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

5617 Commits

Author SHA1 Message Date
Matt Duncan
50b2eb8cbd Fixing another example result 2011-04-15 22:09:23 -04:00
Matt Duncan
1229904602 Removing incorrect example results 2011-04-15 21:56:01 -04:00
Matt Duncan
b6bfcc9115 Fix syntax error in example 2011-04-15 21:50:29 -04:00
Matt Duncan
f274394afb Fixing more spacing inconsistencies 2011-04-15 21:34:49 -04:00
Matt Duncan
e8afe4e1ea Making spacing consistent 2011-04-15 20:30:51 -04:00
Matt Duncan
004042c0d9 Fixing missing colon on symbol in example 2011-04-15 20:27:05 -04:00
Matt Duncan
7f98b544e3 Negative format example should use a negative number 2011-04-15 20:18:30 -04:00
Matt Duncan
6ddd4a3d95 Days are never approximated using 'about' 2011-04-15 20:08:11 -04:00
Matt Duncan
8ac365f476 Making example result match actual result 2011-04-15 20:03:52 -04:00
Matt Duncan
3ca6d0e8fe Including actual usage in example 2011-04-15 19:56:48 -04:00
Xavier Noria
3366479a9a Merge branch 'master' of git://github.com/lifo/docrails 2011-04-12 22:45:33 +02:00
David Heinemeier Hansson
d1575ae1b9 Change Object#either? to Object#among? -- thanks to @jamesarosen for the suggestion! 2011-04-12 00:23:07 +02:00
Oge Nnadi
d5634b2287 Added missing </tt> 2011-04-11 13:08:58 -07: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
James Robinson
2cdc1f0cd5 Make csrf_meta_tags use the tag helper 
Improved formatting of csrf_helper and improved test coverage
 2011-04-08 02:21:08 +02:00
Aaron Patterson
a7c5d40d80 Merge branch 'master' of github.com:rails/rails 
* 'master' of github.com:rails/rails:
  Cache flash now
  Revert "Use freeze instead of close!"
  Revert "Eagerly load Signed and Permanent cookies"
  cookies here
  Eagerly load Signed and Permanent cookies
  Use freeze instead of close!
 2011-04-07 09:35:24 -07:00
Santiago Pastorino
0e624ce9eb Cache flash now 2011-04-07 09:27:00 -03:00
Santiago Pastorino
03d561ad77 Revert "Use freeze instead of close!" 
This reverts commit 29592a7f09.
 2011-04-07 09:26:04 -03:00
Santiago Pastorino
5b0149a17a Revert "Eagerly load Signed and Permanent cookies" 
This reverts commit dffeda3770.
 2011-04-07 09:20:56 -03:00
Santiago Pastorino
dffeda3770 Eagerly load Signed and Permanent cookies 2011-04-07 09:15:28 -03:00
Aaron Patterson
32f876786a getting the flash hash under test 2011-04-06 18:01:03 -07:00
Aaron Patterson
76c2ea7882 favor composition over inheritance, have FlashHash delegate to a Hash 2011-04-06 17:26:55 -07:00
Santiago Pastorino
29592a7f09 Use freeze instead of close! 2011-04-06 20:53:48 -03:00
Aaron Patterson
0ca69ca65f CookieJar should prefer composition over inheritance 2011-04-06 16:27:05 -07:00
Santiago Pastorino
0e4748cd41 Make process reuse the env var passed as argument 2011-04-06 16:37:55 -03:00
Santiago Pastorino
0c5aded092 raise if someone tries to modify the cookies when it was already streamed back to the client or converted to HTTP headers 2011-04-06 15:47:58 -03:00
Santiago Pastorino
90ecad0bc9 Add ClosedError message to the initializer 2011-04-06 15:45:23 -03:00
Aaron Patterson
2e757bc298 do not return html safe strings from auto_link 2011-04-05 16:22:53 -07:00
Santiago Pastorino
d7a5638dfb raise if someone tries to modify the flash when it was already streamed back to the client or converted to HTTP headers 2011-04-05 10:41:34 -03:00
Ryan Bigg
92e6255b58 Merge branch 'master' of github.com:lifo/docrails 
* 'master' of github.com:lifo/docrails: (57 commits)
  Made the defaults section a little more readable and more to the point, giving a overview of the possibilities.
  Added information about default values
  added .'s to headings in the initialization textile page
  s/ERb/ERB/g (part II)
  s/ERb/ERB/g
  Bump up erubis to 2.7.0
  Implicit actions named not_implemented can be rendered
  Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0
  default_executable is deprecated since rubygems 1.7.0
  Trivial fix to HTTP Digest auth MD5 example
  Moved Turn activation/dependency to railties
  fix typo
  Direct logging of Active Record to STDOUT so it's shown inline with the results in the console [DHH]
  Add using Turn with natural language test case names if the library is available (which it will be in Rails 3.1) [DHH]
  require turn only for minitest
  Use Turn to format all Rails tests and enable the natural language case names
  Improve docs.
  pass respond_with options to controller render when using a template for api navigation
  only try to display an api template in responders if the request is a get or there are no errors
  when using respond_with with an invalid resource and custom options, the default response status and error messages should be returned
  ...
 2011-04-05 21:22:38 +10:00
Ryan Bigg
357578256f Correct documentation on url_for. It doesn't call to_s, but rather to_param 2011-04-05 21:22:10 +10: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
Santiago Pastorino
cc58fe79ac Implicit actions named not_implemented can be rendered 2011-04-02 23:47:50 -03: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
Aaron Patterson
58c3ec1b7b use assert_equal so we get normal error messages along with our custom failure message 2011-03-30 15:29:52 -07: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
Prem Sichanugrist
51551a0a5b Update the wildcard route to be non-greedy by default, therefore be able to match the (.:format) segment [#6605 state:resolved] 
After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
 2011-03-29 10:12:17 +01:00
John Firebaugh
07054fe369 Fix grammar, formatting, and cross references 2011-03-28 22:17:20 -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