aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-09-28 15:52:15 +0900
committerGitHub <noreply@github.com>2018-09-28 15:52:15 +0900
commit2ab0df00b69335986f1116b7bea17c1ed0f52d9f (patch)
treec2ea469292b2122eb7f74e9ca103c0601ddb8324
parent71030c93116e39b3c4838a50bfe57d9715439926 (diff)
parent874cff399c8f55423cc126d80bb2db5445d416b9 (diff)
downloadrails-2ab0df00b69335986f1116b7bea17c1ed0f52d9f.tar.gz
rails-2ab0df00b69335986f1116b7bea17c1ed0f52d9f.tar.bz2
rails-2ab0df00b69335986f1116b7bea17c1ed0f52d9f.zip
Merge pull request #34010 from Edouard-chin/ec-uneeded-require
LoggerSilence doesn't require concurrent:
-rw-r--r--activesupport/lib/active_support/logger_silence.rb1
-rw-r--r--activesupport/lib/active_support/logger_thread_safe_level.rb1
2 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/logger_silence.rb b/activesupport/lib/active_support/logger_silence.rb
index 89f32b6782..4344ca0429 100644
--- a/activesupport/lib/active_support/logger_silence.rb
+++ b/activesupport/lib/active_support/logger_silence.rb
@@ -2,7 +2,6 @@
require "active_support/concern"
require "active_support/core_ext/module/attribute_accessors"
-require "concurrent"
module LoggerSilence
extend ActiveSupport::Concern
diff --git a/activesupport/lib/active_support/logger_thread_safe_level.rb b/activesupport/lib/active_support/logger_thread_safe_level.rb
index ba32813d3d..22ab4cc28c 100644
--- a/activesupport/lib/active_support/logger_thread_safe_level.rb
+++ b/activesupport/lib/active_support/logger_thread_safe_level.rb
@@ -1,6 +1,7 @@
# frozen_string_literal: true
require "active_support/concern"
+require "concurrent"
module ActiveSupport
module LoggerThreadSafeLevel # :nodoc: