Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Move javascript/css helpers into the Sprockets helper and just have them ↵ | wycats | 2011-05-23 | 1 | -12/+12 | |
| | | | | | | | | override the old behavior | |||||
* | | Start moving some logic from being embedded in AV into the Rails Sprockets ↵ | wycats | 2011-05-23 | 1 | -0/+2 | |
| | | | | | | | | extensions | |||||
* | | Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵ | Jon Leighton | 2011-05-23 | 2 | -4/+4 | |
| | | | | | | | | and require 'securerandom' from the stdlib when active support is required. | |||||
* | | Merge pull request #1228 from fcheung/db_time_fix2 | José Valim | 2011-05-23 | 1 | -0/+26 | |
|\ \ | | | | | | | Take into account time spent in AR even if a redirect occurs or if it is after the render | |||||
| * | | Take into account time spent in AR even if a redirect occurs or if it is ↵ | Frederick Cheung | 2011-05-23 | 1 | -0/+26 | |
| | | | | | | | | | | | | after the render | |||||
* | | | Eliminate uninitialized instance variable warning | wycats | 2011-05-22 | 1 | -2/+2 | |
| | | | ||||||
* | | | Prepare the context in URLHelperTest so that there are no required ↵ | wycats | 2011-05-22 | 1 | -0/+2 | |
| | | | | | | | | | | | | uninitialized instance variables | |||||
* | | | Merge pull request #1222 from arunagw/sprockets-fixes | José Valim | 2011-05-22 | 2 | -8/+0 | |
|\ \ \ | | | | | | | | | We don't need to load version any more as Sprockets.beta8 is included. | |||||
| * | | | We don't need to load version any more as Sprockets.beta8 is included. | Arun Agrawal | 2011-05-23 | 2 | -8/+0 | |
| | | | | ||||||
* | | | | Always initialize @title in caching test to avoid uninitialized instance ↵ | wycats | 2011-05-22 | 1 | -0/+3 | |
|/ / / | | | | | | | | | | variable warning | |||||
* | | | Merge branch '3-1-stable' | Joshua Peek | 2011-05-22 | 3 | -2/+11 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec | |||||
| * | | | Add debug_asset support | Joshua Peek | 2011-05-22 | 3 | -2/+11 | |
| | |/ | |/| | ||||||
* | | | Revert "Take into account time spent in AR even if a redirect occurs or if ↵ | David Heinemeier Hansson | 2011-05-22 | 1 | -26/+0 | |
| | | | | | | | | | | | | | | | | | | it is after the render" because it's causing test failures about missing db_during_render. This reverts commit 60b55baca9e381deb3a0a85580f089f4caf551d4. | |||||
* | | | Make sure that we're able to run Action Pack test standalone. | Prem Sichanugrist | 2011-05-22 | 2 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Sprocket was trying to look for these two things: * `Rails::VERSION::STRING` * `.initializer(str)` in `Rails::Engine` This commit added require to version.rb into Abstract Unit, and mocking the `Rails::Engine.initializer` in `sprockets_helper_test.rb` | |||||
* | | | Take into account time spent in AR even if a redirect occurs or if it is ↵ | Frederick Cheung | 2011-05-22 | 1 | -0/+26 | |
| |/ |/| | | | | | after the render | |||||
* | | Add method fields_for_with_index to FormHelper | Jorge Bejar | 2011-05-21 | 1 | -0/+125 | |
|/ | ||||||
* | Merge pull request #1151 from joshk/wrap_params_options_change | José Valim | 2011-05-19 | 2 | -9/+9 | |
|\ | | | | | renamed the wrap_parameters :only and :except options to :include and :ex | |||||
| * | renamed the wrap_parameters :only and :except options to :include and ↵ | Josh Kalderimis | 2011-05-19 | 2 | -9/+9 | |
| | | | | | | | | :exclude to make it consistent with controller filters | |||||
* | | adding test | steve | 2011-05-19 | 1 | -4/+8 | |
|/ | ||||||
* | Example Usage updated for actionpack and actionmailer. | Arun Agrawal | 2011-05-19 | 1 | -9/+9 | |
| | ||||||
* | Dump and load rack-cache stuff. | José Valim | 2011-05-17 | 1 | -0/+21 | |
| | ||||||
* | add more robust test for wrapping params with anonymous class | David Chelimsky | 2011-05-17 | 1 | -25/+45 | |
| | ||||||
* | better test name | David Chelimsky | 2011-05-17 | 1 | -1/+1 | |
| | ||||||
* | add failing test for https://github.com/rails/rails/issues/1089 | David Chelimsky | 2011-05-17 | 1 | -0/+7 | |
| | ||||||
* | Merge pull request #570 from sikachu/decouple_actionpack | José Valim | 2011-05-15 | 1 | -10/+8 | |
|\ | | | | | Make ParamsWrapper use a well-defined API and not rely on AR methods | |||||
| * | Make ParamsWrapper calling newly introduced `Model.attribute_names` instead ↵ | Prem Sichanugrist | 2011-05-15 | 1 | -10/+8 | |
| | | | | | | | | of `.column_names` | |||||
* | | Merge pull request #568 from carlosantoniodasilva/fields_for_fixes | José Valim | 2011-05-15 | 1 | -0/+14 | |
|\ \ | |/ |/| | Fields for fixes for non nested attributes and without object | |||||
| * | Refactor fields_for to make the api more clear, and fix usage with non ↵ | Carlos Antonio da Silva | 2011-05-14 | 1 | -0/+14 | |
| | | | | | | | | nested attributes and without object | |||||
* | | Do not try to call `column_names` on the abstract class. | Prem Sichanugrist | 2011-05-15 | 1 | -1/+14 | |
|/ | | | Normally the table for abstract class won't be existed, so we should not trying to call `#column_names` on it. | |||||
* | Reset ActiveRecord::LogSubscriber runtime at the start of each request | Tom Ward | 2011-05-14 | 1 | -0/+13 | |
| | | | | Previously the runtime was reset implicitly when #cleanup_view_runtime was called at the end of most requests. However, this doesn't happen when the request redirects, or send_file is called. Consequently, the ActiveRecord runtime recorded in the logs included the time taken for both the current request and the previous redirect. Explicitly resetting at the start of each request ensures that this can't happen, no matter what occurs previously. | |||||
* | Escape regex in controller_runtime_test to actually check that the ↵ | Tom Ward | 2011-05-14 | 1 | -1/+1 | |
| | | | | ActiveRecord message appears | |||||
* | Test csrf token param name customization | David Lee | 2011-05-10 | 1 | -7/+18 | |
| | ||||||
* | Get around weird missing constant error caused by AS instead of simply ↵ | José Valim | 2011-05-11 | 1 | -21/+24 | |
| | | | | raising NameError, closes #477. | |||||
* | minor cleaning | Vishnu Atrai | 2011-05-10 | 1 | -1/+1 | |
| | ||||||
* | Fix previous commit by allowing a proc to be given as response_body. This is ↵ | José Valim | 2011-05-10 | 1 | -5/+4 | |
| | | | | deprecated and is going to be removed in future releases. | |||||
* | Merge pull request #446 from danielstutzman/response_body_is_proc | José Valim | 2011-05-10 | 1 | -0/+38 | |
|\ | | | | | New test: setting response_body to a Proc should be supported. | |||||
| * | New test: setting response_body to a Proc should be supported. | Daniel Stutzman | 2011-05-07 | 1 | -0/+38 | |
| | | ||||||
* | | Add tests for content_for() for read, closes #475. | José Valim | 2011-05-10 | 1 | -4/+12 | |
| | | ||||||
* | | Optimize the most common resolver case. | José Valim | 2011-05-09 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #420 from burke/master | José Valim | 2011-05-08 | 1 | -0/+9 | |
|\ \ | | | | | | | Accept single prefix in ActionView::MissingTemplate#initialize | |||||
| * | | Added a test for MissingTemplate change, and changed to use Array.wrap() as | Burke Libbey | 2011-05-06 | 1 | -0/+9 | |
| | | | | | | | | | | | | requested by josevalim. | |||||
* | | | Merge pull request #430 from dlee/methodoverride | José Valim | 2011-05-08 | 1 | -0/+7 | |
|\ \ \ | | | | | | | | | Logs should show overridden method; Issue 426 | |||||
| * | | | Logs should show overridden method; Issue 426 | David Lee | 2011-05-07 | 1 | -0/+7 | |
| |/ / | ||||||
* | | | Always expand */* | José Valim | 2011-05-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fixes ticket #6379. Improved the handling of Accept headers containing */*. | mathieuravaux | 2011-05-07 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | `lookup_context#formats=` being too restrictive, "Accept: text/javascript, */*" resulted in [:js, "*/*"] formats instead of [:js, :html]. Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | Merge pull request #343 from asanghi/ampm | José Valim | 2011-05-07 | 1 | -0/+55 | |
|\ \ \ | | | | | | | | | Allow AM/PM format in datetime selectors | |||||
| * | | | Allow AM/PM in datetime selectors | Aditya Sanghi | 2011-04-29 | 1 | -0/+55 | |
| | | | | ||||||
* | | | | Merge pull request #280 from jballanc/frozen-string-strip-tags | José Valim | 2011-05-07 | 1 | -0/+1 | |
|\ \ \ \ | |_|/ / |/| | | | Stripping tags from a frozen string | |||||
| * | | | Test for stripping tags from a frozen string. | Joshua Ballanco | 2011-04-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This test will pass under Ruby 1.8 but fail under Ruby 1.9 because of the change in behavior of gsub! w.r.t. frozen strings that do not match the pattern used [ruby-core:23664]. | |||||
* | | | | Revert to old semantics, use available_action? instead of action_method?. | José Valim | 2011-05-06 | 1 | -4/+4 | |
| | | | |