From 14fdcc196bc0c151d9760161ceeb6b9f2b44211b Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Wed, 22 Jun 2016 21:58:29 +0200 Subject: Check if pipeline is nil before merging --- CHANGELOG | 3 +++ app/controllers/projects/merge_requests_controller.rb | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 222563d355c..e7c22cc92d8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ Please view this file on the master branch, on stable branches it's out of date. +v 8.9.1 (unreleased) + - Fix in auto merge when pipeline is nil + v 8.9.0 (unreleased) - Fix builds API response not including commit data - Fix error when CI job variables key specified but not defined diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 851822d805a..b57caae68bb 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -204,8 +204,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_request.update(merge_error: nil) - if params[:merge_when_build_succeeds].present? - if @merge_request.pipeline && @merge_request.pipeline.active? + if params[:merge_when_build_succeeds].present? + unless @merge_request.pipeline + @status = :failed + return + end + + if @merge_request.pipeline.active? MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params) .execute(@merge_request) @status = :merge_when_build_succeeds -- cgit v1.2.1