Skip to content
Snippets Groups Projects
Verified Commit 19c904d2 authored by Ashraf Khamis's avatar Ashraf Khamis Committed by GitLab
Browse files

Merge branch 'update-index-files-misc-user-2' into 'master'

Docs: Rename misc doc/user index files - 2 (user/project 1)

See merge request !180928



Merged-by: default avatarAshraf Khamis <akhamis@gitlab.com>
Approved-by: default avatarEvan Read <eread@gitlab.com>
Approved-by: default avatarAshraf Khamis <akhamis@gitlab.com>
Approved-by: default avatarFurkan Ayhan <furkanayhn@gmail.com>
Reviewed-by: default avatarAchilleas Pipinellis <axil@gitlab.com>
Co-authored-by: default avatarMarcel Amirault <mamirault@gitlab.com>
parents caa7fb7e c59db6f6
No related branches found
No related tags found
3 merge requests!181325Fix ambiguous `created_at` in project.rb,!180928Docs: Rename misc doc/user index files - 2 (user/project 1),!180727Resolve "Extend job archival mechanism to the whole pipeline"
Pipeline #1665179958 passed
Showing
with 20 additions and 20 deletions
......@@ -57,7 +57,7 @@ export default {
'Environments|A freeze period is in effect from %{startTime} to %{endTime}. Deployments might fail during this time. For more information, see the %{docsLinkStart}deploy freeze documentation%{docsLinkEnd}.',
),
},
deployFreezeDocsPath: helpPagePath('user/project/releases/index', {
deployFreezeDocsPath: helpPagePath('user/project/releases/_index', {
anchor: 'prevent-unintentional-releases-by-setting-a-deploy-freeze',
}),
};
......
......@@ -474,7 +474,7 @@ def project_permissions_panel_data(project)
membersPagePath: project_project_members_path(project),
environmentsHelpPath: help_page_path('ci/environments/_index.md'),
featureFlagsHelpPath: help_page_path('operations/feature_flags.md'),
releasesHelpPath: help_page_path('user/project/releases/index.md'),
releasesHelpPath: help_page_path('user/project/releases/_index.md'),
infrastructureHelpPath: help_page_path('user/infrastructure/_index.md')
}
end
......
......@@ -2,7 +2,7 @@
module ReleasesHelper
IMAGE_PATH = 'illustrations/rocket-launch-md.svg'
DOCUMENTATION_PATH = 'user/project/releases/index'
DOCUMENTATION_PATH = 'user/project/releases/_index'
# This needs to be kept in sync with the constant in
# app/assets/javascripts/releases/constants.js
......
......@@ -27,7 +27,7 @@ def sidebar_text
override :learn_more_link
def learn_more_link
ApplicationController.helpers.link_to(s_('ClusterIntegration|Learn more about Kubernetes.'), help_page_path('user/project/clusters/index.md'), target: '_blank', rel: 'noopener noreferrer')
ApplicationController.helpers.link_to(s_('ClusterIntegration|Learn more about Kubernetes.'), help_page_path('user/project/clusters/_index.md'), target: '_blank', rel: 'noopener noreferrer')
end
end
......
......@@ -31,7 +31,7 @@
= f.label :pages_extra_deployments_default_expiry_seconds, s_('AdminSettings|Default expiration time for parallel deployments (in seconds)'), class: 'label-bold'
= f.number_field :pages_extra_deployments_default_expiry_seconds, class: 'form-control gl-form-input'
.form-text.gl-text-subtle
- link = link_to('', help_page_path('user/project/pages/index.md', anchor: 'parallel-deployments'), target: '_blank', rel: 'noopener noreferrer')
- link = link_to('', help_page_path('user/project/pages/_index.md', anchor: 'parallel-deployments'), target: '_blank', rel: 'noopener noreferrer')
= safe_format(s_('AdminSettings|Set the default time after which parallel deployments expire (0 for unlimited). %{link_start}What are parallel deployments%{link_end}?'), tag_pair(link, :link_start, :link_end))
%h5
= s_("AdminSettings|Configure Let's Encrypt")
......
......@@ -8,6 +8,6 @@
Domain: #{link_to @domain.domain, project_pages_domain_url(@project, @domain)}
%p
If this domain has been disabled in error, please follow
= link_to 'these instructions', help_page_url('user/project/pages/custom_domains_ssl_tls_certification/index.md', anchor: '4-verify-the-domains-ownership')
= link_to 'these instructions', help_page_url('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: '4-verify-the-domains-ownership')
to verify and re-enable your domain.
= render 'removal_notification'
......@@ -7,7 +7,7 @@ Domain: #{@domain.domain} (#{project_pages_domain_url(@project, @domain)})
If this domain has been disabled in error, please follow these instructions
to verify and re-enable your domain:
= help_page_url('user/project/pages/custom_domains_ssl_tls_certification/index.md', anchor: 'steps')
= help_page_url('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: 'steps')
If you no longer wish to use this domain with GitLab Pages, please remove it
from your GitLab project and delete any related DNS records.
......@@ -7,5 +7,5 @@
Domain: #{link_to @domain.domain, project_pages_domain_url(@project, @domain)}
%p
Please visit
= link_to 'these instructions', help_page_url('user/project/pages/custom_domains_ssl_tls_certification/index.md', anchor: 'steps')
= link_to 'these instructions', help_page_url('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: 'steps')
for more information about custom domain verification.
......@@ -5,5 +5,5 @@ Project: #{@project.human_name} (#{project_url(@project)})
Domain: #{@domain.domain} (#{project_pages_domain_url(@project, @domain)})
Please visit
= help_page_url('user/project/pages/custom_domains_ssl_tls_certification/index.md', anchor: 'steps')
= help_page_url('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: 'steps')
for more information about custom domain verification.
......@@ -10,6 +10,6 @@
Until then, you can view your content at #{link_to @domain.url, @domain.url}
%p
Please visit
= link_to 'these instructions', help_page_url('user/project/pages/custom_domains_ssl_tls_certification/index.md', anchor: 'steps')
= link_to 'these instructions', help_page_url('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: 'steps')
for more information about custom domain verification.
= render 'removal_notification'
......@@ -7,7 +7,7 @@ Unless you take action, it will be disabled on *#{@domain.enabled_until.strftime
Until then, you can view your content at #{@domain.url}
Please visit
= help_page_url('user/project/pages/custom_domains_ssl_tls_certification/index.md', anchor: 'steps')
= help_page_url('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: 'steps')
for more information about custom domain verification.
If you no longer wish to use this domain with GitLab Pages, please remove it
......
......@@ -9,5 +9,5 @@
content at #{link_to @domain.url, @domain.url}
%p
Please visit
= link_to 'these instructions', help_page_url('user/project/pages/custom_domains_ssl_tls_certification/index.md', anchor: 'steps')
= link_to 'these instructions', help_page_url('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: 'steps')
for more information about custom domain verification.
......@@ -6,5 +6,5 @@ Domain: #{@domain.domain} (#{project_pages_domain_url(@project, @domain)})
No action is required on your part. You can view your content at #{@domain.url}
Please visit
= help_page_url('user/project/pages/custom_domains_ssl_tls_certification/index.md', anchor: 'steps')
= help_page_url('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: 'steps')
for more information about custom domain verification.
= render ::Layouts::PageHeadingComponent.new(s_('GitLabPages|Pages')) do |c|
- c.with_description do
- docs_link_start = "<a href='#{help_page_path('user/project/pages/index.md')}' target='_blank' rel='noopener noreferrer'>".html_safe
- docs_link_start = "<a href='#{help_page_path('user/project/pages/_index.md')}' target='_blank' rel='noopener noreferrer'>".html_safe
- docs_link_end = '</a>'.html_safe
= s_('GitLabPages|With GitLab Pages you can host your static website directly from your GitLab repository. %{docs_link_start}Learn more.%{link_end}').html_safe % { docs_link_start: docs_link_start, link_end: docs_link_end }
......@@ -7,7 +7,7 @@
s_('GitLabPages|Force HTTPS (requires valid certificates)'),
checkbox_options: { disabled: pages_https_only_disabled? },
label_options: { class: 'label-bold' }
- docs_link_start = "<a href='#{help_page_path('user/project/pages/custom_domains_ssl_tls_certification/index.md', anchor: 'force-https-for-gitlab-pages-websites')}' target='_blank' rel='noopener noreferrer'>".html_safe
- docs_link_start = "<a href='#{help_page_path('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: 'force-https-for-gitlab-pages-websites')}' target='_blank' rel='noopener noreferrer'>".html_safe
- link_end = '</a>'.html_safe
%p.gl-pl-6
= s_("GitLabPages|When enabled, all attempts to visit your website through HTTP are automatically redirected to HTTPS using a response with status code 301. Requires a valid certificate for all domains. %{docs_link_start}Learn more.%{link_end}").html_safe % { docs_link_start: docs_link_start, link_end: link_end }
......
......@@ -3,7 +3,7 @@
- c.with_header do
= s_('GitLabPages|Configure pages')
- c.with_body do
- docs_link_start = "<a href='#{help_page_path('user/project/pages/index.md')}' target='_blank' rel='noopener noreferrer' data-track-action='click_link' data-track-label='pages_docs_link'>".html_safe
- docs_link_start = "<a href='#{help_page_path('user/project/pages/_index.md')}' target='_blank' rel='noopener noreferrer' data-track-action='click_link' data-track-label='pages_docs_link'>".html_safe
- samples_link_start = "<a href='https://gitlab.com/pages' target='_blank' rel='noopener noreferrer' data-track-action='click_link' data-track-label='pages_samples_link'>".html_safe
- link_end = '</a>'.html_safe
= s_('GitLabPages|Your Pages site is not configured yet. See the %{docs_link_start}GitLab Pages documentation%{link_end} to learn how to upload your static site and have GitLab serve it. You can also take some inspiration from the %{samples_link_start}sample Pages projects%{link_end}.').html_safe % { docs_link_start: docs_link_start, samples_link_start: samples_link_start, link_end: link_end }
......@@ -28,5 +28,5 @@
.input-group-append
= clipboard_button(target: '#domain_verification', category: :primary, size: :medium)
%p.form-text.gl-text-subtle
- link_to_help = link_to(_('verify ownership'), help_page_path('user/project/pages/custom_domains_ssl_tls_certification/index.md', anchor: '4-verify-the-domains-ownership'))
- link_to_help = link_to(_('verify ownership'), help_page_path('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: '4-verify-the-domains-ownership'))
= _("To %{link_to_help} of your domain, add the above key to a TXT record within your DNS configuration within seven days.").html_safe % { link_to_help: link_to_help }
- docs_link_url = help_page_path("user/project/pages/custom_domains_ssl_tls_certification/index.md", anchor: "adding-an-ssltls-certificate-to-pages")
- docs_link_url = help_page_path("user/project/pages/custom_domains_ssl_tls_certification/_index.md", anchor: "adding-an-ssltls-certificate-to-pages")
- docs_link_start = "<a href=\"%{docs_link_url}\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"text-nowrap\">".html_safe % { docs_link_url: docs_link_url }
- docs_link_end = "</a>".html_safe
......
......@@ -3,7 +3,7 @@
- link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe
- link_end = '</a>'.html_safe
- kubernetes_cluster_path = help_page_path('user/project/clusters/index.md')
- kubernetes_cluster_path = help_page_path('user/project/clusters/_index.md')
- kubernetes_cluster_link_start = link_start % { url: kubernetes_cluster_path }
- base_domain_path = help_page_path('user/project/clusters/gitlab_managed_clusters.md', anchor: 'base-domain')
......
......@@ -83,7 +83,7 @@
id: 'js-deploy-freeze-settings',
expanded: expanded) do |c|
- c.with_description do
- freeze_period_docs = help_page_path('user/project/releases/index.md', anchor: 'prevent-unintentional-releases-by-setting-a-deploy-freeze')
- freeze_period_docs = help_page_path('user/project/releases/_index.md', anchor: 'prevent-unintentional-releases-by-setting-a-deploy-freeze')
- freeze_period_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: freeze_period_docs }
= html_escape(s_('DeployFreeze|Add a freeze period to prevent unintended releases during a period of time for a given environment. You must update the deployment jobs in %{filename} according to the deploy freezes added here. %{freeze_period_link_start}Learn more.%{freeze_period_link_end}')) % { freeze_period_link_start: freeze_period_link_start, freeze_period_link_end: '</a>'.html_safe, filename: tag.code('.gitlab-ci.yml') }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment