Tweaked the Gemfile again

[feedcatcher.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index d589268e238c9c04ec671279442b588d6026cbcb..947bac66168f54717da9a6b7254afff4cf9e023c 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,8 +38,9 @@ GEM
     capistrano-rails (1.1.0)
       capistrano (>= 3.0.0)
       capistrano-bundler (>= 1.0.0)
-    capistrano-rvm (0.0.3)
-      capistrano
+    capistrano-rvm (0.1.0)
+      capistrano (~> 3.0)
+      sshkit (~> 1.2.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -69,7 +70,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     minitest (4.7.5)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.7.0)
@@ -92,7 +93,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
-    rdoc (3.12.2)
+    rdoc (4.1.1)
       json (~> 1.4)
     rspec-core (2.14.7)
     rspec-expectations (2.14.4)
@@ -111,9 +112,9 @@ GEM
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
+    sdoc (0.4.0)
+      json (~> 1.8)
+      rdoc (~> 4.0, < 5.0)
     sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -123,7 +124,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sshkit (1.3.0)
+    sshkit (1.2.0)
       net-scp (>= 1.1.2)
       net-ssh
       term-ansicolor
@@ -137,7 +138,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.1.0)
+    turbolinks (2.2.0)
       coffee-rails
     tzinfo (0.3.38)
     uglifier (2.4.0)
@@ -151,7 +152,7 @@ DEPENDENCIES
   capistrano (~> 3.0)
   capistrano-bundler (>= 1.1.0)
   capistrano-rails (~> 1.1)
-  capistrano-rvm
+  capistrano-rvm (~> 0.1.0)
   coffee-rails (~> 4.0.0)
   factory_girl_rails
   jbuilder (~> 1.2)