Permalink
Commits on Jun 21, 2012
  1. Merge branch 'acapilleri-update_nested_attributes'

    rafaelfranca committed Jun 19, 2012
    Closes #6675
    
    Conflicts:
    	activerecord/lib/active_record/attribute_methods/dirty.rb
Commits on Jun 19, 2012
  1. Merge pull request #6758 from caironoleto/master

    josevalim committed with rafaelfranca Jun 17, 2012
    Fixing load config in some tasks
    Conflicts:
    	activerecord/lib/active_record/railties/databases.rake
  2. Merge pull request #6649 from route/logger_in_metal_3_2

    carlosantoniodasilva committed Jun 19, 2012
    Logger in metal backport for 3.2
Commits on Jun 18, 2012
  1. Merge pull request #6742 from steveklabnik/deprecate_composed_of

    rafaelfranca committed Jun 18, 2012
    Deprecate composed of
  2. Deprecating composed_of in ActiveRecord

    steveklabnik committed Jun 15, 2012
    This feature adds a lot of complication to ActiveRecord for dubious
    value. Let's talk about what it does currently:
    
    class Customer < ActiveRecord::Base
      composed_of :balance, :class_name => "Money", :mapping => %w(balance
    amount)
    end
    
    Instead, you can do something like this:
    
        def balance
          @balance ||= Money.new(value, currency)
        end
    
        def balance=(balance)
          self[:value] = balance.value
          self[:currency] = balance.currency
          @balance = balance
        end
    
    Since that's fairly easy code to write, and doesn't need anything
    extra from the framework, if you use composed_of today, you'll
    have to add accessors/mutators like that.
    
    This feature will be removed in Rails 4.
  3. Merge pull request #6764 from frodsan/patch-4

    rafaelfranca committed Jun 18, 2012
    bump AS deprecation_horizon to 4.0
  4. bump AS deprecation_horizon to 4.0

    Francesco Rodríguez committed Jun 18, 2012
Commits on Jun 16, 2012
  1. Merge pull request #6756 from arunagw/build_fix_ap

    rafaelfranca committed Jun 16, 2012
    Build fix actionpack
  2. Merge pull request #6752 from steveklabnik/fix_5680

    rafaelfranca committed Jun 16, 2012
    Respect absolute paths in compute_source_path.
Commits on Jun 15, 2012
  1. Added test for case when view doesn't have logger method when using A…

    route committed Jun 15, 2012
    …ctionController::Metal controller.
Commits on Jun 14, 2012
  1. Remove unneded tests.

    rafaelfranca committed Jun 14, 2012
    Before b081f6b, this test are
    asserting that update_attribute does the dirty tracking. Since we
    deprecated this method and update_column write in the database directly
    this tests will always fail.
  2. Merge pull request #6739 from steveklabnik/3-2-stable

    fxn committed Jun 14, 2012
    Deprecate update_attribute
  3. Deprecate update_attribute.

    steveklabnik committed Jun 14, 2012
    Historically, update_attribute and update_attributes are similar, but
    with one big difference: update_attribute does not run validations.
    These two methods are really easy to confuse given their similar
    names. Therefore, update_attribute is being deprecated in favor of
    update_column, and will be removed in Rails 4.
    
    See the discussion on rails-core here:
    https://groups.google.com/d/topic/rubyonrails-core/BWPUTK7WvYA/discussion
  4. adding a test for #6459

    tenderlove committed Jun 14, 2012
Commits on Jun 13, 2012
Commits on Jun 12, 2012
  1. Merge pull request #6716 from frodsan/patch-2

    rafaelfranca committed Jun 12, 2012
    Fix Build
  2. Fix build

    Francesco Rodríguez committed Jun 12, 2012
  3. Merge branch '3-2-stable-rel' into 3-2-stable

    tenderlove committed Jun 12, 2012
    * 3-2-stable-rel:
      updating changelogs
      bumping version numbers
      updating changelogs with security fixes
      updating changelogs
      Array parameters should not contain nil values.
      Additional fix for CVE-2012-2661
  4. updating changelogs

    tenderlove committed Jun 12, 2012
  5. Merge pull request #6715 from arunagw/add_asserts

    rafaelfranca committed Jun 12, 2012
    Need a assert here in tests
  6. Merge pull request #6676 from aurelian/master

    rafaelfranca committed Jun 12, 2012
    Don't assign the attributes if the list is empty
  7. Merge pull request #6682 from acapilleri/dup_validation_fix_backport_…

    rafaelfranca committed Jun 12, 2012
    …for_1_9_3
    
    Dup validation fix backport for 1 9 3
  8. Fix the the backport of the object dup with the ruby 1.9.3p194.

    acapilleri committed Jun 8, 2012
    At the end of initialize_dup was added the call to super if it exists,
    so it also works with 1.8.7 where initialize_dup doesn't exist.
    This issu was introduced with the pull request #6324
Commits on Jun 11, 2012
  1. bumping version numbers

    tenderlove committed Jun 11, 2012
  2. updating changelogs

    tenderlove committed Jun 11, 2012
  3. Additional fix for CVE-2012-2661

    ernie committed with tenderlove Jun 8, 2012
    While the patched PredicateBuilder in 3.1.5 prevents a user
    from specifying a table name using the `table.column` format,
    it doesn't protect against the nesting of hashes changing the
    table context in the next call to build_from_hash. This fix
    covers this case as well.
  4. Change the string to use in test case.

    kennyj committed with tenderlove Mar 6, 2012
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    	activerecord/test/cases/adapters/mysql2/schema_test.rb
  5. Fix GH #3163. Should quote database on mysql/mysql2.

    kennyj committed with tenderlove Mar 3, 2012
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb