aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
* remove .new from raise ActionController::UnknownFormatSteven Soroka2012-05-061-1/+1
* Raise a rescuable exception when Rails doesn't know what to do with the forma...Steven Soroka2012-05-062-2/+4
* Use Hash#fetch instead of has_key? checkCarlos Antonio da Silva2012-05-041-1/+1
* Merge pull request #4445 from nragaz/role_based_params_wrappingJosé Valim2012-05-041-2/+3
* Improve assert_template layout checkingAlexey Vakhov2012-05-041-3/+15
* Fix assert_template :layout => nil assertionAlexey Vakhov2012-05-041-2/+5
* Fix assert_template assertion with :layout optionAlexey Vakhov2012-05-041-1/+1
* Merge pull request #6148 from twinturbo/head-fixJosé Valim2012-05-031-1/+21
|\
| * Remove content-length as welltwinturbo2012-05-031-2/+3
| * Make ActionController#head pass rack-linktwinturbo2012-05-031-1/+20
* | added proc evaluation for action cache's layout parameterNico2012-05-021-2/+4
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-012-2/+2
|\ \ | |/ |/|
| * Code-format references to config settingsMark Rushakoff2012-04-271-1/+1
| * More using <tt>x</tt> instead of +x+ when the latter renders improperly.Mark Rushakoff2012-04-271-1/+1
* | Merge pull request #6078 from lest/patch-4José Valim2012-04-301-18/+12
|\ \
| * | no need to dup options in send_dataSergey Nartimov2012-04-301-1/+1
| * | allow send_file/send_data to skip disposition header, closes #2973Sergey Nartimov2012-04-301-17/+11
* | | Merge pull request #6034 from willbryant/flash_must_not_load_session_on_every...Piotr Sarnacki2012-04-301-1/+0
|\ \ \ | |/ / |/| |
| * | fix the Flash middleware loading the session on every request (very dangerous...Will Bryant2012-04-281-1/+0
| |/
* | Add note about using 303 See Other for XHR requests other than GET/POSTAndrew White2012-04-301-0/+10
* | Fix controller_class_name for anonymous controllers.Michael Schuerig2012-04-291-1/+1
* | Merge pull request #6017 from larzconwell/remove_sanitize_dom_idJeremy Kemper2012-04-291-6/+1
|\ \
| * | Removed the sanitize_dom_id method because HTML5 doctype let's us use anythin...Larz Conwell2012-04-271-6/+1
* | | Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-291-6/+18
* | | Avoid calling content type multiple timesJosé Valim2012-04-291-4/+6
* | | Merge pull request #2321 from omjokine/masterJosé Valim2012-04-291-1/+4
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-0129-102/+134
| |\ \ \
| * | | | Change mimetype to Mime::JS if JSONP is usedOlli Jokinen2011-07-281-1/+4
* | | | | Merge session arg with existing session instead of overwritingAndrew White2012-04-281-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-282-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+Mark Rushakof2012-04-272-4/+4
* | | | remove unnecessary else statementVasiliy Ermolovich2012-04-261-3/+3
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-181-1/+1
|\ \ \
| * | | Fix HTML sanitizer allowed_css_properties commentAlexey Vakhov2012-04-131-1/+1
* | | | Remove obsolete codeAlexey Vakhov2012-04-121-3/+0
* | | | #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so op...Jeremy Kemper2012-04-121-1/+21
|/ / /
* | | Merge pull request #5748 from ai/no_type_in_html5Jeremy Kemper2012-04-081-1/+1
|\ \ \
| * | | Remove unnecessary in HTML 5 type attribute with default valueAndrey A.I. Sitnik2012-04-051-1/+1
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-051-0/+1
|\ \ \ \
| * | | | Add AC record identifier example with not-persisted objectAlexey Vakhov2012-04-051-0/+1
* | | | | Merge pull request #4446 from ayamomiji/patch-1José Valim2012-04-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | prevent the cache sweeper ignores NoMethodErrorayaya2012-03-291-1/+1
* | | | | Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-043-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-033-3/+3
* | | | | Fix AC responder exampleAlexey Vakhov2012-04-041-1/+1
* | | | | Remove non-obligatory params in AC respond_to examplesAlexey Vakhov2012-04-031-2/+2
|/ / / /
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-011-1/+0
|\ \ \ \
| * | | | CSRF messages are no longer controlled by 422.html because InvalidAuthenticit...Tony Primerano2012-03-281-1/+0
| |/ / /
* | | | Remove obsolete reader from AC::MethodNotAllowed exception classAlexey Vakhov2012-03-311-2/+0
* | | | Remove AC::RenderError class second declarationAlexey Vakhov2012-03-311-3/+0
|/ / /