From 179b33c5465649ee5d020f70604f1b02473fc702 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 24 Mar 2022 00:07:27 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- Dangerfile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'Dangerfile') 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 -- cgit v1.2.1