diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-19 17:08:03 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-08-19 17:08:03 +0000 |
commit | 725036669cca45df17f1acbb1a45a031a1a84c85 (patch) | |
tree | f8fae23c197b4db87ed8ed3f387f943c17492b2f /config | |
parent | 8fc800cbcc9994ccf8e582df2e94e8e27b5e6fbe (diff) | |
parent | 1e00e4369d316d079e31227d4a45ad2101553ec2 (diff) | |
download | gitlab-ce-725036669cca45df17f1acbb1a45a031a1a84c85.tar.gz |
Merge branch 'expiration-date-on-memberships' into 'master'
Expiration date on memberships
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495
See merge request !5876
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/1_settings.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index deac3b0f0f9..7a9376def02 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -293,6 +293,12 @@ Settings.cron_jobs['import_export_project_cleanup_worker']['job_class'] = 'Impor Settings.cron_jobs['requests_profiles_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['requests_profiles_worker']['cron'] ||= '0 0 * * *' Settings.cron_jobs['requests_profiles_worker']['job_class'] = 'RequestsProfilesWorker' +Settings.cron_jobs['remove_expired_members_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['remove_expired_members_worker']['cron'] ||= '10 0 * * *' +Settings.cron_jobs['remove_expired_members_worker']['job_class'] = 'RemoveExpiredMembersWorker' +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' # # GitLab Shell |