diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 20:59:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 20:59:07 +0300 |
| commit | fc0a2622a00b99a0b20ac7cfd0342879c1e3044a (patch) | |
| tree | f3aa0a77dcb356a877c9e02dde3dd43072b7a1ba /danger | |
| parent | 623e40c9bbb8b9c8cbca620ad3a663b33c15abcf (diff) | |
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
Diffstat (limited to 'danger')
| -rw-r--r-- | danger/qa_selector/Dangerfile | 2 | ||||
| -rw-r--r-- | danger/stable_branch_patch/Dangerfile | 4 | ||||
| -rw-r--r-- | danger/z_metadata/Dangerfile | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/danger/qa_selector/Dangerfile b/danger/qa_selector/Dangerfile index b781f390a1a..f049915dc42 100644 --- a/danger/qa_selector/Dangerfile +++ b/danger/qa_selector/Dangerfile @@ -1,5 +1,7 @@ # frozen_string_literal: true +return if helper.stable_branch? + data_qa_selectors = /qa_selector|data-qa-selector/ deprecated_qa_selectors = /(?!.*\bdata-qa-)(?=class=.*qa-.*|class: .*qa-.*)/ diff --git a/danger/stable_branch_patch/Dangerfile b/danger/stable_branch_patch/Dangerfile index 258daa7d1fa..2ac1b14c91f 100644 --- a/danger/stable_branch_patch/Dangerfile +++ b/danger/stable_branch_patch/Dangerfile @@ -1,8 +1,8 @@ # frozen_string_literal: true -if stable_branch.non_security_stable_branch? +if stable_branch.encourage_package_and_qa_execution? markdown(<<~MARKDOWN) - ### QA `e2e:package-and-test` + ## QA `e2e:package-and-test` **@#{helper.mr_author}, the `package-and-test` job must complete before merging this merge request.*** diff --git a/danger/z_metadata/Dangerfile b/danger/z_metadata/Dangerfile index 9140bb7d988..1c36c02b69e 100644 --- a/danger/z_metadata/Dangerfile +++ b/danger/z_metadata/Dangerfile @@ -17,9 +17,3 @@ has_milestone = !gitlab.mr_json["milestone"].nil? 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." -end |