Permalink
Commits on Jun 12, 2012
  1. updating changelogs

    tenderlove committed Jun 12, 2012
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
  6. Merge pull request #6690 from suginoy/fix-templates-copy

    rafaelfranca committed Jun 11, 2012
    Fix: 'rake rails:templates:copy' doesn't work
    Conflicts:
    	railties/test/application/rake_test.rb
  7. Merge pull request #6698 from yahonda/address_ora_911_master

    rafaelfranca committed Jun 11, 2012
    Address ORA-00911 errors because of the heading underscore.
  8. Merge pull request #6521 from Empact/throw-result

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

    rafaelfranca committed Jun 10, 2012
  2. Add test to column alias in `exists?` SQL.

    rafaelfranca committed Jun 10, 2012
    This behavior was added in dd286a4
    
    Closes #1139.
    
    Fixes #2553, #1141, #1623 and #2062.
  3. Minimal change to query generation of exists? that makes SQLServer an…

    iaddict committed with rafaelfranca May 19, 2011
    …d others happy that do not work without a column alias.
    
    Conflicts:
    	activerecord/lib/active_record/relation/finder_methods.rb
  4. Merge pull request #6688 from c42engineering/buffered_logger_level_wh…

    rafaelfranca committed Jun 10, 2012
    …ile_creation
    
    BufferedLogger level while creation
  5. Merge pull request #6695 from kennyj/fix_6635

    rafaelfranca committed Jun 10, 2012
    Fix #6635. We should call Scoping methods, before calling Array methods.
  6. Merge pull request #6693 from jkraemer/3-2-stable

    josevalim committed Jun 10, 2012
    Bugfix: Namespace collision with test-unit-activesupport 1.0.0
Commits on Jun 9, 2012
  1. Merge pull request #6687 from tiegz/3-2-optimizations

    josevalim committed Jun 9, 2012
    ActiveRecord#attributes optimization: minimize objects created
  2. Merge pull request #6689 from arunagw/duplicate_test_removed

    pixeltrix committed Jun 9, 2012
    Duplicate test removed
  3. Duplicate tests removed.

    arunagw committed Jun 9, 2012
Commits on Jun 8, 2012
  1. Merge pull request #6678 from arunagw/fix_issue_6673

    rafaelfranca committed Jun 8, 2012
    Fix issue 6673
  2. Merge pull request #6677 from arunagw/3-2-stable

    rafaelfranca committed Jun 8, 2012
    Removed protected as we already doing it above.
  3. We should not include engine.rake file into rake

    arunagw committed Jun 8, 2012
    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
Commits on Jun 7, 2012
  1. Fix railties test suite

    drogus committed Jun 7, 2012
    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. Fix asset tags for files with more than one dot

    drogus committed Jun 2, 2012
    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. Revert "Perf: Don't load the association for #delete_all."

    jonleighton committed Jun 7, 2012
    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. Merge pull request #6642 from kuroda/3-2-activemodel-translation-patch

    josevalim committed Jun 6, 2012
    Fix human attribute_name to handle deeply nested attributes
  2. Fix human attribute_name to handle deeply nested attributes

    kuroda committed Jun 6, 2012
    This is a back-port of b0e2fc8 to Rails 3.2.
    See #5843 and #3859 also.
Commits on Jun 5, 2012
  1. Revert "fix the Flash middleware loading the session on every request…

    rafaelfranca committed Jun 5, 2012
    … (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).