diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-04-06 11:13:34 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-04-06 11:13:34 +0000 |
commit | aba1c226dfb5f4b84b31573ea41f4329ac82e70c (patch) | |
tree | bf9b63512eb0b18ff526301f9aa4931b684ad166 /app | |
parent | 618542949573ddf1636f6e28a72866105d5dbd37 (diff) | |
parent | 2065d14456f279b19ad6f995c0473ff4fde481f2 (diff) | |
download | gitlab-ce-aba1c226dfb5f4b84b31573ea41f4329ac82e70c.tar.gz |
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')
-rw-r--r-- | app/assets/javascripts/environments/components/environment_actions.js | 2 |
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> `, }; |