Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 1 deletions

diff --git a/app/assets/javascripts/branches/components/delete_merged_branches.vue b/app/assets/javascripts/branches/components/delete_merged_branches.vue
index 50fe610d335..17dc084e560 100644
--- a/app/assets/javascripts/branches/components/delete_merged_branches.vue
+++ b/app/assets/javascripts/branches/components/delete_merged_branches.vue
@@ -1,5 +1,12 @@
 <script>
-import { GlDisclosureDropdown, GlButton, GlFormInput, GlModal, GlSprintf } from '@gitlab/ui';
+import {
+  GlDisclosureDropdown,
+  GlButton,
+  GlFormInput,
+  GlModal,
+  GlSprintf,
+  GlTooltipDirective,
+} from '@gitlab/ui';
 import csrf from '~/lib/utils/csrf';
 import { sprintf, s__, __ } from '~/locale';
 
@@ -22,6 +29,7 @@ export const i18n = {
     'Branches|Plese type the following to confirm: %{codeStart}delete%{codeEnd}.',
   ),
   cancelButtonText: __('Cancel'),
+  actionsToggleText: __('More actions'),
 };
 
 export default {
@@ -33,6 +41,9 @@ export default {
     GlFormInput,
     GlSprintf,
   },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
   props: {
     formPath: {
       type: String,
@@ -96,6 +107,10 @@ export default {
 <template>
   <div>
     <gl-disclosure-dropdown
+      v-gl-tooltip.hover.top="{
+        title: $options.i18n.actionsToggleText,
+        boundary: 'viewport',
+      }"
       :toggle-text="$options.i18n.actionsToggleText"
       text-sr-only
       icon="ellipsis_v"