[gem] Lock cocaine version to avoid breaking paperclip

osbridge · Dec 1, 2013 · b3b1543 · b3b1543
1 parent aef5e6c
commit b3b1543
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -35,6 +35,7 @@ gem 'comma',               '~> 3.0'
 gem 'gchartrb',            '~> 0.8.0', :require => 'google_chart'
 gem 'hpricot',             '~> 0.8.2'
 gem 'paperclip',           '~> 2.3.1'
+gem 'cocaine',             '0.3.2'
 gem 'vpim-rails', :git => "https://github.com/osbridge/vpim-rails.git", :require => 'vpim/icalendar'
 gem 'action_mailer_tls',   '~> 1.1.3'
 gem 'nokogiri',            '~> 1.5.10'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -73,10 +73,7 @@ GEM
       xpath (~> 1.0.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
-    cocaine (0.5.1)
-      climate_control (>= 0.0.3, < 1.0)
+    cocaine (0.3.2)
     coderay (1.0.9)
     color (1.4.2)
     columnize (0.3.6)
@@ -285,6 +282,7 @@ DEPENDENCIES
   capistrano
   capistrano-ext
   capybara (~> 2.0.0)
+  cocaine (= 0.3.2)
   color
   comma (~> 3.0)
   coveralls