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
300943e7
Commit
300943e7
authored
Sep 05, 2020
by
Kev
Committed by
Olena Horal-Koretska
Sep 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace v-html with v-safe-html in card_security_discover_app.vue
parent
d991c4b1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
13 deletions
+31
-13
ee/app/assets/javascripts/vue_shared/discover/card_security_discover_app.vue
...cripts/vue_shared/discover/card_security_discover_app.vue
+26
-13
ee/changelogs/unreleased/241937-Replace-v-html.yml
ee/changelogs/unreleased/241937-Replace-v-html.yml
+5
-0
No files found.
ee/app/assets/javascripts/vue_shared/discover/card_security_discover_app.vue
View file @
300943e7
<
script
>
/* eslint-disable vue/no-v-html */
import
{
GlButton
,
GlTooltipDirective
,
GlCarousel
,
GlCarouselSlide
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlTooltipDirective
,
GlCarousel
,
GlCarouselSlide
,
GlSprintf
,
GlLink
,
}
from
'
@gitlab/ui
'
;
import
securityDependencyImageUrl
from
'
ee_images/promotions/security-dependencies.png
'
;
import
securityScanningImageUrl
from
'
ee_images/promotions/security-scanning.png
'
;
import
securityDashboardImageUrl
from
'
ee_images/promotions/security-dashboard.png
'
;
import
Tracking
from
'
~/tracking
'
;
import
{
s
printf
,
s
__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
export
default
{
directives
:
{
...
...
@@ -15,6 +21,8 @@ export default {
GlButton
,
GlCarousel
,
GlCarouselSlide
,
GlSprintf
,
GlLink
,
},
mixins
:
[
Tracking
.
mixin
()],
props
:
{
...
...
@@ -110,14 +118,8 @@ export default {
),
},
],
discoverPlanCaption
:
sprintf
(
s__
(
'
Discover|See the other features of the %{linkStart}gold plan%{linkEnd}
'
),
{
linkStart
:
'
<a href="https://about.gitlab.com/pricing/saas/feature-comparison/" target="_blank" rel="noopener noreferrer">
'
,
linkEnd
:
'
</a>
'
,
},
false
,
discoverPlanCaption
:
s__
(
'
Discover|See the other features of the %{linkStart}gold plan%{linkEnd}
'
,
),
},
};
...
...
@@ -160,13 +162,24 @@ export default {
:key="index"
img-blank
>
<p
class=
"gl-text-gray-900 text-left"
>
<p
class=
"gl-text-gray-900
gl-
text-left"
>
{{
caption
}}
</p>
</gl-carousel-slide>
</gl-carousel>
<div
class=
"discover-footer d-flex flex-nowrap flex-row justify-content-between mx-auto my-0"
>
<p
class=
"gl-text-gray-900 text-left mb-5"
v-html=
"$options.i18n.discoverPlanCaption"
></p>
<p
class=
"gl-text-gray-900 text-left mb-5"
>
<gl-sprintf
:message=
"$options.i18n.discoverPlanCaption"
>
<template
#link
="
{ content }">
<gl-link
href=
"https://about.gitlab.com/pricing/saas/feature-comparison/"
target=
"_blank"
>
{{
content
}}
</gl-link>
</
template
>
</gl-sprintf>
</p>
</div>
<div
class=
"discover-buttons d-flex flex-nowrap flex-row justify-content-between mx-auto my-0"
>
<gl-button
...
...
ee/changelogs/unreleased/241937-Replace-v-html.yml
0 → 100644
View file @
300943e7
---
title
:
Replace v-html with v-safe-html in card_security_discover_app.vue
merge_request
:
41139
author
:
Kev @KevSlashNull
type
:
other
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