diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
| commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
| tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/services/boards/base_items_list_service.rb | |
| parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) | |
| download | gitlab-ce-0ea3fcec397b69815975647f5e2aa5fe944a8486.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
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) |