Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 29, 2015
  1. @jgeiger

    Fix ruby 2.2 comparable warnings

    jgeiger authored
    Check for correct value type in activerecord/fixtures.rb
    Check that zone can respond to expected values to make the comparison.
Commits on Jan 3, 2015
  1. @tmm1
Commits on Dec 23, 2014
  1. @tmm1
Commits on Nov 16, 2014
  1. @tenderlove
Commits on Oct 29, 2014
  1. @tenderlove

    bumping version to 3.2.20

    tenderlove authored
Commits on Jul 2, 2014
  1. @rafaelfranca
  2. @rafaelfranca
Commits on May 6, 2014
  1. @rafaelfranca

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

    rafaelfranca authored
    Conflicts:
    	actionpack/CHANGELOG.md
  2. @rafaelfranca
Commits on Feb 18, 2014
  1. @rafaelfranca

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

    rafaelfranca authored
    Conflicts:
    	actionpack/CHANGELOG.md
  2. @rafaelfranca
Commits on Dec 14, 2013
  1. @tyre

    Update Session Store Documentation

    tyre authored
    session_id doesn't need to be a text column, just string (VARCHAR)
Commits on Dec 3, 2013
  1. @tenderlove

    updating the changelog

    tenderlove authored
Commits on Oct 15, 2013
  1. @tenderlove

    bumping to 3.2.15

    tenderlove authored
Commits on Oct 11, 2013
  1. @tenderlove

    bumping to rc3

    tenderlove authored
Commits on Oct 10, 2013
  1. @rafaelfranca

    Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"

    rafaelfranca authored
    This reverts commit ccd11d5, reversing
    changes made to 54c05ac.
    
    Reason: This caused a regression when the associated record is created
    in a before_create callback. See
    #12413 (comment)
  2. @rafaelfranca

    Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_ta…

    rafaelfranca authored
    …rget"
    
    This reverts commit 7ed5bdc, reversing
    changes made to 31c79e2.
    
    Reason: this caused a regression when the associated record is creted in
    a before_create callback.
    
    See #12413 (comment)
Commits on Oct 4, 2013
  1. @tenderlove

    bumping to rc2

    tenderlove authored
  2. @rafaelfranca

    Merge pull request #12443 from arthurnn/add_inverse_of_add_target

    rafaelfranca authored
    Add inverse of add target
Commits on Oct 3, 2013
  1. @tenderlove
  2. @tenderlove

    Merge pull request #12084 from Ben-M/3-2-stable

    tenderlove authored
    Fix STI scopes using benolee's suggestion. Fixes #11939
Commits on Sep 30, 2013
  1. @arthurnn
Commits on Sep 26, 2013
  1. @arthurnn

    fix inverse_of when find_or_initialize_by_*

    arthurnn authored
    inverse_of relation was not being set when calling find_or_initialize_by_ and the entry was
    found on the db.
Commits on Sep 25, 2013
  1. @rafaelfranca

    Merge pull request #12359 from arthurnn/inverse_on_callbacks

    rafaelfranca authored
    Make sure inverse_of is visible on the has_many callbacks
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/test/models/company.rb
Commits on Sep 12, 2013
  1. @rafaelfranca

    Fix FinderMethods#last unscoped primary key

    Eugene Kalenkovich authored rafaelfranca committed
    Fixes table.joins(:relation).last(N) breaking on sqlite
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/test/cases/finder_test.rb
Commits on Sep 9, 2013
  1. @arthurnn
Commits on Aug 30, 2013
  1. @Ben-M
Commits on Aug 5, 2013
  1. @kassio
Commits on Jul 24, 2013
  1. @alfredw @rafaelfranca

    Specified column type for quote_value

    alfredw authored rafaelfranca committed
    When calling quote_value the underlying connection sometimes requires
    more information about the column to properly return the correct quoted
    value.
    
    I ran into this issue when using optimistic locking in JRuby and the
    activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to
    insert a integer into a NVARCHAR column type so we need to format it as
    N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without
    the column type being passed the connection adapter cannot properly return
    the correct quote value because it doesn't know to return N'3' or '3'.
    
    This patch is fairly straight forward where it just passes in the column
    type into the quote_value, as it already has the ability to take in the column,
    so it can properly handle at the connection level.
    
    I've added the tests required to make sure that the quote_value method
    is being passed the column type so that the underlying connection can
    determine how to quote the value.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/locking/optimistic.rb
Commits on Jul 23, 2013
  1. @90yukke

    Fix merge error when Equality LHS is non-attribute.

    90yukke authored
    This is reworking of rails/rails#7380 made for rails 3.
Commits on Jul 22, 2013
  1. @rafaelfranca
Commits on Jul 16, 2013
  1. @rafaelfranca
Commits on Jul 15, 2013
  1. @senny @rafaelfranca

    Merge pull request #11451 from jetthoughts/11450_do_not_resave_destro…

    senny authored rafaelfranca committed
    …yed_association
    
    Do not re-save destroyed association on saving parent object
    Conflicts:
    	activerecord/lib/active_record/autosave_association.rb
Commits on Jul 13, 2013
  1. @rafaelfranca
Commits on Jul 9, 2013
  1. @rafaelfranca

    Do not shallow the original exception in exec_cache

    rafaelfranca authored
    when result_error_field is not defined on result raise the original
    exception.
    
    Fixes #11260
Something went wrong with that request. Please try again.