aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add ActionController::Base.skip_forgery_protectionLisa Ugray2017-07-101-0/+9
| | | | | | Since we now default to `protect_from_forgery with: :exception`, provide a wrapper to `skip_before_action :verify_authenticity_token` for disabling forgery protection.
* Protect from forgery by defaultLisa Ugray2017-07-102-0/+12
| | | | | | | | Rather than protecting from forgery in the generated ApplicationController, add it to ActionController::Base by config. This configuration defaults to false to support older versions which have removed it from their ApplicationController, but is set to true for Rails 5.2.
* Merge pull request #29655 from kirs/frozen-friendly-ap-arMatthew Draper2017-07-109-10/+19
|\ | | | | Prepare AP and AR to be frozen string friendly
| * Prepare AP and AR to be frozen string friendlyKir Shatrov2017-07-069-10/+19
| |
* | Don't call register on custom driverseileencodes2017-07-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | It's possible for developers toadd a custom driver and then call it using `driven_by`. Because we were only skipping `register` for `:rack_test` that meant any custom driver would attempt to be registered as well. The three listed here are special because Rails registers them with special options. If you're registering your own custom driver then you don't want to separately register that driver. Fixes #29688
* | Allow mounting same engine under several locationsDavid Rodríguez2017-07-053-10/+20
| |
* | Fix endRafael Mendonça França2017-07-041-0/+1
| |
* | Load the Parameters configurations on the right timeRafael Mendonça França2017-07-041-7/+8
|/ | | | | | | We need to configure it only when ActionController::Base is loaded otherwise configs on initializers will not work. Closes #29527.
* Merge branch 'master' into require_relative_2017Xavier Noria2017-07-028-31/+45
|\
| * Merge pull request #29566 from eugeneius/wrap_parameters_queryKasper Timm Hansen2017-07-021-7/+2
| |\ | | | | | | Don't wrap parameters if query parameter exists
| | * Don't wrap parameters if query parameter existsEugene Kenny2017-06-251-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to avoid overwriting a query parameter with the wrapped parameters hash. Previously this was implemented by merging the wrapped parameters at the root level if the key already existed, which was effectively a no-op. The query parameter was still overwritten in the filtered parameters hash, however. We can fix that discrepancy with a simpler implementation and less unnecessary work by skipping parameter wrapping entirely if the key was sent as a query parameter.
| * | Merge pull request #29622 from yalab/warning_system_tesing_http_verbEileen M. Uchitelle2017-07-012-0/+26
| |\ \ | | | | | | | | Warning http verb method call in SystemTestCase
| | * | SystemTestCase undef some IntegrationTest methods because it's confused to use.yalab2017-07-012-0/+26
| | | |
| * | | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-02134-134/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
| * | | Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-02134-0/+134
| |\ \ \ | | | | | | | | | | | | | | | Enforce frozen string in Rubocop
| | * | | Enforce frozen string in RubocopKir Shatrov2017-07-01134-0/+134
| | |/ /
| * | | 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-011-18/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Properly register "custom" URL helpers as named helpers.
| | * | | | Properly register "custom" URL helpers as named helpers.Wilson Bilkovich2017-06-301-18/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | [Action Pack] require => require_relativeAkira Matsuda2017-07-011-1/+1
| | | | | |
* | | | | | [Action Controller] require => require_relativeAkira Matsuda2017-07-017-9/+9
| | | | | |
* | | | | | [Abstract Controller] require => require_relativeAkira Matsuda2017-07-012-2/+2
| | | | | |
* | | | | | [Action Dispatch] require => require_relativeAkira Matsuda2017-07-0127-57/+57
|/ / / / /
* / / / / Fix format of `ActionController::Parameters#to_s` doc [ci skip]yuuji.yaginuma2017-07-011-0/+1
|/ / / /
* | / / Fallback Parameters#to_s to Hash#to_sKir Shatrov2017-06-301-1/+8
| |/ / |/| | | | | Fixes https://github.com/rails/rails/issues/29617
* | | 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-271-0/+2
|\ \ \ | | | | | | | | Fix missing formats in route-set URLs
| * | | Fix missing formats in route-set URLsJonathan del Strother2017-06-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-241-1/+1
|\ \ \ | | | | | | | | Don't wrap parameters if key already exists
| * | | Don't wrap parameters if key already existsEugene Kenny2017-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #27990 from leonelgalan/bug/filtered_parameters_classRafael França2017-06-192-2/+2
|\ \ | | | | | | Use of ParameterFilter no longer forces `request.filtered_parameters' class to be Hash
| * | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-06-1632-101/+199
| |\|
| * | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-05-177-18/+36
| |\ \
| * \ \ Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-258-56/+98
| |\ \ \
| * \ \ \ Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-0360-176/+847
| |\ \ \ \
| * | | | | Use of ParameterFilter no longer forces `request.filtered_parameters' class ↵Leonel Galan2017-02-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
* | | | | Allow translate default option to accept an array similar to i18n.t. Fixes ↵Vipul A M2017-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | #29441
* | | | | 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
|/ / / / /