diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 21:06:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 21:06:24 +0000 |
commit | 4b28d5ae770c6bd332283a3f13ceae06329c409b (patch) | |
tree | ae4d46e1d017002935fe75dc14cb3c108be12fae /app/assets | |
parent | 41efffa17c67405ca5f5dac49d72be7872cee339 (diff) | |
download | gitlab-ce-4b28d5ae770c6bd332283a3f13ceae06329c409b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue index 9c258c4651f..13795eff714 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue @@ -167,7 +167,7 @@ dropdown-menu-labels dropdown-menu-selectable" <div class="dropdown-page-one"> <dropdown-header v-if="showCreate" /> <dropdown-search-input /> - <div class="dropdown-content"></div> + <div class="dropdown-content" data-qa-selector="labels_dropdown_content"></div> <div class="dropdown-loading"><gl-loading-icon /></div> <dropdown-footer v-if="showCreate" diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue index cb53273c786..574b63cf8a6 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue @@ -14,7 +14,11 @@ export default { {{ __('Labels') }} <template v-if="canEdit"> <i aria-hidden="true" class="fa fa-spinner fa-spin block-loading" data-hidden="true"> </i> - <button type="button" class="edit-link btn btn-blank float-right js-sidebar-dropdown-toggle"> + <button + type="button" + class="edit-link btn btn-blank float-right js-sidebar-dropdown-toggle" + data-qa-selector="labels_edit_button" + > {{ __('Edit') }} </button> </template> |