aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | |
* | | | | | | | | Merge pull request #20584 from arthurnn/fix_urlArthur Nogueira Neves2015-06-163-4/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Catch InvalidURIError on bad paths on redirect.
| * | | | | | | | | Catch InvalidURIError on bad paths on redirect.Arthur Neves2015-06-163-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle URI::InvalidURIError errors on the redirect route method, so it wont raise a 500 if a bad path is given.
* | | | | | | | | | Merge pull request #20587 from vngrs/fix_descriptions_of_databases_rakeRafael Mendonça França2015-06-161-11/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix descriptions of databases.rake [ci skip]
| * | | | | | | | | | Fix descriptions of databases.rake [ci skip]Mehmet Emin İNAÇ2015-06-171-11/+11
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | revert create and drop task descriptions
* | | | | | | | | | Merge pull request #20588 from vngrs/minor_comment_fixArthur Nogueira Neves2015-06-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix the comment about attr_reader of headers [ci skip]
| * | | | | | | | | | Fix the comment about attr_reader of headers [ci skip]Mehmet Emin İNAÇ2015-06-161-1/+1
| |/ / / / / / / / /
* | | | | | | | | | enforce a depth limit on XML documentsAaron Patterson2015-06-163-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XML documents that are too deep can cause an stack overflow, which in turn will cause a potential DoS attack. CVE-2015-3227
* | | | | | | | | | Escape HTML entities in JSON keysRafael Mendonça França2015-06-162-0/+11
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CVE-2015-3226
* | | | | | | | | Merge pull request #20578 from dcrec1/regressionSean Griffin2015-06-162-1/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | raise ActiveModel::MissingAttributeError when trying to access a relationship without the foreign key attribute
| * | | | | | | raise ActiveModel::MissingAttributeError when trying to access a ↵Diego Carrion2015-06-162-1/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | relationship without the foreign key attribute fixes regression reported on #20253 ActiveRecord::Base#[] was not used cause of 8b95420
* | | | | | | Merge pull request #20572 from arthurnn/db_resetYves Senn2015-06-161-4/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Small refactor on db:reset
| * | | | | | | Small refactor on db:resetArthur Neves2015-06-151-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db:reset should not prematurely load the environment, so, for instance, if there is any initializer that touches th DB, it will not touch that before droping it. Also this makes the code simpler. This changed was made back in 15fb4302b6ff16e641b6279a3530eb8ed97f2899 , not sure why. But I am pretty much sure we should do it like this, as drop and setup should load its dependencies tasks if necessary.
* | | | | | | | remove `header=` on the response object.Aaron Patterson2015-06-153-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | People should be free to mutate the header object, but not to set a new header object. That header object may be specific to the webserver, and we need to hide it's internals.
* | | | | | | | set the default charset in response initializeAaron Patterson2015-06-151-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this way we don't have to mutate the instance (as much) when writing a rack response
* | | | | | | | Merge pull request #20407 from vngrs/deprecate_implicit_status_for_head_methodMatthew Draper2015-06-165-12/+47
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Deprecate passing hash as first parameter into ActionController::Head
| * | | | | | | | Deprecate passing hash as first parameter into ActionController::HeadMehmet Emin İNAÇ2015-06-155-12/+47
| | | | | | | | |
* | | | | | | | | Merge pull request #20108 from akshay-vishnoi/button-tagArthur Nogueira Neves2015-06-152-2/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing spec and documentation for button_tag helper
| * | | | | | | | | Add missing spec and documentation for button_tag helperAkshay Vishnoi2015-05-242-2/+22
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 14:48:19 +0000