aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'actionmailer-cache'Rafael Mendonça França2016-02-245-69/+87
|\ \ \
| * | | Move private methods to the private visibilityRafael Mendonça França2016-02-241-10/+12
| * | | Move Caching module to Abstract ControllerRafael Mendonça França2016-02-235-14/+18
| * | | Remove unnecessarily included modules in ActionController::CachingStan Lo2016-02-231-1/+0
| * | | Move ActionMailer::Caching's content into ActionMailer::Base instead of inclu...Stan Lo2016-02-231-7/+6
| * | | Make caching configuration more flexibleStan Lo2016-02-232-7/+14
| * | | Move most caching methods to ActionDispatch::Caching, and let ActionMailer an...Stan Lo2016-02-232-54/+64
| * | | Move caching/fragments in ActionMailer and ActionController to action_dispatc...Stan Lo2016-02-232-6/+3
* | | | Fix `request.ssl?` bug with Action CableJon Moss2016-02-232-0/+13
|/ / /
* | | remove args from assert_nothing_raised in testsTara Scherner de la Fuente2016-02-221-1/+1
* | | Add `internal` attribute to routesJon Moss2016-02-224-4/+30
* | | Make sure we unregister the mime type before registeringRafael Mendonça França2016-02-221-10/+22
* | | Transform the mime object to symbol when registering the parsersRafael Mendonça França2016-02-223-5/+15
* | | Use symbol of mime type instead of object to get correct parserMehmet Emin İNAÇ2016-02-224-6/+22
* | | Make per form token work when method is not providedRafael Mendonça França2016-02-221-2/+16
* | | Merge pull request #23752 from vipulnsward/23524-fix-button_to_deleteRafael Mendonça França2016-02-221-48/+60
|\ \ \
| * | | Refactored Request Forgery CSRF PerFormTokensController tests and DRY'ed them...Vipul A M2016-02-221-70/+38
| * | | Fixed passing of delete method on button_to tag, creating wrong form csrf tokenVipul A M2016-02-211-0/+44
* | | | Fix typographical errorGustavo Villa2016-02-221-1/+1
* | | | Merge pull request #23682 from ShikChen/fast_strxorSantiago Pastorino2016-02-211-1/+2
|\ \ \ \
| * | | | Improve the performance of string xor operationshik2016-02-151-1/+2
* | | | | Merge pull request #23695 from kaspth/remove-automatic-collection-cachingKasper Timm Hansen2016-02-202-17/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make collection caching explicit.Kasper Timm Hansen2016-02-202-17/+6
* | | | | Deprecate AC::Parameters#== with a HashBenjamin Quorning2016-02-192-11/+18
* | | | | Fix AC::Parameters#== with other AC::ParametersBenjamin Quorning2016-02-192-3/+37
* | | | | Tests for AC::Parameters#==Benjamin Quorning2016-02-191-0/+6
* | | | | Fix master buildJon Moss2016-02-181-1/+1
|/ / / /
* | | | fields_for_style needs to test for AC::ParametersAaron Patterson2016-02-172-1/+22
* | | | partially revert 69009f4473637a44ade26d954ef5ddea6ff903f2Aaron Patterson2016-02-171-4/+1
* | | | Implement ActionController::Parameters#inspectBenjamin Quorning2016-02-172-1/+14
* | | | Merge pull request #23729 from maclover7/rm-unused-journeyRafael França2016-02-172-8/+0
|\ \ \ \
| * | | | Remove unused Journey codeJon Moss2016-02-172-8/+0
* | | | | Fix typoRafael Mendonça França2016-02-171-1/+1
* | | | | Merge pull request #23712 from bf4/incorrect_to_accept_json_api_and_not_rende...Rafael França2016-02-172-10/+3
|\ \ \ \ \
| * | | | | The JSON API media type should only work wih a JSON API handlerBenjamin Fleischer2016-02-162-10/+3
* | | | | | Fix code styleRafael Mendonça França2016-02-171-3/+4
| |/ / / / |/| | | |
* | | | | Merge pull request #23661 from meinac/add_gzip_mime_typeRichard Schneeman2016-02-163-1/+6
|\ \ \ \ \
| * | | | | application/gzip added as default mime type into mime type listMehmet Emin İNAÇ2016-02-133-1/+6
* | | | | | Merge pull request #23203 from vipulnsward/22979-show-tags-on-exceptionRichard Schneeman2016-02-161-7/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | WIP: Errors in logs should show log tags as well.Vipul A M2016-02-121-7/+11
* | | | | | Merge pull request #23692 from abhishekjain16/docsYves Senn2016-02-163-3/+3
|\ \ \ \ \ \
| * | | | | | Use a URL instead of an URL everywhereAbhishek Jain2016-02-153-3/+3
* | | | | | | Remove unused test controller actionAndrew White2016-02-161-5/+0
* | | | | | | Join values using '; ' as per RFC specAndrew White2016-02-161-1/+1
* | | | | | | Add require and move escape to private methodAndrew White2016-02-161-1/+6
* | | | | | | Move test for #22828 into it's own testAndrew White2016-02-161-2/+10
* | | | | | | Merge branch 'should-escape-cookie' of https://github.com/ma2gedev/rails into...Andrew White2016-02-162-1/+8
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Escape cookie's key and value in ActionController::TestCaseTakayuki Matsubara2015-12-302-1/+8
* | | | | | | Corrected secret_key_basevs4vijay2016-02-151-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Remove `const_missing` which fallback to deprecated `NEVER_UNPERMITTED_PARAMS`Ryuta Kamizono2016-02-152-16/+0
| |_|_|/ / |/| | | |