summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/environments
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-20 11:34:07 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-21 10:50:37 -0500
commit2e9a1ebbc3ce5efef99072c715ae1bdc9d9a46f3 (patch)
tree75a211c09e4b3ce3b49eac9d3346851b0615a4fd /app/assets/javascripts/environments
parentb5c3ad759342e61a597c32b62151d4ad076d4559 (diff)
downloadgitlab-ce-2e9a1ebbc3ce5efef99072c715ae1bdc9d9a46f3.tar.gz
Only show gray footer space if environment actions exist33853-environments-buttons
Diffstat (limited to 'app/assets/javascripts/environments')
-rw-r--r--app/assets/javascripts/environments/components/environment_item.vue15
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">