Do not use MergeRequest#commits in define_pipelines_vars
MergeRequest#commits requires merge_request_diff to be present. This is not the case when creating a new merge request.
This commit is contained in:
parent
b1b5060dba
commit
d7bd8f128e
1 changed files with 2 additions and 5 deletions
|
@ -563,11 +563,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
||||||
|
|
||||||
def define_pipelines_vars
|
def define_pipelines_vars
|
||||||
@pipelines = @merge_request.all_pipelines
|
@pipelines = @merge_request.all_pipelines
|
||||||
|
@pipeline = @merge_request.pipeline
|
||||||
if @pipelines.present? && @merge_request.commits.present?
|
@statuses = @pipeline.statuses.relevant if @pipeline.present?
|
||||||
@pipeline = @pipelines.first
|
|
||||||
@statuses = @pipeline.statuses.relevant
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def define_new_vars
|
def define_new_vars
|
||||||
|
|
Loading…
Reference in a new issue