Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 6 deletions

diff --git a/lib/gitlab/utils/delegator_override.rb b/lib/gitlab/utils/delegator_override.rb
index 15ba29d3916..3478931b170 100644
--- a/lib/gitlab/utils/delegator_override.rb
+++ b/lib/gitlab/utils/delegator_override.rb
@@ -6,7 +6,7 @@ module Gitlab
     # accidentally override important logic on the fabricated object.
     module DelegatorOverride
       def delegator_target(target_class)
-        return unless ENV['STATIC_VERIFICATION']
+        return unless Gitlab::Environment.static_verification?
 
         unless self < ::SimpleDelegator
           raise ArgumentError, "'#{self}' is not a subclass of 'SimpleDelegator' class."
@@ -16,14 +16,14 @@ module Gitlab
       end
 
       def delegator_override(*names)
-        return unless ENV['STATIC_VERIFICATION']
+        return unless Gitlab::Environment.static_verification?
         raise TypeError unless names.all? { |n| n.is_a?(Symbol) }
 
         DelegatorOverride.validator(self).add_allowlist(names)
       end
 
       def delegator_override_with(mod)
-        return unless ENV['STATIC_VERIFICATION']
+        return unless Gitlab::Environment.static_verification?
         raise TypeError unless mod.is_a?(Module)
 
         DelegatorOverride.validator(self).add_allowlist(mod.instance_methods)
diff --git a/lib/gitlab/utils/override.rb b/lib/gitlab/utils/override.rb
index f83ebba7c3f..7f43e25e50d 100644
--- a/lib/gitlab/utils/override.rb
+++ b/lib/gitlab/utils/override.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_dependency 'gitlab/utils'
+require_dependency 'gitlab/environment'
 
 module Gitlab
   module Utils
@@ -117,7 +118,7 @@ module Gitlab
       # This would make sure we're overriding something. See:
       # https://gitlab.com/gitlab-org/gitlab/issues/1819
       def override(method_name)
-        return unless ENV['STATIC_VERIFICATION']
+        return unless Gitlab::Environment.static_verification?
 
         Override.extensions[self] ||= Extension.new(self)
         Override.extensions[self].add_method_name(method_name)
@@ -126,7 +127,7 @@ module Gitlab
       def method_added(method_name)
         super
 
-        return unless ENV['STATIC_VERIFICATION']
+        return unless Gitlab::Environment.static_verification?
         return unless Override.extensions[self]&.verify_override?(method_name)
 
         method_arity = instance_method(method_name).arity
@@ -163,7 +164,7 @@ module Gitlab
       end
 
       def queue_verification(base, verify: false)
-        return unless ENV['STATIC_VERIFICATION']
+        return unless Gitlab::Environment.static_verification?
 
         # We could check for Class in `override`
         # This could be `nil` if `override` was never called.