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
4eb635d6
Commit
4eb635d6
authored
Sep 03, 2020
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove v-html from serverless/.../functions.vue
Signed-off-by:
Takuya Noguchi
<
takninnovationresearch@gmail.com
>
parent
957bd3bc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
app/assets/javascripts/serverless/components/functions.vue
app/assets/javascripts/serverless/components/functions.vue
+7
-5
No files found.
app/assets/javascripts/serverless/components/functions.vue
View file @
4eb635d6
<
script
>
/* eslint-disable vue/no-v-html */
import
{
mapState
,
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
GlLink
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlLink
,
GlLoadingIcon
,
GlSafeHtmlDirective
as
SafeHtml
}
from
'
@gitlab/ui
'
;
import
{
sprintf
,
s__
}
from
'
~/locale
'
;
import
EnvironmentRow
from
'
./environment_row.vue
'
;
import
EmptyState
from
'
./empty_state.vue
'
;
...
...
@@ -14,6 +13,9 @@ export default {
GlLink
,
GlLoadingIcon
,
},
directives
:
{
SafeHtml
,
},
computed
:
{
...
mapState
([
'
installed
'
,
'
isLoading
'
,
'
hasFunctionData
'
,
'
helpPath
'
,
'
statusPath
'
]),
...
mapGetters
([
'
getFunctions
'
]),
...
...
@@ -92,9 +94,9 @@ export default {
}}
</p>
<ul>
<li
v-html=
"noServerlessConfigFile"
></li>
<li
v-html=
"noGitlabYamlConfigured"
></li>
<li
v-html=
"mismatchedServerlessFunctions"
></li>
<li
v-
safe-
html=
"noServerlessConfigFile"
></li>
<li
v-
safe-
html=
"noGitlabYamlConfigured"
></li>
<li
v-
safe-
html=
"mismatchedServerlessFunctions"
></li>
<li>
{{ s__('Serverless|The deploy job has not finished.') }}
</li>
</ul>
...
...
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