Skip to content

Commit

Permalink
Remove some leftovers after Rails 7.0 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
mayorova committed Dec 20, 2024
1 parent adf20f8 commit 439d9c4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ class Application < Rails::Application
# Make Ruby preserve the timezone of the receiver when calling `to_time`.
config.active_support.to_time_preserves_timezone = false

# Use a modern approved hashing function.
# This is the default in Rails 7.0, so can be removed when we upgrade.
config.active_support.hash_digest_class = OpenSSL::Digest::SHA256

# Applying the patch for CVE-2022-32224 broke YAML deserialization because some classes are disallowed in the serialized YAML
config.active_record.yaml_column_permitted_classes = [Symbol, Time, Date, BigDecimal, OpenStruct,
ActionController::Parameters,
Expand Down
4 changes: 2 additions & 2 deletions openshift/system/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* \
&& bundle install --jobs $(grep -c processor /proc/cpuinfo) --retry=5 \
&& npm install -g yarn \
&& yarn install:safe --no-progress \
# TODO: update to SECRET_KEY_BASE_DUMMY=1 when we upgrade to Rails 7.0
# TODO: update to SECRET_KEY_BASE_DUMMY=1 when we upgrade to Rails 7.1
&& SECRET_KEY_BASE=rails/32947 bundle exec rake assets:precompile tmp:clear \
&& rm -rf node_modules /usr/local/share/gems/cache /usr/local/share/gems/doc

Expand Down Expand Up @@ -105,7 +105,7 @@ ENV THINKING_SPHINX_ADDRESS=0.0.0.0 \
THINKING_SPHINX_QUERY_LOG=/dev/stdout \
THINKING_SPHINX_LOG=/dev/stdout \
RAILS_ENV=production \
# TODO: update to SECRET_KEY_BASE_DUMMY=1 when we upgrade to Rails 7.0
# TODO: update to SECRET_KEY_BASE_DUMMY=1 when we upgrade to Rails 7.1
SECRET_KEY_BASE=dummy \
DATABASE_URL='mysql2://root:@localhost/porta'
USER 0
Expand Down

0 comments on commit 439d9c4

Please sign in to comment.