kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Do not use MergeRequest#commits in define_pipelines_vars

Browse source 
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:
Adam Niedzielski 2016-11-22 15:21:01 +01:00
parent b1b5060dba
commit d7bd8f128e
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/projects/merge_requests_controller.rb
View file

@ -563,11 +563,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def define_pipelines_vars
@pipelines = @merge_request.all_pipelines
if @pipelines.present? && @merge_request.commits.present?
@pipeline = @pipelines.first
@statuses = @pipeline.statuses.relevant
end
@pipeline = @merge_request.pipeline
@statuses = @pipeline.statuses.relevant if @pipeline.present?
end
def define_new_vars