Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removes ActionView::Helpers::ScriptaculousHelper | Xavier Noria | 2011-04-13 | 4 | -299/+2 |
| | |||||
* | removes the RJS template handler | Xavier Noria | 2011-04-13 | 3 | -19/+4 |
| | |||||
* | removes support for render :update | Xavier Noria | 2011-04-13 | 1 | -8/+1 |
| | |||||
* | let the default function in button_to_function be nil | Xavier Noria | 2011-04-13 | 1 | -1/+1 |
| | | | | | | | | I don't know which is the use case for button_to_function(name) but there's a test for it. I am focused now on RJS extraction and do not want to introduce a backwards incompatible change at this moment. Perhaps worth revisiting when the whole thing is done. | ||||
* | applies API guidelines to example | Xavier Noria | 2011-04-13 | 1 | -2/+2 |
| | |||||
* | removes support for RJS in button_to_function | Xavier Noria | 2011-04-13 | 1 | -25/+7 |
| | |||||
* | removes assert_select_rjs | Xavier Noria | 2011-04-13 | 1 | -139/+1 |
| | |||||
* | removes support for RJS in link_to_function | Xavier Noria | 2011-04-13 | 1 | -44/+9 |
| | |||||
* | jQuery is the new default | Xavier Noria | 2011-04-13 | 2 | -59/+71 |
| | |||||
* | Aligning comments | Matt Duncan | 2011-04-13 | 1 | -1/+1 |
| | |||||
* | Fixing distance_of_time_in_words range near 2 days | Matt Duncan | 2011-04-13 | 1 | -5/+5 |
| | |||||
* | Merge branch 'master' into sprockets | Joshua Peek | 2011-04-12 | 24 | -66/+198 |
|\ | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-12 | 3 | -4/+7 |
| |\ | |||||
| | * | Added missing </tt> | Oge Nnadi | 2011-04-11 | 1 | -1/+1 |
| | | | |||||
| | * | 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 | 15 | -65/+116 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 | 4 | -5/+5 |
| | | | | | | | | | | | | | | | | suggestion! | ||||
| * | | | Using Object#in? and Object#either? in various places | Prem Sichanugrist | 2011-04-11 | 5 | -7/+13 |
| | | | | | | | | | | | | | | | | 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 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | Improved formatting of csrf_helper and improved test coverage | ||||
| * | | | Merge branch 'master' of github.com:rails/rails | Aaron Patterson | 2011-04-07 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 | 2 | -5/+14 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af. | ||||
| | * | | | Revert "Eagerly load Signed and Permanent cookies" | Santiago Pastorino | 2011-04-07 | 1 | -17/+10 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit dffeda377021ba8691381195f5a2889f8e040b93. | ||||
| | * | | | Eagerly load Signed and Permanent cookies | Santiago Pastorino | 2011-04-07 | 1 | -10/+17 |
| | | | | | |||||
| | * | | | Use freeze instead of close! | Santiago Pastorino | 2011-04-06 | 2 | -14/+5 |
| | | | | | |||||
| * | | | | getting the flash hash under test | Aaron Patterson | 2011-04-06 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | favor composition over inheritance, have FlashHash delegate to a Hash | Aaron Patterson | 2011-04-06 | 1 | -7/+40 |
| |/ / / | |||||
| * | | | CookieJar should prefer composition over inheritance | Aaron Patterson | 2011-04-06 | 1 | -6/+10 |
| | | | | |||||
| * | | | Make process reuse the env var passed as argument | Santiago Pastorino | 2011-04-06 | 1 | -5/+4 |
| | | | | |||||
| * | | | raise if someone tries to modify the cookies when it was already streamed ↵ | Santiago Pastorino | 2011-04-06 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | 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 | 1 | -2/+2 |
| | | | | |||||
| * | | | raise if someone tries to modify the flash when it was already streamed back ↵ | Santiago Pastorino | 2011-04-05 | 1 | -1/+19 |
| | |/ | |/| | | | | | | | to the client or converted to HTTP headers | ||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-03 | 11 | -22/+29 |
| |\ \ | |||||
| | * | | 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 |
| | | | |||||
| * | | Implicit actions named not_implemented can be rendered | Santiago Pastorino | 2011-04-02 | 1 | -0/+2 |
| | | | |||||
| * | | 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 | 14 | -56/+117 |
|\| | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb | ||||
| * | | use assert_equal so we get normal error messages along with our custom ↵ | Aaron Patterson | 2011-03-30 | 1 | -3/+3 |
| | | | | | | | | | | | | failure message | ||||
| * | | Make action_method? public and change implicit rendering to override it instead. | José Valim | 2011-03-30 | 2 | -19/+20 |
| | | | |||||
| * | | Pass the proper method_name instead of hardcoding to action_name. | José Valim | 2011-03-29 | 2 | -9/+11 |
| | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/implicit_render.rb |