diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-21 15:09:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-21 15:09:30 +0300 |
commit | af28a89d5e6a62811b462ca7d3adcccf8c03e213 (patch) | |
tree | be14cd6b4adc411fe7f179c236ec0c2d2e472025 /config | |
parent | 5bd4297fd759a14ad9ab9232cb985d28bf44ac49 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/group.rb | 2 | ||||
-rw-r--r-- | config/routes/project.rb | 7 |
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 |