From 13c091c443502a6824b78c4e93637b3fc794a47c Mon Sep 17 00:00:00 2001 From: Winnie Hellmann Date: Mon, 5 Nov 2018 09:37:09 +0100 Subject: Fix bad merge in app/assets/javascripts/environments/components/environment_item.vue --- app/assets/javascripts/environments/components/environment_item.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index eb51118dcf2..3deef65f3f5 100644 --- a/app/assets/javascripts/environments/components/environment_item.vue +++ b/app/assets/javascripts/environments/components/environment_item.vue @@ -426,7 +426,7 @@ export default { displayEnvironmentActions() { return ( - this.hasManualActions || + this.actions.length > 0 || this.externalURL || this.monitoringUrl || this.canStopEnvironment || -- cgit v1.2.1