summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-10 18:08:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-10 18:08:04 +0000
commit115c8ea7af7ef69ca3f09c333314546e9b5712f9 (patch)
treec3b6798c11e502f7d2785649f95d2255beac3c91 /app/views/admin
parent27d91a629918e417a9e87825e838209b9ace79c1 (diff)
downloadgitlab-ce-115c8ea7af7ef69ca3f09c333314546e9b5712f9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/dashboard/index.html.haml9
1 files changed, 6 insertions, 3 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index e5a3c0df9bf..6b138445675 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -46,7 +46,8 @@
enabled: allow_signup?)
= feature_entry(_('LDAP'),
- enabled: Gitlab.config.ldap.enabled)
+ enabled: Gitlab.config.ldap.enabled,
+ doc_href: help_page_path('administration/auth/ldap'))
= feature_entry(_('Gravatar'),
href: admin_application_settings_path(anchor: 'js-account-settings'),
@@ -54,10 +55,12 @@
= feature_entry(_('OmniAuth'),
href: admin_application_settings_path(anchor: 'js-signin-settings'),
- enabled: Gitlab::Auth.omniauth_enabled?)
+ enabled: Gitlab::Auth.omniauth_enabled?,
+ doc_href: help_page_path('integration/omniauth'))
= feature_entry(_('Reply by email'),
- enabled: Gitlab::IncomingEmail.enabled?)
+ enabled: Gitlab::IncomingEmail.enabled?,
+ doc_href: help_page_path('administration/reply_by_email'))
= render_if_exists 'admin/dashboard/elastic_and_geo'