Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 0 deletions

diff --git a/config/routes/group.rb b/config/routes/group.rb
index 408c57eaa94..cf3e2069ef4 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -55,6 +55,8 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
       post :toggle_subscription, on: :member
     end
 
+    resources :packages, only: [:index]
+
     resources :milestones, constraints: { id: %r{[^/]+} } do
       member do
         get :merge_requests
diff --git a/config/routes/project.rb b/config/routes/project.rb
index dd94e6155a0..7605d63fdbd 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -30,6 +30,13 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
         resources :artifacts, only: [:index, :destroy]
 
+        resources :packages, only: [:index, :show, :destroy], module: :packages
+        resources :package_files, only: [], module: :packages do
+          member do
+            get :download
+          end
+        end
+
         resources :jobs, only: [:index, :show], constraints: { id: /\d+/ } do
           collection do
             resources :artifacts, only: [] do