aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* - Removed unused parameter to cookie serialize method and fixed usage of the ...Vipul A M2014-12-241-4/+4
* cleanup CHANGELOGs. [ci skip]Yves Senn2014-12-231-2/+2
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-12-201-0/+109
|\
| * Add docs for ActionDispatch::Http::URL methodsclaudiob2014-12-181-0/+109
* | Merge pull request #18102 from arthurnn/nodoc_constantArthur Nogueira Neves2014-12-191-0/+1
* | Use released rackGodfrey Chan2014-12-192-2/+2
* | Revert "Merge pull request #18003 from sikachu/permit_all_parameters-thread-s...Godfrey Chan2014-12-191-11/+6
* | Fix typo in nodoc should be `:nodoc:` for RDoc to parse correctlyZachary Scott2014-12-171-1/+1
* | Merge pull request #17995 from jethroo/fix/assert_template_with_unsupported_l...Rafael Mendonça França2014-12-162-0/+9
|\ \
| * | adding that assert_template with :layout will raise ArgumentError for unknown...Carsten Wirth2014-12-162-0/+9
* | | Merge pull request #18052 from timoschilling/reset_variantsRafael Mendonça França2014-12-162-1/+9
|\ \ \
| * | | allow reseting of request variantsTimo Schilling2014-12-162-1/+9
* | | | Remove misleading test: around_action return falseclaudiob2014-12-151-19/+1
|/ / /
* | / Don't convert empty arrays to nils when deep munging paramsChris Sinjakli2014-12-155-17/+15
| |/ |/|
* | Merge pull request #18022 from agrobbin/url-helpers-optional-scopesSantiago Pastorino2014-12-133-1/+17
|\ \
| * | allow URL helpers to work with optional scopesAlex Robbin2014-12-133-1/+17
* | | ParameterFilter shouldn't try to dup symbol keysNate Berkopec2014-12-132-3/+3
|/ /
* | Fix handling of positional url helper arguments when format is falseTatiana Soukiassian2014-12-133-2/+42
* | Merge pull request #18006 from sikachu/add-params-to_unsafe_hRafael Mendonça França2014-12-122-0/+12
|\ \
| * | Add AC::Parameters#to_unsafe_hPrem Sichanugrist2014-12-122-0/+12
| |/
* / Make AC::Params.permit_all_parameters thread safePrem Sichanugrist2014-12-121-1/+10
|/
* Only check that it is a Rails application onceRafael Mendonça França2014-12-081-5/+7
* Mounted Rack apps should have default named routes based on app nameT.J. Schuck2014-12-062-14/+43
* remove unused `#optional_parts`Sergey Alekseev2014-12-051-4/+0
* remove unused `#generalized_table`Sergey Alekseev2014-12-051-45/+0
* Typo: Hello = Guten Tag (in German)Tu Hoang2014-12-052-3/+3
* 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-042-1/+11
|\
| * allow 'all' for :domain option in addition to :allrockrep2014-11-262-1/+11
* | remove unused #await_closeSergey Alekseev2014-12-041-6/+0
* | Remove "rescue" clause around "require 'openssl'"claudiob2014-12-031-10/+1
* | Fix "nonexistent" typo in testsMelissa Xie2014-12-021-2/+2
* | Action View is needed for DebugExceptionsRafael Mendonça França2014-12-021-0/+2
* | Merge pull request #17873 from kirs/refactor-debug-erbRafael Mendonça França2014-12-024-23/+54
|\ \
| * | Refactor debug viewKir Shatrov2014-12-024-23/+54
* | | Merge pull request #17862 from lucasmazza/lm-hide-actionRafael Mendonça França2014-12-022-1/+4
|/ /
* | 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