diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-11 18:33:02 +0000 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-10-11 16:27:35 -0500 |
| commit | dd411a204e010f2eea4a5d3e5797533de1b70a73 (patch) | |
| tree | f2cfd05557f671661df918198d7b55c38f3842d3 /app/assets/javascripts | |
| parent | 31ae0e5d00fc9378ebfb3a71000ef5e1664aefc6 (diff) | |
| download | gitlab-ce-dd411a204e010f2eea4a5d3e5797533de1b70a73.tar.gz | |
Merge branch '52570-erased-block' into 'master'
Fix erased block not being rendered when job was erased
Closes #52570
See merge request gitlab-org/gitlab-ce!22294
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/jobs/components/job_app.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index 047e55866ce..6380f525120 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -87,8 +87,8 @@ /> <erased-block - v-if="job.erased" - class="js-job-erased" + v-if="job.erased_at" + class="js-job-erased-block" :user="job.erased_by" :erased-at="job.erased_at" /> |