summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-10-18 10:17:23 +0000
committerRémy Coutable <remy@rymai.me>2018-10-18 10:17:23 +0000
commitd4ad28856de7b5b0acf63cb257d2b0bfdc9818e5 (patch)
treecc57606b6288272e4c887fd5d6a01956b1bfeaa8 /app/assets
parent329aa24920d9bf385c244e648db4ab38dd3c23e8 (diff)
parent105a8c177f7c2bfdd670180fe57d424d2c2de152 (diff)
downloadgitlab-ce-d4ad28856de7b5b0acf63cb257d2b0bfdc9818e5.tar.gz
Merge branch 'qa-nightly-26' into 'master'
[QA] Fix the 'clone using deploy key' tests Closes gitlab-org/quality/nightly#26 See merge request gitlab-org/gitlab-ce!22445
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/jobs/components/job_app.vue6
-rw-r--r--app/assets/javascripts/jobs/components/job_log.vue2
-rw-r--r--app/assets/javascripts/vue_shared/components/ci_badge_link.vue2
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue
index fa35b87ef2b..ba14aaeed2c 100644
--- a/app/assets/javascripts/jobs/components/job_app.vue
+++ b/app/assets/javascripts/jobs/components/job_app.vue
@@ -165,7 +165,7 @@
<gl-loading-icon
v-if="isLoading"
:size="2"
- class="js-job-loading prepend-top-20"
+ class="js-job-loading qa-loading-animation prepend-top-20"
/>
<template v-else-if="shouldRenderContent">
@@ -217,8 +217,8 @@
/>
<!--job log -->
- <div
- v-if="hasTrace"
+ <div
+ v-if="hasTrace"
class="build-trace-container prepend-top-default">
<log-top-bar
:class="{
diff --git a/app/assets/javascripts/jobs/components/job_log.vue b/app/assets/javascripts/jobs/components/job_log.vue
index accda5d1bd8..ffa6ada3e28 100644
--- a/app/assets/javascripts/jobs/components/job_log.vue
+++ b/app/assets/javascripts/jobs/components/job_log.vue
@@ -42,7 +42,7 @@
};
</script>
<template>
- <pre class="js-build-trace build-trace">
+ <pre class="js-build-trace build-trace qa-build-trace">
<code
class="bash"
v-html="trace"
diff --git a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
index a2518e2a611..c60052fec50 100644
--- a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
+++ b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
@@ -43,7 +43,7 @@ export default {
computed: {
cssClass() {
const className = this.status.group;
- return className ? `ci-status ci-${className}` : 'ci-status';
+ return className ? `ci-status ci-${className} qa-status-badge` : 'ci-status qa-status-badge';
},
},
};