aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-258-56/+98
|\
| * Reuse the Parameters#to_h check in the routing helpersRafael Mendonça França2017-04-184-25/+5
| * Follow the style guide rules in the documetationRafael Mendonça França2017-04-181-30/+30
| * Improve documentationRafael Mendonça França2017-04-181-4/+4
| * Implement ActionController::Parameters#to_query and #to_paramRafael Mendonça França2017-04-181-2/+28
| * Add ActionController::Parameters#to_hash to implict conversionRafael Mendonça França2017-04-181-0/+16
| * Raise exception when calling to_h in a unfiltered ParametersRafael Mendonça França2017-04-181-2/+15
| * Use more specific check for :format in route pathAndrew White2017-04-181-1/+2
| * Add action_controller_api, action_controller_base on_load hookJulian Nadeau2017-04-102-0/+2
| * Improve logging when Origin header doesn't matchJon Leighton2017-04-061-1/+5
* | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-0360-176/+847
|\|
| * Merge pull request #28606 from maclover7/jm-fix-25820Andrew White2017-03-302-1/+7
| |\
| | * Do not include default response headers for AC::MetalJon Moss2017-03-292-1/+7
| * | Add aliases for reverse_merge to with_defaultsMatt Casper2017-03-291-0/+2
| |/
| * Make `driven_by` overridableFumiaki MATSUSHIMA2017-03-291-6/+5
| * Merge pull request #28528 from domcleal/parseerror-const-deprecationRafael França2017-03-221-1/+2
| |\
| | * Use DeprecatedConstantAccessor for AD::ParamsParser::ParseErrorDominic Cleal2017-03-221-1/+2
| * | Small grammar fixJon Moss2017-03-221-1/+1
| * | Small grammar fixJon Moss2017-03-221-2/+1
| |/
| * Merge pull request #28394 from shime/docs-action-dispatchXavier Noria2017-03-2231-96/+96
| |\
| | * [docs] fix ActionDispatch documentationHrvoje Šimić2017-03-1331-96/+96
| * | Start Rails 5.2 developmentMatthew Draper2017-03-221-2/+2
| * | Wrap store accessors in parametersSid Ngeth2017-03-211-1/+5
| * | Revert "Merge pull request #27775 from domcleal/27774-format-reset"Rafael Mendonça França2017-03-211-1/+0
| * | Always use original url_for when generating direct routesAndrew White2017-03-172-1/+9
| * | Add support for calling nested direct routes (#28462)Andrew White2017-03-173-24/+20
| * | Merge pull request #28341 from mtsmfm/pass-options-to-driven-byRafael França2017-03-172-3/+4
| |\ \
| | * | Pass options to `driven_by`Fumiaki MATSUSHIMA2017-03-132-3/+4
| * | | Bump Capybara and include Minitest::Assertionseileencodes2017-03-171-0/+2
| * | | Cleanup documentation fixes (#28460)Vipul A M2017-03-171-3/+3
| * | | Updates incorrect documentation [ci skip]Dmitriy Budnik2017-03-161-4/+3
| * | | Remove unnecessary params mungingAndrew White2017-03-151-2/+1
| * | | Fix Typo [ci skip]Olivier2017-03-131-1/+1
| * | | Fix HTTPS grammarJon Moss2017-03-131-4/+4
| * | | Merge pull request #28381 from shime/docs-action-controller-baseVipul A M2017-03-1321-55/+55
| |\ \ \
| | * | | [docs] fix ActionController documentationHrvoje Šimić2017-03-1221-55/+55
| * | | | Merge pull request #28185 from renchap/system-testing-screenshot-outputEileen M. Uchitelle2017-03-131-5/+34
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Dont always display inline screenshots in system testing (#28133)Renaud Chaput2017-03-111-5/+34
| | | |/ | | |/|
| * / | Fixes ActionController::Rendering#with_defaultsalpaca-tc2017-03-121-1/+1
| |/ /
| * / [docs] remove unnecessary sentenceHrvoje Šimić2017-03-111-4/+3
| |/
| * Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparametersRafael Mendonça França2017-03-101-0/+15
| |\
| | * Added `reverse_merge`/`reverse_merge!` to AC::Parameters:Edouard CHIN2017-03-091-0/+15
| * | Call system test driver per-instance rather than globallyeileencodes2017-03-093-11/+13
| * | Refactor system test driver/browsereileencodes2017-03-093-40/+24
| |/
| * params --> parametersJon Moss2017-03-071-2/+2
| * Document delegated public methods on AC::ParametersT.J. Schuck2017-03-071-0/+71
| * Fix malformed asset_url when rendering template with ActionController::RendererGiorgos Vrettos2017-03-061-0/+1
| * Merge pull request #28301 from y-yagi/fix_direct_with_params_exampleJon Moss2017-03-051-1/+1
| |\
| | * Fix `direct` with params example [ci skip]yuuji.yaginuma2017-03-061-1/+1
| * | Fix CI failure due to contain <U+2028>Ryuta Kamizono2017-03-061-2/+2