Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added render :js for people who want to render inline JavaScript replies ↵ | David Heinemeier Hansson | 2008-11-01 | 1 | -0/+10 |
| | | | | without using RJS [DHH] | ||||
* | Ensure content type gets reset after render_to_string [#1182 state:resolved] | Joshua Peek | 2008-10-30 | 1 | -0/+10 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-10-30 | 2 | -1/+5 |
|\ | |||||
| * | Dup local assigns for partial collections so nil values doesn't get ↵ | Joshua Peek | 2008-10-30 | 2 | -1/+5 |
| | | | | | | | | overwritten [#1250 state:resolved] | ||||
* | | Fixed regex in redirect_to to fully support URI schemes [#1247 state:committed] | Seth Fitzsimmons | 2008-10-30 | 1 | -0/+10 |
|/ | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Proper API for reloading translations | David Heinemeier Hansson | 2008-10-29 | 1 | -2/+2 |
| | |||||
* | Ensure @content_for_* is checked before yielding to block in render :layout ↵ | Ryan Bates | 2008-10-28 | 3 | -0/+15 |
| | | | | | | [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Track rendered templates in stack so the current template can always be ↵ | Joshua Peek | 2008-10-28 | 2 | -0/+5 |
| | | | | accessed. Added ActionView::Base#template to access the template object. | ||||
* | modified current_page? to ignore extra parameters unless specified in options | Erik Andrejko | 2008-10-26 | 1 | -0/+10 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#805 state:committed] | ||||
* | Fixed bug with asset timestamping when using relative_url_root (Joe ↵ | David Heinemeier Hansson | 2008-10-26 | 1 | -0/+8 |
| | | | | Goldwasser) [#1265 status:committed] | ||||
* | Fix incorrect closing CDATA delimiter. Add tests for CDATA nodes. | Jeffrey Hardy | 2008-10-23 | 1 | -0/+15 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix that HTML::Node.parse would blow up on unclosed CDATA sections. | Jeffrey Hardy | 2008-10-23 | 2 | -0/+31 |
| | | | | | | | | If an unclosed CDATA section is encountered and parsing is strict, an exception will be raised. Otherwise, we consider the remainder of the line to be the section contents. This is consistent with HTML::Tokenizer#scan_tag. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Dont try to auto-set the etag based on the body if any freshness headers ↵ | David Heinemeier Hansson | 2008-10-21 | 1 | -5/+22 |
| | | | | have already been set [DHH/José Valim] | ||||
* | Let fresh_when actually do the head(:not_modified). Cleaner and we get the ↵ | David Heinemeier Hansson | 2008-10-21 | 1 | -3/+1 |
| | | | | filter halting for free then. | ||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-10-21 | 1 | -1/+9 |
|\ | |||||
| * | Ensure ActionView::Helpers::AssetTagHelper::AssetTag::Cache is cleared ↵ | Tim Harper | 2008-10-20 | 1 | -1/+9 |
| | | | | | | | | | | | | before loading so changes to asset files are picked up by the broswer [#1233 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Added stale?/fresh? and fresh_when methods to provide a layer of abstraction ↵ | David Heinemeier Hansson | 2008-10-21 | 1 | -11/+14 |
|/ | | | | above request.fresh? and friends [DHH] | ||||
* | Added inline builder yield to atom_feed_helper tags where appropriate (Sam ↵ | David Heinemeier Hansson | 2008-10-13 | 1 | -0/+30 |
| | | | | Ruby) [#8994 status:committed] | ||||
* | Add support for xml processing instructions in atom_feed_helper [#926 ↵ | Matthew M. Boedicker | 2008-10-13 | 1 | -0/+51 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Make sure named routes with parameters can be used in tests before a request ↵ | Eloy Duran | 2008-10-13 | 1 | -0/+1 |
| | | | | | | has been done. [#1208 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Allow use of :path_prefix and :name_prefix outside of namespaced routes. ↵ | Tom Stuart | 2008-10-08 | 1 | -0/+21 |
| | | | | | | [#1188 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Make sure last_modified! works with <= rather than just equality. | Michael Koziarski | 2008-10-07 | 1 | -0/+6 |
| | |||||
* | Ensure select_tag#name attribute uses [] when :multiple is true. [#1146 ↵ | Andrew Kaspick | 2008-10-07 | 1 | -1/+2 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Implement submit_to_remote as a wrapper around a more generic button_to_remote | Tarmo Tänav | 2008-10-07 | 1 | -3/+3 |
| | | | | | | | Removed the "return false" from submit_to_remote onclick end as button input elements have no default behavior to cancel. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix image_tag behavior on windows. [#1085 state:resolved] | madlep | 2008-10-06 | 1 | -0/+13 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure rescue_from handlers are respected inside tests. [#835 state:resolved] | Pratik Naik | 2008-10-04 | 1 | -24/+11 |
| | | | | | | Note : If you're not using rescue_from, you should overrider rescue_action_without_handler() method and not rescue_action(). Afterwards, you can set request.remote_addr to a non "0.0.0.0" value for testing the overridden behavior. | ||||
* | Fixed load path for actionmailer and activesupport tests to always load from ↵ | madlep | 2008-10-04 | 1 | -1/+1 |
| | | | | | | | | local lib files. [#983 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix etag! and last_modified! to work as advertised. | Michael Koziarski | 2008-09-30 | 1 | -1/+40 |
| | | | | Add tests too. | ||||
* | Add options to field_set_tag | Andrew Kaspick | 2008-09-29 | 1 | -0/+6 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1116 state:committed] | ||||
* | Fixed AssetTag cache with with relative_url_root [#1022 state:resolved] | Martin Rehfeld | 2008-09-22 | 1 | -0/+50 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Refactor AssetTagHelper and fix remaining threadsafe issues. | Joshua Peek | 2008-09-22 | 1 | -4/+10 |
| | |||||
* | Fixed missing template paths on exception [#1082 state:resolved] | Claudio Poli | 2008-09-20 | 2 | -1/+18 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Remove the country_select helper. | Michael Koziarski | 2008-09-18 | 1 | -1549/+0 |
| | | | | | | | | We're in no position to mediate disputes on this matter, and the previous change to use ISO 3166 has offended just as many people as the ad-hoc list did. If you want the old list back you can install the plugin: ruby script/plugin install git://github.com/rails/country_select.git | ||||
* | Added support for http_only cookies in cookie_store Added unit tests for ↵ | Pelle Braendgaard | 2008-09-17 | 1 | -1/+52 |
| | | | | | | | secure and http_only cookies in cookie_store Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1046 state:committed] | ||||
* | Added ActionController::Translation module delegating to I18n #translate/#t ↵ | Sven Fuchs | 2008-09-10 | 1 | -0/+26 |
| | | | | | | and #localize/#l [status:committed #1008] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Added image_submit_tag confirm option [status:committed #784] | Alastair Brunton | 2008-09-10 | 1 | -0/+7 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | The FormTagHelper#submit_tag helper will now pass along the original value ↵ | Jose Fernandez | 2008-09-10 | 1 | -2/+2 |
| | | | | | | of the submit button to the params if the :disable_with option is used [status:committed #633] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Ensure routing optimizations are cleared when new routes are added [#981 ↵ | Matt Jones | 2008-09-07 | 1 | -0/+30 |
| | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Don't set Content-Length on 304 responses | Jonathan del Strother | 2008-09-02 | 1 | -0/+6 |
| | | | | | | | | | Commit 8aad8c claimed to do this, but it checks for the 304 status too early, before handle_conditional_get! has overridden it. [#958 state:resolved] Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, ↵ | Jeremy Kemper | 2008-08-31 | 4 | -8/+8 |
| | | | | | | | | | | but it has since been removed from 1.9. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> Conflicts: actionpack/test/controller/layout_test.rb | ||||
* | Fixes optimised named routes generating question mark followed by nothing ↵ | Luke Melia | 2008-08-31 | 1 | -0/+6 |
| | | | | | | | when provided an empty hash as the last argument. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#481 state:committed] | ||||
* | Moved layout exemption logic into the view | Joshua Peek | 2008-08-31 | 1 | -49/+0 |
| | |||||
* | Fix AM tests and add tests for rendering logging | Pratik Naik | 2008-08-31 | 1 | -0/+30 |
| | |||||
* | Move copying ivar logic from ActionController::Base to ActionView::Base | Pratik Naik | 2008-08-31 | 1 | -12/+12 |
| | |||||
* | Allow prototype functions to receive position parameter as a symbol. | miloops | 2008-08-30 | 1 | -0/+2 |
| | | | | | | [#887 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Add test to make sure RJS block inside controller is executed in view context | Pratik Naik | 2008-08-30 | 1 | -0/+13 |
| | |||||
* | Add support for shallow nesting of routes. [#838 state:resolved] | Pratik Naik | 2008-08-30 | 1 | -25/+109 |
| | | | | | | | | | | | | | | | | | | Adds :shallow option to resource route definition. If true, paths for nested resources which reference a specific member (ie. those with an :id parameter) will not use the parent path prefix or name prefix. Example : map.resources :users, :shallow => true do |user| user.resources :posts end * GET /users/1/posts (maps to PostsController#index action as usual) named route "user_posts" is added as usual. * GET /posts/2 (maps to PostsController#show action as if it were not nested) Additionally, named route "post" is added too. | ||||
* | Make assert_select_rjs code more readable, make use of unused constants and ↵ | miloops | 2008-08-29 | 1 | -0/+5 |
| | | | | | | | | use more simple Regexps. [#540 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Added button_to_remote helper | Tarmo Tänav | 2008-08-29 | 1 | -0/+13 |
| | | | | | | Ticket originally from http://dev.rubyonrails.org/ticket/3641 Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Ensure that calling content_tag_for in a helper doesn't cause duplicate output. | Tom Lea | 2008-08-29 | 1 | -0/+8 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#871 state:committed] |