No space required after WIP identifier
Fixes #2426 (closed)
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").
Merge request reports
Activity
Added 1328 commits:
-
6e6a9906...eeba266e - 1327 commits from branch
gitlab-org:master
- 9fc6df51 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into wipMergeSpacing
-
6e6a9906...eeba266e - 1327 commits from branch
@TheTedHogan Can you retry again with CI?
@DouweM Looks good to me. Any issues with this?
193 193 expect(subject).to be_work_in_progress 194 194 end 195 195 196 it "detects the 'WIP' prefix" do 197 subject.title = "WIP#{subject.title}" 198 expect(subject).to be_work_in_progress I think this would be
not_to
, unless we add a space afterWIP
?Edited by Douwe Maan
Added 1 commit:
- f0c2f748 - Removed redundent and incorrect tests on WIP
mentioned in commit a1fa9731
@TheTedHogan I ran the test locally and it passed. Not sure why it's failing here, but I'll go ahead and merge.
@TheTedHogan Thanks for contributing this :)