Skip to content
代码片段 群组 项目
未验证 提交 0d0219ec 编辑于 作者: Simon Knox's avatar Simon Knox 提交者: GitLab
浏览文件

Merge branch '20250310-clavimoniere-ready-to-merge-error-alert-variant' into 'master'

Fix rebase failure alert variant

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184085



Merged-by: default avatarSimon Knox <simon@gitlab.com>
Approved-by: default avatarSimon Knox <simon@gitlab.com>
Co-authored-by: default avatarChad Lavimoniere <clavimoniere@gitlab.com>
No related branches found
No related tags found
2 合并请求!3031Merge per-main-jh to main-jh by luzhiyuan,!3030Merge per-main-jh to main-jh
...@@ -578,7 +578,7 @@ export default { ...@@ -578,7 +578,7 @@ export default {
} catch (error) { } catch (error) {
createAlert({ createAlert({
message: error.response?.data?.message || __('Failed to rebase. Please try again.'), message: error.response?.data?.message || __('Failed to rebase. Please try again.'),
variant: 'error', variant: 'danger',
}); });
} finally { } finally {
this.isRebaseInProgress = false; this.isRebaseInProgress = false;
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册