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:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-07-17 18:11:35 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-07-17 18:11:35 +0300
commit1b70d442d130862fc779529056df2c6fe140f662 (patch)
tree7776134fe79c592351e12844930af580b35e9fb7 /app/assets/javascripts/vue_shared/components
parent6622c70f238cd1b8c0429fb5b8cb35e143c406df (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
-rw-r--r--app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue b/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
index a2a29241fb1..ba557878246 100644
--- a/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
+++ b/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
@@ -231,10 +231,12 @@ export default {
:auto-close="false"
>
<template #toggle>
- <div class="gl-min-h-7 gl-mb-2 gl-md-mb-0!" :aria-label="$options.i18n.mergeRequestActions">
+ <div class="gl-min-h-7 gl-mb-2 gl-md-mb-0!">
<gl-button
class="gl-md-display-none! gl-new-dropdown-toggle gl-absolute gl-top-0 gl-left-0 gl-w-full"
category="secondary"
+ :aria-label="$options.i18n.mergeRequestActions"
+ :title="$options.i18n.mergeRequestActions"
>
<span class="">{{ $options.i18n.mergeRequestActions }}</span>
<gl-icon class="dropdown-chevron" name="chevron-down" />
@@ -243,6 +245,8 @@ export default {
class="gl-display-none gl-md-display-flex! gl-new-dropdown-toggle gl-new-dropdown-icon-only gl-new-dropdown-toggle-no-caret gl-ml-3"
category="tertiary"
icon="ellipsis_v"
+ :aria-label="$options.i18n.mergeRequestActions"
+ :title="$options.i18n.mergeRequestActions"
/>
</div>
</template>