aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20138 from tgxworld/deprecated_assert_templateRafael Mendonça França2015-06-012-188/+3
|\
| * Remove `assigns` and `assert_template`.Guo Xiang Tan2015-05-302-188/+3
* | Use `any?` rather than `present?` to check argseileencodes2015-05-311-1/+1
|/
* Remove unused code.Guo Xiang Tan2015-05-291-2/+0
* Deprecate `:nothing` option for render methodMehmet Emin İNAÇ2015-05-281-0/+1
* Merge pull request #19808 from byroot/action-parameterRafael Mendonça França2015-05-271-15/+12
|\
| * Allow to parameters named `action` or `controller` from AC::TestCase helpersJean Boussier2015-04-181-15/+12
* | Spelling/typo/grammatical fixes [ci skip]karanarora2015-05-234-5/+5
* | [ci skip] Remove comments about Rails 3.1claudiob2015-05-112-5/+4
* | Move `TemplateAssertions` to their own fileeileencodes2015-05-092-188/+189
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-05-081-1/+1
|\ \
| * | Add missing "of" to RequestForgeryProtection doc.Hendy Tanata2015-04-271-1/+1
* | | Give authentication methods the ability to customize response message.Keenan Brock2015-05-031-14/+16
* | | Use `args` instead of `*args` in `kwargs_request?` methodeileencodes2015-05-021-3/+3
* | | Updated request_forgery_protection docs [ci skip]Prathamesh Sonpatki2015-04-281-5/+6
| |/ |/|
* | remove extra `=` in form builder example [ci skip]yuuji.yaginuma2015-04-151-1/+1
* | Merge pull request #19757 from Strech/http-auth-realm-unquotingArthur Nogueira Neves2015-04-141-2/+2
|\ \
| * | Tiny optimization of http auth Realm unquotingStrech (Sergey Fedorov)2015-04-141-2/+2
| |/
* | Fix typos in the documentation [ci skip]Rafael Mendonça França2015-04-141-1/+1
* | Merge pull request #19736 from kmcphillips/masterRafael Mendonça França2015-04-142-0/+49
|\ \ | |/ |/|
| * Override default form builder for a controllerKevin McPhillips2015-04-132-0/+49
* | Add note regarding CSRF for APIs, as a use-case for skipping it [ci skip]Zachary Scott2015-04-121-0/+4
* | Apply comments from @jeremy regarding why HTML and Javascript requestsZachary Scott2015-04-121-0/+5
* | update request_forgery_protection docs [ci skip]Vladimir Lyzo2015-04-121-7/+8
* | Revert "Merge pull request #19682 from supercaracal/fix_force_ssl_redirection...Santiago Pastorino2015-04-122-6/+3
|/
* fix fails to force_ssl_redirection if session_store is disabledTaishi Kasuga2015-04-092-3/+6
* Merge pull request #19666 from mikej/masterSantiago Pastorino2015-04-061-1/+1
|\
| * fix missing "if" in API docs for ActionController::Parameters#permitMichael Josephson2015-04-061-1/+1
* | Fix ActionPack tests after changes to missing template loggereileencodes2015-04-061-1/+1
|/
* head no_content when there is no template or action performedStephen Bussey2015-04-051-1/+6
* Fix a few typos [ci skip]Robin Dupret2015-04-051-3/+3
* Freeze static arguments for gsubbrainopia2015-04-022-3/+3
* Prefer string patterns for gsubbrainopia2015-04-022-3/+3
* Merge pull request #19544 from shuhei/fix-parameters-const-missingXavier Noria2015-03-281-1/+1
|\
| * Return super in ActionController::Parameters.const_missingShuhei Kagawa2015-03-281-1/+1
* | Provide friendlier access to request variantsGeorge Claghorn2015-03-241-6/+7
|/
* Merge pull request #19291 from hired/return-truthy-value-from-headRafael Mendonça França2015-03-131-0/+2
|\
| * Return true from head methodJoel Hayhurst2015-03-121-0/+2
* | Use request.session.id instead of request.session_options[:id]Brian John2015-03-121-1/+1
|/
* Fix documentation of url_for module [ci skip]Prathamesh Sonpatki2015-03-061-1/+4
* Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
* Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
* Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
* Tiny documentation edits [ci skip]Robin Dupret2015-03-031-1/+1
* [ci skip] Add documentation for Helpers#all_helpers_from_pathAnton Davydov2015-03-031-0/+4
* Removed non-standard and unused require 'active_support/deprecation' from par...Vipul A M2015-02-271-1/+0
* Try only to decode stringsRafael Mendonça França2015-02-181-2/+4
* Merge pull request #18917 from lautis/non-string-csrf-tokenRafael Mendonça França2015-02-181-1/+1
|\
| * Handle non-string authenticity tokensVille Lautanala2015-02-121-1/+1
* | Tiny documentation edits [ci skip]Robin Dupret2015-02-151-3/+3