aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make the tests pass with minitest 4.2Rafael Mendonça França2013-02-241-0/+3
* Check for `method_missing` in public and protectedPrem Sichanugrist2013-02-241-1/+2
* There is already a Set of non-hidden action_names lying around.thedarkone2013-02-241-8/+2
* Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a fe...Jeremy Kemper2013-02-241-1/+1
* Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag t...Aaron Patterson2013-02-241-0/+1
* search private and protected methods for convert_keyAaron Patterson2013-02-243-4/+3
* Define #inspect instead of #to_sPrem Sichanugrist2013-02-241-2/+2
* 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.Yves Senn2013-02-234-2/+34
|/
* 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.Yves Senn2013-02-223-9/+54
|/
* 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
* 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 differentYves Senn2013-02-191-1/+1
|/
* 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