diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/services/labels | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/services/labels')
-rw-r--r-- | app/services/labels/available_labels_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/labels/available_labels_service.rb b/app/services/labels/available_labels_service.rb index 3b226f39d04..1d022740c44 100644 --- a/app/services/labels/available_labels_service.rb +++ b/app/services/labels/available_labels_service.rb @@ -30,7 +30,7 @@ module Labels end def filter_labels_ids_in_param(key) - ids = params[key].to_a + ids = Array.wrap(params[key]) return [] if ids.empty? # rubocop:disable CodeReuse/ActiveRecord @@ -39,12 +39,12 @@ module Labels ids.map(&:to_i) & existing_ids end - private - def available_labels @available_labels ||= LabelsFinder.new(current_user, finder_params).execute end + private + def finder_params params = { include_ancestor_groups: true } |