aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Define #inspect instead of #to_sPrem Sichanugrist2013-02-241-2/+2
| | | | Ruby 2.0 Object#inspect does not call #to_s by default anymore.
* Fix failing test case when no database.ymlPrem Sichanugrist2013-02-241-4/+11
|
* `name` should be public.Aaron Patterson2013-02-241-12/+12
|
* Add in missing requiresPrem Sichanugrist2013-02-242-0/+3
|
* Merge pull request #9388 from senny/9367_wrong_schema_after_remove_columnCarlos Antonio da Silva2013-02-234-2/+34
|\ | | | | Sqlite preserves primary keys when copying/altering tables.
| * Sqlite preserves primary keys when copying/altering tables.Yves Senn2013-02-234-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 styleCarlos Antonio da Silva2013-02-221-1/+1
|
* Merge pull request #9374 from senny/improved_match_shorthand_syntaxAndrew White2013-02-223-9/+54
|\ | | | | determine the match shorthand target early.
| * determine the match shorthand target early.Yves Senn2013-02-223-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 Silva2013-02-211-2/+2
|
* Use order to get the first record since postgresql returns in theRafael Mendonça França2013-02-201-1/+1
| | | | desired order
* Merge pull request #9323 from senny/build_fix_from_9252Rafael Mendonça França2013-02-191-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 differentYves Senn2013-02-191-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_9252Rafael Mendonça França2013-02-193-1/+31
|\ | | | | don't cache invalid subsets when preloading hmt associations.
| * don't cache invalid subsets when preloading hmt associations.Yves Senn2013-02-193-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.0Rafael Mendonça França2013-02-181-0/+3
|
* Fix handling of dirty time zone aware attributesLilibeth De La Cruz2013-02-173-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-1Xavier Noria2013-02-161-1/+1
|\ | | | | Update activemodel/CHANGELOG.md
| * Update activemodel/CHANGELOG.mdjoernchen of Phenoelit2013-02-161-1/+1
|/ | | Fixed a typo
* Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug"Rafael Mendonça França2013-02-153-30/+1
| | | | | | | This reverts commit c5451777b038c5e48567f69256986ae42a2cde48. Conflicts: activerecord/CHANGELOG.md
* Do not put the version in unreleased changes [ci skip]Rafael Mendonça França2013-02-147-7/+7
|
* Fix the CHANGELOG headers [ci skip]Rafael Mendonça França2013-02-147-0/+23
|
* Merge pull request #9252 from senny/8423_hmt_preloading_bugRafael Mendonça França2013-02-143-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-2Rafael Mendonça França2013-02-141-0/+1
|\ | | | | Add Ruby 2.0 RC to Travis CI build matrix
| * Add Ruby 2.0 RC to Travis CI build matrixPrem Sichanugrist2013-02-141-0/+1
|/
* Fix typo in railties changelog [ci skip]Carlos Antonio da Silva2013-02-141-1/+1
| | | | Other changelogs were fixed in f15581b1bab8fa042f4614f9b2709c3c580ad9d1.
* Merge pull request #9288 from jmccartie/jm/typosRafael Mendonça França2013-02-146-6/+6
|\ | | | | Fixed changelog typos [ci skip]
| * Fixed changelog typos [ci skip]Jon McCartie2013-02-146-6/+6
|/
* Merge pull request #9278 from matthewrobertson/backport-hmt-counter-cache-bugCarlos Antonio da Silva2013-02-133-0/+23
|\ | | | | Backport of #8400 to fix for issue #7630, a bug in has_many :through counter caches.
| * backport of fix for issue #7630Matthew Robertson2013-02-133-0/+23
|/
* Add note about attr_protected fix in Active Model changelog [ci skip]Carlos Antonio da Silva2013-02-111-1/+4
|
* Update changelogs with version/release dates [ci skip]Carlos Antonio da Silva2013-02-117-11/+28
|
* Merge branch '3-2-sec' into 3-2-stableAaron Patterson2013-02-1112-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 versionAaron Patterson2013-02-109-9/+9
| |
| * remove ruby-profAaron Patterson2013-02-101-6/+0
| |
| * Fix issue with attr_protected where malformed input could circumventjoernchen of Phenoelit2013-02-092-2/+2
| | | | | | | | | | | | protection Fixes: CVE-2013-0276
| * fixing call to columns hash. run the damn tests when you backport!Aaron Patterson2013-02-091-1/+1
| |
| * Bump rack dependency to 1.4.5Santiago Pastorino2013-02-091-1/+1
| | | | | | | | | | Conflicts: actionpack/actionpack.gemspec
| * Merge pull request #9224 from dylanahsmith/bigdecimal-takes-stringGuillermo Iguaran2013-02-091-1/+1
| | | | | | | | [3.2] Fix test failure for ruby 1.8.
| * Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numericGuillermo Iguaran2013-02-098-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_2Guillermo Iguaran2013-02-101-2/+1
|\ \ | | | | | | ignore .ruby-version instead of tool specifc config on 3-2-stable
| * | use .ruby-version instead of tool specifc configYves Senn2013-02-101-2/+1
|/ /
* | fixing call to columns hash. run the damn tests when you backport!Aaron Patterson2013-02-091-1/+1
| |
* | Bump rack dependency to 1.4.5Santiago Pastorino2013-02-081-1/+1
| |
* | Merge pull request #9224 from dylanahsmith/bigdecimal-takes-stringGuillermo Iguaran2013-02-081-1/+1
|\ \ | | | | | | [3.2] Fix test failure for ruby 1.8.
| * | Fix test failure for ruby 1.8.Dylan Smith2013-02-081-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-numericGuillermo Iguaran2013-02-078-14/+59
|\ \ | | | | | | [3.2] active_record: Quote numeric values compared to string columns.
| * | active_record: Quote numeric values compared to string columns.Dylan Smith2013-02-078-14/+59
|/ /
* | Merge pull request #9159 from lexmag/col_defaults-dup-fixCarlos Antonio da Silva2013-02-034-2/+16
|\ \ | | | | | | Backport: Duplicate column_defaults properly
| * | This pull requests addresses ORA-01400 errors and also supports #6115 issue ↵Yasuo Honda2013-02-031-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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 06:29:59 +0000