diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-14 12:44:28 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-14 13:23:01 +0200 |
| commit | d10e3c4498e11e97548b0212887a146d19d19ffd (patch) | |
| tree | 40160307c143e1796e1dad5e55caf1b9d4a7cdfb /app/models/merge_request.rb | |
| parent | 3a69dd20a1d8e54c25f871f35f09a1b8b5d4b2a4 (diff) | |
| parent | 82da19cecd6390d2372bad36da0a9f89b21abb38 (diff) | |
| download | gitlab-ce-d10e3c4498e11e97548b0212887a146d19d19ffd.tar.gz | |
Merge branch 'master' into filter-labelfilter-label
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index eb468c6cd53..c83b15c7d39 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -227,7 +227,7 @@ class MergeRequest < ActiveRecord::Base end def work_in_progress? - title =~ /\A\[?WIP\]?:? /i + !!(title =~ /\A\[?WIP\]?:? /i) end def mergeable? @@ -275,7 +275,8 @@ class MergeRequest < ActiveRecord::Base attrs = { source: source_project.hook_attrs, target: target_project.hook_attrs, - last_commit: nil + last_commit: nil, + work_in_progress: work_in_progress? } unless last_commit.nil? |