aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5-0-beta-sec'Aaron Patterson2016-01-255-5/+61
|\
| * bumping versionAaron Patterson2016-01-251-1/+1
| * allow :file to be outside rails root, but anything else must be inside the ra...Aaron Patterson2016-01-222-1/+38
| * stop caching mime types globallyAaron Patterson2016-01-221-2/+16
| * use secure string comparisons for basic auth username / passwordAaron Patterson2016-01-221-1/+6
* | Fix nodoc to internal class error document some of themVipul A M2016-01-251-1/+0
* | rm changelog for unreleased changes fixesVipul A M2016-01-221-4/+0
* | Merge pull request #23167 from maclover7/fix-21032Rafael França2016-01-213-1/+15
|\ \
| * | Fix `ActionController::Parameters#==` bugJon Moss2016-01-213-1/+15
* | | - Fix warning introduced in https://github.com/vipulnsward/rails/commit/77acc...Vipul A M2016-01-221-1/+3
* | | remove doc reference to ActionController::MimeResponds#respond_tosealocal2016-01-201-3/+0
* | | document simple example of ActionController::MimeResponds#respond_tosealocal2016-01-201-1/+9
* | | Re-add ActionController::ApiRenderingJon Moss2016-01-204-1/+39
|/ /
* | Merge pull request #23140 from rails/fix-search-for-custom-routesAaron Patterson2016-01-202-14/+83
|\ \
| * | Fix marking of custom routes for JourneyAndrew White2016-01-202-14/+83
* | | Merge pull request #17573 from zerothabhishek/masterGodfrey Chan2016-01-205-10/+18
|\ \ \ | |/ / |/| |
| * | Response etags to always be weak: Prefixed W/ to value returned by ActionDisp...abhishek2016-01-205-10/+18
* | | Revert "Remove literal? check to fix issue with prefixed optionals"eileencodes2016-01-202-13/+1
|/ /
* | Revert "Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipp...schneems2016-01-192-2/+2
* | Merge pull request #23120 from vipulnsward/always-set-vary-for-static-assetsRichard Schneeman2016-01-192-2/+2
|\ \
| * | Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipped versi...Vipul A M2016-01-192-2/+2
* | | Link to docs instead of listing methodsschneems2016-01-191-5/+7
* | | Add methods to StrongParametersschneems2016-01-192-2/+9
* | | [close #23084] Deprecated StrongParametersschneems2016-01-192-0/+22
|/ /
* | Pass through AP CHANGELOG [ci skip]Vipul A M2016-01-181-2/+2
* | Remove literal? check to fix issue with prefixed optionalseileencodes2016-01-162-1/+13
* | Merge pull request #22985 from akshay-vishnoi/fix-typoRafael França2016-01-161-1/+1
|\ \
| * | test `include?`- fix typoAkshay Vishnoi2016-01-091-1/+1
* | | Fix typo in docs [ci skip]Rebecca Skinner2016-01-141-2/+2
* | | Space OddityAkira Matsuda2016-01-143-4/+4
* | | docs, formatting pass over changelogs. [ci skip]Yves Senn2016-01-131-4/+4
* | | do not run in parallel on travisAaron Patterson2016-01-121-1/+5
* | | remove `present?` callsAaron Patterson2016-01-121-4/+4
* | | monkey patch `recycle!` on to controllers onceAaron Patterson2016-01-121-4/+4
* | | Merge pull request #22935 from cllns/add-status-name-to-outputRafael França2016-01-125-17/+84
|\ \ \
| * | | Add both HTTP Response Code and Type to assertion messagesSean Collins2016-01-125-17/+84
* | | | Merge pull request #23035 from jkowens/fix-null-byteRafael França2016-01-122-1/+9
|\ \ \ \
| * | | | Prevent attempt to serve a request with a null byteJordan Owens2016-01-122-1/+9
* | | | | AC::Parameters#at_json: restore Rails 4.2’s valueclaudiob2016-01-122-1/+8
| |/ / / |/| | |
* | | | Commit before freezing the headersMatthew Draper2016-01-123-1/+29
* | | | Unneeded &block parametersAkira Matsuda2016-01-121-2/+2
* | | | Merge pull request #21181 from denisenkom/mypatchKasper Timm Hansen2016-01-101-0/+19
|\ \ \ \ | |_|/ / |/| | |
| * | | Test basic auth with symbols in login and passwordMikhail Denisenko2015-10-241-0/+19
* | | | [ci skip] Fix typo Renderering --> RenderingAkshay Vishnoi2016-01-091-1/+1
* | | | Fix typo in ActionPack CHANGELOG [ci skip]Prathamesh Sonpatki2016-01-081-1/+1
* | | | add gregBen Toews2016-01-071-1/+1
* | | | Better error message when running `rake routes` with CONTROLLER arg:Edouard CHIN2016-01-073-7/+64
* | | | Merge pull request #20109 from prathamesh-sonpatki/keep-only-one-rootKasper Timm Hansen2016-01-071-21/+21
|\ \ \ \
| * | | | Kept overridden root method and removed original methodPrathamesh Sonpatki2016-01-071-21/+21
* | | | | Remove splat operator warning from ssl_testPrathamesh Sonpatki2016-01-071-1/+1