summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-20 12:06:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-20 12:06:01 +0000
commita68e9d3318c6847436f81f83eb347b29f52d1bff (patch)
tree511a790297f7e771f8d73025b9a1f9b4a0586d71 /app/controllers
parent7bc0aff0b4e15fce828621d7e0919d84368f3d2b (diff)
downloadgitlab-ce-a68e9d3318c6847436f81f83eb347b29f52d1bff.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/boards/lists_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/boards/lists_controller.rb b/app/controllers/boards/lists_controller.rb
index 880f7500708..0b8469e8290 100644
--- a/app/controllers/boards/lists_controller.rb
+++ b/app/controllers/boards/lists_controller.rb
@@ -53,7 +53,7 @@ module Boards
service = Boards::Lists::GenerateService.new(board_parent, current_user)
if service.execute(board)
- lists = board.lists.movable.preload_associations
+ lists = board.lists.movable.preload_associated_models
List.preload_preferences_for_user(lists, current_user)