diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb new file mode 100644 index 00000000000..1dbf4eb8c37 --- /dev/null +++ b/app/controllers/projects/boards_controller.rb @@ -0,0 +1,7 @@ +class Projects::BoardsController < Projects::ApplicationController + def show + respond_to do |format| + format.html + end + end +end diff --git a/app/views/projects/boards/show.html.haml b/app/views/projects/boards/show.html.haml new file mode 100644 index 00000000000..44b002d3fe5 --- /dev/null +++ b/app/views/projects/boards/show.html.haml @@ -0,0 +1,8 @@ +- @no_container = true +- @content_class = 'issues-board-content' +- page_title 'Board' + += render 'projects/issues/head' += render 'shared/issuable/filter', type: :boards + +.board-lists diff --git a/app/views/projects/issues/_head.html.haml b/app/views/projects/issues/_head.html.haml index 60b45115b73..b6cb559afcb 100644 --- a/app/views/projects/issues/_head.html.haml +++ b/app/views/projects/issues/_head.html.haml @@ -6,6 +6,11 @@ %span Issues + = nav_link(controller: :boards) do + = link_to namespace_project_board_path(@project.namespace, @project), title: 'Board' do + %span + Board + - if project_nav_tab?(:merge_requests) && current_controller?(:merge_requests) = nav_link(controller: :merge_requests) do = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests' do diff --git a/config/routes.rb b/config/routes.rb index 63a8827a6a2..8e39993493c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -856,6 +856,8 @@ Rails.application.routes.draw do end end + resource :board, only: [:show] + resources :todos, only: [:create] resources :uploads, only: [:create] do diff --git a/spec/controllers/projects/boards_controller_spec.rb b/spec/controllers/projects/boards_controller_spec.rb new file mode 100644 index 00000000000..7382a2a5c43 --- /dev/null +++ b/spec/controllers/projects/boards_controller_spec.rb @@ -0,0 +1,20 @@ +require 'spec_helper' + +describe Projects::BoardsController do + let(:project) { create(:empty_project) } + let(:user) { create(:user) } + + before do + project.team << [user, :master] + sign_in(user) + end + + describe 'GET #show' do + it 'renders HTML template' do + get :show, namespace_id: project.namespace.to_param, project_id: project.to_param + + expect(response).to render_template :show + expect(response.content_type).to eq 'text/html' + end + end +end