aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Remove bundle exec from the exception messageRafael Mendonça França2012-06-101-1/+1
* | | | | Add test to column alias in `exists?` SQL.Rafael Mendonça França2012-06-102-1/+7
* | | | | Minimal change to query generation of exists? that makes SQLServer and others...iaddict2012-06-101-1/+1
* | | | | Merge pull request #6695 from kennyj/fix_6635Rafael Mendonça França2012-06-102-5/+14
|\ \ \ \ \
| * | | | | Fix #6635. We should call Scoping methods, before calling Array methods.kennyj2012-06-102-5/+14
* | | | | | Ensure that mass assignment options are preservedAndrew White2012-06-104-11/+55
|/ / / / /
* | | | | Merge pull request #6694 from arunagw/build_fix_masterJosé Valim2012-06-101-1/+1
|\ \ \ \ \
| * | | | | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fbaArun Agrawal2012-06-101-1/+1
|/ / / / /
* | | | | Merge pull request #6692 from schneems/schneems/something-went-wrongJosé Valim2012-06-102-0/+2
|\ \ \ \ \
| * | | | | add prompt to 404 & 500 pages to check logsschneems2012-06-092-0/+2
* | | | | | Use . instead of :: for class methods, add CHANGELOG entriesJosé Valim2012-06-105-5/+10
* | | | | | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-106-0/+74
|\ \ \ \ \ \
| * | | | | | test errors for pending migrationsschneems2012-06-091-0/+15
| * | | | | | raise error for pending migration schneems2012-06-095-4/+40
| * | | | | | add convenience methods for checking migrationsschneems2012-06-032-0/+23
* | | | | | | Merge pull request #6683 from stevecj/fix-fragile-assert-queriesRafael Mendonça França2012-06-095-25/+37
|\ \ \ \ \ \ \
| * | | | | | | Fix fragile #assert_queries implementation and usages.Steve Jorgensen2012-06-095-25/+37
* | | | | | | | removes the obsolete require_association method from dependenciesXavier Noria2012-06-103-21/+7
| |_|/ / / / / |/| | | | | |
* | | | | | | Remove conditional committed by accidentSantiago Pastorino2012-06-091-1/+1
* | | | | | | Use each_with_object instead of each hereSantiago Pastorino2012-06-092-4/+4
* | | | | | | Merge pull request #6687 from tiegz/3-2-optimizationsJosé Valim2012-06-091-1/+3
| |_|/ / / / |/| | | | |
* | | | | | Fix tests, active_authorizer shouldn't include blank valuesPiotr Sarnacki2012-06-091-1/+1
|/ / / / /
* | | | | Merge pull request #6668 from pomnikita/masterPiotr Sarnacki2012-06-082-1/+7
|\ \ \ \ \
| * | | | | Compact array of values added to PermissionSet instanceNikita Pomyashchiy2012-06-082-1/+7
* | | | | | Merge pull request #6681 from arunagw/plugin_gen_fixRafael Mendonça França2012-06-082-3/+9
|\ \ \ \ \ \
| * | | | | | We should not include engine.rake file into rakeArun Agrawal2012-06-082-1/+9
| * | | | | | Removed protected as we already doing it above.Arun Agrawal2012-06-081-2/+0
| | |_|_|/ / | |/| | | |
* / | | | | Don't add sqlite3 to gemspec with -O on rails plugin newPiotr Sarnacki2012-06-082-0/+10
|/ / / / /
* | | | | Merge pull request #6667 from yahonda/skip_polymorphic_index_with_oracleRafael Mendonça França2012-06-071-0/+3
|\ \ \ \ \
| * | | | | Skip two tests with polymorphic if current adapter is Oracle Adapter.Yasuo Honda2012-06-081-0/+3
| |/ / / /
* | | | | Merge pull request #6597 from frodsan/am_include_root_to_falseRafael Mendonça França2012-06-074-98/+115
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | change AMS::JSON.include_root_in_json default value to falseFrancesco Rodriguez2012-06-064-98/+115
| | |_|/ | |/| |
* | | | Merge pull request #6629 from marcandre/destroyCarlos Antonio da Silva2012-06-065-0/+34
|\ \ \ \
| * | | | + ActiveRecord::Base#destroy!Marc-Andre Lafortune2012-06-065-0/+34
* | | | | Merge pull request #6645 from amatsuda/reduce_string_instanceCarlos Antonio da Silva2012-06-0613-36/+30
|\ \ \ \ \
| * | | | | reduce number of StringsAkira Matsuda2012-06-062-2/+2
| * | | | | no need to to_s here. Both String and Symbol can be interpolated into StringAkira Matsuda2012-06-061-3/+0
| * | | | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-065-7/+7
| * | | | | stop `to_s`ing method namesAkira Matsuda2012-06-066-24/+21
* | | | | | Merge pull request #6647 from amatsuda/192_minitest_method_nameRafael Mendonça França2012-06-061-2/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | MiniTest::Spec shipped with Ruby >= 1.9.3 always responds_to __name__Akira Matsuda2012-06-061-2/+1
|/ / / / /
* | | | | Merge pull request #6644 from amatsuda/fix_meaningless_test_caseAndrew White2012-06-061-1/+1
|\ \ \ \ \
| * | | | | fix meaningless test caseAkira Matsuda2012-06-061-1/+1
* | | | | | Make method name consistent with existing methodsAndrew White2012-06-062-4/+4
* | | | | | Merge pull request #6643 from fredwu/fix_require_dependencyJosé Valim2012-06-063-6/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed the application_controller require_dependency path generated by the app...Fred Wu2012-06-063-6/+9
|/ / / / /
* | | | | Eliminate dependency on Rails::VERSION::STRINGAndrew White2012-06-053-21/+44
* | | | | Merge pull request #6627 from Vanuan/tests_add_precompile_failure_assertJosé Valim2012-06-051-17/+24
|\ \ \ \ \
| * | | | | bundle exec rake assets:precompile shouldn't fail quietly.John Yani2012-06-051-17/+24
| | |/ / / | |/| | |
* | | | | Merge pull request #6638 from frodsan/config_accessorRafael Mendonça França2012-06-053-9/+82
|\ \ \ \ \