Add cop to make sure we don't use ivar in a module

35 files changed, 69 insertions, 30 deletions

diff --git a/lib/after_commit_queue.rb b/lib/after_commit_queue.rb
index 4750a2c373a..f3fba4fe389 100644
--- a/lib/after_commit_queue.rb
+++ b/lib/after_commit_queue.rb
@@ -20,6 +20,7 @@ module AfterCommitQueue
     end
   end
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def _after_commit_queue
     @after_commit_queue ||= []
   end
diff --git a/lib/api/api_guard.rb b/lib/api/api_guard.rb
index c4c0fdda665..05f55097a80 100644
--- a/lib/api/api_guard.rb
+++ b/lib/api/api_guard.rb
@@ -2,6 +2,7 @@
 
 require 'rack/oauth2'
 
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module API
   module APIGuard
     extend ActiveSupport::Concern
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 00dbc2aee7a..49e659d3d27 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module API
   module Helpers
     include Gitlab::Utils
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb
index 4c0db4d42b1..a187517a66a 100644
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module API
   module Helpers
     module InternalHelpers
@@ -57,6 +58,7 @@ module API
 
       private
 
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def set_project
         if params[:gl_repository]
           @project, @wiki = Gitlab::GlRepository.parse(params[:gl_repository])
diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb
index 282af32ca94..1b21594487d 100644
--- a/lib/api/helpers/runner.rb
+++ b/lib/api/helpers/runner.rb
@@ -21,6 +21,7 @@ module API
         forbidden! unless current_runner
       end
 
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def current_runner
         @runner ||= ::Ci::Runner.find_by_token(params[:token].to_s)
       end
diff --git a/lib/extracts_path.rb b/lib/extracts_path.rb
index 721ed97bb6b..f3e5b1c1109 100644
--- a/lib/extracts_path.rb
+++ b/lib/extracts_path.rb
@@ -1,5 +1,6 @@
 # Module providing methods for dealing with separating a tree-ish string and a
 # file path string when combined in a request parameter
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module ExtractsPath
   # Raised when given an invalid file path
   InvalidPathError = Class.new(StandardError)
diff --git a/lib/gitlab/cache/request_cache.rb b/lib/gitlab/cache/request_cache.rb
index 754a45c3257..65e3e672894 100644
--- a/lib/gitlab/cache/request_cache.rb
+++ b/lib/gitlab/cache/request_cache.rb
@@ -45,6 +45,7 @@ module Gitlab
         klass.prepend(extension)
       end
 
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def request_cache_key(&block)
         if block_given?
           @request_cache_key = block
diff --git a/lib/gitlab/ci/charts.rb b/lib/gitlab/ci/charts.rb
index 7df7b542d91..a7040a8fa03 100644
--- a/lib/gitlab/ci/charts.rb
+++ b/lib/gitlab/ci/charts.rb
@@ -2,6 +2,7 @@ module Gitlab
   module Ci
     module Charts
       module DailyInterval
+        # rubocop:disable Cop/ModuleWithInstanceVariables
         def grouped_count(query)
           query
             .group("DATE(#{::Ci::Pipeline.table_name}.created_at)")
@@ -9,6 +10,7 @@ module Gitlab
             .transform_keys { |date| date.strftime(@format) }
         end
 
+        # rubocop:disable Cop/ModuleWithInstanceVariables
         def interval_step
           @interval_step ||= 1.day
         end
@@ -28,6 +30,7 @@ module Gitlab
           end
         end
 
+        # rubocop:disable Cop/ModuleWithInstanceVariables
         def interval_step
           @interval_step ||= 1.month
         end
diff --git a/lib/gitlab/ci/config/entry/configurable.rb b/lib/gitlab/ci/config/entry/configurable.rb
index 68b6742385a..e34f4c9e101 100644
--- a/lib/gitlab/ci/config/entry/configurable.rb
+++ b/lib/gitlab/ci/config/entry/configurable.rb
@@ -13,6 +13,7 @@ module Gitlab
         #   script: ...
         #   artifacts: ...
         #
+        # rubocop:disable Cop/ModuleWithInstanceVariables
         module Configurable
           extend ActiveSupport::Concern
 
diff --git a/lib/gitlab/ci/config/entry/validatable.rb b/lib/gitlab/ci/config/entry/validatable.rb
index 5ced778d311..524d349c094 100644
--- a/lib/gitlab/ci/config/entry/validatable.rb
+++ b/lib/gitlab/ci/config/entry/validatable.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module Ci
     class Config
diff --git a/lib/gitlab/ci/model.rb b/lib/gitlab/ci/model.rb
index 3994a50772b..213301d245e 100644
--- a/lib/gitlab/ci/model.rb
+++ b/lib/gitlab/ci/model.rb
@@ -5,6 +5,7 @@ module Gitlab
         "ci_"
       end
 
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def model_name
         @model_name ||= ActiveModel::Name.new(self, nil, self.name.split("::").last)
       end
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 642f0944354..4e0dadcc3c7 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -52,6 +52,7 @@ module Gitlab
       ::ApplicationSetting.create_from_defaults || in_memory_application_settings
     end
 
+    # rubocop:disable Cop/ModuleWithInstanceVariables
     def in_memory_application_settings
       @in_memory_application_settings ||= ::ApplicationSetting.new(::ApplicationSetting.defaults)
     rescue ActiveRecord::StatementInvalid, ActiveRecord::UnknownAttributeError
diff --git a/lib/gitlab/cycle_analytics/base_event_fetcher.rb b/lib/gitlab/cycle_analytics/base_event_fetcher.rb
index ab115afcaa5..bec201f309c 100644
--- a/lib/gitlab/cycle_analytics/base_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/base_event_fetcher.rb
@@ -59,6 +59,12 @@ module Gitlab
         nil
       end
 
+      def load_allowed_ids
+        allowed_ids_finder_class
+          .new(@options[:current_user], project_id: @project.id)
+          .execute.where(id: event_result_ids).pluck(:id)
+      end
+
       def event_result_ids
         event_result.map { |event| event['id'] }
       end
diff --git a/lib/gitlab/cycle_analytics/base_query.rb b/lib/gitlab/cycle_analytics/base_query.rb
index 58729d3ced8..3f6fb227a67 100644
--- a/lib/gitlab/cycle_analytics/base_query.rb
+++ b/lib/gitlab/cycle_analytics/base_query.rb
@@ -7,6 +7,7 @@ module Gitlab
 
       private
 
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def base_query
         @base_query ||= stage_query
       end
diff --git a/lib/gitlab/cycle_analytics/code_event_fetcher.rb b/lib/gitlab/cycle_analytics/code_event_fetcher.rb
index d5bf6149749..39df80352b6 100644
--- a/lib/gitlab/cycle_analytics/code_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/code_event_fetcher.rb
@@ -1,8 +1,6 @@
 module Gitlab
   module CycleAnalytics
     class CodeEventFetcher < BaseEventFetcher
-      include MergeRequestAllowed
-
       def initialize(*args)
         @projections = [mr_table[:title],
                         mr_table[:iid],
@@ -20,6 +18,14 @@ module Gitlab
       def serialize(event)
         AnalyticsMergeRequestSerializer.new(project: @project).represent(event)
       end
+
+      def allowed_ids
+        load_allowed_ids
+      end
+
+      def allowed_ids_finder_class
+        MergeRequestsFinder
+      end
     end
   end
 end
diff --git a/lib/gitlab/cycle_analytics/issue_allowed.rb b/lib/gitlab/cycle_analytics/issue_allowed.rb
deleted file mode 100644
index a7652a70641..00000000000
--- a/lib/gitlab/cycle_analytics/issue_allowed.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Gitlab
-  module CycleAnalytics
-    module IssueAllowed
-      def allowed_ids
-        @allowed_ids ||= IssuesFinder.new(@options[:current_user], project_id: @project.id).execute.where(id: event_result_ids).pluck(:id)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/cycle_analytics/issue_event_fetcher.rb b/lib/gitlab/cycle_analytics/issue_event_fetcher.rb
index 3df9cbdcfce..cc79e2dfe88 100644
--- a/lib/gitlab/cycle_analytics/issue_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/issue_event_fetcher.rb
@@ -1,8 +1,6 @@
 module Gitlab
   module CycleAnalytics
     class IssueEventFetcher < BaseEventFetcher
-      include IssueAllowed
-
       def initialize(*args)
         @projections = [issue_table[:title],
                         issue_table[:iid],
@@ -18,6 +16,14 @@ module Gitlab
       def serialize(event)
         AnalyticsIssueSerializer.new(project: @project).represent(event)
       end
+
+      def allowed_ids
+        load_allowed_ids
+      end
+
+      def allowed_ids_finder_class
+        IssuesFinder
+      end
     end
   end
 end
diff --git a/lib/gitlab/cycle_analytics/merge_request_allowed.rb b/lib/gitlab/cycle_analytics/merge_request_allowed.rb
deleted file mode 100644
index 28f6db44759..00000000000
--- a/lib/gitlab/cycle_analytics/merge_request_allowed.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Gitlab
-  module CycleAnalytics
-    module MergeRequestAllowed
-      def allowed_ids
-        @allowed_ids ||= MergeRequestsFinder.new(@options[:current_user], project_id: @project.id).execute.where(id: event_result_ids).pluck(:id)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/cycle_analytics/production_helper.rb b/lib/gitlab/cycle_analytics/production_helper.rb
index d693443bfa4..cd7ee39d9ca 100644
--- a/lib/gitlab/cycle_analytics/production_helper.rb
+++ b/lib/gitlab/cycle_analytics/production_helper.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module CycleAnalytics
     module ProductionHelper
diff --git a/lib/gitlab/cycle_analytics/review_event_fetcher.rb b/lib/gitlab/cycle_analytics/review_event_fetcher.rb
index 4c7b3f4467f..5a7f1eb00b3 100644
--- a/lib/gitlab/cycle_analytics/review_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/review_event_fetcher.rb
@@ -1,8 +1,6 @@
 module Gitlab
   module CycleAnalytics
     class ReviewEventFetcher < BaseEventFetcher
-      include MergeRequestAllowed
-
       def initialize(*args)
         @projections = [mr_table[:title],
                         mr_table[:iid],
@@ -14,9 +12,19 @@ module Gitlab
         super(*args)
       end
 
+      private
+
       def serialize(event)
         AnalyticsMergeRequestSerializer.new(project: @project).represent(event)
       end
+
+      def allowed_ids
+        load_allowed_ids
+      end
+
+      def allowed_ids_finder_class
+        MergeRequestsFinder
+      end
     end
   end
 end
diff --git a/lib/gitlab/database/rename_reserved_paths_migration/v1/migration_classes.rb b/lib/gitlab/database/rename_reserved_paths_migration/v1/migration_classes.rb
index 5481024db8e..6959fa74293 100644
--- a/lib/gitlab/database/rename_reserved_paths_migration/v1/migration_classes.rb
+++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/migration_classes.rb
@@ -3,6 +3,7 @@ module Gitlab
     module RenameReservedPathsMigration
       module V1
         module MigrationClasses
+          # rubocop:disable Cop/ModuleWithInstanceVariables
           module Routable
             def full_path
               if route && route.path.present?
diff --git a/lib/gitlab/email/handler/reply_processing.rb b/lib/gitlab/email/handler/reply_processing.rb
index 32c5caf93e8..f077d64d75e 100644
--- a/lib/gitlab/email/handler/reply_processing.rb
+++ b/lib/gitlab/email/handler/reply_processing.rb
@@ -12,6 +12,7 @@ module Gitlab
           raise NotImplementedError
         end
 
+        # rubocop:disable Cop/ModuleWithInstanceVariables
         def message
           @message ||= process_message
         end
diff --git a/lib/gitlab/emoji.rb b/lib/gitlab/emoji.rb
index e3e36b35ce9..c8689d85c0c 100644
--- a/lib/gitlab/emoji.rb
+++ b/lib/gitlab/emoji.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module Emoji
     extend self
diff --git a/lib/gitlab/git/popen.rb b/lib/gitlab/git/popen.rb
index 25fa62ce4bd..10c15b316f5 100644
--- a/lib/gitlab/git/popen.rb
+++ b/lib/gitlab/git/popen.rb
@@ -13,15 +13,15 @@ module Gitlab
         vars = { "PWD" => path }
         options = { chdir: path }
 
-        @cmd_output = ""
-        @cmd_status = 0
+        cmd_output = ""
+        cmd_status = 0
         Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
-          @cmd_output << stdout.read
-          @cmd_output << stderr.read
-          @cmd_status = wait_thr.value.exitstatus
+          cmd_output << stdout.read
+          cmd_output << stderr.read
+          cmd_status = wait_thr.value.exitstatus
         end
 
-        [@cmd_output, @cmd_status]
+        [cmd_output, cmd_status]
       end
     end
   end
diff --git a/lib/gitlab/identifier.rb b/lib/gitlab/identifier.rb
index 94678b6ec40..54fd9d15e7b 100644
--- a/lib/gitlab/identifier.rb
+++ b/lib/gitlab/identifier.rb
@@ -52,6 +52,7 @@ module Gitlab
       end
     end
 
+    # rubocop:disable Cop/ModuleWithInstanceVariables
     def identification_cache
       @identification_cache ||= {
         email: {},
diff --git a/lib/gitlab/import_export/command_line_util.rb b/lib/gitlab/import_export/command_line_util.rb
index 90942774a2e..5ac57c5775a 100644
--- a/lib/gitlab/import_export/command_line_util.rb
+++ b/lib/gitlab/import_export/command_line_util.rb
@@ -30,6 +30,7 @@ module Gitlab
         execute(%W(tar -#{options} #{archive} -C #{dir}))
       end
 
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def execute(cmd)
         output, status = Gitlab::Popen.popen(cmd)
         @shared.error(Gitlab::ImportExport::Error.new(output.to_s)) unless status.zero?
diff --git a/lib/gitlab/metrics/influx_db.rb b/lib/gitlab/metrics/influx_db.rb
index 7b06bb953aa..4d0f79ef163 100644
--- a/lib/gitlab/metrics/influx_db.rb
+++ b/lib/gitlab/metrics/influx_db.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module Metrics
     module InfluxDb
diff --git a/lib/gitlab/metrics/prometheus.rb b/lib/gitlab/metrics/prometheus.rb
index 460dab47276..476aad2f4dd 100644
--- a/lib/gitlab/metrics/prometheus.rb
+++ b/lib/gitlab/metrics/prometheus.rb
@@ -1,5 +1,6 @@
 require 'prometheus/client'
 
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module Metrics
     module Prometheus
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb
index 7c02c9c5c48..6df9d60721e 100644
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module PathRegex
     extend self
diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb
index cb95daf2260..37112ca3cdb 100644
--- a/lib/gitlab/prometheus/additional_metrics_parser.rb
+++ b/lib/gitlab/prometheus/additional_metrics_parser.rb
@@ -26,6 +26,7 @@ module Gitlab
         load_yaml_file&.map(&:deep_symbolize_keys).freeze
       end
 
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def load_yaml_file
         @loaded_yaml_file ||= YAML.load_file(Rails.root.join('config/prometheus/additional_metrics.yml'))
       end
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
index 7ac6162b54d..6e377a24e57 100644
--- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb
+++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
@@ -56,6 +56,7 @@ module Gitlab
           query
         end
 
+        # rubocop:disable Cop/ModuleWithInstanceVariables
         def available_metrics
           @available_metrics ||= client_label_values || []
         end
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index 58f6245579a..fdd5c86c698 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module Regex
     extend self
diff --git a/lib/gitlab/slash_commands/presenters/issue_base.rb b/lib/gitlab/slash_commands/presenters/issue_base.rb
index 341f2aabdd0..2cec307867c 100644
--- a/lib/gitlab/slash_commands/presenters/issue_base.rb
+++ b/lib/gitlab/slash_commands/presenters/issue_base.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module SlashCommands
     module Presenters
diff --git a/lib/gitlab/themes.rb b/lib/gitlab/themes.rb
index d43eff5ba4a..7805f89831b 100644
--- a/lib/gitlab/themes.rb
+++ b/lib/gitlab/themes.rb
@@ -72,6 +72,7 @@ module Gitlab
 
     private
 
+    # rubocop:disable Cop/ModuleWithInstanceVariables
     def default_id
       @default_id ||= begin
         id = Gitlab.config.gitlab.default_theme.to_i
diff --git a/lib/tasks/gitlab/task_helpers.rb b/lib/tasks/gitlab/task_helpers.rb
index 8a63f486fa3..24b65630b87 100644
--- a/lib/tasks/gitlab/task_helpers.rb
+++ b/lib/tasks/gitlab/task_helpers.rb
@@ -1,5 +1,6 @@
 require 'rainbow/ext/string'
 
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   TaskFailedError = Class.new(StandardError)
   TaskAbortedByUserError = Class.new(StandardError)