diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-31 11:31:29 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-31 11:31:29 +0000 |
| commit | 5d8bb33d48826abc7cd348a7c151c5b6985f0ade (patch) | |
| tree | 24fdd6e911e931888c7786302016e603543c68f7 /config | |
| parent | 4251c6565fa18ecd64befe3a2561df30d48d1846 (diff) | |
| parent | 94a3dbca33634dd4f6a1de8b14cd2a4f0a9a0abc (diff) | |
| download | gitlab-ce-5d8bb33d48826abc7cd348a7c151c5b6985f0ade.tar.gz | |
Merge branch 'zj-gitaly-server-info' into 'master'
Gitaly Server info for admin panel
See merge request gitlab-org/gitlab-ce!16794
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/admin.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index e22fb440abc..57e401c9b89 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -24,6 +24,8 @@ namespace :admin do resource :impersonation, only: :destroy resources :abuse_reports, only: [:index, :destroy] + resources :gitaly_servers, only: [:index] + resources :spam_logs, only: [:index, :destroy] do member do post :mark_as_ham |