summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorYorick Peterse <yorick@yorickpeterse.com>2019-08-28 12:02:14 +0000
committerYorick Peterse <yorick@yorickpeterse.com>2019-08-28 12:02:14 +0000
commita58bf655e4812632ca98bc19701aad431721ff9f (patch)
tree4e678af6ae19f03ff9480665518ecfde2d00de75 /.rubocop.yml
parentf8a442b71fdb6c0fecb8d54ef09120abd6982929 (diff)
parent1f272b193ec32ee434b47d4e9dfeb03fabb95c6f (diff)
downloadgitlab-ce-a58bf655e4812632ca98bc19701aad431721ff9f.tar.gz
Merge branch 'docs/rs-root-parity' into 'master'
CE-EE parity for root files See merge request gitlab-org/gitlab-ce!32287
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 573f2fbb6c6..a20924c21b7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -50,7 +50,9 @@ Style/FrozenStringLiteralComment:
- 'config/**/*'
- 'danger/**/*'
- 'db/**/*'
- - 'ee/**/*'
+ - 'ee/db/**/*'
+ - 'ee/spec/**/*'
+ - 'ee/lib/tasks/**/*'
- 'lib/tasks/**/*'
- 'qa/**/*'
- 'rubocop/**/*'
@@ -91,6 +93,7 @@ Naming/FileName:
- JSON
- LDAP
- SAML
+ - SSO
- IO
- HMAC
- QA