summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-04-23 08:53:01 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-04-23 08:53:01 +0000
commit383642e10056101dc29d1242c2158b9d911386a9 (patch)
treeb2bdd6a9876c34b9662065bd02f63d51f161eab1
parent30940ccd242dcd05d7205f75af2c16e8dc4ae769 (diff)
parent080e8de584a4b04d193dae4f97766b4e04680e34 (diff)
downloadgitlab-ce-383642e10056101dc29d1242c2158b9d911386a9.tar.gz
Merge branch 'tc-move-geo-cursor-bin-ce' into 'master'
Exclude ee/bin from Naming/FileName cop See merge request gitlab-org/gitlab-ce!27488
-rw-r--r--.rubocop.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index aa49f41ebf4..e5fe527e611 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -75,6 +75,7 @@ Naming/FileName:
- 'qa/spec/**/*'
- 'qa/qa/specs/**/*'
- 'qa/bin/*'
+ - 'ee/bin/*'
- 'config/**/*'
- 'ee/config/**/*'
- 'lib/generators/**/*'