From 86699339bc01f4dd8eefe86d04317b2e0b3cf233 Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Thu, 14 Oct 2010 13:28:43 -0300 Subject: Weakling is only required for JRuby. --- Gemfile | 3 +-- activerecord/lib/active_record.rb | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4e1bd1325e..59f8771a0b 100644 --- a/Gemfile +++ b/Gemfile @@ -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' -- cgit v1.2.3