Browse files

Update some dependencies

  • Loading branch information...
1 parent deac3d4 commit 86dc49bdd79a91adb337c25195341f4f701617db @jyurek jyurek committed Oct 19, 2012
Showing with 11 additions and 11 deletions.
  1. +10 −10 Gemfile.lock
  2. +1 −1 paperclip.gemspec
View
20 Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- paperclip (3.2.0)
+ paperclip (3.3.0)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -52,7 +52,7 @@ GEM
uuidtools (~> 2.1)
bourne (1.1.2)
mocha (= 0.10.5)
- builder (3.0.0)
+ builder (3.0.4)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -62,7 +62,7 @@ GEM
xpath (~> 0.1.4)
childprocess (0.3.2)
ffi (~> 1.0.6)
- cocaine (0.4.0)
+ cocaine (0.4.2)
coderay (1.0.6)
cucumber (1.2.1)
builder (>= 2.1.2)
@@ -71,12 +71,12 @@ GEM
json (>= 1.4.6)
diff-lcs (1.1.3)
erubis (2.7.0)
- excon (0.14.3)
+ excon (0.16.7)
fakeweb (1.3.0)
ffi (1.0.11)
- fog (1.4.0)
+ fog (1.6.0)
builder
- excon (~> 0.14.0)
+ excon (~> 0.14)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
@@ -104,15 +104,15 @@ GEM
treetop (~> 1.4.8)
metaclass (0.0.1)
method_source (0.7.1)
- mime-types (1.18)
+ mime-types (1.19)
mocha (0.10.5)
metaclass (~> 0.0.1)
multi_json (1.3.6)
multi_xml (0.5.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
- net-ssh (2.5.2)
- nokogiri (1.5.4)
+ net-ssh (2.6.1)
+ nokogiri (1.5.5)
polyglot (0.3.3)
pry (0.9.9.6)
coderay (~> 1.0.5)
@@ -187,7 +187,7 @@ DEPENDENCIES
cocaine (~> 0.2)
cucumber (~> 1.2.1)
fakeweb
- fog (~> 1.4.0)
+ fog (>= 1.4.0, < 1.7.0)
jruby-openssl
launchy
mocha
View
2 paperclip.gemspec
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
s.add_development_dependency('capybara')
s.add_development_dependency('bundler')
s.add_development_dependency('cocaine', '~> 0.2')
- s.add_development_dependency('fog', '~> 1.4.0')
+ s.add_development_dependency('fog', '>= 1.4.0', "< 1.7.0")
s.add_development_dependency('pry')
s.add_development_dependency('launchy')
s.add_development_dependency('rake')

0 comments on commit 86dc49b

Please sign in to comment.