diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 15:09:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 15:09:34 +0300 |
commit | 9a5dcad39c5dd81384ae4ec2398435883b944363 (patch) | |
tree | 3c684d30e4500028299d7948171e885b844a1ade /app/assets/javascripts/projects | |
parent | 0923a94d58cdd15cdb6379330e5eb41d30ccb8cc (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.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/projects/commits/components/author_select.vue b/app/assets/javascripts/projects/commits/components/author_select.vue index 6b414d958ed..403715ec1f8 100644 --- a/app/assets/javascripts/projects/commits/components/author_select.vue +++ b/app/assets/javascripts/projects/commits/components/author_select.vue @@ -2,7 +2,7 @@ import { debounce } from 'lodash'; import { mapState, mapActions } from 'vuex'; import { - GlNewDropdown, + GlDropdown, GlNewDropdownHeader, GlNewDropdownItem, GlSearchBoxByType, @@ -18,7 +18,7 @@ const tooltipMessage = __('Searching by both author and message is currently not export default { name: 'AuthorSelect', components: { - GlNewDropdown, + GlDropdown, GlNewDropdownHeader, GlNewDropdownItem, GlSearchBoxByType, @@ -107,7 +107,7 @@ export default { <template> <div ref="dropdownContainer" v-gl-tooltip :title="tooltipTitle" :disabled="!hasSearchParam"> - <gl-new-dropdown + <gl-dropdown :text="dropdownText" :disabled="hasSearchParam" toggle-class="gl-py-3 gl-border-0" @@ -137,6 +137,6 @@ export default { > {{ author.name }} </gl-new-dropdown-item> - </gl-new-dropdown> + </gl-dropdown> </div> </template> |