diff options
author | Rémy Coutable <remy@rymai.me> | 2018-10-10 07:19:40 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-10-10 07:19:40 +0000 |
commit | 1e93657c80fdd09006304e2842ca08e49bc51e2b (patch) | |
tree | 5d4503247e6e028347cd3e711bf533216c79039b | |
parent | 550f55745a3be5f86bafaf25b3bcc90beba8e2ac (diff) | |
parent | b75b516cfc6d7b22b2107c92a438a8391661bd4a (diff) | |
download | gitlab-ce-1e93657c80fdd09006304e2842ca08e49bc51e2b.tar.gz |
Merge branch 'jej/inline-rspec-filepath-cop' into 'master'
Inline RSpec/FilePath rubocop rule
See merge request gitlab-org/gitlab-ce!22233
-rw-r--r-- | .rubocop.yml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index b7aec5b8b14..242e7615211 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -3,7 +3,9 @@ inherit_gem: - rubocop-default.yml inherit_from: .rubocop_todo.yml -require: ./rubocop/rubocop +require: + - ./rubocop/rubocop + - rubocop-rspec AllCops: TargetRailsVersion: 4.2 @@ -54,6 +56,13 @@ Style/FrozenStringLiteralComment: - 'scripts/**/*' - 'spec/**/*' +RSpec/FilePath: + Exclude: + - 'qa/**/*' + - 'spec/javascripts/fixtures/*' + - 'ee/spec/javascripts/fixtures/*' + - 'spec/requests/api/v3/*' + Naming/FileName: ExpectMatchingDefinition: true Exclude: |