diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 15:09:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 15:09:07 +0300 |
commit | c089cf73c2f1835dc68fd6107d6cbd10fc17f365 (patch) | |
tree | b91f11ed13f00c84ee69e03150d00426279911ef /app/assets/javascripts | |
parent | f14507e586a7f75f0fb71a1d8468b7361be860d4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/boards/components/board_list.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/components/board_list.vue b/app/assets/javascripts/boards/components/board_list.vue index ee889e0f7e0..4a64d9e04f2 100644 --- a/app/assets/javascripts/boards/components/board_list.vue +++ b/app/assets/javascripts/boards/components/board_list.vue @@ -181,6 +181,8 @@ export default { boardsStore.startMoving(list, issue); + this.$root.$emit('bv::hide::tooltip'); + sortableStart(); }, onAdd: e => { diff --git a/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue b/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue index eedcafe2b42..932ca8e002e 100644 --- a/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue +++ b/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue @@ -149,7 +149,13 @@ export default { }; </script> <template> - <gl-dropdown :text="timeWindowText" class="date-time-picker" menu-class="date-time-picker-menu"> + <gl-dropdown + :text="timeWindowText" + class="date-time-picker" + menu-class="date-time-picker-menu" + v-bind="$attrs" + toggle-class="w-100 text-truncate" + > <div class="d-flex justify-content-between gl-p-2"> <gl-form-group :label="__('Custom range')" |