From d6a647ce6583c6e35b3b2f47f8d8c796c36c56c3 Mon Sep 17 00:00:00 2001
From: Chad Lavimoniere <clavimoniere@gitlab.com>
Date: Mon, 10 Mar 2025 16:13:10 -0400
Subject: [PATCH] Fix rebase failure alert variant
There is no `error` variant for alerts, so passing that yields an
unstyled alert banner.
Changelog: fixed
---
.../components/states/ready_to_merge.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index 3ff2b9211c73..3ff2488d8787 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -578,7 +578,7 @@ export default {
} catch (error) {
createAlert({
message: error.response?.data?.message || __('Failed to rebase. Please try again.'),
- variant: 'error',
+ variant: 'danger',
});
} finally {
this.isRebaseInProgress = false;
--
GitLab