aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17827 from rkh/rkh-fix-or-patternAaron Patterson2014-12-012-0/+7
|\
| * 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 nameJean Boussier2014-11-292-8/+2
* | | 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
| |/ |/|
* | Start Rails 5 development :tada:Rafael Mendonça França2014-11-282-413/+4
|/
* 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
* Merge pull request #17186 from tgxworld/header_authentication_tokenMatthew Draper2014-11-273-4/+37
|\
| * Allow authentication header to not have to specify 'token=' key.Guo Xiang Tan2014-10-102-4/+30
* | 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 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 ParamsParserYuki Nishijima2014-11-232-1/+11
| |/ /
* | | 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 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
| * | | | sets script_name to always be a string.JONBRWN2014-11-251-1/+1
|/ / / /
* | | | 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
| | |/ / | |/| |
* | | | 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 errorsGenadi Samokovarov2014-11-243-0/+33
| |/ /
* | | Don't show the warning if we're already raising the error anywayGodfrey Chan2014-11-231-8/+13
* | | Deprecate `use_route` in controller testsGodfrey Chan2014-11-232-3/+24
* | | Deprecate passing an invalid name to `Formatter#generate`Godfrey Chan2014-11-231-0/+10
* | | Fix cases where the wrong name is passed to `Formatter#generate`Godfrey Chan2014-11-232-2/+2
|/ /
* | Test using `ActionController::TestCase` with enginesGodfrey Chan2014-11-231-0/+52
* | Merge pull request #17715 from tgxworld/fix_nil_anchorGodfrey Chan2014-11-223-1/+20
|\ \
| * | Anchor should not be appended when set to nil/false.Guo Xiang Tan2014-11-233-1/+20
* | | [ci skip] Fix comment of ActionDispatch::Callbacksyui-knk2014-11-231-1/+1
* | | Remove outdated comments [ci skip]Godfrey Chan2014-11-221-6/+0
|/ /
* | Wrap code snippets in +, not backticks, in sdocclaudiob2014-11-202-5/+5
* | Wrap code snippets in +, not backticks, in sdocclaudiob2014-11-201-3/+3
* | Use request method instead of ActionDispatch::Request#request_method instead ...Ilya Katz2014-11-201-1/+1
* | Make sure assert_select can assert body tagRafael Mendonça França2014-11-185-9/+30
* | 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 assertionsCalvin Correli2014-11-172-4/+20