aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12349 from odigity/masterYves Senn2013-09-261-1/+1
|\
| * added "id: false" to HABTM join table exampleOfer Nave2013-09-241-1/+1
* | Merge pull request #12356 from francisgo/patch-3Yves Senn2013-09-261-3/+3
|\ \
| * | Getting Started Guide: posts_controller -> PostsController [ci skip]Francis Go2013-09-261-3/+3
* | | Merge pull request #12357 from JuanitoFatas/AR-basicsYves Senn2013-09-261-11/+11
|\ \ \
| * | | [ci skip] Add missing periods and update link name and some wording.Juanito Fatas2013-09-261-11/+11
| |/ /
* | | quote `false` reference in querying guide.Yves Senn2013-09-261-1/+1
* | | Merge pull request #12355 from speakingcode/doc-fixYves Senn2013-09-261-1/+1
|\ \ \
| * | | [ci skip] Correct the explanation of the example for find_or_create_by when u...Daniel Lissner2013-09-251-1/+1
| |/ /
* | | Merge pull request #12368 from francisgo/patch-5Yves Senn2013-09-261-1/+1
|\ \ \
| * | | Getting Started Guide: update link_to string argument to use single-quote mar...Francis Go2013-09-261-1/+1
|/ / /
* | | Merge pull request #12363 from jbaudanza/docRafael Mendonça França2013-09-251-1/+1
|\ \ \
| * | | Fix small typo in docsJonathan Baudanza2013-09-251-1/+1
* | | | Merge pull request #12362 from arthurnn/inverse_on_findRafael Mendonça França2013-09-253-5/+22
|\ \ \ \ | |/ / / |/| | |
| * | | changelog entryArthur Neves2013-09-251-0/+6
| * | | fix .find when inverse is setArthur Neves2013-09-252-5/+16
|/ / /
* | | Merge pull request #12359 from arthurnn/inverse_on_callbacksRafael Mendonça França2013-09-254-2/+18
|\ \ \
| * | | update changelog for #12359Arthur Neves2013-09-251-1/+5
| * | | Make sure inverse_of is visible on the has_many callbacksArthur Neves2013-09-253-1/+13
| |/ /
* | | Merge branch 'master' into preloadAaron Patterson2013-09-2579-201/+735
|\| |
| * | Merge pull request #12290 from kennyj/fix_12278Andrew White2013-09-243-3/+28
| |\ \
| | * | ActiveRecord::ConnectionAdapters::Column.string_to_time method respects strin...kennyj2013-09-253-3/+28
| * | | Merge pull request #12351 from francisgo/patch-2Rafael Mendonça França2013-09-241-1/+1
| |\ \ \
| | * | | Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tagFrancis Go2013-09-251-1/+1
| |/ / /
| * | | Add CHANGELOG entry for #12344Rafael Mendonça França2013-09-241-0/+5
| * | | Merge pull request #12344 from angelic/collection_check_boxes_with_nameRafael Mendonça França2013-09-242-1/+9
| |\ \ \
| | * | | Use the given name in html_options for the hidden field in collection_check_b...Angel N. Sciortino2013-09-242-1/+9
| * | | | Add regression test to #12343Rafael Mendonça França2013-09-241-0/+5
| * | | | Merge pull request #12343 from wangjohn/fix_failing_agile_controller_testsRafael Mendonça França2013-09-241-0/+1
| |\ \ \ \
| | * | | | assign_attributes should return if argument is blank.wangjohn2013-09-241-0/+1
| | |/ / /
| * | | | Merge pull request #12346 from graysonwright/patch-1Rafael Mendonça França2013-09-241-0/+1
| |\ \ \ \
| | * | | | [Documentation] Add a missing validation to I18n docsGrayson Wright2013-09-241-0/+1
| | |/ / /
| * | | | Merge pull request #12341 from odigity/masterRafael Mendonça França2013-09-241-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | added column type to example in section 2.3Ofer Nave2013-09-241-1/+1
| * | | | Merge pull request #12347 from macmartine/masterRafael Mendonça França2013-09-241-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix typo in number_to_human docs: you -> yourMac Martine2013-09-241-1/+1
| |/ / /
| * | | Merge pull request #10822 from gaurish/poolXavier Noria2013-09-242-0/+13
| |\ \ \
| | * | | Add notes about database connection pool [ci skip]Gaurish Sharma2013-09-222-0/+13
| * | | | No need the else clauseRafael Mendonça França2013-09-241-2/+0
| * | | | Use join to concat the both side of the ASTRafael Mendonça França2013-09-241-1/+2
| * | | | Merge pull request #12337 from rubys/route-formatter-testRafael Mendonça França2013-09-241-0/+13
| |\ \ \ \
| | * | | | add test_scoped_root_as_nameSam Ruby2013-09-241-0/+13
| * | | | | Merge pull request #12342 from gsamokovarov/web-console-changelogGuillermo Iguaran2013-09-241-0/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Add a CHANGELOG entry about Web Console inclusionGenadi Samokovarov2013-09-241-0/+4
| |/ / / /
| * | | | Merge pull request #11667 from gsamokovarov/introduce-web-consoleGuillermo Iguaran2013-09-241-0/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Include web-console in new projects GemfileGenadi Samokovarov2013-09-241-0/+3
| |/ / /
| * | | Merge pull request #9860 from wangjohn/update_attributes_throws_error_with_nilRafael Mendonça França2013-09-244-6/+25
| |\ \ \
| | * | | Raising an error when nil or non-hash is passed to update_attributes.wangjohn2013-06-254-6/+25
| * | | | Merge pull request #11423 from kennyj/remove_quoted_locking_columnRafael Mendonça França2013-09-243-0/+9
| |\ \ \ \
| | * | | | Deprecate unused quoted_locking_column method.kennyj2013-09-243-0/+9