Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | removes reference to RJS from AC::RecordIdentifier docs | Xavier Noria | 2011-04-13 | 1 | -10/+4 | |
| | ||||||
* | removes the RJS template handler | Xavier Noria | 2011-04-13 | 1 | -4/+4 | |
| | ||||||
* | removes support for render :update | Xavier Noria | 2011-04-13 | 1 | -8/+1 | |
| | ||||||
* | Merge branch 'master' into sprockets | Joshua Peek | 2011-04-12 | 6 | -16/+61 | |
|\ | ||||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-12 | 1 | -2/+2 | |
| |\ | ||||||
| | * | removed :nodoc: from ActionController::MimeResponds | Jo Liss | 2011-04-10 | 1 | -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 places | Prem Sichanugrist | 2011-04-11 | 1 | -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/docrails | Xavier Noria | 2011-04-03 | 4 | -4/+11 | |
| |\ | ||||||
| | * | s/ERb/ERB/g | Akira Matsuda | 2011-04-03 | 1 | -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 example | Jon Cooper | 2011-03-31 | 1 | -1/+1 | |
| | | | ||||||
| | * | Explain in the method doc that you need to call respond_to at the class ↵ | Amaia Castro | 2011-03-31 | 1 | -0/+3 | |
| | | | | | | | | | | | | level in order to use respond_with. | |||||
| | * | Add docs for ActionController::Metal class methods | Gabriel Horner | 2011-03-28 | 1 | -1/+5 | |
| | | | ||||||
| * | | Improve docs. | José Valim | 2011-03-31 | 1 | -0/+31 | |
| | | | ||||||
| * | | pass respond_with options to controller render when using a template for api ↵ | Josh Kalderimis | 2011-03-31 | 3 | -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 Kalderimis | 2011-03-31 | 1 | -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 Kalderimis | 2011-03-31 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | default response status and error messages should be returned Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | Unify sprockets config options | Joshua Peek | 2011-03-30 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 5 | -31/+66 | |
|\| | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb | |||||
| * | | Make action_method? public and change implicit rendering to override it instead. | José Valim | 2011-03-30 | 1 | -4/+2 | |
| | | | ||||||
| * | | Pass the proper method_name instead of hardcoding to action_name. | José Valim | 2011-03-29 | 1 | -8/+10 | |
| | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/implicit_render.rb | |||||
| * | | Dont call authenticate_or_request_with_http_basic twice | David Heinemeier Hansson | 2011-03-29 | 1 | -4/+2 | |
| | | | ||||||
| * | | Fix examples | David Heinemeier Hansson | 2011-03-28 | 1 | -1/+1 | |
| | | | ||||||
| * | | Added Base.http_basic_authenticate_with to do simple http basic ↵ | David Heinemeier Hansson | 2011-03-28 | 1 | -14/+16 | |
| |/ | | | | | | | authentication with a single class method call [DHH] | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-27 | 1 | -7/+6 | |
| |\ | ||||||
| | * | Proc objects for cache_path for caches_action no longer need controller ↵ | Ryan Bigg | 2011-03-26 | 1 | -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 Sichanugrist | 2011-03-28 | 2 | -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_pipeline | Joshua Peek | 2011-03-29 | 1 | -1/+1 | |
| | | ||||||
* | | Copy use_sprockets config | Joshua Peek | 2011-03-29 | 1 | -0/+1 | |
|/ | ||||||
* | Improve testing of cookies in functional tests: | Andrew White | 2011-03-06 | 1 | -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. Lechow | 2011-03-05 | 2 | -2/+2 | |
| | ||||||
* | Fix Action caching bug where an action that has a non-cacheable response ↵ | Cheah Chu Yeow | 2011-03-02 | 1 | -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::MS | Aaron Patterson | 2011-03-01 | 1 | -1/+1 | |
| | ||||||
* | Prepend the CSRF filter to make it much more difficult to execute ↵ | Michael Koziarski | 2011-02-23 | 1 | -1/+1 | |
| | | | | application code before it fires. | |||||
* | merges docrails | Xavier Noria | 2011-02-18 | 1 | -0/+37 | |
|\ | ||||||
| * | add some docs for ActionController::Renderers | Gabriel Horner | 2011-02-10 | 1 | -0/+37 | |
| | | ||||||
* | | Remove misleading reference to polymorphic_url. | José Valim | 2011-02-11 | 1 | -2/+0 | |
| | | ||||||
* | | Change the CSRF whitelisting to only apply to get requests | Michael Koziarski | 2011-02-08 | 1 | -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é Valim | 2011-02-08 | 1 | -1/+1 | |
| | | ||||||
* | | Allow page_cache_directory to be set as a Pathname | Andre Arko | 2011-02-06 | 1 | -1/+1 | |
|/ | | | | | | For example, page_cache_directory = Rails.root.join("public/cache") Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | revises a metal example | Xavier Noria | 2011-02-02 | 1 | -4/+4 | |
| | ||||||
* | copy-edits 2446b13 | Xavier Noria | 2011-02-02 | 1 | -14/+13 | |
| | ||||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-02 | 1 | -5/+55 | |
|\ | ||||||
| * | Provide documentation for ActionController::Metal | Bernerd Schaefer | 2011-02-02 | 1 | -5/+55 | |
| | | ||||||
* | | If I want to set respond_body to nil then it | Neeraj Singh | 2011-01-25 | 1 | -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 Fales | 2011-01-25 | 1 | -1/+5 | |
|/ | | | | | | exception [#6333 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | html_safe.to_str makes no sense | Santiago Pastorino | 2011-01-11 | 1 | -1/+1 | |
| | ||||||
* | ActionController::Base.helpers.sanitize ignores case in protocol | Timothy N. Tsvetkov | 2010-12-30 | 1 | -1/+1 | |
| | | | | | | [#6044 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-29 | 1 | -1/+1 | |
|\ | ||||||
| * | .erb => .html.erb | Akira Matsuda | 2010-12-25 | 1 | -1/+1 | |
| | | ||||||
* | | No need to symbolize these. | José Valim | 2010-12-27 | 1 | -2/+2 | |
| | |