aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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]
| * | | | | | correct example output of references migration [ci skip]yuuji.yaginuma2015-06-191-4/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | this behavior was changed in 99a6f9e60ea55924b44f894a16f8de0162cf2702
* | | | | | Nitpick :nail_care: [ci skip]Zachary Scott2015-06-181-1/+2
| | | | | |
* | | | | | Autoload ActiveRecord::RecordInvalidRafael Mendonça França2015-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #20626
* | | | | | Merge pull request #20549 from maurogeorge/distance_of_time_in_words-rdocZachary Scott2015-06-181-0/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add RDoc about scope option on distance_of_time_in_words
| * | | | | | Add RDoc about scope option on distance_of_time_in_wordsMauro George2015-06-181-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #20575 from prathamesh-sonpatki/doc-xml-disallowed-typesZachary Scott2015-06-181-1/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added documentation about passing custom disallowed types to Hash#from_xml [ci skip]
| * | | | | | | Added documentation about passing custom disallowed types to Hash#from_xml ↵Prathamesh Sonpatki2015-06-181-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #20618 from vngrs/fix_railties_testsEileen M. Uchitelle2015-06-181-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix railties tests
| * | | | | | | | fix railties testsMehmet Emin İNAÇ2015-06-181-2/+2
|/ / / / / / / /
* | | | | | | | Tiny documentation fixes [ci skip]Robin Dupret2015-06-182-10/+12
| | | | | | | |
* | | | | | | | Merge pull request #20054 from trosborn/masterRobin Dupret2015-06-181-77/+107
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | updates caching guide to reflect current Rails capabilities [ci skip]
| * | | | | | | | updates caching guide to reflect current Rails capabilities [ci skip]Thomas Osborn2015-06-171-77/+107
| | | | | | | | |
* | | | | | | | | Merge pull request #20614 from y-yagi/remove_rails_rack_debugger_from_guideZachary Scott2015-06-171-3/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | remove `Rails::Rack::Debugger` from guides [ci skip]
| * | | | | | | | | remove `Rails::Rack::Debugger` from guides [ci skip]yuuji.yaginuma2015-06-181-3/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails::Rack::Debugger was removed in 93559da4826546d07014f8cfa399b64b4a143127
* | | | | | | | | Remove ContentLength middleware from the defaults.Aaron Patterson2015-06-172-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContentLength is not part of the rack SPEC since rack/rack@86ddc7a6ec68d7b6951c2dbd07947c4254e8bc0d If you want it, just add it as a middleware in your config.
* | | | | | | | | Revert "Merge pull request #20584 from arthurnn/fix_url"Arthur Neves2015-06-173-19/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0b3397872582f2cf1bc6960960a6393f477c55e6, reversing changes made to 56d52e3749180e6c1dcf7166adbad967470aa78b. As pointed out on the PR, this will hide development mistakes too, which is not ideal.
* | | | | | | | | Merge pull request #20598 from timrogers/update-bundler-version-to-1-10-4Rafael Mendonça França2015-06-171-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update bundler to v1.10.4
| * | | | | | | | | Update bundler to v1.10.4Tim Rogers2015-06-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #20596 from vngrs/use_single_quote_in_gemfileKasper Timm Hansen2015-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Use single quote in Railties generators Gemfile [ci skip]
| * | | | | | | | | Use single quote in Railties generators Gemfile [ci skip]Mehmet Emin İNAÇ2015-06-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Bump AMS to 0.10.0.rc2Santiago Pastorino2015-06-161-1/+1
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 06:29:05 +0000