diff options
| author | jhampton <jhampton@gitlab.com> | 2018-12-07 13:21:43 -0500 |
|---|---|---|
| committer | jhampton <jhampton@gitlab.com> | 2018-12-07 13:21:43 -0500 |
| commit | 6de31cddb81613045ae4ac920a054c53f2028949 (patch) | |
| tree | 5da9d29ba985e9ce2b81f02c33fd43b222e91e10 /app/assets/javascripts/jobs | |
| parent | 02ef0523634123f3abc3dd6235ff229e38f40341 (diff) | |
| parent | 88c0984d077e2a85d684d71d036d27278cd81182 (diff) | |
| download | gitlab-ce-6de31cddb81613045ae4ac920a054c53f2028949.tar.gz | |
Merge remote-tracking branch 'origin/master' into 20422-hide-ui-variables-by-default
Diffstat (limited to 'app/assets/javascripts/jobs')
| -rw-r--r-- | app/assets/javascripts/jobs/components/environments_block.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/jobs/components/stuck_block.vue | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/jobs/components/environments_block.vue b/app/assets/javascripts/jobs/components/environments_block.vue index 2d09cf5760f..f7fbb9503a0 100644 --- a/app/assets/javascripts/jobs/components/environments_block.vue +++ b/app/assets/javascripts/jobs/components/environments_block.vue @@ -128,7 +128,7 @@ export default { }; </script> <template> - <div class="prepend-top-default js-environment-container"> + <div class="prepend-top-default append-bottom-default js-environment-container"> <div class="environment-information"> <ci-icon :status="iconStatus" /> <p class="inline append-bottom-0" v-html="environment"></p> diff --git a/app/assets/javascripts/jobs/components/stuck_block.vue b/app/assets/javascripts/jobs/components/stuck_block.vue index 7b077d5e621..ec52d272168 100644 --- a/app/assets/javascripts/jobs/components/stuck_block.vue +++ b/app/assets/javascripts/jobs/components/stuck_block.vue @@ -28,20 +28,22 @@ export default { <div class="bs-callout bs-callout-warning"> <p v-if="tags.length" class="js-stuck-with-tags append-bottom-0"> {{ - s__(`This job is stuck, because you don't have + s__(`This job is stuck because you don't have any active runners online with any of these tags assigned to them:`) }} - <span v-for="(tag, index) in tags" :key="index" class="badge badge-primary"> {{ tag }} </span> + <span v-for="(tag, index) in tags" :key="index" class="badge badge-primary append-right-4"> + {{ tag }} + </span> </p> <p v-else-if="hasNoRunnersForProject" class="js-stuck-no-runners append-bottom-0"> {{ - s__(`Job|This job is stuck, because the project + s__(`Job|This job is stuck because the project doesn't have any runners online assigned to it.`) }} </p> <p v-else class="js-stuck-no-active-runner append-bottom-0"> {{ - s__(`This job is stuck, because you don't + s__(`This job is stuck because you don't have any active runners that can run this job.`) }} </p> |