From d7bd8f128e08da9f4aa9d395d430bb35e4a5e3eb Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Tue, 22 Nov 2016 15:21:01 +0100
Subject: [PATCH] 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.
---
app/controllers/projects/merge_requests_controller.rb | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index dbbd2ad849e..e24a670631f 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -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
--
GitLab