Permalink
Commits on Nov 20, 2011
  1. Preparing for 3.1.3 release

    jonleighton committed Nov 20, 2011
Commits on Nov 19, 2011
  1. Perf fix

    jonleighton committed Nov 19, 2011
    If we're deleting all records in an association, don't add a IN(..)
    clause to the query.
    
    Fixes #3672.
  2. Don't html-escape the :count option to translate if it's a Numeric. F…

    jonleighton committed Nov 19, 2011
    …ixes #3685.
    
    Conflicts:
    
    	actionpack/CHANGELOG.md
  3. Bump sprockets to 2.1.1

    jonleighton committed Nov 19, 2011
    Conflicts:
    
    	actionpack/actionpack.gemspec
  4. Use `show index from`. We could fix `pk_and_sequence_for` method's pe…

    kennyj committed with jonleighton Nov 18, 2011
    …rformance problem (GH #3678)
  5. Verify that #3690 has been closed by previous changes to the mysql

    jonleighton committed Nov 19, 2011
    adapters.
    
    These tests fail on the v3.1.2 tag.
    
    Closes #3690.
    
    Conflicts:
    
    	activerecord/CHANGELOG.md
Commits on Nov 18, 2011
  1. fixing my bad merge. doh!

    tenderlove committed Nov 18, 2011
  2. allow people to set a local .Gemfile so that things like ruby-debug a…

    tenderlove committed Nov 17, 2011
    …re not required for regular development
  3. Merge pull request #3682 from sikachu/3-1-stable-fix_test_variable

    vijaydev committed Nov 18, 2011
    Update variable's name in the test case to reflect the class we're testing
  4. "denoted" instead of "donated"

    capps committed with vijaydev Nov 16, 2011
    "parentheses" instead of "use brackets"
  5. Fixed typo: expect -> expected

    parndt committed with vijaydev Nov 18, 2011
  6. Merge pull request #3683 from christos/schema_introspection_speedup

    tenderlove committed Nov 18, 2011
    Only used detailed schema introspection when doing a schema dump.
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
  7. Preparing for 3.1.2 release

    jonleighton committed Nov 18, 2011
Commits on Nov 17, 2011
  1. Merge pull request #3665 from wildchild/label_i18n_3-1-stable

    josevalim committed Nov 17, 2011
    Fix impractical I18n lookup in nested fields_for (3-1-stable)
  2. Revert "warn the user values are directly interpolated into _html tra…

    fxn committed Nov 17, 2011
    …nslation strings"
    
    Reason: After another round of discussion, it has been
    decided to let interpolation deal with unsafe strings
    as it should do.
    
    This reverts commit d57d809.
Commits on Nov 16, 2011
  1. Switch from marshal format to plain text for the encoding conversions…

    jonleighton committed Nov 16, 2011
    … dump. This is for windows compatibility. Fixes #3644.
  2. Switch from marshal format to plain text for the encoding conversions…

    jonleighton committed Nov 16, 2011
    … dump. This is for windows compatibility. Fixes #3644.
Commits on Nov 15, 2011
  1. Merge pull request #3633 from Juanmcuello/3-1-stable

    jonleighton committed Nov 15, 2011
    Backport #3232 to 3-1-stable
  2. Merge pull request #3633 from Juanmcuello/3-1-stable

    jonleighton committed Nov 15, 2011
    Backport #3232 to 3-1-stable
  3. Backport #3232 to 3-1-stable.

    Juanmcuello committed Oct 5, 2011
    Use the schema_search_path in prepared statements in postgres.
    
    Only the tests are backported, the fix was already included by
    commit 818d285.
Commits on Nov 14, 2011
  1. Put sass-rails 3.1.5.rc.2 in the default Gemfile.

    jonleighton committed Nov 14, 2011
    Otherwise there will be dependency conflicts with sprockets.
  2. Put sass-rails 3.1.5.rc.2 in the default Gemfile.

    jonleighton committed Nov 14, 2011
    Otherwise there will be dependency conflicts with sprockets.