Commit dfc0d76e authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'ph/344298/contextCommitModalGlBadge' into 'master'

Convert context commits badge to use GlBadge

See merge request gitlab-org/gitlab!78892
parents 717a73a6 5c8091ef
<script> <script>
import { GlModal, GlTabs, GlTab, GlSearchBoxByType, GlSprintf } from '@gitlab/ui'; import { GlModal, GlTabs, GlTab, GlSearchBoxByType, GlSprintf, GlBadge } from '@gitlab/ui';
import { mapState, mapActions } from 'vuex'; import { mapState, mapActions } from 'vuex';
import ReviewTabContainer from '~/add_context_commits_modal/components/review_tab_container.vue'; import ReviewTabContainer from '~/add_context_commits_modal/components/review_tab_container.vue';
import createFlash from '~/flash'; import createFlash from '~/flash';
...@@ -21,6 +21,7 @@ export default { ...@@ -21,6 +21,7 @@ export default {
ReviewTabContainer, ReviewTabContainer,
GlSearchBoxByType, GlSearchBoxByType,
GlSprintf, GlSprintf,
GlBadge,
}, },
props: { props: {
contextCommitsPath: { contextCommitsPath: {
...@@ -239,7 +240,7 @@ export default { ...@@ -239,7 +240,7 @@ export default {
<template #title> <template #title>
<gl-sprintf :message="__(`Commits in %{codeStart}${targetBranch}%{codeEnd}`)"> <gl-sprintf :message="__(`Commits in %{codeStart}${targetBranch}%{codeEnd}`)">
<template #code="{ content }"> <template #code="{ content }">
<code>{{ content }}</code> <code class="gl-ml-2">{{ content }}</code>
</template> </template>
</gl-sprintf> </gl-sprintf>
</template> </template>
...@@ -262,7 +263,7 @@ export default { ...@@ -262,7 +263,7 @@ export default {
<gl-tab> <gl-tab>
<template #title> <template #title>
{{ __('Selected commits') }} {{ __('Selected commits') }}
<span class="badge badge-pill">{{ selectedCommitsCount }}</span> <gl-badge size="sm" class="gl-ml-2">{{ selectedCommitsCount }}</gl-badge>
</template> </template>
<review-tab-container <review-tab-container
:is-loading="isLoadingContextCommits" :is-loading="isLoadingContextCommits"
......
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