Merge branch '3-2-15' into 3-2-sec

* 3-2-15:
  bumping to rc3
  Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
  Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"
  bumping to rc2
  Merge pull request #12443 from arthurnn/add_inverse_of_add_target
  bumping version to 3.2.15.rc1
  Fix STI scopes using benolee's suggestion. Fixes #11939

RAILS_VERSION

@@ -1 +1 @@
-3.2.14
+3.2.15.rc3

actionmailer/lib/action_mailer/version.rb

@@ -2,8 +2,8 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 14
-    PRE   = nil
+    TINY  = 15
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

actionpack/lib/action_pack/version.rb

@@ -2,8 +2,8 @@ module ActionPack
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 14
-    PRE   = nil
+    TINY  = 15
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

activemodel/lib/active_model/version.rb

@@ -2,8 +2,8 @@ module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 14
-    PRE   = nil
+    TINY  = 15
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

activerecord/CHANGELOG.md

@@ -1,10 +1,4 @@
 ## unreleased ##
-*   Move .set_inverse_instance call to association.build_record method. Everytime a new record is build
-    using the association, we need to try to set the inverse_of relation.
-
-    Fixes #10371.
-
-    *arthurnn*
 
 *   When calling the method .find_or_initialize_by_* from a collection_proxy
     it should set the inverse_of relation even when the entry was found on the db.

activerecord/lib/active_record/associations/association.rb

@@ -240,7 +240,6 @@ module ActiveRecord
             skip_assign = [reflection.foreign_key, reflection.type].compact
             attributes = create_scope.except(*(record.changed - skip_assign))
             record.assign_attributes(attributes, :without_protection => true)
-            set_inverse_instance(record)
           end
         end
     end

activerecord/lib/active_record/associations/collection_association.rb

@@ -350,6 +350,7 @@ module ActiveRecord
         end
 
         callback(:after_add, record)
+        set_inverse_instance(record)
 
         record
       end

activerecord/lib/active_record/relation/spawn_methods.rb

@@ -151,7 +151,7 @@ module ActiveRecord
         values = other.joins_values
         return if values.blank?
 
-        if other.klass == relation.klass
+        if other.klass >= relation.klass
           relation.joins_values += values
         else
           joins_dependency, rest = values.partition do |join|

activerecord/lib/active_record/version.rb

@@ -2,8 +2,8 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 14
-    PRE   = nil
+    TINY  = 15
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

activerecord/test/cases/associations/inverse_associations_test.rb

@@ -125,10 +125,8 @@ class InverseHasOneTests < ActiveRecord::TestCase
   end
 
   def test_parent_instance_should_be_shared_with_newly_created_child
-    m = Man.create
+    m = Man.find(:first)
     f = m.create_face(:description => 'haunted')
-
-    assert_equal m.object_id, f.man.object_id
     assert_not_nil f.man
     assert_equal m.name, f.man.name, "Name of man should be the same before changes to parent instance"
     m.name = 'Bongo'

activerecord/test/cases/inheritance_test.rb

@@ -236,6 +236,11 @@ class InheritanceTest < ActiveRecord::TestCase
     assert_nothing_raised { s = SpecialSubscriber.new("name" => "And breaaaaathe!"); s.id = 'roger'; s.save }
   end
 
+  def test_scope_inherited_properly
+    assert_nothing_raised { Company.of_first_firm }
+    assert_nothing_raised { Client.of_first_firm }
+  end
+
   private
     def switch_to_alt_inheritance_column
       # we don't want misleading test results, so get rid of the values in the type column

activerecord/test/models/company.rb

@@ -12,6 +12,11 @@ class Company < AbstractCompany
   has_many :contracts
   has_many :developers, :through => :contracts
 
+  scope :of_first_firm, lambda {
+    joins(:account => :firm).
+    where('firms.id' => 1)
+  }
+
   def arbitrary_method
     "I am Jack's profound disappointment"
   end

activeresource/lib/active_resource/version.rb

@@ -2,8 +2,8 @@ module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 14
-    PRE   = nil
+    TINY  = 15
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

activesupport/lib/active_support/version.rb

@@ -2,8 +2,8 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 14
-    PRE   = nil
+    TINY  = 15
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

railties/lib/rails/version.rb

@@ -2,8 +2,8 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 14
-    PRE   = nil
+    TINY  = 15
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

version.rb

@@ -2,8 +2,8 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 14
-    PRE   = nil
+    TINY  = 15
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end