From 85dc423f7090da0a52c73eb66faf22ddb20efff9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 19 Sep 2020 01:45:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee --- .rubocop.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to '.rubocop.yml') diff --git a/.rubocop.yml b/.rubocop.yml index f3a264d1f2f..47dc85a79f0 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -60,6 +60,9 @@ Style/MutableConstant: Style/SafeNavigation: Enabled: false +Style/AccessModifierDeclarations: + AllowModifiersOnSymbols: true + # Frozen String Literal Style/FrozenStringLiteralComment: Enabled: true @@ -243,6 +246,13 @@ Gitlab/Json: - 'lib/quality/**/*' - 'lib/gitlab/danger/**/*' +Gitlab/AvoidUploadedFileFromParams: + Enabled: true + Exclude: + - 'lib/gitlab/middleware/multipart.rb' + - 'spec/**/*' + - 'ee/spec/**/*' + GitlabSecurity/PublicSend: Enabled: true Exclude: @@ -282,6 +292,14 @@ Cop/ActiveRecordAssociationReload: Gitlab/AvoidFeatureGet: Enabled: true +RSpec/TimecopFreeze: + Enabled: false + AutoCorrect: true + Include: + - 'spec/**/*.rb' + - 'ee/spec/**/*.rb' + - 'qa/spec/**/*.rb' + Naming/PredicateName: Enabled: true Exclude: @@ -509,3 +527,24 @@ Cop/PutGroupRoutesUnderScope: Include: - 'config/routes/group.rb' - 'ee/config/routes/group.rb' + +Migration/ComplexIndexesRequireName: + Exclude: + - !ruby/regexp /\Adb\/(post_)?migrate\/201.*\.rb\z/ + - !ruby/regexp /\Adb\/(post_)?migrate\/20200[1-7].*\.rb\z/ + +Migration/ReferToIndexByName: + Exclude: + - !ruby/regexp /\Adb\/(post_)?migrate\/201.*\.rb\z/ + - !ruby/regexp /\Adb\/(post_)?migrate\/20200[1-7].*\.rb\z/ + - !ruby/regexp /\Aee\/db\/geo\/(post_)?migrate\/201.*\.rb\z/ + +Migration/CreateTableWithForeignKeys: + # Disable this cop for all the existing migrations + Exclude: + - !ruby/regexp /\Adb\/(?:post_)?migrate\/(?:201[0-9]\d+|20200[0-8][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])_.+\.rb\z/ + +Gitlab/RailsLogger: + Exclude: + - 'spec/**/*.rb' + - 'ee/spec/**/*.rb' -- cgit v1.2.3