diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-20 12:08:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-20 12:08:32 +0300 |
| commit | 2ee5991b42717969af93cb30d863aafab04dff8a (patch) | |
| tree | c09c0b7b4d02ceb9d6ac090c1ccfb93effb8a368 /.rubocop.yml | |
| parent | 6b1ba27ef7373815ea29dc5b80eab846c8acd022 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index da14413deb7..b374012cac5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -301,24 +301,6 @@ RSpec/AnyInstanceOf: Enabled: false # Cops for upgrade to gitlab-styles 3.1.0 -Rails/SafeNavigationWithBlank: - Enabled: false - -Rails/ApplicationController: - Enabled: false - -Rails/ApplicationMailer: - Enabled: false - -Rails/RakeEnvironment: - Enabled: false - -Rails/HelperInstanceVariable: - Enabled: false - -Rails/EnumHash: - Enabled: false - RSpec/ReceiveCounts: Enabled: false @@ -362,10 +344,13 @@ RSpec/UnspecifiedException: Enabled: false RSpec/HaveGitlabHttpStatus: - Enabled: false + Enabled: true + Include: + - 'spec/support/shared_examples/**/*' Style/MultilineWhenThen: Enabled: false Style/FloatDivision: Enabled: false +
\ No newline at end of file |