aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16570 from bradleybuda/breach-mitigation-mask-csrf-tokenJeremy Kemper2014-08-191-3/+65
|\
| * Auth token mask from breach-mitigation-rails gemBradley Buda2014-08-191-3/+65
* | Merge pull request #16299 from sikachu/ps-safer-ac-paramsJeremy Kemper2014-08-191-3/+84
|\ \
| * | User `#to_hash` instead of calling `super`Prem Sichanugrist2014-08-181-1/+1
| * | Fix failing test on several methods on ParameterPrem Sichanugrist2014-08-181-1/+25
| * | Refactor code to reduce duplicate `self.class.new`Prem Sichanugrist2014-08-181-12/+10
| * | Add missing `Hash` methods to `AC::Parameters`Prem Sichanugrist2014-08-181-0/+40
| * | Make `AC::Params#to_h` return Hash with safe keysPrem Sichanugrist2014-08-181-0/+19
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-191-2/+2
|\ \ \ | |/ / |/| |
| * | Uppercase HTML in docs.Hendy Tanata2014-08-082-9/+9
* | | Merge pull request #15889 from carnesmedia/model-nameRafael Mendonça França2014-08-171-1/+1
|\ \ \
| * | | Use #model_name on instances instead of classesAmiel Martin2014-06-241-1/+1
* | | | Merge branch 'master' into loofahRafael Mendonça França2014-08-177-531/+109
|\ \ \ \
| * | | | `responders` 1.x won't do it. Told you to RTFM for details!Godfrey Chan2014-08-171-3/+6
| * | | | The gem is called 'responders'Godfrey Chan2014-08-171-2/+2
| * | | | Raise a more helpful error for people who are using these extracted featuresGodfrey Chan2014-08-171-1/+16
| * | | | Move respond_with to the responders gemJosé Valim2014-08-172-528/+3
| * | | | When your templates change, browser caches bust automatically.Jeremy Kemper2014-08-173-6/+82
| | |_|/ | |/| |
| * | | Merge pull request #16027 from tgxworld/template_assertionsYves Senn2014-08-141-0/+9
| |\ \ \
| | * | | Fix assert_template for files.Guo Xiang Tan2014-08-141-0/+9
| * | | | [ci skip] correct default cache store classAditya Kapoor2014-08-131-1/+1
| |/ / /
* | | | Merge branch 'master' into loofahRafael Mendonça França2014-08-1210-92/+67
|\| | |
| * | | Pass block for logging.Guo Xiang Tan2014-08-091-4/+6
| * | | Remove ActionController::RaiseActionExceptions.Guo Xiang Tan2014-08-071-34/+0
| * | | refactor Redirecting so we do not need a controller instanceAaron Patterson2014-08-061-3/+5
| * | | avoid testing only_pathAaron Patterson2014-08-041-2/+1
| | |/ | |/|
| * | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-021-1/+2
| |\ \
| | * | copy edits[ci skip]Vijay Dev2014-08-021-3/+1
| | * | Performed Returns true if redirect/render has happenedGaurish Sharma2014-07-191-1/+4
| * | | just set the host, no need for another hash allocation / merge!Aaron Patterson2014-08-011-1/+1
| * | | Simplify code branch, remove #tapCarlos Antonio da Silva2014-07-311-7/+6
| * | | Avoid a new hash objectCarlos Antonio da Silva2014-07-311-1/+1
| * | | Fix protect_from_forgery docsDavid Albert2014-07-271-1/+1
| * | | docs, add ref where to find valid `head` status symbols.Yves Senn2014-07-251-0/+2
| * | | Bug fix for assert_template when opening a new session.Guo Xiang Tan2014-07-251-5/+9
| * | | Fix AC::TemplateAssertions instance variables not resetting.Guo Xiang Tan2014-07-211-5/+7
| * | | Prefer to pass block when logging.Guo Xiang Tan2014-07-181-25/+26
| * | | Don't accept parameters as argument for redirect to [via @homakov]Santiago Pastorino2014-07-161-0/+1
| |/ /
| * | Removed single space padding from empty response body.Godfrey Chan2014-07-101-6/+2
* | | We don't need loofah for the assertionsRafael Mendonça França2014-07-151-1/+0
* | | Merge pull request #11218 from kaspth/loofah-integrationRafael Mendonça França2014-07-101-0/+9
|\ \ \ | |/ / |/| |
| * | Moved html_document to ActionDispatch::Assertions. Included the Rails::Dom::T...Timm2014-06-161-6/+1
| * | Support for changes in SelectorAssertions.Timm2014-06-161-0/+14
| * | Moved ActionView::Assertions dependency from Action Pack's lib to abstract_un...Timm2014-06-161-2/+0
| * | Require ActionView::Assertions in ActionController test_case.rb.Timm2014-06-161-0/+1
| * | Moved Dom and Selector assertions from ActionDispatch to ActionView.Timm2014-06-161-0/+1
* | | Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into gcamp...Aaron Patterson2014-07-101-1/+1
|\ \ \
| * | | Address CVE-2014-4671 (JSONP Flash exploit)Greg Campbell2014-07-091-1/+1
* | | | Reduce number of subscriptions created.Guo Xiang Tan2014-07-081-17/+13
|/ / /
* | | Merge pull request #16013 from tgxworld/remove_symbolized_path_parametersRafael Mendonça França2014-07-041-1/+0
|\ \ \