diff options
| author | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-09-13 12:00:59 +0200 |
|---|---|---|
| committer | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-09-13 12:00:59 +0200 |
| commit | 87d01cc3bfc12c08024881dc8f13101e5430e3e6 (patch) | |
| tree | 05e82defa51500257f97e3530862da03668895e3 /qa/qa/git/repository.rb | |
| parent | fef5c923c009c64183cc43909444a1bdaba218b7 (diff) | |
| parent | 71f3d48544cc0857c8d470b182f7e809de6a4642 (diff) | |
| download | gitlab-ce-consolidate-page-widths-part02.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into consolidate-page-widths-part02consolidate-page-widths-part02
Diffstat (limited to 'qa/qa/git/repository.rb')
| -rw-r--r-- | qa/qa/git/repository.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qa/qa/git/repository.rb b/qa/qa/git/repository.rb index bdbb18b5045..faecacd45ec 100644 --- a/qa/qa/git/repository.rb +++ b/qa/qa/git/repository.rb @@ -28,8 +28,13 @@ module QA end def use_default_credentials - self.username = Runtime::User.username - self.password = Runtime::User.password + if ::QA::Runtime::User.ldap_user? + self.username = Runtime::User.ldap_username + self.password = Runtime::User.ldap_password + else + self.username = Runtime::User.username + self.password = Runtime::User.password + end end def clone(opts = '') |