diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-10-14 13:28:43 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-11-19 19:08:28 -0300 |
| commit | 86699339bc01f4dd8eefe86d04317b2e0b3cf233 (patch) | |
| tree | 2990478a5e460c460eb4d9cee233ec1f54e8e2b1 | |
| parent | ada014929b01af5ce8ca5e6fdd13401bc3c392f5 (diff) | |
| download | rails-86699339bc01f4dd8eefe86d04317b2e0b3cf233.tar.gz rails-86699339bc01f4dd8eefe86d04317b2e0b3cf233.tar.bz2 rails-86699339bc01f4dd8eefe86d04317b2e0b3cf233.zip | |
Weakling is only required for JRuby.
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | activerecord/lib/active_record.rb | 1 |
2 files changed, 1 insertions, 3 deletions
@@ -25,8 +25,6 @@ gem "memcache-client", ">= 1.8.5" # AM gem "text-format", "~> 1.0.0" -gem "weakling", :git => "git://github.com/swistak/weakling.git" - platforms :mri_18 do gem "system_timer" gem "ruby-debug", ">= 0.10.3" @@ -55,6 +53,7 @@ end platforms :jruby do gem "ruby-debug", ">= 0.10.3" + gem "weakling", :git => "git://github.com/headius/weakling.git" gem "activerecord-jdbcsqlite3-adapter" diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index ff6cf44a73..83e20af3d0 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -32,7 +32,6 @@ require 'active_support' require 'active_support/i18n' require 'active_model' require 'arel' -require 'weakling' require 'active_record/version' |