mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
28,777 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

28777 Commits

Author SHA1 Message Date
Philip Arndt f12f071ece Documented the removal of size from text_field based helpers and cols, rows from text_area helper. 2012-03-12 10:39:45 +13:00
Philip Arndt 8b5198a417 Fix unintended removal of 'cols' from a text_area example. 2012-03-12 10:33:47 +13:00
Philip Arndt 3384ee24ad Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea. 2012-03-10 23:30:39 +13:00
José Valim 3e776496d0 Merge pull request #5364 from carlosantoniodasilva/active-model-serialization-include 
Active model serialization :include returning string keys
 2012-03-10 01:06:30 -08:00
Carlos Antonio da Silva 3508da50f0 Rename variable to avoid using name "include" 
Better syntax highlight :)
 2012-03-09 22:07:59 -03:00
Carlos Antonio da Silva 3d04d726fd Remove Array#wrap usage in AMo serialization 2012-03-09 21:56:05 -03:00
Carlos Antonio da Silva 10c3304db6 Make sure serializable hash with :include always returns string keys 2012-03-09 21:51:12 -03:00
José Valim a39ee47312 Install latest bundler on Travis. 2012-03-09 22:19:55 +01:00
José Valim 3742152310 Bump bundler dependency. 2012-03-09 22:10:43 +01:00
José Valim ee0879f6ce Merge pull request #5356 from carlosantoniodasilva/rake-test-system 
Use one system call whenever possible, group rake and Dir.chdir calls
 2012-03-09 06:25:34 -08:00
José Valim 74d5d9a334 Merge pull request #5352 from avakhov/ar_finder_sql_uniq_ids 
In AR depths use &:to_i before :uniq to process mixed arrays likes ["1", 1] correct
 2012-03-09 03:35:15 -08:00
Alexey Vakhov 48a7df9a9f In AR depths use &:to_i before :uniq to process mixed arrays likes ["1", 1] correct 2012-03-09 15:21:12 +04:00
José Valim 225eff9d61 Merge pull request #5351 from shanna/master 
Missing active_model/naming.rb dependency.
 2012-03-08 23:26:48 -08:00
Vijay Dev ba35527fe7 Minor changelog fixes [ci skip] 2012-03-09 12:29:29 +05:30
Vijay Dev acc7e50385 Merge pull request #5349 from rafaelfranca/changelog-fix 
Fix my name in the CHANGELOG to follow the convention
 2012-03-08 22:29:55 -08:00
Vijay Dev 2741f2cd6d Merge pull request #5348 from rafaelfranca/fix-warning 
Remove warning of unused variable
 2012-03-08 22:29:00 -08:00
Shane Hanna 2b97b8fb9e Added missing ActiveModel::Naming dependency. 
ActiveModel::Name constructor expects to be able to call #blank? on a
String but the core Object#blank? extension is never required.
 2012-03-09 15:46:24 +11:00
Rafael Mendonça França d804790634 Fix my name in the CHANGELOG to follow the convention 
Also add missing entries and use the formating convention
 2012-03-09 00:54:21 -03:00
Rafael Mendonça França 9f69f01569 Remove warning of unused variable 2012-03-08 23:58:05 -03:00
Aaron Patterson 657095d8bb ensure that released connections move between threads 2012-03-08 16:12:49 -08:00
Aaron Patterson d523504c2f make active_connection? return true only if there is an open connection in use for the current thread. fixes #5330 2012-03-08 15:40:23 -08:00
Carlos Antonio da Silva 73e8e70066 Use one system call whenever possible, group rake and Dir.chdir calls 2012-03-08 19:57:17 -03:00
Vijay Dev 8a714c4d80 fix incorrect changelog headings [ci skip]. 
Last commit message should not have said 'Rails 4' either
 2012-03-09 02:30:49 +05:30
Vijay Dev db6542178c changelog updates for Rails 4 [ci skip] 2012-03-09 02:22:17 +05:30
Vijay Dev 188d1d2787 Merge branch 'master' of github.com:lifo/docrails 2012-03-09 00:07:59 +05:30
Vijay Dev 97e7d43146 Revert "Add rails glossary of common terms & concepts" 
This reverts commit fd584a63de.

Reason: This is not suitable for a Rails guide in my opinion.
 2012-03-08 23:54:55 +05:30
Aaron Patterson 085cb3b9af Merge pull request #5287 from nashby/hash-slice-extract 
refactor Hash#slice and Hash#extract!
 2012-03-08 09:54:34 -08:00
José Valim 58a55595ca Merge pull request #5306 from kennyj/fix_69c7f02 
Change the message string to use in  test case.
 2012-03-08 04:00:02 -08:00
Xavier Noria efc0d0373e Merge pull request #5336 from kennyj/fix_wrong_extension 
Update CHANGELOG to fix wrong extension.
 2012-03-08 03:17:16 -08:00
kennyj aa9b64790b Update CHANGELOG to fix wrong extension. 2012-03-08 20:07:44 +09:00
Jon Leighton 104eebb4cc Merge pull request #5289 from rafaelfranca/fix-through-associations 
Fix has_many through associations when mass_assignment_sanitizer is strict
 2012-03-08 00:13:08 -08:00
Aaron Patterson 447ecb08ca Merge pull request #5162 from kennyj/schema_cache_dump 
[Proposal] Schema cache dump
 2012-03-07 16:44:50 -08:00
Rafael Mendonça França c9c7ee7710 Not need to pass join attributes to association build 2012-03-07 21:07:29 -03:00
Xavier Noria b700153507 Revert "let the connection pool of new applications have size 1 rather than 5" 
Reason: Temporarily reverting this because it has uncovered an issue that
prevents Sam's test suite from passing.

This reverts commit 9b2c38b7bd.
 2012-03-07 22:46:59 +01:00
Xavier Noria 73324fd830 Revert "updates the new default pool size in some additional places" 
Reason: We are about to temporarily revert the change to the default.

This reverts commit 5c0aba238c.
 2012-03-07 22:46:06 +01:00
kuahyeow a149612c0b Add tests to test that through associations are not readonly, and we can update the records we retrive from the association 2012-03-08 09:48:59 +13:00
Aaron Patterson 89cef0757a Merge pull request #5315 from travisjeffery/enhance_postgresql_adapter_schema_support 
Enhance PostgreSQL Adapter schema support
 2012-03-07 10:58:55 -08:00
Travis Jeffery 8dc1a625c8 Adds #create/drop_schema on the PostgreSQL Adapter. 2012-03-07 17:55:33 +00:00
José Valim 3da31b948f Merge pull request #5316 from Jacobkg/master 
Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
 2012-03-07 07:03:59 -08:00
Vijay Dev 35922c0f82 copy edits [ci skip] 2012-03-07 20:32:25 +05:30
Vijay Dev 6588560c61 Merge pull request #88 from kevingriffin/master 
Correct "its" usage for "AJAX on Rails" page
 2012-03-07 06:51:33 -08:00
kennyj 37802dd51e Change the string to use in test case. 2012-03-07 23:33:52 +09:00
José Valim 7638004d7d Set the rendered_format on respond_to. 2012-03-07 15:02:58 +01:00
José Valim bbdb54ad15 Just change the formats on first render, closes #5307, closes #5308. 2012-03-07 14:56:38 +01:00
Santiago Pastorino e6e591dffc Merge pull request #5320 from carlosantoniodasilva/test-render-js-no-layout 
Add test case for #5307
 2012-03-07 04:37:46 -08:00
Carlos Antonio da Silva 787617760c Add test case for #5307 2012-03-07 09:35:17 -03:00
Vijay Dev 87a8f95f6c fixes #4506 [ci skip] 
odd and even keys are not scoped by activerecord.
 2012-03-07 17:43:54 +05:30
Vijay Dev 5e4102ef5f Merge pull request #5305 from arunagw/warning_fix 
warning fix : mismatched indentations at 'end' with 'case'
 2012-03-07 04:02:08 -08:00
Jacob Green 04aca254cc attribute_present? should return false for empty strings 2012-03-06 22:32:29 -08:00
Travis Jeffery 577971f05a Add #schema_names to PostgreSQL Adapter. 2012-03-07 05:27:12 +00:00