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
70752790
Commit
70752790
authored
Dec 12, 2019
by
Magdalena Frankiewicz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix interpolation failure in strings with HTLM
parent
9761c317
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
9 deletions
+6
-9
app/assets/javascripts/serverless/components/functions.vue
app/assets/javascripts/serverless/components/functions.vue
+6
-9
No files found.
app/assets/javascripts/serverless/components/functions.vue
View file @
70752790
...
@@ -44,12 +44,14 @@ export default {
...
@@ -44,12 +44,14 @@ export default {
'
Serverless|Your repository does not have a corresponding %{startTag}serverless.yml%{endTag} file.
'
,
'
Serverless|Your repository does not have a corresponding %{startTag}serverless.yml%{endTag} file.
'
,
),
),
{
startTag
:
'
<code>
'
,
endTag
:
'
</code>
'
},
{
startTag
:
'
<code>
'
,
endTag
:
'
</code>
'
},
false
,
);
);
},
},
noGitlabYamlConfigured
()
{
noGitlabYamlConfigured
()
{
return
sprintf
(
return
sprintf
(
s__
(
'
Serverless|Your %{startTag}.gitlab-ci.yml%{endTag} file is not properly configured.
'
),
s__
(
'
Serverless|Your %{startTag}.gitlab-ci.yml%{endTag} file is not properly configured.
'
),
{
startTag
:
'
<code>
'
,
endTag
:
'
</code>
'
},
{
startTag
:
'
<code>
'
,
endTag
:
'
</code>
'
},
false
,
);
);
},
},
mismatchedServerlessFunctions
()
{
mismatchedServerlessFunctions
()
{
...
@@ -58,6 +60,7 @@ export default {
...
@@ -58,6 +60,7 @@ export default {
"
Serverless|The functions listed in the %{startTag}serverless.yml%{endTag} file don't match the namespace of your cluster.
"
,
"
Serverless|The functions listed in the %{startTag}serverless.yml%{endTag} file don't match the namespace of your cluster.
"
,
),
),
{
startTag
:
'
<code>
'
,
endTag
:
'
</code>
'
},
{
startTag
:
'
<code>
'
,
endTag
:
'
</code>
'
},
false
,
);
);
},
},
},
},
...
@@ -111,15 +114,9 @@ export default {
...
@@ -111,15 +114,9 @@ export default {
}}
}}
</p>
</p>
<ul>
<ul>
<li>
<li
v-html=
"noServerlessConfigFile"
></li>
{{ noServerlessConfigFile }}
<li
v-html=
"noGitlabYamlConfigured"
></li>
</li>
<li
v-html=
"mismatchedServerlessFunctions"
></li>
<li>
{{ noGitlabYamlConfigured }}
</li>
<li>
{{ mismatchedServerlessFunctions }}
</li>
<li>
{{ s__('Serverless|The deploy job has not finished.') }}
</li>
<li>
{{ s__('Serverless|The deploy job has not finished.') }}
</li>
</ul>
</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