Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5b3f6ab4
Commit
5b3f6ab4
authored
Apr 28, 2020
by
Robert May
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Autocorrect Gitlab/Json cop in /config
parent
314a0bb3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
config/initializers/gettext_rails_i18n_patch.rb
config/initializers/gettext_rails_i18n_patch.rb
+1
-1
config/initializers/sidekiq.rb
config/initializers/sidekiq.rb
+1
-1
No files found.
config/initializers/gettext_rails_i18n_patch.rb
View file @
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
...
...
config/initializers/sidekiq.rb
View file @
5b3f6ab4
...
@@ -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
|
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment