diff options
| -rw-r--r-- | app/controllers/boards/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/boards_helper.rb | 1 | ||||
| -rw-r--r-- | app/models/board.rb | 8 | ||||
| -rw-r--r-- | app/services/boards/issues/list_service.rb | 2 | ||||
| -rw-r--r-- | app/services/issues/update_service.rb | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/app/controllers/boards/issues_controller.rb b/app/controllers/boards/issues_controller.rb index 8ac23faa4b7..016059b3a51 100644 --- a/app/controllers/boards/issues_controller.rb +++ b/app/controllers/boards/issues_controller.rb @@ -10,7 +10,7 @@ module Boards def index issues = Boards::Issues::ListService.new(board_parent, current_user, filter_params).execute issues = issues.page(params[:page]).per(params[:per] || 20) - make_sure_position_is_set(issues) unless Gitlab::Geo.secondary? + make_sure_position_is_set(issues) render json: { issues: serialize_as_json(issues.preload(:project)), diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index 062c3dcf164..3133b716345 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -8,7 +8,6 @@ module BoardsHelper boards_endpoint: @boards_endpoint, lists_endpoint: board_lists_url(board), board_id: board.id, - board_milestone_title: board&.milestone&.title, disabled: "#{!can?(current_user, :admin_list, current_board_parent)}", issue_link_base: build_issue_link_base, root_path: root_path, diff --git a/app/models/board.rb b/app/models/board.rb index 8a6de31ea30..5bb7d3d3722 100644 --- a/app/models/board.rb +++ b/app/models/board.rb @@ -9,6 +9,14 @@ class Board < ActiveRecord::Base true end + def parent + project + end + + def group_board? + false + end + def backlog_list lists.merge(List.backlog).take end diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb index a4c82817148..d85d93e251b 100644 --- a/app/services/boards/issues/list_service.rb +++ b/app/services/boards/issues/list_service.rb @@ -40,7 +40,7 @@ module Boards end def set_parent - params[:project_id] = project.id + params[:project_id] = parent.id end def set_state diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb index 69ccb15a0a1..a1f31abd164 100644 --- a/app/services/issues/update_service.rb +++ b/app/services/issues/update_service.rb @@ -54,7 +54,7 @@ module Issues end end - def handle_move_between_iids(issue) + def handle_move_between_ids(issue) return unless params[:move_between_ids] after_id, before_id = params.delete(:move_between_ids) |