Fix bad merge in app/assets/javascripts/environments/components/environment_item.vue

13c091c4 · Winnie Hellmann · d520338a · 13c091c4
Commit 13c091c4 authored Nov 05, 2018 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/javascripts/environments/components/environment_item.vue .../javascripts/environments/components/environment_item.vue +1 -1

No files found.
--- 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 ||