diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
| commit | c993481d991333fe0750080eec98fd2e9eeda8d5 (patch) | |
| tree | 7d1fdd7926f8542b7fbf7add052004dbfd48b206 /app/models/merge_request.rb | |
| parent | 83f04853e9a749c3397ee7683a78b986e1070904 (diff) | |
| parent | 123669a55107514798ba531ba3a744b3ec8503ee (diff) | |
| download | gitlab-ce-git-archive-golang.tar.gz | |
Merge branch 'master' into git-archive-golanggit-archive-golang
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? |