aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* Fix sorting of helpers from different pathsPiotr Sarnacki2012-05-281-2/+2
| | | | | | | | | | | | | | | | When more than one directory for helpers is provided to a controller, it should preserver the order of directories. Given 2 paths: MyController.helpers_paths = ["dir1/helpers", "dir2/helpers"] helpers from dir1 should be loaded first. Before this commit, all helpers were mixed and then sorted alphabetically, which essentially would require to rename helpers to get desired order. This is a problem especially for engines, where you would like to be able to predict accurately which engine helpers will load first. (closes #6496)
* Escape the extension when normalizing the action cache path.Andrew White2012-05-201-2/+3
| | | | | | | | | Although no recognized formats use non-ASCII characters, sometimes they can be included in the :format parameter because of invalid URLS. To prevent encoding incompatibility errors we need to escape them before passing the path to URI.unescape. Closes #4379
* Raise ActionController::BadRequest for malformed parameter hashes.Andrew White2012-05-201-1/+4
| | | | | | | | | | | | | | Currently Rack raises a TypeError when it encounters a malformed or ambiguous hash like `foo[]=bar&foo[4]=bar`. Rather than pass this through to the application this commit captures the exception and re-raises it using a new ActionController::BadRequest exception. The new ActionController::BadRequest exception returns a 400 error instead of the 500 error that would've been returned by the original TypeError. This allows exception notification libraries to ignore these errors if so desired. Closes #3051
* Show in log correct wrapped keysDmitry Vorotilin2012-05-201-1/+2
|
* Make AC::LogSubscriber#send_file like #send_dataAlexey Vakhov2012-05-191-3/+1
|
* Fix incorrect assert_block -> assert conversion. Assumed too much from the ↵Jeremy Kemper2012-05-171-2/+2
| | | | MiniTest deprecation message.
* 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_to
| * 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
|\ \ | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| * | 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 ↵Rafael Magana2012-05-101-1/+1
|/ / | | | | | | LogSubscriber#process_action
* | If content_type is explicitly passed to the :head method use the value or ↵Kunal Shah2012-05-081-1/+2
| | | | | | | | fallback
* | 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 ↵Steven Soroka2012-05-062-2/+4
| | | | | | | | format, rather than responding with a head :not_acceptable (406)
* | 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
| | | | | | | | specify a role for identifying accessible attributes when wrapping params
* | 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
|\ \ | | | | | | Make ActionController#head pass rack-link
| * | 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
|\ \ \ | | | | | | | | allow send_file/send_data to skip disposition header, closes #2973
| * | | no need to dup options in send_dataSergey Nartimov2012-04-301-1/+1
| | | | | | | | | | | | | | | | options aren't modified inside send_file_headers!
| * | | allow send_file/send_data to skip disposition header, closes #2973Sergey Nartimov2012-04-301-17/+11
| | | |
* | | | Merge pull request #6034 from ↵Piotr Sarnacki2012-04-301-1/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | willbryant/flash_must_not_load_session_on_every_request_master Fix the Flash middleware loading the session on every request
| * | | fix the Flash middleware loading the session on every request (very ↵Will Bryant2012-04-281-1/+0
| |/ / | | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called
* | | Add note about using 303 See Other for XHR requests other than GET/POSTAndrew White2012-04-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE since version 6 and recently Chrome and Firefox have started following 302 redirects from XHR requests other than GET/POST using the original request method. This can lead to DELETE requests being redirected amongst other things. Although it doesn't directly affect the Rails framework since it doesn't return a 302 redirect to any non-GET/POST request a note has been added to raise awareness of the issue. Some references: Original article from @technoweenie: http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/ Hacker News discussion of the article: http://news.ycombinator.com/item?id=2903493 WebKit bug report: https://bugs.webkit.org/show_bug.cgi?id=46183 Firefox bug report and changeset: https://bugzilla.mozilla.org/show_bug.cgi?id=598304 https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d Chrome bug report: http://code.google.com/p/chromium/issues/detail?id=56373 HTTPbis bug report and changeset: http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160 http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428 Roy T. Fielding's history of the issue: http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html Automated browser tests for the issue: http://www.mnot.net/javascript/xmlhttprequest/ Fixes #4144
* | | 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
| * | | Removed the sanitize_dom_id method because HTML5 doctype let's us use ↵Larz Conwell2012-04-271-6/+1
| | | | | | | | | | | | | | | | anything except nothing and whitespace for id's
* | | | 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
|\ \ \ \ | | | | | | | | | | JSONP should use mimetype application/javascript
| * \ \ \ 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
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may break existing tests that are asserting the whole session contents but should not break existing tests that are asserting individual keys - e.g: class SomeControllerTest < ActionController::TestCase setup do session['user_id'] = 1 end test "some test" do get :some_action, nil, { 'another_var' => 2 } # This assertion will now fail assert_equal({ 'another_var' => 2 }, session) # This assertion will still pass assert_equal 2, session['another_var] end end Fixes #1529.
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter doesn't render as code in HTML output. Regex used in Rubymine to locate the latter form: (\+)(:*\w+:(?::|\w)+)(\+)
* | | | | 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 20:25:56 +0000