diff options
Diffstat (limited to 'lib/gitlab/danger/helper.rb')
| -rw-r--r-- | lib/gitlab/danger/helper.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb index d22f28ff7f2..09e013e24b8 100644 --- a/lib/gitlab/danger/helper.rb +++ b/lib/gitlab/danger/helper.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true require_relative 'teammate' +require_relative 'title_linting' module Gitlab module Danger module Helper RELEASE_TOOLS_BOT = 'gitlab-release-tools-bot' - DRAFT_REGEX = /\A*#{Regexp.union(/(?i)(\[WIP\]\s*|WIP:\s*|WIP$)/, /(?i)(\[draft\]|\(draft\)|draft:|draft\s\-\s|draft$)/)}+\s*/i.freeze # Returns a list of all files that have been added, modified or renamed. # `git.modified_files` might contain paths that already have been renamed, @@ -128,7 +128,7 @@ module Gitlab }.freeze # First-match win, so be sure to put more specific regex at the top... CATEGORIES = { - [%r{usage_data\.rb}, %r{^(\+|-).*(count|distinct_count)\(.*\)(.*)$}] => [:database, :backend], + [%r{usage_data\.rb}, %r{^(\+|-).*\s+(count|distinct_count|estimate_batch_distinct_count)\(.*\)(.*)$}] => [:database, :backend], %r{\Adoc/.*(\.(md|png|gif|jpg))\z} => :docs, %r{\A(CONTRIBUTING|LICENSE|MAINTENANCE|PHILOSOPHY|PROCESS|README)(\.md)?\z} => :docs, @@ -216,14 +216,10 @@ module Gitlab usernames.map { |u| Gitlab::Danger::Teammate.new('username' => u) } end - def sanitize_mr_title(title) - title.gsub(DRAFT_REGEX, '').gsub(/`/, '\\\`') - end - def draft_mr? return false unless gitlab_helper - DRAFT_REGEX.match?(gitlab_helper.mr_json['title']) + TitleLinting.has_draft_flag?(gitlab_helper.mr_json['title']) end def security_mr? |