Commit 8c34c1d6 authored by Simon Knox's avatar Simon Knox

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
parents ac57d834 6ebc26f2
...@@ -10,7 +10,6 @@ module BoardsHelper ...@@ -10,7 +10,6 @@ module BoardsHelper
boards_endpoint: @boards_endpoint, boards_endpoint: @boards_endpoint,
lists_endpoint: board_lists_url(board), lists_endpoint: board_lists_url(board),
board_id: board.id, board_id: board.id,
board_milestone_title: board&.milestone&.title,
disabled: "#{!can?(current_user, :admin_list, current_board_parent)}", disabled: "#{!can?(current_user, :admin_list, current_board_parent)}",
issue_link_base: build_issue_link_base, issue_link_base: build_issue_link_base,
root_path: root_path, root_path: root_path,
......
...@@ -2,7 +2,13 @@ module EE ...@@ -2,7 +2,13 @@ module EE
module BoardsHelper module BoardsHelper
def board_data def board_data
parent = @group || @project parent = @group || @project
super.merge(focus_mode_available: parent.feature_available?(:issue_board_focus_mode).to_s)
data = {
board_milestone_title: board&.milestone&.title,
focus_mode_available: parent.feature_available?(:issue_board_focus_mode).to_s
}
super.merge(data)
end end
def build_issue_link_base def build_issue_link_base
......
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