aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Action View is needed for DebugExceptionsRafael Mendonça França2014-12-021-0/+2
| | | | We should remove this dependency later.
* Merge pull request #17873 from kirs/refactor-debug-erbRafael Mendonça França2014-12-023-23/+31
|\ | | | | Refactor debug view
| * Refactor debug viewKir Shatrov2014-12-023-23/+31
| | | | | | Avoid logic in ERB and use helpers
* | Merge pull request #17862 from lucasmazza/lm-hide-actionRafael Mendonça França2014-12-021-0/+2
|/ | | | `_generate_paths_by_default` should always be private.
* Merge pull request #17827 from rkh/rkh-fix-or-patternAaron Patterson2014-12-011-0/+5
|\ | | | | Fix OR in Journey patterns
| * make OR in journey patterns compile to a valid regular expressionKonstantin Haase2014-11-291-0/+5
| |
* | Pretty-print request params on exception pageKir Shatrov2014-12-012-1/+9
| |
* | Merge pull request #17823 from byroot/fix-mount-rack-apps-with-asSean Griffin2014-11-291-7/+1
|\ \ | | | | | | Pure rack apps can be mounted with a name
| * | Pure rack apps can be mounted with a nameJean Boussier2014-11-291-7/+1
| | | | | | | | | | | | See https://github.com/rails/rails/commit/9b15828b5c347395b42066a588c88e5eb4e72279#commitcomment-8764492
* | | Pass symbol as an argument instead of a blockErik Michaels-Ober2014-11-2910-17/+15
| |/ |/|
* | Start Rails 5 development :tada:Rafael Mendonça França2014-11-281-3/+3
|/ | | | | | | We will support only Ruby >= 2.1. But right now we don't accept pull requests with syntax changes to drop support to Ruby 1.9.
* Merge pull request #17803 from sadfuzzy/patch-2Abdelkader Boudih2014-11-271-1/+3
| | | | | | Update cookies.rb Conflicts: actionpack/lib/action_dispatch/middleware/cookies.rb
* Merge pull request #17186 from tgxworld/header_authentication_tokenMatthew Draper2014-11-271-2/+9
|\ | | | | | | Allow authentication header to not have to specify 'token=' key.
| * Allow authentication header to not have to specify 'token=' key.Guo Xiang Tan2014-10-101-2/+9
| | | | | | | | Fixes: https://github.com/rails/rails/issues/17108.
* | Refactor nested ifBruno Sutic2014-11-261-5/+3
| |
* | Remove extra empty lineArtur Cygan2014-11-261-1/+0
| |
* | :scissors:Rafael Mendonça França2014-11-261-1/+1
| |
* | getting the location of the serverdilpreet922014-11-261-2/+2
| |
* | Merge pull request #17728 from jcutrell/jcutrell/docs-to_session_value-for-prRafael Mendonça França2014-11-251-3/+6
|\ \ | | | | | | Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_value
| * | adding nodoc to private methodsJonathan Cutrell2014-11-231-2/+2
| | |
| * | Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_valueJonathan Cutrell2014-11-231-1/+4
| | |
* | | Merge pull request #17733 from yuki24/do-not-rescue-exception-in-params-parserRafael Mendonça França2014-11-251-1/+1
|\ \ \ | | | | | | | | Do not rescue Exception in ActionDispatch::ParamsParser
| * | | Do not rescue Exception in ParamsParserYuki Nishijima2014-11-231-1/+1
| |/ / | | | | | | | | | | | | Unlike ShowExceptions or PublicExceptions, ParamsParser shouldn't transform exceptions like Interrupt and NoMemoryError into ParserError.
* | | CSS fix for the router visualizerBruno Sutic2014-11-251-4/+0
| | |
* | | Merge pull request #17753 from gsamokovarov/dont-center-routing-tableSantiago Pastorino2014-11-251-1/+1
|\ \ \ | | | | | | | | Don't center the routes table on routing errors
| * | | Don't center the routes table on routing errorsGenadi Samokovarov2014-11-241-1/+1
| | | |
* | | | sets script_name to always be a string.JONBRWN2014-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17615 #17616 when script_name is nil in the options hash, script_name is set to nil. options = {script_name: nil} script_name = options.delete(:script_name) {‘’} # => nil Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | | Merge branch 'deprecate-string-options-in-url-helpers'Sean Griffin2014-11-241-1/+17
|\ \ \ \
| * | | | Deprecate string options in URL helpersMelanie Gilman2014-11-241-1/+17
| | |/ / | |/| | | | | | | | | | | | | | | | | | 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-242-0/+6
|\ \ \ | | | | | | | | Show source view and backtrace on missing template errors
| * | | Show source view and backtrace on missing template errorsGenadi Samokovarov2014-11-242-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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-231-1/+22
| | | | | | | | | | | | 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
* | Merge pull request #17715 from tgxworld/fix_nil_anchorGodfrey Chan2014-11-221-1/+3
|\ \ | | | | | | Anchor should not be appended when set to nil/false.
| * | Anchor should not be appended when set to nil/false.Guo Xiang Tan2014-11-231-1/+3
| | | | | | | | | | | | 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-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.