Skip to content
Snippets Groups Projects
Commit 07d3d447 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files

Move ModuleWithInstanceVariables to Gitlab namespace

And use .rubocop.yml to exclude paths we don't care,
rather than using the cop itself to exclude.
parent 15edf741
No related branches found
No related tags found
No related merge requests found
Showing
with 80 additions and 67 deletions
Loading
Loading
@@ -1185,7 +1185,20 @@ RSpec/SubjectStub:
RSpec/VerifiedDoubles:
Enabled: false
 
# GitlabSecurity ##############################################################
# Gitlab ###################################################################
Gitlab/ModuleWithInstanceVariables:
Enable: true
Exclude:
# We ignore Rails helpers right now because it's hard to workaround it
- app/helpers/*_helper.rb
# We ignore Rails mailers right now because it's hard to workaround it
- app/mailers/emails/*.rb
# We ignore spec helpers because it usually doesn't matter
- spec/support/**/*.rb
- features/steps/**/*.rb
# GitlabSecurity ###########################################################
 
GitlabSecurity/DeepMunge:
Enabled: true
Loading
Loading
Loading
Loading
@@ -24,11 +24,11 @@ module BoardsResponses
end
 
def respond_with_boards
respond_with(@boards) # rubocop:disable Cop/ModuleWithInstanceVariables
respond_with(@boards) # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
def respond_with_board
respond_with(@board) # rubocop:disable Cop/ModuleWithInstanceVariables
respond_with(@board) # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
def respond_with(resource)
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@ module CreatesCommit
extend ActiveSupport::Concern
include Gitlab::Utils::StrongMemoize
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/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
Loading
Loading
@@ -47,7 +47,7 @@ module CreatesCommit
end
end
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
def authorize_edit_tree!
return if can_collaborate_with_project?
Loading
Loading
@@ -80,7 +80,7 @@ module CreatesCommit
end
end
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def new_merge_request_path
project_new_merge_request_path(
@project_to_commit_into,
Loading
Loading
@@ -92,13 +92,13 @@ module CreatesCommit
}
)
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
def existing_merge_request_path
project_merge_request_path(@project, @merge_request) # rubocop:disable Cop/ModuleWithInstanceVariables
project_merge_request_path(@project, @merge_request) # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def merge_request_exists?
strong_memoize(:merge_request) do
MergeRequestsFinder.new(current_user, project_id: @project.id)
Loading
Loading
@@ -110,10 +110,10 @@ module CreatesCommit
target_branch: @start_branch)
end
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
def different_project?
@project_to_commit_into != @project # rubocop:disable Cop/ModuleWithInstanceVariables
@project_to_commit_into != @project # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
def create_merge_request?
Loading
Loading
@@ -121,6 +121,6 @@ module CreatesCommit
# 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) # rubocop:disable Cop/ModuleWithInstanceVariables
(different_project? || @start_branch != @branch_name) # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
end
module GroupTree
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def render_group_tree(groups)
@groups = if params[:filter].present?
Gitlab::GroupHierarchy.new(groups.search(params[:filter]))
Loading
Loading
@@ -21,6 +21,6 @@ module GroupTree
render json: serializer.represent(@groups)
end
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
end
end
Loading
Loading
@@ -17,7 +17,7 @@ module IssuableActions
end
 
def update
@issuable = update_service.execute(issuable) # rubocop:disable Cop/ModuleWithInstanceVariables
@issuable = update_service.execute(issuable) # rubocop:disable Gitlab/ModuleWithInstanceVariables
 
respond_to do |format|
format.html do
Loading
Loading
@@ -83,7 +83,7 @@ module IssuableActions
def render_conflict_response
respond_to do |format|
format.html do
@conflict = true # rubocop:disable Cop/ModuleWithInstanceVariables
@conflict = true # rubocop:disable Gitlab/ModuleWithInstanceVariables
render :edit
end
 
Loading
Loading
@@ -98,7 +98,7 @@ module IssuableActions
end
 
def labels
@labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute # rubocop:disable Cop/ModuleWithInstanceVariables
@labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
def authorize_destroy_issuable!
Loading
Loading
@@ -108,7 +108,7 @@ module IssuableActions
end
 
def authorize_admin_issuable!
unless can?(current_user, :"admin_#{resource_name}", @project) # rubocop:disable Cop/ModuleWithInstanceVariables
unless can?(current_user, :"admin_#{resource_name}", @project) # rubocop:disable Gitlab/ModuleWithInstanceVariables
return access_denied!
end
end
Loading
Loading
@@ -142,7 +142,7 @@ module IssuableActions
@resource_name ||= controller_name.singularize
end
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def render_entity_json
if @issuable.valid?
render json: serializer.represent(@issuable)
Loading
Loading
@@ -150,7 +150,7 @@ module IssuableActions
render json: { errors: @issuable.errors.full_messages }, status: :unprocessable_entity
end
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
def serializer
raise NotImplementedError
Loading
Loading
@@ -161,6 +161,6 @@ module IssuableActions
end
 
def parent
@project || @group # rubocop:disable Cop/ModuleWithInstanceVariables
@project || @group # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
end
Loading
Loading
@@ -10,7 +10,7 @@ module IssuableCollections
 
private
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def set_issuables_index
@issuables = issuables_collection
@issuables = @issuables.page(params[:page])
Loading
Loading
@@ -35,7 +35,7 @@ module IssuableCollections
@users.push(author) if author
end
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
def issuables_collection
finder.execute.preload(preload_for_collection)
Loading
Loading
@@ -44,7 +44,7 @@ module IssuableCollections
def redirect_out_of_range(total_pages)
return false if total_pages.zero?
 
out_of_range = @issuables.current_page > total_pages # rubocop:disable Cop/ModuleWithInstanceVariables
out_of_range = @issuables.current_page > total_pages # rubocop:disable Gitlab/ModuleWithInstanceVariables
 
if out_of_range
redirect_to(url_for(params.merge(page: total_pages, only_path: true)))
Loading
Loading
@@ -54,7 +54,7 @@ module IssuableCollections
end
 
def issuable_page_count
page_count_for_relation(@issuables, finder.row_count) # rubocop:disable Cop/ModuleWithInstanceVariables
page_count_for_relation(@issuables, finder.row_count) # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
def page_count_for_relation(relation, row_count)
Loading
Loading
@@ -69,7 +69,7 @@ module IssuableCollections
finder_class.new(current_user, filter_params)
end
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def filter_params
set_sort_order_from_cookie
set_default_state
Loading
Loading
@@ -94,7 +94,7 @@ module IssuableCollections
 
@filter_params.permit(IssuableFinder::VALID_PARAMS)
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
def set_default_state
params[:state] = 'opened' if params[:state].blank?
Loading
Loading
@@ -135,7 +135,7 @@ module IssuableCollections
 
def finder
strong_memoize(:finder) do
issuable_finder_for(@finder_type) # rubocop:disable Cop/ModuleWithInstanceVariables
issuable_finder_for(@finder_type) # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
end
 
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@ module IssuesAction
extend ActiveSupport::Concern
include IssuableCollections
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def issues
@finder_type = IssuesFinder
@label = finder.labels.first
Loading
Loading
@@ -18,5 +18,5 @@ module IssuesAction
format.atom { render layout: 'xml.atom' }
end
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
end
Loading
Loading
@@ -2,7 +2,7 @@ module MergeRequestsAction
extend ActiveSupport::Concern
include IssuableCollections
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def merge_requests
@finder_type = MergeRequestsFinder
@label = finder.labels.first
Loading
Loading
@@ -11,7 +11,7 @@ module MergeRequestsAction
 
@issuable_meta_data = issuable_meta_data(@merge_requests, collection_type)
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
private
 
Loading
Loading
Loading
Loading
@@ -6,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, # rubocop:disable Cop/ModuleWithInstanceVariables
merge_requests: @milestone.sorted_merge_requests, # rubocop:disable Gitlab/ModuleWithInstanceVariables
show_project_name: true
})
end
Loading
Loading
@@ -18,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 # rubocop:disable Cop/ModuleWithInstanceVariables
users: @milestone.participants # rubocop:disable Gitlab/ModuleWithInstanceVariables
})
end
end
Loading
Loading
@@ -29,7 +29,7 @@ module MilestoneActions
format.html { redirect_to milestone_redirect_path }
format.json do
render json: tabs_json("shared/milestones/_labels_tab", {
labels: @milestone.labels # rubocop:disable Cop/ModuleWithInstanceVariables
labels: @milestone.labels # rubocop:disable Gitlab/ModuleWithInstanceVariables
 
})
end
Loading
Loading
@@ -44,7 +44,7 @@ module MilestoneActions
}
end
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def milestone_redirect_path
if @project
project_milestone_path(@project, @milestone)
Loading
Loading
@@ -54,5 +54,5 @@ module MilestoneActions
dashboard_milestone_path(@milestone.safe_title, title: @milestone.title)
end
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
end
Loading
Loading
@@ -31,7 +31,7 @@ module NotesActions
render json: notes_json
end
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def create
create_params = note_params.merge(
merge_request_diff_head_sha: params[:merge_request_diff_head_sha],
Loading
Loading
@@ -49,9 +49,9 @@ module NotesActions
format.html { redirect_back_or_default }
end
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def update
@note = Notes::UpdateService.new(project, current_user, note_params).execute(note)
 
Loading
Loading
@@ -64,7 +64,7 @@ module NotesActions
format.html { redirect_back_or_default }
end
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
def destroy
if note.editable?
Loading
Loading
@@ -143,7 +143,7 @@ module NotesActions
end
else
template = "discussions/_diff_discussion"
@fresh_discussion = true # rubocop:disable Cop/ModuleWithInstanceVariables
@fresh_discussion = true # rubocop:disable Gitlab/ModuleWithInstanceVariables
 
locals = { discussions: [discussion], on_image: on_image }
end
Loading
Loading
@@ -196,7 +196,7 @@ module NotesActions
end
 
def noteable
@noteable ||= notes_finder.target || @note&.noteable # rubocop:disable Cop/ModuleWithInstanceVariables
@noteable ||= notes_finder.target || @note&.noteable # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
def require_noteable!
Loading
Loading
module PreviewMarkdown
extend ActiveSupport::Concern
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def preview_markdown
result = PreviewMarkdownService.new(@project, current_user, params).execute
 
Loading
Loading
@@ -20,5 +20,5 @@ module PreviewMarkdown
}
}
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
end
module RendersCommits
def prepare_commits_for_rendering(commits)
Banzai::CommitRenderer.render(commits, @project, current_user) # rubocop:disable Cop/ModuleWithInstanceVariables
Banzai::CommitRenderer.render(commits, @project, current_user) # rubocop:disable Gitlab/ModuleWithInstanceVariables
 
commits
end
Loading
Loading
module RendersNotes
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def prepare_notes_for_rendering(notes, noteable = nil)
preload_noteable_for_regular_notes(notes)
preload_max_access_for_authors(notes, @project)
Loading
Loading
@@ -8,7 +8,7 @@ module RendersNotes
 
notes
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
private
 
Loading
Loading
Loading
Loading
@@ -66,7 +66,7 @@ module ServiceParams
FILTER_BLANK_PARAMS = [:password].freeze
 
def service_params
dynamic_params = @service.event_channel_names + @service.event_names # rubocop:disable Cop/ModuleWithInstanceVariables
dynamic_params = @service.event_channel_names + @service.event_names # rubocop:disable Gitlab/ModuleWithInstanceVariables
service_params = params.permit(:id, service: ALLOWED_PARAMS_CE + dynamic_params)
 
if service_params[:service].is_a?(Hash)
Loading
Loading
Loading
Loading
@@ -4,7 +4,7 @@ module SnippetsActions
def edit
end
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def raw
disposition = params[:inline] == 'false' ? 'attachment' : 'inline'
 
Loading
Loading
@@ -15,7 +15,7 @@ module SnippetsActions
filename: @snippet.sanitized_file_name
)
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
private
 
Loading
Loading
Loading
Loading
@@ -46,7 +46,7 @@ module Noteable
notes.inc_relations_for_view.grouped_diff_discussions(*args)
end
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def resolvable_discussions
@resolvable_discussions ||=
if defined?(@discussions)
Loading
Loading
@@ -55,7 +55,7 @@ module Noteable
discussion_notes.resolvable.discussions(self)
end
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
 
def discussions_resolvable?
resolvable_discussions.any?(&:resolvable?)
Loading
Loading
Loading
Loading
@@ -52,7 +52,7 @@ module RelativePositioning
# to its predecessor. This process will recursively move all the predecessors until we have a place
if (after.relative_position - before.relative_position) < 2
before.move_before
@positionable_neighbours = [before] # rubocop:disable Cop/ModuleWithInstanceVariables
@positionable_neighbours = [before] # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
self.relative_position = position_between(before.relative_position, after.relative_position)
Loading
Loading
@@ -65,7 +65,7 @@ module RelativePositioning
if before.shift_after?
issue_to_move = self.class.in_projects(project_ids).find_by!(relative_position: pos_after)
issue_to_move.move_after
@positionable_neighbours = [issue_to_move] # rubocop:disable Cop/ModuleWithInstanceVariables
@positionable_neighbours = [issue_to_move] # rubocop:disable Gitlab/ModuleWithInstanceVariables
 
pos_after = issue_to_move.relative_position
end
Loading
Loading
@@ -80,7 +80,7 @@ module RelativePositioning
if after.shift_before?
issue_to_move = self.class.in_projects(project_ids).find_by!(relative_position: pos_before)
issue_to_move.move_before
@positionable_neighbours = [issue_to_move] # rubocop:disable Cop/ModuleWithInstanceVariables
@positionable_neighbours = [issue_to_move] # rubocop:disable Gitlab/ModuleWithInstanceVariables
 
pos_before = issue_to_move.relative_position
end
Loading
Loading
@@ -132,7 +132,7 @@ module RelativePositioning
end
end
 
# rubocop:disable Cop/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def save_positionable_neighbours
return unless @positionable_neighbours
 
Loading
Loading
@@ -141,5 +141,5 @@ module RelativePositioning
 
status
end
# rubocop:enable Cop/ModuleWithInstanceVariables
# rubocop:enable Gitlab/ModuleWithInstanceVariables
end
Loading
Loading
@@ -45,13 +45,13 @@ module ResolvableDiscussion
def first_note_to_resolve
return unless resolvable?
 
@first_note_to_resolve ||= notes.find(&:to_be_resolved?) # rubocop:disable Cop/ModuleWithInstanceVariables
@first_note_to_resolve ||= notes.find(&:to_be_resolved?) # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
def last_resolved_note
return unless resolved?
 
@last_resolved_note ||= resolved_notes.sort_by(&:resolved_at).last # rubocop:disable Cop/ModuleWithInstanceVariables
@last_resolved_note ||= resolved_notes.sort_by(&:resolved_at).last # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
def resolved_notes
Loading
Loading
@@ -91,7 +91,7 @@ module ResolvableDiscussion
yield(notes_relation)
 
# Set the notes array to the updated notes
@notes = notes_relation.fresh.to_a # rubocop:disable Cop/ModuleWithInstanceVariables
@notes = notes_relation.fresh.to_a # rubocop:disable Gitlab/ModuleWithInstanceVariables
 
self.class.memoized_values.each do |var|
instance_variable_set(:"@#{var}", nil)
Loading
Loading
Loading
Loading
@@ -88,7 +88,7 @@ module Routable
 
def full_name
if route && route.name.present?
@full_name ||= route.name # rubocop:disable Cop/ModuleWithInstanceVariables
@full_name ||= route.name # rubocop:disable Gitlab/ModuleWithInstanceVariables
else
update_route if persisted?
 
Loading
Loading
@@ -112,7 +112,7 @@ module Routable
 
def expires_full_path_cache
RequestStore.delete(full_path_key) if RequestStore.active?
@full_path = nil # rubocop:disable Cop/ModuleWithInstanceVariables
@full_path = nil # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
def build_full_path
Loading
Loading
@@ -127,7 +127,7 @@ module Routable
 
def uncached_full_path
if route && route.path.present?
@full_path ||= route.path # rubocop:disable Cop/ModuleWithInstanceVariables
@full_path ||= route.path # rubocop:disable Gitlab/ModuleWithInstanceVariables
else
update_route if persisted?
 
Loading
Loading
@@ -166,7 +166,7 @@ module Routable
route || build_route(source: self)
route.path = build_full_path
route.name = build_full_name
@full_path = nil # rubocop:disable Cop/ModuleWithInstanceVariables
@full_name = nil # rubocop:disable Cop/ModuleWithInstanceVariables
@full_path = nil # rubocop:disable Gitlab/ModuleWithInstanceVariables
@full_name = nil # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
end
Loading
Loading
@@ -39,7 +39,7 @@ module Taskable
def task_list_items
return [] if description.blank?
 
@task_list_items ||= Taskable.get_tasks(description) # rubocop:disable Cop/ModuleWithInstanceVariables
@task_list_items ||= Taskable.get_tasks(description) # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
 
def tasks
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment