From 999f47e9e6da399de9dc1de404f073f7dd30af0d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 12 Aug 2020 12:10:25 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/routes/group.rb | 2 ++ config/routes/repository.rb | 1 + 2 files changed, 3 insertions(+) (limited to 'config') 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 -- cgit v1.2.3