github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
21,651 Commits 34 Branches 105 Tags
9dfc2153270dcaa2f978ef52fbece99efc150bbc
Commit Graph

2759 Commits

Author SHA1 Message Date
Xavier Noria
3366479a9a Merge branch 'master' of git://github.com/lifo/docrails 2011-04-12 22:45:33 +02:00
Prem Sichanugrist
a9f3c9da01 Using Object#in? and Object#either? in various places 
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?.
 2011-04-11 03:17:09 +08:00
Jo Liss
c59456a1d9 removed :nodoc: from ActionController::MimeResponds 
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.
 2011-04-10 11:47:22 +02:00
Xavier Noria
3e24e9ebc2 Merge branch 'master' of git://github.com/lifo/docrails 2011-04-03 22:22:03 +02:00
Akira Matsuda
bd3cdeea35 s/ERb/ERB/g 
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
 2011-04-03 12:47:51 +09:00
Jon Cooper
c17b8e4047 Trivial fix to HTTP Digest auth MD5 example 2011-03-31 16:22:52 -07:00
José Valim
7a9dafd96c Improve docs. 2011-03-31 19:00:05 +02:00
Josh Kalderimis
b45302d767 pass respond_with options to controller render when using a template for api navigation 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-03-31 18:53:36 +02:00
Josh Kalderimis
48404a751d only try to display an api template in responders if the request is a get or there are no errors 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-03-31 18:53:27 +02:00
Josh Kalderimis
9766997f4c when using respond_with with an invalid resource and custom options, the default response status and error messages should be returned 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-03-31 18:53:21 +02:00
Amaia Castro
a64abdda25 Explain in the method doc that you need to call respond_to at the class level in order to use respond_with. 2011-03-31 13:19:19 +02:00
José Valim
ba51aa0b1b Make action_method? public and change implicit rendering to override it instead. 2011-03-30 17:22:05 +02:00
José Valim
94907035b6 Pass the proper method_name instead of hardcoding to action_name. 
Conflicts:

	actionpack/lib/action_controller/metal/implicit_render.rb
 2011-03-29 19:30:59 +02:00
David Heinemeier Hansson
e8d20b858d Dont call authenticate_or_request_with_http_basic twice 2011-03-29 07:29:10 -07:00
Gabriel Horner
cc446d6c9f Add docs for ActionController::Metal class methods 2011-03-28 23:48:45 -04:00
David Heinemeier Hansson
3d1e7c2645 Fix examples 2011-03-28 18:15:41 -07:00
David Heinemeier Hansson
e2b07ee000 Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH] 2011-03-28 18:10:08 -07:00
Xavier Noria
eea6a65488 Merge branch 'master' of git://github.com/lifo/docrails 2011-03-27 23:50:39 +02:00
Prem Sichanugrist
7cbdfa8303 Add controller-specific force_ssl method to force web browser to use HTTPS 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.
 2011-03-28 04:58:47 +08:00
Ryan Bigg
198f3883fa Proc objects for cache_path for caches_action no longer need controller object, nor to use send when calling routing helpers 2011-03-26 11:34:05 +11:00
Andrew White
31f09f9dbc Improve testing of cookies in functional tests: 
- 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]
 2011-03-06 12:49:44 +00:00
R.T. Lechow
87e9e3f9af Action Pack typos. 2011-03-05 11:56:35 +01:00
Cheah Chu Yeow
2ee5555744 Fix Action caching bug where an action that has a non-cacheable response 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>
 2011-03-02 13:11:07 -02:00
Aaron Patterson
648fd60ecf prefer composition over inheritance with AD::MS 2011-03-01 10:14:09 -08:00
Michael Koziarski
3d907a68d9 Prepend the CSRF filter to make it much more difficult to execute application code before it fires. 2011-02-23 09:00:41 +13:00
Xavier Noria
f41bf6938f merges docrails 2011-02-18 23:22:15 +01:00
José Valim
28185ebc2e Remove misleading reference to polymorphic_url. 2011-02-11 05:51:13 -08:00
Gabriel Horner
b3dad5deb9 add some docs for ActionController::Renderers 2011-02-10 00:16:06 -05:00
Michael Koziarski
ae19e4141f Change the CSRF whitelisting to only apply to get requests 
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
 2011-02-08 14:57:08 -08:00
José Valim
6b1018526f Use Mime::Type references. 2011-02-08 14:14:26 -08:00
Andre Arko
10cab35d3b Allow page_cache_directory to be set as a Pathname 
For example, page_cache_directory = Rails.root.join("public/cache")

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2011-02-06 17:55:38 -02:00
Xavier Noria
e99e859a04 revises a metal example 2011-02-02 23:27:27 +01:00
Xavier Noria
33643bcf53 copy-edits 2446b13 2011-02-02 23:04:12 +01:00
Xavier Noria
a96a9a4948 Merge branch 'master' of git://github.com/lifo/docrails 2011-02-02 22:04:11 +01:00
Bernerd Schaefer
2446b1307e Provide documentation for ActionController::Metal 2011-02-02 16:02:28 +01:00
Neeraj Singh
c1145d9281 If I want to set respond_body to nil then it 
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>
 2011-01-25 20:13:56 +01:00
Doug Fales
7927fc2ff7 A patch so that http status codes are still included in logs even during an exception [#6333 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-01-25 20:12:22 +01:00
Santiago Pastorino
a61e3acef2 html_safe.to_str makes no sense 2011-01-11 18:57:35 -02:00
Timothy N. Tsvetkov
e5b84fd723 ActionController::Base.helpers.sanitize ignores case in protocol 
[#6044 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-12-30 22:43:43 -02:00
Xavier Noria
69765aad8b Merge branch 'master' of git://github.com/lifo/docrails 2010-12-29 23:46:03 +01:00
José Valim
6b099975fa No need to symbolize these. 2010-12-27 09:30:36 +01:00
artemave
ddd85ef9c6 #948 template_inheritance 2010-12-26 22:32:15 -08:00
Akira Matsuda
4e50c6c08a .erb => .html.erb 2010-12-25 04:58:11 +09:00
Rizwan Reza
9dfa06acb4 Edits to caching/fragments. 2010-12-23 16:29:40 +03:30
Will
aebbbc78cc Fix respond_with example code so it makes sense 2010-12-19 14:16:54 +11:00
Will
1a6c4c86ea Correct deprecated AR usage in ActionController::MimeResponds documentation 2010-12-19 14:14:02 +11:00
Piotr Sarnacki
0e5ee9af48 Set proper engine's asset directories when assets are served from engine. 
When using stylesheet_link_tag(:all) or javascript_include_tag(:all),
assets directories are searched for css or js files. When
config.serve_static_assets is set to true, those files can be
served directly from engine's directories. That's why assets paths
should be set individually for controllers inside engine
if we want to serve static assets with ActionDispatch::Static
 2010-12-15 10:01:27 +01:00
Neeraj Singh
0027b65421 Ensure that while caching a page rails takes into 
account the resolved mime type for the request

[#6110 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-12-09 16:14:57 +01:00
José Valim
8e6d27641c Clean up asset_host and asset_path. 2010-12-09 13:40:45 +01:00
Xavier Noria
0aa78826e4 makes a pass to the action caching rdoc 2010-12-08 21:20:53 +01:00