diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-07-13 13:39:31 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-07-20 13:54:46 +0300 |
| commit | d0afab482f1157d0b41631cb4dbdfdfeadabb7c8 (patch) | |
| tree | 5ac1f6769b6ee311878d0c7d2960414c26ce7f54 /app/views/admin/dashboard | |
| parent | 8895863cf340a8a6c9a708dc864af77fe48beaaa (diff) | |
Disable SAML if OmniAuth is disabled
We also try to unify the way we setup OmniAuth, and how we check
if it's enabled or not.
Diffstat (limited to 'app/views/admin/dashboard')
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 18f2c1a509f..fac61f9d249 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -91,10 +91,10 @@ %span.light.float-right = boolean_to_icon gravatar_enabled? - omniauth = "OmniAuth" - %p{ "aria-label" => "#{omniauth}: status " + (Gitlab.config.omniauth.enabled ? "on" : "off") } + %p{ "aria-label" => "#{omniauth}: status " + (Gitlab::Auth.omniauth_enabled? ? "on" : "off") } = omniauth %span.light.float-right - = boolean_to_icon Gitlab.config.omniauth.enabled + = boolean_to_icon Gitlab::Auth.omniauth_enabled? - reply_email = "Reply by email" %p{ "aria-label" => "#{reply_email}: status " + (Gitlab::IncomingEmail.enabled? ? "on" : "off") } = reply_email |