Commit 8758e1ca by Jon Yurek

Merge pull request #1139 from johnnyshields/master

Updating Cocaine to ~> 0.5.0 to get latest fixes
parents e362e5da d7aef303
...@@ -28,7 +28,7 @@ Gem::Specification.new do |s| ...@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
s.add_dependency('activerecord', '>= 3.0.0') s.add_dependency('activerecord', '>= 3.0.0')
s.add_dependency('activemodel', '>= 3.0.0') s.add_dependency('activemodel', '>= 3.0.0')
s.add_dependency('activesupport', '>= 3.0.0') s.add_dependency('activesupport', '>= 3.0.0')
s.add_dependency('cocaine', '~> 0.4.0') s.add_dependency('cocaine', '~> 0.5.0')
s.add_dependency('mime-types') s.add_dependency('mime-types')
s.add_development_dependency('shoulda') s.add_development_dependency('shoulda')
...@@ -42,7 +42,6 @@ Gem::Specification.new do |s| ...@@ -42,7 +42,6 @@ Gem::Specification.new do |s|
s.add_development_dependency('nokogiri') s.add_development_dependency('nokogiri')
s.add_development_dependency('capybara') s.add_development_dependency('capybara')
s.add_development_dependency('bundler') s.add_development_dependency('bundler')
s.add_development_dependency('cocaine', '~> 0.2')
s.add_development_dependency('fog', '>= 1.4.0', "< 1.7.0") s.add_development_dependency('fog', '>= 1.4.0', "< 1.7.0")
s.add_development_dependency('pry') s.add_development_dependency('pry')
s.add_development_dependency('launchy') s.add_development_dependency('launchy')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment