Merge branch 'master' into issue-board-sidebar

2 files changed, 19 insertions, 4 deletions

diff --git a/app/views/projects/boards/index.html.haml b/app/views/projects/boards/index.html.haml
new file mode 100644
index 00000000000..45c2e0ee2da
--- /dev/null
+++ b/app/views/projects/boards/index.html.haml
@@ -0,0 +1,18 @@
+- @no_container = true
+- @content_class = "issue-boards-content"
+- page_title "Boards"
+
+- content_for :page_specific_javascripts do
+  = page_specific_javascript_tag('boards/boards_bundle.js')
+  = page_specific_javascript_tag('boards/test_utils/simulate_drag.js') if Rails.env.test?
+
+= render "projects/issues/head"
+
+= render 'shared/issuable/filter', type: :boards
+
+#board-app.boards-app{ "v-cloak" => true, data: board_data }
+  .boards-list
+    .boards-app-loading.text-center{ "v-if" => "loading" }
+      = icon("spinner spin")
+    = render "projects/boards/components/board"
+  = render "projects/boards/components/sidebar"
diff --git a/app/views/projects/boards/show.html.haml b/app/views/projects/boards/show.html.haml
index 432390eb03f..45c2e0ee2da 100644
--- a/app/views/projects/boards/show.html.haml
+++ b/app/views/projects/boards/show.html.haml
@@ -10,10 +10,7 @@
 
 = render 'shared/issuable/filter', type: :boards
 
-#board-app.boards-app{ "v-cloak" => true,
-  "data-endpoint" => "#{namespace_project_board_path(@project.namespace, @project)}",
-  "data-disabled" => "#{!can?(current_user, :admin_list, @project)}",
-  "data-issue-link-base" => "#{namespace_project_issues_path(@project.namespace, @project)}" }
+#board-app.boards-app{ "v-cloak" => true, data: board_data }
   .boards-list
     .boards-app-loading.text-center{ "v-if" => "loading" }
       = icon("spinner spin")