Commit 4eab10bb

@@ -1,4 +1,4 @@
-$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
+#$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
 require "rvm/capistrano"
 set :rvm_ruby_string, 'ruby-1.9.2-p290@cakeside'
 set :rvm_type, :system

@@ -15,12 +15,12 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activeadmin (0.4.3)
+    activeadmin (0.4.4)
       bourbon (>= 1.0.0)
       devise (>= 1.1.2)
       fastercsv
-      formtastic (>= 2.0.0)
-      inherited_resources (> 0)
+      formtastic (~> 2.1.1)
+      inherited_resources (>= 1.3.1)
       jquery-rails (>= 1.0.0)
       kaminari (>= 0.13.0)
       meta_search (>= 0.9.2)
@@ -117,10 +117,10 @@ GEM
       em-websocket (>= 0.2.0)
       guard (>= 0.10.0)
       multi_json (~> 1.0)
-    guard-rspec (0.7.0)
+    guard-rspec (0.7.1)
       guard (>= 0.10.0)
     has_scope (0.5.1)
-    highline (1.6.11)
+    highline (1.6.12)
     hike (1.2.1)
     i18n (0.6.0)
     inherited_resources (1.3.1)
@@ -136,7 +136,7 @@ GEM
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.7.1)
+    json (1.7.3)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -153,7 +153,7 @@ GEM
       activesupport (~> 3.1)
       polyamorous (~> 0.5.0)
     mime-types (1.18)
-    multi_json (1.3.4)
+    multi_json (1.3.5)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -213,7 +213,7 @@ GEM
     rubyzip (0.9.8)
     rvm-capistrano (1.1.0)
       capistrano (>= 2.0.0)
-    sass (3.1.17)
+    sass (3.1.18)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)