diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml index 2df67713ecc..782d0261cc3 100644 --- a/.gitlab/ci/review-apps/main.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml @@ -58,8 +58,6 @@ review-build-cng: .review-workflow-base: image: ${REVIEW_APPS_IMAGE} - retry: - max: 1 # This is confusing but this means "2 runs at max" variables: HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" diff --git a/Gemfile b/Gemfile index 7f17381a2e8..e9df0507de9 100644 --- a/Gemfile +++ b/Gemfile @@ -452,7 +452,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.0.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'gitlab-dangerfiles', '~> 4.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end group :development, :test, :coverage do diff --git a/Gemfile.checksum b/Gemfile.checksum index 475c0767e0f..7d67e20d41f 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -206,7 +206,7 @@ {"name":"gitaly","version":"16.3.0.pre.rc1","platform":"ruby","checksum":"55d9cc414a4f3859588f3770bd88d7c67c0f5454a1178b018b7a6f6913674c43"}, {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"}, {"name":"gitlab-chronic","version":"0.10.5","platform":"ruby","checksum":"f80f18dc699b708870a80685243331290bc10cfeedb6b99c92219722f729c875"}, -{"name":"gitlab-dangerfiles","version":"4.0.0","platform":"ruby","checksum":"e3abe81790388e6a686a2cfb248c9a46486c0efbf169a07b62df2dad740f4812"}, +{"name":"gitlab-dangerfiles","version":"4.1.0","platform":"ruby","checksum":"ecf2262fcc038c1e77f7ea014f5fa8657e02ae37fde5034a2d7f67fd6e804d8d"}, {"name":"gitlab-experiment","version":"0.8.0","platform":"ruby","checksum":"b4e2f73e0af19cdd899a745f5a846c1318d44054e068a8f4ac887f6b1017d3f9"}, {"name":"gitlab-fog-azure-rm","version":"1.8.0","platform":"ruby","checksum":"e4f24b174b273b88849d12fbcfecb79ae1c09f56cbd614998714c7f0a81e6c28"}, {"name":"gitlab-labkit","version":"0.34.0","platform":"ruby","checksum":"ca5c504201390cd07ba1029e6ca3059f4e2e6005eb121ba8a103af1e166a3ecd"}, diff --git a/Gemfile.lock b/Gemfile.lock index da150484d76..21907a0c9c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -646,7 +646,7 @@ GEM terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (4.0.0) + gitlab-dangerfiles (4.1.0) danger (>= 9.3.0) danger-gitlab (>= 8.0.0) rake @@ -1819,7 +1819,7 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly (~> 16.3.0.pre.rc1) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 4.0.0) + gitlab-dangerfiles (~> 4.1.0) gitlab-experiment (~> 0.8.0) gitlab-fog-azure-rm (~> 1.8.0) gitlab-http! diff --git a/app/assets/javascripts/alert_management/components/alert_management_empty_state.vue b/app/assets/javascripts/alert_management/components/alert_management_empty_state.vue index 77c14d9f812..da9f300c941 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_empty_state.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_empty_state.vue @@ -34,7 +34,11 @@ export default {