diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-26 15:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-26 15:09:48 +0300 |
| commit | 142890d5bbefa7b1e1b30f263f9ad67d9d496d29 (patch) | |
| tree | 2c4de4059aba586f3204f983f17757dbf1643b6c /config | |
| parent | bbede1e22c4dd615042a3e9c0d7e24afc83ca377 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/import.rb | 9 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/config/routes/import.rb b/config/routes/import.rb index 557d7fe7143..6c99b0320de 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -42,15 +42,6 @@ namespace :import do get :realtime_changes end - resource :google_code, only: [:create, :new], controller: :google_code do - get :status - post :callback - get :jobs - - get :new_user_map, path: :user_map - post :create_user_map, path: :user_map - end - resource :fogbugz, only: [:create, :new], controller: :fogbugz do get :status post :callback diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index e4b601bc006..82a171103bc 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -250,6 +250,8 @@ - 1 - - project_import_schedule - 1 +- - project_schedule_bulk_repository_shard_moves + - 1 - - project_service - 1 - - project_template_export |