diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-07 22:57:21 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-07 22:57:21 -0800 |
| commit | d90fc3b71432817731032e67bd8d16374fc7af75 (patch) | |
| tree | 6a42c7c28691fcdd7816fdf205e33ccc29c224ca | |
| parent | bef19a29175f549c891178a5f3f46f9f8bd24d26 (diff) | |
| download | gitlab-ce-sh-strip-trailing-whitespace-job-app-vue.tar.gz | |
Strip trailing whitespace in job_app.vuesh-strip-trailing-whitespace-job-app-vue
This caused unnecessary conflicts in EE.
| -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 --> |