aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | add instance_accessor option to ActiveSupport::Configurable#config_accessorFrancesco Rodriguez2012-06-053-9/+82
|/ / /
* | | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3Carlos Antonio da Silva2012-06-051-0/+3
|\ \ \
| * | | The resolver tests fail if the mysql gem is not installed; this breaksDavid Paschich2012-06-031-0/+3
| |/ /
* | | Merge pull request #6632 from route/one_line_code_for_loggerJosé Valim2012-06-051-5/+1
|\ \ \
| * | | One-liner code for logger in ActionView::Helpers::ControllerHelperDmitry Vorotilin2012-06-051-5/+1
|/ / /
* | | Merge pull request #6631 from yuki24/use_block_in_button_helperJosé Valim2012-06-052-3/+18
|\ \ \
| * | | accept a block in button helper.Yuki Nishijima2012-06-052-3/+18
| | |/ | |/|
* | | Merge pull request #6628 from fredwu/fix_skip_gemspecJosé Valim2012-06-052-0/+41
|\ \ \
| * | | Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' commandFred Wu2012-06-052-0/+41
| |/ /
* | | Merge pull request #6630 from route/logger_in_metalJosé Valim2012-06-051-2/+8
|\ \ \ | |/ / |/| |
| * | Metal controller doesn't have logger method, check it and then delegateDmitry Vorotilin2012-06-051-2/+8
| |/
* | Merge pull request #6619 from kennyj/fix_6591Piotr Sarnacki2012-06-042-1/+13
|\ \ | |/ |/|
| * Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
| * Add failing test for 3.2.5 datetime attribute regressionEvan Arnold2012-06-041-0/+11
|/
* Merge pull request #6607 from parndt/patch-2Vijay Dev2012-06-031-2/+2
|\