From f61bb2a16a514b71bf33aabbbb999d6732016a24 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 20 Apr 2021 14:36:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-11-stable-ee --- app/finders/packages/conan/package_file_finder.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/finders/packages/conan/package_file_finder.rb') diff --git a/app/finders/packages/conan/package_file_finder.rb b/app/finders/packages/conan/package_file_finder.rb index edf35388a36..a1ebf9f40fa 100644 --- a/app/finders/packages/conan/package_file_finder.rb +++ b/app/finders/packages/conan/package_file_finder.rb @@ -8,8 +8,7 @@ module Packages def package_files files = super files = by_conan_file_type(files) - files = by_conan_package_reference(files) - files + by_conan_package_reference(files) end def by_conan_file_type(files) -- cgit v1.2.1