diff options
Diffstat (limited to 'app/controllers/boards')
-rw-r--r-- | app/controllers/boards/issues_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/boards/lists_controller.rb | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/controllers/boards/issues_controller.rb b/app/controllers/boards/issues_controller.rb index 347bf1f4fa8..003ed45adb5 100644 --- a/app/controllers/boards/issues_controller.rb +++ b/app/controllers/boards/issues_controller.rb @@ -27,7 +27,9 @@ module Boards list_service = Boards::Issues::ListService.new(board_parent, current_user, filter_params) issues = issues_from(list_service) - Issue.move_nulls_to_end(issues) if Gitlab::Database.read_write? + if Gitlab::Database.read_write? && !board.disabled_for?(current_user) + Issue.move_nulls_to_end(issues) + end render_issues(issues, list_service.metadata) end @@ -158,4 +160,4 @@ module Boards end end -Boards::IssuesController.prepend_if_ee('EE::Boards::IssuesController') +Boards::IssuesController.prepend_mod_with('Boards::IssuesController') diff --git a/app/controllers/boards/lists_controller.rb b/app/controllers/boards/lists_controller.rb index 19a4508c061..8ab8337a3ad 100644 --- a/app/controllers/boards/lists_controller.rb +++ b/app/controllers/boards/lists_controller.rb @@ -33,10 +33,10 @@ module Boards service = Boards::Lists::UpdateService.new(board_parent, current_user, update_list_params) result = service.execute(list) - if result[:status] == :success + if result.success? head :ok else - head result[:http_status] + head result.http_status end end @@ -99,4 +99,4 @@ module Boards end end -Boards::ListsController.prepend_if_ee('EE::Boards::ListsController') +Boards::ListsController.prepend_mod_with('Boards::ListsController') |