aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* allow reseting of request variantsTimo Schilling2014-12-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The current implementation of `variants=` don't allow a resetting to nil, wich is the default value. This results in the following code smell: ```ruby case request.user_agent when /iPhone/ request.variants = :phone when /iPad/ request.variants = :ipad end ``` With the ability to reset variants to nil, it could be: ```ruby request.variants = case request.user_agent when /iPhone/ :phone when /iPad/ :ipad end ```
* Don't convert empty arrays to nils when deep munging paramsChris Sinjakli2014-12-151-4/+0
|
* Merge pull request #18022 from agrobbin/url-helpers-optional-scopesSantiago Pastorino2014-12-131-1/+1
|\ | | | | Allow URL helpers to work with optional scopes
| * allow URL helpers to work with optional scopesAlex Robbin2014-12-131-1/+1
| |
* | ParameterFilter shouldn't try to dup symbol keysNate Berkopec2014-12-131-1/+1
|/
* Fix handling of positional url helper arguments when format is falseTatiana Soukiassian2014-12-131-2/+8
| | | | | | | There is no need to subtract one from the path_params size when there is no format parameter because it is not present in the path_params array. Fixes #17819.
* Only check that it is a Rails application onceRafael Mendonça França2014-12-081-5/+7
| | | | Also avoid using try since is_a? is faster for this case.
* Mounted Rack apps should have default named routes based on app nameT.J. Schuck2014-12-061-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression in 4.2.0 from 4.1.8. https://github.com/rails/rails/pull/17823 fixed a similar regression regarding _explicitly_ named routes for a mounted Rack app, but there was another regression for the default value. With a route like: Rails.application.routes.draw do mount Mountable::Web, at: 'some_route' end The "Prefix" column of rake routes gives the following: - 4.1.8: mountable_web - 4.2.0.beta1-4: [nothing] - 4.2.0.rc1: [nothing] - 4.2.0.rc2: some_route <- regression This fixes the default to go back to being based off the name of the class like the docs specify: https://github.com/rails/rails/blob/785d04e3109f69d0b9b9f4732179592f0ef04e52/actionpack/lib/action_dispatch/routing/mapper.rb#L558-L560 Explicitly named routes still work correctly per https://github.com/rails/rails/pull/17823: Rails.application.routes.draw do mount Mountable::Web, at: 'some_route', as: 'named' end - 4.1.8: named - 4.2.0.beta1-4: [nothing] - 4.2.0.rc1: [nothing] - 4.2.0.rc2: named
* remove unused `#optional_parts`Sergey Alekseev2014-12-051-4/+0
| | | | | This method was copied from journey at https://github.com/rails/rails/commit/56fee39c392788314c44a575b3fd66e16a50c8b5#diff-2cfaf53c860732fea8689d6f2002594bR78. `grep -nr 'optional_parts' .`
* remove unused `#generalized_table`Sergey Alekseev2014-12-051-45/+0
| | | | This method wass copied from journey at https://github.com/rails/rails/commit/56fee39c392788314c44a575b3fd66e16a50c8b5#diff-d89de8881fc4b9f10cb3e4fc7b2463f3R53. However it looks the method was unused in journey at those point as well.
* We don't need to call to_sym. Just compare the stringRafael Mendonça França2014-12-041-1/+1
|
* Merge pull request #17792 from rockrep/masterRafael Mendonça França2014-12-041-1/+1
|\ | | | | | | allow 'all' for :domain option in addition to :all
| * allow 'all' for :domain option in addition to :allrockrep2014-11-261-1/+1
| |
* | 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-298-15/+13
|/ /
* | Merge pull request #17803 from sadfuzzy/patch-2Abdelkader Boudih2014-11-271-1/+3
| | | | | | | | | | | | Update cookies.rb Conflicts: actionpack/lib/action_dispatch/middleware/cookies.rb
* | Refactor nested ifBruno Sutic2014-11-261-5/+3
| |
* | 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 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-201-3/+3
| | | | | | | | [ci skip]
* | Make sure assert_select can assert body tagRafael Mendonça França2014-11-182-2/+2
| | | | | | | | | | | | | | | | | | This reverts commit f93df52845766216f0fe36a4586f8abad505cac4, reversing changes made to a455e3f4e9dbfb9630d47878e1239bc424fb7d13. Conflicts: actionpack/lib/action_controller/test_case.rb actionview/lib/action_view/test_case.rb
* | 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