diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 14:36:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 14:36:54 +0000 |
commit | f61bb2a16a514b71bf33aabbbb999d6732016a24 (patch) | |
tree | 9548caa89e60b4f40b99bbd1dac030420b812aa8 /app/finders/packages/conan/package_file_finder.rb | |
parent | 35fc54e5d261f8898e390aea7c2f5ec5fdf0539d (diff) | |
download | gitlab-ce-f61bb2a16a514b71bf33aabbbb999d6732016a24.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42
Diffstat (limited to 'app/finders/packages/conan/package_file_finder.rb')
-rw-r--r-- | app/finders/packages/conan/package_file_finder.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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) |