diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-10-13 17:12:51 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-10-13 17:12:51 +0000 |
| commit | e0072892e888f36dcec928ba65cea307da2fbaf2 (patch) | |
| tree | 192410aa29b17d2dccc8a0c4f8ee65e81d2f3d41 /app/models/merge_request.rb | |
| parent | c9c538469c17b5c12c73c9ce72dc8787f381935c (diff) | |
| parent | 6b739027330cb07484b71c748e30d5966f63d647 (diff) | |
| download | gitlab-ce-e0072892e888f36dcec928ba65cea307da2fbaf2.tar.gz | |
Merge branch 'add-wip-to-mr-hook-attrs' into 'master'
merge_request: add work_in_progress to MR hooks
See merge request !1443
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? |