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:
Diffstat (limited to 'app/assets/javascripts/branches/components')
-rw-r--r--app/assets/javascripts/branches/components/delete_merged_branches.vue19
-rw-r--r--app/assets/javascripts/branches/components/sort_dropdown.vue4
2 files changed, 19 insertions, 4 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..24ae9b83b9c 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"
@@ -153,7 +168,7 @@ export default {
<gl-form-input
v-model="enteredText"
type="text"
- size="sm"
+ width="sm"
class="gl-mt-2"
aria-labelledby="input-label"
autocomplete="off"
diff --git a/app/assets/javascripts/branches/components/sort_dropdown.vue b/app/assets/javascripts/branches/components/sort_dropdown.vue
index 4866d506988..f4a5b25c4f2 100644
--- a/app/assets/javascripts/branches/components/sort_dropdown.vue
+++ b/app/assets/javascripts/branches/components/sort_dropdown.vue
@@ -1,6 +1,6 @@
<script>
import { GlCollapsibleListbox, GlSearchBoxByClick } from '@gitlab/ui';
-import { mergeUrlParams, visitUrl } from '~/lib/utils/url_utility';
+import { mergeUrlParams, visitUrl, getParameterValues } from '~/lib/utils/url_utility';
import { s__ } from '~/locale';
export default {
@@ -21,7 +21,7 @@ export default {
// own attributes, also in created()
data() {
return {
- searchTerm: '',
+ searchTerm: getParameterValues('search')[0] || '',
};
},
computed: {