diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-06-23 18:55:16 -0400 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-06-23 18:55:16 -0400 |
| commit | 951b0a1a12ea16e815da0e483474b5ae61b7077a (patch) | |
| tree | dd0a4596dc68c661e457193c892c1c39032e53dd | |
| parent | 214137aa60cb50d4a0a980161a783277d628d074 (diff) | |
| parent | 14fdcc196bc0c151d9760161ceeb6b9f2b44211b (diff) | |
| download | gitlab-ce-951b0a1a12ea16e815da0e483474b5ae61b7077a.tar.gz | |
Merge branch 'zj-pipeline-can-be-nil'
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3fad823c800..3504c6c74e4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ v 8.9.1 - Fix unwanted label unassignment when doing bulk action on issues page - Fix 404 when accessing pipelines as guest user on public projects - Fix mobile Safari bug where horizontal nav arrows would flicker on scroll + - Fix in auto merge when pipeline is nil v 8.9.0 - Fix builds API response not including commit data diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 6c26c7f7658..089669841d3 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 |