aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Changelog formatSean Griffin2014-11-241-2/+3
| | | | |
* | | | | Merge branch 'deprecate-string-options-in-url-helpers'Sean Griffin2014-11-243-1/+43
|\ \ \ \ \
| * | | | | Deprecate string options in URL helpersMelanie Gilman2014-11-243-1/+43
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/16958 [Byron Bischoff & Melanie Gilman]
* | | | | let mailer templates generate URLs by default [Xavier Noria, Richard Schneeman]Xavier Noria2014-11-242-2/+12
| |/ / / |/| | |
* | | | Merge pull request #17747 from gsamokovarov/missing-template-backtraceDavid Heinemeier Hansson2014-11-243-0/+33
|\ \ \ \ | | | | | | | | | | Show source view and backtrace on missing template errors
| * | | | Show source view and backtrace on missing template errorsGenadi Samokovarov2014-11-243-0/+33
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help you debug missing template errors, especially if they come from a programmatic template selection. Thanks to @dhh for suggesting that. As a bonus, also show request and response info on the routing error page for consistency.
* | | | Don't show the warning if we're already raising the error anywayGodfrey Chan2014-11-231-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the route set is empty, or if none of the routes matches with a score > 0, there is no point showing the deprecation message because we are already be raising the `ActionController::UrlGenerationError` mentioned in the warning. In this case it is the expected behavior and the user wouldn't have to take any actions.
* | | | Deprecate `use_route` in controller testsGodfrey Chan2014-11-232-3/+24
| | | | | | | | | | | | | | | | Reference #17453
* | | | Deprecate passing an invalid name to `Formatter#generate`Godfrey Chan2014-11-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal tests that (incorrectly) relied on this were already fixed in 938d130. However, we cannot simply fix this bug because the guides prior to b7b9e92 recommended a workaround that relies on this buggy behavior. Reference #17453
* | | | Fix cases where the wrong name is passed to `Formatter#generate`Godfrey Chan2014-11-232-2/+2
|/ / / | | | | | | | | | | | | These are currently working "by accident" because `match_route` does not check that the name is valid.
* | | Test using `ActionController::TestCase` with enginesGodfrey Chan2014-11-231-0/+52
| | | | | | | | | | | | | | | | | | Reference #17453 [Godfrey Chan, Washington Luiz]
* | | Merge pull request #17715 from tgxworld/fix_nil_anchorGodfrey Chan2014-11-223-1/+20
|\ \ \ | | | | | | | | Anchor should not be appended when set to nil/false.
| * | | Anchor should not be appended when set to nil/false.Guo Xiang Tan2014-11-233-1/+20
| | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/17714.
* | | | [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-185-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-172-4/+20
|\ \ \ | | | | | | | | Fix for assigns(:..) resetting template assertions
| * | | Fix for assigns(:..) resetting template assertionsCalvin Correli2014-11-172-4/+20
| | | | | | | | | | | | | | | | 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-164-10/+10
|\ \ \ \ | | | | | | | | | | Rename #source_extract to #source_extracts in ExceptionWrapper
| * | | | Rename #source_extract to #source_extracts in ExceptionWrapperGenadi Samokovarov2014-11-164-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | 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-163-31/+62
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #17614 from gsamokovarov/exception-wrapper-basic-testsSantiago Pastorino2014-11-141-0/+66
|\ \ \ \ | |/ / / |/| | | Add basic tests for ActionDispatch::ExceptionWrapper
| * | | Add basic tests for ActionDispatch::ExceptionWrapperGenadi Samokovarov2014-11-131-0/+66
| | | |
* | | | Make FlashHash#key? work with symbol and stringRafael Mendonça França2014-11-112-1/+10
| | | | | | | | | | | | | | | | 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_/'
* | | | | Remove useless `only_path: true` in path helpersGodfrey Chan2014-11-101-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We added a deprecation warning for these cases in aa1fadd, so these are now causing deprecation warnings in the test output. AFAICT, in these two cases, the option is not integral to the purpose of the test, so they can be safely removed
* | | | | Pass the route name explicitlyGodfrey Chan2014-11-102-1/+14
| |/ / / |/| | | | | | | | | | | | | | | | | | | 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-063-0/+41
|\ \ \ \ | | | | | | | | | | Remove session to allow `with_routing` to be called twice.
| * | | | Remove session to allow `with_routing` to be called twice.Guo Xiang Tan2014-11-053-0/+41
| | | | | | | | | | | | | | | | | | | | 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-302-3/+3
|\ \ \ | | | | | | | | Remove redundant `to_s` in interpolation
| * | | Remove redundant `to_s` in interpolationclaudiob2014-10-302-3/+3
| | | |
* | | | Merge branch 'master-sec'Aaron Patterson2014-10-302-4/+32
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * master-sec: FileHandler should not be called for files outside the root
| * | | FileHandler should not be called for files outside the rootAaron Patterson2014-10-102-4/+32
| |/ / | | | | | | | | | | | | 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-283-2/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]