diff --git a/Gemfile.lock b/Gemfile.lock index e2c665b..4f31ae0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ PATH acts_as_indexed coffee-rails (~> 3.2.1) coffee_cup - dragonfly (~> 0.9.11) + dragonfly (>= 0.9.11, < 1.5.0) jquery-rails rack-cache rails (~> 3.2.0) @@ -17,32 +17,32 @@ PATH GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.11) - actionpack (= 3.2.11) - mail (~> 2.4.4) - actionpack (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + actionmailer (3.2.22.5) + actionpack (= 3.2.22.5) + mail (~> 2.5.4) + actionpack (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.11) - activesupport (= 3.2.11) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) - activesupport (3.2.11) - i18n (~> 0.6) + activeresource (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + activesupport (3.2.22.5) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) acts_as_indexed (0.8.3) addressable (2.3.2) @@ -67,13 +67,14 @@ GEM execjs coffee-script-source (1.12.2) coffee_cup (0.0.4) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.8) database_cleaner (0.9.1) - dragonfly (0.9.15) + dragonfly (1.4.0) + addressable (~> 2.3) multi_json (~> 1.0) - rack + rack (>= 1.3) erubis (2.7.0) - execjs (2.7.0) + execjs (2.8.1) ffi (1.8.1) formatador (0.2.4) guard (1.8.0) @@ -102,42 +103,41 @@ GEM rb-inotify (>= 0.9) rb-kqueue (>= 0.2) lumberjack (1.0.3) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.8.1) mime-types (1.19) - multi_json (1.3.6) + multi_json (1.15.0) nokogiri (1.5.5) polyglot (0.3.5) pry (0.9.12.2) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) - rack (1.4.1) - rack-cache (1.8.0) + rack (1.4.7) + rack-cache (1.12.1) rack (>= 0.4) rack-ssl (1.3.4) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.11) - actionmailer (= 3.2.11) - actionpack (= 3.2.11) - activerecord (= 3.2.11) - activeresource (= 3.2.11) - activesupport (= 3.2.11) + rails (3.2.22.5) + actionmailer (= 3.2.22.5) + actionpack (= 3.2.22.5) + activerecord (= 3.2.22.5) + activeresource (= 3.2.22.5) + activesupport (= 3.2.22.5) bundler (~> 1.0) - railties (= 3.2.11) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + railties (= 3.2.22.5) + railties (3.2.22.5) + actionpack (= 3.2.22.5) + activesupport (= 3.2.22.5) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (12.3.2) + rake (13.0.3) rb-fsevent (0.9.3) rb-inotify (0.9.0) ffi (>= 0.5.0) @@ -180,10 +180,10 @@ GEM polyglot (>= 0.3.1) turn (0.9.3) ansi - tzinfo (0.3.55) - uglifier (4.1.20) + tzinfo (0.3.60) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) - will_paginate (3.1.6) + will_paginate (3.3.0) xpath (0.1.4) nokogiri (~> 1.3) diff --git a/ample_assets.gemspec b/ample_assets.gemspec index 32e2684..95a408d 100644 --- a/ample_assets.gemspec +++ b/ample_assets.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.test_files = Dir["test/**/*"] s.add_dependency "rails", "~> 3.2.0" - s.add_dependency "dragonfly", "~> 0.9.11" + s.add_dependency "dragonfly", ">= 0.9.11", "< 1.5.0" s.add_dependency "jquery-rails" s.add_dependency "rack-cache" s.add_dependency "sass-rails", "~> 3.2.3"