jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade Ruby to 3.1.2.

Browse Source 
Also fix a call to `Time.utc` that fails in Ruby 3.1.2 (can't pass a
string to Time.utc).
This commit is contained in:
evazion
2022-04-21 20:42:26 -05:00
parent 29e0139583
commit 7701fe2e17
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.ruby-version
View File

@@ -1 +1 @@
3.0.3 3.1.2

2
INSTALL.debian
View File

@@ -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 # 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 GITHUB_INSTALL_SCRIPTS=https://raw.githubusercontent.com/danbooru/danbooru/master/script/install
export VIPS_VERSION=8.7.0 export VIPS_VERSION=8.7.0

2
app/views/user_upgrades/new.html.erb
View File

@@ -29,7 +29,7 @@
<% if Danbooru.config.is_promotion? %> <% if Danbooru.config.is_promotion? %>
<p> <p>
<%= tag.img src: "/images/padoru.gif", width: 24, height: 24 %> <%= 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 %> <%= tag.img src: "/images/padoru.gif", width: 24, height: 24 %>
</p> </p>
<% end %> <% end %>

2
config/docker/build-base-image.sh
View File

@@ -2,7 +2,7 @@
set -xeuo pipefail set -xeuo pipefail
RUBY_VERSION="${RUBY_VERSION:-3.0.3}" RUBY_VERSION="${RUBY_VERSION:-3.1.2}"
VIPS_VERSION="${VIPS_VERSION:-8.12.1}" VIPS_VERSION="${VIPS_VERSION:-8.12.1}"
FFMPEG_VERSION="${FFMPEG_VERSION:-4.4.1}" FFMPEG_VERSION="${FFMPEG_VERSION:-4.4.1}"
MOZJPEG_VERSION="${MOZJPEG_VERSION:-4.0.3}" MOZJPEG_VERSION="${MOZJPEG_VERSION:-4.0.3}"