aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4497 from carlosantoniodasilva/action-controller-refactorJosé Valim2012-01-1735-232/+76
|\ | | | | Action controller refactor - remove Compatibility module
| * Update changelogCarlos Antonio da Silva2012-01-171-1/+16
| |
| * Bring back rendering templates that start with / in nested structuresCarlos Antonio da Silva2012-01-172-0/+23
| |
| * Move protected instance variables definition, kill compatibility moduleCarlos Antonio da Silva2012-01-172-15/+5
| |
| * Remove deprecated default_charset= from AC::BaseCarlos Antonio da Silva2012-01-174-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::RenderingCarlos Antonio da Silva2012-01-175-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 Silva2012-01-172-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 placeCarlos Antonio da Silva2012-01-172-3/+4
| | | | | | | | | | Options :nothing and :text => nil should be handled by ActionController::Rendering instead.
| * Move render :nothing and :text => nil options to AC::RenderingCarlos Antonio da Silva2012-01-172-10/+3
| |
| * Rename test class and fix tests to keep consistencyCarlos Antonio da Silva2012-01-171-10/+10
| | | | | | | | Based on 50d23bc2bd3653b3c66e480c22ae97c5f7fd7f62.
| * Remove deprecated logic to render templates starting with /Carlos Antonio da Silva2012-01-172-23/+0
| | | | | | | | render :template => "/foo/bar"
| * Remove relative url root setting from ENV varCarlos Antonio da Silva2012-01-171-4/+0
| | | | | | | | This is already being set by Rails configuration.
| * Remove rescue_action from compatibility module and testsCarlos Antonio da Silva2012-01-1723-87/+7
| |
| * Remove other old compatibility constantsCarlos Antonio da Silva2012-01-176-15/+12
| |
| * Remove constant already defined in exceptions moduleCarlos Antonio da Silva2012-01-171-3/+0
| |
| * Remove old compatibility methods not being usedCarlos Antonio da Silva2012-01-174-15/+2
| |
* | Merge pull request #4493 from bogdan/callbacks_per_keyJosé Valim2012-01-171-35/+7
|\ \ | | | | | | AS::Callbacks: Refactor :per_key option
| * | AS::Callbacks: Refactor :per_key optionBogdan Gusiev2012-01-171-35/+7
| | |
* | | Merge pull request #4487 from sarenji/fix-reset-countersAaron Patterson2012-01-177-3/+45
|\ \ \ | | | | | | | | Fix bug where reset_counters resets the wrong counter cache.
| * | | Fix bug where reset_counters resets the wrong counter cache.David Peter2012-01-167-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 testAaron Patterson2012-01-171-1/+4
| | | |
* | | | Merge pull request #4500 from kennyj/should_deprecate_rails_cacheAaron Patterson2012-01-177-13/+56
|\ \ \ \ | | | | | | | | | | [Proposal] We should deprecate the RAILS_CACHE constant.
| * | | | Deprecate RAILS_CACHE constant.kennyj2012-01-187-13/+56
| | |_|/ | |/| |
* | | | Merge pull request #4499 from rafaelfranca/patch-1José Valim2012-01-171-1/+1
|\ \ \ \ | |/ / / |/| | | Add option to configure Sprockets logger
| * | | Add option to configure Sprockets loggerRafael Mendonça França2012-01-171-1/+1
|/ / /
* | | Merge pull request #4494 from Dreamfa11/patch-0José Valim2012-01-172-4/+10
|\ \ \ | |_|/ |/| | Validates method should not change options argument
| * | whitespacesdreamfall2012-01-171-3/+3
| | |
| * | validates method should not change options argumentdreamfall2012-01-172-1/+7
|/ /
* | Merge pull request #4490 from EmmanuelOga/masterJosé Valim2012-01-173-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 Oga2012-01-173-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-1José Valim2012-01-171-3/+2
|\ \ | | | | | | use thread variable in TaggedLogging
| * | use thread variable in TaggedLoggingSergey Nartimov2012-01-171-3/+2
| | | | | | | | | | | | previous solution can cause race conditions under GIL-free ruby implementations
* | | Merge pull request #4491 from pkondzior/masterPiotr Sarnacki2012-01-162-1/+14
|\ \ \ | |_|/ |/| | Wrong behavior of ActiveModel::Errors#dup is causing regressions on Rails master
| * | Remove redundant #to_symPaweł Kondzior2012-01-161-1/+1
| | |
| * | Fix ActiveModel::Errors#dupPaweł Kondzior2012-01-162-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 changesAaron Patterson2012-01-162-14/+16
| |
* | stop ddl modifications for another testAaron Patterson2012-01-162-12/+10
| |
* | use one based indexes for the mock migrationsAaron Patterson2012-01-161-16/+16
| |
* | stop making ddl changes for migrator testsAaron Patterson2012-01-162-67/+78
| |
* | actually use the variable I created. :bomb: thanks @exvivaAaron Patterson2012-01-161-1/+1
| |
* | move another migrator to use sensorsAaron Patterson2012-01-162-12/+18
| |
* | Make it more explicit that the feature is deprecated, not removed.Jon Leighton2012-01-161-2/+4
| |
* | Deprecate inferred JOINs with includes + SQL snippets.Jon Leighton2012-01-1623-66/+216
| | | | | | | | | | | | See the CHANGELOG for details. Fixes #950.
* | infer references from Relation#orderJon Leighton2012-01-162-2/+28
| |
* | store references as a stringJon Leighton2012-01-164-8/+8
| |
* | Avoid sanitize_sql when we can use Relation#where insteadJon Leighton2012-01-164-22/+16
| |
* | automatically add references when we canJon Leighton2012-01-163-1/+29
| |
* | Make referencing an included item trigger eager loadingJon Leighton2012-01-162-1/+13
| |
* | Add ActiveRecord::Relation#references (#950)Jon Leighton2012-01-164-4/+35
| |
* | Revert "Deprecate implicit eager loading. Closes #950."Jon Leighton2012-01-1627-181/+99
|/ | | | This reverts commit c99d507fccca2e9e4d12e49b4387e007c5481ae9.