aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* :scissors:Ryuta Kamizono2017-09-071-1/+1
| | | | [ci skip]
* fix type fully qualified [ci skip]Yauheni Dakuka2017-09-061-1/+1
|
* Merge pull request #30367 from ptoomey3/consistent-cache-control-headersAaron Patterson2017-09-053-8/+34
|\ | | | | Normalize/process Cache-Control headers consistently
| * Don't touch an unused headerPatrick Toomey2017-08-231-1/+0
| | | | | | | | | | | | The prior logic explictly set `Cache-Control` to `nil`. But, we would only reach that logic if the header was not set to begin with. So, rather than give it any value at all, just leave it alone.
| * Decouple the merge/normalization and conditional cache control logicPatrick Toomey2017-08-232-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prior logic was trying to do too many things at once. For all responses, we want to perform two distinct steps: * Merge/normalize the `Cache-Control` values found in HTTP headers and those found in the `@cache_control` hash. * Conditionally set a default `Cache-Control` header value when we have an ETag This change separates these concerns since the merge/normalize step should occur for all responses, but the second should only occur when we have already set an ETag/last modified value. Normally ETag middleware will set a default `Cache-Control`, but only if an existing ETag is not already set. So, in the cases where an ETag is set, we need to set the default `Cache-Control` value ourselves.
| * This constant is no longer usedPatrick Toomey2017-08-221-1/+0
| |
| * Let middleware handle default cache behaviorPatrick Toomey2017-08-221-1/+2
| |
| * Use equality in place of refute assertions for accuracyPatrick Toomey2017-08-221-4/+2
| |
| * Normalize/process Cach-Control headers consistentlyPatrick Toomey2017-08-222-3/+24
| | | | | | | | | | | | | | | | | | | | In the existing logic, the `Cache-Control` header may or may not get normalized by additional logic depending on whether `response.cache_conrol` has been modified. This leads to inconsistent behavior, since sometimes `Cache-Control` can contain whatever a user sets and sometimes it gets normalized, based on the logic inside of `set_conditional_cache_control!`. It seems like this normalization process should happen regardless to ensure consistent behavior.
* | This commit adds:Assain2017-09-042-4/+28
| | | | | | | | | | | | | | | | * Documentation for Duration support added to signed/encrypted cookies * Changelog entries for the duration support and expiry metadata added to cookies [ci skip]
* | Merge pull request #30493 from ↵Ryuta Kamizono2017-09-022-1/+13
|\ \ | | | | | | | | | | | | koic/fix_cant_modify_frozen_string_error_in_ac_rendering Fix `can't modify frozen String` error in AC::Rendering
| * | Fix `can't modify frozen String` error in AC::RenderingKoichi ITO2017-09-022-1/+13
| | |
* | | Replace unnecessary link with typewriter text [ci skip]Yoshiyuki Hirano2017-09-021-2/+2
| | |
* | | Remove unused requireRyuta Kamizono2017-09-011-2/+0
| | | | | | | | | | | | This is no longer used since 79a5ea9eadb4d43b62afacedc0706cbe88c54496.
* | | Unused variablesAkira Matsuda2017-09-011-2/+2
| | |
* | | Clarify intentions around method redefinitionsMatthew Draper2017-09-013-3/+5
|/ / | | | | | | | | | | | | | | | | Don't use remove_method or remove_possible_method just before a new definition: at best the purpose is unclear, and at worst it creates a race condition. Instead, prefer redefine_method when practical, and silence_redefinition_of_method otherwise.
* | Merge pull request #30433 from ↵Ryuta Kamizono2017-08-292-7/+45
|\ \ | | | | | | | | | | | | y-yagi/fix_cant_modify_forzen_string_error_in_debug_locks Fix `can't modify frozen String` error in `DebugLocks`
| * | Fix `warning: shadowing outer local variable`yuuji.yaginuma2017-08-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This fixes following warnings: ``` actionpack/lib/action_dispatch/middleware/debug_locks.rb:46: warning: shadowing outer local variable - threads ```
| * | Fix `can't modify frozen String` error in `DebugLocks`yuuji.yaginuma2017-08-282-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, `DebugLocks` middleware raises an error as follwing: ``` Puma caught this error: can't modify frozen String (RuntimeError) actionpack/lib/action_dispatch/middleware/debug_locks.rb:97:in `block in render_details' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `each' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `map' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `render_details' actionpack/lib/action_dispatch/middleware/debug_locks.rb:37:in `call' railties/lib/rails/engine.rb:524:in `call' ```
* | | Merge pull request #30421 from y-yagi/fix_30405Eileen M. Uchitelle2017-08-273-13/+39
|\ \ \ | | | | | | | | Retrive screenshot in relative path of current directory
| * | | Retrive screenshot in relative path of current directoryyuuji.yaginuma2017-08-273-13/+39
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails engine `Rails.root `returns the path of the dummy application. Therefore, there is no `tmp` directly where the test is running, so can not get the screenshot. For this reason, instead of directly specifying tmp, retrive screenshot by relative path from the current directory. Fixes #30405
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-08-261-1/+1
|\ \ \ | |/ / |/| |
| * | [ci skip] Fix a typoyui-knk2017-08-181-1/+1
| | | | | | | | | | | | We always plural form for `resources` method.
* | | Merge pull request #30418 from yhirano55/use_tt_in_doc_for_actionpackRyuta Kamizono2017-08-268-17/+17
|\ \ \ | | | | | | | | Use tt in doc for action_pack [ci skip]
| * | | Use tt in doc for ActionPack [ci skip]Yoshiyuki Hirano2017-08-268-17/+17
| | |/ | |/|
* / | Fix `can't modify frozen String` error in `display_image`yuuji.yaginuma2017-08-262-1/+16
|/ / | | | | | | | | | | | | | | | | | | Without this, `display_image` raises an error as follwing: ``` RuntimeError: can't modify frozen String rails/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb:72:in `display_image' rails/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb:40:in `block (2 levels) in <class:ScreenshotHelperTest>' ```
* | Update links to use https link instead of http [ci skip]Yoshiyuki Hirano2017-08-229-21/+21
| |
* | Update MIT licenses link [ci skip]Yoshiyuki Hirano2017-08-221-1/+1
| |
* | Merge pull request #30121 from assain/add_expires_in_and_expires_at_to_cookiesKasper Timm Hansen2017-08-203-5/+54
|\ \ | | | | | | Add expiry metadata to Cookies and freshen expires option to support duration
| * | freshen :expires option with duration support and add expiry metadata to cookiesAssain2017-08-203-5/+54
| |/
* | fix typo in ambiguous route definition error messageZoran Pesic2017-08-181-1/+1
| |
* | Use ssl in guide and comment [ci skip]Yoshiyuki Hirano2017-08-191-1/+1
| |
* | Fix RuboCop offensesKoichi ITO2017-08-166-28/+28
| | | | | | | | And enable `context_dependent` of Style/BracesAroundHashParameters cop.
* | Load Parameters configurations on :action_controller only onceAlberto Almagro2017-08-141-1/+1
|/ | | | Fixes regression ActionController::UnpermittedParameters not raised. The inner hook was being executed twice, once when ActionController::Base was loaded and again when ActionController::API was loaded. As options.delete operations inside the block are not idempotent, the second time it was run there was no configuration option available
* Merge pull request #29559 from kirs/eager-load-controller-actionsRafael França2017-08-111-0/+6
|\ | | | | Eager load controller actions to reduce response time of the first request
| * Eager load controller and mailer actionsKir Shatrov2017-07-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | On the first request, ActionController::Base#action_methods computes and memoized the list of available actions [1]. With this PR we move this expensive operation into eager load step to reduce response time of the first request served in production. This also reduces the memory footprint when running on forking server like Unicorn. [1] https://github.com/rails/rails/blob/a3813dce9a0c950a4af7909111fa730a2622b1db/actionpack/lib/abstract_controller/base.rb#L66-L77
* | Merge pull request #30104 from trev/deprecate-actiondispatch-testresponse-aliasRafael França2017-08-083-3/+36
|\ \ | | | | | | Deprecate ActionDispatch::TestResponse response aliases
| * | Deprecate ActionDispatch::TestResponse response aliasesTrevor Wistaff2017-08-073-3/+36
| | | | | | | | | | | | https://github.com/rails/rails/issues/30072
* | | Merge pull request #29767 from yui-knk/ac_testRafael França2017-08-081-7/+2
|\ \ \ | |/ / |/| | Remove needless restoring of `default_charset`
| * | Remove needless restoring of `default_charset`yui-knk2017-07-131-7/+2
| | | | | | | | | | | | | | | | | | `default_charset` is not changed in this test case, so we do not need to backup an original value and restore it.
* | | Lint actionpack/CHANGELOG.mdJon Moss2017-08-061-3/+3
| | | | | | | | | | | | | | | | | | Fixes a few grammar things. [ci skip]
* | | 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
| |