aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | Duplicate column_defaults properlyPiotr Sarnacki2013-02-034-2/+16
|/ / | | | | | | | | | | | | | | | | | | Backport c517602 to fix #6115 Deleted: activerecord/lib/active_record/core.rb Conflicts: activerecord/test/cases/base_test.rb
* | Merge pull request #9078 from senny/6865_ar_count_with_uniqRafael Mendonça França2013-02-023-1/+15
| | | | | | | | | | | | `#count` in conjunction with `#uniq` performs distinct count. Conflicts: activerecord/CHANGELOG.md
* | Fix markdown syntax in actionpack CHANGELOG.Steve Klabnik2013-02-011-1/+2
| | | | | | | | Starting a line with an octothorpe makes an <h1>
* | Merge pull request #9043 from senny/backport_7536Carlos Antonio da Silva2013-01-295-3/+23
|\ \ | | | | | | Backport: Fix pluck when columns/tables are reserved words.
| * | Fix pluck when columns/tables are reserved words.Ian Lesperance2013-01-235-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | Backport #7536 to fix #8968. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb
* | | Merge pull request #9114 from rosenfeld/patch-2Rafael Mendonça França2013-01-291-0/+1
|\ \ \ | | | | | | | | Add another NumberHelper missing dependency
| * | | Add another NumberHelper missing dependencyRodrigo Rosenfeld Rosas2013-01-291-0/+1
|/ / / | | | | | | | | | | | | Another missing dependency, now affecting #number_to_percentage. It depends on reverse_merge.
* | | Merge pull request #9113 from rosenfeld/patch-1Rafael Mendonça França2013-01-291-0/+1
|\ \ \ | | | | | | | | Add NumberHelper missing dependency
| * | | Add NumberHelper missing dependencyRodrigo Rosenfeld Rosas2013-01-291-0/+1
|/ / / | | | | | | symbolize_keys depends on hash/keys AS core extension
* | | Install latest bundler on Travis.José Valim2013-01-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to fix travis error on 1.8.7/1.9.2: $ bundle install --path vendor/bundle ERROR: Gem bundler is not installed, run `gem install bundler` first. The command "bundle install --path vendor/bundle" failed and exited with 127 during install.
* | | Fix the CHANGELOG entry order [ci skip]Rafael Mendonça França2013-01-251-3/+5
| | |
* | | Merge pull request #9074 from ↵Carlos Antonio da Silva2013-01-251-3/+3
|\ \ \ | |/ / |/| | | | | | | | gaynetdinov/replace_undefined_abcs_to_config_variable Undefined abcs variable inside structure:dump task.
| * | Replaced abcs to config.Damir Gaynetdinov2013-01-251-3/+3
|/ /
* | Add changelog entry for skipping explain from dbs that don't support itCarlos Antonio da Silva2013-01-221-0/+5
| | | | | | | | Backport of #6197 in 29d564add926307fea8cd3f77caf88d735e252a1.
* | Merge pull request #6197 from ↵Xavier Noria2013-01-223-6/+24
| | | | | | | | | | | | blakesmith/connection_adapters_without_explain_support Don't run explain on slow queries for database adapters that don't support it
* | Revert "Merge pull request #6986 from kennyj/fix_6975"Andrew White2013-01-223-29/+10
| | | | | | | | | | | | | | | | | | This reverts commit 8905c1fb496641c3cdb7b3b816ae6d3d4b2c2b73. Closes #8460 Conflicts: activerecord/test/cases/dirty_test.rb
* | Add failing test case for #8460Andrew White2013-01-221-0/+14
| | | | | | | | Add a test case to ensure that fractional second updates are detected.
* | Duplicate possible frozen string from routeAndrew White2013-01-212-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 1.9 freezes Hash string keys by default so where a route is defined like this: get 'search' => 'search' then the Mapper will derive the action from the key. This blows up later when the action is added to the parameters hash and the encoding is forced. Closes #3429
* | Remove warning of not used variableCarlos Antonio da Silva2013-01-171-1/+1
| |
* | Do not run this streaming test in Ruby 1.8, fix syntax errorCarlos Antonio da Silva2013-01-171-5/+8
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 04:37:52 +0000