summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-07-31 11:32:13 +0000
committerSean McGivern <sean@gitlab.com>2019-07-31 11:32:13 +0000
commitfff0fc7b4c2475a432fd4e1b025be66f9f5ba519 (patch)
tree83ee6971083b9ce41efc2a6ab7238af13ed5f294 /lib
parent533237a097281dbe4fb1c821d5823c4de8c8f6af (diff)
parent89a8d02c350a18b23e1ba0f00080e4549d9770ec (diff)
downloadgitlab-ce-fff0fc7b4c2475a432fd4e1b025be66f9f5ba519.tar.gz
Merge branch '65317-adapt-tae-role-name-change' into 'master'
Fix Danger finding a test reviewer Closes #65317 See merge request gitlab-org/gitlab-ce!31292
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/danger/teammate.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/danger/teammate.rb b/lib/gitlab/danger/teammate.rb
index b44f134f2c1..74cbcc11255 100644
--- a/lib/gitlab/danger/teammate.rb
+++ b/lib/gitlab/danger/teammate.rb
@@ -39,7 +39,7 @@ module Gitlab
def has_capability?(project, category, kind, labels)
case category
when :test
- area = role[/Test Automation Engineer, (\w+)/, 1]
+ area = role[/Test Automation Engineer(?:.*?, (\w+))/, 1]
area && labels.any?(area) if kind == :reviewer
else