summaryrefslogtreecommitdiff
path: root/danger
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-20 15:19:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-20 15:19:03 +0000
commit14bd84b61276ef29b97d23642d698de769bacfd2 (patch)
treef9eba90140c1bd874211dea17750a0d422c04080 /danger
parent891c388697b2db0d8ee0c8358a9bdbf6dc56d581 (diff)
downloadgitlab-ce-14bd84b61276ef29b97d23642d698de769bacfd2.tar.gz
Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42
Diffstat (limited to 'danger')
-rw-r--r--danger/plugins/sidekiq_args.rb10
-rw-r--r--danger/roulette/Dangerfile2
-rw-r--r--danger/sidekiq_args/Dangerfile5
3 files changed, 16 insertions, 1 deletions
diff --git a/danger/plugins/sidekiq_args.rb b/danger/plugins/sidekiq_args.rb
new file mode 100644
index 00000000000..2210aa66b07
--- /dev/null
+++ b/danger/plugins/sidekiq_args.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative '../../tooling/danger/sidekiq_args'
+
+module Danger
+ class SidekiqArgs < ::Danger::Plugin
+ # Put the helper code somewhere it can be tested
+ include Tooling::Danger::SidekiqArgs
+ end
+end
diff --git a/danger/roulette/Dangerfile b/danger/roulette/Dangerfile
index ca5a671ef29..32899c4d74f 100644
--- a/danger/roulette/Dangerfile
+++ b/danger/roulette/Dangerfile
@@ -96,7 +96,7 @@ categories = Set.new(changes.keys - [:unknown])
categories << :database if helper.mr_labels.include?('database')
# Ensure to spin for UX reviewer when ~UX is applied (e.g. to review changes to the UI) except when it's from wider community contribution where we want to assign from the corresponding group
-categories << :ux if helper.mr_labels.include?('UX') && !helper.mr_labels.include?('Community contribution')
+categories << :ux if helper.mr_labels.include?('UX') && !helper.mr_labels.include?('Community contribution') # rubocop:disable Rails/NegateInclude
# Ensure to spin for Product Intelligence reviewer when ~"product intelligence::review pending" is applied
categories << :product_intelligence if helper.mr_labels.include?("product intelligence::review pending")
diff --git a/danger/sidekiq_args/Dangerfile b/danger/sidekiq_args/Dangerfile
new file mode 100644
index 00000000000..fdd582889f3
--- /dev/null
+++ b/danger/sidekiq_args/Dangerfile
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+sidekiq_args.changed_worker_files.each do |filename|
+ sidekiq_args.add_comment_for_matched_line(filename)
+end