Added safety check for formatted values

6e509ae3 · Luke Bennett · Z.J. van de Weg · 35e2315a · 6e509ae3
Commit 6e509ae3 authored Oct 13, 2016 by Luke Bennett Committed by Z.J. van de Weg Oct 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/assets/javascripts/merge_request_widget.js.es6 app/assets/javascripts/merge_request_widget.js.es6 +2 -2

No files found.
--- 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.external_url || !environment.external_url_formatted) $('.js-environment-link', $template).remove();
-        if (environment.deployed_at) {
+        if (environment.deployed_at && environment.deployed_at_formatted) {
          environment.deployed_at = $.timeago(environment.deployed_at) + '.';
        } else {
          $('.js-environment-timeago', $template).remove();