diff --git a/config/application.rb b/config/application.rb index e4e8578497..a00ea63ab4 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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, diff --git a/openshift/system/Dockerfile b/openshift/system/Dockerfile index b1e3c7ec8f..23ba16db38 100644 --- a/openshift/system/Dockerfile +++ b/openshift/system/Dockerfile @@ -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 @@ -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