Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | 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. | |||||
| | | * | Merge branch 'master' of github.com:lifo/docrails | Ryan Bigg | 2011-04-05 | 25 | -76/+291 | |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 ... | |||||
| | | * | | Correct documentation on url_for. It doesn't call to_s, but rather to_param | Ryan Bigg | 2011-04-05 | 1 | -1/+4 | |
| | | | | | ||||||
| | * | | | Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵ | David Heinemeier Hansson | 2011-04-12 | 9 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | suggestion! | |||||
| | * | | | Fix failing test case on master | Prem Sichanugrist | 2011-04-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | It turned out that I overlook at some replacements .. | |||||
| | * | | | Using Object#in? and Object#either? in various places | Prem Sichanugrist | 2011-04-11 | 12 | -16/+29 | |
| | | | | | | | | | | | | | | | | | | | | 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?. | |||||
| | * | | | Make csrf_meta_tags use the tag helper | James Robinson | 2011-04-08 | 2 | -9/+9 | |
| | | | | | | | | | | | | | | | | | | | | Improved formatting of csrf_helper and improved test coverage | |||||
| | * | | | Merge branch 'master' of github.com:rails/rails | Aaron Patterson | 2011-04-07 | 2 | -4/+4 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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! | |||||
| | | * | | | Cache flash now | Santiago Pastorino | 2011-04-07 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | Revert "Use freeze instead of close!" | Santiago Pastorino | 2011-04-07 | 3 | -11/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af. | |||||
| | | * | | | Revert "Eagerly load Signed and Permanent cookies" | Santiago Pastorino | 2011-04-07 | 1 | -17/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit dffeda377021ba8691381195f5a2889f8e040b93. | |||||
| | | * | | | cookies here | Santiago Pastorino | 2011-04-07 | 1 | -3/+3 | |
| | | | | | | ||||||
| | | * | | | Eagerly load Signed and Permanent cookies | Santiago Pastorino | 2011-04-07 | 1 | -10/+17 | |
| | | | | | | ||||||
| | | * | | | Use freeze instead of close! | Santiago Pastorino | 2011-04-06 | 3 | -14/+11 | |
| | | | | | | ||||||
| | * | | | | many args does not make sense with the current implementation because of how ↵ | Aaron Patterson | 2011-04-06 | 1 | -10/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | `use` works | |||||
| | * | | | | getting the flash hash under test | Aaron Patterson | 2011-04-06 | 2 | -0/+104 | |
| | | | | | | ||||||
| | * | | | | favor composition over inheritance, have FlashHash delegate to a Hash | Aaron Patterson | 2011-04-06 | 2 | -11/+44 | |
| | |/ / / | ||||||
| | * | | | CookieJar should prefer composition over inheritance | Aaron Patterson | 2011-04-06 | 1 | -6/+10 | |
| | | | | | ||||||
| | * | | | Delete useless arguments | Santiago Pastorino | 2011-04-06 | 1 | -6/+6 | |
| | | | | | ||||||
| | * | | | Delete useless env variable | Santiago Pastorino | 2011-04-06 | 1 | -9/+3 | |
| | | | | | ||||||
| | * | | | Add tests to verify that signed and permanent cookies raises if someone tries | Santiago Pastorino | 2011-04-06 | 1 | -0/+51 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | to modify the cookies when it was already streamed back to the client or converted to HTTP headers | |||||
| | * | | | Make process reuse the env var passed as argument | Santiago Pastorino | 2011-04-06 | 2 | -5/+12 | |
| | | | | | ||||||
| | * | | | raise if someone tries to modify the cookies when it was already streamed ↵ | Santiago Pastorino | 2011-04-06 | 2 | -0/+63 | |
| | | | | | | | | | | | | | | | | | | | | back to the client or converted to HTTP headers | |||||
| | * | | | Add ClosedError message to the initializer | Santiago Pastorino | 2011-04-06 | 3 | -5/+10 | |
| | | | | | ||||||
| | * | | | do not return html safe strings from auto_link | Aaron Patterson | 2011-04-05 | 2 | -7/+13 | |
| | | | | | ||||||
| | * | | | raise if someone tries to modify the flash when it was already streamed back ↵ | Santiago Pastorino | 2011-04-05 | 2 | -1/+69 | |
| | | |/ | | |/| | | | | | | | | | to the client or converted to HTTP headers | |||||
| | * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-03 | 12 | -24/+31 | |
| | |\ \ | ||||||
| | | * | | s/ERb/ERB/g (part II) | Akira Matsuda | 2011-04-03 | 1 | -2/+2 | |
| | | | | | ||||||
| | | * | | s/ERb/ERB/g | Akira Matsuda | 2011-04-03 | 7 | -12/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | | * | Fix grammar, formatting, and cross references | John Firebaugh | 2011-03-28 | 1 | -8/+8 | |
| | | | | ||||||
| | | * | Add docs for ActionController::Metal class methods | Gabriel Horner | 2011-03-28 | 1 | -1/+5 | |
| | | | | ||||||
| | * | | Bump up erubis to 2.7.0 | Santiago Pastorino | 2011-04-02 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Implicit actions named not_implemented can be rendered | Santiago Pastorino | 2011-04-02 | 3 | -2/+15 | |
| | | | | ||||||
| * | | | Unify sprockets config options | Joshua Peek | 2011-03-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 24 | -62/+344 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb | |||||
| * \ \ \ | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 6 | -2/+45 | |
| |\ \ \ \ | ||||||
| * | | | | | Seperate asset directories | Joshua Peek | 2011-03-29 | 8 | -16/+21 | |
| | | | | | | ||||||
| * | | | | | Rename option to config.asset_pipeline | Joshua Peek | 2011-03-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Change back to /assets prefix | Joshua Peek | 2011-03-29 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Only add fingerprints if perform_caching is on | Joshua Peek | 2011-03-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Copy use_sprockets config | Joshua Peek | 2011-03-29 | 2 | -2/+3 | |
| | | | | | | ||||||
| * | | | | | Use sprockets helpers if config.use_sprockets is set | Joshua Peek | 2011-03-29 | 2 | -6/+22 | |
| | | | | | | ||||||
| * | | | | | Tests for SprocketsHelper | Joshua Peek | 2011-03-29 | 8 | -5/+104 | |
| | | | | | | ||||||
| * | | | | | Update sprockets path generation method | Joshua Peek | 2011-03-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Add SprocketsHelper | Joshua Peek | 2011-03-28 | 2 | -0/+79 | |
| | | | | | | ||||||
| * | | | | | Remove sprockets exception from main asset helpers | Joshua Peek | 2011-03-28 | 2 | -20/+0 | |
| | | | | | | ||||||
| * | | | | | Add sprockets md5s to asset tags | Joshua Peek | 2011-03-22 | 2 | -0/+20 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-03 | 10 | -32/+132 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | |