aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10506 from seanwalbran/fix-10502-skip-object-filterAaron Patterson2013-05-073-1/+28
|\
| * add changelog entry for fix-10502-skip-object-filterSean Walbran2013-05-071-0/+5
| * fix issue #10502, do not recompute method name for already-stringified object...Sean Walbran2013-05-072-1/+23
* | Revert "Merge pull request #10455 from patricksrobertson/bigserial_id_not_ide...Aaron Patterson2013-05-072-35/+2
|/
* Merge pull request #10455 from patricksrobertson/bigserial_id_not_identifying_pkAaron Patterson2013-05-072-2/+35
|\
| * Handle other pk types in PostgreSQL gracefully.Patrick Robertson2013-05-072-2/+35
* | Test that #fresh_when accepts an arrayBrandon Keepers2013-05-071-2/+19
|/
* Merge pull request #10234 from dasch/dasch/fetch-multiRafael Mendonça França2013-05-063-1/+61
|\
| * Allow fetching multiple values from the cache at onceDaniel Schierbeck2013-05-063-1/+61
* | Merge pull request #10377 from bricker/template_digest_ending_with_numberRafael Mendonça França2013-05-064-3/+12
|\ \
| * | Allow numbers in partial name for digestingBryan Ricker2013-05-064-3/+12
* | | Merge pull request #10446 from dasch/instrument-template-compilationRafael Mendonça França2013-05-061-2/+9
|\ \ \ | |/ / |/| |
| * | Instrument template compilationDaniel Schierbeck2013-05-061-2/+9
| |/
* | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-05-061-4/+4
* | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-063-2/+28
|\ \
| * | Confirm a record has not already been destroyed before decrementingBen Tucker2013-05-063-1/+27
* | | Merge pull request #10478 from cainlevy/patch-1Rafael Mendonça França2013-05-061-1/+1
|\ \ \
| * | | use canonical #controller_path logic in controller test casesLance Ivy2013-05-051-1/+1
* | | | Fix test asserting the sanitized SQL hash differently to some adaptersRafael Mendonça França2013-05-061-1/+7
* | | | Merge pull request #10352 from zohlgren/fix_activerecord_sanitization_sanitiz...Rafael Mendonça França2013-05-063-4/+15
|\ \ \ \
| * | | | Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditionsZach Ohlgren2013-05-063-4/+15
* | | | | Merge pull request #10488 from neerajdotname/10419-bRafael Mendonça França2013-05-061-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix failing test caused by 3771e4d511Neeraj Singh2013-05-061-2/+2
* | | | | let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462]Xavier Noria2013-05-061-45/+56
* | | | | Merge pull request #10437 from neerajdotname/10419Rafael Mendonça França2013-05-063-1/+49
|\| | | |
| * | | | raise IrreversibleMigration if no column givenNeeraj Singh2013-05-063-1/+49
|/ / / /
* | | | Merge pull request #10486 from vipulnsward/remove_variableRafael Mendonça França2013-05-061-1/+0
|\ \ \ \
| * | | | remove unused variableVipul A M2013-05-061-1/+0
|/ / / /
* | | | Merge pull request #10453 from vipulnsward/destructive_sortJeremy Kemper2013-05-051-1/+1
|\ \ \ \
| * | | | use destructive sort on array in Hash#to_param for performance gains.Vipul A M2013-05-051-1/+1
* | | | | Merge pull request #10480 from juno/fix-typoSteve Klabnik2013-05-051-1/+1
|\ \ \ \ \
| * | | | | Fix typo in documentation commentJunya Ogura2013-05-061-1/+1
|/ / / / /
* | | | | Merge pull request #10467 from akalyaev/set-correct-backend-for-nokogirisax-e...Rafael Mendonça França2013-05-051-3/+3
|\ \ \ \ \
| * | | | | use nokogirisax as a backendAnton Kalyaev2013-05-051-3/+3
* | | | | | Merge pull request #10476 from prathamesh-sonpatki/gitignoreRafael Mendonça França2013-05-053-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Updated link to to GitHub article about ignoring files [ci skip]Prathamesh Sonpatki2013-05-053-3/+3
|/ / / / /
* | | | | Merge pull request #10466 from prathamesh-sonpatki/scaffold-assetsCarlos Antonio da Silva2013-05-051-4/+4
|\ \ \ \ \
| * | | | | Fixes warning 'method redefined' in scaffold generators testsPrathamesh Sonpatki2013-05-051-4/+4
| |/ / / /
* | | | | Merge pull request #10468 from rimidl/add-missing-require-to-actionview-looku...Carlos Antonio da Silva2013-05-051-0/+1
|\ \ \ \ \
| * | | | | Added missing `require` to ActionView::LookupContextVladimir Strakhov2013-05-051-0/+1
| |/ / / /
* | | | | Merge pull request #10472 from prathamesh-sonpatki/githubCarlos Antonio da Silva2013-05-054-14/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Github -> GitHub [ci skip]Prathamesh Sonpatki2013-05-054-14/+14
|/ / / /
* | | | Merge pull request #10465 from raphweiner/rake_install_depend_on_buildRafael Mendonça França2013-05-041-1/+1
* | | | Merge pull request #10464 from arkiver/masterRafael Mendonça França2013-05-042-2/+2
|\ \ \ \
| * | | | fix to remove warning on postgres adapter test.Akshay Khole2013-05-051-1/+1
| * | | | Changing method call according to coding conventionsAkshay Khole2013-05-051-1/+1
|/ / / /
* | | | Merge pull request #10463 from prathamesh-sonpatki/dirRafael Mendonça França2013-05-041-1/+1
|\ \ \ \
| * | | | dir -> directory [ci skip]Prathamesh Sonpatki2013-05-041-1/+1
|/ / / /
* | | | Use Ruby 1.9 syntaxRafael Mendonça França2013-05-041-2/+2
* | | | Review the CHANGELOG entry [ci skip]Rafael Mendonça França2013-05-041-1/+2