summaryrefslogtreecommitdiff
path: root/config/settings.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-19 09:08:59 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-19 09:08:59 +0000
commitc1fc5da123a1fe670e32740669a9d5e59eff38f5 (patch)
tree9e872d4057232aed3e5e0304cdfa04db74ba8464 /config/settings.rb
parent82a708b9f0adca259062555d16a9720f9955993b (diff)
downloadgitlab-ce-c1fc5da123a1fe670e32740669a9d5e59eff38f5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/settings.rb')
-rw-r--r--config/settings.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/settings.rb b/config/settings.rb
index 767c6c56337..b6225be4b54 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'settingslogic'
require 'digest/md5'
@@ -143,6 +145,10 @@ class Settings < Settingslogic
Gitlab::Application.secrets.db_key_base
end
+ def load_dynamic_cron_schedules!
+ cron_jobs['gitlab_usage_ping_worker']['cron'] ||= cron_for_usage_ping
+ end
+
private
def base_url(config)