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
809b1271
Commit
809b1271
authored
Oct 23, 2021
by
Siddharth Asthana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace v-html with v-safe-html to improve frontend security posture
Changelog: other
parent
bbafe868
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
11 deletions
+4
-11
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
...rge_request_widget/components/states/mr_widget_rebase.vue
+4
-11
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
View file @
809b1271
<
script
>
import
{
GlButton
,
GlSkeletonLoader
}
from
'
@gitlab/ui
'
;
import
{
escape
}
from
'
lodash
'
;
import
createFlash
from
'
~/flash
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
import
glFeatureFlagMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
simplePoll
from
'
../../../lib/utils/simple_poll
'
;
import
eventHub
from
'
../../event_hub
'
;
...
...
@@ -85,13 +84,7 @@ export default {
return
[
'
failed
'
,
'
loading
'
].
includes
(
this
.
status
);
},
fastForwardMergeText
()
{
return
sprintf
(
__
(
'
Merge blocked: the source branch must be rebased onto the target branch.
'
),
{
targetBranch
:
`<span class="label-branch">
${
escape
(
this
.
targetBranch
)}
</span>`
,
},
false
,
);
return
__
(
'
Merge blocked: the source branch must be rebased onto the target branch.
'
);
},
},
methods
:
{
...
...
@@ -170,8 +163,8 @@ export default {
v-if=
"!rebaseInProgress && !canPushToSourceBranch"
class=
"gl-font-weight-bold gl-ml-0!"
data-testid=
"rebase-message"
v-html=
"fastForwardMergeText /* eslint-disable-line vue/no-v-html */"
>
</span>
>
{{
fastForwardMergeText
}}
</span
>
<div
v-if=
"!rebaseInProgress && canPushToSourceBranch && !isMakingRequest"
class=
"accept-merge-holder clearfix js-toggle-container accept-action media space-children"
...
...
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