diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-05-25 21:05:53 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-05-25 21:05:53 +0000 |
commit | 74894a38779adb32a8b8a3cdad8358fc98693403 (patch) | |
tree | 4bf957d7b513797b03e571f451a760e2eb1524d8 /app/assets/javascripts/environments/components/environment_stop.vue | |
parent | 6f4935bcee76a7af532399945f440a8fbd15658e (diff) | |
parent | d219ed25fa0b67984984f0b5f60f1eff7a0c34c9 (diff) | |
download | gitlab-ce-74894a38779adb32a8b8a3cdad8358fc98693403.tar.gz |
Merge branch 'bootstrap4' into 'master'
Upgrade to Bootstrap 4
Closes #45185 and #46710
See merge request gitlab-org/gitlab-ce!18232
Diffstat (limited to 'app/assets/javascripts/environments/components/environment_stop.vue')
-rw-r--r-- | app/assets/javascripts/environments/components/environment_stop.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/environments/components/environment_stop.vue b/app/assets/javascripts/environments/components/environment_stop.vue index dda7429a726..7055f208451 100644 --- a/app/assets/javascripts/environments/components/environment_stop.vue +++ b/app/assets/javascripts/environments/components/environment_stop.vue @@ -43,7 +43,7 @@ if (confirm('Are you sure you want to stop this environment?')) { this.isLoading = true; - $(this.$el).tooltip('destroy'); + $(this.$el).tooltip('dispose'); eventHub.$emit('postAction', this.stopUrl); } @@ -55,7 +55,7 @@ <button v-tooltip type="button" - class="btn stop-env-link hidden-xs hidden-sm" + class="btn stop-env-link d-none d-sm-none d-md-block" data-container="body" @click="onClick" :disabled="isLoading" |