diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-28 09:11:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-28 09:11:19 +0000 |
| commit | f4963c8c9bb2b6c38e9bd3016494a27c6c91e7e6 (patch) | |
| tree | ab7bbc8ef334603d9d5e9781b9998bc7f195b6d7 /app/finders/projects_finder.rb | |
| parent | 84b216224c765b3e16506cde793cf07003266abc (diff) | |
| download | gitlab-ce-f4963c8c9bb2b6c38e9bd3016494a27c6c91e7e6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders/projects_finder.rb')
| -rw-r--r-- | app/finders/projects_finder.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb index 5537058cc79..7245bb36ac9 100644 --- a/app/finders/projects_finder.rb +++ b/app/finders/projects_finder.rb @@ -182,8 +182,8 @@ class ProjectsFinder < UnionFinder def by_topics(items) return items unless params[:topic].present? - topics = params[:topic].instance_of?(String) ? params[:topic].strip.split(/\s*,\s*/) : params[:topic] - topics.each do |topic| + topics = params[:topic].instance_of?(String) ? params[:topic].split(',') : params[:topic] + topics.map(&:strip).uniq.reject(&:empty?).each do |topic| items = items.with_topic(topic) end |