Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Extract LabelTag | Rafael Mendonça França | 2012-01-17 | 3 | -54/+156 | |
| | | | | ||||||
* | | | | Merge pull request #4497 from carlosantoniodasilva/action-controller-refactor | José Valim | 2012-01-17 | 35 | -232/+76 | |
|\ \ \ \ | | | | | | | | | | | Action controller refactor - remove Compatibility module | |||||
| * | | | | Update changelog | Carlos Antonio da Silva | 2012-01-17 | 1 | -1/+16 | |
| | | | | | ||||||
| * | | | | Bring back rendering templates that start with / in nested structures | Carlos Antonio da Silva | 2012-01-17 | 2 | -0/+23 | |
| | | | | | ||||||
| * | | | | Move protected instance variables definition, kill compatibility module | Carlos Antonio da Silva | 2012-01-17 | 2 | -15/+5 | |
| | | | | | ||||||
| * | | | | Remove deprecated default_charset= from AC::Base | Carlos Antonio da Silva | 2012-01-17 | 4 | -9/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This should be set globally as a configuration, using `config.action_dispatch.default_charset` instead | |||||
| * | | | | Move render_to_body logic to return a spaced string to AC::Rendering | Carlos Antonio da Silva | 2012-01-17 | 5 | -9/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to be required only when calling render :partial with an empty collection from a controller. This call happens to return no content, letting the response body empty, which means to Rails that it should go on and try to find a template to render based on the current action name, thus failing hard. Although tests keep all green, we need to check a better way to fix this. | |||||
| * | | | | Remove method missing handling when action is not found, use action missing ↵ | Carlos Antonio da Silva | 2012-01-17 | 2 | -53/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead Do not create a method_missing method to handle not found actions, use the action_missing method provided by Rails instead. | |||||
| * | | | | Refactor render nothing/text => nil logic, and move to right place | Carlos Antonio da Silva | 2012-01-17 | 2 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Options :nothing and :text => nil should be handled by ActionController::Rendering instead. | |||||
| * | | | | Move render :nothing and :text => nil options to AC::Rendering | Carlos Antonio da Silva | 2012-01-17 | 2 | -10/+3 | |
| | | | | | ||||||
| * | | | | Rename test class and fix tests to keep consistency | Carlos Antonio da Silva | 2012-01-17 | 1 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | Based on 50d23bc2bd3653b3c66e480c22ae97c5f7fd7f62. | |||||
| * | | | | Remove deprecated logic to render templates starting with / | Carlos Antonio da Silva | 2012-01-17 | 2 | -23/+0 | |
| | | | | | | | | | | | | | | | | | | | | render :template => "/foo/bar" | |||||
| * | | | | Remove relative url root setting from ENV var | Carlos Antonio da Silva | 2012-01-17 | 1 | -4/+0 | |
| | | | | | | | | | | | | | | | | | | | | This is already being set by Rails configuration. | |||||
| * | | | | Remove rescue_action from compatibility module and tests | Carlos Antonio da Silva | 2012-01-17 | 23 | -87/+7 | |
| | | | | | ||||||
| * | | | | Remove other old compatibility constants | Carlos Antonio da Silva | 2012-01-17 | 6 | -15/+12 | |
| | | | | | ||||||
| * | | | | Remove constant already defined in exceptions module | Carlos Antonio da Silva | 2012-01-17 | 1 | -3/+0 | |
| | | | | | ||||||
| * | | | | Remove old compatibility methods not being used | Carlos Antonio da Silva | 2012-01-17 | 4 | -15/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #4493 from bogdan/callbacks_per_key | José Valim | 2012-01-17 | 1 | -35/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | AS::Callbacks: Refactor :per_key option | |||||
| * | | | | | AS::Callbacks: Refactor :per_key option | Bogdan Gusiev | 2012-01-17 | 1 | -35/+7 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #4487 from sarenji/fix-reset-counters | Aaron Patterson | 2012-01-17 | 7 | -3/+45 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix bug where reset_counters resets the wrong counter cache. | |||||
| * | | | | | | Fix bug where reset_counters resets the wrong counter cache. | David Peter | 2012-01-16 | 7 | -3/+45 | |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a model belongs_to two associations with the same class, then reset_counters will reset the wrong counter cache. Finding the right reflection should use the foreign_key instead, which should be unique. | |||||
* | | | | | | disable transactions for this test | Aaron Patterson | 2012-01-17 | 1 | -1/+4 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #4500 from kennyj/should_deprecate_rails_cache | Aaron Patterson | 2012-01-17 | 7 | -13/+56 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [Proposal] We should deprecate the RAILS_CACHE constant. | |||||
| * | | | | | | Deprecate RAILS_CACHE constant. | kennyj | 2012-01-18 | 7 | -13/+56 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #4499 from rafaelfranca/patch-1 | José Valim | 2012-01-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add option to configure Sprockets logger | |||||
| * | | | | | Add option to configure Sprockets logger | Rafael Mendonça França | 2012-01-17 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4494 from Dreamfa11/patch-0 | José Valim | 2012-01-17 | 2 | -4/+10 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Validates method should not change options argument | |||||
| * | | | | whitespaces | dreamfall | 2012-01-17 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | validates method should not change options argument | dreamfall | 2012-01-17 | 2 | -1/+7 | |
|/ / / / | ||||||
* | | | | Merge pull request #4490 from EmmanuelOga/master | José Valim | 2012-01-17 | 3 | -2/+19 | |
|\ \ \ \ | | | | | | | | | | | when validating a record, if a validation context is used, use the same context when validating related records | |||||
| * | | | | validate related records in the same validation context as parent. | Emmanuel Oga | 2012-01-17 | 3 | -2/+19 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.G.: ```ruby class Parent < ActiveRecord::Base has_one :child validates_presence_of :name, :on => "custom_context" validates_associated :child end class Child < ActiveRecord::Base belongs_to :parent validates_presence_of :name, :on => "custom_context" end p = Parent.new(:name => "Montoto", :child => Child.new) p.valid?(:custom_context) # => Returns true, even though the child is not valid under the same context. ``` | |||||
* | | | | Merge pull request #4484 from lest/patch-1 | José Valim | 2012-01-17 | 1 | -3/+2 | |
|\ \ \ \ | | | | | | | | | | | use thread variable in TaggedLogging | |||||
| * | | | | use thread variable in TaggedLogging | Sergey Nartimov | 2012-01-17 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | | | | | previous solution can cause race conditions under GIL-free ruby implementations | |||||
* | | | | | Merge pull request #4491 from pkondzior/master | Piotr Sarnacki | 2012-01-16 | 2 | -1/+14 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Wrong behavior of ActiveModel::Errors#dup is causing regressions on Rails master | |||||
| * | | | | Remove redundant #to_sym | Paweł Kondzior | 2012-01-16 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fix ActiveModel::Errors#dup | Paweł Kondzior | 2012-01-16 | 2 | -0/+13 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since ActiveModel::Errors instance keeps all error messages as hash we should duplicate this object as well. Previously ActiveModel::Errors was a subclass of ActiveSupport::OrderedHash, which results in different behavior on `dup`, this may result in regression for people relying on it. | |||||
* | | | | stop more ddl changes | Aaron Patterson | 2012-01-16 | 2 | -14/+16 | |
| | | | | ||||||
* | | | | stop ddl modifications for another test | Aaron Patterson | 2012-01-16 | 2 | -12/+10 | |
| | | | | ||||||
* | | | | use one based indexes for the mock migrations | Aaron Patterson | 2012-01-16 | 1 | -16/+16 | |
| | | | | ||||||
* | | | | stop making ddl changes for migrator tests | Aaron Patterson | 2012-01-16 | 2 | -67/+78 | |
| | | | | ||||||
* | | | | actually use the variable I created. :bomb: thanks @exviva | Aaron Patterson | 2012-01-16 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | move another migrator to use sensors | Aaron Patterson | 2012-01-16 | 2 | -12/+18 | |
| | | | | ||||||
* | | | | Make it more explicit that the feature is deprecated, not removed. | Jon Leighton | 2012-01-16 | 1 | -2/+4 | |
| | | | | ||||||
* | | | | Deprecate inferred JOINs with includes + SQL snippets. | Jon Leighton | 2012-01-16 | 23 | -66/+216 | |
| | | | | | | | | | | | | | | | | | | | | | | | | See the CHANGELOG for details. Fixes #950. | |||||
* | | | | infer references from Relation#order | Jon Leighton | 2012-01-16 | 2 | -2/+28 | |
| | | | | ||||||
* | | | | store references as a string | Jon Leighton | 2012-01-16 | 4 | -8/+8 | |
| | | | | ||||||
* | | | | Avoid sanitize_sql when we can use Relation#where instead | Jon Leighton | 2012-01-16 | 4 | -22/+16 | |
| | | | | ||||||
* | | | | automatically add references when we can | Jon Leighton | 2012-01-16 | 3 | -1/+29 | |
| | | | | ||||||
* | | | | Make referencing an included item trigger eager loading | Jon Leighton | 2012-01-16 | 2 | -1/+13 | |
| | | | | ||||||
* | | | | Add ActiveRecord::Relation#references (#950) | Jon Leighton | 2012-01-16 | 4 | -4/+35 | |
| | | | |