diff options
| author | Han Loong Liauw <hanloongliauw@gmail.com> | 2015-10-17 09:32:31 +1100 |
|---|---|---|
| committer | Han Loong Liauw <hanloongliauw@gmail.com> | 2015-10-17 09:32:31 +1100 |
| commit | 02e8beaa0b83a343752ebf60e4fca4482c17f9e3 (patch) | |
| tree | e00847b274daa7fa03fd7a4647154cc2e4d98e85 /app/models/merge_request.rb | |
| parent | 0bea5ced8bf4c9306f8f8e912313731a43d16f4c (diff) | |
| parent | c856a7a5934fba13598be09507c2090888f57a39 (diff) | |
| download | gitlab-ce-02e8beaa0b83a343752ebf60e4fca4482c17f9e3.tar.gz | |
Merge branch 'master' into remove-forks-from-projects-settings
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? |