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 112 additions and 112 deletions
Loading
Loading
@@ -162,8 +162,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
# Get commits from repository
# or from cache if already merged
@commits = @merge_request.commits
@note_counts = Note.where(commit_id: @commits.map(&:id)).
group(:commit_id).count
@note_counts = Note.where(commit_id: @commits.map(&:id))
.group(:commit_id).count
 
render json: { html: view_to_html_string('projects/merge_requests/show/_commits') }
end
Loading
Loading
@@ -232,9 +232,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
 
format.json do
render json: PipelineSerializer.
new(project: @project, user: @current_user).
represent(@pipelines)
render json: PipelineSerializer
.new(project: @project, user: @current_user)
.represent(@pipelines)
end
end
end
Loading
Loading
@@ -245,9 +245,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
format.json do
define_pipelines_vars
 
render json: PipelineSerializer.
new(project: @project, user: @current_user).
represent(@pipelines)
render json: PipelineSerializer
.new(project: @project, user: @current_user)
.represent(@pipelines)
end
end
end
Loading
Loading
@@ -332,9 +332,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
return access_denied!
end
 
MergeRequests::MergeWhenPipelineSucceedsService.
new(@project, current_user).
cancel(@merge_request)
MergeRequests::MergeWhenPipelineSucceedsService
.new(@project, current_user)
.cancel(@merge_request)
end
 
def merge
Loading
Loading
@@ -361,9 +361,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
 
if @merge_request.head_pipeline.active?
MergeRequests::MergeWhenPipelineSucceedsService.
new(@project, current_user, merge_params).
execute(@merge_request)
MergeRequests::MergeWhenPipelineSucceedsService
.new(@project, current_user, merge_params)
.execute(@merge_request)
 
@status = :merge_when_build_succeeds
elsif @merge_request.head_pipeline.success?
Loading
Loading
@@ -624,8 +624,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@commit = @merge_request.diff_head_commit
@base_commit = @merge_request.diff_base_commit
 
@note_counts = Note.where(commit_id: @commits.map(&:id)).
group(:commit_id).count
@note_counts = Note.where(commit_id: @commits.map(&:id))
.group(:commit_id).count
 
@labels = LabelsFinder.new(current_user, project_id: @project.id).execute
 
Loading
Loading
@@ -640,8 +640,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
 
def merge_request_params
params.require(:merge_request).
permit(merge_request_params_ce)
params.require(:merge_request)
.permit(merge_request_params_ce)
end
 
def merge_request_params_ce
Loading
Loading
Loading
Loading
@@ -7,11 +7,11 @@ class Projects::PipelinesController < Projects::ApplicationController
 
def index
@scope = params[:scope]
@pipelines = PipelinesFinder.
new(project).
execute(scope: @scope).
page(params[:page]).
per(30)
@pipelines = PipelinesFinder
.new(project)
.execute(scope: @scope)
.page(params[:page])
.per(30)
 
@running_count = PipelinesFinder.
.new(project).execute(scope: 'running').count
Loading
Loading
@@ -29,10 +29,10 @@ class Projects::PipelinesController < Projects::ApplicationController
format.html
format.json do
render json: {
pipelines: PipelineSerializer.
new(project: @project, user: @current_user).
with_pagination(request, response).
represent(@pipelines),
pipelines: PipelineSerializer
.new(project: @project, user: @current_user)
.with_pagination(request, response)
.represent(@pipelines),
count: {
all: @pipelines_count,
running: @running_count,
Loading
Loading
@@ -49,9 +49,9 @@ class Projects::PipelinesController < Projects::ApplicationController
end
 
def create
@pipeline = Ci::CreatePipelineService.
new(project, current_user, create_params).
execute(ignore_skip_ci: true, save_on_errors: false)
@pipeline = Ci::CreatePipelineService
.new(project, current_user, create_params)
.execute(ignore_skip_ci: true, save_on_errors: false)
unless @pipeline.persisted?
render 'new'
return
Loading
Loading
Loading
Loading
@@ -31,8 +31,8 @@ class Projects::ProjectMembersController < Projects::ApplicationController
end
 
def destroy
Members::DestroyService.new(@project, current_user, params).
execute(:all)
Members::DestroyService.new(@project, current_user, params)
.execute(:all)
 
respond_to do |format|
format.html do
Loading
Loading
Loading
Loading
@@ -14,8 +14,8 @@ module Projects
 
def define_runners_variables
@project_runners = @project.runners.ordered
@assignable_runners = current_user.ci_authorized_runners.
assignable_for(project).ordered.page(params[:page]).per(20)
@assignable_runners = current_user.ci_authorized_runners
.assignable_for(project).ordered.page(params[:page]).per(20)
@shared_runners = Ci::Runner.shared.active
@shared_runners_count = @shared_runners.count(:all)
end
Loading
Loading
Loading
Loading
@@ -41,10 +41,10 @@ module Projects
wheres = ["members.id IN (#{@project_members.select(:id).to_sql})"]
wheres << "members.id IN (#{group_members.select(:id).to_sql})" if group_members
 
@project_members = Member.
where(wheres.join(' OR ')).
sort(@sort).
page(params[:page])
@project_members = Member
.where(wheres.join(' OR '))
.sort(@sort)
.page(params[:page])
 
@requesters = AccessRequestsFinder.new(@project).execute(current_user)
 
Loading
Loading
Loading
Loading
@@ -27,8 +27,8 @@ class Projects::TagsController < Projects::ApplicationController
end
 
def create
result = Tags::CreateService.new(@project, current_user).
execute(params[:tag_name], params[:ref], params[:message], params[:release_description])
result = Tags::CreateService.new(@project, current_user)
.execute(params[:tag_name], params[:ref], params[:message], params[:release_description])
 
if result[:status] == :success
@tag = result[:tag]
Loading
Loading
Loading
Loading
@@ -5,8 +5,8 @@ class Projects::UploadsController < Projects::ApplicationController
before_action :authorize_upload_file!, only: [:create]
 
def create
link_to_file = ::Projects::UploadService.new(project, params[:file]).
execute
link_to_file = ::Projects::UploadService.new(project, params[:file])
.execute
 
respond_to do |format|
if link_to_file
Loading
Loading
Loading
Loading
@@ -293,8 +293,8 @@ class ProjectsController < Projects::ApplicationController
end
 
def project_params
params.require(:project).
permit(project_params_ce)
params.require(:project)
.permit(project_params_ce)
end
 
def project_params_ce
Loading
Loading
Loading
Loading
@@ -119,8 +119,8 @@ class SessionsController < Devise::SessionsController
end
 
def log_audit_event(user, options = {})
AuditEventService.new(user, user, options).
for_authentication.security_event
AuditEventService.new(user, user, options)
.for_authentication.security_event
end
 
def load_recaptcha
Loading
Loading
Loading
Loading
@@ -4,8 +4,8 @@ module Sherlock
 
def find_transaction
if params[:transaction_id]
@transaction = Gitlab::Sherlock.collection.
find_transaction(params[:transaction_id])
@transaction = Gitlab::Sherlock.collection
.find_transaction(params[:transaction_id])
end
end
end
Loading
Loading
Loading
Loading
@@ -28,8 +28,8 @@ class SnippetsController < ApplicationController
@snippets = SnippetsFinder.new.execute(current_user, {
filter: :by_user,
user: @user,
scope: params[:scope] }).
page(params[:page])
scope: params[:scope] })
.page(params[:page])
 
render 'index'
else
Loading
Loading
@@ -82,8 +82,8 @@ class SnippetsController < ApplicationController
@snippet ||= if current_user
PersonalSnippet.where("author_id = ? OR visibility_level IN (?)",
current_user.id,
[Snippet::PUBLIC, Snippet::INTERNAL]).
find(params[:id])
[Snippet::PUBLIC, Snippet::INTERNAL])
.find(params[:id])
else
PersonalSnippet.find(params[:id])
end
Loading
Loading
Loading
Loading
@@ -109,17 +109,17 @@ class UsersController < ApplicationController
 
def load_events
# Get user activity feed for projects common for both users
@events = user.recent_events.
merge(projects_for_current_user).
references(:project).
with_associations.
limit_recent(20, params[:offset])
@events = user.recent_events
.merge(projects_for_current_user)
.references(:project)
.with_associations
.limit_recent(20, params[:offset])
end
 
def load_projects
@projects =
PersonalProjectsFinder.new(user).execute(current_user).
page(params[:page])
PersonalProjectsFinder.new(user).execute(current_user)
.page(params[:page])
end
 
def load_contributed_projects
Loading
Loading
Loading
Loading
@@ -17,12 +17,12 @@ class EnvironmentsFinder
deployments.none
end
 
environment_ids = deployments.
group(:environment_id).
select(:environment_id)
environment_ids = deployments
.group(:environment_id)
.select(:environment_id)
 
environments = project.environments.available.
where(id: environment_ids).order_by_last_deployed_at.to_a
environments = project.environments.available
.where(id: environment_ids).order_by_last_deployed_at.to_a
 
environments.select! do |environment|
Ability.allowed?(current_user, :read_environment, environment)
Loading
Loading
Loading
Loading
@@ -8,9 +8,9 @@ class GroupMembersFinder < Projects::ApplicationController
 
return group_members unless @group.parent
 
parents_members = GroupMember.non_request.
where(source_id: @group.ancestors.select(:id)).
where.not(user_id: @group.users.select(:id))
parents_members = GroupMember.non_request
.where(source_id: @group.ancestors.select(:id))
.where.not(user_id: @group.users.select(:id))
 
wheres = ["members.id IN (#{group_members.select(:id).to_sql})"]
wheres << "members.id IN (#{parents_members.select(:id).to_sql})"
Loading
Loading
Loading
Loading
@@ -8,10 +8,10 @@ module FormHelper
content_tag(:div, class: 'alert alert-danger', id: 'error_explanation') do
content_tag(:h4, headline) <<
content_tag(:ul) do
model.errors.full_messages.
map { |msg| content_tag(:li, msg) }.
join.
html_safe
model.errors.full_messages
.map { |msg| content_tag(:li, msg) }
.join
.html_safe
end
end
end
Loading
Loading
Loading
Loading
@@ -97,8 +97,8 @@ module SearchHelper
 
# Autocomplete results for the current user's projects
def projects_autocomplete(term, limit = 5)
current_user.authorized_projects.search_by_title(term).
sorted_by_stars.non_archived.limit(limit).map do |p|
current_user.authorized_projects.search_by_title(term)
.sorted_by_stars.non_archived.limit(limit).map do |p|
{
category: "Projects",
id: p.id,
Loading
Loading
Loading
Loading
@@ -6,8 +6,8 @@ module WikiHelper
# Returns a String composed of the capitalized name of each directory and the
# capitalized name of the page itself.
def breadcrumb(page_slug)
page_slug.split('/').
map { |dir_or_page| WikiPage.unhyphenize(dir_or_page).capitalize }.
join(' / ')
page_slug.split('/')
.map { |dir_or_page| WikiPage.unhyphenize(dir_or_page).capitalize }
.join(' / ')
end
end
Loading
Loading
@@ -18,9 +18,9 @@ class AwardEmoji < ActiveRecord::Base
 
class << self
def votes_for_collection(ids, type)
select('name', 'awardable_id', 'COUNT(*) as count').
where('name IN (?) AND awardable_type = ? AND awardable_id IN (?)', [DOWNVOTE_NAME, UPVOTE_NAME], type, ids).
group('name', 'awardable_id')
select('name', 'awardable_id', 'COUNT(*) as count')
.where('name IN (?) AND awardable_type = ? AND awardable_id IN (?)', [DOWNVOTE_NAME, UPVOTE_NAME], type, ids)
.group('name', 'awardable_id')
end
end
 
Loading
Loading
Loading
Loading
@@ -63,9 +63,9 @@ module Ci
end
 
def retry(build, current_user)
Ci::RetryBuildService.
new(build.project, current_user).
execute(build)
Ci::RetryBuildService
.new(build.project, current_user)
.execute(build)
end
end
 
Loading
Loading
@@ -96,9 +96,9 @@ module Ci
end
 
def detailed_status(current_user)
Gitlab::Ci::Status::Build::Factory.
new(self, current_user).
fabricate!
Gitlab::Ci::Status::Build::Factory
.new(self, current_user)
.fabricate!
end
 
def manual?
Loading
Loading
@@ -220,9 +220,9 @@ module Ci
end
 
def merge_request
merge_requests = MergeRequest.includes(:merge_request_diff).
where(source_branch: ref, source_project_id: pipeline.gl_project_id).
reorder(iid: :asc)
merge_requests = MergeRequest.includes(:merge_request_diff)
.where(source_branch: ref, source_project_id: pipeline.gl_project_id)
.reorder(iid: :asc)
 
merge_requests.find do |merge_request|
merge_request.commits_sha.include?(pipeline.sha)
Loading
Loading
@@ -278,8 +278,8 @@ module Ci
 
def raw_trace(last_lines: nil)
if File.exist?(trace_file_path)
Gitlab::Ci::TraceReader.new(trace_file_path).
read(last_lines: last_lines)
Gitlab::Ci::TraceReader.new(trace_file_path)
.read(last_lines: last_lines)
else
# backward compatibility
read_attribute :trace
Loading
Loading
Loading
Loading
@@ -89,9 +89,9 @@ module Ci
 
# ref can't be HEAD or SHA, can only be branch/tag name
scope :latest, ->(ref = nil) do
max_id = unscope(:select).
select("max(#{quoted_table_name}.id)").
group(:ref, :sha)
max_id = unscope(:select)
.select("max(#{quoted_table_name}.id)")
.group(:ref, :sha)
 
if ref
where(ref: ref, id: max_id.where(ref: ref))
Loading
Loading
@@ -126,23 +126,23 @@ module Ci
end
 
def stages_name
statuses.order(:stage_idx).distinct.
pluck(:stage, :stage_idx).map(&:first)
statuses.order(:stage_idx).distinct
.pluck(:stage, :stage_idx).map(&:first)
end
 
def stages
# TODO, this needs refactoring, see gitlab-ce#26481.
 
stages_query = statuses.
group('stage').select(:stage).order('max(stage_idx)')
stages_query = statuses
.group('stage').select(:stage).order('max(stage_idx)')
 
status_sql = statuses.latest.where('stage=sg.stage').status_sql
 
warnings_sql = statuses.latest.select('COUNT(*) > 0').
where('stage=sg.stage').failed_but_allowed.to_sql
warnings_sql = statuses.latest.select('COUNT(*) > 0')
.where('stage=sg.stage').failed_but_allowed.to_sql
 
stages_with_statuses = CommitStatus.from(stages_query, :sg).
pluck('sg.stage', status_sql, "(#{warnings_sql})")
stages_with_statuses = CommitStatus.from(stages_query, :sg)
.pluck('sg.stage', status_sql, "(#{warnings_sql})")
 
stages_with_statuses.map do |stage|
Ci::Stage.new(self, Hash[%i[name status warnings].zip(stage)])
Loading
Loading
@@ -222,8 +222,8 @@ module Ci
end
 
def retry_failed(current_user)
Ci::RetryPipelineService.new(project, current_user).
execute(self)
Ci::RetryPipelineService.new(project, current_user)
.execute(self)
end
 
def mark_as_processable_after_stage(stage_idx)
Loading
Loading
@@ -255,9 +255,9 @@ module Ci
def config_builds_attributes
return [] unless config_processor
 
config_processor.
builds_for_ref(ref, tag?, trigger_requests.first).
sort_by { |build| build[:stage_idx] }
config_processor
.builds_for_ref(ref, tag?, trigger_requests.first)
.sort_by { |build| build[:stage_idx] }
end
 
def has_warnings?
Loading
Loading
@@ -355,15 +355,15 @@ module Ci
# Merge requests for which the current pipeline is running against
# the merge request's latest commit.
def merge_requests
@merge_requests ||= project.merge_requests.
where(source_branch: self.ref).
select { |merge_request| merge_request.head_pipeline.try(:id) == self.id }
@merge_requests ||= project.merge_requests
.where(source_branch: self.ref)
.select { |merge_request| merge_request.head_pipeline.try(:id) == self.id }
end
 
def detailed_status(current_user)
Gitlab::Ci::Status::Pipeline::Factory.
new(self, current_user).
fabricate!
Gitlab::Ci::Status::Pipeline::Factory
.new(self, current_user)
.fabricate!
end
 
private
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