@@ -162,8 +162,8 @@ def commits
162
162
# Get commits from repository
163
163
# or from cache if already merged
164
164
@commits = @merge_request . commits
165
- @note_counts = Note . where ( commit_id : @commits . map ( &:id ) ) .
166
- group ( :commit_id ) . count
165
+ @note_counts = Note . where ( commit_id : @commits . map ( &:id ) )
166
+ . group ( :commit_id ) . count
167
167
168
168
render json : { html : view_to_html_string ( 'projects/merge_requests/show/_commits' ) }
169
169
end
@@ -232,9 +232,9 @@ def pipelines
232
232
end
233
233
234
234
format . json do
235
- render json : PipelineSerializer .
236
- new ( project : @project , user : @current_user ) .
237
- represent ( @pipelines )
235
+ render json : PipelineSerializer
236
+ . new ( project : @project , user : @current_user )
237
+ . represent ( @pipelines )
238
238
end
239
239
end
240
240
end
@@ -245,9 +245,9 @@ def new
245
245
format . json do
246
246
define_pipelines_vars
247
247
248
- render json : PipelineSerializer .
249
- new ( project : @project , user : @current_user ) .
250
- represent ( @pipelines )
248
+ render json : PipelineSerializer
249
+ . new ( project : @project , user : @current_user )
250
+ . represent ( @pipelines )
251
251
end
252
252
end
253
253
end
@@ -332,9 +332,9 @@ def cancel_merge_when_build_succeeds
332
332
return access_denied!
333
333
end
334
334
335
- MergeRequests ::MergeWhenPipelineSucceedsService .
336
- new ( @project , current_user ) .
337
- cancel ( @merge_request )
335
+ MergeRequests ::MergeWhenPipelineSucceedsService
336
+ . new ( @project , current_user )
337
+ . cancel ( @merge_request )
338
338
end
339
339
340
340
def merge
@@ -361,9 +361,9 @@ def merge
361
361
end
362
362
363
363
if @merge_request . head_pipeline . active?
364
- MergeRequests ::MergeWhenPipelineSucceedsService .
365
- new ( @project , current_user , merge_params ) .
366
- execute ( @merge_request )
364
+ MergeRequests ::MergeWhenPipelineSucceedsService
365
+ . new ( @project , current_user , merge_params )
366
+ . execute ( @merge_request )
367
367
368
368
@status = :merge_when_build_succeeds
369
369
elsif @merge_request . head_pipeline . success?
@@ -624,8 +624,8 @@ def define_new_vars
624
624
@commit = @merge_request . diff_head_commit
625
625
@base_commit = @merge_request . diff_base_commit
626
626
627
- @note_counts = Note . where ( commit_id : @commits . map ( &:id ) ) .
628
- group ( :commit_id ) . count
627
+ @note_counts = Note . where ( commit_id : @commits . map ( &:id ) )
628
+ . group ( :commit_id ) . count
629
629
630
630
@labels = LabelsFinder . new ( current_user , project_id : @project . id ) . execute
631
631
@@ -640,8 +640,8 @@ def invalid_mr
640
640
end
641
641
642
642
def merge_request_params
643
- params . require ( :merge_request ) .
644
- permit ( merge_request_params_ce )
643
+ params . require ( :merge_request )
644
+ . permit ( merge_request_params_ce )
645
645
end
646
646
647
647
def merge_request_params_ce
0 commit comments