diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-06 12:35:36 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-06 12:35:36 +0000 |
| commit | 483b5f1bfac5e338fab0e11f2045254f70df8fc1 (patch) | |
| tree | 74efdc890a666752bb7c73af95f97ca1fded49f1 /app | |
| parent | 6836078304f8eb889c1d3324c4bcf04a1168afcd (diff) | |
| parent | 1b42b14612655eaef2f62df65ca7bec435896fb9 (diff) | |
| download | gitlab-ce-483b5f1bfac5e338fab0e11f2045254f70df8fc1.tar.gz | |
Merge branch '39364-in-issue-board-url-doesn-t-take-in-account-hostname-settings' into 'master'
Resolve "In Issue board url doesn't take in account hostname settings"
Closes #39364
See merge request gitlab-org/gitlab-ce!15703
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/boards_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/boards_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb index d1b99ecce4a..e36105ddc11 100644 --- a/app/controllers/projects/boards_controller.rb +++ b/app/controllers/projects/boards_controller.rb @@ -20,7 +20,7 @@ class Projects::BoardsController < Projects::ApplicationController private def assign_endpoint_vars - @boards_endpoint = project_boards_url(project) + @boards_endpoint = project_boards_path(project) @bulk_issues_path = bulk_update_project_issues_path(project) @namespace_path = project.namespace.full_path @labels_endpoint = project_labels_path(project) diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index c4a621160af..12b3d9bac1a 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -6,7 +6,7 @@ module BoardsHelper def board_data { boards_endpoint: @boards_endpoint, - lists_endpoint: board_lists_url(board), + lists_endpoint: board_lists_path(board), board_id: board.id, disabled: "#{!can?(current_user, :admin_list, current_board_parent)}", issue_link_base: build_issue_link_base, |