summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb3
-rw-r--r--config/routes.rb6
-rw-r--r--config/sidekiq_queues.yml4
3 files changed, 10 insertions, 3 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 1b368346cfa..8d88d1bcf7c 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -546,6 +546,9 @@ Gitlab.ee do
Settings.cron_jobs['elastic_index_bulk_cron_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['elastic_index_bulk_cron_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['elastic_index_bulk_cron_worker']['job_class'] ||= 'ElasticIndexBulkCronWorker'
+ Settings.cron_jobs['sync_seat_link_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['sync_seat_link_worker']['cron'] ||= "#{rand(60)} 0 * * *"
+ Settings.cron_jobs['sync_seat_link_worker']['job_class'] = 'SyncSeatLinkWorker'
end
#
diff --git a/config/routes.rb b/config/routes.rb
index cf39ca3384d..466555eeee8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -133,6 +133,9 @@ Rails.application.routes.draw do
get :kill
end
end
+
+ # Notification settings
+ resources :notification_settings, only: [:create, :update]
end
concern :clusterable do
@@ -181,9 +184,6 @@ Rails.application.routes.draw do
# Spam reports
resources :abuse_reports, only: [:new, :create]
- # Notification settings
- resources :notification_settings, only: [:create, :update]
-
resources :groups, only: [:index, :new, :create] do
post :preview_markdown
end
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index d3af738a576..9f52b422fec 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -232,6 +232,8 @@
- 2
- - service_desk_email_receiver
- 1
+- - sync_seat_link_request
+ - 1
- - system_hook_push
- 1
- - todos_destroyer
@@ -248,3 +250,5 @@
- 1
- - web_hook
- 1
+- - x509_certificate_revoke
+ - 1