Commit cbf5d0f0 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'migrate-gl-new-dropdown-divider' into 'master'

Migrate GlNewDropdownDivider to GlDropdownDivider

See merge request gitlab-org/gitlab!42145
parents 7efa4369 9be849a4
<script>
import {
GlDropdown,
GlNewDropdownDivider,
GlDropdownDivider,
GlNewDropdownHeader,
GlNewDropdownItem,
GlLoadingIcon,
......@@ -18,7 +18,7 @@ const SEARCH_DEBOUNCE_MS = 250;
export default {
components: {
GlDropdown,
GlNewDropdownDivider,
GlDropdownDivider,
GlNewDropdownHeader,
GlNewDropdownItem,
GlLoadingIcon,
......@@ -200,7 +200,7 @@ export default {
<span class="text-center d-block">{{ $options.translations.selectMilestone }}</span>
</gl-new-dropdown-header>
<gl-new-dropdown-divider />
<gl-dropdown-divider />
<gl-search-box-by-type
ref="searchBox"
......@@ -217,17 +217,17 @@ export default {
</span>
</gl-new-dropdown-item>
<gl-new-dropdown-divider />
<gl-dropdown-divider />
<template v-if="isLoading">
<gl-loading-icon />
<gl-new-dropdown-divider />
<gl-dropdown-divider />
</template>
<template v-else-if="noResults">
<div class="dropdown-item-space">
<span ref="noResults" class="pl-4">{{ $options.translations.noResultsLabel }}</span>
</div>
<gl-new-dropdown-divider />
<gl-dropdown-divider />
</template>
<template v-else-if="dropdownItems.length">
<gl-new-dropdown-item
......@@ -240,7 +240,7 @@ export default {
{{ item }}
</span>
</gl-new-dropdown-item>
<gl-new-dropdown-divider />
<gl-dropdown-divider />
</template>
<gl-new-dropdown-item v-for="(item, idx) in extraLinks" :key="idx" :href="item.url">
......
......@@ -3,7 +3,7 @@ import { mapState, mapGetters, mapActions } from 'vuex';
import {
GlDeprecatedButton,
GlDropdown,
GlNewDropdownDivider,
GlDropdownDivider,
GlNewDropdownItem,
GlModal,
GlIcon,
......@@ -24,7 +24,7 @@ export default {
components: {
GlDeprecatedButton,
GlDropdown,
GlNewDropdownDivider,
GlDropdownDivider,
GlNewDropdownItem,
GlModal,
GlIcon,
......@@ -268,7 +268,7 @@ export default {
{{ selectedDashboard.starred ? $options.i18n.unstarDashboard : $options.i18n.starDashboard }}
</gl-new-dropdown-item>
<gl-new-dropdown-divider />
<gl-dropdown-divider />
<gl-new-dropdown-item
v-gl-modal="$options.modalIds.createDashboard"
......
......@@ -8,7 +8,7 @@ import {
GlLoadingIcon,
GlDropdown,
GlNewDropdownItem as GlDropdownItem,
GlNewDropdownDivider as GlDropdownDivider,
GlDropdownDivider,
GlModal,
GlModalDirective,
GlSprintf,
......
......@@ -5,7 +5,7 @@ import {
GlDropdown,
GlNewDropdownItem,
GlNewDropdownHeader,
GlNewDropdownDivider,
GlDropdownDivider,
GlSearchBoxByType,
GlModalDirective,
} from '@gitlab/ui';
......@@ -20,7 +20,7 @@ export default {
GlDropdown,
GlNewDropdownItem,
GlNewDropdownHeader,
GlNewDropdownDivider,
GlDropdownDivider,
GlSearchBoxByType,
},
directives: {
......@@ -101,7 +101,7 @@ export default {
<gl-icon class="text-muted gl-flex-shrink-0 gl-ml-3 gl-align-self-center" name="star" />
</div>
</gl-new-dropdown-item>
<gl-new-dropdown-divider
<gl-dropdown-divider
v-if="starredDashboards.length && nonStarredDashboards.length"
ref="starredListDivider"
/>
......
......@@ -6,7 +6,7 @@ import {
GlButton,
GlDropdown,
GlNewDropdownItem,
GlNewDropdownDivider,
GlDropdownDivider,
GlTooltipDirective,
} from '@gitlab/ui';
import { n__, __ } from '~/locale';
......@@ -50,7 +50,7 @@ export default {
GlButton,
GlDropdown,
GlNewDropdownItem,
GlNewDropdownDivider,
GlDropdownDivider,
},
directives: {
GlTooltip: GlTooltipDirective,
......@@ -164,7 +164,7 @@ export default {
@click="removeRefreshInterval()"
>{{ __('Off') }}</gl-new-dropdown-item
>
<gl-new-dropdown-divider />
<gl-dropdown-divider />
<gl-new-dropdown-item
v-for="(option, i) in $options.refreshIntervals"
:key="i"
......
......@@ -6,7 +6,7 @@ import {
GlNewDropdownHeader,
GlNewDropdownItem,
GlSearchBoxByType,
GlNewDropdownDivider,
GlDropdownDivider,
GlTooltipDirective,
} from '@gitlab/ui';
import { redirectTo } from '~/lib/utils/url_utility';
......@@ -22,7 +22,7 @@ export default {
GlNewDropdownHeader,
GlNewDropdownItem,
GlSearchBoxByType,
GlNewDropdownDivider,
GlDropdownDivider,
},
directives: {
GlTooltip: GlTooltipDirective,
......@@ -116,7 +116,7 @@ export default {
<gl-new-dropdown-header>
{{ __('Search by author') }}
</gl-new-dropdown-header>
<gl-new-dropdown-divider />
<gl-dropdown-divider />
<gl-search-box-by-type
v-model.trim="authorInput"
class="gl-m-3"
......@@ -126,7 +126,7 @@ export default {
<gl-new-dropdown-item :is-checked="!currentAuthor" @click="selectAuthor(null)">
{{ __('Any Author') }}
</gl-new-dropdown-item>
<gl-new-dropdown-divider />
<gl-dropdown-divider />
<gl-new-dropdown-item
v-for="author in commitsAuthors"
:key="author.id"
......
......@@ -2,7 +2,7 @@
import { mapActions, mapGetters, mapState } from 'vuex';
import {
GlDropdown,
GlNewDropdownDivider,
GlDropdownDivider,
GlNewDropdownHeader,
GlSearchBoxByType,
GlSprintf,
......@@ -19,7 +19,7 @@ export default {
store: createStore(),
components: {
GlDropdown,
GlNewDropdownDivider,
GlDropdownDivider,
GlNewDropdownHeader,
GlSearchBoxByType,
GlSprintf,
......@@ -134,7 +134,7 @@ export default {
<span class="gl-text-center gl-display-block">{{ i18n.dropdownHeader }}</span>
</gl-new-dropdown-header>
<gl-new-dropdown-divider />
<gl-dropdown-divider />
<gl-search-box-by-type
ref="searchBox"
......@@ -175,7 +175,7 @@ export default {
@selected="selectRef($event)"
/>
<gl-new-dropdown-divider v-if="showTagsSection || showCommitsSection" />
<gl-dropdown-divider v-if="showTagsSection || showCommitsSection" />
</template>
<template v-if="showTagsSection">
......@@ -190,7 +190,7 @@ export default {
@selected="selectRef($event)"
/>
<gl-new-dropdown-divider v-if="showCommitsSection" />
<gl-dropdown-divider v-if="showCommitsSection" />
</template>
<template v-if="showCommitsSection">
......
......@@ -3,7 +3,7 @@ import {
GlToken,
GlFilteredSearchToken,
GlFilteredSearchSuggestion,
GlNewDropdownDivider as GlDropdownDivider,
GlDropdownDivider,
GlLoadingIcon,
} from '@gitlab/ui';
import { debounce } from 'lodash';
......
......@@ -2,7 +2,7 @@
import {
GlFilteredSearchToken,
GlFilteredSearchSuggestion,
GlNewDropdownDivider as GlDropdownDivider,
GlDropdownDivider,
GlLoadingIcon,
} from '@gitlab/ui';
import { debounce } from 'lodash';
......
......@@ -4,7 +4,7 @@ import {
GlButton,
GlDropdown,
GlNewDropdownItem as GlDropdownItem,
GlNewDropdownDivider as GlDropdownDivider,
GlDropdownDivider,
GlForm,
GlFormInput,
GlFormGroup,
......
......@@ -2,7 +2,7 @@
import { debounce } from 'lodash';
import {
GlDropdown,
GlNewDropdownDivider,
GlDropdownDivider,
GlNewDropdownItem,
GlIcon,
GlLoadingIcon,
......@@ -15,7 +15,7 @@ import { deprecatedCreateFlash as createFlash } from '~/flash';
export default {
components: {
GlDropdown,
GlNewDropdownDivider,
GlDropdownDivider,
GlNewDropdownItem,
GlSearchBoxByType,
GlIcon,
......@@ -97,7 +97,7 @@ export default {
<span ref="noResults" class="text-secondary gl-p-3">
{{ $options.translations.noMatchingResults }}
</span>
<gl-new-dropdown-divider />
<gl-dropdown-divider />
<gl-new-dropdown-item @click="addEnvironment(environmentSearch)">
{{ createEnvironmentLabel }}
</gl-new-dropdown-item>
......
......@@ -5,7 +5,7 @@ import {
GlSegmentedControl,
GlDropdown,
GlNewDropdownItem as GlDropdownItem,
GlNewDropdownDivider as GlDropdownDivider,
GlDropdownDivider,
} from '@gitlab/ui';
import { __ } from '~/locale';
......
......@@ -3,7 +3,7 @@ import {
GlFilteredSearchToken,
GlFilteredSearchTokenSegment,
GlFilteredSearchSuggestion,
GlNewDropdownDivider as GlDropdownDivider,
GlDropdownDivider,
} from '@gitlab/ui';
import MockAdapter from 'axios-mock-adapter';
import waitForPromises from 'helpers/wait_for_promises';
......
......@@ -3,7 +3,7 @@ import {
GlFilteredSearchToken,
GlFilteredSearchSuggestion,
GlFilteredSearchTokenSegment,
GlNewDropdownDivider as GlDropdownDivider,
GlDropdownDivider,
} from '@gitlab/ui';
import MockAdapter from 'axios-mock-adapter';
import waitForPromises from 'helpers/wait_for_promises';
......
......@@ -3,7 +3,7 @@ import {
GlFilteredSearchToken,
GlFilteredSearchSuggestion,
GlFilteredSearchTokenSegment,
GlNewDropdownDivider as GlDropdownDivider,
GlDropdownDivider,
} from '@gitlab/ui';
import MockAdapter from 'axios-mock-adapter';
import waitForPromises from 'helpers/wait_for_promises';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment