Commit 95e37ef7 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'docs-links-from-ui-ee-2' into 'master'

Update UI links in EE features 2

See merge request gitlab-org/gitlab!36177
parents c0ddad26 3cdf9f5c
...@@ -37,7 +37,7 @@ module EE ...@@ -37,7 +37,7 @@ module EE
end end
if message if message
link = link_to "About burndown charts", help_page_path('user/project/milestones/index', anchor: 'burndown-charts'), class: 'burndown-docs-link' link = link_to "About burndown charts", help_page_path('user/project/milestones/burndown_charts.md'), class: 'burndown-docs-link'
content_tag(:div, (message + link).html_safe, id: "data-warning", class: "settings-message prepend-top-20") content_tag(:div, (message + link).html_safe, id: "data-warning", class: "settings-message prepend-top-20")
end end
......
...@@ -117,7 +117,7 @@ module EE ...@@ -117,7 +117,7 @@ module EE
end end
def add_migrate_to_hashed_storage_link(message) def add_migrate_to_hashed_storage_link(message)
migrate_link = link_to(_('For more info, read the documentation.'), help_page_path('administration/repository_storage_types.md', anchor: 'how-to-migrate-to-hashed-storage'), target: '_blank') migrate_link = link_to(_('For more info, read the documentation.'), help_page_path('administration/raketasks/storage.md', anchor: 'migrate-to-hashed-storage'), target: '_blank')
linked_message = message % { migrate_link: migrate_link } linked_message = message % { migrate_link: migrate_link }
linked_message.html_safe linked_message.html_safe
end end
......
...@@ -8,7 +8,7 @@ module EE ...@@ -8,7 +8,7 @@ module EE
'clusters-path': clusterable.index_path, 'clusters-path': clusterable.index_path,
'metrics-endpoint': clusterable.metrics_cluster_path(cluster, format: :json), 'metrics-endpoint': clusterable.metrics_cluster_path(cluster, format: :json),
'dashboard-endpoint': clusterable.metrics_dashboard_path(cluster), 'dashboard-endpoint': clusterable.metrics_dashboard_path(cluster),
'documentation-path': help_page_path('user/project/clusters/index', anchor: 'monitoring-your-kubernetes-cluster-ultimate'), 'documentation-path': help_page_path('user/project/clusters/index', anchor: 'monitoring-your-kubernetes-cluster'),
'empty-getting-started-svg-path': image_path('illustrations/monitoring/getting_started.svg'), 'empty-getting-started-svg-path': image_path('illustrations/monitoring/getting_started.svg'),
'empty-loading-svg-path': image_path('illustrations/monitoring/loading.svg'), 'empty-loading-svg-path': image_path('illustrations/monitoring/loading.svg'),
'empty-no-data-svg-path': image_path('illustrations/monitoring/no_data.svg'), 'empty-no-data-svg-path': image_path('illustrations/monitoring/no_data.svg'),
......
...@@ -41,7 +41,7 @@ module EE ...@@ -41,7 +41,7 @@ module EE
end end
def merge_train_when_pipeline_succeeds_docs_path def merge_train_when_pipeline_succeeds_docs_path
help_page_path('ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md', anchor: 'startadd-to-merge-train-when-pipeline-succeeds') help_page_path('ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md', anchor: 'add-a-merge-request-to-a-merge-train')
end end
def merge_immediately_docs_path def merge_immediately_docs_path
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%li %li
= _("During this process, you’ll be asked for URLs from GitLab’s side. Use the URLs shown below.") = _("During this process, you’ll be asked for URLs from GitLab’s side. Use the URLs shown below.")
%li %li
= (_("Set up assertions/attributes/claims (email, first_name, last_name) and NameID according to %{docsLinkStart}the documentation %{icon}%{docsLinkEnd}") % { icon: icon('external-link'), docsLinkStart: "<a href='#{help_page_path('user/group/saml_sso/index', anchor: 'assertions')}' target='_blank'>", docsLinkEnd: '</a>' }).html_safe = (_("Set up assertions/attributes/claims (email, first_name, last_name) and NameID according to %{docsLinkStart}the documentation %{icon}%{docsLinkEnd}") % { icon: icon('external-link'), docsLinkStart: "<a href='#{help_page_path('user/group/saml_sso/group_managed_accounts', anchor: 'assertions')}' target='_blank'>", docsLinkEnd: '</a>' }).html_safe
%li %li
= (_("Fill in the fields below, turn on <strong>%{enable_label}</strong>, and press <strong>%{save_changes}</strong>") % { enable_label: _('Enable SAML authentication for this group'), save_changes: _('Save changes') }).html_safe = (_("Fill in the fields below, turn on <strong>%{enable_label}</strong>, and press <strong>%{save_changes}</strong>") % { enable_label: _('Enable SAML authentication for this group'), save_changes: _('Save changes') }).html_safe
%li %li
......
- return if ci_cd_only - return if ci_cd_only
- docs_link = help_page_path('/workflow/repository_mirroring.md', anchor: 'ssh-authentication') - docs_link = help_page_path('user/project/repository/repository_mirroring', anchor: 'ssh-authentication')
- link_start = "<a href='#{docs_link}' rel='noopener noreferrer' target='_blank'>".html_safe - link_start = "<a href='#{docs_link}' rel='noopener noreferrer' target='_blank'>".html_safe
%li %li
......
---
title: Update more UI links in EE features
merge_request: 36177
author:
type: other
...@@ -21,7 +21,7 @@ RSpec.describe Clusters::ClusterPresenter do ...@@ -21,7 +21,7 @@ RSpec.describe Clusters::ClusterPresenter do
'clusters-path': clusterable_presenter.index_path, 'clusters-path': clusterable_presenter.index_path,
'metrics-endpoint': clusterable_presenter.metrics_cluster_path(cluster, format: :json), 'metrics-endpoint': clusterable_presenter.metrics_cluster_path(cluster, format: :json),
'dashboard-endpoint': clusterable_presenter.metrics_dashboard_path(cluster), 'dashboard-endpoint': clusterable_presenter.metrics_dashboard_path(cluster),
'documentation-path': help_page_path('user/project/clusters/index', anchor: 'monitoring-your-kubernetes-cluster-ultimate'), 'documentation-path': help_page_path('user/project/clusters/index', anchor: 'monitoring-your-kubernetes-cluster'),
'empty-getting-started-svg-path': match_asset_path('/assets/illustrations/monitoring/getting_started.svg'), 'empty-getting-started-svg-path': match_asset_path('/assets/illustrations/monitoring/getting_started.svg'),
'empty-loading-svg-path': match_asset_path('/assets/illustrations/monitoring/loading.svg'), 'empty-loading-svg-path': match_asset_path('/assets/illustrations/monitoring/loading.svg'),
'empty-no-data-svg-path': match_asset_path('/assets/illustrations/monitoring/no_data.svg'), 'empty-no-data-svg-path': match_asset_path('/assets/illustrations/monitoring/no_data.svg'),
......
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