diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-03 00:16:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-03 00:16:54 +0300 |
| commit | bd091da6d5cb036cf3c58d4ba5671f931c8381e1 (patch) | |
| tree | 285571eaae458aa65fb2dc8de115ef98dc98f39e /danger | |
| parent | ad4dfa2eb4a24a56fbdcf838fc28f2a5b2b6a3a0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'danger')
| -rw-r--r-- | danger/product_intelligence/Dangerfile | 2 | ||||
| -rw-r--r-- | danger/specialization_labels/Dangerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/danger/product_intelligence/Dangerfile b/danger/product_intelligence/Dangerfile index 77d714a7f60..8f782e3de65 100644 --- a/danger/product_intelligence/Dangerfile +++ b/danger/product_intelligence/Dangerfile @@ -19,4 +19,4 @@ return if product_intelligence_paths_to_review.empty? || product_intelligence.sk warn format(CHANGED_FILES_MESSAGE, changed_files: helper.markdown_list(product_intelligence_paths_to_review)) unless product_intelligence.has_approved_label? -helper.labels_to_add.merge(labels_to_add) unless labels_to_add.empty? +helper.labels_to_add.concat(labels_to_add) unless labels_to_add.empty? diff --git a/danger/specialization_labels/Dangerfile b/danger/specialization_labels/Dangerfile index 7d1c83697fd..b3520e7af7e 100644 --- a/danger/specialization_labels/Dangerfile +++ b/danger/specialization_labels/Dangerfile @@ -26,4 +26,4 @@ labels_to_add = helper.changes_by_category.each_with_object([]) do |(category, _ memo << label end -helper.labels_to_add.merge(labels_to_add) if labels_to_add.any? +helper.labels_to_add.concat(labels_to_add) if labels_to_add.any? |