aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused requireRyuta Kamizono2017-09-011-2/+0
| | | | This is no longer used since 79a5ea9eadb4d43b62afacedc0706cbe88c54496.
* 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-291-7/+7
|\ | | | | | | | | 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-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-271-5/+9
|\ \ | | | | | | Retrive screenshot in relative path of current directory
| * | Retrive screenshot in relative path of current directoryyuuji.yaginuma2017-08-271-5/+9
| |/ | | | | | | | | | | | | | | | | | | 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-261-1/+1
|/ / | | | | | | | | | | | | | | | | | | 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
| |
* | Merge pull request #30121 from assain/add_expires_in_and_expires_at_to_cookiesKasper Timm Hansen2017-08-201-3/+15
|\ \ | | | | | | 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-201-3/+15
| |/
* | 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
| |
* | 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
* | Deprecate ActionDispatch::TestResponse response aliasesTrevor Wistaff2017-08-071-3/+21
| | | | | | | | https://github.com/rails/rails/issues/30072
* | 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.
* | | Path parameters should default to UTF8eileencodes2017-08-013-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-29125-2/+252
| |/ |/|
* | 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-242-2/+4
|\ \ | | | | | | Make actionpack frozen string friendly
| * | Make actionpack frozen string friendlyKir Shatrov2017-07-242-2/+4
| | |
* | | 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
| |/ /
* / / Fix regression from multiple mountpoint supportDavid Rodríguez2017-07-242-1/+27
|/ /
* | 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-171-1/+1
| | | | | | | | | | | | | | 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-121-0/+1
| | | | fixes a regression introduced at 8607c25ba7810573733d9b37d0015154ba059f5e
* [Action Pack] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-1110-0/+10
|
* 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.