aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into sprocketsJoshua Peek2011-04-126-16/+61
|\
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-121-2/+2
| |\
| | * removed :nodoc: from ActionController::MimeRespondsJo Liss2011-04-101-2/+2
| | | | | | | | | | | | | | | So we don't miss out on the nice documentation of the respond_to and respond_with instance methods. Also added :nodoc: to protected method.
| * | Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-111-2/+3
| |/ | | | | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-034-4/+11
| |\
| | * s/ERb/ERB/gAkira Matsuda2011-04-031-2/+2
| | | | | | | | | | | | | | | The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib. http://www2a.biglobe.ne.jp/~seki/ruby/erb.html
| | * Trivial fix to HTTP Digest auth MD5 exampleJon Cooper2011-03-311-1/+1
| | |
| | * Explain in the method doc that you need to call respond_to at the class ↵Amaia Castro2011-03-311-0/+3
| | | | | | | | | | | | level in order to use respond_with.
| | * Add docs for ActionController::Metal class methodsGabriel Horner2011-03-281-1/+5
| | |
| * | Improve docs.José Valim2011-03-311-0/+31
| | |
| * | pass respond_with options to controller render when using a template for api ↵Josh Kalderimis2011-03-313-5/+5
| | | | | | | | | | | | | | | | | | navigation Signed-off-by: José Valim <jose.valim@gmail.com>
| * | only try to display an api template in responders if the request is a get or ↵Josh Kalderimis2011-03-311-4/+9
| | | | | | | | | | | | | | | | | | there are no errors Signed-off-by: José Valim <jose.valim@gmail.com>
| * | when using respond_with with an invalid resource and custom options, the ↵Josh Kalderimis2011-03-311-1/+2
| | | | | | | | | | | | | | | | | | default response status and error messages should be returned Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Unify sprockets config optionsJoshua Peek2011-03-301-1/+1
| | |
* | | Merge branch 'master' into sprocketsJoshua Peek2011-03-305-31/+66
|\| | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb
| * | Make action_method? public and change implicit rendering to override it instead.José Valim2011-03-301-4/+2
| | |
| * | Pass the proper method_name instead of hardcoding to action_name.José Valim2011-03-291-8/+10
| | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/implicit_render.rb
| * | Dont call authenticate_or_request_with_http_basic twiceDavid Heinemeier Hansson2011-03-291-4/+2
| | |
| * | Fix examplesDavid Heinemeier Hansson2011-03-281-1/+1
| | |
| * | Added Base.http_basic_authenticate_with to do simple http basic ↵David Heinemeier Hansson2011-03-281-14/+16
| |/ | | | | | | authentication with a single class method call [DHH]
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-271-7/+6
| |\
| | * Proc objects for cache_path for caches_action no longer need controller ↵Ryan Bigg2011-03-261-7/+6
| | | | | | | | | | | | object, nor to use send when calling routing helpers
| * | Add controller-specific `force_ssl` method to force web browser to use HTTPS ↵Prem Sichanugrist2011-03-282-0/+36
| |/ | | | | | | | | | | | | | | protocol This would become useful for site which sometime transferring sensitive information such as account information on particular controller or action. This featured was requested by DHH.
* | Rename option to config.asset_pipelineJoshua Peek2011-03-291-1/+1
| |
* | Copy use_sprockets configJoshua Peek2011-03-291-0/+1
|/
* Improve testing of cookies in functional tests:Andrew White2011-03-061-1/+10
| | | | | | | | | - cookies can be set using string or symbol keys - cookies are preserved across calls to get, post, etc. - cookie names and values are escaped - cookies can be cleared using @request.cookies.clear [#6272 state:resolved]
* Action Pack typos.R.T. Lechow2011-03-052-2/+2
|
* Fix Action caching bug where an action that has a non-cacheable response ↵Cheah Chu Yeow2011-03-021-3/+5
| | | | | | | | | | always renders a nil response body. It now correctly renders the response body. Note that only GET and HTTP 200 responses can be cached. [#6480 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* prefer composition over inheritance with AD::MSAaron Patterson2011-03-011-1/+1
|
* Prepend the CSRF filter to make it much more difficult to execute ↵Michael Koziarski2011-02-231-1/+1
| | | | application code before it fires.
* merges docrailsXavier Noria2011-02-181-0/+37
|\
| * add some docs for ActionController::RenderersGabriel Horner2011-02-101-0/+37
| |
* | Remove misleading reference to polymorphic_url.José Valim2011-02-111-2/+0
| |
* | Change the CSRF whitelisting to only apply to get requestsMichael Koziarski2011-02-081-10/+9
| | | | | | | | | | | | | | | | Unfortunately the previous method of browser detection and XHR whitelisting is unable to prevent requests issued from some Flash animations and Java applets. To ease the work required to include the CSRF token in ajax requests rails now supports providing the token in a custom http header: X-CSRF-Token: ... This fixes CVE-2011-0447
* | Use Mime::Type references.José Valim2011-02-081-1/+1
| |
* | Allow page_cache_directory to be set as a PathnameAndre Arko2011-02-061-1/+1
|/ | | | | | For example, page_cache_directory = Rails.root.join("public/cache") Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* revises a metal exampleXavier Noria2011-02-021-4/+4
|
* copy-edits 2446b13Xavier Noria2011-02-021-14/+13
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-021-5/+55
|\
| * Provide documentation for ActionController::MetalBernerd Schaefer2011-02-021-5/+55
| |
* | If I want to set respond_body to nil then itNeeraj Singh2011-01-251-1/+1
| | | | | | | | | | | | | | should be nil and not [nil]. If anything other than nil then wrap it in array Signed-off-by: José Valim <jose.valim@gmail.com>
* | A patch so that http status codes are still included in logs even during an ↵Doug Fales2011-01-251-1/+5
|/ | | | | | exception [#6333 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* html_safe.to_str makes no senseSantiago Pastorino2011-01-111-1/+1
|
* ActionController::Base.helpers.sanitize ignores case in protocolTimothy N. Tsvetkov2010-12-301-1/+1
| | | | | | [#6044 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-291-1/+1
|\
| * .erb => .html.erbAkira Matsuda2010-12-251-1/+1
| |
* | No need to symbolize these.José Valim2010-12-271-2/+2
| |
* | #948 template_inheritanceartemave2010-12-261-2/+2
|/
* Edits to caching/fragments.Rizwan Reza2010-12-231-17/+39
|
* Fix respond_with example code so it makes senseWill2010-12-191-2/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 16:57:47 +0000