Upgrade paperclip to version 5.2.1

AyuntamientoMadrid · Jan 30, 2018 · 5e76717 · 5e76717
1 parent 7cf7a8b
commit 5e76717
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,7 @@ gem 'jquery-ui-rails', '~> 5.0.5'
 gem 'jquery-validation-rails', '~> 1.13.1'
 gem 'kaminari', '~> 1.0.1'
 gem 'newrelic_rpm', '~> 3.13.2.302'
-gem 'paperclip', '~> 4.3', '>= 4.3.7'
+gem 'paperclip', '~> 5.2', '>= 4.3.7'
 gem 'pg', '~> 0.18.3'
 gem 'progress_bar', '~> 1.1.0'
 gem 'public_activity', '~> 1.4.2'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -172,16 +172,16 @@ GEM
     httpi (2.4.2)
       rack
       socksify
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
     i18n_data (0.7.0)
     initialjs-rails (0.2.0.1)
       railties (>= 3.1, < 5.0)
     invisible_captcha (0.9.3)
       rails (>= 3.2.0)
-    jbuilder (2.3.2)
-      activesupport (>= 3.0.0, < 5)
-      multi_json (~> 1.2)
+    jbuilder (2.7.0)
+      activesupport (>= 4.2.0)
+      multi_json (>= 1.2)
     jquery-rails (4.0.5)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
@@ -220,27 +220,27 @@ GEM
       mini_mime (>= 0.1.1)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mimemagic (0.3.0)
+    mimemagic (0.3.2)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.11.1)
-    multi_json (1.11.2)
+    minitest (5.11.3)
+    multi_json (1.13.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
     netrc (0.11.0)
     newrelic_rpm (3.13.2.302)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     nori (2.6.0)
     options (2.3.2)
     orm_adapter (0.5.0)
-    paperclip (4.3.7)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
+    paperclip (5.2.1)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
-      mimemagic (= 0.3.0)
+      mimemagic (~> 0.3.0)
     parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
@@ -509,7 +509,7 @@ DEPENDENCIES
   launchy (~> 2.4.3)
   letter_opener_web (~> 1.3.1)
   newrelic_rpm (~> 3.13.2.302)
-  paperclip (~> 4.3, >= 4.3.7)
+  paperclip (~> 5.2, >= 4.3.7)
   pg (~> 0.18.3)
   poltergeist (~> 1.15.0)
   premailer-rails