diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-27 21:12:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-27 21:12:38 +0300 |
| commit | 223359576dabfa1539f2f44fc817e9760ad831c9 (patch) | |
| tree | c8bfa8b5bd8ab354eea78e094060c91f3e1ff908 /danger | |
| parent | 28b15b6b1c591fd7796bf3a7a20508d991216b51 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'danger')
| -rw-r--r-- | danger/product_intelligence/Dangerfile | 9 | ||||
| -rw-r--r-- | danger/roulette/Dangerfile | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/danger/product_intelligence/Dangerfile b/danger/product_intelligence/Dangerfile index ae58cf4588c..0a2545c6d51 100644 --- a/danger/product_intelligence/Dangerfile +++ b/danger/product_intelligence/Dangerfile @@ -10,14 +10,13 @@ Please check the ~"product intelligence" [guide](https://docs.gitlab.com/ee/deve MSG -# exit if not matching files +# exit if not matching files or if no product intelligence labels matching_changed_files = product_intelligence.matching_changed_files -return unless matching_changed_files.any? +labels = product_intelligence.missing_labels -warn format(CHANGED_FILES_MESSAGE, changed_files: helper.markdown_list(matching_changed_files)) +return if matching_changed_files.empty? || labels.empty? -labels = product_intelligence.missing_labels -return unless labels.any? +warn format(CHANGED_FILES_MESSAGE, changed_files: helper.markdown_list(matching_changed_files)) gitlab.api.update_merge_request(gitlab.mr_json['project_id'], gitlab.mr_json['iid'], diff --git a/danger/roulette/Dangerfile b/danger/roulette/Dangerfile index cd23028a379..54b46807241 100644 --- a/danger/roulette/Dangerfile +++ b/danger/roulette/Dangerfile @@ -99,6 +99,9 @@ categories << :database if helper.mr_labels.include?('database') # Ensure to spin for Product Intelligence reviewer when ~"product intelligence::review pending" is applied categories << :product_intelligence if helper.mr_labels.include?("product intelligence::review pending") +# Skip Product intelligence reviews for growth experiment MRs +categories.delete(:product_intelligence) unless helper.mr_labels.include?("growth experiment") + if changes.any? project = project_helper.project_name |