diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-26 21:10:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-26 21:10:07 +0300 |
| commit | cafc99870a5167530f45ddcdee98afa86a27a0f7 (patch) | |
| tree | c02d4d58df1b01340711707f52862fbd24389e2d /danger | |
| parent | a3a9c1103b0f023deafc9fc9307032085419ff7d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'danger')
| -rw-r--r-- | danger/database/Dangerfile | 4 | ||||
| -rw-r--r-- | danger/roulette/Dangerfile | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/danger/database/Dangerfile b/danger/database/Dangerfile index 1c0e9d72118..6861a04ffc6 100644 --- a/danger/database/Dangerfile +++ b/danger/database/Dangerfile @@ -67,9 +67,7 @@ end return unless helper.ci? return if helper.mr_labels.include?(DATABASE_APPROVED_LABEL) -db_paths_to_review = helper.changes_by_category[:database] - -if helper.mr_labels.include?('database') || db_paths_to_review.any? +if helper.mr_labels.include?('database') || database.changes.any? message 'This merge request adds or changes files that require a ' \ 'review from the [Database team](https://gitlab.com/groups/gl-database/-/group_members).' diff --git a/danger/roulette/Dangerfile b/danger/roulette/Dangerfile index 39b79745ead..960f6a995d4 100644 --- a/danger/roulette/Dangerfile +++ b/danger/roulette/Dangerfile @@ -98,7 +98,7 @@ categories = roulette.prepare_categories(changes.keys - [:unknown]) categories.subtract([:database, :ux, :analytics_instrumentation]) if stable_branch.valid_stable_branch? if changes.any? - random_roulette_spins = roulette.spin(nil, categories, timezone_experiment: false) + random_roulette_spins = roulette.spin(nil, categories) if categories.include?(:ux) # rubocop:disable Style/IfUnlessModifier roulette.assign_pedroms_for_ux_wider_community_contribution(random_roulette_spins) |