diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 12:08:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 12:08:09 +0000 |
| commit | 0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a (patch) | |
| tree | 64f91b4d4ca74aa09d2a62ac5910820d087ed7cb /.rubocop.yml | |
| parent | 6044caed20964a70c1ac6c5a3365d567ed96dfde (diff) | |
| download | gitlab-ce-0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 1adeb7a05cd..2544675eea3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,6 +7,10 @@ require: - ./rubocop/rubocop - rubocop-rspec +inherit_mode: + merge: + - Include + AllCops: TargetRubyVersion: 2.6 TargetRailsVersion: 5.0 @@ -161,6 +165,14 @@ Rails/ApplicationRecord: - ee/db/**/*.rb - ee/spec/**/*.rb +Rails/FindBy: + Enabled: true + Include: + - 'ee/app/**/*.rb' + - 'ee/lib/**/*.rb' + - 'spec/**/*.rb' + - 'ee/spec/**/*.rb' + # GitLab ################################################################### Gitlab/ModuleWithInstanceVariables: @@ -205,7 +217,6 @@ Gitlab/DuplicateSpecLocation: - ee/spec/helpers/auth_helper_spec.rb - ee/spec/lib/gitlab/gl_repository_spec.rb - ee/spec/models/namespace_spec.rb - - ee/spec/models/note_spec.rb - ee/spec/serializers/environment_entity_spec.rb - ee/spec/services/issues/create_service_spec.rb - ee/spec/services/merge_requests/create_service_spec.rb @@ -214,7 +225,6 @@ Gitlab/DuplicateSpecLocation: - ee/spec/services/system_hooks_service_spec.rb - ee/spec/helpers/ee/auth_helper_spec.rb - ee/spec/models/ee/namespace_spec.rb - - ee/spec/models/ee/note_spec.rb - ee/spec/serializers/ee/environment_entity_spec.rb - ee/spec/services/ee/issues/create_service_spec.rb - ee/spec/services/ee/merge_requests/create_service_spec.rb |