Merge pull request #584 from SUSE/depfu/update/paperclip-6.1.0

Upgrade paperclip: 5.3.0 → 6.1.0 (major)
SUSE · Feb 5, 2020 · 0d7b0d2 · 0d7b0d2
2 parents fe6b574 + 1146529
commit 0d7b0d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -79,7 +79,7 @@ gem 'rspec-rails', :group => [:development, :test]
 gem 'capybara', :group => [:development, :test]
 gem 'rails-controller-testing', group: [:development, :test]
 # for file attachments
-gem 'paperclip', '~> 5.2'
+gem 'paperclip', '~> 6.1'
 # as deployer
 gem 'mina', '~> 0.3'
 # as the app server

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -175,10 +175,10 @@ GEM
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
     middleware (0.1.0)
-    mime-types (3.1)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mimemagic (0.3.3)
+    mime-types-data (3.2019.1009)
+    mimemagic (0.3.4)
     mina (0.3.8)
       open4 (~> 1.3.4)
       rake
@@ -193,7 +193,7 @@ GEM
       mini_portile2 (~> 2.4.0)
     open4 (1.3.4)
     orm_adapter (0.5.0)
-    paperclip (5.3.0)
+    paperclip (6.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       mime-types
@@ -392,7 +392,7 @@ DEPENDENCIES
   mina (~> 0.3)
   mousetrap-rails
   mysql2
-  paperclip (~> 5.2)
+  paperclip (~> 6.1)
   poltergeist
   pry-byebug
   pry-rails