Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Nitpick :nail_care: [ci skip] | Zachary Scott | 2015-06-18 | 1 | -1/+2 |
| | |||||
* | Autoload ActiveRecord::RecordInvalid | Rafael Mendonça França | 2015-06-18 | 1 | -0/+1 |
| | | | | Fixes #20626 | ||||
* | Merge pull request #20549 from maurogeorge/distance_of_time_in_words-rdoc | Zachary Scott | 2015-06-18 | 1 | -0/+20 |
|\ | | | | | Add RDoc about scope option on distance_of_time_in_words | ||||
| * | Add RDoc about scope option on distance_of_time_in_words | Mauro George | 2015-06-18 | 1 | -0/+20 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #20575 from prathamesh-sonpatki/doc-xml-disallowed-types | Zachary Scott | 2015-06-18 | 1 | -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 Sonpatki | 2015-06-18 | 1 | -1/+19 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #20618 from vngrs/fix_railties_tests | Eileen M. Uchitelle | 2015-06-18 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | fix railties tests | ||||
| * | | | fix railties tests | Mehmet Emin İNAÇ | 2015-06-18 | 1 | -2/+2 |
|/ / / | |||||
* | | | Tiny documentation fixes [ci skip] | Robin Dupret | 2015-06-18 | 2 | -10/+12 |
| | | | |||||
* | | | Merge pull request #20054 from trosborn/master | Robin Dupret | 2015-06-18 | 1 | -77/+107 |
|\ \ \ | | | | | | | | | updates caching guide to reflect current Rails capabilities [ci skip] | ||||
| * | | | updates caching guide to reflect current Rails capabilities [ci skip] | Thomas Osborn | 2015-06-17 | 1 | -77/+107 |
| | | | | |||||
* | | | | Merge pull request #20614 from y-yagi/remove_rails_rack_debugger_from_guide | Zachary Scott | 2015-06-17 | 1 | -3/+1 |
|\ \ \ \ | | | | | | | | | | | remove `Rails::Rack::Debugger` from guides [ci skip] | ||||
| * | | | | remove `Rails::Rack::Debugger` from guides [ci skip] | yuuji.yaginuma | 2015-06-18 | 1 | -3/+1 |
|/ / / / | | | | | | | | | | | | | Rails::Rack::Debugger was removed in 93559da4826546d07014f8cfa399b64b4a143127 | ||||
* | | | | Remove ContentLength middleware from the defaults. | Aaron Patterson | 2015-06-17 | 2 | -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 Neves | 2015-06-17 | 3 | -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-4 | Rafael Mendonça França | 2015-06-17 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Update bundler to v1.10.4 | ||||
| * | | | | Update bundler to v1.10.4 | Tim Rogers | 2015-06-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #20596 from vngrs/use_single_quote_in_gemfile | Kasper Timm Hansen | 2015-06-17 | 1 | -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-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Bump AMS to 0.10.0.rc2 | Santiago Pastorino | 2015-06-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #20584 from arthurnn/fix_url | Arthur Nogueira Neves | 2015-06-16 | 3 | -4/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | Catch InvalidURIError on bad paths on redirect. | ||||
| * | | | | | Catch InvalidURIError on bad paths on redirect. | Arthur Neves | 2015-06-16 | 3 | -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_rake | Rafael Mendonça França | 2015-06-16 | 1 | -11/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix descriptions of databases.rake [ci skip] | ||||
| * | | | | | | Fix descriptions of databases.rake [ci skip] | Mehmet Emin İNAÇ | 2015-06-17 | 1 | -11/+11 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | revert create and drop task descriptions | ||||
* | | | | | | Merge pull request #20588 from vngrs/minor_comment_fix | Arthur Nogueira Neves | 2015-06-16 | 1 | -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-16 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | enforce a depth limit on XML documents | Aaron Patterson | 2015-06-16 | 3 | -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 keys | Rafael Mendonça França | 2015-06-16 | 2 | -0/+11 |
|/ / / / / | | | | | | | | | | | | | | | | Fixes CVE-2015-3226 | ||||
* | | | | | Merge pull request #20578 from dcrec1/regression | Sean Griffin | 2015-06-16 | 2 | -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 Carrion | 2015-06-16 | 2 | -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_reset | Yves Senn | 2015-06-16 | 1 | -4/+1 |
|\ \ \ \ | | | | | | | | | | | Small refactor on db:reset | ||||
| * | | | | Small refactor on db:reset | Arthur Neves | 2015-06-15 | 1 | -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 Patterson | 2015-06-15 | 3 | -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 initialize | Aaron Patterson | 2015-06-15 | 1 | -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_method | Matthew Draper | 2015-06-16 | 5 | -12/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | Deprecate passing hash as first parameter into ActionController::Head | ||||
| * | | | | | Deprecate passing hash as first parameter into ActionController::Head | Mehmet Emin İNAÇ | 2015-06-15 | 5 | -12/+47 |
| | | | | | | |||||
* | | | | | | Merge pull request #20108 from akshay-vishnoi/button-tag | Arthur Nogueira Neves | 2015-06-15 | 2 | -2/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add missing spec and documentation for button_tag helper | ||||
| * | | | | | | Add missing spec and documentation for button_tag helper | Akshay Vishnoi | 2015-05-24 | 2 | -2/+22 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #20257 from ↵ | Arthur Nogueira Neves | 2015-06-15 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/test-for-serial-for-quoted-sequence Added test case for serial? method when sequence name is not quoted | ||||
| * | | | | | | Added test case for serial? method when sequence name is not quoted | Prathamesh Sonpatki | 2015-05-22 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/20190/. | ||||
* | | | | | | | Merge pull request #20107 from ankit8898/av_refac_record_tag_helper | Arthur Nogueira Neves | 2015-06-15 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removed not needed includes, As record_tag_helper is moved to a gem we.. | ||||
| * | | | | | | | Removed not needed includes, As record_tag_helper is moved to a gem we are not | Ankit Gupta | 2015-05-10 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing is completely here now. RenderErbUtils and AM::Conversion are not used | ||||
* | | | | | | | | Merge pull request #20573 from kaspth/fix-caching-test-for-realskies | Matthew Draper | 2015-06-16 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix flakyness. | ||||
| * | | | | | | | | Fix flakyness. | Kasper Timm Hansen | 2015-06-15 | 1 | -0/+1 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Brought on by my own stupidity :) | ||||
* | | | | | | | | i18n guide: warn about default_url_options caching and locale selectors [ci ↵ | Xavier Noria | 2015-06-15 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip] | ||||
* | | | | | | | | document that default_url_options is cached per request [ci skip] | Xavier Noria | 2015-06-15 | 1 | -1/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #20564 from repinel/fix-generators-named-base-template-doc | Arthur Nogueira Neves | 2015-06-15 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ci skip] Fix the Rails::Generators::NamedBase#template doc | ||||
| * | | | | | | | | [ci skip] Fix the Rails::Generators::NamedBase#template doc | Roque Pinel | 2015-06-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #13612, `template` is no longer being used to generate migrations. | ||||
* | | | | | | | | | Merge pull request #20440 from repinel/fix-message-verifier-encoding-issue | Matthew Draper | 2015-06-16 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | Fix the message verifier encoding issue | ||||
| * | | | | | | | | Fix the message verifier encoding issue | Roque Pinel | 2015-06-14 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby verifier = ActiveSupport::MessageVerifier.new('secret') verifier.verify("\xff") # => ArgumentError: invalid byte sequence in UTF-8 ``` |