Commit 8825659e authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'json-cop-autocorrects-config' into 'master'

Gitlab/Json cop autocorrects in /config

See merge request gitlab-org/gitlab!30626
parents dea72e1a 5b3f6ab4
...@@ -45,7 +45,7 @@ module GettextI18nRailsJs ...@@ -45,7 +45,7 @@ module GettextI18nRailsJs
private private
def gettext_messages_by_file def gettext_messages_by_file
@gettext_messages_by_file ||= JSON.parse(load_messages) @gettext_messages_by_file ||= Gitlab::Json.parse(load_messages)
end end
def load_messages def load_messages
......
...@@ -75,7 +75,7 @@ Sidekiq.configure_server do |config| ...@@ -75,7 +75,7 @@ Sidekiq.configure_server do |config|
# Sidekiq-cron: load recurring jobs from gitlab.yml # Sidekiq-cron: load recurring jobs from gitlab.yml
# UGLY Hack to get nested hash from settingslogic # UGLY Hack to get nested hash from settingslogic
cron_jobs = JSON.parse(Gitlab.config.cron_jobs.to_json) cron_jobs = Gitlab::Json.parse(Gitlab.config.cron_jobs.to_json)
# UGLY hack: Settingslogic doesn't allow 'class' key # UGLY hack: Settingslogic doesn't allow 'class' key
cron_jobs_required_keys = %w(job_class cron) cron_jobs_required_keys = %w(job_class cron)
cron_jobs.each do |k, v| cron_jobs.each do |k, v|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment