summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorTed Hogan <ted.hogan17@gmail.com>2015-11-23 11:36:47 -0700
committerTed Hogan <ted.hogan17@gmail.com>2015-11-23 11:52:43 -0700
commit6e6a99061dbec4bb45a398a03e8a13a084e44035 (patch)
tree92d6f72d767a1236374bd0b8c33ba42b1240c909 /app/models/merge_request.rb
parent36f7b624be0926b45b6a45aabea2beecfba72e50 (diff)
downloadgitlab-ce-6e6a99061dbec4bb45a398a03e8a13a084e44035.tar.gz
No space required after WIP identifier
Modified changelog
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 1b3d6079d2c..2b336ca8927 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -239,7 +239,7 @@ class MergeRequest < ActiveRecord::Base
end
def work_in_progress?
- !!(title =~ /\A\[?WIP\]?:? /i)
+ !!(title =~ /\A\[?WIP(\]|:| )/i)
end
def mergeable?