diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-21 06:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-21 06:09:46 +0300 |
| commit | a6ebd13ef8a8b95d7b12a442fdb99b03092e98ba (patch) | |
| tree | ae5c0944b542fc67e7589dd071b1d8c82d5d40a0 /app | |
| parent | c13bf680779c861d0c77a06217e5e1e4e77dd65e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
3 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/components/board_content_sidebar.vue b/app/assets/javascripts/boards/components/board_content_sidebar.vue index e014b82d362..92a4910fd6a 100644 --- a/app/assets/javascripts/boards/components/board_content_sidebar.vue +++ b/app/assets/javascripts/boards/components/board_content_sidebar.vue @@ -159,7 +159,7 @@ export default { :issuable-type="issuableType" data-testid="sidebar-due-date" /> - <board-sidebar-labels-select class="labels" /> + <board-sidebar-labels-select class="block labels" /> <sidebar-weight-widget v-if="weightFeatureAvailable" :iid="activeBoardItem.iid" diff --git a/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js b/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js index a1dd12ff769..69f1d62539a 100644 --- a/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js +++ b/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js @@ -281,6 +281,7 @@ export class GitLabDropdown { $target && !$target.hasClass('dropdown-menu-close') && !$target.hasClass('dropdown-menu-close-icon') && + !$target.is('use') && !$target.data('isLink') ) { e.stopPropagation(); diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb index 04b4d8ea9a7..96a3b38669d 100644 --- a/app/controllers/groups/boards_controller.rb +++ b/app/controllers/groups/boards_controller.rb @@ -7,7 +7,7 @@ class Groups::BoardsController < Groups::ApplicationController before_action :assign_endpoint_vars before_action do - push_frontend_feature_flag(:graphql_board_lists, group, default_enabled: false) + push_frontend_feature_flag(:graphql_board_lists, group, default_enabled: :yaml) push_frontend_feature_flag(:issue_boards_filtered_search, group, default_enabled: :yaml) push_frontend_feature_flag(:board_multi_select, group, default_enabled: :yaml) push_frontend_feature_flag(:swimlanes_buffered_rendering, group, default_enabled: :yaml) |