diff --git a/Gemfile b/Gemfile index cda54d942..bdad43027 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'propshaft' gem 'puma', '~> 7.2' gem 'rack_content_type_default', '~> 1.1' gem 'rack-cors' -gem 'rails', '~> 7.1' +gem 'rails', '~> 7.2' gem 'ruby-progressbar', '~> 1.13', require: false gem 'sentry-rails' gem 'statesman' diff --git a/Gemfile.lock b/Gemfile.lock index 6b80775d6..93a12cc3f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -617,7 +617,7 @@ DEPENDENCIES puma (~> 7.2) rack-cors rack_content_type_default (~> 1.1) - rails (~> 7.1) + rails (~> 7.2) rails-erd rspec rspec-rails diff --git a/bin/rubocop b/bin/rubocop new file mode 100755 index 000000000..40330c0ff --- /dev/null +++ b/bin/rubocop @@ -0,0 +1,8 @@ +#!/usr/bin/env ruby +require "rubygems" +require "bundler/setup" + +# explicit rubocop config increases performance slightly while avoiding config confusion. +ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__)) + +load Gem.bin_path("rubocop", "rubocop") diff --git a/config/application.rb b/config/application.rb index e8b482e8c..6eec39bd9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,8 +23,7 @@ module App class Application < Rails::Application - # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 7.1 + config.load_defaults 7.2 config.add_autoload_paths_to_load_path = false diff --git a/config/environments/production.rb b/config/environments/production.rb index cd0b8ca17..a9ec297f0 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -82,19 +82,6 @@ # Don't log any deprecations. config.active_support.report_deprecations = false - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = Logger::Formatter.new - - # Use a different logger for distributed setups. - # require "syslog/logger" - # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name") - - if ENV['RAILS_LOG_TO_STDOUT'].present? - logger = ActiveSupport::Logger.new($stdout) - logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) - end - # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false