15 files changed, 24 insertions, 3 deletions
diff --git a/app/controllers/concerns/boards_responses.rb b/app/controllers/concerns/boards_responses.rb
index 2c9c095a5d7..058e4591770 100644
--- a/app/controllers/concerns/boards_responses.rb
+++ b/app/controllers/concerns/boards_responses.rb
@@ -23,10 +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)
   end
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def respond_with_board
     respond_with(@board)
   end
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index 782f0be9c4a..0350c9228c9 100644
--- a/app/controllers/concerns/creates_commit.rb
+++ b/app/controllers/concerns/creates_commit.rb
@@ -1,6 +1,7 @@
 module CreatesCommit
   extend ActiveSupport::Concern
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def create_commit(service, success_path:, failure_path:, failure_view: nil, success_notice: nil)
     if can?(current_user, :push_code, @project)
       @project_to_commit_into = @project
@@ -77,6 +78,7 @@ module CreatesCommit
     end
   end
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def new_merge_request_path
     project_new_merge_request_path(
       @project_to_commit_into,
@@ -93,6 +95,7 @@ module CreatesCommit
     project_merge_request_path(@project, @merge_request)
   end
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def merge_request_exists?
     return @merge_request if defined?(@merge_request)
 
@@ -100,10 +103,12 @@ module CreatesCommit
       .find_by(source_project_id: @project_to_commit_into, source_branch: @branch_name, target_branch: @start_branch)
   end
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def different_project?
     @project_to_commit_into != @project
   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,
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb
index 9c222549cdc..01645d4f6c1 100644
--- a/app/controllers/concerns/issuable_actions.rb
+++ b/app/controllers/concerns/issuable_actions.rb
@@ -19,7 +19,7 @@ module IssuableActions
   end
 
   def update
-    @issuable = update_service.execute(issuable)
+    @issuable = update_service.execute(issuable) # rubocop:disable Cop/ModuleWithInstanceVariables
 
     respond_to do |format|
       format.html do
@@ -85,7 +85,7 @@ module IssuableActions
   def render_conflict_response
     respond_to do |format|
       format.html do
-        @conflict = true
+        @conflict = true # rubocop:disable Cop/ModuleWithInstanceVariables
         render :edit
       end
 
@@ -99,6 +99,7 @@ module IssuableActions
     end
   end
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def labels
     @labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute
   end
@@ -109,6 +110,7 @@ module IssuableActions
     end
   end
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def authorize_admin_issuable!
     unless can?(current_user, :"admin_#{resource_name}", @project)
       return access_denied!
diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb
index 3181f517087..cfd1d077fe8 100644
--- a/app/controllers/concerns/issuable_collections.rb
+++ b/app/controllers/concerns/issuable_collections.rb
@@ -10,6 +10,7 @@ module IssuableCollections
 
   private
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def set_issues_index
     @collection_type    = "Issue"
     @issues             = issues_collection
@@ -84,6 +85,7 @@ module IssuableCollections
     finder_class.new(current_user, filter_params)
   end
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def filter_params
     set_sort_order_from_cookie
     set_default_state
diff --git a/app/controllers/concerns/issues_action.rb b/app/controllers/concerns/issues_action.rb
index 404559c8707..a28dd376c80 100644
--- a/app/controllers/concerns/issues_action.rb
+++ b/app/controllers/concerns/issues_action.rb
@@ -2,6 +2,7 @@ module IssuesAction
   extend ActiveSupport::Concern
   include IssuableCollections
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def issues
     @label = issues_finder.labels.first
 
diff --git a/app/controllers/concerns/merge_requests_action.rb b/app/controllers/concerns/merge_requests_action.rb
index d3c8e4888bc..0f61e1ccc06 100644
--- a/app/controllers/concerns/merge_requests_action.rb
+++ b/app/controllers/concerns/merge_requests_action.rb
@@ -2,6 +2,7 @@ module MergeRequestsAction
   extend ActiveSupport::Concern
   include IssuableCollections
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def merge_requests
     @label = merge_requests_finder.labels.first
 
diff --git a/app/controllers/concerns/milestone_actions.rb b/app/controllers/concerns/milestone_actions.rb
index 081f3336780..46facd915c8 100644
--- a/app/controllers/concerns/milestone_actions.rb
+++ b/app/controllers/concerns/milestone_actions.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module MilestoneActions
   extend ActiveSupport::Concern
 
diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb
index 57b45f335fa..be6062c7d55 100644
--- a/app/controllers/concerns/notes_actions.rb
+++ b/app/controllers/concerns/notes_actions.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Cop/ModuleWithInstanceVariables
 module NotesActions
   include RendersNotes
   extend ActiveSupport::Concern
diff --git a/app/controllers/concerns/oauth_applications.rb b/app/controllers/concerns/oauth_applications.rb
index 9849aa93fa6..f0a68f23566 100644
--- a/app/controllers/concerns/oauth_applications.rb
+++ b/app/controllers/concerns/oauth_applications.rb
@@ -14,6 +14,6 @@ module OauthApplications
   end
 
   def load_scopes
-    @scopes = Doorkeeper.configuration.scopes
+    @scopes ||= Doorkeeper.configuration.scopes
   end
 end
diff --git a/app/controllers/concerns/renders_commits.rb b/app/controllers/concerns/renders_commits.rb
index bb2c1dfa00a..675fefd0d36 100644
--- a/app/controllers/concerns/renders_commits.rb
+++ b/app/controllers/concerns/renders_commits.rb
@@ -1,4 +1,5 @@
 module RendersCommits
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def prepare_commits_for_rendering(commits)
     Banzai::CommitRenderer.render(commits, @project, current_user)
 
diff --git a/app/controllers/concerns/renders_notes.rb b/app/controllers/concerns/renders_notes.rb
index 4791bc561a4..4185396e24b 100644
--- a/app/controllers/concerns/renders_notes.rb
+++ b/app/controllers/concerns/renders_notes.rb
@@ -1,4 +1,5 @@
 module RendersNotes
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def prepare_notes_for_rendering(notes, noteable = nil)
     preload_noteable_for_regular_notes(notes)
     preload_max_access_for_authors(notes, @project)
diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb
index be2e6c7f193..ce60267f345 100644
--- a/app/controllers/concerns/service_params.rb
+++ b/app/controllers/concerns/service_params.rb
@@ -65,6 +65,7 @@ module ServiceParams
   # Parameters to ignore if no value is specified
   FILTER_BLANK_PARAMS = [:password].freeze
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def service_params
     dynamic_params = @service.event_channel_names + @service.event_names
     service_params = params.permit(:id, service: ALLOWED_PARAMS_CE + dynamic_params)
diff --git a/app/controllers/concerns/snippets_actions.rb b/app/controllers/concerns/snippets_actions.rb
index ffea712a833..4216c1fe063 100644
--- a/app/controllers/concerns/snippets_actions.rb
+++ b/app/controllers/concerns/snippets_actions.rb
@@ -4,6 +4,7 @@ module SnippetsActions
   def edit
   end
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def raw
     disposition = params[:inline] == 'false' ? 'attachment' : 'inline'
 
diff --git a/app/controllers/concerns/spammable_actions.rb b/app/controllers/concerns/spammable_actions.rb
index ada0dde87fb..ef6e14c9e4c 100644
--- a/app/controllers/concerns/spammable_actions.rb
+++ b/app/controllers/concerns/spammable_actions.rb
@@ -17,6 +17,7 @@ module SpammableActions
 
   private
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def ensure_spam_config_loaded!
     return @spam_config_loaded if defined?(@spam_config_loaded)
 
diff --git a/app/controllers/concerns/toggle_subscription_action.rb b/app/controllers/concerns/toggle_subscription_action.rb
index 92cb534343e..0a6d40d36ea 100644
--- a/app/controllers/concerns/toggle_subscription_action.rb
+++ b/app/controllers/concerns/toggle_subscription_action.rb
@@ -11,6 +11,7 @@ module ToggleSubscriptionAction
 
   private
 
+  # rubocop:disable Cop/ModuleWithInstanceVariables
   def subscribable_project
     @project || raise(NotImplementedError)
   end