Commit dbd56ec1 authored by Sean McGivern's avatar Sean McGivern

Merge branch '10io-cleanup-conan-endpoints-concern' into 'master'

Move the conan api concern to a proper location

See merge request gitlab-org/gitlab!47771
parents a49cd500 1aae3e80
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
module API module API
class ConanInstancePackages < ::API::Base class ConanInstancePackages < ::API::Base
namespace 'packages/conan/v1' do namespace 'packages/conan/v1' do
include ConanPackageEndpoints include ::API::Concerns::Packages::ConanEndpoints
end end
end end
end end
This diff is collapsed.
...@@ -9,7 +9,7 @@ module API ...@@ -9,7 +9,7 @@ module API
resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
namespace ':id/packages/conan/v1' do namespace ':id/packages/conan/v1' do
include ConanPackageEndpoints include ::API::Concerns::Packages::ConanEndpoints
end end
end end
end end
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment