aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
* Fix incorrect assert_block -> assert conversion. Assumed too much from the Mi...Jeremy Kemper2012-05-171-2/+2
* MiniTest deprecated #assert_block in favor of calling #assert with a blockJeremy Kemper2012-05-171-1/+1
* Merge pull request #2237 from jackdempsey/log_redirect_toAaron Patterson2012-05-161-0/+1
|\
| * log at debug level what line caused the redirect_toJack Dempsey2012-05-161-0/+1
* | Removing ==Examples and last blank lines of docs from actionpackFrancesco Rodriguez2012-05-1510-34/+12
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-121-42/+44
|\ \
| * | Move HTTP Token auth docs above the Token moduleElia Schito2012-05-111-42/+44
* | | Move require to where it's neededSantiago Pastorino2012-05-111-0/+1
* | | remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_ac...Rafael Magana2012-05-101-1/+1
|/ /
* | If content_type is explicitly passed to the :head method use the value or fal...Kunal Shah2012-05-081-1/+2
* | 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