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

Merge branch 'admin-email-frequency' into 'master'
aacb4855 · Jacob Vosmaer · 45f4cc6e · 2e072034 · aacb4855 · aacb4855
Commit aacb4855 authored Apr 28, 2016 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

gitlab.yml.example config/gitlab.yml.example +2 -2

1_settings.rb config/initializers/1_settings.rb +1 -1

No files found.
--- 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:

--- 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 * * * *'