diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-26 12:06:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-26 12:06:00 +0000 |
| commit | 5707f305f4b961e24369fcdaecf0b8ce1c34bad8 (patch) | |
| tree | 3b291653b83b3e6c2bffc77c54527fbe6f6373be /config | |
| parent | 759cd6c2985088d187ed519f2a881c2c690b34ec (diff) | |
| download | gitlab-ce-5707f305f4b961e24369fcdaecf0b8ce1c34bad8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/google_api_client.rb | 2 | ||||
| -rw-r--r-- | config/routes/admin.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/google_api_client.rb b/config/initializers/google_api_client.rb index 611726a20c7..71338d2d9e1 100644 --- a/config/initializers/google_api_client.rb +++ b/config/initializers/google_api_client.rb @@ -6,7 +6,7 @@ # as a workaround until this is resolved. # # This can be removed once fog-google and google-api-client can be upgraded. -# See https://gitlab.com/gitlab-org/gitlab-ce/issues/66630 for more details. +# See https://gitlab.com/gitlab-org/gitlab/issues/31280 for more details. # require 'google/apis/container_v1beta1' diff --git a/config/routes/admin.rb b/config/routes/admin.rb index a003ffca270..418d3324569 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -21,6 +21,10 @@ namespace :admin do end end + resource :session, only: [:new, :create] do + get 'destroy', action: :destroy, as: :destroy + end + resource :impersonation, only: :destroy resources :abuse_reports, only: [:index, :destroy] |