Merge pull request #1229 from sparc-request/wth-update-paperclip

wth - Security vulnerability in paperclip gem
sparc-request · Feb 5, 2018 · bbd1a99 · bbd1a99
2 parents d96ae35 + ce9bcf0
commit bbd1a99
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -51,7 +51,7 @@ gem 'nprogress-rails'
 gem 'net-ldap', '~> 0.16.0'
 gem 'omniauth'
 gem 'omniauth-shibboleth'
-gem 'paperclip', '~> 4.3', '>= 4.3.7'
+gem 'paperclip', '~> 5.2', '>= 5.2.1'
 gem 'pdfkit'
 gem 'prawn', '0.12.0'
 gem 'premailer-rails'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -334,12 +334,12 @@ GEM
       omniauth (>= 1.0.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)
     parallel_tests (2.19.0)
       parallel
@@ -624,7 +624,7 @@ DEPENDENCIES
   omniauth
   omniauth-cas
   omniauth-shibboleth
-  paperclip (~> 4.3, >= 4.3.7)
+  paperclip (~> 5.2, >= 5.2.1)
   parallel_tests
   pdfkit
   prawn (= 0.12.0)
@@ -669,4 +669,4 @@ DEPENDENCIES
   x-editable-rails
 
 BUNDLED WITH
-   1.16.0
+   1.16.1