BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
d37d461b
Unverified
Commit
d37d461b
authored
Jan 17, 2018
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct applications.vue conflict?
parent
df8e5a5d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
27 deletions
+23
-27
applications.vue
app/assets/javascripts/clusters/components/applications.vue
+23
-27
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
d37d461b
...
...
@@ -52,33 +52,29 @@ export default {
false
,
);
return
`
<p>
${
descriptionParagraph
}
</p>
<p class="append-bottom-0">
${
extraCostParagraph
}
</p>
`
;
},
gitlabRunnerDescription
()
{
return
_
.
escape
(
s__
(
`ClusterIntegration|GitLab Runner is the open source project that is used to run your jobs
and send the results back to GitLab.`
,
));
},
prometheusDescription
()
{
return
sprintf
(
_
.
escape
(
s__
(
`ClusterIntegration|Prometheus is an open-source monitoring system
with %{gitlabIntegrationLink} to monitor deployed applications.`
)),
{
gitlabIntegrationLink
:
`<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html"
target="_blank" rel="noopener noreferrer">
${
_
.
escape
(
s__
(
'ClusterIntegration|GitLab Integration'
))}
</a>`
,
},
false
,
);
},
return
`
<p>
${
descriptionParagraph
}
</p>
<p class="append-bottom-0">
${
extraCostParagraph
}
</p>
`
;
},
gitlabRunnerDescription
()
{
return
_
.
escape
(
s__
(
`ClusterIntegration|GitLab Runner is the open source project that is used to run your jobs
and send the results back to GitLab.`
,
));
},
prometheusDescription
()
{
return
sprintf
(
_
.
escape
(
s__
(
'ClusterIntegration|Prometheus is an open-source monitoring system with %{gitlabIntegrationLink} to monitor deployed applications.'
)),
{
gitlabIntegrationLink
:
`<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html", target="_blank" rel="noopener noreferrer">
${
_
.
escape
(
s__
(
'ClusterIntegration|Gitlab Integration'
))}
</a>`
,
},
false
,
);
},
},
};
...
...
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