diff options
author | Stan Hu <stanhu@gmail.com> | 2018-10-26 15:59:49 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-10-26 15:59:49 +0000 |
commit | 1815aa561ac1428cd183a8dc5c662299f9fd19e2 (patch) | |
tree | 4f09dedcff41772da1709feb6323e8d4195b1979 /.rubocop.yml | |
parent | b77ef97b347627a4063500c03b5eac12478d0c4a (diff) | |
parent | 83d64ed40c95c912c5d4c0f6e7d3d23bf7489053 (diff) | |
download | gitlab-ce-1815aa561ac1428cd183a8dc5c662299f9fd19e2.tar.gz |
Merge branch 'qa-59-ldap-ssl-scenario' into 'master'
E2E Test - LDAP login with SSL
Closes gitlab-qa#59
See merge request gitlab-org/gitlab-ce!22574
Diffstat (limited to '.rubocop.yml')
-rw-r--r-- | .rubocop.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 5d2c5c7cf49..a95ded8af1c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -81,6 +81,9 @@ Naming/FileName: - '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 |