diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 21:06:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 21:06:20 +0300 |
commit | 2abb1b54c0305b359b178d6660810e865f619c22 (patch) | |
tree | e388953a0566ef9844b0b98cdb34236049721a14 /app/controllers/boards | |
parent | 8320f7956d72986f5a7c850874fce4f8b5a8e015 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/boards')
-rw-r--r-- | app/controllers/boards/lists_controller.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/boards/lists_controller.rb b/app/controllers/boards/lists_controller.rb index b64b18505b6..90e04414d8d 100644 --- a/app/controllers/boards/lists_controller.rb +++ b/app/controllers/boards/lists_controller.rb @@ -11,6 +11,8 @@ module Boards def index lists = Boards::Lists::ListService.new(board.parent, current_user).execute(board) + List.preload_preferences_for_user(lists, current_user) + render json: serialize_as_json(lists) end @@ -51,7 +53,10 @@ module Boards service = Boards::Lists::GenerateService.new(board_parent, current_user) if service.execute(board) - lists = board.lists.movable.preload_associations(current_user) + lists = board.lists.movable.preload_associations + + List.preload_preferences_for_user(lists, current_user) + render json: serialize_as_json(lists) else head :unprocessable_entity |