gemfile wars

1 files changed, 18 insertions, 14 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 323329257..e2c6e116a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,6 +68,7 @@ GEM
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
+    SystemTimer (1.2.1)
     abstract (1.0.0)
     actionmailer (3.0.3)
       actionpack (= 3.0.3)
@@ -96,7 +97,6 @@ GEM
       activesupport (= 3.0.3)
     activesupport (3.0.3)
     addressable (2.2.2)
-    archive-tar-minitar (0.5.2)
     arel (2.0.9)
     aws (2.3.32)
       activesupport
@@ -123,6 +123,7 @@ GEM
       selenium-webdriver (>= 0.0.3)
     carrierwave (0.5.2)
       activesupport (~> 3.0)
+    cgi_multipart_eof_fix (2.5.0)
     chalofa_ruby-progressbar (0.0.9.1)
     chef (0.9.12)
       bunny (>= 0.6.0)
@@ -181,6 +182,7 @@ GEM
     faraday_middleware (0.3.2)
       faraday (~> 0.5.4)
     fastercsv (1.5.4)
+    fastthread (1.0.7)
     ffi (0.6.3)
       rake (>= 0.8.7)
     fixture_builder (0.2.2)
@@ -199,6 +201,7 @@ GEM
       chalofa_ruby-progressbar (~> 0.0.9)
       rspec (~> 2.0)
       rspec-instafail (~> 0.1.4)
+    gem_plugin (0.2.3)
     gherkin (2.3.8)
       json (>= 1.4.6)
     haml (3.0.25)
@@ -220,8 +223,7 @@ GEM
     launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
+    linecache (0.43)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -236,6 +238,11 @@ GEM
     mixlib-config (1.1.2)
     mixlib-log (1.3.0)
     moneta (0.6.0)
+    mongrel (1.1.5)
+      cgi_multipart_eof_fix (>= 2.4)
+      daemons (>= 1.0.3)
+      fastthread (>= 1.0.1)
+      gem_plugin (>= 0.2.3)
     multi_json (0.0.5)
     multi_xml (0.2.2)
     multipart-post (1.1.1)
@@ -340,20 +347,15 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.6.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     ruby-hmac (0.4.0)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
     selenium-client (1.2.18)
@@ -400,6 +402,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  SystemTimer (= 1.2.1)
   acts-as-taggable-on!
   addressable (= 2.2.2)
   aws (= 2.3.32)
@@ -430,6 +433,7 @@ DEPENDENCIES
   json (= 1.4.6)
   launchy
   mini_magick (= 3.2)
+  mongrel
   mysql2 (= 0.2.6)
   nokogiri
   ohai (= 0.5.8)
@@ -442,7 +446,7 @@ DEPENDENCIES
   rspec (>= 2.0.0)
   rspec-instafail (>= 0.1.7)
   rspec-rails (>= 2.0.0)
-  ruby-debug19
+  ruby-debug
   selenium-webdriver (= 0.1.3)
   sod!
   thin (= 1.2.11)