diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-04 19:07:13 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-04 19:07:13 +0000 |
| commit | 88e3b8ec271d9624371ee71eb16e7476f00c9bc3 (patch) | |
| tree | 3372aee22aeece4426fc34eb606207c190f618cd /app/assets | |
| parent | cb5bb4dbc67c5dd43bb7b27faf79ca79f8ae3e1f (diff) | |
| parent | 11204398fbbd044ca587bb1b082ffbc1eaac2738 (diff) | |
| download | gitlab-ce-88e3b8ec271d9624371ee71eb16e7476f00c9bc3.tar.gz | |
Merge branch '44922-fix-build-metadata-creation' into 'master'
Resolve "ActiveRecord::RecordNotUnique: PG::UniqueViolation: ERROR: duplicate key value violates unique constraint "index_ci_builds_meta..."
Closes #44922
See merge request gitlab-org/gitlab-ce!18155
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/jobs/components/sidebar_details_block.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue index 172de6b3679..af47056d98f 100644 --- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue +++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue @@ -45,7 +45,7 @@ return `#${this.job.runner.id}`; }, hasTimeout() { - return this.job.metadata != null && this.job.metadata.timeout_human_readable !== ''; + return this.job.metadata != null && this.job.metadata.timeout_human_readable !== null; }, timeout() { if (this.job.metadata == null) { |