diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 18:09:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 18:09:09 +0300 |
| commit | d0bb0e04f40b962576353ce56e270aa7bd25a5c0 (patch) | |
| tree | 8d78f5e9adf8d965f84869c936ac997e8748900e /app/services/boards/base_items_list_service.rb | |
| parent | 0eea37aefa31ed22e32eadbe6164dd92e3c64ec2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/boards/base_items_list_service.rb')
| -rw-r--r-- | app/services/boards/base_items_list_service.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/services/boards/base_items_list_service.rb b/app/services/boards/base_items_list_service.rb index 01fad14d036..2a9cbb83cc4 100644 --- a/app/services/boards/base_items_list_service.rb +++ b/app/services/boards/base_items_list_service.rb @@ -78,12 +78,15 @@ module Boards end def list - return unless params.key?(:id) + return unless params.key?(:id) || params.key?(:list) strong_memoize(:list) do id = params[:id] + list = params[:list] - if board.lists.loaded? + if list.present? + list + elsif board.lists.loaded? board.lists.find { |l| l.id == id } else board.lists.find(id) |