Commit 0d589b25 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'russell/glbutton_issue229340' into 'master'

Migrate button to GlButton in MR in an archived project

See merge request gitlab-org/gitlab!42550
parents 4ecf818b 93fac8ef
<script> <script>
import { GlButton } from '@gitlab/ui';
import statusIcon from '../mr_widget_status_icon.vue'; import statusIcon from '../mr_widget_status_icon.vue';
export default { export default {
name: 'MRWidgetArchived', name: 'MRWidgetArchived',
components: { components: {
GlButton,
statusIcon, statusIcon,
}, },
}; };
...@@ -12,9 +14,9 @@ export default { ...@@ -12,9 +14,9 @@ export default {
<div class="mr-widget-body media"> <div class="mr-widget-body media">
<div class="space-children"> <div class="space-children">
<status-icon status="warning" /> <status-icon status="warning" />
<button type="button" class="btn btn-success btn-sm" disabled="true"> <gl-button category="secondary" variant="success" :disabled="true">
{{ s__('mrWidget|Merge') }} {{ s__('mrWidget|Merge') }}
</button> </gl-button>
</div> </div>
<div class="media-body"> <div class="media-body">
<span class="bold"> <span class="bold">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment