summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/pipelines
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-30 12:56:06 +0100
committerPhil Hughes <me@iamphill.com>2018-05-30 12:56:06 +0100
commitc9d676c1069e6e88b4eeeea2246cc5706b56f2ab (patch)
treec7d88b9d025964d4973eb80764d03d6f6c4d0e3f /app/assets/javascripts/ide/components/pipelines
parent6c9844c10e23e939a08a9ba3e8972dd3f112f206 (diff)
downloadgitlab-ce-c9d676c1069e6e88b4eeeea2246cc5706b56f2ab.tar.gz
changed mutations, update single object instead of returning new array
bunch of i18n stuff :see_no_evil:
Diffstat (limited to 'app/assets/javascripts/ide/components/pipelines')
-rw-r--r--app/assets/javascripts/ide/components/pipelines/list.vue16
1 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue
index 9f2fe1cb95c..06455fac439 100644
--- a/app/assets/javascripts/ide/components/pipelines/list.vue
+++ b/app/assets/javascripts/ide/components/pipelines/list.vue
@@ -1,5 +1,6 @@
<script>
import { mapActions, mapGetters, mapState } from 'vuex';
+import _ from 'underscore';
import { sprintf, __ } from '../../../locale';
import LoadingIcon from '../../../vue_shared/components/loading_icon.vue';
import Icon from '../../../vue_shared/components/icon.vue';
@@ -28,12 +29,15 @@ export default {
return sprintf(
__('You can also test your .gitlab-ci.yml in the %{linkStart}Lint%{linkEnd}'),
{
- linkStart: `<a href="${this.currentProject.web_url}/-/ci/lint">`,
+ linkStart: `<a href="${_.escape(this.currentProject.web_url)}/-/ci/lint">`,
linkEnd: '</a>',
},
false,
);
},
+ showLoadingIcon() {
+ return this.isLoadingPipeline && this.latestPipeline === null;
+ },
},
created() {
this.fetchLatestPipeline();
@@ -47,7 +51,7 @@ export default {
<template>
<div class="ide-pipeline">
<loading-icon
- v-if="isLoadingPipeline && latestPipeline === null"
+ v-if="showLoadingIcon"
class="prepend-top-default"
size="2"
/>
@@ -62,7 +66,7 @@ export default {
/>
<span class="prepend-left-8">
<strong>
- Pipeline
+ {{ __('Pipeline') }}
</strong>
<a
:href="latestPipeline.path"
@@ -88,7 +92,7 @@ export default {
class="bs-callout bs-callout-danger"
>
<p class="append-bottom-0">
- Found errors in your .gitlab-ci.yml:
+ {{ __('Found errors in your .gitlab-ci.yml:') }}
</p>
<p class="append-bottom-0">
{{ latestPipeline.yamlError }}
@@ -106,7 +110,7 @@ export default {
:active="!pipelineFailed"
>
<template slot="title">
- Jobs
+ {{ __('Jobs') }}
<span
v-if="jobsCount"
class="badge badge-pill"
@@ -123,7 +127,7 @@ export default {
:active="pipelineFailed"
>
<template slot="title">
- Failed Jobs
+ {{ __('Failed Jobs') }}
<span
v-if="failedJobsCount"
class="badge badge-pill"