aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Fix `undefined method uncached` for polymorphic belongs_to #20426James Dabbs2015-06-132-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unitialized polymorphic `belongs_to` associations raise an error while attempting to reload, as they attempt to make an uncached reload, but don't have a klass to fetch uncachedly. In this case, `loaded?` should be `false` anyway.
* | | | | | Merge pull request #20545 from dcrec1/20541Yves Senn2015-06-233-3/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value for a namespaced association
| * | | | | | thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value ↵Diego Carrion2015-06-223-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for a namespaced association fixes #20541
* | | | | | | Merge pull request #20667 from y-yagi/do_not_show_failed_messagesRafael Mendonça França2015-06-222-3/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | do not show "Failed tests" message when a failed test is not
| * | | | | | | do not show "Failed tests" message when a failed test is notyuuji.yaginuma2015-06-232-3/+10
| | | | | | | |
* | | | | | | | Merge pull request #20664 from vngrs/remove_mistaken_end_from_docClaudio B.2015-06-221-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove mistaken end from controller_path doc [ci skip]
| * | | | | | | | Remove mistaken end from controller_path doc [ci skip]Mehmet Emin İNAÇ2015-06-221-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #19431 from hmarr/head-routingRafael Mendonça França2015-06-222-4/+4
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Respect routing precedence for HEAD requests
| * | | | | | | Respect routing precedence for HEAD requestsHarry Marr2015-03-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the issue described in #18764 - prevents Rack middleware from swallowing up HEAD requests that should have been matched by a higher-precedence `get` route, but still allows Rack middleware to respond to HEAD requests.
* | | | | | | | Merge pull request #20665 from vngrs/add_nodoc_to_validations_helpersRafael Mendonça França2015-06-221-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | Add nodoc to the Validations::Helpers [ci skip]
| * | | | | | | Add nodoc to the Validations::Helpers [ci skip]Mehmet Emin İNAÇ2015-06-221-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #20663 from andreynering/patch-1Rafael Mendonça França2015-06-221-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Minor fixes [ci skip]
| * | | | | | Minor fixes [ci skip]Andrey Nering2015-06-221-2/+2
|/ / / / / /
* | | | | | docs, :scissors: wrongly placed heading. [ci skip]Yves Senn2015-06-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The heading "Active Model Length Validator" was shown on the "ActiveModel::Validations" page without any text following it.
* | | | | | refactor, don't duplicate presence validator logic.Yves Senn2015-06-221-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a small refactoring that simplifies the Active Record specific lenght validator.
* | | | | | docs, update Active Model reference for AR length validator. [ci skip]Yves Senn2015-06-221-1/+4
| | | | | |
* | | | | | AR absence validator respects `marked_for_destruction?`. Closes #20449.Yves Senn2015-06-224-0/+106
| |/ / / / |/| | | | | | | | | | | | | | Associated objects that were marked for destruction are considered absent.
* | | | | Merge pull request #20656 from repinel/move-validations-helper-methodsYves Senn2015-06-222-10/+13
|\ \ \ \ \ | | | | | | | | | | | | Move the validations HelperMethods to its own file
| * | | | | Move the validations HelperMethods to its own fileRoque Pinel2015-06-212-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #11209 [Roque Pinel & Steven Yang]
* | | | | | Merge pull request #20659 from ↵Yves Senn2015-06-221-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vngrs/strong_parameters_unpermitted_parameters_wrong_doc_fix Fix the documentation about ActionController::UnpermittedParameters [ci skip]
| * | | | | | Fix the documentation about ActionController::UnpermittedParameters [ci skip]Mehmet Emin İNAÇ2015-06-221-2/+4
|/ / / / / /
* | | | | | Merge pull request #20655 from y-yagi/remove_unused_variableRichard Schneeman2015-06-211-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove unused variable in reporter test
| * | | | | | remove unused variable in reporter testyuuji.yaginuma2015-06-221-1/+0
| | | | | | |
* | | | | | | Merge pull request #20658 from vngrs/strong_parameters_parameter_wrong_doc_fixRichard Schneeman2015-06-211-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix the documentation about ActionController::ParameterMissing [ci skip]
| * | | | | | | Fix the documentation about ActionController::ParameterMissing [ci skip]Mehmet Emin İNAÇ2015-06-221-5/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #20654 from repinel/remove-duplicate-privateRichard Schneeman2015-06-211-2/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Remove duplicate private statement
| * | | | | | Remove duplicate private statementRoque Pinel2015-06-211-2/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-06-218-11/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Conflicts: guides/source/configuring.md
| * | | | | Remove broken linksGaurish Sharma2015-06-211-2/+0
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | [ci skip] Fix to Fixed-width Fontyui-knk2015-06-143-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | LookupContext is class name
| * | | | | [ci skip] Add '.'yui-knk2015-06-141-1/+1
| | | | | |
| * | | | | [ci skip] Add `.`yui-knk2015-06-101-1/+1
| | | | | |
| * | | | | Remove misplaced period on "Configuring" guide.Hendy Tanata2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | [ci skip] Fix minutes to seconds in `select_second`yui-knk2015-06-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is same type commit of https://github.com/rails/rails/pull/20463
| * | | | | [ci skip] Fix order to match options orderyui-knk2015-06-071-1/+1
| | | | | |
* | | | | | applies project style guidelinesXavier Noria2015-06-201-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Just saw these in passing while reading this file.
* | | | | | removes unnecessary backslashes in regexpsXavier Noria2015-06-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Colons are not metacharacters.
* | | | | | Merge pull request #20636 from dcrec1/isolated_testYves Senn2015-06-201-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | fix test not failing when executed isolated
| * | | | | fix test not failing when executed isolatedDiego Carrion2015-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the test was created in 7659fb6 the fixtures were added in c092dbe
* | | | | | Include `Enumerable` in `ActiveRecord::Relation`Sean Griffin2015-06-195-37/+21
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussing, we've decided it makes more sense to include it. We're already forwarding every conflicting method to `to_a`, and there's no conflation of concerns. `Enumerable` has no mutating methods, and it just allows us to simplify the code. No existing methods will have a change in behavior. Un-overridden Enumerable methods will simply delegate to `each`. [Sean Griffin & bogdan]
* | | | | Use `Enumerable#sum` on `ActiveRecord::Relation` when a block is givenSean Griffin2015-06-193-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches our behavior in other cases where useful enumerable methods might have a different definition in `Relation`. Wanting to actually enumerate over the records in this case is completely reasonable, and wanting `.sum` is reasonable for the same reason it is on `Enumerable` in the first place.
* | | | | Merge pull request #20117 from jfine/action-mailer-smtp-settings-updateYves Senn2015-06-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Add openssl_verify_mode and sync other smtp_settings with API docs [ci skip]
| * | | | | Add openssl_verify_mode and sync other smtp_settings with API docsJared Fine2015-05-111-1/+1
| | | | | |
* | | | | | Merge pull request #20259 from rastasheep/rastasheep-patch-1Yves Senn2015-06-191-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update documentation for ActiveRecord::Migration#remove_index
| * | | | | | Fix typo [ci skip]Aleksandar Diklic2015-05-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `remove_index` works with multiple column names as `add_index`
* | | | | | | Merge pull request #20605 from dcrec1/assert_fileYves Senn2015-06-194-2/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | assert_file understands paths with special characters
| * | | | | | | assert_file understands paths with special charactersDiego Carrion2015-06-183-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | fixes #20042
* | | | | | | | Merge pull request #19843 from marshall-lee/explain_cte_queriesYves Senn2015-06-193-1/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let WITH (CTE) queries be explainable Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | Let WITH (CTE) queries be explainableVladimir Kochnev2015-05-283-1/+10
| | | | | | | | |
* | | | | | | | | Merge pull request #20630 from y-yagi/fix_references_migration_exampleZachary Scott2015-06-181-4/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | correct example output of references migration [ci skip]