diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-12 15:10:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-12 15:10:25 +0300 |
| commit | 999f47e9e6da399de9dc1de404f073f7dd30af0d (patch) | |
| tree | 926bf806abb6705632dc19ceb75269f40a4c9fac /config | |
| parent | 20bd3b7d4ebb1d7ebef305656b156313d09a6674 (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/repository.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index 5a335e4f701..e07ed0fab05 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -69,6 +69,8 @@ constraints(::Constraints::GroupUrlConstrainer.new) do end end + resources :releases, only: [:index] + resources :deploy_tokens, constraints: { id: /\d+/ }, only: [] do member do put :revoke diff --git a/config/routes/repository.rb b/config/routes/repository.rb index eec204f2870..43837f2ce34 100644 --- a/config/routes/repository.rb +++ b/config/routes/repository.rb @@ -17,6 +17,7 @@ resources :commit, only: [:show], constraints: { id: /\h{7,40}/ } do post :revert post :cherry_pick get :diff_for_path + get :diff_files get :merge_requests end end |