diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-10-13 13:00:06 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-10-14 11:08:03 +0200 |
| commit | 6e509ae3b60eb0fbe4bddb7dbb42beaf47817f3b (patch) | |
| tree | a59967b177846403cc517637a6d4f4e370e78b14 | |
| parent | 35e2315a66e34f290230720cfa74240fd5532970 (diff) | |
| download | gitlab-ce-6e509ae3b60eb0fbe4bddb7dbb42beaf47817f3b.tar.gz | |
Added safety check for formatted values
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.es6 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6 index 8354f7ab8a4..fcadc4bc515 100644 --- a/app/assets/javascripts/merge_request_widget.js.es6 +++ b/app/assets/javascripts/merge_request_widget.js.es6 @@ -204,8 +204,8 @@ const environment = environments[i]; if ($(`.mr-state-widget #${ environment.id }`).length) return; const $template = $(DEPLOYMENT_TEMPLATE); - if (!environment.external_url) $('.js-environment-link', $template).remove(); - if (environment.deployed_at) { + if (!environment.external_url || !environment.external_url_formatted) $('.js-environment-link', $template).remove(); + if (environment.deployed_at && environment.deployed_at_formatted) { environment.deployed_at = $.timeago(environment.deployed_at) + '.'; } else { $('.js-environment-timeago', $template).remove(); |