Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 13, 2012
  1. fix markdown markup in AR/CHANGELOG

    Francesco Rodríguez authored
  2. Backport PostgreSQL auto-reconnect test coverage

    Steve Jorgensen authored
    6d5f4de
    Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.
    
    4b1bca0
    Stop being silly with formatting of method aliasing.
    
    c381d5c
    Fix just-plain-wrongness of psql auto-reconnect test.
    
    1e17a9d
    Fix only-once stub logic.
    
    f16c2043826ec1991cf94fe17cb671507b7a7f51
    Changelog for PostgreSQL auto-reconnect test coverage backport.
Commits on Sep 11, 2012
  1. @kennyj

    Backported #7572 to 3-2-stable. Use config['encoding'], because datab…

    kennyj authored
    …ase configuration use not charset but encoding.
Commits on Sep 9, 2012
  1. @rafaelfranca

    Merge pull request #7582 from tchandy/fix_type_cast_code

    rafaelfranca authored
    type_cast_code should always convert values to integer calling #to_i
  2. @tchandy

    ConnectionAdapters::Column.type_cast_code should always convert value…

    tchandy authored
    …s to integer calling #to_i
Commits on Sep 5, 2012
  1. @rafaelfranca

    Merge pull request #7337 from adzap/string_to_dummy_time

    rafaelfranca authored
    Fix for time type columns with invalid time value
    Conflicts:
    	activerecord/CHANGELOG.md
Commits on Sep 3, 2012
  1. @senny

    set the configured #inheritance_column on #become (#7503)

    senny authored senny committed
    I had to create a new table because I needed an STI table,
    which does not have both a "type" and a "custom_type"
    
    the test fails with:
      1) Error:
    test_alt_becomes_works_with_sti(InheritanceTest):
    NoMethodError: undefined method `type=' for #<Cabbage id: 1, name: "my cucumber", custom_type: "Cucumber">
        /Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing'
        /Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:100:in `method_missing'
        /Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes'
        test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti'
        test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti'
    
    Conflicts:
    
    	activerecord/test/cases/inheritance_test.rb
Commits on Aug 28, 2012
  1. @fxn

    CHANGELOGs are now per branch

    fxn authored
    Check 810a50d for the rationale.
Commits on Aug 21, 2012
  1. @rafaelfranca

    Merge pull request #5210 from Pliny/masteri

    rafaelfranca authored
    Fix for #5200
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/counter_cache.rb
  2. @rafaelfranca

    Merge pull request #6986 from kennyj/fix_6975

    rafaelfranca authored
    Fix #6975. Round usec when writing timestamp attribute.
    
    Conflicts:
    	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
  3. @carlosantoniodasilva

    Merge pull request #7377 from brainopia/use_inversed_parent_for_first…

    carlosantoniodasilva authored
    …_and_last_child
    
    Use inversed parent for first and last child of has_many association
    
    [Backport] Closes #3223.
    
    Conflicts:
    	activerecord/lib/active_record/associations/collection_association.rb
Commits on Aug 17, 2012
  1. @rafaelfranca

    Merge pull request #7352 from aripollak/microsecond-timestamp

    rafaelfranca authored
    Fix occasional microsecond conversion inaccuracy
    Conflicts:
    	activerecord/CHANGELOG.md
Commits on Aug 15, 2012
  1. @carlosantoniodasilva
  2. @rafaelfranca

    Do not use update_column where update_attribute is not interchangeable

    rafaelfranca authored
    Revert "Deprecate update_attribute."
    
    This reverts commit b081f6b.
    
    Reason: Since the new deprecation policy we removed the deprecation of
    update_attribute but we didn't reverted the changes to use
    update_column.
    
    Fixes #7306
Commits on Aug 12, 2012
  1. @rafaelfranca

    Merge pull request #6073 from daveyeu/restore-state-on-record-invalid

    rafaelfranca authored
    Restore state on create when ActiveRecord::RecordInvalid is raised
    Conflicts:
    	activerecord/CHANGELOG.md
Commits on Aug 10, 2012
  1. @rafaelfranca
Commits on Aug 9, 2012
  1. @spastorino
  2. @spastorino
  3. @rafaelfranca

    Add CHANGELOG entry

    rafaelfranca authored
Commits on Aug 6, 2012
  1. @rafaelfranca
Commits on Aug 5, 2012
  1. @rafaelfranca

    Merge pull request #7140 from seamusabshere/patch-1

    rafaelfranca authored
    Make sure :environment task is executed before db:schema:load or
    db:structure:load
    
    Conflicts:
    	activerecord/CHANGELOG.md
Commits on Aug 2, 2012
  1. @rafaelfranca @spastorino

    Do not consider the numeric attribute as changed if the old value is

    rafaelfranca authored spastorino committed
    zero and the new value is not a string.
    
    Before this commit this was the behavior
    
    r = Review.find_by_issue(0)
    r.issue
    => 0
    r.changes
    => {}
    r.issue = 0
    => 0
    r.changed?
    => true
    r.changes
    => {"issue"=>[0,0]}
    
    Fixes #7237
  2. @rafaelfranca

    Do not consider the numeric attribute as changed if the old value is

    rafaelfranca authored
    zero and the new value is not a string.
    
    Before this commit this was the behavior
    
    r = Review.find_by_issue(0)
    r.issue
    => 0
    r.changes
    => {}
    r.issue = 0
    => 0
    r.changed?
    => true
    r.changes
    => {"issue"=>[0,0]}
    
    Fixes #7237
Commits on Aug 1, 2012
  1. @spastorino

    This entry is wrong

    spastorino authored
  2. @rafaelfranca

    Fix CHANGELOGS

    rafaelfranca authored
  3. @fxn

    removes the deprecation of update_attribute

    fxn authored
    Applying the new policy here to not deprecate stuff in point releases.
  4. @fxn

    revises the deprecation warning of update_attribute

    fxn authored
    We have decided not to drop this important method in 4.0 and give
    it a longer deprecation cycle. On the other hand we do not expect
    to have update_column around for a long time, it is going to be
    replaced in favor of update_columns.
  5. @rafaelfranca

    Revert "Deprecating composed_of in ActiveRecord"

    rafaelfranca authored
    This reverts commit 44b313b.
  6. @jonleighton

    Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."

    jonleighton authored
    This reverts commit a79bfa9.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    
    We shouldn't introducing deprecations in point releases.
    It will be deprecated in 4.0 instead.
  7. @spastorino

    Add missing CHANGELOG entries

    spastorino authored
    [ci skip]
Commits on Jul 31, 2012
  1. @rafaelfranca
Commits on Jul 30, 2012
  1. @rafaelfranca

    Revert "Add update_columns and the suggestion of using update_columns

    rafaelfranca authored
    instead of update_column"
    
    This reverts commit 9fa06c3.
    
    This reverts commit 17a64de.
    
    This reverts commit def9c85, reversing
    changes made to 6b7d26c.
    
    Reason: This was supposed to be released with 3.2.7 before the
    suggestion to use update_column. Since it was not release now is not
    good to suggest to use another method because it will confusing the
    people.
Commits on Jul 26, 2012
  1. @tenderlove

    Merge branch '3-2-rel' into 3-2-stable

    tenderlove authored
    * 3-2-rel:
      updating release date
      bumping to 3.2.7
      updating the changelog
      * Do not convert digest auth strings to symbols. CVE-2012-3424
      updating the version
      updating changelogs
  2. @tenderlove

    updating release date

    tenderlove authored
  3. @parndt
Something went wrong with that request. Please try again.