diff options
| author | Chris Baumbauer <cab@cabnetworks.net> | 2018-11-02 08:39:25 -0700 |
|---|---|---|
| committer | Chris Baumbauer <cab@cabnetworks.net> | 2018-11-02 08:39:25 -0700 |
| commit | dc078c241765cfea5f49409407b82db7296c132d (patch) | |
| tree | deeabb4b302f896b60ffe8e27163a4dddf625c4b /.rubocop.yml | |
| parent | 28a9bbceb7ab5ffe2305db02052d663b1e68ab8e (diff) | |
| parent | a80ee886e4b4a41ace5fb796bf920c4e395bf4dd (diff) | |
| download | gitlab-ce-dc078c241765cfea5f49409407b82db7296c132d.tar.gz | |
Merge branch 'master' into triggermesh-phase1-knative
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 0f4018326a1..a95ded8af1c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -76,10 +76,14 @@ Naming/FileName: - 'qa/qa/specs/**/*' - 'qa/bin/*' - 'config/**/*' + - 'ee/config/**/*' - 'lib/generators/**/*' - 'locale/unfound_translations.rb' - 'ee/locale/unfound_translations.rb' - 'ee/lib/generators/**/*' + - 'qa/qa/scenario/test/integration/ldap_no_tls.rb' + - 'qa/qa/scenario/test/integration/ldap_tls.rb' + IgnoreExecutableScripts: true AllowedAcronyms: - EE |