From 7b7b0e2b81dd4a3c6f0c1d2e0704cf21733b26ed Mon Sep 17 00:00:00 2001 From: Enigel Date: Tue, 30 Mar 2021 19:42:43 +0100 Subject: [PATCH 1/4] AO3-5578 Use kt-paperclip as a drop-in replacement for paperclip --- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 643095697fe..b3d7fb4199b 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,7 @@ gem 'aws-sdk' gem 'css_parser' gem "terrapin" -gem 'paperclip', '>= 5.2.0' +gem "kt-paperclip", ">= 5.2.0" # for looking up image dimensions quickly gem 'fastimage' diff --git a/Gemfile.lock b/Gemfile.lock index 3d890b68660..7db12fe5e88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1135,6 +1135,12 @@ GEM jmespath (1.4.0) json (2.3.1) kgio (2.10.0) + kt-paperclip (6.4.1) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) + mime-types + mimemagic (~> 0.3.0) + terrapin (~> 0.6.0) launchy (2.5.0) addressable (~> 2.7) lograge (0.11.2) @@ -1193,12 +1199,6 @@ GEM nokogiri ntlm-http (0.1.1) orm_adapter (0.5.0) - paperclip (6.1.0) - activemodel (>= 4.2.0) - activesupport (>= 4.2.0) - mime-types - mimemagic (~> 0.3.0) - terrapin (~> 0.6.0) permit_yo (2.1.3) phraseapp-in-context-editor-ruby (1.3.1) i18n (>= 0.6) @@ -1439,6 +1439,7 @@ DEPENDENCIES htmlentities httparty kgio (= 2.10.0) + kt-paperclip (>= 5.2.0) launchy lograge mechanize @@ -1447,7 +1448,6 @@ DEPENDENCIES newrelic_rpm nokogiri (>= 1.8.5) nokogumbo (= 1.4.9) - paperclip (>= 5.2.0) permit_yo phraseapp-in-context-editor-ruby (>= 1.0.6) pickle From be623351da429181a6738d17b6c639d0a1e645e2 Mon Sep 17 00:00:00 2001 From: Sarken Date: Mon, 12 Apr 2021 02:19:21 -0400 Subject: [PATCH 2/4] Upgrade to Ruby 2.7.3 --- .rubocop.yml | 2 +- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 971b6900938..21d91d8578b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -10,7 +10,7 @@ AllCops: - "(?:^|/)factories/" - "(?:^|/)features/" - "(?:^|/)spec/" - TargetRubyVersion: 2.6 + TargetRubyVersion: 2.7 Bundler/OrderedGems: Enabled: false diff --git a/.ruby-version b/.ruby-version index d7edb568617..c0013a89ced 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.6.5 +ruby-2.7.3 diff --git a/Gemfile b/Gemfile index 859b2cb9df0..d991f415d71 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.6.5' +ruby '2.7.3' gem 'test-unit', '~> 3.2' diff --git a/Gemfile.lock b/Gemfile.lock index eb810c1d8d8..584da47cf2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1160,10 +1160,10 @@ GEM webrobots (>= 0.0.9, < 0.2) method_source (1.0.0) mime-types (2.99.3) - mini_mime (1.0.2) mimemagic (0.3.10) nokogiri (~> 1) rake + mini_mime (1.0.2) mini_portile2 (2.5.0) minitest (5.14.2) mono_logger (1.1.0) @@ -1490,7 +1490,7 @@ DEPENDENCIES will_paginate (>= 3.0.2) RUBY VERSION - ruby 2.6.5p114 + ruby 2.7.3p183 BUNDLED WITH 1.17.3 From e58f82ffa2e96faa02306fd15fcfa0346bbcd3da Mon Sep 17 00:00:00 2001 From: Sarken Date: Mon, 12 Apr 2021 02:49:13 -0400 Subject: [PATCH 3/4] AO3-6157 Also update Dockerfile --- config/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/docker/Dockerfile b/config/docker/Dockerfile index 01277d1b20e..abf7534a591 100644 --- a/config/docker/Dockerfile +++ b/config/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6.5 +FROM ruby:2.7.3 # Install additional packages RUN apt-get update && \ From e4cd9d8d89a39fbb051e4c0cb71d0a8af5a1188c Mon Sep 17 00:00:00 2001 From: Sarken Date: Thu, 22 Apr 2021 22:35:36 -0400 Subject: [PATCH 4/4] AO3-6157 Update rest-client and mime-types gems --- Gemfile | 2 +- Gemfile.lock | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index d991f415d71..3666ebecc7a 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem 'sanitize', '>= 4.6.5' # https://otwarchive.atlassian.net/browse/AO3-4957 # https://github.com/rubys/nokogumbo/issues/50 gem 'nokogumbo', '1.4.9' -gem 'rest-client', '~> 1.8.0', require: 'rest_client' +gem 'rest-client', '~> 2.1.0', require: 'rest_client' gem 'resque', '>=1.14.0' gem 'resque-scheduler' gem 'after_commit_everywhere' diff --git a/Gemfile.lock b/Gemfile.lock index 584da47cf2f..2083e77741f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1126,6 +1126,7 @@ GEM hashdiff (1.0.1) highline (2.0.3) htmlentities (4.3.4) + http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) httparty (0.16.2) @@ -1159,7 +1160,9 @@ GEM webrick (~> 1.7) webrobots (>= 0.0.9, < 0.2) method_source (1.0.0) - mime-types (2.99.3) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2021.0225) mimemagic (0.3.10) nokogiri (~> 1) rake @@ -1284,10 +1287,11 @@ GEM redis (>= 3.3) resque (>= 1.26) rufus-scheduler (~> 3.2) - rest-client (1.8.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) rollout (2.4.3) rspec (3.8.0) rspec-core (~> 3.8.0) @@ -1465,7 +1469,7 @@ DEPENDENCIES redis-namespace resque (>= 1.14.0) resque-scheduler - rest-client (~> 1.8.0) + rest-client (~> 2.1.0) rollout rspec (~> 3.8) rspec-rails (~> 3.8.2)