From 7701fe2e17cf393acac2289a9332b509b5b75023 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Thu, 21 Apr 2022 20:42:26 -0500
Subject: [PATCH] Upgrade Ruby to 3.1.2.

Also fix a call to `Time.utc` that fails in Ruby 3.1.2 (can't pass a
string to Time.utc).
---
 .ruby-version                        | 2 +-
 INSTALL.debian                       | 2 +-
 app/views/user_upgrades/new.html.erb | 2 +-
 config/docker/build-base-image.sh    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 75a22a26a..ef538c281 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.3
+3.1.2
diff --git a/INSTALL.debian b/INSTALL.debian
index b2b1f36a1..5b5f7f986 100644
--- a/INSTALL.debian
+++ b/INSTALL.debian
@@ -2,7 +2,7 @@
 
 # Run: curl -L -s https://raw.githubusercontent.com/danbooru/danbooru/master/INSTALL.debian -o install.sh ; chmod +x install.sh ; ./install.sh
 
-export RUBY_VERSION=3.0.3
+export RUBY_VERSION=3.1.2
 export GITHUB_INSTALL_SCRIPTS=https://raw.githubusercontent.com/danbooru/danbooru/master/script/install
 export VIPS_VERSION=8.7.0
 
diff --git a/app/views/user_upgrades/new.html.erb b/app/views/user_upgrades/new.html.erb
index 4e2488fb8..6fa496f28 100644
--- a/app/views/user_upgrades/new.html.erb
+++ b/app/views/user_upgrades/new.html.erb
@@ -29,7 +29,7 @@
     <% if Danbooru.config.is_promotion? %>
       <p>
         <%= tag.img src: "/images/padoru.gif", width: 24, height: 24 %>
-        <b>Danbooru Winter Sale! Gold and Platinum upgrades are 25% off. Sale ends <%= time_ago_in_words_tagged(Time.utc("2022-01-01")) %>.</b>
+        <b>Danbooru Winter Sale! Gold and Platinum upgrades are 25% off. Sale ends <%= time_ago_in_words_tagged(Danbooru.config.winter_sale_end_date) %>.</b>
         <%= tag.img src: "/images/padoru.gif", width: 24, height: 24 %>
       </p>
     <% end %>
diff --git a/config/docker/build-base-image.sh b/config/docker/build-base-image.sh
index f300b169b..0fe7931ca 100755
--- a/config/docker/build-base-image.sh
+++ b/config/docker/build-base-image.sh
@@ -2,7 +2,7 @@
 
 set -xeuo pipefail
 
-RUBY_VERSION="${RUBY_VERSION:-3.0.3}"
+RUBY_VERSION="${RUBY_VERSION:-3.1.2}"
 VIPS_VERSION="${VIPS_VERSION:-8.12.1}"
 FFMPEG_VERSION="${FFMPEG_VERSION:-4.4.1}"
 MOZJPEG_VERSION="${MOZJPEG_VERSION:-4.0.3}"