diff --git a/Gemfile b/Gemfile index 2b82440..5a15062 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source 'http://rubygems.org' gem 'rails', '3.0.13' gem 'will_paginate', ">= 3.0.pre2" -gem 'paperclip', "=2.3.11" +gem 'paperclip', "4.2.2" gem 'formtastic' gem 'validation_reflection' gem 'mysql2','0.2.7' diff --git a/Gemfile.lock b/Gemfile.lock index d74af7f..2d231c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,13 +30,16 @@ GEM activesupport (3.0.13) arel (2.0.10) builder (2.1.2) + climate_control (0.2.0) + cocaine (0.5.8) + climate_control (>= 0.0.3, < 1.0) deep_cloneable (1.4.1) rails erubis (2.6.6) abstract (>= 1.0.0) formtastic (2.2.1) actionpack (>= 3.0) - i18n (0.5.0) + i18n (0.5.4) json (1.7.3) mail (2.2.19) activesupport (>= 2.3.6) @@ -45,9 +48,11 @@ GEM treetop (~> 1.4.8) mime-types (1.19) mysql2 (0.2.7) - paperclip (2.3.11) - activerecord (>= 2.3.0) - activesupport (>= 2.3.2) + paperclip (4.2.2) + activemodel (>= 3.0.0) + activesupport (>= 3.0.0) + cocaine (~> 0.5.3) + mime-types polyglot (0.3.3) rack (1.2.5) rack-mount (0.6.14) @@ -76,7 +81,7 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (0.3.55) validation_reflection (1.0.0) will_paginate (3.0.3) @@ -87,7 +92,7 @@ DEPENDENCIES deep_cloneable (~> 1.4.1) formtastic mysql2 (= 0.2.7) - paperclip (= 2.3.11) + paperclip (= 4.2.2) rails (= 3.0.13) rmagick validation_reflection