Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5c8091ef
Commit
5c8091ef
authored
Jan 21, 2022
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert context commits badge to use GlBadge
Closes
https://gitlab.com/gitlab-org/gitlab/-/issues/344298
parent
b292b07c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue
...ts_modal/components/add_context_commits_modal_wrapper.vue
+4
-3
No files found.
app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue
View file @
5c8091ef
<
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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment