diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /app/models/commit.rb | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
download | gitlab-ce-a7b3560714b4d9cc4ab32dffcd1f74a284b93580.tar.gz |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r-- | app/models/commit.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index f0c5f3c2d12..5293bfcf1ab 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -513,9 +513,7 @@ class Commit # We don't want to do anything for `Commit` model, so this is empty. end - # WIP is deprecated in favor of Draft. Currently both options are supported - # https://gitlab.com/gitlab-org/gitlab/-/issues/227426 - DRAFT_REGEX = /\A\s*#{Regexp.union(Gitlab::Regex.merge_request_wip, Gitlab::Regex.merge_request_draft)}|(fixup!|squash!)\s/.freeze + DRAFT_REGEX = /\A\s*#{Gitlab::Regex.merge_request_draft}|(fixup!|squash!)\s/.freeze def work_in_progress? !!(title =~ DRAFT_REGEX) |