Gemfile.lock in paperclip-3.4.0 vs Gemfile.lock in paperclip-3.4.1
- old
+ new
@@ -3,11 +3,11 @@
specs:
paperclip (3.4.0)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
- cocaine (~> 0.4.0)
+ cocaine (~> 0.5.0)
mime-types
GEM
remote: http://rubygems.org/
specs:
@@ -43,11 +43,11 @@
aruba (0.4.11)
childprocess (>= 0.2.3)
cucumber (>= 1.1.1)
ffi (>= 1.0.11)
rspec (>= 2.7.0)
- aws-sdk (1.5.4)
+ aws-sdk (1.5.7)
httparty (~> 0.7)
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
bourne (1.1.2)
@@ -60,11 +60,14 @@
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.3.2)
ffi (~> 1.0.6)
- cocaine (0.4.2)
+ climate_control (0.0.3)
+ activesupport (>= 3.0)
+ cocaine (0.5.1)
+ climate_control (>= 0.0.3, < 1.0)
coderay (1.0.6)
cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.11.0)
@@ -86,13 +89,13 @@
ruby-hmac
formatador (0.2.3)
gherkin (2.11.0)
json (>= 1.4.6)
hike (1.2.1)
- httparty (0.8.3)
+ httparty (0.10.2)
multi_json (~> 1.0)
- multi_xml
+ multi_xml (>= 0.5.2)
i18n (0.6.0)
journey (1.0.4)
json (1.7.3)
launchy (2.1.0)
addressable (~> 2.2.6)
@@ -106,11 +109,11 @@
method_source (0.7.1)
mime-types (1.19)
mocha (0.10.5)
metaclass (~> 0.0.1)
multi_json (1.3.6)
- multi_xml (0.5.1)
+ multi_xml (0.5.2)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.6.1)
nokogiri (1.5.5)
polyglot (0.3.3)
@@ -166,11 +169,11 @@
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.35)
- uuidtools (2.1.2)
+ uuidtools (2.1.3)
xpath (0.1.4)
nokogiri (~> 1.3)
PLATFORMS
ruby
@@ -178,14 +181,13 @@
DEPENDENCIES
actionmailer
activerecord-jdbcsqlite3-adapter
appraisal
aruba
- aws-sdk (>= 1.2.0)
+ aws-sdk (>= 1.5.7)
bourne
bundler
capybara
- cocaine (~> 0.2)
cucumber (~> 1.2.1)
fakeweb
fog (>= 1.4.0, < 1.7.0)
jruby-openssl
launchy