Skip to content
代码片段 群组 项目
提交 599697d3 编辑于 作者: Savas Vedova's avatar Savas Vedova
浏览文件

Merge branch...

Merge branch '422864-migrate-button-variant-in-app-assets-javascripts-pages-import-bitbucket_server-status' into 'master' 

Update button variant to "confirm" and make it secondary

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



Merged-by: default avatarSavas Vedova <svedova@gitlab.com>
Approved-by: default avatarSavas Vedova <svedova@gitlab.com>
Approved-by: default avatarDoug Stull <dstull@gitlab.com>
Co-authored-by: default avatarJustin Ho Tuan Duong <hduong@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -19,9 +19,14 @@ export default { ...@@ -19,9 +19,14 @@ export default {
<template> <template>
<bitbucket-status-table v-bind="$attrs"> <bitbucket-status-table v-bind="$attrs">
<template #actions> <template #actions>
<gl-button variant="info" class="gl-ml-3" data-method="post" :href="reconfigurePath">{{ <gl-button
__('Reconfigure') category="secondary"
}}</gl-button> variant="confirm"
class="gl-ml-3"
data-method="post"
:href="reconfigurePath"
>{{ __('Reconfigure') }}</gl-button
>
</template> </template>
</bitbucket-status-table> </bitbucket-status-table>
</template> </template>
...@@ -12,11 +12,7 @@ const BitbucketStatusTableStub = { ...@@ -12,11 +12,7 @@ const BitbucketStatusTableStub = {
describe('BitbucketServerStatusTable', () => { describe('BitbucketServerStatusTable', () => {
let wrapper; let wrapper;
const findReconfigureButton = () => const findReconfigureButton = () => wrapper.findComponent(GlButton);
wrapper
.findAllComponents(GlButton)
.filter((w) => w.props().variant === 'info')
.at(0);
function createComponent(bitbucketStatusTableStub = true) { function createComponent(bitbucketStatusTableStub = true) {
wrapper = shallowMount(BitbucketServerStatusTable, { wrapper = shallowMount(BitbucketServerStatusTable, {
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册