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>2020-09-14 21:09:48 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-14 21:09:48 +0300
commita8caa9ce4922947ba057f259bccd017c2177e1b5 (patch)
treec2d3e86b3c0336630edc7604ea575ca605fd1dd0 /app/assets/javascripts/ref
parenta483e9271bccdd2cb98cb4f3874fff5d3264d07d (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ref')
-rw-r--r--app/assets/javascripts/ref/components/ref_results_section.vue8
-rw-r--r--app/assets/javascripts/ref/components/ref_selector.vue10
2 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/javascripts/ref/components/ref_results_section.vue b/app/assets/javascripts/ref/components/ref_results_section.vue
index c8f5c66b0c1..57a3c2482c9 100644
--- a/app/assets/javascripts/ref/components/ref_results_section.vue
+++ b/app/assets/javascripts/ref/components/ref_results_section.vue
@@ -1,12 +1,12 @@
<script>
-import { GlNewDropdownHeader, GlNewDropdownItem, GlBadge, GlIcon } from '@gitlab/ui';
+import { GlNewDropdownHeader, GlDropdownItem, GlBadge, GlIcon } from '@gitlab/ui';
import { s__ } from '~/locale';
export default {
name: 'RefResultsSection',
components: {
GlNewDropdownHeader,
- GlNewDropdownItem,
+ GlDropdownItem,
GlBadge,
GlIcon,
},
@@ -97,7 +97,7 @@ export default {
</div>
</template>
<template v-else>
- <gl-new-dropdown-item
+ <gl-dropdown-item
v-for="item in items"
:key="item.name"
@click="$emit('selected', item.value || item.name)"
@@ -118,7 +118,7 @@ export default {
s__('DefaultBranchLabel|default')
}}</gl-badge>
</div>
- </gl-new-dropdown-item>
+ </gl-dropdown-item>
</template>
</div>
</template>
diff --git a/app/assets/javascripts/ref/components/ref_selector.vue b/app/assets/javascripts/ref/components/ref_selector.vue
index 7fe30a2d902..d982893b4c6 100644
--- a/app/assets/javascripts/ref/components/ref_selector.vue
+++ b/app/assets/javascripts/ref/components/ref_selector.vue
@@ -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">