Permalink
Switch branches/tags
Commits on Jun 14, 2012
  1. Deprecate rendering html format if user wants javascript

    If a user wants javascript (Accept: text/javascript is sent or :js
    format is explicitly passed to render), we should not try to return
    HTML. It may be confusing and, what's even more important, it's
    against HTTP spec.
    committed Jun 14, 2012
Commits on Jun 12, 2012
  1. Merge pull request #6716 from frodsan/patch-2

    Fix Build
    rafaelfranca committed Jun 12, 2012
  2. Fix build

    Francesco Rodríguez committed Jun 12, 2012
  3. Merge branch '3-2-stable-rel' into 3-2-stable

    * 3-2-stable-rel:
      updating changelogs
      bumping version numbers
      updating changelogs with security fixes
      updating changelogs
      Array parameters should not contain nil values.
      Additional fix for CVE-2012-2661
    tenderlove committed Jun 12, 2012
  4. updating changelogs

    tenderlove committed Jun 12, 2012
  5. Merge pull request #6715 from arunagw/add_asserts

    Need a assert here in tests
    rafaelfranca committed Jun 12, 2012
  6. Merge pull request #6676 from aurelian/master

    Don't assign the attributes if the list is empty
    rafaelfranca committed Jun 12, 2012
  7. Merge pull request #6682 from acapilleri/dup_validation_fix_backport_…

    …for_1_9_3
    
    Dup validation fix backport for 1 9 3
    rafaelfranca committed Jun 12, 2012
  8. Fix the the backport of the object dup with the ruby 1.9.3p194.

    At the end of initialize_dup was added the call to super if it exists,
    so it also works with 1.8.7 where initialize_dup doesn't exist.
    This issu was introduced with the pull request #6324
    acapilleri committed Jun 8, 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

    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.
    ernie committed with tenderlove Jun 8, 2012
  4. Change the string to use in test case.

    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    	activerecord/test/cases/adapters/mysql2/schema_test.rb
    kennyj committed with tenderlove Mar 6, 2012
  5. Fix GH #3163. Should quote database on mysql/mysql2.

    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    kennyj committed with tenderlove Mar 3, 2012
  6. Merge pull request #6690 from suginoy/fix-templates-copy

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    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
    arunagw committed Jun 8, 2012