From e20baee820ea2c76ee16980a98e8080f255d9035 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 27 Mar 2020 18:07:48 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .rubocop.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.rubocop.yml') diff --git a/.rubocop.yml b/.rubocop.yml index 873876ecc94..984377cbb90 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -204,7 +204,6 @@ Gitlab/DuplicateSpecLocation: Exclude: - ee/spec/helpers/auth_helper_spec.rb - ee/spec/lib/gitlab/gl_repository_spec.rb - - ee/spec/lib/gitlab/usage_data_spec.rb - ee/spec/models/namespace_spec.rb - ee/spec/models/note_spec.rb - ee/spec/serializers/environment_entity_spec.rb @@ -215,7 +214,6 @@ Gitlab/DuplicateSpecLocation: - ee/spec/services/system_hooks_service_spec.rb - ee/spec/helpers/ee/auth_helper_spec.rb - ee/spec/lib/ee/gitlab/gl_repository_spec.rb - - ee/spec/lib/ee/gitlab/usage_data_spec.rb - ee/spec/models/ee/namespace_spec.rb - ee/spec/models/ee/note_spec.rb - ee/spec/serializers/ee/environment_entity_spec.rb @@ -382,3 +380,6 @@ Style/FloatDivision: Cop/BanCatchThrow: Enabled: true + +Performance/ReadlinesEach: + Enabled: true -- cgit v1.2.3