diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-08-19 21:04:25 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-08-19 21:04:25 +0300 |
| commit | d7d0da267489ace1a55668c11eb44dd37e1bd3e6 (patch) | |
| tree | 543e53b5a6d971df50ae1542bc54d9c4094a0ec3 | |
| parent | bb9b715904940add5a10c9171ce2736d75128112 (diff) | |
| parent | abd5190cf42b14d35b9a41df65c91af10f9c7cc3 (diff) | |
Merge branch 'zj-update-label-danger' into 'master'
Update the automatic labels
See merge request gitlab-org/gitaly!1434
| -rw-r--r-- | danger/labels/Dangerfile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/danger/labels/Dangerfile b/danger/labels/Dangerfile index 6770b718c..06ee0df8c 100644 --- a/danger/labels/Dangerfile +++ b/danger/labels/Dangerfile @@ -10,13 +10,10 @@ def changelog_entry end end -required_labels = [] +required_labels = %w[devops::create] -GITALY_TEAM = %w[jacobvosmaer-gitlab johncai pokstad1 zj] - -if GITALY_TEAM.include?(gitlab.mr_author) && !gitlab.mr_labels.include?("Gitaly") - required_labels << "Gitaly" -end +GITALY_TEAM = %w[jacobvosmaer-gitlab johncai pokstad1 zj-gitlab] +required_labels << "group::gitaly" if GITALY_TEAM.include?(gitlab.mr_author) TYPE_TO_LABEL = { 'added' => ['feature'], @@ -43,7 +40,7 @@ end required_labels.concat(TYPE_TO_LABEL[changelog_entry["type"]]) -mr_labels = gitlab.mr_labels | required_labels |inherited_labels +mr_labels = gitlab.mr_labels | required_labels | inherited_labels gitlab.api.update_merge_request( gitlab.mr_json['project_id'], gitlab.mr_json['iid'], |