diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-25 16:46:11 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-10-25 16:46:11 +0100 |
| commit | f670f699f3bd170ee279003371e45cd7e0f20b1a (patch) | |
| tree | 1f4cf7cb11c076fbc4ba69a9d69e08321058f64e | |
| parent | fb194acb62bfc2f3b748dddb8f8c6e3d4807685d (diff) | |
| download | gitlab-ce-53133-jobs-list.tar.gz | |
Runs prettier and adds MR id in changelog53133-jobs-list
| -rw-r--r-- | app/assets/javascripts/jobs/components/sidebar.vue | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/53133-jobs-list.yml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue index f024a623751..28a02230d89 100644 --- a/app/assets/javascripts/jobs/components/sidebar.vue +++ b/app/assets/javascripts/jobs/components/sidebar.vue @@ -59,10 +59,10 @@ export default { return ''; } - let t = this.job.metadata.timeout_human_readable; - if (this.job.metadata.timeout_source !== '') { - t += ` (from ${this.job.metadata.timeout_source})`; - } + let t = this.job.metadata.timeout_human_readable; + if (this.job.metadata.timeout_source !== '') { + t += ` (from ${this.job.metadata.timeout_source})`; + } return t; }, diff --git a/changelogs/unreleased/53133-jobs-list.yml b/changelogs/unreleased/53133-jobs-list.yml index c945d205837..2e13edc0e76 100644 --- a/changelogs/unreleased/53133-jobs-list.yml +++ b/changelogs/unreleased/53133-jobs-list.yml @@ -1,5 +1,5 @@ --- title: Fix stage dropdown not rendering in different languages -merge_request: +merge_request: 22604 author: type: other |