WIP

app/controllers/concerns/boards_responses.rb

@@ -23,14 +23,12 @@ module BoardsResponses
     return render_403 unless can?(current_user, ability, resource)
   end
 
-  # rubocop:disable Cop/ModuleWithInstanceVariables
   def respond_with_boards
-    respond_with(@boards)
+    respond_with(@boards) # rubocop:disable Cop/ModuleWithInstanceVariables
   end
 
-  # rubocop:disable Cop/ModuleWithInstanceVariables
   def respond_with_board
-    respond_with(@board)
+    respond_with(@board) # rubocop:disable Cop/ModuleWithInstanceVariables
   end
 
   def respond_with(resource)

app/controllers/concerns/creates_commit.rb

@@ -46,6 +46,7 @@ module CreatesCommit
       end
     end
   end
+  # rubocop:enable Cop/ModuleWithInstanceVariables
 
   def authorize_edit_tree!
     return if can_collaborate_with_project?
@@ -90,6 +91,7 @@ module CreatesCommit
       }
     )
   end
+  # rubocop:enable Cop/ModuleWithInstanceVariables
 
   def existing_merge_request_path
     project_merge_request_path(@project, @merge_request)
@@ -102,18 +104,17 @@ module CreatesCommit
     @merge_request = MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened
       .find_by(source_project_id: @project_to_commit_into, source_branch: @branch_name, target_branch: @start_branch)
   end
+  # rubocop:enable Cop/ModuleWithInstanceVariables
 
-  # rubocop:disable Cop/ModuleWithInstanceVariables
   def different_project?
-    @project_to_commit_into != @project
+    @project_to_commit_into != @project # rubocop:disable Cop/ModuleWithInstanceVariables
   end
 
-  # rubocop:disable Cop/ModuleWithInstanceVariables
   def create_merge_request?
     # Even if the field is set, if we're checking the same branch
     # as the target branch in the same project,
     # we don't want to create a merge request.
     params[:create_merge_request].present? &&
-      (different_project? || @start_branch != @branch_name)
+      (different_project? || @start_branch != @branch_name) # rubocop:disable Cop/ModuleWithInstanceVariables
   end
 end

app/controllers/concerns/issuable_actions.rb

@@ -99,9 +99,8 @@ module IssuableActions
     end
   end
 
-  # rubocop:disable Cop/ModuleWithInstanceVariables
   def labels
-    @labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute
+    @labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute   # rubocop:disable Cop/ModuleWithInstanceVariables
   end
 
   def authorize_destroy_issuable!
@@ -110,9 +109,8 @@ module IssuableActions
     end
   end
 
-  # rubocop:disable Cop/ModuleWithInstanceVariables
   def authorize_admin_issuable!
-    unless can?(current_user, :"admin_#{resource_name}", @project)
+    unless can?(current_user, :"admin_#{resource_name}", @project) # rubocop:disable Cop/ModuleWithInstanceVariables
       return access_denied!
     end
   end

app/controllers/concerns/issuable_collections.rb

@@ -26,6 +26,7 @@ module IssuableCollections
 
     @users = []
   end
+  # rubocop:enable Cop/ModuleWithInstanceVariables
 
   def issues_collection
     issues_finder.execute.preload(:project, :author, :assignees, :labels, :milestone, project: :namespace)
@@ -110,6 +111,7 @@ module IssuableCollections
 
     @filter_params.permit(IssuableFinder::VALID_PARAMS)
   end
+  # rubocop:enable Cop/ModuleWithInstanceVariables
 
   def set_default_state
     params[:state] = 'opened' if params[:state].blank?

app/controllers/concerns/issues_action.rb

@@ -18,4 +18,5 @@ module IssuesAction
       format.atom { render layout: 'xml.atom' }
     end
   end
+  # rubocop:enable Cop/ModuleWithInstanceVariables
 end

app/controllers/concerns/merge_requests_action.rb

@@ -12,6 +12,7 @@ module MergeRequestsAction
     @collection_type    = "MergeRequest"
     @issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type)
   end
+  # rubocop:enable Cop/ModuleWithInstanceVariables
 
   private
 

app/controllers/concerns/milestone_actions.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Cop/ModuleWithInstanceVariables
 module MilestoneActions
   extend ActiveSupport::Concern
 
@@ -7,7 +6,7 @@ module MilestoneActions
       format.html { redirect_to milestone_redirect_path }
       format.json do
         render json: tabs_json("shared/milestones/_merge_requests_tab", {
-          merge_requests: @milestone.sorted_merge_requests,
+          merge_requests: @milestone.sorted_merge_requests, # rubocop:disable Cop/ModuleWithInstanceVariables
           show_project_name: true
         })
       end
@@ -19,7 +18,7 @@ module MilestoneActions
       format.html { redirect_to milestone_redirect_path }
       format.json do
         render json: tabs_json("shared/milestones/_participants_tab", {
-          users: @milestone.participants
+          users: @milestone.participants # rubocop:disable Cop/ModuleWithInstanceVariables
         })
       end
     end
@@ -30,7 +29,8 @@ module MilestoneActions
       format.html { redirect_to milestone_redirect_path }
       format.json do
         render json: tabs_json("shared/milestones/_labels_tab", {
-          labels: @milestone.labels
+          labels: @milestone.labels # rubocop:disable Cop/ModuleWithInstanceVariables
+
         })
       end
     end
@@ -44,6 +44,7 @@ module MilestoneActions
     }
   end
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def milestone_redirect_path
     if @project
       project_milestone_path(@project, @milestone)
@@ -53,4 +54,5 @@ module MilestoneActions
       dashboard_milestone_path(@milestone.safe_title, title: @milestone.title)
     end
   end
+  # rubocop:enable Cop/ModuleWithInstanceVariables
 end

app/models/concerns/resolvable_discussion.rb

@@ -30,36 +30,28 @@ module ResolvableDiscussion
               allow_nil: true
   end
 
-  # rubocop:disable Cop/ModuleWithInstanceVariables
   def resolvable?
-    return @resolvable if @resolvable.present?
-
-    @resolvable = potentially_resolvable? && notes.any?(&:resolvable?)
+    @resolvable ||= potentially_resolvable? && notes.any?(&:resolvable?)
   end
 
-  # rubocop:disable Cop/ModuleWithInstanceVariables
   def resolved?
-    return @resolved if @resolved.present?
-
-    @resolved = resolvable? && notes.none?(&:to_be_resolved?)
+    @resolved ||= resolvable? && notes.none?(&:to_be_resolved?)
   end
 
   def first_note
     @first_note ||= notes.first
   end
 
-  # rubocop:disable Cop/ModuleWithInstanceVariables
   def first_note_to_resolve
     return unless resolvable?
 
-    @first_note_to_resolve ||= notes.find(&:to_be_resolved?)
+    @first_note_to_resolve ||= notes.find(&:to_be_resolved?) # rubocop:disable Cop/ModuleWithInstanceVariables
   end
 
-  # rubocop:disable Cop/ModuleWithInstanceVariables
   def last_resolved_note
     return unless resolved?
 
-    @last_resolved_note ||= resolved_notes.sort_by(&:resolved_at).last
+    @last_resolved_note ||= resolved_notes.sort_by(&:resolved_at).last # rubocop:disable Cop/ModuleWithInstanceVariables
   end
 
   def resolved_notes
@@ -100,7 +92,7 @@ module ResolvableDiscussion
     yield(notes_relation)
 
     # Set the notes array to the updated notes
-    @notes = notes_relation.fresh.to_a
+    @notes = notes_relation.fresh.to_a # rubocop:disable Cop/ModuleWithInstanceVariables
 
     self.class.memoized_values.each do |var|
       instance_variable_set(:"@#{var}", nil)

lib/gitlab/ci/pipeline/chain/helpers.rb

@@ -3,17 +3,21 @@ module Gitlab
     module Pipeline
       module Chain
         module Helpers
+          # rubocop:disable Cop/ModuleWithInstanceVariables
           def branch_exists?
             return @is_branch if defined?(@is_branch)
 
             @is_branch = project.repository.branch_exists?(pipeline.ref)
           end
+          # rubocop:enable Cop/ModuleWithInstanceVariables
 
+          # rubocop:disable Cop/ModuleWithInstanceVariables
           def tag_exists?
             return @is_tag if defined?(@is_tag)
 
             @is_tag = project.repository.tag_exists?(pipeline.ref)
           end
+          # rubocop:enable Cop/ModuleWithInstanceVariables
 
           def error(message)
             pipeline.errors.add(:base, message)