diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-22 07:55:03 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-22 07:55:03 +0000 |
| commit | 8cc9ab50179cd6842ca6cd092ba391f0a6145945 (patch) | |
| tree | 7b63df8f6ca48eb5e95292d42edae0e24d564c0c | |
| parent | afbb93f72c7f83d78d1a2e07c22f70aded6389f6 (diff) | |
| parent | 2e9a1ebbc3ce5efef99072c715ae1bdc9d9a46f3 (diff) | |
| download | gitlab-ce-8cc9ab50179cd6842ca6cd092ba391f0a6145945.tar.gz | |
Merge branch '33853-environments-buttons' into 'master'
Only show gray footer space if environment actions exist
Closes #33853
See merge request !12315
| -rw-r--r-- | app/assets/javascripts/environments/components/environment_item.vue | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index 809c147bf25..b25113e0fc6 100644 --- a/app/assets/javascripts/environments/components/environment_item.vue +++ b/app/assets/javascripts/environments/components/environment_item.vue @@ -403,6 +403,14 @@ export default { return ''; }, + displayEnvironmentActions() { + return this.hasManualActions || + this.externalURL || + this.monitoringUrl || + this.hasStopAction || + this.canRetry; + }, + /** * Constructs folder URL based on the current location and the folder id. * @@ -535,9 +543,12 @@ export default { </span> </div> - <div class="table-section section-30 table-button-footer" role="gridcell"> + <div + v-if="!model.isFolder && displayEnvironmentActions" + class="table-section section-30 table-button-footer" + role="gridcell"> + <div - v-if="!model.isFolder" class="btn-group table-action-buttons" role="group"> |