From 3d5183e99c851ef97107407ec0f85fe9e31240bf Mon Sep 17 00:00:00 2001
From: Daigo 3 Dango <zunda@users.noreply.github.com>
Date: Fri, 9 Jul 2021 23:29:27 +0000
Subject: [PATCH] Use ruby-2.7.4 (#16481)

Stop using older version of resolv gem as the bug has been fixed.
https://bugs.ruby-lang.org/issues/17781
---
 .ruby-version | 2 +-
 Dockerfile    | 2 +-
 Gemfile       | 2 --
 Gemfile.lock  | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 37c2961c24..a4dd9dba4f 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.2
+2.7.4
diff --git a/Dockerfile b/Dockerfile
index 962e5a8c9b..8279e87359 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ RUN ARCH= && \
 	mv node-v$NODE_VER-linux-$ARCH /opt/node
 
 # Install Ruby
-ENV RUBY_VER="2.7.2"
+ENV RUBY_VER="2.7.4"
 RUN apt-get update && \
   apt-get install -y --no-install-recommends build-essential \
     bison libyaml-dev libgdbm-dev libreadline-dev libjemalloc-dev \
diff --git a/Gemfile b/Gemfile
index a76e69ac3b..e80312047d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -155,5 +155,3 @@ gem 'concurrent-ruby', require: false
 gem 'connection_pool', require: false
 
 gem 'xorcist', '~> 1.1'
-
-gem 'resolv', '~> 0.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 96d89fbae5..6ebdd67a91 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -491,7 +491,6 @@ GEM
     regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
-    resolv (0.1.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -764,7 +763,6 @@ DEPENDENCIES
   rdf-normalize (~> 0.4)
   redis (~> 4.3)
   redis-namespace (~> 1.8)
-  resolv (~> 0.1.0)
   rqrcode (~> 2.0)
   rspec-rails (~> 5.0)
   rspec-sidekiq (~> 3.1)