Commit 8cec872c

mo khan <mo@mokhan.ca>
2013-05-12 03:08:16
rollback gemfile
1 parent 1168a7c
Changed files (1)
Gemfile.lock
@@ -14,7 +14,7 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activeadmin (0.6.0)
+    activeadmin (0.5.1)
       arbre (>= 1.0.1)
       bourbon (>= 1.0.0)
       devise (>= 1.1.2)
@@ -40,8 +40,8 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    acts-as-taggable-on (2.4.1)
-      rails (>= 3, < 5)
+    acts-as-taggable-on (2.3.3)
+      rails (~> 3.0)
     acts_as_commentable_with_threading (1.1.2)
       activerecord (>= 3.0)
       activesupport (~> 3.0)
@@ -62,15 +62,15 @@ GEM
     better_errors (0.8.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
-    bootstrap-sass (2.3.1.0)
+    bootstrap-sass (2.3.0.1)
       sass (~> 3.2)
-    bourbon (3.1.6)
+    bourbon (3.1.1)
       sass (>= 3.2.0)
       thor
     builder (3.0.4)
     bullet (4.6.0)
       uniform_notifier
-    capistrano (2.15.4)
+    capistrano (2.14.2)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -81,16 +81,17 @@ GEM
     capistrano-gitflow (1.4.3)
       capistrano
       stringex
-    capybara (2.1.0)
+    capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 1.0.0)
     carrierwave (0.8.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
-    carrierwave_backgrounder (0.2.1)
+    carrierwave_backgrounder (0.2.0)
       carrierwave (~> 0.5)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
@@ -101,26 +102,26 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.1)
     daemons (1.1.9)
     delayed_job (3.0.5)
       activesupport (~> 3.0)
-    delayed_job_active_record (0.4.4)
+    delayed_job_active_record (0.4.3)
       activerecord (>= 2.1.0, < 4)
       delayed_job (~> 3.0)
     developwithpassion_arrays (0.0.1)
-    devise (2.2.4)
+    devise (2.2.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.1)
     dotenv (0.7.0)
     dotenv-rails (0.7.0)
       dotenv (= 0.7.0)
     erubis (2.7.0)
     escape (0.0.4)
-    excon (0.21.0)
+    excon (0.19.5)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.2.0)
@@ -135,13 +136,13 @@ GEM
       rspec
     fastercsv (1.5.5)
     ffaker (1.16.1)
-    ffi (1.8.1)
-    fog (1.11.1)
+    ffi (1.4.0)
+    fog (1.10.0)
       builder
-      excon (~> 0.20)
+      excon (~> 0.14)
       formatador (~> 0.2.0)
-      json (~> 1.7)
       mime-types
+      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
@@ -150,13 +151,13 @@ GEM
     formtastic (2.2.1)
       actionpack (>= 3.0)
     has_scope (0.5.1)
-    highline (1.6.18)
-    hike (1.2.2)
+    highline (1.6.15)
+    hike (1.2.1)
     i18n (0.6.1)
-    inherited_resources (1.4.0)
+    inherited_resources (1.3.1)
       has_scope (~> 0.5.0)
-      responders (~> 0.9)
-    jasmine (1.3.2)
+      responders (~> 0.6)
+    jasmine (1.3.1)
       jasmine-core (~> 1.3.1)
       rack (~> 1.0)
       rspec (>= 1.3.1)
@@ -182,23 +183,23 @@ GEM
       activerecord (~> 3.1)
       activesupport (~> 3.1)
       polyamorous (~> 0.5.0)
-    mime-types (1.23)
-    mixpanel (4.0.1)
+    mime-types (1.21)
+    mixpanel (4.0.0)
       escape
       json
       rack
-    multi_json (1.7.3)
+    multi_json (1.7.1)
     net-scp (1.1.0)
       net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
+    net-sftp (2.1.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
+    net-ssh (2.6.6)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    newrelic_rpm (3.6.2.96)
-    nokogiri (1.5.9)
+    newrelic_rpm (3.5.8.72)
+    nokogiri (1.5.6)
     orm_adapter (0.4.0)
-    pg (0.15.1)
+    pg (0.14.1)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
@@ -224,8 +225,8 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rb-readline (0.5.0)
+    rake (10.0.3)
+    rb-readline (0.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
     responders (0.9.3)
@@ -235,11 +236,11 @@ GEM
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
+    rspec-core (2.13.0)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-rails (2.13.1)
+    rspec-mocks (2.13.0)
+    rspec-rails (2.13.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -248,14 +249,14 @@ GEM
       rspec-mocks (~> 2.13.0)
     ruby-hmac (0.4.0)
     rubyzip (0.9.9)
-    rvm-capistrano (1.3.0)
+    rvm-capistrano (1.2.7)
       capistrano (>= 2.0.0)
-    sass (3.2.9)
+    sass (3.2.6)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.32.1)
+    selenium-webdriver (2.31.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
@@ -271,20 +272,20 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
     stringex (1.5.1)
-    thor (0.18.1)
-    tilt (1.4.1)
+    thor (0.17.0)
+    tilt (1.3.6)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    uglifier (2.1.0)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     uniform_notifier (1.2.0)
     warden (1.2.1)
       rack (>= 1.0)
     websocket (1.0.7)
-    xpath (2.0.0)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS