summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-02-15 08:58:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-02-15 08:58:20 +0000
commit59c9ff627603da03f6a7c330d57a2c765b3c24a3 (patch)
treedd8f3a2fbc9564818a77d2d8798fcc464d220e8e /lib/api
parent30b4659f2c485885324fd8d67fcd92a2939310a3 (diff)
downloadgitlab-ce-59c9ff627603da03f6a7c330d57a2c765b3c24a3.tar.gz
Add latest changes from gitlab-org/gitlab@14-7-stable-ee
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/helpers/packages/conan/api_helpers.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/helpers/packages/conan/api_helpers.rb b/lib/api/helpers/packages/conan/api_helpers.rb
index 031c29e7472..e92547890e8 100644
--- a/lib/api/helpers/packages/conan/api_helpers.rb
+++ b/lib/api/helpers/packages/conan/api_helpers.rb
@@ -145,6 +145,7 @@ module API
.with_conan_username(params[:package_username])
.with_conan_channel(params[:package_channel])
.order_created
+ .not_pending_destruction
.last
end
end