Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Define #inspect instead of #to_s | Prem Sichanugrist | 2013-02-24 | 1 | -2/+2 |
| | | | | Ruby 2.0 Object#inspect does not call #to_s by default anymore. | ||||
* | Fix failing test case when no database.yml | Prem Sichanugrist | 2013-02-24 | 1 | -4/+11 |
| | |||||
* | `name` should be public. | Aaron Patterson | 2013-02-24 | 1 | -12/+12 |
| | |||||
* | Add in missing requires | Prem Sichanugrist | 2013-02-24 | 2 | -0/+3 |
| | |||||
* | Merge pull request #9388 from senny/9367_wrong_schema_after_remove_column | Carlos Antonio da Silva | 2013-02-23 | 4 | -2/+34 |
|\ | | | | | Sqlite preserves primary keys when copying/altering tables. | ||||
| * | Sqlite preserves primary keys when copying/altering tables. | Yves Senn | 2013-02-23 | 4 | -2/+34 |
|/ | | | | | | | | Backport #2312. Fixes #9367. I also added a test-case to make sure that renaming or removing a column preserves the primary key. | ||||
* | Use 1.8 hash style | Carlos Antonio da Silva | 2013-02-22 | 1 | -1/+1 |
| | |||||
* | Merge pull request #9374 from senny/improved_match_shorthand_syntax | Andrew White | 2013-02-22 | 3 | -9/+54 |
|\ | | | | | determine the match shorthand target early. | ||||
| * | determine the match shorthand target early. | Yves Senn | 2013-02-22 | 3 | -9/+54 |
|/ | | | | | | | | | Backport #9361. Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes. | ||||
* | Change tabs to spaces in form options helper [ci skip] | Carlos Antonio da Silva | 2013-02-21 | 1 | -2/+2 |
| | |||||
* | Use order to get the first record since postgresql returns in the | Rafael Mendonça França | 2013-02-20 | 1 | -1/+1 |
| | | | | desired order | ||||
* | Merge pull request #9323 from senny/build_fix_from_9252 | Rafael Mendonça França | 2013-02-19 | 1 | -1/+1 |
|\ | | | | | keep the build :green_heart:, #first on 1.8.7 and pg is different | ||||
| * | keep the build :green_heart:, #first on 1.8.7 and pg is different | Yves Senn | 2013-02-19 | 1 | -1/+1 |
|/ | | | | | | | | | | | The build only failed for ruby-1.8.7 and pg. The problem was that the statement: ```ruby author = Author.includes(:comments_with_order_and_conditions, :posts).first ``` resulted in Author with ID 2 where on all other rubies / db-engines Author with ID 1 was retunred. Of course this breaks the assertions. | ||||
* | Merge pull request #9322 from senny/backport_9252 | Rafael Mendonça França | 2013-02-19 | 3 | -1/+31 |
|\ | | | | | don't cache invalid subsets when preloading hmt associations. | ||||
| * | don't cache invalid subsets when preloading hmt associations. | Yves Senn | 2013-02-19 | 3 | -1/+31 |
|/ | | | | | | | | | | | | | Backport #9252. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/eager_test.rb The preloader code on 3-2-stable is not based on relations but on option hashes. I had to modify the original patch and comparing the option hashes could be more fuzzy than comparing the relations. All the tests passed though. | ||||
* | Allow failures to 2.0.0 | Rafael Mendonça França | 2013-02-18 | 1 | -0/+3 |
| | |||||
* | Fix handling of dirty time zone aware attributes | Lilibeth De La Cruz | 2013-02-17 | 3 | -2/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when `time_zone_aware_attributes` were enabled, after changing a datetime or timestamp attribute and then changing it back to the original value, `changed_attributes` still tracked the attribute as changed. This caused `[attribute]_changed?` and `changed?` methods to return true incorrectly. Example: in_time_zone 'Paris' do order = Order.new original_time = Time.local(2012, 10, 10) order.shipped_at = original_time order.save order.changed? # => false # changing value order.shipped_at = Time.local(2013, 1, 1) order.changed? # => true # reverting to original value order.shipped_at = original_time order.changed? # => false, used to return true end (cherry picked from commit bc982cbcb34129ea2cfe8aa1f8e0b40e444e68db) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb Backport of #9073 Fixes #8898 | ||||
* | Merge pull request #9308 from joernchen/patch-1 | Xavier Noria | 2013-02-16 | 1 | -1/+1 |
|\ | | | | | Update activemodel/CHANGELOG.md | ||||
| * | Update activemodel/CHANGELOG.md | joernchen of Phenoelit | 2013-02-16 | 1 | -1/+1 |
|/ | | | Fixed a typo | ||||
* | Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug" | Rafael Mendonça França | 2013-02-15 | 3 | -30/+1 |
| | | | | | | | This reverts commit c5451777b038c5e48567f69256986ae42a2cde48. Conflicts: activerecord/CHANGELOG.md | ||||
* | Do not put the version in unreleased changes [ci skip] | Rafael Mendonça França | 2013-02-14 | 7 | -7/+7 |
| | |||||
* | Fix the CHANGELOG headers [ci skip] | Rafael Mendonça França | 2013-02-14 | 7 | -0/+23 |
| | |||||
* | Merge pull request #9252 from senny/8423_hmt_preloading_bug | Rafael Mendonça França | 2013-02-14 | 3 | -1/+30 |
| | | | | | | | don't cache invalid subsets when preloading hmt associations Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/eager_test.rb | ||||
* | Merge pull request #9289 from rails/3-2-stable-test-with-ruby-2 | Rafael Mendonça França | 2013-02-14 | 1 | -0/+1 |
|\ | | | | | Add Ruby 2.0 RC to Travis CI build matrix | ||||
| * | Add Ruby 2.0 RC to Travis CI build matrix | Prem Sichanugrist | 2013-02-14 | 1 | -0/+1 |
|/ | |||||
* | Fix typo in railties changelog [ci skip] | Carlos Antonio da Silva | 2013-02-14 | 1 | -1/+1 |
| | | | | Other changelogs were fixed in f15581b1bab8fa042f4614f9b2709c3c580ad9d1. | ||||
* | Merge pull request #9288 from jmccartie/jm/typos | Rafael Mendonça França | 2013-02-14 | 6 | -6/+6 |
|\ | | | | | Fixed changelog typos [ci skip] | ||||
| * | Fixed changelog typos [ci skip] | Jon McCartie | 2013-02-14 | 6 | -6/+6 |
|/ | |||||
* | Merge pull request #9278 from matthewrobertson/backport-hmt-counter-cache-bug | Carlos Antonio da Silva | 2013-02-13 | 3 | -0/+23 |
|\ | | | | | Backport of #8400 to fix for issue #7630, a bug in has_many :through counter caches. | ||||
| * | backport of fix for issue #7630 | Matthew Robertson | 2013-02-13 | 3 | -0/+23 |
|/ | |||||
* | Add note about attr_protected fix in Active Model changelog [ci skip] | Carlos Antonio da Silva | 2013-02-11 | 1 | -1/+4 |
| | |||||
* | Update changelogs with version/release dates [ci skip] | Carlos Antonio da Silva | 2013-02-11 | 7 | -11/+28 |
| | |||||
* | Merge branch '3-2-sec' into 3-2-stable | Aaron Patterson | 2013-02-11 | 12 | -23/+23 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version remove ruby-prof Fix issue with attr_protected where malformed input could circumvent protection fixing call to columns hash. run the damn tests when you backport! Bump rack dependency to 1.4.5 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric Conflicts: Gemfile activerecord/CHANGELOG.md | ||||
| * | bumping version | Aaron Patterson | 2013-02-10 | 9 | -9/+9 |
| | | |||||
| * | remove ruby-prof | Aaron Patterson | 2013-02-10 | 1 | -6/+0 |
| | | |||||
| * | Fix issue with attr_protected where malformed input could circumvent | joernchen of Phenoelit | 2013-02-09 | 2 | -2/+2 |
| | | | | | | | | | | | | protection Fixes: CVE-2013-0276 | ||||
| * | fixing call to columns hash. run the damn tests when you backport! | Aaron Patterson | 2013-02-09 | 1 | -1/+1 |
| | | |||||
| * | Bump rack dependency to 1.4.5 | Santiago Pastorino | 2013-02-09 | 1 | -1/+1 |
| | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec | ||||
| * | Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string | Guillermo Iguaran | 2013-02-09 | 1 | -1/+1 |
| | | | | | | | | [3.2] Fix test failure for ruby 1.8. | ||||
| * | Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric | Guillermo Iguaran | 2013-02-09 | 8 | -15/+62 |
| | | | | | | | | | | | | [3.2] active_record: Quote numeric values compared to string columns. Conflicts: activerecord/CHANGELOG.md | ||||
* | | Merge pull request #9239 from senny/use_ruby_version_on_3_2 | Guillermo Iguaran | 2013-02-10 | 1 | -2/+1 |
|\ \ | | | | | | | ignore .ruby-version instead of tool specifc config on 3-2-stable | ||||
| * | | use .ruby-version instead of tool specifc config | Yves Senn | 2013-02-10 | 1 | -2/+1 |
|/ / | |||||
* | | fixing call to columns hash. run the damn tests when you backport! | Aaron Patterson | 2013-02-09 | 1 | -1/+1 |
| | | |||||
* | | Bump rack dependency to 1.4.5 | Santiago Pastorino | 2013-02-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string | Guillermo Iguaran | 2013-02-08 | 1 | -1/+1 |
|\ \ | | | | | | | [3.2] Fix test failure for ruby 1.8. | ||||
| * | | Fix test failure for ruby 1.8. | Dylan Smith | 2013-02-08 | 1 | -1/+1 |
|/ / | | | | | | | BigDecimal.new needs to take a string rather than an integer in ruby 1.8. | ||||
* | | Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric | Guillermo Iguaran | 2013-02-07 | 8 | -14/+59 |
|\ \ | | | | | | | [3.2] active_record: Quote numeric values compared to string columns. | ||||
| * | | active_record: Quote numeric values compared to string columns. | Dylan Smith | 2013-02-07 | 8 | -14/+59 |
|/ / | |||||
* | | Merge pull request #9159 from lexmag/col_defaults-dup-fix | Carlos Antonio da Silva | 2013-02-03 | 4 | -2/+16 |
|\ \ | | | | | | | Backport: Duplicate column_defaults properly | ||||
| * | | This pull requests addresses ORA-01400 errors and also supports #6115 issue ↵ | Yasuo Honda | 2013-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | tested. Issue #6115 has been fixed and tested with the attribute `:null => false, :default => ""` However `:null => false` attribute is not necessary to test this issue, which causes many ORA-01400 errors with Oracle enhanced adapter. |