Commit 5631a464 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch '35368-add-doc-links-to-all-features-2' into 'master'

Add doc links to admin dashboard features

Closes #35368

See merge request gitlab-org/gitlab!21419
parents 740dd848 0657e14a
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
enabled: allow_signup?) enabled: allow_signup?)
= feature_entry(_('LDAP'), = feature_entry(_('LDAP'),
enabled: Gitlab.config.ldap.enabled) enabled: Gitlab.config.ldap.enabled,
doc_href: help_page_path('administration/auth/ldap'))
= feature_entry(_('Gravatar'), = feature_entry(_('Gravatar'),
href: admin_application_settings_path(anchor: 'js-account-settings'), href: admin_application_settings_path(anchor: 'js-account-settings'),
...@@ -54,10 +55,12 @@ ...@@ -54,10 +55,12 @@
= feature_entry(_('OmniAuth'), = feature_entry(_('OmniAuth'),
href: admin_application_settings_path(anchor: 'js-signin-settings'), 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'), = 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' = render_if_exists 'admin/dashboard/elastic_and_geo'
......
---
title: Add doc links to features on admin dashboard
merge_request: 21419
author:
type: changed
= feature_entry(_('Elasticsearch'), href: admin_application_settings_path(anchor: 'js-elasticsearch-settings'), enabled: Gitlab::CurrentSettings.elasticsearch_search?) = feature_entry(_('Elasticsearch'),
= feature_entry(_('Geo'), href: admin_geo_nodes_path, enabled: Gitlab::Geo.enabled?) href: admin_application_settings_path(anchor: 'js-elasticsearch-settings'),
doc_href: help_page_path('integration/elasticsearch'),
enabled: Gitlab::CurrentSettings.elasticsearch_search?)
= feature_entry(_('Geo'),
href: admin_geo_nodes_path,
doc_href: help_page_path('administration/geo/replication/index'),
enabled: Gitlab::Geo.enabled?)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment