From f2ebc27236ecef67e67da1da864bbf58e9b9c267 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 Jan 2021 12:11:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .rubocop.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to '.rubocop.yml') diff --git a/.rubocop.yml b/.rubocop.yml index 4a0cd9579e6..7a4b53b5aa5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -78,21 +78,7 @@ Style/AccessModifierDeclarations: # Frozen String Literal Style/FrozenStringLiteralComment: Enabled: true - Exclude: - - 'config.ru' - - 'Dangerfile' - - 'Gemfile' - - 'Rakefile' - - 'app/views/**/*' - - 'config/**/*' - - 'danger/**/*' - - 'db/**/*' - - 'ee/db/**/*' - - 'ee/lib/tasks/**/*' - - 'lib/tasks/**/*' - - 'qa/**/*' - - 'rubocop/**/*' - - 'scripts/**/*' + EnforcedStyle: always_true RSpec/FilePath: Exclude: @@ -256,7 +242,7 @@ Gitlab/Json: - 'scripts/**/*' - 'lib/rspec_flaky/**/*' - 'lib/quality/**/*' - - 'lib/gitlab/danger/**/*' + - 'tooling/danger/**/*' Gitlab/AvoidUploadedFileFromParams: Enabled: true -- cgit v1.2.3