summaryrefslogtreecommitdiff
path: root/Dangerfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-03-24 00:07:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-03-24 00:07:27 +0000
commit179b33c5465649ee5d020f70604f1b02473fc702 (patch)
treef2883044ea8126a7b5774ec2ff7750940a443246 /Dangerfile
parentbbc06065aa40c3d0d037bea16081f4f5c969053e (diff)
downloadgitlab-ce-179b33c5465649ee5d020f70604f1b02473fc702.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Dangerfile')
-rw-r--r--Dangerfile14
1 files changed, 3 insertions, 11 deletions
diff --git a/Dangerfile b/Dangerfile
index aaa1aae813b..280a73d432c 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -11,16 +11,8 @@ project_name = ee? ? 'gitlab' : 'gitlab-foss'
Gitlab::Dangerfiles.for_project(self, project_name) do |gitlab_dangerfiles|
gitlab_dangerfiles.import_plugins
+ gitlab_dangerfiles.config.ci_only_rules = ProjectHelper::CI_ONLY_RULES
+ gitlab_dangerfiles.config.files_to_category = ProjectHelper::CATEGORIES
- unless helper.release_automation?
- danger.import_plugin('danger/plugins/*.rb')
- gitlab_dangerfiles.import_dangerfiles(except: %w[simple_roulette])
- gitlab_dangerfiles.config.files_to_category = ProjectHelper::CATEGORIES
- end
-end
-
-return if helper.release_automation?
-
-project_helper.rule_names.each do |rule|
- danger.import_dangerfile(path: File.join('danger', rule))
+ gitlab_dangerfiles.import_dangerfiles(except: %w[simple_roulette])
end