ruby: Upgrade to v3.1.4 (pt. 2, app image) (#19912)

Co-authored-with: Josh Klar <josh@klar.sh>

Co-authored-by: Helio Cola <helio@tcard.io>
This commit is contained in:
Josh Klar 2023-08-09 14:18:13 -07:00 committed by GitHub
parent c202afdec6
commit 7db08e34b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 11 additions and 11 deletions

View file

@ -1,7 +1,7 @@
FROM gitpod/workspace-postgres
# Install Ruby
ENV RUBY_VERSION=3.0.6
ENV RUBY_VERSION=3.1.4
# Install the GitHub CLI
RUN brew install gh

View file

@ -1 +1 @@
3.0.6
3.1.4

View file

@ -1,4 +1,4 @@
FROM ghcr.io/forem/ruby:3.0.6@sha256:287260a9c729fcd4f7952c551f8320cfe484db9d1e3ac77986b175b959aba715 as base
FROM ghcr.io/forem/ruby:3.1.4@sha256:d072fde5b0bb0f1374e308f7fcf1283e379e2a28a61f6e56df87b25a7dfdd5bf as base
FROM base as builder

View file

@ -1,4 +1,4 @@
ARG RUBY_VERSION=3.0.6
ARG RUBY_VERSION=3.1.4
ARG DEBIAN_VERSION=bullseye
FROM public.ecr.aws/docker/library/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS ruby-upstream

View file

@ -1127,7 +1127,7 @@ DEPENDENCIES
zonebie (~> 0.6.1)
RUBY VERSION
ruby 3.0.6p216
ruby 3.1.4p223
BUNDLED WITH
2.4.17

View file

@ -153,7 +153,7 @@ module Settings
# get the setting's value, YAML decoded
def value
YAML.load(self[:value]) if self[:value].present? # rubocop:disable Security/YAMLLoad
YAML.unsafe_load(self[:value]) if self[:value].present?
end
# set the settings's value, YAML encoded

View file

@ -1,9 +1,9 @@
class ChangeLastModerationNotificationDefaultOnUser < ActiveRecord::Migration[5.1]
def up
change_column_default :users, :last_moderation_notification, Time.new("2017-01-01")
change_column_default :users, :last_moderation_notification, Time.new(2017,1,1)
end
def down
change_column_default :users, :last_moderation_notification, Time.new("2017-01-01")
change_column_default :users, :last_moderation_notification, Time.new(2017,1,1)
end
end

View file

@ -16,7 +16,7 @@ RSpec.describe AbExperiment do
describe "validate field test experiment configuration" do
it "only allow at most one active feed_strategy (e.g. an experiment without a winner)" do
field_tests = Psych.load(Rails.root.join("config/field_test.yml").read)
field_tests = Psych.load(Rails.root.join("config/field_test.yml").read, permitted_classes: [Date])
active_field_tests = field_tests.fetch("experiments", {})
.select { |key, values| key.start_with?("feed_strategy") && !values["winner"] }

View file

@ -776,7 +776,7 @@ RSpec.describe Article do
end
it "returns true if parser raises a Psych::DisallowedClass error" do
allow(FrontMatterParser::Parser).to receive(:new).and_raise(Psych::DisallowedClass.new("msg"))
allow(FrontMatterParser::Parser).to receive(:new).and_raise(Psych::DisallowedClass.new("msg", Date))
expect(article.has_frontmatter?).to be(true)
end

View file

@ -1,4 +1,4 @@
FROM ghcr.io/forem/ruby:3.0.6@sha256:287260a9c729fcd4f7952c551f8320cfe484db9d1e3ac77986b175b959aba715 as base
FROM ghcr.io/forem/ruby:3.1.4@sha256:d072fde5b0bb0f1374e308f7fcf1283e379e2a28a61f6e56df87b25a7dfdd5bf as base
FROM base as builder