aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12349 from odigity/masterYves Senn2013-09-261-1/+1
|\ | | | | added "id: false" to HABTM join table example [ci skip]
| * added "id: false" to HABTM join table exampleOfer Nave2013-09-241-1/+1
| | | | | | Based on the instructions further down in section 3.3.2.
* | Merge pull request #12356 from francisgo/patch-3Yves Senn2013-09-261-3/+3
|\ \ | | | | | | Getting Started Guide: posts_controller -> PostsController [ci skip]
| * | 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 in active_record_basics.md.
| * | | [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
|\ \ \ | | | | | | | | Correct error in ActiveRecord Querying guide [ci skip]
| * | | [ci skip] Correct the explanation of the example for find_or_create_by when ↵Daniel Lissner2013-09-251-1/+1
| |/ / | | | | | | | | | used with create_with in ActiveRecord Querying guide
* | | 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 [ci skip]
| * | | Getting Started Guide: update link_to string argument to use single-quote ↵Francis Go2013-09-261-1/+1
|/ / / | | | | | | | | | mark, following document style [ci skip]
* | | Merge pull request #12363 from jbaudanza/docRafael Mendonça França2013-09-251-1/+1
|\ \ \ | | | | | | | | Fix small typo in docs
| * | | 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
|\ \ \ \ | |/ / / |/| | | fix .find when inverse is loaded
| * | | changelog entryArthur Neves2013-09-251-0/+6
| | | |
| * | | fix .find when inverse is setArthur Neves2013-09-252-5/+16
|/ / / | | | | | | | | | .find([1]) should return an Array of entries, even when a invese object is in memory already
* | | Merge pull request #12359 from arthurnn/inverse_on_callbacksRafael Mendonça França2013-09-254-2/+18
|\ \ \ | | | | | | | | Make sure inverse_of is visible on the has_many callbacks
| * | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (62 commits) Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag Add CHANGELOG entry for #12344 Add regression test to #12343 Fix typo in number_to_human docs: you -> your [Documentation] Add a missing validation to I18n docs Use the given name in html_options for the hidden field in collection_check_boxes assign_attributes should return if argument is blank. No need the else clause Use join to concat the both side of the AST Add a CHANGELOG entry about Web Console inclusion added column type to example in section 2.3 Include web-console in new projects Gemfile ActiveRecord::ConnectionAdapters::Column.string_to_time method respects string with timezone. Closes #12278. add test_scoped_root_as_name Getting Started Guide: update RubyGems Guides link [ci skip] Deprecate unused quoted_locking_column method. Update references to wycats/thor to erikhuda/thor. bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows Fix the model name in the association basics guides We shouldn't override PostgreSQLAdapter's superclass inheritance while monkeypatching ...
| * | Merge pull request #12290 from kennyj/fix_12278Andrew White2013-09-243-3/+28
| |\ \ | | | | | | | | Closes #12278. AR::ConnectionAdapters::Column.string_to_time method respects string with timezone.
| | * | ActiveRecord::ConnectionAdapters::Column.string_to_time method respects ↵kennyj2013-09-253-3/+28
| | | | | | | | | | | | | | | | string with timezone. Closes #12278.
| * | | 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 tag
| | * | | 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
| | | | | | | | | | | | | | | | [ci skip]
| * | | 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_ch...
| | * | | Use the given name in html_options for the hidden field in ↵Angel N. Sciortino2013-09-242-1/+9
| | | | | | | | | | | | | | | | | | | | collection_check_boxes
| * | | | 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 arguments are blank
| | * | | | assign_attributes should return if argument is blank.wangjohn2013-09-241-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | If you are passed an empty hash, then assign_attributes doesn't need to do any work and can just return early. This should fix the failing Agile Web Development tests.
| * | | | Merge pull request #12346 from graysonwright/patch-1Rafael Mendonça França2013-09-241-0/+1
| |\ \ \ \ | | | | | | | | | | | | [Documentation] Add a missing validation to I18n docs
| | * | | | [Documentation] Add a missing validation to I18n docsGrayson Wright2013-09-241-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | The guide was missing a description of the error message interpolation for validates_numericality_of with the :only_integer option.
| * | | | Merge pull request #12341 from odigity/masterRafael Mendonça França2013-09-241-1/+1
| |\ \ \ \ | | | |_|/ | | |/| | added column type to example in section 2.3
| | * | | 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 -> your
| | * | | 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 note about database connection pool in postgres template
| | * | | 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
| | | | | | | | | | | | | | | | | | | | Onf of the sides can be nil and it will raise a Conversion error
| * | | | Merge pull request #12337 from rubys/route-formatter-testRafael Mendonça França2013-09-241-0/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | add test_scoped_root_as_name
| | * | | | add test_scoped_root_as_nameSam Ruby2013-09-241-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | test for regression introduced by https://github.com/rails/rails/pull/9155
| * | | | | Merge pull request #12342 from gsamokovarov/web-console-changelogGuillermo Iguaran2013-09-241-0/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Add a CHANGELOG entry about Web Console inclusion
| | * | | | 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 Gemfile
| | * | | 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 is passed to update_attributes. Conflicts: activerecord/CHANGELOG.md
| | * | | 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
| |\ \ \ \ | | | | | | | | | | | | Remove unused quoted_locking_column method.
| | * | | | Deprecate unused quoted_locking_column method.kennyj2013-09-243-0/+9
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 00:17:17 +0000