summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2018-01-12 12:02:01 +0000
committerLuke Bennett <lukeeeebennettplus@gmail.com>2018-01-17 15:33:19 +0000
commitdf8e5a5d6cf7261ad5f9d5d4f96b6ff0828a7684 (patch)
treeda3b82e846b604414d61392fa24fa7a852086203
parentee92903fa6c89912610f6204daddc56b2907ae00 (diff)
downloadgitlab-ce-df8e5a5d6cf7261ad5f9d5d4f96b6ff0828a7684.tar.gz
Merge branch '41797-prometheus-wording-fixes' into 'master'
Resolve "Wording fixes on cluster page" Closes #41797 See merge request gitlab-org/gitlab-ce!16324
-rw-r--r--app/assets/javascripts/clusters/components/applications.vue51
1 files changed, 27 insertions, 24 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index cd58b88db69..c34f8266fb6 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -52,30 +52,33 @@ 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,
+ );
+ },
},
},
};