From aad1f5adc8366613eae7de35cb0f97f9d3c69ee0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 19:02:30 +0000 Subject: [PATCH] Bump paperclip from 3.3.1 to 4.3.7 Bumps [paperclip](https://github.com/thoughtbot/paperclip) from 3.3.1 to 4.3.7. - [Release notes](https://github.com/thoughtbot/paperclip/releases) - [Changelog](https://github.com/thoughtbot/paperclip/blob/v4.3.7/NEWS) - [Commits](https://github.com/thoughtbot/paperclip/compare/v3.3.1...v4.3.7) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 29 +++++++++++++++++------------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index 09cdadb..004fd31 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem 'feedzirra' gem 'diffy' # paperclip with amazon s3 -gem "paperclip", "~> 3.0" +gem "paperclip", "~> 4.3" gem 'aws-sdk', '~> 1.3.4' gem 'formtastic', :git => 'git://github.com/justinfrench/formtastic.git', :branch => '2.1-stable', :require => 'formtastic' diff --git a/Gemfile.lock b/Gemfile.lock index e53a84c..824602d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ GEM activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) - arel (3.0.2) + arel (3.0.3) authlogic (3.2.0) activerecord (>= 3.0.0) activesupport (>= 3.0.0) @@ -91,7 +91,9 @@ GEM nokogiri (>= 1.4.4) uuidtools (~> 2.1) builder (3.0.4) - cocaine (0.4.2) + climate_control (0.2.0) + cocaine (0.5.8) + climate_control (>= 0.0.3, < 1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -100,6 +102,7 @@ GEM execjs coffee-script-source (1.4.0) commonjs (0.2.6) + concurrent-ruby (1.1.5) curb (0.8.3) diffy (2.1.3) domain_name (0.5.6) @@ -121,7 +124,8 @@ GEM httparty (0.9.0) multi_json (~> 1.0) multi_xml - i18n (0.6.1) + i18n (0.9.5) + concurrent-ruby (~> 1.0) inherited_resources (1.3.1) has_scope (~> 0.5.0) responders (~> 0.6) @@ -156,8 +160,9 @@ GEM nokogiri (~> 1.4) ntlm-http (~> 0.1, >= 0.1.1) webrobots (~> 0.0, >= 0.0.9) - mime-types (1.19) - multi_json (1.6.1) + mime-types (1.25.1) + mimemagic (0.3.0) + multi_json (1.14.1) multi_xml (0.5.1) mysql (2.8.1) mysql2 (0.3.11) @@ -165,12 +170,12 @@ GEM net-http-persistent (2.8) nokogiri (1.5.5) ntlm-http (0.1.1) - paperclip (3.3.1) - activemodel (>= 3.0.0) - activerecord (>= 3.0.0) - activesupport (>= 3.0.0) - cocaine (~> 0.4.0) + 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) rack (1.4.5) rack-cache (1.2) @@ -219,7 +224,7 @@ GEM treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.35) + tzinfo (0.3.56) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -250,7 +255,7 @@ DEPENDENCIES mechanize mysql (= 2.8.1) mysql2 - paperclip (~> 3.0) + paperclip (~> 4.3) rack-reverse-proxy! rails (= 3.2.11) railstrap!