aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17827 from rkh/rkh-fix-or-patternAaron Patterson2014-12-012-0/+7
|\ | | | | Fix OR in Journey patterns
| * make OR in journey patterns compile to a valid regular expressionKonstantin Haase2014-11-292-0/+7
| |
* | 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-292-8/+2
|\ \ | | | | | | Pure rack apps can be mounted with a name
| * | Pure rack apps can be mounted with a nameJean Boussier2014-11-292-8/+2
| | | | | | | | | | | | See https://github.com/rails/rails/commit/9b15828b5c347395b42066a588c88e5eb4e72279#commitcomment-8764492
* | | Pass symbol as an argument instead of a blockErik Michaels-Ober2014-11-2914-25/+23
| | |
* | | Bump required Ruby version to 2.1.0claudiob2014-11-281-1/+1
| |/ |/| | | | | | | | | | | | | | | [This article](http://weblog.rubyonrails.org/2014/8/20/Rails-4-2-beta1/#maintenance-consequences-and-rails-5-0) states that: > Rails 5.0 is in most likelihood going to target Ruby 2.2. Before the exact minimum version is fully decided, @arthurnn [suggests](https://github.com/rails/rails/pull/17830#issuecomment-64940383) that **at least** version 2.1.0 **must** be required by the `gemspec` files.
* | Start Rails 5 development :tada:Rafael Mendonça França2014-11-282-413/+4
|/ | | | | | | 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.
* Bump to rack 1.6.0.beta2Santiago Pastorino2014-11-271-1/+1
|
* 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-273-4/+37
|\ | | | | | | Allow authentication header to not have to specify 'token=' key.
| * Allow authentication header to not have to specify 'token=' key.Guo Xiang Tan2014-10-102-4/+30
| | | | | | | | 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-252-1/+11
|\ \ \ | | | | | | | | Do not rescue Exception in ActionDispatch::ParamsParser
| * | | Do not rescue Exception in ParamsParserYuki Nishijima2014-11-232-1/+11
| |/ / | | | | | | | | | | | | Unlike ShowExceptions or PublicExceptions, ParamsParser shouldn't transform exceptions like Interrupt and NoMemoryError into ParserError.
* | | Use released rails-dom-testingRafael Mendonça França2014-11-251-1/+1
| | |
* | | 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
| | | |
* | | | Merge branch 'nil_script_name'Santiago Pastorino2014-11-252-1/+8
|\ \ \ \
| * | | | Add regression test case to ensure script_name as nil is not used anymore in ↵Santiago Pastorino2014-11-251-0/+7
| | | | | | | | | | | | | | | | | | | | url_for
| * | | | 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>
* | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-13 03:32:28 +0000