Skip to content
Snippets Groups Projects
Commit 206953a4 authored by Douwe Maan's avatar Douwe Maan
Browse files

Prefer leading style for Style/DotPosition

parent f72a6560
No related branches found
No related tags found
No related merge requests found
Showing
with 85 additions and 85 deletions
Loading
Loading
@@ -17,8 +17,8 @@ module Boards
attr_reader :board
 
def decrement_higher_lists(list)
board.lists.movable.where('position > ?', list.position).
update_all('position = position - 1')
board.lists.movable.where('position > ?', list.position)
.update_all('position = position - 1')
end
 
def remove_list(list)
Loading
Loading
Loading
Loading
@@ -33,15 +33,15 @@ module Boards
end
 
def decrement_intermediate_lists
board.lists.movable.where('position > ?', old_position).
where('position <= ?', new_position).
update_all('position = position - 1')
board.lists.movable.where('position > ?', old_position)
.where('position <= ?', new_position)
.update_all('position = position - 1')
end
 
def increment_intermediate_lists
board.lists.movable.where('position >= ?', new_position).
where('position < ?', old_position).
update_all('position = position + 1')
board.lists.movable.where('position >= ?', new_position)
.where('position < ?', old_position)
.update_all('position = position + 1')
end
 
def update_list_position(list)
Loading
Loading
Loading
Loading
@@ -36,8 +36,8 @@ module Ci
end
 
def new_builds
@new_builds ||= pipeline.config_builds_attributes.
reject { |build| existing_build_names.include?(build[:name]) }
@new_builds ||= pipeline.config_builds_attributes
.reject { |build| existing_build_names.include?(build[:name]) }
end
 
def existing_build_names
Loading
Loading
Loading
Loading
@@ -48,9 +48,9 @@ module Ci
Ci::Pipeline.transaction do
pipeline.save
 
Ci::CreatePipelineBuildsService.
new(project, current_user).
execute(pipeline)
Ci::CreatePipelineBuildsService
.new(project, current_user)
.execute(pipeline)
end
 
pipeline.tap(&:process!)
Loading
Loading
Loading
Loading
@@ -3,8 +3,8 @@ module Ci
def execute(project, trigger, ref, variables = nil)
trigger_request = trigger.trigger_requests.create(variables: variables)
 
pipeline = Ci::CreatePipelineService.new(project, nil, ref: ref).
execute(ignore_skip_ci: true, trigger_request: trigger_request)
pipeline = Ci::CreatePipelineService.new(project, nil, ref: ref)
.execute(ignore_skip_ci: true, trigger_request: trigger_request)
if pipeline.persisted?
trigger_request
end
Loading
Loading
Loading
Loading
@@ -78,9 +78,9 @@ module Ci
def ensure_created_builds!
return if created_builds.any?
 
Ci::CreatePipelineBuildsService.
new(project, current_user).
execute(pipeline)
Ci::CreatePipelineBuildsService
.new(project, current_user)
.execute(pipeline)
end
end
end
Loading
Loading
@@ -42,15 +42,15 @@ module Ci
def builds_for_shared_runner
new_builds.
# don't run projects which have not enabled shared runners and builds
joins(:project).where(projects: { shared_runners_enabled: true }).
joins('LEFT JOIN project_features ON ci_builds.gl_project_id = project_features.project_id').
where('project_features.builds_access_level IS NULL or project_features.builds_access_level > 0').
joins(:project).where(projects: { shared_runners_enabled: true })
.joins('LEFT JOIN project_features ON ci_builds.gl_project_id = project_features.project_id')
.where('project_features.builds_access_level IS NULL or project_features.builds_access_level > 0').
 
# Implement fair scheduling
# this returns builds that are ordered by number of running builds
# we prefer projects that don't use shared runners at all
joins("LEFT JOIN (#{running_builds_for_shared_runners.to_sql}) AS project_builds ON ci_builds.gl_project_id=project_builds.gl_project_id").
order('COALESCE(project_builds.running_builds, 0) ASC', 'ci_builds.id ASC')
joins("LEFT JOIN (#{running_builds_for_shared_runners.to_sql}) AS project_builds ON ci_builds.gl_project_id=project_builds.gl_project_id")
.order('COALESCE(project_builds.running_builds, 0) ASC', 'ci_builds.id ASC')
end
 
def builds_for_specific_runner
Loading
Loading
@@ -58,8 +58,8 @@ module Ci
end
 
def running_builds_for_shared_runners
Ci::Build.running.where(runner: Ci::Runner.shared).
group(:gl_project_id).select(:gl_project_id, 'count(*) AS running_builds')
Ci::Build.running.where(runner: Ci::Runner.shared)
.group(:gl_project_id).select(:gl_project_id, 'count(*) AS running_builds')
end
 
def new_builds
Loading
Loading
Loading
Loading
@@ -2,8 +2,8 @@ module Ci
class RetryBuildService < ::BaseService
CLONE_ATTRIBUTES = %i[pipeline project ref tag options commands name
allow_failure stage stage_idx trigger_request
yaml_variables when environment coverage_regex].
freeze
yaml_variables when environment coverage_regex]
.freeze
 
REJECT_ATTRIBUTES = %i[id status user token coverage trace runner
artifacts_expire_at artifacts_file
Loading
Loading
@@ -20,9 +20,9 @@ module Ci
 
new_build.enqueue!
 
MergeRequests::AddTodoWhenBuildFailsService.
new(project, current_user).
close(new_build)
MergeRequests::AddTodoWhenBuildFailsService
.new(project, current_user)
.close(new_build)
end
end
 
Loading
Loading
Loading
Loading
@@ -8,13 +8,13 @@ module Ci
pipeline.builds.failed_or_canceled.find_each do |build|
next unless build.retryable?
 
Ci::RetryBuildService.new(project, current_user).
reprocess(build)
Ci::RetryBuildService.new(project, current_user)
.reprocess(build)
end
 
MergeRequests::AddTodoWhenBuildFailsService.
new(project, current_user).
close_all(pipeline)
MergeRequests::AddTodoWhenBuildFailsService
.new(project, current_user)
.close_all(pipeline)
 
pipeline.process!
end
Loading
Loading
Loading
Loading
@@ -70,8 +70,8 @@ module Commits
# Temporary branch exists and contains the change commit
return if repository.find_branch(new_branch)
 
result = ValidateNewBranchService.new(@project, current_user).
execute(new_branch)
result = ValidateNewBranchService.new(@project, current_user)
.execute(new_branch)
 
if result[:status] == :error
raise ChangeError, "There was an error creating the source branch: #{result[:message]}"
Loading
Loading
class CreateBranchService < BaseService
def execute(branch_name, ref)
result = ValidateNewBranchService.new(project, current_user).
execute(branch_name)
result = ValidateNewBranchService.new(project, current_user)
.execute(branch_name)
 
return result if result[:status] == :error
 
Loading
Loading
Loading
Loading
@@ -72,8 +72,8 @@ module Files
end
 
def validate_target_branch
result = ValidateNewBranchService.new(project, current_user).
execute(@target_branch)
result = ValidateNewBranchService.new(project, current_user)
.execute(@target_branch)
 
if result[:status] == :error
raise_error("Something went wrong when we tried to create #{@target_branch} for you: #{result[:message]}")
Loading
Loading
Loading
Loading
@@ -24,8 +24,8 @@ module Files
end
 
def last_commit
@last_commit ||= Gitlab::Git::Commit.
last_for_path(@start_project.repository, @start_branch, @file_path)
@last_commit ||= Gitlab::Git::Commit
.last_for_path(@start_project.repository, @start_branch, @file_path)
end
end
end
Loading
Loading
@@ -85,8 +85,8 @@ class GitPushService < BaseService
default = is_default_branch?
 
push_commits.last(PROCESS_COMMIT_LIMIT).each do |commit|
ProcessCommitWorker.
perform_async(project.id, current_user.id, commit.to_hash, default)
ProcessCommitWorker
.perform_async(project.id, current_user.id, commit.to_hash, default)
end
end
 
Loading
Loading
@@ -96,8 +96,8 @@ class GitPushService < BaseService
# Update merge requests that may be affected by this push. A new branch
# could cause the last commit of a merge request to change.
#
UpdateMergeRequestsWorker.
perform_async(@project.id, current_user.id, params[:oldrev], params[:newrev], params[:ref])
UpdateMergeRequestsWorker
.perform_async(@project.id, current_user.id, params[:oldrev], params[:newrev], params[:ref])
 
EventCreateService.new.push(@project, current_user, build_push_data)
@project.execute_hooks(build_push_data.dup, :push_hooks)
Loading
Loading
@@ -105,9 +105,9 @@ class GitPushService < BaseService
Ci::CreatePipelineService.new(@project, current_user, build_push_data).execute
 
if push_remove_branch?
AfterBranchDeleteService.
new(project, current_user).
execute(branch_name)
AfterBranchDeleteService
.new(project, current_user)
.execute(branch_name)
end
end
 
Loading
Loading
Loading
Loading
@@ -144,8 +144,8 @@ class IssuableBaseService < BaseService
 
def merge_slash_commands_into_params!(issuable)
description, command_params =
SlashCommands::InterpretService.new(project, current_user).
execute(params[:description], issuable)
SlashCommands::InterpretService.new(project, current_user)
.execute(params[:description], issuable)
 
# Avoid a description already set on an issuable to be overwritten by a nil
params[:description] = description if params.has_key?(:description)
Loading
Loading
Loading
Loading
@@ -29,8 +29,8 @@ module Issues
def resolve_discussions_in_merge_request(issue)
Discussions::ResolveService.new(project, current_user,
merge_request: merge_request_for_resolving_discussions,
follow_up_issue: issue).
execute(merge_request_for_resolving_discussions.resolvable_discussions)
follow_up_issue: issue)
.execute(merge_request_for_resolving_discussions.resolvable_discussions)
end
 
private
Loading
Loading
Loading
Loading
@@ -61,8 +61,8 @@ module Issues
end
 
def cloneable_milestone_id
@new_project.milestones.
find_by(title: @old_issue.milestone.try(:title)).try(:id)
@new_project.milestones
.find_by(title: @old_issue.milestone.try(:title)).try(:id)
end
 
def rewrite_notes
Loading
Loading
Loading
Loading
@@ -26,29 +26,29 @@ module Labels
private
 
def label_ids_for_merge(new_label)
LabelsFinder.
new(current_user, title: new_label.title, group_id: project.group.id).
execute(skip_authorization: true).
where.not(id: new_label).
select(:id) # Can't use pluck() to avoid object-creation because of the batching
LabelsFinder
.new(current_user, title: new_label.title, group_id: project.group.id)
.execute(skip_authorization: true)
.where.not(id: new_label)
.select(:id) # Can't use pluck() to avoid object-creation because of the batching
end
 
def update_issuables(new_label, label_ids)
LabelLink.
where(label: label_ids).
update_all(label_id: new_label)
LabelLink
.where(label: label_ids)
.update_all(label_id: new_label)
end
 
def update_issue_board_lists(new_label, label_ids)
List.
where(label: label_ids).
update_all(label_id: new_label)
List
.where(label: label_ids)
.update_all(label_id: new_label)
end
 
def update_priorities(new_label, label_ids)
LabelPriority.
where(label: label_ids).
update_all(label_id: new_label)
LabelPriority
.where(label: label_ids)
.update_all(label_id: new_label)
end
 
def update_project_labels(label_ids)
Loading
Loading
Loading
Loading
@@ -41,16 +41,16 @@ module Labels
end
 
def group_labels_applied_to_issues
Label.joins(:issues).
where(
Label.joins(:issues)
.where(
issues: { project_id: project.id },
labels: { type: 'GroupLabel', group_id: old_group.id }
)
end
 
def group_labels_applied_to_merge_requests
Label.joins(:merge_requests).
where(
Label.joins(:merge_requests)
.where(
merge_requests: { target_project_id: project.id },
labels: { type: 'GroupLabel', group_id: old_group.id }
)
Loading
Loading
@@ -64,15 +64,15 @@ module Labels
end
 
def update_label_links(labels, old_label_id:, new_label_id:)
LabelLink.joins(:label).
merge(labels).
where(label_id: old_label_id).
update_all(label_id: new_label_id)
LabelLink.joins(:label)
.merge(labels)
.where(label_id: old_label_id)
.update_all(label_id: new_label_id)
end
 
def update_label_priorities(old_label_id:, new_label_id:)
LabelPriority.where(project_id: project.id, label_id: old_label_id).
update_all(label_id: new_label_id)
LabelPriority.where(project_id: project.id, label_id: old_label_id)
.update_all(label_id: new_label_id)
end
end
end
Loading
Loading
@@ -40,11 +40,11 @@ module MergeRequests
 
# Returns all origin and fork merge requests from `@project` satisfying passed arguments.
def merge_requests_for(source_branch, mr_states: [:opened])
MergeRequest.
with_state(mr_states).
where(source_branch: source_branch, source_project_id: @project.id).
preload(:source_project). # we don't need a #includes since we're just preloading for the #select
select(&:source_project)
MergeRequest
.with_state(mr_states)
.where(source_branch: source_branch, source_project_id: @project.id)
.preload(:source_project) # we don't need a #includes since we're just preloading for the #select
.select(&:source_project)
end
 
def pipeline_merge_requests(pipeline)
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