diff --git a/Gemfile b/Gemfile index dcaaff7e93aee5f4e13366758a77eec5ac681f9c..6654d53c44d46bca4578ee21635b8be63af02ec4 100644 --- a/Gemfile +++ b/Gemfile @@ -398,7 +398,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.10.1', require: false + gem 'gitlab-dangerfiles', '~> 2.10.2', require: false end group :development, :test, :coverage do diff --git a/Gemfile.lock b/Gemfile.lock index 8b634fd162488b1f00889c97e4503ddf0531003c..65ee5af0dba6a71ae66420add809ef4e6be691ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -463,7 +463,7 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.10.1) + gitlab-dangerfiles (2.10.2) danger (>= 8.3.1) danger-gitlab (>= 8.0.0) gitlab-experiment (0.7.0) @@ -1478,7 +1478,7 @@ DEPENDENCIES gitaly (~> 14.8.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.10.1) + gitlab-dangerfiles (~> 2.10.2) gitlab-experiment (~> 0.7.0) gitlab-fog-azure-rm (~> 1.2.0) gitlab-labkit (~> 0.22.0) diff --git a/danger/product_intelligence/Dangerfile b/danger/product_intelligence/Dangerfile index 77d714a7f600f5e321a5eafd0f07ee9d57e78509..8f782e3de65d64917313338af6a17e70582111ba 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 7d1c83697fd0db163adb72d52ebe9edee162aaff..b3520e7af7e34eb804c108aa4b56215920331b7b 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? diff --git a/doc/development/dangerbot.md b/doc/development/dangerbot.md index e2ff56351a7baf201fb7185e3b8da2ce7ece10ef..9bf0fbe1d787e5a685a699de0509f9aaed91a018 100644 --- a/doc/development/dangerbot.md +++ b/doc/development/dangerbot.md @@ -124,8 +124,8 @@ NOTE: This is applicable to all the projects that use the [`gitlab-dangerfiles` gem](https://rubygems.org/gems/gitlab-dangerfiles). Danger is often used to improve MR hygiene by adding labels. Instead of calling the -API directly in your `Dangerfile`, add the labels to `helper.labels_to_add` set (with `helper.labels_to_add << label` -or `helper.labels_to_add.merge(array_of_labels)`. +API directly in your `Dangerfile`, add the labels to `helper.labels_to_add` array (with `helper.labels_to_add << label` +or `helper.labels_to_add.concat(array_of_labels)`. `gitlab-dangerfiles` will then take care of adding the labels to the MR with a single API call after all the rules have had the chance to add to `helper.labels_to_add`.