diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-24 15:10:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-24 15:10:54 +0300 |
commit | 4d3bbc4990ead10831a087cece3ccdd25dc4f0b4 (patch) | |
tree | d6daa91eaae8318b7b26bc1b9bfbbb8f7a295da0 /app/assets/javascripts/add_context_commits_modal | |
parent | 94df43c8c19e64afb29e8491b92c3d258f6814ea (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/add_context_commits_modal')
-rw-r--r-- | app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue index 90c9113e0e1..96584080d0f 100644 --- a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue +++ b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue @@ -1,5 +1,5 @@ <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 ReviewTabContainer from '~/add_context_commits_modal/components/review_tab_container.vue'; import createFlash from '~/flash'; @@ -21,6 +21,7 @@ export default { ReviewTabContainer, GlSearchBoxByType, GlSprintf, + GlBadge, }, props: { contextCommitsPath: { @@ -239,7 +240,7 @@ export default { <template #title> <gl-sprintf :message="__(`Commits in %{codeStart}${targetBranch}%{codeEnd}`)"> <template #code="{ content }"> - <code>{{ content }}</code> + <code class="gl-ml-2">{{ content }}</code> </template> </gl-sprintf> </template> @@ -262,7 +263,7 @@ export default { <gl-tab> <template #title> {{ __('Selected commits') }} - <span class="badge badge-pill">{{ selectedCommitsCount }}</span> + <gl-badge size="sm" class="gl-ml-2">{{ selectedCommitsCount }}</gl-badge> </template> <review-tab-container :is-loading="isLoadingContextCommits" |