Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #6694 from arunagw/build_fix_master | José Valim | 2012-06-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fba | Arun Agrawal | 2012-06-10 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #6692 from schneems/schneems/something-went-wrong | José Valim | 2012-06-10 | 2 | -0/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add prompt to 404 & 500 pages to check logs | schneems | 2012-06-09 | 2 | -0/+2 | |
* | | | | | | | Use . instead of :: for class methods, add CHANGELOG entries | José Valim | 2012-06-10 | 5 | -5/+10 | |
* | | | | | | | Merge pull request #6665 from schneems/schneems/raise-migration-error | José Valim | 2012-06-10 | 6 | -0/+74 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | test errors for pending migrations | schneems | 2012-06-09 | 1 | -0/+15 | |
| * | | | | | | | raise error for pending migration | schneems | 2012-06-09 | 5 | -4/+40 | |
| * | | | | | | | add convenience methods for checking migrations | schneems | 2012-06-03 | 2 | -0/+23 | |
* | | | | | | | | Merge pull request #6683 from stevecj/fix-fragile-assert-queries | Rafael Mendonça França | 2012-06-09 | 5 | -25/+37 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix fragile #assert_queries implementation and usages. | Steve Jorgensen | 2012-06-09 | 5 | -25/+37 | |
* | | | | | | | | | removes the obsolete require_association method from dependencies | Xavier Noria | 2012-06-10 | 3 | -21/+7 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Remove conditional committed by accident | Santiago Pastorino | 2012-06-09 | 1 | -1/+1 | |
* | | | | | | | | Use each_with_object instead of each here | Santiago Pastorino | 2012-06-09 | 2 | -4/+4 | |
* | | | | | | | | Merge pull request #6687 from tiegz/3-2-optimizations | José Valim | 2012-06-09 | 1 | -1/+3 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | Fix tests, active_authorizer shouldn't include blank values | Piotr Sarnacki | 2012-06-09 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #6668 from pomnikita/master | Piotr Sarnacki | 2012-06-08 | 2 | -1/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Compact array of values added to PermissionSet instance | Nikita Pomyashchiy | 2012-06-08 | 2 | -1/+7 | |
* | | | | | | | Merge pull request #6681 from arunagw/plugin_gen_fix | Rafael Mendonça França | 2012-06-08 | 2 | -3/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | We should not include engine.rake file into rake | Arun Agrawal | 2012-06-08 | 2 | -1/+9 | |
| * | | | | | | | Removed protected as we already doing it above. | Arun Agrawal | 2012-06-08 | 1 | -2/+0 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* / | | | | | | Don't add sqlite3 to gemspec with -O on rails plugin new | Piotr Sarnacki | 2012-06-08 | 2 | -0/+10 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #6667 from yahonda/skip_polymorphic_index_with_oracle | Rafael Mendonça França | 2012-06-07 | 1 | -0/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Skip two tests with polymorphic if current adapter is Oracle Adapter. | Yasuo Honda | 2012-06-08 | 1 | -0/+3 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #6597 from frodsan/am_include_root_to_false | Rafael Mendonça França | 2012-06-07 | 4 | -98/+115 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | change AMS::JSON.include_root_in_json default value to false | Francesco Rodriguez | 2012-06-06 | 4 | -98/+115 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #6629 from marcandre/destroy | Carlos Antonio da Silva | 2012-06-06 | 5 | -0/+34 | |
|\ \ \ \ \ | ||||||
| * | | | | | + ActiveRecord::Base#destroy! | Marc-Andre Lafortune | 2012-06-06 | 5 | -0/+34 | |
* | | | | | | Merge pull request #6645 from amatsuda/reduce_string_instance | Carlos Antonio da Silva | 2012-06-06 | 13 | -36/+30 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | reduce number of Strings | Akira Matsuda | 2012-06-06 | 2 | -2/+2 | |
| * | | | | | | no need to to_s here. Both String and Symbol can be interpolated into String | Akira Matsuda | 2012-06-06 | 1 | -3/+0 | |
| * | | | | | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9 | Akira Matsuda | 2012-06-06 | 5 | -7/+7 | |
| * | | | | | | stop `to_s`ing method names | Akira Matsuda | 2012-06-06 | 6 | -24/+21 | |
* | | | | | | | Merge pull request #6647 from amatsuda/192_minitest_method_name | Rafael Mendonça França | 2012-06-06 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | MiniTest::Spec shipped with Ruby >= 1.9.3 always responds_to __name__ | Akira Matsuda | 2012-06-06 | 1 | -2/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #6644 from amatsuda/fix_meaningless_test_case | Andrew White | 2012-06-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix meaningless test case | Akira Matsuda | 2012-06-06 | 1 | -1/+1 | |
* | | | | | | | Make method name consistent with existing methods | Andrew White | 2012-06-06 | 2 | -4/+4 | |
* | | | | | | | Merge pull request #6643 from fredwu/fix_require_dependency | José Valim | 2012-06-06 | 3 | -6/+9 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fixed the application_controller require_dependency path generated by the app... | Fred Wu | 2012-06-06 | 3 | -6/+9 | |
|/ / / / / / | ||||||
* | | | | | | Eliminate dependency on Rails::VERSION::STRING | Andrew White | 2012-06-05 | 3 | -21/+44 | |
* | | | | | | Merge pull request #6627 from Vanuan/tests_add_precompile_failure_assert | José Valim | 2012-06-05 | 1 | -17/+24 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | bundle exec rake assets:precompile shouldn't fail quietly. | John Yani | 2012-06-05 | 1 | -17/+24 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #6638 from frodsan/config_accessor | Rafael Mendonça França | 2012-06-05 | 3 | -9/+82 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add instance_accessor option to ActiveSupport::Configurable#config_accessor | Francesco Rodriguez | 2012-06-05 | 3 | -9/+82 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3 | Carlos Antonio da Silva | 2012-06-05 | 1 | -0/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | The resolver tests fail if the mysql gem is not installed; this breaks | David Paschich | 2012-06-03 | 1 | -0/+3 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #6632 from route/one_line_code_for_logger | José Valim | 2012-06-05 | 1 | -5/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | One-liner code for logger in ActionView::Helpers::ControllerHelper | Dmitry Vorotilin | 2012-06-05 | 1 | -5/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #6631 from yuki24/use_block_in_button_helper | José Valim | 2012-06-05 | 2 | -3/+18 | |
|\ \ \ \ \ \ |