BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
6e6a9906
Commit
6e6a9906
authored
Nov 23, 2015
by
Ted Hogan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No space required after WIP identifier
Modified changelog
parent
36f7b624
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
CHANGELOG
CHANGELOG
+1
-0
merge_request.rb
app/models/merge_request.rb
+1
-1
merge_request_spec.rb
spec/models/merge_request_spec.rb
+15
-0
No files found.
CHANGELOG
View file @
6e6a9906
...
...
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.3.0 (unreleased)
- Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera)
- WIP identifier on merge requests no longer requires trailing space
v 8.2.0
- Improved performance of finding projects and groups in various places
...
...
app/models/merge_request.rb
View file @
6e6a9906
...
...
@@ -239,7 +239,7 @@ class MergeRequest < ActiveRecord::Base
end
def
work_in_progress?
!!
(
title
=~
/\A\[?WIP
\]?:?
/i
)
!!
(
title
=~
/\A\[?WIP
(\]|:| )
/i
)
end
def
mergeable?
...
...
spec/models/merge_request_spec.rb
View file @
6e6a9906
...
...
@@ -162,6 +162,21 @@ describe MergeRequest 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
"detects the 'WIP:' prefix"
do
subject
.
title
=
"WIP:
#{
subject
.
title
}
"
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment