From 7e0eb486ed150c0447bf245bdebe250f1771f7dc Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 30 Apr 2015 15:43:32 +0200 Subject: Don't allow a merge request to be merged when its title starts with "WIP". --- lib/api/merge_requests.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/api') diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index f3765f5ab03..b252c57faed 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -186,7 +186,7 @@ module API merge_request.check_if_can_be_merged end - if merge_request.open? + if merge_request.open? && !merge_request.work_in_progress? if merge_request.can_be_merged? merge_request.automerge!(current_user, params[:merge_commit_message] || merge_request.merge_commit_message) present merge_request, with: Entities::MergeRequest @@ -195,7 +195,7 @@ module API end else # Merge request can not be merged - # because it is already closed/merged + # because it is already closed/merged or marked as WIP not_allowed! end else -- cgit v1.2.1