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/projects
parenta483e9271bccdd2cb98cb4f3874fff5d3264d07d (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/projects')
-rw-r--r--app/assets/javascripts/projects/commits/components/author_select.vue20
1 files changed, 10 insertions, 10 deletions
diff --git a/app/assets/javascripts/projects/commits/components/author_select.vue b/app/assets/javascripts/projects/commits/components/author_select.vue
index 403715ec1f8..ba81101abc3 100644
--- a/app/assets/javascripts/projects/commits/components/author_select.vue
+++ b/app/assets/javascripts/projects/commits/components/author_select.vue
@@ -4,9 +4,9 @@ import { mapState, mapActions } from 'vuex';
import {
GlDropdown,
GlNewDropdownHeader,
- GlNewDropdownItem,
+ GlDropdownItem,
GlSearchBoxByType,
- GlNewDropdownDivider,
+ GlDropdownDivider,
GlTooltipDirective,
} from '@gitlab/ui';
import { redirectTo } from '~/lib/utils/url_utility';
@@ -20,9 +20,9 @@ export default {
components: {
GlDropdown,
GlNewDropdownHeader,
- GlNewDropdownItem,
+ GlDropdownItem,
GlSearchBoxByType,
- GlNewDropdownDivider,
+ GlDropdownDivider,
},
directives: {
GlTooltip: GlTooltipDirective,
@@ -116,18 +116,18 @@ 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"
:placeholder="__('Search')"
@input="searchAuthors"
/>
- <gl-new-dropdown-item :is-checked="!currentAuthor" @click="selectAuthor(null)">
+ <gl-dropdown-item :is-checked="!currentAuthor" @click="selectAuthor(null)">
{{ __('Any Author') }}
- </gl-new-dropdown-item>
- <gl-new-dropdown-divider />
- <gl-new-dropdown-item
+ </gl-dropdown-item>
+ <gl-dropdown-divider />
+ <gl-dropdown-item
v-for="author in commitsAuthors"
:key="author.id"
:is-checked="author.name === currentAuthor"
@@ -136,7 +136,7 @@ export default {
@click="selectAuthor(author)"
>
{{ author.name }}
- </gl-new-dropdown-item>
+ </gl-dropdown-item>
</gl-dropdown>
</div>
</template>