diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-15 15:15:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-15 15:15:54 +0000 |
| commit | 231a6ae572807c481b71d906cad717fdffc85e0f (patch) | |
| tree | 8b2415e1d4420bb3a5a14b365a37c8ef92bf6728 /danger | |
| parent | 73b652cf4f890e91868055df8f76e6f869dd710d (diff) | |
| download | gitlab-ce-231a6ae572807c481b71d906cad717fdffc85e0f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'danger')
| -rw-r--r-- | danger/product_intelligence/Dangerfile | 2 | ||||
| -rw-r--r-- | danger/roulette/Dangerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/danger/product_intelligence/Dangerfile b/danger/product_intelligence/Dangerfile index fb621cdbadb..01a2f9b6feb 100644 --- a/danger/product_intelligence/Dangerfile +++ b/danger/product_intelligence/Dangerfile @@ -15,7 +15,7 @@ MSG product_intelligence_paths_to_review = helper.changes_by_category[:product_intelligence] labels_to_add = product_intelligence.missing_labels -return if product_intelligence_paths_to_review.empty? +return if product_intelligence_paths_to_review.empty? || product_intelligence.skip_review? warn format(CHANGED_FILES_MESSAGE, changed_files: helper.markdown_list(product_intelligence_paths_to_review)) unless product_intelligence.has_approved_label? diff --git a/danger/roulette/Dangerfile b/danger/roulette/Dangerfile index cdea635e808..8d1b14d3b9a 100644 --- a/danger/roulette/Dangerfile +++ b/danger/roulette/Dangerfile @@ -111,7 +111,7 @@ categories << :ux if (["UX", "Community contribution"] - helper.mr_labels).empty 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") +categories.delete(:product_intelligence) if helper.mr_labels.include?("growth experiment") if changes.any? random_roulette_spins = roulette.spin(nil, categories, timezone_experiment: false) |