diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-29 18:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-29 18:09:53 +0300 |
| commit | 9c28b22cfc7b2b9306b9c72d53f5c88c3129eb67 (patch) | |
| tree | 92e5e3ac55cfa092d473abca506546cf56e2215c /danger | |
| parent | ef59e05bd14aea8bf19bbe77c52116bfe24c7107 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'danger')
| -rw-r--r-- | danger/z_metadata/Dangerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/danger/z_metadata/Dangerfile b/danger/z_metadata/Dangerfile index 8aeb0c33a9c..9140bb7d988 100644 --- a/danger/z_metadata/Dangerfile +++ b/danger/z_metadata/Dangerfile @@ -2,7 +2,7 @@ # rubocop:disable Style/SignalException -DEFAULT_BRANCH = 'master' +default_branch = ENV['CI_DEFAULT_BRANCH'] || 'main' if gitlab.mr_body.size < 5 fail "Please provide a proper merge request description." @@ -14,12 +14,12 @@ end has_milestone = !gitlab.mr_json["milestone"].nil? -unless has_milestone || (helper.security_mr? && helper.mr_target_branch == DEFAULT_BRANCH) +unless has_milestone || (helper.security_mr? && helper.mr_target_branch == default_branch) warn "This merge request does not refer to an existing milestone.", sticky: false end has_pick_into_stable_label = helper.mr_labels.find { |label| label.start_with?('Pick into') } -if helper.mr_target_branch != DEFAULT_BRANCH && !has_pick_into_stable_label && !helper.security_mr? - warn "Most of the time, merge requests should target `#{DEFAULT_BRANCH}`. Otherwise, please set the relevant `Pick into X.Y` label." +if helper.mr_target_branch != default_branch && !has_pick_into_stable_label && !helper.security_mr? + warn "Most of the time, merge requests should target `#{default_branch}`. Otherwise, please set the relevant `Pick into X.Y` label." end |