Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-04-06 14:13:34 +0300
committerJacob Schatz <jschatz@gitlab.com>2017-04-06 14:13:34 +0300
commitaba1c226dfb5f4b84b31573ea41f4329ac82e70c (patch)
treebf9b63512eb0b18ff526301f9aa4931b684ad166 /app/assets/javascripts/environments/components
parent618542949573ddf1636f6e28a72866105d5dbd37 (diff)
parent2065d14456f279b19ad6f995c0473ff4fde481f2 (diff)
Merge branch '30493-env-deploy-tooltip' into 'master'
Fix html structure to prevent tooltip from not hidding Closes #30493 See merge request !10474
Diffstat (limited to 'app/assets/javascripts/environments/components')
-rw-r--r--app/assets/javascripts/environments/components/environment_actions.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/environments/components/environment_actions.js b/app/assets/javascripts/environments/components/environment_actions.js
index 4bb7920bb5e..1418e8d86ee 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js
+++ b/app/assets/javascripts/environments/components/environment_actions.js
@@ -75,6 +75,7 @@ export default {
class="fa fa-spinner fa-spin"
aria-hidden="true"/>
</span>
+ </button>
<ul class="dropdown-menu dropdown-menu-align-right">
<li v-for="action in actions">
@@ -91,7 +92,6 @@ export default {
</button>
</li>
</ul>
- </button>
</div>
`,
};