Add latest changes from gitlab-org/gitlab@master

2 files changed, 16 insertions, 1 deletions

diff --git a/danger/database/clickhouse/Dangerfile b/danger/clickhouse/Dangerfile
index 5a82779ce90..91fa45541e7 100644
--- a/danger/database/clickhouse/Dangerfile
+++ b/danger/clickhouse/Dangerfile
@@ -11,12 +11,17 @@ MSG
 CH_UNREVIEWED_LABEL = 'clickhouse::review pending'
 CH_APPROVED_LABEL = 'clickhouse::approved'
 
+CH_URL =
+  'https://gitlab.com/groups/gitlab-org/maintainers/clickhouse/-/group_members?with_inherited_permissions=exclude'
+
 return if stable_branch.valid_stable_branch?
 return if helper.mr_labels.include?(CH_UNREVIEWED_LABEL)
 
+helper.labels_to_add << 'clickhouse' if clickhouse.changes.any?
+
 if helper.mr_labels.include?('clickhouse') || clickhouse.changes.any?
   message 'This merge request adds or changes files that require a ' \
-          'review from the [GitLab ClickHouse team](https://gitlab.com/groups/gl-clickhouse/-/group_members).'
+          'review from the [GitLab ClickHouse team](CH_URL).'
 
   markdown(CH_MESSAGE)
 
diff --git a/danger/plugins/clickhouse.rb b/danger/plugins/clickhouse.rb
new file mode 100644
index 00000000000..324a0e5c1a9
--- /dev/null
+++ b/danger/plugins/clickhouse.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative '../../tooling/danger/clickhouse'
+
+module Danger
+  class Clickhouse < ::Danger::Plugin
+    # Put the helper code somewhere it can be tested
+    include Tooling::Danger::Clickhouse
+  end
+end