aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Fix comment of ActionDispatch::Callbacksyui-knk2014-11-231-1/+1
| | | | cc ddce3dd
* Remove outdated comments [ci skip]Godfrey Chan2014-11-221-6/+0
| | | They were introduced in 23b6def; the serial stuff has been removed since a5d80f8
* Wrap code snippets in +, not backticks, in sdocclaudiob2014-11-202-5/+5
| | | | | | | | I grepped the source code for code snippets wrapped in backticks in the comments and replaced the backticks with plus signs so they are correctly displayed in the Rails documentation. [ci skip]
* Wrap code snippets in +, not backticks, in sdocclaudiob2014-11-201-3/+3
| | | | [ci skip]
* Use request method instead of ActionDispatch::Request#request_method instead ↵Ilya Katz2014-11-201-1/+1
| | | | of ActionDispatch::Request#method to pick up overrides by the middleware
* Make sure assert_select can assert body tagRafael Mendonça França2014-11-183-6/+6
| | | | | | | | | This reverts commit f93df52845766216f0fe36a4586f8abad505cac4, reversing changes made to a455e3f4e9dbfb9630d47878e1239bc424fb7d13. Conflicts: actionpack/lib/action_controller/test_case.rb actionview/lib/action_view/test_case.rb
* document_root_element need to be publicRafael Mendonça França2014-11-171-4/+4
|
* Merge pull request #17642 from tgxworld/fix_template_assertion_on_assignsRafael Mendonça França2014-11-171-3/+7
|\ | | | | Fix for assigns(:..) resetting template assertions
| * Fix for assigns(:..) resetting template assertionsCalvin Correli2014-11-171-3/+7
| | | | | | | | When calling assigns(:...) or cookies(:...), template assertions would be reset, which they obviously shouldn't be.
* | Merge pull request #17630 from gsamokovarov/exception-wrapper-source-extractGuillermo Iguaran2014-11-163-8/+8
|\ \ | | | | | | Rename #source_extract to #source_extracts in ExceptionWrapper
| * | Rename #source_extract to #source_extracts in ExceptionWrapperGenadi Samokovarov2014-11-163-8/+8
| | | | | | | | | | | | | | | It returns multiple source extracts since 1ed264bc. Also cleaned its result structure, as we no longer need the file in a code extract.
* | | Merge pull request #17639 from gsamokovarov/faster-exception-wrapper-tracesGuillermo Iguaran2014-11-161-2/+6
|\ \ \ | | | | | | | | Don't double check trace origin in ExceptionWrapper#traces
| * | | Don't double check trace origin in ExceptionWrapper#tracesGenadi Samokovarov2014-11-161-2/+6
| |/ / | | | | | | | | | | | | | | | If a trace isn't an application one, then it comes from a framework. That's the definition of framework trace. We can speed up the traces generation if we don't double check that.
* / / Don't show full trace on routing errorsGenadi Samokovarov2014-11-161-1/+1
|/ / | | | | | | | | | | | | | | | | | | Since dbcbbcf2bc58e8971672b143d1c52c0244e33f26 the full trace is shown by default on routing errors. While this is a nice feature to have, it does take the attention off the routes table in this view and I think this is what most of the people look for in this page. Added an exception to the default trace switching rule to remove that noise.
* / Don't let #{application,framework,full}_trace be nilGenadi Samokovarov2014-11-162-31/+31
|/ | | | | | Those three can be nil when exception backtrace is nil. This happens and that forced a couple of nil guards in the code. I'm proposing to make those always return an array, even on nil backtrace.
* Make FlashHash#key? work with symbol and stringRafael Mendonça França2014-11-111-1/+1
| | | | Closes #17586
* Merge pull request #16535 from bf4/patch-1Rafael Mendonça França2014-11-101-4/+4
|\ | | | | | | Allow fallback to LegacyKeyGenerator when secret_key_base is not set but secrets.secret_token is
| * `secret_token` is now saved in `Rails.application.secrets.secret_token`Benjamin Fleischer2014-11-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `secrets.secret_token` is now used in all places `config.secret_token` was - `secrets.secret_token`, when not present in `config/secrets.yml`, now falls back to the value of `config.secret_token` - when `secrets.secret_token` is set, it over-writes `config.secret_token` so they are the same (for backwards-compatibility) - Update docs to reference app.secrets in all places - Remove references to `config.secret_token`, `config.secret_key_base` - Warn that missing secret_key_base is deprecated - Add tests for secret_token, key_generator, and message_verifier - the legacy key generator is used with the message verifier when secrets.secret_key_base is blank and secret_token is set - app.key_generator raises when neither secrets.secret_key_base nor secret_token are set - app.env_config raises when neither secrets.secret_key_base nor secret_token are set - Add changelog Run focused tests via ruby -w -Itest test/application/configuration_test.rb -n '/secret_|key_/'
* | Pass the route name explicitlyGodfrey Chan2014-11-101-1/+2
| | | | | | | | | | | | Follow up to 212057b9. Since that commit, we need to pass the `route_name` explicitly. This is one of the left-over cases that was not handled in that commit, which was causing `use_route` to be ignored in functional tests.
* | Merge pull request #17523 from tgxworld/reset_session_after_calling_with_routingRafael Mendonça França2014-11-061-0/+4
|\ \ | | | | | | Remove session to allow `with_routing` to be called twice.
| * | Remove session to allow `with_routing` to be called twice.Guo Xiang Tan2014-11-051-0/+4
| | | | | | | | | | | | Fixes: https://github.com/rails/rails/issues/16814
* | | Removed documentation that still mentioned using respond_with in placeRobert Evans2014-11-052-18/+5
|/ / | | | | | | | | of respond_to. respond_with was moved into the responders gem and deprecated inside rails, so there is no need to mention it within rails itself.
* | Merge pull request #17480 from gsamokovarov/exception-wrapper-tracesRafael Mendonça França2014-11-042-29/+23
|\ \ | |/ |/| Move DebugExceptions#traces_from_wrapper to ExceptionWrapper
| * Move DebugExceptions#traces_from_wrapper to ExceptionWrapperGenadi Samokovarov2014-11-032-29/+23
| | | | | | | | | | ActionDispatch::ExceptionWrapper seems to be the more natural place for this method to live in.
* | Call gsub with a Regexp instead of a String for better performancePablo Herrero2014-11-011-1/+1
|/
* Prepare for 4.2.0.beta4 releaseGodfrey Chan2014-10-301-1/+1
|
* Merge pull request #17440 from claudiob/remove-yet-another-redundant-to-sXavier Noria2014-10-301-1/+1
|\ | | | | Remove redundant `to_s` in interpolation
| * Remove redundant `to_s` in interpolationclaudiob2014-10-301-1/+1
| |
* | Merge branch 'master-sec'Aaron Patterson2014-10-301-2/+12
|\ \ | |/ |/| | | | | * master-sec: FileHandler should not be called for files outside the root
| * FileHandler should not be called for files outside the rootAaron Patterson2014-10-101-2/+12
| | | | | | | | | | FileHandler#matches? should return false for files that are outside the "root" path.
* | edit pass over all warningsXavier Noria2014-10-286-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uniformizes warning messages. I used the most common style already present in the code base: * Capitalize the first word. * End the message with a full stop. * "Rails 5" instead of "Rails 5.0". * Backticks for method names and inline code. Also, converted a few long strings into the new heredoc convention.
* | let's warn with heredocsXavier Noria2014-10-283-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | The current style for warning messages without newlines uses concatenation of string literals with manual trailing spaces where needed. Heredocs have better readability, and with `squish` we can still produce a single line. This is a similar use case to the one that motivated defining `strip_heredoc`, heredocs are super clean.
* | Typos in the deprecation messageGodfrey Chan2014-10-281-2/+2
| |
* | Deprecate the `only_path` option on `*_path` helpers.Godfrey Chan2014-10-281-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | In cases where this option is set to `true`, the option is redundant and can be safely removed; otherwise, the corresponding `*_url` helper should be used instead. Fixes #17294. See also #17363. [Dan Olson, Godfrey Chan]
* | Merge pull request #16229 from byroot/stop-swallowing-url-generation-errorsAndrew White2014-10-271-1/+1
|\ \ | | | | | | UrlGenerationError are not catched as 404 anymore
| * | UrlGenerationError are not catched as 404 anymoreJean Boussier2014-10-271-1/+1
| | |
* | | Merge pull request #17362 from bronzle/fix_debug_exceptions_appRafael Mendonça França2014-10-263-25/+35
|\ \ \ | |/ / |/| | Show the user’s application in the source window and select the correct ...
| * | Show the user’s application in the source window and select the correct ↵Byron Bischoff2014-10-233-25/+35
| | | | | | | | | | | | trace list, closes #17312
* | | give a better error message for misspelled helpersXavier Noria2014-10-251-1/+11
| | | | | | | | | | | | | | | | | | See comment in this patch for the rationale. References #16468
* | | Use AS secure_compare for CSRF token comparisonGuillermo Iguaran2014-10-231-2/+2
|/ /
* | Merge pull request #17313 from accessd/fix-url-generation-error-messageRafael Mendonça França2014-10-211-1/+1
|\ \ | | | | | | Fix url generation error message
| * | fix url generation error messageAccessd2014-10-211-1/+1
| | |
* | | remove duplicate method (_status_code) in action_dispatchAbdelkader Boudih2014-10-192-4/+1
| | |
* | | Make _status_code methods nodocPrathamesh Sonpatki2014-10-192-4/+4
|/ / | | | | | | | | - Also one minor change for documenting url_for method in ActionController::Metal. [ci skip]
* | Replace (slower) block.call with (faster) yieldclaudiob2014-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance optimization: `yield` with an implicit `block` is faster than `block.call`. See http://youtu.be/fGFM_UrSp70?t=10m35s and the following benchmark: ```ruby require 'benchmark/ips' def fast yield end def slow(&block) block.call end Benchmark.ips do |x| x.report('fast') { fast{} } x.report('slow') { slow{} } end # => fast 154095 i/100ms # => slow 71454 i/100ms # => # => fast 7511067.8 (±5.0%) i/s - 37445085 in 4.999660s # => slow 1227576.9 (±6.8%) i/s - 6145044 in 5.028356s ```
* | Fix typo in actionpack/lib/action_dispatch/routing/mapper.rbYuutetu2014-10-161-1/+1
| |
* | Merge pull request #17255 from printercu/cors_exception_wrapperRafael Mendonça França2014-10-151-10/+11
|\ \ | | | | | | ActionController::InvalidCrossOriginRequest fails with 422 instead of 500
| * | ActionController::InvalidCrossOriginRequest fails with 422 instead of 500Max Melentiev2014-10-141-10/+11
| | | | | | | | | | | | Fixes #15967
* | | Use `#tr` instead of `#gsub`Nicolas Cavigneaux2014-10-141-1/+1
| | | | | | | | | | | | | | | `#tr` is more efficient than `#gsub` and can be used as a drop in replacement in this context.
* | | Improve Journey compliance to RFC 3986Nicolas Cavigneaux2014-10-141-5/+5
|/ / | | | | | | | | | | | | | | | | | | The scanner in Journey fails to recognize routes that use literals from the sub-delims section of RFC 3986. This commit enhance the compatibility of Journey with the RFC by adding support of authorized delimiters to the scanner. Fix #17212