Commit 2d92a23a authored by Sean McGivern's avatar Sean McGivern

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

Enable Gitlab/Json cop

See merge request gitlab-org/gitlab!30630
parents d5cbed29 40cc60eb
...@@ -212,11 +212,13 @@ Gitlab/HTTParty: ...@@ -212,11 +212,13 @@ Gitlab/HTTParty:
- 'ee/spec/**/*' - 'ee/spec/**/*'
Gitlab/Json: Gitlab/Json:
Enabled: false Enabled: true
Exclude: Exclude:
- 'db/**/*' - 'db/**/*'
- 'qa/**/*' - 'qa/**/*'
- 'scripts/**/*' - 'scripts/**/*'
- 'lib/rspec_flaky/**/*'
- 'lib/quality/**/*'
GitlabSecurity/PublicSend: GitlabSecurity/PublicSend:
Enabled: true Enabled: true
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
.form-group.row .form-group.row
.col-sm-12 .col-sm-12
= text_area_tag :user_map, JSON.pretty_generate(@user_map), class: 'form-control', rows: 15 = text_area_tag :user_map, Gitlab::Json.pretty_generate(@user_map), class: 'form-control', rows: 15
.form-actions .form-actions
= submit_tag _('Continue to the next step'), class: "btn btn-success" = submit_tag _('Continue to the next step'), class: "btn btn-success"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
%h5 Request body: %h5 Request body:
%pre %pre
:escaped :escaped
#{JSON.pretty_generate(hook_log.request_data)} #{Gitlab::Json.pretty_generate(hook_log.request_data)}
%h5 Response headers: %h5 Response headers:
%pre %pre
- hook_log.response_headers.each do |k,v| - hook_log.response_headers.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