Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-07-03 | 150 | -4301/+2496 |
|\ | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_view/template/path.rb activesupport/lib/active_support/json/encoders/hash.rb | ||||
| * | Allow symbols on routes declaration (:controller and :action values) [#2828 ↵ | Jesús García Sáez | 2009-07-02 | 2 | -0/+11 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | ||||
| * | Removed unnecessary calls to image_path and hash lookups [#2827 state:resolved] | Yehuda Katz + Carl Lerche | 2009-07-02 | 1 | -3/+3 |
| | | |||||
| * | My suggestion to fix ticket 2401 [#2401 state:resolved] | Jarl Friis | 2009-07-02 | 2 | -4/+98 |
| | | | | | | | | Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | ||||
| * | Fixes a number of tests that inexplicably didn't fail when we committed the ↵ | Yehuda Katz + Carl Lerche | 2009-07-02 | 4 | -12/+12 |
| | | | | | | | | original patch | ||||
| * | Adds a video_tag helper for the HTML5 video tag (similar to how the ↵ | Tieg Zaharia | 2009-07-02 | 3 | -3/+110 |
| | | | | | | | | | | | | image_tag works) (tests included); removes a duplicate test line for image_tag; adds boolean attributes for video tag to tag()'s boolean attributes Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | ||||
| * | Patch FormTagHelper so that when a form tag is created, the div which holds ↵ | Elliot Winkler | 2009-07-01 | 1 | -2/+2 |
| | | | | | | | | | | | | the form authenticity token is set to display:inline [#2846 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | ||||
| * | Fix pattern to match various magic comment formats | Akira Matsuda | 2009-07-01 | 1 | -1/+1 |
| | | |||||
| * | Move mocha down below initial T::U require and bump version to 0.9.7 [#2858 ↵ | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -3/+0 |
| | | | | | | | | state:resolved] | ||||
| * | Accept Symbol for contoller name [#2855 state:resolved] | Yehuda Katz + Carl Lerche | 2009-07-01 | 2 | -1/+12 |
| | | | | | | Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | ||||
| * | Bump up the version to 3.0.pre | Carl Lerche | 2009-06-30 | 2 | -4/+4 |
| | | |||||
| * | Make text_area_tag escape contents by default. | Chris Mear | 2009-06-27 | 2 | -0/+17 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2015 state:committed] | ||||
| * | Make filter_parameters work correctly with array parameters. | Vicente Mundim | 2009-06-27 | 2 | -1/+6 |
| | | |||||
| * | Handle missing javascript/stylesheets assets by raising an exception | Christos Zisopoulos | 2009-06-26 | 6 | -34/+120 |
| | | | | | | | | | | | | | | | | | | | | | | | | An exception will be raised if a local javascript/stylesheet file included by the stylesheet_link_tag or javascript_include_tag can not be found. When caching is enabled, we use atomic_write to ensure that the cache file is not created with zero length. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2738 state:committed] | ||||
| * | Try speeding up rails booting | Yehuda Katz + Carl Lerche | 2009-06-25 | 2 | -3/+3 |
| | | |||||
| * | ignore absolute tmp directory | Joshua Peek | 2009-06-25 | 1 | -0/+1 |
| | | |||||
| * | send_data should set Content-Length as a string | Joshua Peek | 2009-06-25 | 2 | -2/+2 |
| | | |||||
| * | Remove deprecated implicit ivar assignment | Joshua Peek | 2009-06-25 | 2 | -33/+0 |
| | | |||||
| * | Missed file from the previous commit 92b229e1251d7d3578c3f73e8185972354e76436 | Pratik Naik | 2009-06-25 | 1 | -0/+15 |
| | | |||||
| * | Make performance tests work again | Pratik Naik | 2009-06-25 | 1 | -15/+0 |
| | | |||||
| * | Passes in 1.9 | Yehuda Katz + Carl Lerche | 2009-06-23 | 1 | -3/+3 |
| | | |||||
| * | Small changes to get 1.9 passing (for the most part) | Yehuda Katz | 2009-06-23 | 2 | -2/+2 |
| | | |||||
| * | Fix polymorphic_path doesn't modify options hash [#2099 state:resolved] | =?utf-8?q?Mislav=20Marohni=C4=87?= | 2009-06-21 | 2 | -5/+7 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Add content_for?(:name) helper to check if content_for(:name) is present ↵ | Darragh Curran | 2009-06-21 | 2 | -0/+37 |
| | | | | | | | | | | | | [#1311 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Minor ActionView cleanup | Yehuda Katz + Carl Lerche | 2009-06-18 | 2 | -8/+5 |
| | | |||||
| * | Fix typo | Yehuda Katz + Carl Lerche | 2009-06-18 | 1 | -1/+1 |
| | | |||||
| * | Use errors[field] instead of errors.on(field) | Jeremy Kemper | 2009-06-17 | 3 | -57/+20 |
| | | |||||
| * | Extract the layout proc into a method, and write documentation explaining ↵ | Yehuda Katz + Carl Lerche | 2009-06-17 | 2 | -9/+38 |
| | | | | | | | | what the proc does in various cases. | ||||
| * | Remove one more note about deprecated behavior | Yehuda Katz + Carl Lerche | 2009-06-17 | 1 | -3/+0 |
| | | |||||
| * | Drive the final stake through @content_for_*'s heart! | Yehuda Katz + Carl Lerche | 2009-06-17 | 8 | -36/+23 |
| | | |||||
| * | Cleaning up more tests and code that needed to work in both old and new base | Yehuda Katz + Carl Lerche | 2009-06-17 | 7 | -90/+37 |
| | | |||||
| * | Cleaning up if defined?(ActionController::Http) blocks from the pre new base ↵ | Yehuda Katz + Carl Lerche | 2009-06-17 | 7 | -90/+42 |
| | | | | | | | | era. | ||||
| * | Remove some defined?(Http) checks | Yehuda Katz + Carl Lerche | 2009-06-17 | 8 | -55/+16 |
| | | |||||
| * | Rename path.rb to resolver.rb | Yehuda Katz + Carl Lerche | 2009-06-17 | 3 | -2/+2 |
| | | |||||
| * | Rename ActionView::Template::Path ActionView::Resolver | Yehuda Katz + Carl Lerche | 2009-06-17 | 18 | -202/+164 |
| | | |||||
| * | Finish making pending tests pass | Yehuda Katz + Carl Lerche | 2009-06-17 | 2 | -7/+8 |
| | | |||||
| * | RJS doesn't render with an HTML layout by default | Yehuda Katz + Carl Lerche | 2009-06-17 | 2 | -5/+4 |
| | | |||||
| * | Fixing pending tests and fixed some formats / partial rendering semantics | Yehuda Katz + Carl Lerche | 2009-06-17 | 12 | -57/+74 |
| | | |||||
| * | Fix pending test about content-type | Yehuda Katz + Carl Lerche | 2009-06-17 | 1 | -5/+19 |
| | | |||||
| * | Move model naming into ActiveModel | Joshua Peek | 2009-06-17 | 9 | -0/+16 |
| | | |||||
| * | Move the exceptions for missing template into Compatibility in prep for ↵ | Yehuda Katz + Carl Lerche | 2009-06-16 | 2 | -2/+7 |
| | | | | | | | | moving it into a "not-production" module | ||||
| * | An exception is raised if a layout is missing only if the layout is missing ↵ | Yehuda Katz + Carl Lerche | 2009-06-16 | 4 | -11/+5 |
| | | | | | | | | for all mimes | ||||
| * | Exceptions now in an exceptions module | Yehuda Katz + Carl Lerche | 2009-06-16 | 1 | -0/+58 |
| | | |||||
| * | Remove exceptions from AbstractUnit so they work in real life | Yehuda Katz + Carl Lerche | 2009-06-16 | 2 | -58/+13 |
| | | |||||
| * | Merge process2 into process to people's regular tests run :P | Yehuda Katz + Carl Lerche | 2009-06-16 | 3 | -115/+12 |
| | | |||||
| * | More _write_layout_method removal | Yehuda Katz + Carl Lerche | 2009-06-15 | 2 | -14/+0 |
| | | |||||
| * | Whoops, I guess we broke layouts ;) | Yehuda Katz + Carl Lerche | 2009-06-15 | 6 | -32/+7 |
| | | |||||
| * | rm -r controller/base! | Yehuda Katz + Carl Lerche | 2009-06-15 | 19 | -2476/+9 |
| | | |||||
| * | Get all of rake tests to pass | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -0/+2 |
| | | |||||
| * | Get the new base tests to pass | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -2/+1 |
| | |