diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:39 +0300 |
| commit | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (patch) | |
| tree | 70945aa6721a271fc8057efa13c3216a03fbac45 /app/views/admin | |
| parent | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/application_settings/_signin.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml index 0e45301b598..007cd343339 100644 --- a/app/views/admin/application_settings/_signin.html.haml +++ b/app/views/admin/application_settings/_signin.html.haml @@ -16,7 +16,7 @@ Password authentication enabled for Git over HTTP(S) .form-text.text-muted When disabled, a Personal Access Token - - if Gitlab::Auth::LDAP::Config.enabled? + - if Gitlab::Auth::Ldap::Config.enabled? or LDAP password must be used to authenticate. - if omniauth_enabled? && button_based_providers.any? |