From f4d6d3ec77286fa64810bd6a25c58671e0deedaf Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 9 Jun 2021 12:10:27 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- danger/feature_flag/Dangerfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'danger') diff --git a/danger/feature_flag/Dangerfile b/danger/feature_flag/Dangerfile index 88ce6393b64..bf2194724fc 100644 --- a/danger/feature_flag/Dangerfile +++ b/danger/feature_flag/Dangerfile @@ -53,14 +53,22 @@ def message_for_feature_flag_with_group!(feature_flag:, mr_group_label:) end end +def feature_flag_file_added? + feature_flag.feature_flag_files(change_type: :added).any? +end + def feature_flag_file_added_or_removed? - feature_flag.feature_flag_files(change_type: :added).any? || feature_flag.feature_flag_files(change_type: :deleted).any? + feature_flag_file_added? || feature_flag.feature_flag_files(change_type: :deleted).any? end feature_flag.feature_flag_files(change_type: :added).each do |feature_flag| check_feature_flag_yaml(feature_flag) end +if helper.security_mr? && feature_flag_file_added? + fail "Feature flags are discouraged from security merge requests. Read the [security documentation](https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/utilities/feature_flags.md) for details." +end + if feature_flag_file_added_or_removed? new_mr_title = helper.mr_title.dup new_mr_title << ' [RUN ALL RSPEC]' unless helper.run_all_rspec_mr? -- cgit v1.2.3