Allow simple ivar ||= form. Update accordingly

16 files changed, 17 insertions, 19 deletions

diff --git a/lib/gitlab/ci/charts.rb b/lib/gitlab/ci/charts.rb
index a7040a8fa03..fe2fd08a67a 100644
--- a/lib/gitlab/ci/charts.rb
+++ b/lib/gitlab/ci/charts.rb
@@ -10,7 +10,6 @@ module Gitlab
             .transform_keys { |date| date.strftime(@format) }
         end
 
-        # rubocop:disable Cop/ModuleWithInstanceVariables
         def interval_step
           @interval_step ||= 1.day
         end
@@ -30,7 +29,6 @@ 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 e34f4c9e101..2c96e5f65d7 100644
--- a/lib/gitlab/ci/config/entry/configurable.rb
+++ b/lib/gitlab/ci/config/entry/configurable.rb
@@ -13,7 +13,6 @@ module Gitlab
         #   script: ...
         #   artifacts: ...
         #
-        # rubocop:disable Cop/ModuleWithInstanceVariables
         module Configurable
           extend ActiveSupport::Concern
 
@@ -25,6 +24,7 @@ module Gitlab
             end
           end
 
+          # rubocop:disable Cop/ModuleWithInstanceVariables
           def compose!(deps = nil)
             return unless valid?
 
diff --git a/lib/gitlab/ci/config/entry/validatable.rb b/lib/gitlab/ci/config/entry/validatable.rb
index 524d349c094..1850c652c09 100644
--- a/lib/gitlab/ci/config/entry/validatable.rb
+++ b/lib/gitlab/ci/config/entry/validatable.rb
@@ -1,4 +1,3 @@
-# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module Ci
     class Config
@@ -13,6 +12,7 @@ module Gitlab
             end
           end
 
+          # rubocop:disable Cop/ModuleWithInstanceVariables
           def errors
             @validator.messages + descendants.flat_map(&:errors)
           end
diff --git a/lib/gitlab/ci/model.rb b/lib/gitlab/ci/model.rb
index 213301d245e..3994a50772b 100644
--- a/lib/gitlab/ci/model.rb
+++ b/lib/gitlab/ci/model.rb
@@ -5,7 +5,6 @@ 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/cycle_analytics/base_query.rb b/lib/gitlab/cycle_analytics/base_query.rb
index 3f6fb227a67..52fdae84c58 100644
--- a/lib/gitlab/cycle_analytics/base_query.rb
+++ b/lib/gitlab/cycle_analytics/base_query.rb
@@ -7,11 +7,11 @@ module Gitlab
 
       private
 
-      # rubocop:disable Cop/ModuleWithInstanceVariables
       def base_query
         @base_query ||= stage_query
       end
 
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def stage_query
         query = mr_closing_issues_table.join(issue_table).on(issue_table[:id].eq(mr_closing_issues_table[:issue_id]))
           .join(issue_metrics_table).on(issue_table[:id].eq(issue_metrics_table[:issue_id]))
diff --git a/lib/gitlab/cycle_analytics/production_helper.rb b/lib/gitlab/cycle_analytics/production_helper.rb
index cd7ee39d9ca..9a05c910ba0 100644
--- a/lib/gitlab/cycle_analytics/production_helper.rb
+++ b/lib/gitlab/cycle_analytics/production_helper.rb
@@ -1,7 +1,7 @@
-# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module CycleAnalytics
     module ProductionHelper
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def stage_query
         super.where(mr_metrics_table[:first_deployed_to_production_at].gteq(@options[:from]))
       end
diff --git a/lib/gitlab/email/handler/reply_processing.rb b/lib/gitlab/email/handler/reply_processing.rb
index f077d64d75e..32c5caf93e8 100644
--- a/lib/gitlab/email/handler/reply_processing.rb
+++ b/lib/gitlab/email/handler/reply_processing.rb
@@ -12,7 +12,6 @@ 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 c8689d85c0c..89cf659bce4 100644
--- a/lib/gitlab/emoji.rb
+++ b/lib/gitlab/emoji.rb
@@ -1,4 +1,3 @@
-# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module Emoji
     extend self
@@ -32,8 +31,7 @@ module Gitlab
     end
 
     def emoji_unicode_version(name)
-      @emoji_unicode_versions_by_name ||= JSON.parse(File.read(Rails.root.join('fixtures', 'emojis', 'emoji-unicode-version-map.json')))
-      @emoji_unicode_versions_by_name[name]
+      emoji_unicode_versions_by_name[name]
     end
 
     def normalize_emoji_name(name)
@@ -57,5 +55,12 @@ module Gitlab
 
       ActionController::Base.helpers.content_tag('gl-emoji', emoji_info['moji'], title: emoji_info['description'], data: data)
     end
+
+    private
+
+    def emoji_unicode_versions_by_name
+      @emoji_unicode_versions_by_name ||=
+        JSON.parse(File.read(Rails.root.join('fixtures', 'emojis', 'emoji-unicode-version-map.json')))
+    end
   end
 end
diff --git a/lib/gitlab/identifier.rb b/lib/gitlab/identifier.rb
index 54fd9d15e7b..94678b6ec40 100644
--- a/lib/gitlab/identifier.rb
+++ b/lib/gitlab/identifier.rb
@@ -52,7 +52,6 @@ module Gitlab
       end
     end
 
-    # rubocop:disable Cop/ModuleWithInstanceVariables
     def identification_cache
       @identification_cache ||= {
         email: {},
diff --git a/lib/gitlab/metrics/influx_db.rb b/lib/gitlab/metrics/influx_db.rb
index 4d0f79ef163..c4dc061eda1 100644
--- a/lib/gitlab/metrics/influx_db.rb
+++ b/lib/gitlab/metrics/influx_db.rb
@@ -1,4 +1,3 @@
-# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module Metrics
     module InfluxDb
@@ -150,6 +149,7 @@ module Gitlab
 
       # When enabled this should be set before being used as the usual pattern
       # "@foo ||= bar" is _not_ thread-safe.
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def pool
         if influx_metrics_enabled?
           if @pool.nil?
diff --git a/lib/gitlab/metrics/prometheus.rb b/lib/gitlab/metrics/prometheus.rb
index 476aad2f4dd..b5f9dafccab 100644
--- a/lib/gitlab/metrics/prometheus.rb
+++ b/lib/gitlab/metrics/prometheus.rb
@@ -1,6 +1,5 @@
 require 'prometheus/client'
 
-# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module Metrics
     module Prometheus
@@ -14,6 +13,7 @@ module Gitlab
           ::File.writable?(multiprocess_files_dir)
       end
 
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def prometheus_metrics_enabled?
         return @prometheus_metrics_enabled if defined?(@prometheus_metrics_enabled)
 
diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb
index 37112ca3cdb..cb95daf2260 100644
--- a/lib/gitlab/prometheus/additional_metrics_parser.rb
+++ b/lib/gitlab/prometheus/additional_metrics_parser.rb
@@ -26,7 +26,6 @@ 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 6e377a24e57..7ac6162b54d 100644
--- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb
+++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
@@ -56,7 +56,6 @@ 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 fdd5c86c698..58f6245579a 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -1,4 +1,3 @@
-# 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 2cec307867c..5aaf3655396 100644
--- a/lib/gitlab/slash_commands/presenters/issue_base.rb
+++ b/lib/gitlab/slash_commands/presenters/issue_base.rb
@@ -1,4 +1,3 @@
-# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module SlashCommands
     module Presenters
@@ -11,14 +10,17 @@ module Gitlab
           issuable.open? ? 'Open' : 'Closed'
         end
 
+        # rubocop:disable Cop/ModuleWithInstanceVariables
         def project
           @resource.project
         end
 
+        # rubocop:disable Cop/ModuleWithInstanceVariables
         def author
           @resource.author
         end
 
+        # rubocop:disable Cop/ModuleWithInstanceVariables
         def fields
           [
             {
diff --git a/lib/gitlab/themes.rb b/lib/gitlab/themes.rb
index 7805f89831b..d43eff5ba4a 100644
--- a/lib/gitlab/themes.rb
+++ b/lib/gitlab/themes.rb
@@ -72,7 +72,6 @@ module Gitlab
 
     private
 
-    # rubocop:disable Cop/ModuleWithInstanceVariables
     def default_id
       @default_id ||= begin
         id = Gitlab.config.gitlab.default_theme.to_i