aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Remove symbolized_path_parameters.Guo Xiang Tan2014-07-021-1/+0
* | | Merge pull request #16011 from xjlu/token_and_optionsRafael Mendonça França2014-07-041-1/+1
|\ \ \
| * | | Improve token_and_options regex and testXinjiang Lu2014-07-011-1/+1
| |/ /
* / / Change the JSON renderer to enforce the 'JS' Content TypeLucas Mazza2014-07-021-1/+4
|/ /
* | Merge pull request #15933 from rafael/masterRafael Mendonça França2014-06-272-5/+24
|\ \
| * | Improvements per code review.Rafael Chacón2014-06-271-4/+3
| * | Add always_permitted_parameters as an option.Rafael Chacón2014-06-262-5/+25
* | | `:nodoc: all` does not remove the constants from the API. [ci skip]Yves Senn2014-06-241-1/+1
* | | Merge pull request #15537 from tgxworld/fix_state_leakMatthew Draper2014-06-201-1/+0
|\ \ \
| * | | Prevent state leak.Guo Xiang Tan2014-06-051-1/+0
* | | | [ci skip] /javascript/ ~> JavaScriptAditya Kapoor2014-06-171-3/+3
* | | | Merge pull request #15692 from sromano/falseClassMatthew Draper2014-06-141-1/+6
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 17:07:40 +0000