GeekOnCoffee/rails forked from rails/rails
-
Merge pull request #6444 from kennyj/create_extenstion_hstore
rafaelfranca committedJun 12, 2012 Create hstore extension when building PostgreSQL databases (for rails contributor).
-
Create hstore extension when building PostgreSQL databases.
kennyj committedMay 22, 2012 -
Merge pull request #6711 from takkanm/fix-warning-LoadError-path-method
josevalim committedJun 12, 2012 fix method redefined warning in Ruby2.0
-
fix method redefined warning in Ruby2.0
takkanm committedJun 12, 2012 Ruby2.0 already has LoadError#path.
-
Stop relying on mutable structures in the FileUpdateChecker
josevalim committedJun 12, 2012 -
Remove warnings and unused code
rafaelfranca committedJun 12, 2012
-
No need to cache table metadata in advance now that #6683 was merged.
rafaelfranca committedJun 11, 2012 -
Return proper format on exceptions
spastorino committedJun 11, 2012 -
Merge pull request #6492 from pmahoney/fair-connection-pool2
rafaelfranca committedJun 11, 2012 Fair connection pool2 Conflicts: activerecord/test/cases/associations/eager_test.rb
-
Merge pull request #6709 from amatsuda/sqlite3_version_is_always_gt_125
rafaelfranca committedJun 11, 2012 current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6
-
current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 …
amatsuda committedJun 11, 2012 …~> 1.3.6
-
Merge pull request #6708 from amatsuda/ignore_git_ignored_files_in_ra…
josevalim committedJun 11, 2012 …ke_test_uncommitted ignore .gitignore'd files in rake test:uncomitted
-
ignore .gitignore'd files in rake test:uncomitted
amatsuda committedJun 11, 2012 -
Merge pull request #6706 from amatsuda/ar_timezone_format_test_tiny_fix
rafaelfranca committedJun 11, 2012 TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9
-
TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9
amatsuda committedJun 11, 2012 -
Merge pull request #6705 from ganeshkumar/string_method_changes
rafaelfranca committedJun 11, 2012 both string and symbol will be interpolated as string no need to convert to_s
-
both string and sumbol will be interpolated as string no need to conv…
ganesh authored and ganesh committedJun 11, 2012 …ert to_s
-
Merge pull request #6704 from amatsuda/lambda_respond_to_binding
josevalim committedJun 11, 2012 Proc always respond_to :binding
-
Proc always respond_to :binding
amatsuda committedJun 11, 2012 -
Merge pull request #6690 from suginoy/fix-templates-copy
rafaelfranca committedJun 11, 2012 Fix: 'rake rails:templates:copy' doesn't work
-
-
Merge pull request #6699 from takkanm/fix-character-class-duplicated-…
rafaelfranca committedJun 11, 2012 …range-warning 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])/ ```
-
Merge pull request #6698 from yahonda/address_ora_911_master
rafaelfranca committedJun 11, 2012 Address ORA-00911 errors because of the heading underscore.
-
Address ORA-00911 errors because of the heading underscore.
yahonda committedJun 11, 2012 -
Merge pull request #6521 from Empact/throw-result
rafaelfranca committedJun 11, 2012 Fix that #exists? can blow up with ThrowResult exception
-
Fix that #exists? raises ThrowResult when called with an empty limited
Empact committedMay 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.
-
Remove bundle exec from the exception message
rafaelfranca committedJun 10, 2012 -
Add test to column alias in `exists?` SQL.
rafaelfranca committedJun 10, 2012 -
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
-
Merge pull request #6695 from kennyj/fix_6635
rafaelfranca committedJun 10, 2012 Fix #6635. We should call Scoping methods, before calling Array methods.
-
Ensure that mass assignment options are preserved
pixeltrix committedJun 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.
-
Fix #6635. We should call Scoping methods, before calling Array meth…
kennyj committedJun 7, 2012 …ods.
-
Merge pull request #6694 from arunagw/build_fix_master
josevalim committedJun 10, 2012 Build fix broken here 03f2249
-
arunagw committed
Jun 10, 2012