diff options
| author | Regis <boudinot.regis@yahoo.com> | 2016-12-13 13:03:49 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2016-12-13 13:03:49 -0700 |
| commit | 77daed05ca877e9882096787b3d57244baaa5d91 (patch) | |
| tree | 48e972448234b338dba2fce10eaee19f8e6027ec /config | |
| parent | d46af1d9b263916063200f5fd2cafa18df11c37b (diff) | |
| parent | 632450a4bd95c7f67f9968e57b317dc4b4704f5f (diff) | |
| download | gitlab-ce-77daed05ca877e9882096787b3d57244baaa5d91.tar.gz | |
merge master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 9ddd1554811..0ee1b1ec634 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -302,7 +302,7 @@ Settings.cron_jobs['remove_expired_group_links_worker'] ||= Settingslogic.new({} Settings.cron_jobs['remove_expired_group_links_worker']['cron'] ||= '10 0 * * *' Settings.cron_jobs['remove_expired_group_links_worker']['job_class'] = 'RemoveExpiredGroupLinksWorker' Settings.cron_jobs['prune_old_events_worker'] ||= Settingslogic.new({}) -Settings.cron_jobs['prune_old_events_worker']['cron'] ||= '* */6 * * *' +Settings.cron_jobs['prune_old_events_worker']['cron'] ||= '0 */6 * * *' Settings.cron_jobs['prune_old_events_worker']['job_class'] = 'PruneOldEventsWorker' Settings.cron_jobs['trending_projects_worker'] ||= Settingslogic.new({}) diff --git a/config/routes.rb b/config/routes.rb index 03b47261e7e..06d565df469 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,5 @@ require 'sidekiq/web' require 'sidekiq/cron/web' -require 'api/api' require 'constraints/group_url_constrainer' Rails.application.routes.draw do |