diff options
author | Phil Hughes <me@iamphill.com> | 2017-06-22 07:55:03 +0000 |
---|---|---|
committer | kushalpandya <kushal@gitlab.com> | 2017-06-23 17:10:51 +0530 |
commit | 7a17d76e013ef636037da2422458ee2c48fd0618 (patch) | |
tree | 759f6fe5a262184a1302dec53358bdf4142bdcb4 | |
parent | acb7f257db65e8ce2907e4de7c42627c110476e1 (diff) | |
download | gitlab-ce-7a17d76e013ef636037da2422458ee2c48fd0618.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 | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index de2269118cd..9b9e83a54f1 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,10 +543,13 @@ export default { </span> </div> - <div class="table-section section-30 environments-actions 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 environment-action-buttons" + class="btn-group table-action-buttons" role="group"> <actions-component |