diff --git a/Gemfile b/Gemfile index a17faa2..ea9869a 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'rails', '3.2.13' gem 'jquery-ui-rails' # Use Paperclip for image dependency management -gem "paperclip", "~> 2.3" +gem "paperclip", "~> 4.3" # Use rubyzip for serving zipped up widget files gem "rubyzip" diff --git a/Gemfile.lock b/Gemfile.lock index 6b0278b..d165a10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,7 +32,7 @@ GEM activesupport (3.2.13) i18n (= 0.6.1) multi_json (~> 1.0) - arel (3.0.2) + arel (3.0.3) backup (3.4.0) open4 (~> 1.3.0) thor (>= 0.15.4, < 2) @@ -55,9 +55,8 @@ GEM xpath (~> 2.0) chronic (0.9.1) chunky_png (1.2.8) - climate_control (0.0.3) - activesupport (>= 3.0) - cocaine (0.5.1) + climate_control (0.2.0) + cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) compass (0.12.2) chunky_png (~> 1.2) @@ -115,9 +114,10 @@ GEM skinny (~> 0.2.3) sqlite3 (~> 1.3) thin (~> 1.5.0) - mime-types (1.23) + mime-types (1.25.1) + mimemagic (0.3.0) mini_portile (0.5.0) - multi_json (1.7.6) + multi_json (1.13.1) mysql2 (0.3.11) net-scp (1.1.1) net-ssh (>= 2.6.5) @@ -130,11 +130,12 @@ GEM mini_portile (~> 0.5.0) open4 (1.3.0) orm_adapter (0.0.7) - paperclip (2.8.0) - activerecord (>= 2.3.0) - activesupport (>= 2.3.2) - cocaine (>= 0.0.2) + paperclip (4.3.7) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) mime-types + mimemagic (= 0.3.0) polyglot (0.3.3) populator (1.0.0) rack (1.4.5) @@ -206,7 +207,7 @@ GEM treetop (1.4.14) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) + tzinfo (0.3.55) uglifier (2.1.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -242,7 +243,7 @@ DEPENDENCIES jquery-ui-rails mailcatcher mysql2 - paperclip (~> 2.3) + paperclip (~> 4.3) populator rails (= 3.2.13) rails_autolink