Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-27 21:09:41 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-27 21:09:41 +0300
commitf569792df8a25caa1bed9c448c8c4c3f837f5164 (patch)
tree8c2ed7dae5ba132a97c0321a7649174e5832d637 /.rubocop.yml
parentc2908ec6a0d7b62996cdb8da0350705bdad691bf (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml19
1 files changed, 19 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 5de4cb7874f..bd19b80e8b5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -211,6 +211,13 @@ Gitlab/HTTParty:
- 'spec/**/*'
- 'ee/spec/**/*'
+Gitlab/Json:
+ Enabled: false
+ Exclude:
+ - 'db/**/*'
+ - 'qa/**/*'
+ - 'scripts/**/*'
+
GitlabSecurity/PublicSend:
Enabled: true
Exclude:
@@ -277,6 +284,18 @@ Gitlab/Union:
- 'spec/**/*'
- 'ee/spec/**/*'
+API/GrapeAPIInstance:
+ Enabled: true
+ Include:
+ - 'lib/**/api/**/*.rb'
+ - 'ee/**/api/**/*.rb'
+
+API/GrapeArrayMissingCoerce:
+ Enabled: true
+ Include:
+ - 'lib/**/api/**/*.rb'
+ - 'ee/**/api/**/*.rb'
+
Cop/SidekiqOptionsQueue:
Enabled: true
Exclude: