aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-0379-524/+1645
|\
| * Merge pull request #28606 from maclover7/jm-fix-25820Andrew White2017-03-304-1/+64
| |\
| | * Do not include default response headers for AC::MetalJon Moss2017-03-294-1/+64
| * | Merge pull request #28603 from mikeastock/alias-reverse-mergeSean Griffin2017-03-292-0/+18
| |\ \ | | |/ | |/|
| | * Add aliases for reverse_merge to with_defaultsMatt Casper2017-03-292-0/+18
| * | Add test to make sure subclasses also get helpersRafael Mendonça França2017-03-291-0/+16
| |/
| * Make `driven_by` overridableFumiaki MATSUSHIMA2017-03-292-6/+13
| * Merge pull request #28514 from y-yagi/follow_up_to_28056Andrew White2017-03-281-8/+10
| |\
| | * Fix store accessors in parameters testyuuji.yaginuma2017-03-221-8/+10
| * | Make sure that ActionController::Api can include helpersRafael Mendonça França2017-03-271-0/+26
| * | 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-222-410/+3
| | |/ | |/|
| * | Merge pull request #28056 from sngeth/wrap_store_accessors_in_paramsRafael França2017-03-212-1/+18
| |\ \
| | * | Wrap store accessors in parametersSid Ngeth2017-03-212-1/+18
| * | | Fix test assertionRafael Mendonça França2017-03-211-1/+1
| * | | Fix test that was asserting the wrong thingRafael Mendonça França2017-03-211-1/+1
| |/ /
| * | Revert "Merge pull request #27775 from domcleal/27774-format-reset"Rafael Mendonça França2017-03-212-15/+5
| * | 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-174-32/+48
| * | Merge pull request #28341 from mtsmfm/pass-options-to-driven-byRafael França2017-03-173-4/+6
| |\ \
| | * | Pass options to `driven_by`Fumiaki MATSUSHIMA2017-03-133-4/+6
| * | | 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-152-2/+62
| * | | Small grammar changeJon Moss2017-03-131-3/+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-123-1/+17
| |/ /
| * | Merge pull request #28378 from y-yagi/use_correct_variable_in_reverse_merge_testEileen M. Uchitelle2017-03-111-8/+4
| |\ \
| | * | Use correct value in `reverse_merge` testyuuji.yaginuma2017-03-111-8/+4
| * | | [docs] remove unnecessary sentenceHrvoje Šimić2017-03-111-4/+3
| | |/ | |/|
| * | Fix indentation and formatting in CHANGELOGs [ci skip]Ryuta Kamizono2017-03-111-2/+2
| |/
| * Add @takkanm credits in the changelog [ci skip]Rafael Mendonça França2017-03-101-1/+1
| * Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparametersRafael Mendonça França2017-03-103-0/+48
| |\
| | * Added `reverse_merge`/`reverse_merge!` to AC::Parameters:Edouard CHIN2017-03-093-0/+48
| * | Call system test driver per-instance rather than globallyeileencodes2017-03-097-42/+36
| * | Refactor system test driver/browsereileencodes2017-03-096-56/+35
| |/
| * Tests for delegated public methods on AC::ParametersT.J. Schuck2017-03-071-0/+63
| * params --> parametersJon Moss2017-03-071-2/+2
| * Document delegated public methods on AC::ParametersT.J. Schuck2017-03-071-0/+71
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 08:27:03 +0000