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

Enable Gitlab/Json cop

See merge request gitlab-org/gitlab!30630

.rubocop.yml

@@ -212,11 +212,13 @@ Gitlab/HTTParty:
     - 'ee/spec/**/*'
 
 Gitlab/Json:
-  Enabled: false
+  Enabled: true
   Exclude:
     - 'db/**/*'
     - 'qa/**/*'
     - 'scripts/**/*'
+    - 'lib/rspec_flaky/**/*'
+    - 'lib/quality/**/*'
 
 GitlabSecurity/PublicSend:
   Enabled: true

app/views/import/google_code/new_user_map.html.haml

@@ -30,7 +30,7 @@
 
   .form-group.row
     .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
     = submit_tag _('Continue to the next step'), class: "btn btn-success"

app/views/shared/hook_logs/_content.html.haml

@@ -31,7 +31,7 @@
 %h5 Request body:
 %pre
   :escaped
-    #{JSON.pretty_generate(hook_log.request_data)}
+    #{Gitlab::Json.pretty_generate(hook_log.request_data)}
 %h5 Response headers:
 %pre
   - hook_log.response_headers.each do |k,v|