summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 17:29:35 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:56 -0600
commit3dadf306ddc81183e74b048bc4119796852ed7ea (patch)
treef01d5e7eb9c5550bc34a42d9e88479cd3fef578d /app/controllers/projects/merge_requests_controller.rb
parent547063b3ac096dff25309b6e0846b0d5f417c128 (diff)
downloadgitlab-ce-3dadf306ddc81183e74b048bc4119796852ed7ea.tar.gz
Enable Style/DotPosition
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
-rw-r--r--app/controllers/projects/merge_requests_controller.rb28
1 files changed, 14 insertions, 14 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 365c49a20d4..c0c71c11dc2 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -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
@@ -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
@@ -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
@@ -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?
@@ -639,8 +639,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