diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/views/shared/boards | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/views/shared/boards')
-rw-r--r-- | app/views/shared/boards/_show.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/boards/_switcher.html.haml | 12 |
2 files changed, 0 insertions, 14 deletions
diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml index 98752345074..c070baf02b1 100644 --- a/app/views/shared/boards/_show.html.haml +++ b/app/views/shared/boards/_show.html.haml @@ -16,6 +16,4 @@ - page_title("#{board.name}", _("Boards")) - add_page_specific_style 'page_bundles/boards' -= render 'shared/issuable/search_bar', type: :boards, board: board - #js-issuable-board-app{ data: board_data } diff --git a/app/views/shared/boards/_switcher.html.haml b/app/views/shared/boards/_switcher.html.haml deleted file mode 100644 index c667b3a4626..00000000000 --- a/app/views/shared/boards/_switcher.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -- parent = board.resource_parent -- milestone_filter_opts = { format: :json } -- milestone_filter_opts = milestone_filter_opts.merge(only_group_milestones: true) if board.group_board? -- weights = Gitlab.ee? ? ([Issue::WEIGHT_ANY] + Issue.weight_options) : [] - -#js-multiple-boards-switcher.inline.boards-switcher{ data: { milestone_path: milestones_filter_path(milestone_filter_opts), - board_base_url: board_base_url, - has_missing_boards: (!multiple_boards_available? && current_board_parent.boards.size > 1).to_s, - can_admin_board: can?(current_user, :admin_issue_board, parent).to_s, - multiple_issue_boards_available: parent.multiple_issue_boards_available?.to_s, - scoped_issue_board_feature_enabled: Gitlab.ee? && parent.feature_available?(:scoped_issue_board) ? 'true' : 'false', - weights: weights.to_json } } |