Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 4 deletions

diff --git a/rubocop/code_reuse_helpers.rb b/rubocop/code_reuse_helpers.rb
index 283c43de227..6ea12999cae 100644
--- a/rubocop/code_reuse_helpers.rb
+++ b/rubocop/code_reuse_helpers.rb
@@ -180,5 +180,13 @@ module RuboCop
     def rails_root
       File.expand_path('..', __dir__)
     end
+
+    def ee?
+      File.exist?(File.expand_path('../ee/app/models/license.rb', __dir__)) && !%w[true 1].include?(ENV['FOSS_ONLY'].to_s)
+    end
+
+    def jh?
+      ee? && Dir.exist?(File.expand_path('../jh', __dir__)) && !%w[true 1].include?(ENV['EE_ONLY'].to_s)
+    end
   end
 end
diff --git a/rubocop/cop/gitlab/mark_used_feature_flags.rb b/rubocop/cop/gitlab/mark_used_feature_flags.rb
index d3c5cfb827e..4d9fc6148fa 100644
--- a/rubocop/cop/gitlab/mark_used_feature_flags.rb
+++ b/rubocop/cop/gitlab/mark_used_feature_flags.rb
@@ -255,14 +255,12 @@ module RuboCop
             ]
 
             # For EE additionally process `ee/` feature flags
-            is_ee = File.exist?(File.expand_path('../../../ee/app/models/license.rb', __dir__)) && !%w[true 1].include?(ENV['FOSS_ONLY'].to_s)
-            if is_ee
+            if ee?
               flags_paths << 'ee/config/feature_flags/**/*.yml'
             end
 
             # For JH additionally process `jh/` feature flags
-            is_jh = is_ee && Dir.exist?(File.expand_path('../../../jh', __dir__)) && !%w[true 1].include?(ENV['EE_ONLY'].to_s)
-            if is_jh
+            if jh?
               flags_paths << 'jh/config/feature_flags/**/*.yml'
             end