Permalink
Commits on Jun 12, 2012
  1. Merge pull request #6444 from kennyj/create_extenstion_hstore

    rafaelfranca committed Jun 12, 2012
    Create hstore extension when building PostgreSQL databases (for rails contributor).
  2. Merge pull request #6711 from takkanm/fix-warning-LoadError-path-method

    josevalim committed Jun 12, 2012
    fix method redefined warning in Ruby2.0
  3. fix method redefined warning in Ruby2.0

    takkanm committed Jun 12, 2012
    Ruby2.0 already has LoadError#path.
Commits on Jun 11, 2012
  1. Merge pull request #6492 from pmahoney/fair-connection-pool2

    rafaelfranca committed Jun 11, 2012
    Fair connection pool2
    
    Conflicts:
    	activerecord/test/cases/associations/eager_test.rb
  2. Merge pull request #6709 from amatsuda/sqlite3_version_is_always_gt_125

    rafaelfranca committed Jun 11, 2012
    current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6
  3. Merge pull request #6708 from amatsuda/ignore_git_ignored_files_in_ra…

    josevalim committed Jun 11, 2012
    …ke_test_uncommitted
    
    ignore .gitignore'd files in rake test:uncomitted
  4. Merge pull request #6706 from amatsuda/ar_timezone_format_test_tiny_fix

    rafaelfranca committed Jun 11, 2012
    TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9
  5. Merge pull request #6705 from ganeshkumar/string_method_changes

    rafaelfranca committed Jun 11, 2012
    both string and symbol will be interpolated as string no need to convert to_s
  6. both string and sumbol will be interpolated as string no need to conv…

    ganesh ganesh
    ganesh authored and ganesh committed Jun 11, 2012
    …ert to_s
  7. Merge pull request #6704 from amatsuda/lambda_respond_to_binding

    josevalim committed Jun 11, 2012
    Proc always respond_to :binding
  8. Merge pull request #6690 from suginoy/fix-templates-copy

    rafaelfranca committed Jun 11, 2012
    Fix: 'rake rails:templates:copy' doesn't work
  9. Added a testcase for #6690.

    kennyj authored and suginoy committed Jun 10, 2012
  10. Merge pull request #6699 from takkanm/fix-character-class-duplicated-…

    rafaelfranca committed Jun 11, 2012
    …range-warning
    
    fix warning in Ruby2.0.0
  11. fix warning in Ruby2.0.0

    takkanm committed Jun 11, 2012
    ```
    rails/activesupport/lib/active_support/multibyte/chars.rb:136: warning:
    character class has duplicated range: /\b('?[\S])/
    ```
  12. Merge pull request #6698 from yahonda/address_ora_911_master

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

    rafaelfranca committed Jun 11, 2012
    Fix that #exists? can blow up with ThrowResult exception
  14. Fix that #exists? raises ThrowResult when called with an empty limited

    Empact committed May 28, 2012
    reflection.
    
    ActiveRecord::FinderMethods#construct_limited_ids_condition will raise
    ThrowResult if the limited reflection comes back empty. The other callers
    of #construct_limited_ids_condition handle this exception (more specifically,
    the callers of construct_relation_for*), but #exists? didn't until now.
Commits on Jun 10, 2012
  1. Add test to column alias in `exists?` SQL.

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

    iaddict authored and rafaelfranca committed May 19, 2011
    …d others happy that do not work without a column alias.
    
    Conflicts:
    	activerecord/lib/active_record/relation/finder_methods.rb
  3. Merge pull request #6695 from kennyj/fix_6635

    rafaelfranca committed Jun 10, 2012
    Fix #6635. We should call Scoping methods, before calling Array methods.
  4. Ensure that mass assignment options are preserved

    pixeltrix committed Jun 10, 2012
    There are two possible scenarios where the @mass_assignment_options
    instance variable can become corrupted:
    
    1. If the assign_attributes doesn't complete correctly, then
       subsequent calls to a nested attribute assignment method will use
       whatever options were passed to the previous assign_attributes call.
    
    2. With nested assign_attributes calls, the inner call will overwrite
       the current options. This will only affect nested attributes as the
       attribute hash is sanitized before any methods are called.
    
    To fix this we save the current options in a local variable and then
    restore these options in an ensure block.
  5. Merge pull request #6694 from arunagw/build_fix_master

    josevalim committed Jun 10, 2012
    Build fix broken here 03f2249
  6. Build fix broken here 03f2249

    arunagw committed Jun 10, 2012