diff --git a/config/environments/production.rb b/config/environments/production.rb index 3b6f9b56..fca0672b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -83,7 +83,7 @@ Rails.application.configure do config.active_support.deprecation = :notify # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new + config.log_formatter = Logger::Formatter.new # Use a different logger for distributed setups. # require 'syslog/logger' diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 71ab3707..2e59be8a 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -101,7 +101,7 @@ Rails.application.configure do config.active_support.disallowed_deprecation_warnings = [] # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new + config.log_formatter = Logger::Formatter.new # Use a different logger for distributed setups. # require 'syslog/logger' diff --git a/config/initializers/prometheus.rb b/config/initializers/prometheus.rb index 0820a788..41739c98 100644 --- a/config/initializers/prometheus.rb +++ b/config/initializers/prometheus.rb @@ -3,7 +3,7 @@ require 'code_ocean/config' require 'prometheus/record' -return unless CodeOcean::Config.new(:code_ocean).read[:prometheus_exporter][:enabled] && !defined?(::Rails::Console) +return unless CodeOcean::Config.new(:code_ocean).read[:prometheus_exporter][:enabled] && !defined?(Rails::Console) return if %w[db: assets:].any? {|task| Rake.application.top_level_tasks.to_s.include?(task) } # Add metric callbacks to all models diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index 1cfe5447..4212ccb5 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -88,7 +88,7 @@ describe SessionsController do it 'sets the specified locale' do expect(controller).to receive(:switch_locale).and_call_original - i18n = class_double I18n, locale: locale + i18n = class_double(I18n, locale:) allow(I18n).to receive(:locale=).with(I18n.default_locale).and_call_original allow(I18n).to receive(:locale=).with(locale).and_return(i18n) perform_request