Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
d78513cb
Commit
d78513cb
authored
Feb 21, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Security/JSONLoad
parent
5cd9c7c6
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
20 deletions
+11
-20
.rubocop.yml
.rubocop.yml
+3
-0
.rubocop_todo.yml
.rubocop_todo.yml
+0
-12
db/migrate/20161019190736_migrate_sidekiq_queues_from_default.rb
...ate/20161019190736_migrate_sidekiq_queues_from_default.rb
+1
-1
db/migrate/20161024042317_migrate_mailroom_queue_from_default.rb
...ate/20161024042317_migrate_mailroom_queue_from_default.rb
+1
-1
db/migrate/20161124141322_migrate_process_commit_worker_jobs.rb
...rate/20161124141322_migrate_process_commit_worker_jobs.rb
+2
-2
spec/migrations/migrate_process_commit_worker_jobs_spec.rb
spec/migrations/migrate_process_commit_worker_jobs_spec.rb
+2
-2
spec/models/project_services/irker_service_spec.rb
spec/models/project_services/irker_service_spec.rb
+1
-1
spec/support/stub_gitlab_calls.rb
spec/support/stub_gitlab_calls.rb
+1
-1
No files found.
.rubocop.yml
View file @
d78513cb
...
...
@@ -944,6 +944,9 @@ Rails/TimeZone:
Rails/Validation
:
Enabled
:
true
Security/JSONLoad
:
Enabled
:
true
Style/AlignParameters
:
Enabled
:
false
...
...
.rubocop_todo.yml
View file @
d78513cb
...
...
@@ -38,18 +38,6 @@ RSpec/SingleArgumentMessageChain:
Exclude
:
-
'
spec/requests/api/internal_spec.rb'
# Offense count: 8
# Cop supports --auto-correct.
# Configuration parameters: AutoCorrect.
Security/JSONLoad
:
Exclude
:
-
'
db/migrate/20161019190736_migrate_sidekiq_queues_from_default.rb'
-
'
db/migrate/20161024042317_migrate_mailroom_queue_from_default.rb'
-
'
db/migrate/20161124141322_migrate_process_commit_worker_jobs.rb'
-
'
spec/migrations/migrate_process_commit_worker_jobs_spec.rb'
-
'
spec/models/project_services/irker_service_spec.rb'
-
'
spec/support/stub_gitlab_calls.rb'
# Offense count: 55
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
...
...
db/migrate/20161019190736_migrate_sidekiq_queues_from_default.rb
View file @
d78513cb
...
...
@@ -93,7 +93,7 @@ def down
def
migrate_from_queue
(
redis
,
queue
,
job_mapping
)
while
job
=
redis
.
lpop
(
"queue:
#{
queue
}
"
)
payload
=
JSON
.
load
(
job
)
payload
=
JSON
.
parse
(
job
)
new_queue
=
job_mapping
[
payload
[
'class'
]]
# If we have no target queue to migrate to we're probably dealing with
...
...
db/migrate/20161024042317_migrate_mailroom_queue_from_default.rb
View file @
d78513cb
...
...
@@ -47,7 +47,7 @@ def down
def
migrate_from_queue
(
redis
,
queue
,
job_mapping
)
while
job
=
redis
.
lpop
(
"queue:
#{
queue
}
"
)
payload
=
JSON
.
load
(
job
)
payload
=
JSON
.
parse
(
job
)
new_queue
=
job_mapping
[
payload
[
'class'
]]
# If we have no target queue to migrate to we're probably dealing with
...
...
db/migrate/20161124141322_migrate_process_commit_worker_jobs.rb
View file @
d78513cb
...
...
@@ -34,7 +34,7 @@ def up
new_jobs
=
[]
while
job
=
redis
.
lpop
(
'queue:process_commit'
)
payload
=
JSON
.
load
(
job
)
payload
=
JSON
.
parse
(
job
)
project
=
Project
.
find_including_path
(
payload
[
'args'
][
0
])
next
unless
project
...
...
@@ -75,7 +75,7 @@ def down
new_jobs
=
[]
while
job
=
redis
.
lpop
(
'queue:process_commit'
)
payload
=
JSON
.
load
(
job
)
payload
=
JSON
.
parse
(
job
)
payload
[
'args'
][
2
]
=
payload
[
'args'
][
2
][
'id'
]
...
...
spec/migrations/migrate_process_commit_worker_jobs_spec.rb
View file @
d78513cb
...
...
@@ -62,7 +62,7 @@ def job_count
end
def
pop_job
JSON
.
load
(
Sidekiq
.
redis
{
|
r
|
r
.
lpop
(
'queue:process_commit'
)
})
JSON
.
parse
(
Sidekiq
.
redis
{
|
r
|
r
.
lpop
(
'queue:process_commit'
)
})
end
before
do
...
...
@@ -198,7 +198,7 @@ def job_count
let
(
:job
)
do
migration
.
down
JSON
.
load
(
Sidekiq
.
redis
{
|
r
|
r
.
lpop
(
'queue:process_commit'
)
})
JSON
.
parse
(
Sidekiq
.
redis
{
|
r
|
r
.
lpop
(
'queue:process_commit'
)
})
end
it
'includes the project ID'
do
...
...
spec/models/project_services/irker_service_spec.rb
View file @
d78513cb
...
...
@@ -59,7 +59,7 @@
conn
=
@irker_server
.
accept
conn
.
readlines
.
each
do
|
line
|
msg
=
JSON
.
load
(
line
.
chomp
(
"
\n
"
))
msg
=
JSON
.
parse
(
line
.
chomp
(
"
\n
"
))
expect
(
msg
.
keys
).
to
match_array
([
'to'
,
'privmsg'
])
expect
(
msg
[
'to'
]).
to
match_array
([
"irc://chat.freenode.net/#commits"
,
"irc://test.net/#test"
])
...
...
spec/support/stub_gitlab_calls.rb
View file @
d78513cb
...
...
@@ -35,7 +35,7 @@ def stub_container_registry_tags(*tags)
{
"tags"
=>
tags
}
)
allow_any_instance_of
(
ContainerRegistry
::
Client
).
to
receive
(
:repository_manifest
).
and_return
(
JSON
.
load
(
File
.
read
(
Rails
.
root
+
'spec/fixtures/container_registry/tag_manifest.json'
))
JSON
.
parse
(
File
.
read
(
Rails
.
root
+
'spec/fixtures/container_registry/tag_manifest.json'
))
)
allow_any_instance_of
(
ContainerRegistry
::
Client
).
to
receive
(
:blob
).
and_return
(
File
.
read
(
Rails
.
root
+
'spec/fixtures/container_registry/config_blob.json'
)
...
...
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