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>2023-09-06 12:10:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-06 12:10:26 +0300
commit57257d511c341ce744d152e23a8ca554ef9559e1 (patch)
tree70ac8ac113f1ddfe95b88d9cf943d5d2429dca32 /gems/config
parent79e65d684085107ba34101d2ee3a402753516df9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'gems/config')
-rw-r--r--gems/config/rubocop.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/gems/config/rubocop.yml b/gems/config/rubocop.yml
index 58746de53b0..72b37aa60b5 100644
--- a/gems/config/rubocop.yml
+++ b/gems/config/rubocop.yml
@@ -2,7 +2,7 @@
# (AllCops/Exclude: 'gems/**/*') if RuboCop cop is run within `gems/...`.
# See https://gitlab.com/gitlab-org/gitlab/-/issues/417281
<%
- relative_path = ENV['PWD'].delete_prefix(File.expand_path('../..'))
+ relative_path = ENV['PWD'].delete_prefix(File.expand_path('../..'))
RuboCop::ConfigLoader.ignore_parent_exclusion = relative_path.start_with?('/gems/')
%>
---
@@ -61,6 +61,9 @@ Gitlab/RSpec/AvoidSetup:
Graphql/AuthorizeTypes:
Enabled: false
+Gitlab/Json:
+ Enabled: false
+
# This cop doesn't make sense in the context of gems
Graphql/Descriptions:
Enabled: false