summaryrefslogtreecommitdiff
path: root/danger/database
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 01:45:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 01:45:44 +0000
commit85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch)
tree9160f299afd8c80c038f08e1545be119f5e3f1e1 /danger/database
parent15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff)
downloadgitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'danger/database')
-rw-r--r--danger/database/Dangerfile8
1 files changed, 3 insertions, 5 deletions
diff --git a/danger/database/Dangerfile b/danger/database/Dangerfile
index 41ca2aa1978..2ccfdcffaea 100644
--- a/danger/database/Dangerfile
+++ b/danger/database/Dangerfile
@@ -59,11 +59,9 @@ if gitlab.mr_labels.include?('database') || db_paths_to_review.any?
markdown(DB_MESSAGE)
markdown(DB_FILES_MESSAGE + helper.markdown_list(db_paths_to_review)) if db_paths_to_review.any?
- database_labels = helper.missing_database_labels(gitlab.mr_labels)
-
- if database_labels.any?
+ unless helper.has_database_scoped_labels?(gitlab.mr_labels)
gitlab.api.update_merge_request(gitlab.mr_json['project_id'],
- gitlab.mr_json['iid'],
- labels: (gitlab.mr_labels + database_labels).join(','))
+ gitlab.mr_json['iid'],
+ add_labels: 'database::review pending')
end
end