aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-02310-310/+0
| | | | | This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
* Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-02310-0/+310
|\ | | | | | | Enforce frozen string in Rubocop
| * Enforce frozen string in RubocopKir Shatrov2017-07-01310-0/+310
| |
* | Merge pull request #29506 from pat/frozen-string-literalsMatthew Draper2017-07-024-6/+6
|\ \ | | | | | | | | | Make ActiveSupport frozen-string-literal friendly.
| * | Make ActionView frozen string literal friendly.Pat Allan2017-06-203-3/+3
| | | | | | | | | | | | Plus a couple of related ActionPack patches.
| * | Make ActionMailer frozen string literal friendly.Pat Allan2017-06-202-2/+2
| | |
| * | Make ActiveModel frozen string literal friendly.Pat Allan2017-06-201-1/+1
| | | | | | | | | | | | Includes two external changes because they're referenced within the ActiveModel test suite.
* | | Merge pull request #29644 from wilson/unify-route-helper-visibilityMatthew Draper2017-07-012-18/+17
|\ \ \ | | | | | | | | | | | | Properly register "custom" URL helpers as named helpers.
| * | | Properly register "custom" URL helpers as named helpers.Wilson Bilkovich2017-06-302-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CustomUrlHelpers were introduced in ce7d5fb2e6, closing issue #22512. They currently register themselves in an ivar that is never accessed. This change removes the @custom_helpers special-case, and registers them the way named routes are normally handled. Without this, you can get route_defined?(:example_url) == false, while still being able to call url_helpers.example_url and example_path. Various popular gems such as 'rspec-rails' make use of route_defined?() when determining how to proxy method calls or whether to define a route.
* | | | Fix format of `ActionController::Parameters#to_s` doc [ci skip]yuuji.yaginuma2017-07-011-0/+1
|/ / /
* | | Add CHANGELOG for #29630 [ci skip]Prathamesh Sonpatki2017-07-011-0/+4
| | |
* | | Fallback Parameters#to_s to Hash#to_sKir Shatrov2017-06-302-1/+13
| |/ |/| | | Fixes https://github.com/rails/rails/issues/29617
* | Merge pull request #29588 from greysteil/add-gemspec-linksRafael França2017-06-281-0/+5
|\ \ | | | | | | Add source code and changelog links to gemspecs
| * | Add source code and changelog links to gemspecsGrey Baker2017-06-281-0/+5
| | |
* | | Merge pull request #29595 from fatkodima/result_lambda_class_checkingRafael França2017-06-281-1/+1
|\ \ \ | | | | | | | | Remove useless class checking for `ActiveSupport::Callbacks`s result_lambda
| * | | Remove useless class checking for `ActiveSupport::Callbacks`s result_lambdafatkodima2017-06-271-1/+1
| |/ /
* | | Merge pull request #29533 from jdelStrother/missing_url_formatsRichard Schneeman2017-06-272-0/+11
|\ \ \ | | | | | | | | Fix missing formats in route-set URLs
| * | | Fix missing formats in route-set URLsJonathan del Strother2017-06-232-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, handle_positional_args would end up mutating @segment_keys if inner_options included path components. Subsequent calls would then be missing the implicit path components. eg: user_path(1, :json) # => "/users/1.json" (correct) user_path(1, format: :json) # => "/users/1.json" (correct, but @segment_keys was mutated) user_path(1, :json) # => "/users/1" (oh no!)
* | | | Calling `follow_redirect!` does not reset the `html_document`:Edouard CHIN2017-06-262-1/+13
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When making a request to a controller that redirects, `follow_redirect!` would not reset the `html_document` ivar, it only resets the `html_document` ivar from the session (not the runner) - If one was doing something like this; ```ruby get '/redirect' assert_select 'you are being redirected' follow_redirect! # html_document is memoized and doesn't get reset ``` - To fix the issue we can do the same for any other methods (`get`, `post`...) and define a method in the runner that delegates to the session but clears the html_document_first - Fixes #29367
* | | Add an option to silence puma in system tests.Sam Phippen2017-06-241-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is motivated by our usage of system test in RSpec. Puma lazily boots the first time a system test is used, but this causes some unfortunate output to appear in the middle of the user's green dots. An example of this can be seen in @derekprior's comment [here](https://github.com/rspec/rspec-rails/pull/1813#issuecomment-309252314). There are alternatives in RSpec where we attempt to intercept the puma boot and prevent the output from being made there, but that would involve some monkey patching. This seems like a cleaner solution.
* | | Merge pull request #29553 from eugeneius/wrap_parameters_nilKasper Timm Hansen2017-06-242-1/+9
|\ \ \ | | | | | | | | Don't wrap parameters if key already exists
| * | | Don't wrap parameters if key already existsEugene Kenny2017-06-242-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't perform parameter wrapping if it would overwrite one of the parameters sent with the request, as that would interfere with reading the parameter directly from the top level `params` hash. The current implementation has logic for this case, but it doesn't handle `nil`/`false` values, which means these parameters: { "user" => nil } are transformed into this `params` hash: { "user" => { "user" => nil } } and `params["user"]` no longer returns the original parameter value.
* | | | Removed reference to unexisting methods:Edouard CHIN2017-06-231-2/+1
|/ / / | | | | | | | | | `get/post_via_redirect`, `xhr` and his alias `xml_http_request` were respectively removed in 092033d59f7e2b248f6c6ab6c0b67339c5e9f2df and eb52e5d42fbdc9288925a402dcb3c5664d1125b7
* / / Fix typo in `AC::UnfilteredParameters` message [ci skip]yuuji.yaginuma2017-06-231-2/+2
|/ / | | | | | | Ref: https://github.com/rails/rails/blob/33b596709388cc48d90ab6d1de99d7bd6e85f916/actionpack/lib/action_controller/metal/strong_parameters.rb#L52..L56
* | prepare for Minitest 6utilum2017-06-201-1/+1
| |
* | Merge pull request #27990 from leonelgalan/bug/filtered_parameters_classRafael França2017-06-193-2/+15
|\ \ | | | | | | Use of ParameterFilter no longer forces `request.filtered_parameters' class to be Hash
| * | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-06-1662-268/+511
| |\|
| * | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-05-1713-26/+77
| |\ \
| * \ \ Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-2522-93/+316
| |\ \ \
| * \ \ \ Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-0379-524/+1645
| |\ \ \ \
| * | | | | Fixes CodeClimate warningsLeonel Galan2017-02-131-2/+2
| | | | | |
| * | | | | Use of ParameterFilter no longer forces `request.filtered_parameters' class ↵Leonel Galan2017-02-133-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be Hash - Fixes issue described on #27944 - `filtered_query_string` used an Array representation of what semantically is a key value pair: better suited for a Hash. Without this change `filtered_params = original_params.class.new` returns an Array with unintended consequences.
* | | | | | Fix examples for `AC::Parameters#to_query` [ci skip]yuuji.yaginuma2017-06-191-1/+6
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without `permit`, `AC::Parameters#to_query` raise `AC::UnfilteredParameters`. ```ruby params = ActionController::Parameters.new({ name: "David", nationality: "Danish" }) params.to_query # => ActionController::UnfilteredParameters: unable to convert unpermitted parameters to hash ```
* | | | | Merge pull request #29451 from vipulnsward/29441-flatten-defaultRafael França2017-06-142-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Allow translate default option to accept an array similar to i18n.t
| * | | | | Allow translate default option to accept an array similar to i18n.t. Fixes ↵Vipul A M2017-06-152-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | #29441
* | | | | | Use `require_relative` instead of `require` with full pathbogdanvlviv2017-06-141-1/+1
|/ / / / /
* | | | | Fix formatting of AD::FileHandler and AD::Static doc [ci skip]yuuji.yaginuma2017-06-131-7/+7
| | | | |
* | | | | Merge pull request #29263 from assain/default_message_encryptor_to_gcmKasper Timm Hansen2017-06-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Default Message Encryptor Cipher to AES-256-GCM From AES-256-CBC
| * | | | | set message_encryptor default cipher to aes-256-gcmAssain2017-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Introduce a method to select default cipher, and maintain backward compatibility
* | | | | | Tiny documentation fixes [ci skip]Robin Dupret2017-06-061-3/+3
|/ / / / /
* | | | | Merge pull request #29294 from gsamokovarov/attributes-defaultKasper Timm Hansen2017-06-047-20/+10
|\ \ \ \ \ | | | | | | | | | | | | Introduce mattr_accessor default option
| * | | | | Use mattr_accessor default: option throughout the projectGenadi Samokovarov2017-06-037-20/+10
| | | | | |
* | | | | | Fix typo on error message when route definition is ambiguous.André Luis Leal Cardoso Junior2017-06-031-1/+1
| | | | | |
* | | | | | [ci skip] Fix typo in the system tests docsPrathamesh Sonpatki2017-06-031-1/+1
| | | | | |
* | | | | | Fix formatting of `direct` and `resolve` doc [ci skip]yuuji.yaginuma2017-06-031-14/+14
|/ / / / /
* | | | | SystemTesting::Driver can register capybara-webkit and poltergeistMario Alberto Chávez2017-06-024-9/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers. When using `driver_by` with capybara-webkit or poltergeist, SystemTesting::Driver will register the driver while passing `screen_size` and `options` parameteres. `options` could contain any option supported by the underlying driver.
* | | | | Merge pull request #29191 from ↵Kasper Timm Hansen2017-05-291-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/pass_params_filename_lineno_to_class_eval Pass params __FILE__ and __LINE__ + 1 if class_eval with <<
| * | | | | Pass params __FILE__ and __LINE__ + 1 if class_eval with <<bogdanvlviv2017-05-291-5/+5
| | | | | |
* | | | | | Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-299-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow a default value to be declared for class_attribute * Convert to using class_attribute default rather than explicit setter * Removed instance_accessor option by mistake * False is a valid default value * Documentation
* | | | | | Merge pull request #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-284-89/+181
|\ \ \ \ \ \ | | | | | | | | | | | | | | AEAD encrypted cookies and sessions