diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-11-08 09:29:02 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-11-08 09:29:02 +0000 |
| commit | 369631c84195f6b8b26624d5647ae994e64b77e8 (patch) | |
| tree | a930d1a94eae5c883bb88884d9e8bf40d8581d9d | |
| parent | b3b9817e5100ae2e827794d87ac6a6649571eddc (diff) | |
| parent | d90fc3b71432817731032e67bd8d16374fc7af75 (diff) | |
| download | gitlab-ce-369631c84195f6b8b26624d5647ae994e64b77e8.tar.gz | |
Merge branch 'sh-strip-trailing-whitespace-job-app-vue' into 'master'
Strip trailing whitespace in job_app.vue
See merge request gitlab-org/gitlab-ce!22897
| -rw-r--r-- | app/assets/javascripts/jobs/components/job_app.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index 35104c80694..90216b04e92 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -240,16 +240,16 @@ export default { :erased-at="job.erased_at" /> - <div + <div v-if="job.archived" ref="sticky" class="js-archived-job prepend-top-default archived-sticky sticky-top" > - <icon + <icon name="lock" class="align-text-bottom" /> - + {{ __('This job is archived. Only the complete pipeline can be retried.') }} </div> <!--job log --> |