Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v3.2.6
Commits on Jun 12, 2012
  1. @tenderlove

    updating changelogs

    tenderlove authored
Commits on Jun 11, 2012
  1. @tenderlove

    bumping version numbers

    tenderlove authored
  2. @tenderlove
  3. @tenderlove

    updating changelogs

    tenderlove authored
  4. @tenderlove
  5. @ernie @tenderlove

    Additional fix for CVE-2012-2661

    ernie authored tenderlove committed
    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.
  6. @kennyj @tenderlove

    Change the string to use in test case.

    kennyj authored tenderlove committed
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    	activerecord/test/cases/adapters/mysql2/schema_test.rb
  7. @kennyj @tenderlove

    Fix GH #3163. Should quote database on mysql/mysql2.

    kennyj authored tenderlove committed
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
  8. @rafaelfranca

    Merge pull request #6690 from suginoy/fix-templates-copy

    rafaelfranca authored
    Fix: 'rake rails:templates:copy' doesn't work
    Conflicts:
    	railties/test/application/rake_test.rb
  9. @rafaelfranca

    Merge pull request #6698 from yahonda/address_ora_911_master

    rafaelfranca authored
    Address ORA-00911 errors because of the heading underscore.
  10. @rafaelfranca

    Merge pull request #6521 from Empact/throw-result

    rafaelfranca authored
    Fix that #exists? can blow up with ThrowResult exception
    Conflicts:
    	activerecord/lib/active_record/relation/finder_methods.rb
Commits on Jun 10, 2012
  1. @rafaelfranca

    Remove warning

    rafaelfranca authored
  2. @rafaelfranca

    Add test to column alias in `exists?` SQL.

    rafaelfranca authored
    This behavior was added in dd286a4
    
    Closes #1139.
    
    Fixes #2553, #1141, #1623 and #2062.
  3. @iaddict @rafaelfranca

    Minimal change to query generation of exists? that makes SQLServer an…

    iaddict authored rafaelfranca committed
    …d others happy that do not work without a column alias.
    
    Conflicts:
    	activerecord/lib/active_record/relation/finder_methods.rb
  4. @rafaelfranca

    Merge pull request #6688 from c42engineering/buffered_logger_level_wh…

    rafaelfranca authored
    …ile_creation
    
    BufferedLogger level while creation
  5. @rafaelfranca

    Merge pull request #6695 from kennyj/fix_6635

    rafaelfranca authored
    Fix #6635. We should call Scoping methods, before calling Array methods.
  6. @josevalim

    Merge pull request #6693 from jkraemer/3-2-stable

    josevalim authored
    Bugfix: Namespace collision with test-unit-activesupport 1.0.0
  7. @jkraemer
Commits on Jun 9, 2012
  1. @josevalim

    Merge pull request #6687 from tiegz/3-2-optimizations

    josevalim authored
    ActiveRecord#attributes optimization: minimize objects created
  2. @pixeltrix

    Merge pull request #6689 from arunagw/duplicate_test_removed

    pixeltrix authored
    Duplicate test removed
  3. @arunagw

    Duplicate tests removed.

    arunagw authored
  4. @achamian
  5. @tiegz
Commits on Jun 8, 2012
  1. @drogus
  2. @rafaelfranca
  3. @rafaelfranca

    Merge pull request #6677 from arunagw/3-2-stable

    rafaelfranca authored
    Removed protected as we already doing it above.
  4. @arunagw

    We should not include engine.rake file into rake

    arunagw authored
    if we are passing -T which is skip_test_unit
    
    See issue #6673 for more details.
    
    I saw that we are not creating dummy app even if 
    we do skip_test_unit. 
    
    Fixes #6673
  5. @arunagw
Commits on Jun 7, 2012
  1. @drogus

    Fix railties test suite

    drogus authored
    Apparently asset_environment should not be invoked if it's not needed.
    This fixes broken build by getting back to the code more similar to the
    version changed here: 5b0a891
  2. @drogus

    Fix asset tags for files with more than one dot

    drogus authored
    After the fix done in 39f9f02, there are cases that will not work
    correctly. If you have file with "2 extensions", like foo.min.js and you
    reference the file without extension, like:
    
        javascript_include_tag "foo.min"
    
    it will fail because sprockets finds foo.min.js with foo.min argument.
    
    This commit fixes this case and will get the right file even when
    referrencing it without extension.
    
    (closes #6598)
  3. @jonleighton
  4. @jonleighton

    Revert "Perf: Don't load the association for #delete_all."

    jonleighton authored
    This reverts commit b98d1e2.
    
    Closes #6609
    
    Conflicts:
    
    	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
Commits on Jun 6, 2012
  1. @josevalim

    Merge pull request #6642 from kuroda/3-2-activemodel-translation-patch

    josevalim authored
    Fix human attribute_name to handle deeply nested attributes
  2. @kuroda

    Fix human attribute_name to handle deeply nested attributes

    kuroda authored
    This is a back-port of b0e2fc8 to Rails 3.2.
    See #5843 and #3859 also.
Commits on Jun 5, 2012
  1. @rafaelfranca

    Revert "fix the Flash middleware loading the session on every request…

    rafaelfranca authored
    … (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called"
    
    This reverts commits e3069c6 and 2b2983d.
    
    Reason: This add a non-backward compatible change in the way that flash
    works now (swept in every request).
Something went wrong with that request. Please try again.