diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-28 14:07:42 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-28 14:07:42 +0300 |
| commit | aacb4855355953b9e8defdd9d3fae63504b5645f (patch) | |
| tree | 943bff34d4d42bc7c0c351a64eab3f615c9fdcd9 | |
| parent | 45f4cc6e9bee72ef91331721fe1c515c8ad2b913 (diff) | |
| parent | 2e072034a6a30eaf9478875140c541b9b072f7aa (diff) | |
Merge branch 'admin-email-frequency' into 'master'
Send 'admin emails' weekly, not daily
Daily seems to be to spammy, so let's default to weekly instead.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15520
See merge request !3923
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 2790f1c8a29..07ce4b6d715 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -168,9 +168,9 @@ production: &base # once per hour you will have concurrent 'git fsck' jobs. repository_check_worker: cron: "20 * * * *" - # Send admin emails once a day + # Send admin emails once a week admin_email_worker: - cron: "0 0 * * *" + cron: "0 0 * * 0" # Remove outdated repository archives repository_archive_cache_worker: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 6eb144d043b..8db2c05fe45 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -269,7 +269,7 @@ Settings.cron_jobs['repository_check_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['repository_check_worker']['cron'] ||= '20 * * * *' Settings.cron_jobs['repository_check_worker']['job_class'] = 'RepositoryCheck::BatchWorker' Settings.cron_jobs['admin_email_worker'] ||= Settingslogic.new({}) -Settings.cron_jobs['admin_email_worker']['cron'] ||= '0 0 * * *' +Settings.cron_jobs['admin_email_worker']['cron'] ||= '0 0 * * 0' Settings.cron_jobs['admin_email_worker']['job_class'] = 'AdminEmailWorker' Settings.cron_jobs['repository_archive_cache_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['repository_archive_cache_worker']['cron'] ||= '0 * * * *' |