Merge branch 'issue_928_group_boards' of gitlab.com:gitlab-org/gitlab-ee into...

Merge branch 'issue_928_group_boards' of gitlab.com:gitlab-org/gitlab-ee into issue_928_group_boards

app/controllers/projects/boards_controller.rb

@@ -24,7 +24,7 @@ class Projects::BoardsController < Projects::ApplicationController
   def assign_endpoint_vars
     @boards_endpoint = project_boards_url(project)
     @bulk_issues_path = bulk_update_project_issues_path(project)
-    @namespace_path = project.namespace.path
+    @namespace_path = project.namespace.full_path
     @labels_endpoint = project_labels_path(project)
   end
 

app/helpers/boards_helper.rb

@@ -41,8 +41,8 @@ module BoardsHelper
     current_board_parent.multiple_issue_boards_available?(current_user)
   end
 
-  def board_path(board)
-    @board_path ||= project_board_path(current_board_parent, board)
+  def current_board_path(board)
+    @current_board_path ||= project_board_path(current_board_parent, board)
   end
 
   def current_board_parent

app/views/shared/boards/_switcher.html.haml

@@ -26,7 +26,7 @@
           %li{ "v-for" => "board in boards" }
             %a{ ":href" => "'#{board_base_url}/' + board.id" }
               {{ board.name }}
-          - if !multiple_boards_available? && @boards.size > 1
+          - if !multiple_boards_available? && current_board_parent.boards.size > 1
             %li.small
               Some of your boards are hidden, activate a license to see them again.
       .dropdown-loading{ "v-if" => "loading" }
@@ -40,7 +40,7 @@
           %p
             Are you sure you want to delete this board?
           .board-delete-btns.clearfix
-            = link_to board_path(board),
+            = link_to current_board_path(board),
               class: "btn btn-danger pull-left",
               method: :delete do
               Delete

ee/app/controllers/ee/boards/boards_controller.rb

@@ -2,6 +2,7 @@ module EE
   module Boards
     module BoardsController
       extend ActiveSupport::Concern
+
       prepended do
         before_action :check_multiple_issue_boards_available!, only: [:create]
         before_action :authorize_admin_board!, only: [:create, :update, :destroy]

ee/app/helpers/ee/boards_helper.rb

@@ -25,8 +25,8 @@ module EE
       end
     end
 
-    def board_path(board)
-      @board_path ||= begin
+    def current_board_path(board)
+      @current_board_path ||= begin
         if board.group_board?
           group_board_path(current_board_parent, board)
         else

lib/gitlab/path_regex.rb

@@ -26,6 +26,7 @@ module Gitlab
       apple-touch-icon.png
       assets
       autocomplete
+      boards
       ci
       dashboard
       deploy.html
@@ -118,6 +119,7 @@ module Gitlab
       analytics
       audit_events
       avatar
+      boards
       edit
       group_members
       hooks