diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
| commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
| tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/views/shared/boards/_show.html.haml | |
| parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
| download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/views/shared/boards/_show.html.haml')
| -rw-r--r-- | app/views/shared/boards/_show.html.haml | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml index cf42ac3dd37..902b6d19f82 100644 --- a/app/views/shared/boards/_show.html.haml +++ b/app/views/shared/boards/_show.html.haml @@ -20,20 +20,31 @@ #board-app.boards-app.position-relative{ "v-cloak" => "true", data: board_data, ":class" => "{ 'is-compact': detailIssueVisible }" } = render 'shared/issuable/search_bar', type: :boards, board: board - .boards-list.w-100.py-3.px-2.text-nowrap{ data: { qa_selector: "boards_list" } } - .boards-app-loading.w-100.text-center{ "v-if" => "loading" } - = icon("spinner spin 2x") - %board{ "v-cloak" => "true", - "v-for" => "list in state.lists", - "ref" => "board", + - if Feature.enabled?(:boards_with_swimlanes, current_board_parent) + %board-content{ "v-cloak" => "true", + "ref" => "board_content", + ":lists" => "state.lists", ":can-admin-list" => can_admin_list, ":group-id" => group_id, - ":list" => "list", ":disabled" => "disabled", ":issue-link-base" => "issueLinkBase", ":root-path" => "rootPath", - ":board-id" => "boardId", - ":key" => "list.id" } + ":board-id" => "boardId" } + - else + .boards-list.w-100.py-3.px-2.text-nowrap{ data: { qa_selector: "boards_list" } } + .boards-app-loading.w-100.text-center{ "v-if" => "loading" } + = icon("spinner spin 2x") + %board{ "v-cloak" => "true", + "v-for" => "list in state.lists", + "ref" => "board", + ":can-admin-list" => can_admin_list, + ":group-id" => group_id, + ":list" => "list", + ":disabled" => "disabled", + ":issue-link-base" => "issueLinkBase", + ":root-path" => "rootPath", + ":board-id" => "boardId", + ":key" => "list.id" } = render "shared/boards/components/sidebar", group: group = render_if_exists 'shared/boards/components/board_settings_sidebar' - if @project |