Skip to content

G
gitlab-ce
Commit e9f0158f authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

Resolved issue boards conflicts

parent c863fcbc
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 18 deletions
app/views/projects/boards/index.html.haml
View file @ e9f0158f
...@@ -10,18 +10,10 @@ ...@@ -10,18 +10,10 @@
= render 'shared/issuable/filter', type: :boards = render 'shared/issuable/filter', type: :boards
<<<<<<< HEAD
#board-app{ "v-cloak" => true, data: board_data }
= render "title", board: @boards.first
.boards-app-loading.text-center{ "v-if" => "loading" }
= icon("spinner spin")
.boards-list
= render "projects/boards/components/board"
=======
#board-app.boards-app{ "v-cloak" => true, data: board_data } #board-app.boards-app{ "v-cloak" => true, data: board_data }
= render "title", board: @boards.first
.boards-list{ ":class" => "{ 'is-compact': detailIssueVisible }" } .boards-list{ ":class" => "{ 'is-compact': detailIssueVisible }" }
.boards-app-loading.text-center{ "v-if" => "loading" } .boards-app-loading.text-center{ "v-if" => "loading" }
= icon("spinner spin") = icon("spinner spin")
= render "projects/boards/components/board" = render "projects/boards/components/board"
= render "projects/boards/components/sidebar" = render "projects/boards/components/sidebar"
>>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
app/views/projects/boards/show.html.haml
View file @ e9f0158f
...@@ -10,18 +10,10 @@ ...@@ -10,18 +10,10 @@
= render 'shared/issuable/filter', type: :boards = render 'shared/issuable/filter', type: :boards
<<<<<<< HEAD
#board-app{ "v-cloak" => true, data: board_data }
= render "title", board: @board
.boards-app-loading.text-center{ "v-if" => "loading" }
= icon("spinner spin")
.boards-list
= render "projects/boards/components/board"
=======
#board-app.boards-app{ "v-cloak" => true, data: board_data } #board-app.boards-app{ "v-cloak" => true, data: board_data }
= render "title", board: @board
.boards-list{ ":class" => "{ 'is-compact': detailIssueVisible }" } .boards-list{ ":class" => "{ 'is-compact': detailIssueVisible }" }
.boards-app-loading.text-center{ "v-if" => "loading" } .boards-app-loading.text-center{ "v-if" => "loading" }
= icon("spinner spin") = icon("spinner spin")
= render "projects/boards/components/board" = render "projects/boards/components/board"
= render "projects/boards/components/sidebar" = render "projects/boards/components/sidebar"
>>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7