Don't allow a merge request to be merged when its title starts with "WIP".

4 files changed, 37 insertions, 5 deletions

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 41b4e55a598..5b93e95866a 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -124,13 +124,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       @merge_request.check_if_can_be_merged
     end
 
-    render json: { merge_status: @merge_request.merge_status_name }
+    render json: { merge_status: @merge_request.automerge_status }
   end
 
   def automerge
     return access_denied! unless allowed_to_merge?
 
-    if @merge_request.open? && @merge_request.can_be_merged?
+    if @merge_request.automergeable?
       AutoMergeWorker.perform_async(@merge_request.id, current_user.id, params)
       @status = true
     else
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 49a00697ee1..64f3c39f131 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -199,6 +199,8 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def automerge!(current_user, commit_message = nil)
+    return unless automergeable?
+
     MergeRequests::AutoMergeService.
       new(target_project, current_user).
       execute(self, commit_message)
@@ -208,6 +210,22 @@ class MergeRequest < ActiveRecord::Base
     opened? || reopened?
   end
 
+  def work_in_progress?
+    title =~ /\A\[?WIP\]?:? /i
+  end
+
+  def automergeable?
+    open? && !work_in_progress? && can_be_merged?
+  end
+
+  def automerge_status
+    if work_in_progress?
+      "work_in_progress"
+    else
+      merge_status_name
+    end
+  end
+
   def mr_and_commit_notes
     # Fetch comments only from last 100 commits
     commits_for_notes_limit = 100
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index cec02de84ca..45dd410dd15 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -72,6 +72,6 @@
     check_enable: #{@merge_request.unchecked? ? "true" : "false"},
     url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
     ci_enable: #{@project.ci_service ? "true" : "false"},
-    current_status: "#{@merge_request.merge_status_name}",
+    current_status: "#{@merge_request.automerge_status}",
     action: "#{controller.action_name}"
   });
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index 9f51f84d400..41f739a45b8 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -4,9 +4,11 @@
       %strong Archived projects cannot be committed to!
   - else
     .automerge_widget.cannot_be_merged.hide
-      %strong This can't be merged automatically, even if it could be merged you don't have the permission to do so.
+      %strong This request can't be merged automatically. Even if it could be merged, you don't have permission to do so.
+    .automerge_widget.work_in_progress.hide
+      %strong This request can't be merged automatically because it is marked a Work In Progress. Even if it could be merged, you don't have permission to do so.
     .automerge_widget.can_be_merged.hide
-      %strong This can be merged automatically but you don't have the permission to do so.
+      %strong This request can be merged automatically, but you don't have permission to do so.
 
 
 - if @show_merge_controls
@@ -57,6 +59,18 @@
       &nbsp;
       This usually happens when git can not resolve conflicts between branches automatically.
 
+  .automerge_widget.work_in_progress.hide
+    %h4
+      This request can't be merged because it is marked a <strong>Work In Progress</strong>.
+
+    %p
+      %button.btn.disabled
+        %i.fa.fa-warning
+        Accept Merge Request
+      &nbsp;
+
+      When the merge request is ready, remove the "WIP" prefix from the title to allow it to be merged.
+
   .automerge_widget.unchecked
     %p
       %strong