aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditionsZach Ohlgren2013-05-063-4/+15
* 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
* | Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-masterRafael Mendonça França2013-05-043-0/+20
|\ \
| * | Fixes Scaffold generator with --assets=falseArun Agrawal2013-05-043-0/+20
|/ /
* | Merge pull request #10458 from bwbuchanan/issue-10451Rafael Mendonça França2013-05-043-2/+18
|\ \
| * | Make SchemaDumper emit "id: :uuid" when appropriate. Fixes #10451.Brian Buchanan2013-05-033-2/+18
| |/
* | Merge pull request #10436 from NARKOZ/keep-imagesRafael Mendonça França2013-05-043-0/+6
|\ \
| * | generate 'app/assets/images' directory when creating new rails appNihad Abbasov2013-05-043-0/+6
* | | Merge pull request #10461 from rwz/masterRafael Mendonça França2013-05-042-2/+2
|\ \ \
| * | | Relaxed jbuilder dependency in Gemfile templatePavel Pravosud2013-05-043-3/+3
* | | | Merge pull request #10457 from zenspider/squishy_test_order_dependenciesAaron Patterson2013-05-034-6/+27
|\ \ \ \
| * | | | Fixed bad tests to clean up after themselves.Ryan Davis2013-05-034-6/+27
|/ / / /
* | | | Merge pull request #10452 from rubys/rails_version_testRafael Mendonça França2013-05-031-0/+5
|\ \ \ \
| * | | | Add a test case for comparing Rails versionsSam Ruby2013-05-031-0/+5
| | |_|/ | |/| |
* / | | Squashed commit of the following:Aaron Patterson2013-05-0317-174/+7
|/ / /
* | | Fix generating route from engine to other enginePiotr Sarnacki2013-05-033-1/+48
* | | Merge pull request #9426 from exviva/nested_attributes_reuse_existing_new_recordJon Leighton2013-05-034-11/+75
|\ \ \
| * | | Do not overwrite manually built records during one-to-one nested attribute as...Olek Janiszewski2013-05-034-11/+75
|/ / /
* | | Merge pull request #10417 from jholton/fix_association_auto_saveJon Leighton2013-05-033-12/+34
|\ \ \
| * | | destroys association records before saving/inserting new association recordsJohnny Holton2013-05-023-12/+34
* | | | Merge pull request #10413 from vipulnsward/change_groupingCarlos Antonio da Silva2013-05-031-1/+1
|\ \ \ \
| * | | | Use faster Array.new instead of []*paddingVipul A M2013-05-021-1/+1
* | | | | Revert "Merge pull request #10433 from wangjohn/making_callbacks_more_perform...Jon Leighton2013-05-031-33/+11
* | | | | Work around change in how MiniTest detects SIGINFOJon Leighton2013-05-031-0/+4