diff --git a/Gemfile b/Gemfile index e2e5c70..5c8954d 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ end gem 'jquery-rails' gem 'rack-cache', :require => 'rack/cache' gem 'rmagick' -gem 'dragonfly', '~>0.9.12' +gem 'dragonfly', '~>1.4.0' gem "pry" gem 'rb-readline' # To use ActiveModel has_secure_password diff --git a/Gemfile.lock b/Gemfile.lock index 372d6ff..f5fc536 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,6 +28,8 @@ GEM activesupport (3.2.6) i18n (~> 0.6) multi_json (~> 1.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) arel (3.0.2) bcrypt-ruby (3.0.1) bootstrap-sass (2.0.0) @@ -48,8 +50,10 @@ GEM orm_adapter (~> 0.1) railties (~> 3.1) warden (~> 1.2.1) - dragonfly (0.9.12) - rack + dragonfly (1.4.0) + addressable (~> 2.3) + multi_json (~> 1.0) + rack (>= 1.3) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) @@ -92,7 +96,8 @@ GEM coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.3.1) - rack (1.4.1) + public_suffix (4.0.6) + rack (1.4.7) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) @@ -155,7 +160,7 @@ DEPENDENCIES bson_ext coffee-rails (~> 3.2.1) devise - dragonfly (~> 0.9.12) + dragonfly (~> 1.4.0) jquery-rails kaminari mongoid (= 2.4.12)