Merge branch 'wipMergeSpacing' into 'master'

No space required after WIP identifier Fixes #2426 Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap"). See merge request !1876

Merge branch 'wipMergeSpacing' into 'master'
a1fa9731 · Douwe Maan · 8d948744 · f0c2f748 · a1fa9731 · a1fa9731
Commit a1fa9731 authored Feb 04, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

merge_request.rb app/models/merge_request.rb +1 -1

merge_request_spec.rb spec/models/merge_request_spec.rb +5 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -180,6 +180,7 @@ v 8.3.0
  - Handle and report SSL errors in Web hook test (Stan Hu)
  - Bump Redis requirement to 2.8 for Sidekiq 4 (Stan Hu)
  - Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera)
+  - WIP identifier on merge requests no longer requires trailing space
  - Add rake tasks for git repository maintainance (Zeger-Jan van de Weg)
  - Fix 500 error when update group member permission
  - Fix: As an admin, cannot add oneself as a member to a group/project

--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -258,7 +258,7 @@ class MergeRequest < ActiveRecord::Base
  end

  def work_in_progress?
-    !!(title =~ /\A\[?WIP\]?:? /i)
+    !!(title =~ /\A\[?WIP(\]|:| )/i)
  end

  def mergeable?

--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -188,6 +188,11 @@ describe MergeRequest, models: true do
      expect(subject).to be_work_in_progress
    end

+    it "detects the '[WIP]' prefix" do
+      subject.title = "[WIP]#{subject.title}"
+      expect(subject).to be_work_in_progress
+    end
+
    it "doesn't detect WIP for words starting with WIP" do
      subject.title = "Wipwap #{subject.title}"
      expect(subject).not_to be_work_in_progress