aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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.Yves Senn2013-02-193-1/+31
|/
* 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
* Merge pull request #9308 from joernchen/patch-1Xavier Noria2013-02-161-1/+1
|\
| * Update activemodel/CHANGELOG.mdjoernchen of Phenoelit2013-02-161-1/+1
|/
* Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug"Rafael Mendonça França2013-02-153-30/+1
* 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
* 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 matrixPrem Sichanugrist2013-02-141-0/+1
|/
* Fix typo in railties changelog [ci skip]Carlos Antonio da Silva2013-02-141-1/+1
* Merge pull request #9288 from jmccartie/jm/typosRafael Mendonça França2013-02-146-6/+6
|\
| * 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 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
|\
| * 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
| * 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
| * Merge pull request #9224 from dylanahsmith/bigdecimal-takes-stringGuillermo Iguaran2013-02-091-1/+1
| * Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numericGuillermo Iguaran2013-02-098-15/+62
* | Merge pull request #9239 from senny/use_ruby_version_on_3_2Guillermo Iguaran2013-02-101-2/+1
|\ \
| * | 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
|\ \
| * | Fix test failure for ruby 1.8.Dylan Smith2013-02-081-1/+1
|/ /
* | Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numericGuillermo Iguaran2013-02-078-14/+59
|\ \
| * | 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
|\ \
| * | This pull requests addresses ORA-01400 errors and also supports #6115 issue t...Yasuo Honda2013-02-031-1/+1
| * | Duplicate column_defaults properlyPiotr Sarnacki2013-02-034-2/+16
|/ /
* | Merge pull request #9078 from senny/6865_ar_count_with_uniqRafael Mendonça França2013-02-023-1/+15
* | Fix markdown syntax in actionpack CHANGELOG.Steve Klabnik2013-02-011-1/+2
* | Merge pull request #9043 from senny/backport_7536Carlos Antonio da Silva2013-01-295-3/+23
|\ \
| * | Fix pluck when columns/tables are reserved words.Ian Lesperance2013-01-235-3/+23
* | | Merge pull request #9114 from rosenfeld/patch-2Rafael Mendonça França2013-01-291-0/+1
|\ \ \
| * | | Add another NumberHelper missing dependencyRodrigo Rosenfeld Rosas2013-01-291-0/+1
|/ / /
* | | Merge pull request #9113 from rosenfeld/patch-1Rafael Mendonça França2013-01-291-0/+1
|\ \ \
| * | | Add NumberHelper missing dependencyRodrigo Rosenfeld Rosas2013-01-291-0/+1
|/ / /
* | | Install latest bundler on Travis.José Valim2013-01-261-0/+2
* | | Fix the CHANGELOG entry order [ci skip]Rafael Mendonça França2013-01-251-3/+5
* | | Merge pull request #9074 from gaynetdinov/replace_undefined_abcs_to_config_va...Carlos Antonio da Silva2013-01-251-3/+3
|\ \ \ | |/ / |/| |
| * | Replaced abcs to config.Damir Gaynetdinov2013-01-251-3/+3
|/ /