Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removes item in the Active Record CHANGELOG | Xavier Noria | 2012-06-14 | 1 | -2/+0 |
| | | | | | | | That change to update_attribute was considered to be too subtle and was reverted in 30ea923 just before Rails 3 shipped. Later we introduced update_column (Rails 3.1). | ||||
* | using hax to fix tests on Ruby 2.0 | Aaron Patterson | 2012-06-13 | 1 | -1/+6 |
| | |||||
* | Fix build | Santiago Pastorino | 2012-06-13 | 1 | -2/+2 |
| | |||||
* | Merge pull request #6721 from homakov/patch-2 | Santiago Pastorino | 2012-06-13 | 1 | -3/+0 |
|\ | | | | | These lines don't help to mitigate CVE. They only turn [nil] into nil, w... | ||||
| * | These lines don't help to mitigate CVE. They only turn [nil] into nil, w/o ↵ | Egor Homakov | 2012-06-13 | 1 | -3/+0 |
| | | | | | | | | | | | | them [nil] turns into [] and that is quite innocent. generated SQL - `IN (NULL)` compact! did all the job. | ||||
* | | ActionController::Caching depends on RackDelegation and ↵ | Santiago Pastorino | 2012-06-13 | 2 | -0/+35 |
|/ | | | | AbstractController::Callbacks | ||||
* | raise the same exception in order to keep path info | Aaron Patterson | 2012-06-12 | 2 | -1/+15 |
| | | | | | | Ruby 2.0.0 implements LoadError#path, but newly raised load errors will not contain the path information. Replace the error message, copy blame, and rereaise the same exception object | ||||
* | fixing security email address | Aaron Patterson | 2012-06-12 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master-sec' | Aaron Patterson | 2012-06-12 | 2 | -2/+8 |
|\ | | | | | | | | | * master-sec: Array parameters should not contain nil values. | ||||
| * | Array parameters should not contain nil values. | Aaron Patterson | 2012-06-12 | 2 | -2/+8 |
| | | |||||
* | | Merge pull request #6715 from arunagw/add_asserts | Rafael Mendonça França | 2012-06-12 | 1 | -2/+2 |
|\ \ | | | | | | | Need a assert here in tests | ||||
| * | | Need a assert here in tests | Arun Agrawal | 2012-06-12 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #6676 from aurelian/master | Rafael Mendonça França | 2012-06-12 | 2 | -1/+5 |
|\ \ | | | | | | | Don't assign the attributes if the list is empty | ||||
| * | | Don't assign the attributes if the list is empty. | Aurelian Oancea | 2012-06-08 | 2 | -1/+5 |
| | | | |||||
* | | | content_type is already a Mime::Type object | Santiago Pastorino | 2012-06-12 | 1 | -1/+1 |
| | | | |||||
* | | | This consider_all_requests_local doesn't make sense | Santiago Pastorino | 2012-06-12 | 2 | -21/+2 |
| | | | | | | | | | | | | | | | This middleware is only for Public Exceptions. This follows bd8c0b8a | ||||
* | | | Merge pull request #6444 from kennyj/create_extenstion_hstore | Rafael Mendonça França | 2012-06-12 | 2 | -0/+12 |
|\ \ \ | | | | | | | | | Create hstore extension when building PostgreSQL databases (for rails contributor). | ||||
| * | | | Create hstore extension when building PostgreSQL databases. | kennyj | 2012-06-12 | 2 | -0/+12 |
|/ / / | |||||
* | | | Merge pull request #6711 from takkanm/fix-warning-LoadError-path-method | José Valim | 2012-06-12 | 1 | -5/+7 |
|\ \ \ | | | | | | | | | fix method redefined warning in Ruby2.0 | ||||
| * | | | fix method redefined warning in Ruby2.0 | Mitsutaka Mimura | 2012-06-12 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | Ruby2.0 already has LoadError#path. | ||||
* | | | | Stop relying on mutable structures in the FileUpdateChecker | José Valim | 2012-06-12 | 2 | -35/+7 |
|/ / / | |||||
* | / | Remove warnings and unused code | Rafael Mendonça França | 2012-06-11 | 2 | -7/+2 |
| |/ |/| | |||||
* | | No need to cache table metadata in advance now that #6683 was merged. | Rafael Mendonça França | 2012-06-11 | 2 | -16/+0 |
| | | |||||
* | | Return proper format on exceptions | Santiago Pastorino | 2012-06-11 | 3 | -14/+81 |
| | | |||||
* | | Merge pull request #6492 from pmahoney/fair-connection-pool2 | Rafael Mendonça França | 2012-06-11 | 5 | -38/+286 |
|\ \ | | | | | | | | | | | | | | | | | | | Fair connection pool2 Conflicts: activerecord/test/cases/associations/eager_test.rb | ||||
| * | | Make connection pool fair with respect to waiting threads. | Patrick Mahoney | 2012-05-25 | 4 | -38/+282 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The core of this fix is a threadsafe, fair Queue class. It is very similar to Queue in stdlib except that it supports waiting with a timeout. The issue this solves is that if several threads are contending for database connections, an unfair queue makes is possible that a thread will timeout even while other threads successfully acquire and release connections. A fair queue means the thread that has been waiting the longest will get the next available connection. This includes a few test fixes to avoid test ordering issues that cropped up during development of this patch. | ||||
| * | | Cache metadata in advance to avoid extra sql statements while testing. | Yasuo Honda | 2012-05-25 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | Reason: If metadata is not cached extra sql statements will be executed, which causes failures tests with assert_queries(). | ||||
* | | | Merge pull request #6709 from amatsuda/sqlite3_version_is_always_gt_125 | Rafael Mendonça França | 2012-06-11 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6 | ||||
| * | | | current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6 | Akira Matsuda | 2012-06-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #6708 from ↵ | José Valim | 2012-06-11 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | amatsuda/ignore_git_ignored_files_in_rake_test_uncommitted ignore .gitignore'd files in rake test:uncomitted | ||||
| * | | | | ignore .gitignore'd files in rake test:uncomitted | Akira Matsuda | 2012-06-12 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #6706 from amatsuda/ar_timezone_format_test_tiny_fix | Rafael Mendonça França | 2012-06-11 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9 | ||||
| * | | | | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9 | Akira Matsuda | 2012-06-12 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #6705 from ganeshkumar/string_method_changes | Rafael Mendonça França | 2012-06-11 | 2 | -8/+8 |
|\ \ \ \ | | | | | | | | | | | 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 convert to_s | ganesh | 2012-06-11 | 2 | -8/+8 |
| | | | | | |||||
* | | | | | Merge pull request #6704 from amatsuda/lambda_respond_to_binding | José Valim | 2012-06-11 | 1 | -43/+39 |
|\ \ \ \ \ | |/ / / / |/| | | | | Proc always respond_to :binding | ||||
| * | | | | Proc always respond_to :binding | Akira Matsuda | 2012-06-12 | 1 | -43/+39 |
| |/ / / | |||||
* | | | | Merge pull request #6690 from suginoy/fix-templates-copy | Rafael Mendonça França | 2012-06-11 | 2 | -1/+12 |
|\ \ \ \ | |/ / / |/| | | | Fix: 'rake rails:templates:copy' doesn't work | ||||
| * | | | Added a testcase for #6690. | kennyj | 2012-06-12 | 1 | -0/+11 |
| | | | | |||||
| * | | | fix stylesheet template dir | Sugino Yasuhiro | 2012-06-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #6699 from ↵ | Rafael Mendonça França | 2012-06-11 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | takkanm/fix-character-class-duplicated-range-warning fix warning in Ruby2.0.0 | ||||
| * | | | | fix warning in Ruby2.0.0 | takkanm | 2012-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` 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 | Rafael Mendonça França | 2012-06-10 | 2 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | Address ORA-00911 errors because of the heading underscore. | ||||
| * | | | | Address ORA-00911 errors because of the heading underscore. | Yasuo Honda | 2012-06-11 | 2 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #6521 from Empact/throw-result | Rafael Mendonça França | 2012-06-10 | 2 | -1/+8 |
|\ \ \ \ | | | | | | | | | | | Fix that #exists? can blow up with ThrowResult exception | ||||
| * | | | | Fix that #exists? raises ThrowResult when called with an empty limited | Ben Woosley | 2012-06-10 | 2 | -1/+8 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | Rafael Mendonça França | 2012-06-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add test to column alias in `exists?` SQL. | Rafael Mendonça França | 2012-06-10 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior was added in be4ecdcc87984e9421ff5d5c90d33f475e0fbc01. Closes #1139. Fixes #2553, #1141, #1623 and #2062. | ||||
* | | | | Minimal change to query generation of exists? that makes SQLServer and ↵ | iaddict | 2012-06-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | Rafael Mendonça França | 2012-06-10 | 2 | -5/+14 |
|\ \ \ \ | | | | | | | | | | | Fix #6635. We should call Scoping methods, before calling Array methods. |