aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29958 from znz/file-nullMatthew Draper2017-08-021-1/+1
|\ | | | | Use File::NULL instead of "/dev/null"
| * Use File::NULL instead of "/dev/null"Kazuhiro NISHIYAMA2017-07-311-1/+1
| |
* | Merge pull request #29777 from yui-knk/set_content_typeMatthew Draper2017-08-021-3/+2
|\ \ | | | | | | Refactoring `Response#charset=`
| * | Brush up local variables assignmentyui-knk2017-07-131-3/+2
| | |
| * | Use `#set_content_type` instead of `#set_header`yui-knk2017-07-131-1/+1
| | | | | | | | | | | | | | | | | | By this commit, `#set_header` is called only via `#set_content_type`. This commit makes the role of `#charset=` more clear.
* | | Clarify route encoding testeileencodes2017-08-011-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this test changed in 9220935 I noticed that it really doesn't make sense anymore. I split the tests into 2 groups to explain what each one does. First these routes should throw a `bad_request` when the encoding isn't valid. We're expecting UTF8 encoding and passing binary, that should be a bad request. For the second test we are setting the `show` route to set `self.binary_params_for?` for that route which will convert the parameters and return a `:ok` instead of a `:bad_request`.
* | | Path parameters should default to UTF8eileencodes2017-08-015-14/+44
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the behavior such the path_params now default to UTF8 just like regular parameters. This also changes the behavior such that if a path parameter contains invalid UTF8 it returns a 400 bad request. Previously the behavior was to encode the path params as binary but that's not the same as query params. So this commit makes path params behave the same as query params. It's important to test with a path that's encoded as binary because that's how paths are encoded from the socket. The test that was altered was changed to make the behavior for bad encoding the same as query params. We want to treat path params the same as query params. The params in the test are invalid UTF8 so they should return a bad request. Fixes #29669 *Eileen M. Uchitelle, Aaron Patterson, & Tsukuru Tanimichi*
* | Use frozen string literal in actionpack/Kir Shatrov2017-07-29280-3/+560
| |
* | Fix search input's type & placeholder conflict in Routing Error pageKaan Kölköy2017-07-261-0/+4
| |
* | Merge pull request #29919 from kirs/actionpack-frozen-friendlyRafael França2017-07-249-10/+26
|\ \ | | | | | | Make actionpack frozen string friendly
| * | Make actionpack frozen string friendlyKir Shatrov2017-07-249-10/+26
| | |
* | | Merge pull request #29866 from rlue/masterRafael França2017-07-241-4/+4
|\ \ \ | | | | | | | | [API DOCUMENTATION] [MINOR] Correct description of ActionController::Parameters#delete
| * | | Fix typo in API docsRyan Lue2017-07-201-1/+1
| | | |
| * | | Correct API documentation for ActionController::Parameters#deleteRyan Lue2017-07-201-4/+4
| |/ /
* | | Merge pull request #29898 from ↵Rafael França2017-07-242-1/+27
|\ \ \ | | | | | | | | | | | | | | | | deivid-rodriguez/follow_up_to_multiple_location_engine_mounting Fix regression introduced by fixing mounting the same engine in multiple locations
| * | | Fix regression from multiple mountpoint supportDavid Rodríguez2017-07-242-1/+27
| |/ /
* / / Update rack-test dependency constraintDwight Watson2017-07-241-1/+1
|/ /
* | Merge pull request #29775 from yui-knk/assign_onceSean Griffin2017-07-181-2/+2
|\ \ | | | | | | Assign `content_type` only once
| * | Assign `content_type` only onceyui-knk2017-07-131-2/+2
| |/
* | Scrub the invalid paramter value before using it in the errorArthur Neves2017-07-172-2/+3
| | | | | | | | | | | | | | You should be able to safely use the String error message. So when finding the paramter has an invalid encoding we need to remove the invalid bytes before using it in the error. Otherwise the caller might get another Encoding error if they use the message.
* | `Response#charset=` uses `default_charset` when `nil` is passedyui-knk2017-07-131-1/+1
|/
* normalize_path used to be nil tolerantAkira Matsuda2017-07-122-0/+5
| | | | fixes a regression introduced at 8607c25ba7810573733d9b37d0015154ba059f5e
* [Action Pack] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-1116-0/+16
|
* Add backticks for class names in CHANGELOG [ci skip]Ryuta Kamizono2017-07-111-3/+3
|
* Add ActionController::Base.skip_forgery_protectionLisa Ugray2017-07-102-0/+39
| | | | | | 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-103-0/+22
| | | | | | | | 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-1015-17/+32
|\ | | | | Prepare AP and AR to be frozen string friendly
| * Prepare AP and AR to be frozen string friendlyKir Shatrov2017-07-0615-17/+32
| |
* | Don't call register on custom driverseileencodes2017-07-082-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-0211-31/+91
|\
| * Merge pull request #29566 from eugeneius/wrap_parameters_queryKasper Timm Hansen2017-07-022-7/+10
| |\ | | | | | | Don't wrap parameters if query parameter exists
| | * Don't wrap parameters if query parameter existsEugene Kenny2017-06-252-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-013-0/+58
| |\ \ | | | | | | | | Warning http verb method call in SystemTestCase
| | * | SystemTestCase undef some IntegrationTest methods because it's confused to use.yalab2017-07-013-0/+58
| | | |
| * | | 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.
* | | | | | [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
|/ / / / /