diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-11-05 09:37:09 +0100 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-11-05 09:37:45 +0100 |
| commit | 13c091c443502a6824b78c4e93637b3fc794a47c (patch) | |
| tree | 6f692649a7c84ecdc6d086a10e54589fe185c796 /app/assets/javascripts | |
| parent | d520338ad4941c6cdfaca25fdcca9a087db12c83 (diff) | |
| download | gitlab-ce-13c091c443502a6824b78c4e93637b3fc794a47c.tar.gz | |
Fix bad merge in app/assets/javascripts/environments/components/environment_item.vuescheduled-manual-jobs-environment-play-buttons
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/environments/components/environment_item.vue | 2 |
1 files changed, 1 insertions, 1 deletions
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 || |