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
04c7be88
Commit
04c7be88
authored
Sep 30, 2021
by
Stanislav Lashmanov
Committed by
Natalia Tepluhina
Sep 30, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace v-html with gl-sprintf in commits_header.vue
parent
7e2be326
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
17 deletions
+27
-17
app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
...merge_request_widget/components/states/commits_header.vue
+23
-17
spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js
...widget/components/states/mr_widget_commits_header_spec.js
+4
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
View file @
04c7be88
<
script
>
<
script
>
/* eslint-disable @gitlab/require-string-literal-i18n-helpers */
/* eslint-disable @gitlab/require-string-literal-i18n-helpers */
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlSprintf
}
from
'
@gitlab/ui
'
;
import
{
escape
}
from
'
lodash
'
;
import
{
escape
}
from
'
lodash
'
;
import
{
__
,
n__
,
sprintf
,
s__
}
from
'
~/locale
'
;
import
{
__
,
n__
,
s__
}
from
'
~/locale
'
;
const
mergeCommitCount
=
s__
(
'
mrWidgetCommitsAdded|1 merge commit
'
);
export
default
{
export
default
{
mergeCommitCount
,
components
:
{
components
:
{
GlButton
,
GlButton
,
GlSprintf
,
},
},
props
:
{
props
:
{
isSquashEnabled
:
{
isSquashEnabled
:
{
...
@@ -47,22 +51,15 @@ export default {
...
@@ -47,22 +51,15 @@ export default {
ariaLabel
()
{
ariaLabel
()
{
return
this
.
expanded
?
__
(
'
Collapse
'
)
:
__
(
'
Expand
'
);
return
this
.
expanded
?
__
(
'
Collapse
'
)
:
__
(
'
Expand
'
);
},
},
targetBranchEscaped
()
{
return
escape
(
this
.
targetBranch
);
},
message
()
{
message
()
{
const
message
=
this
.
isFastForwardEnabled
return
this
.
isFastForwardEnabled
?
s__
(
'
mrWidgetCommitsAdded|%{commitCount} will be added to %{targetBranch}.
'
)
?
s__
(
'
mrWidgetCommitsAdded|%{commitCount} will be added to %{targetBranch}.
'
)
:
s__
(
:
s__
(
'
mrWidgetCommitsAdded|%{commitCount} and %{mergeCommitCount} will be added to %{targetBranch}.
'
,
'
mrWidgetCommitsAdded|%{commitCount} and %{mergeCommitCount} will be added to %{targetBranch}.
'
,
);
);
return
sprintf
(
message
,
{
commitCount
:
`<strong class="commits-count-message">
${
this
.
commitsCountMessage
}
</strong>`
,
mergeCommitCount
:
`<strong>
${
s__
(
'
mrWidgetCommitsAdded|1 merge commit
'
)}
</strong>`
,
targetBranch
:
`<span class="label-branch">
${
escape
(
this
.
targetBranch
)}
</span>`
,
},
false
,
);
},
},
},
},
methods
:
{
methods
:
{
...
@@ -89,10 +86,19 @@ export default {
...
@@ -89,10 +86,19 @@ export default {
/>
/>
<span
v-if=
"expanded"
>
{{
__
(
'
Collapse
'
)
}}
</span>
<span
v-if=
"expanded"
>
{{
__
(
'
Collapse
'
)
}}
</span>
<span
v-else
>
<span
v-else
>
<span
<span
class=
"vertical-align-middle"
>
class=
"vertical-align-middle"
<gl-sprintf
:message=
"message"
>
v-html=
"message /* eslint-disable-line vue/no-v-html */"
<template
#commitCount
>
></span>
<strong
class=
"commits-count-message"
>
{{
commitsCountMessage
}}
</strong>
</
template
>
<
template
#mergeCommitCount
>
<strong>
{{
$options
.
mergeCommitCount
}}
</strong>
</
template
>
<
template
#targetBranch
>
<span
class=
"label-branch"
>
{{
targetBranchEscaped
}}
</span>
</
template
>
</gl-sprintf>
</span>
<gl-button
variant=
"link"
class=
"modify-message-button"
>
<gl-button
variant=
"link"
class=
"modify-message-button"
>
{{ modifyLinkMessage }}
{{ modifyLinkMessage }}
</gl-button>
</gl-button>
...
...
spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js
View file @
04c7be88
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
GlSprintf
}
from
'
@gitlab/ui
'
;
import
CommitsHeader
from
'
~/vue_merge_request_widget/components/states/commits_header.vue
'
;
import
CommitsHeader
from
'
~/vue_merge_request_widget/components/states/commits_header.vue
'
;
describe
(
'
Commits header component
'
,
()
=>
{
describe
(
'
Commits header component
'
,
()
=>
{
...
@@ -6,6 +7,9 @@ describe('Commits header component', () => {
...
@@ -6,6 +7,9 @@ describe('Commits header component', () => {
const
createComponent
=
(
props
)
=>
{
const
createComponent
=
(
props
)
=>
{
wrapper
=
shallowMount
(
CommitsHeader
,
{
wrapper
=
shallowMount
(
CommitsHeader
,
{
stubs
:
{
GlSprintf
,
},
propsData
:
{
propsData
:
{
isSquashEnabled
:
false
,
isSquashEnabled
:
false
,
targetBranch
:
'
main
'
,
targetBranch
:
'
main
'
,
...
...
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