Skip to content
Snippets Groups Projects
Verified Commit 8dbfc6b0 authored by Pedro Pombeiro's avatar Pedro Pombeiro Committed by GitLab
Browse files

Merge branch 'docs-lyspin-fix-broken-from-ruby-files' into 'master'

Fixes broken links to docs from Ruby files

See merge request !171037



Merged-by: default avatarPedro Pombeiro <noreply@pedro.pombei.ro>
Approved-by: default avatarMarcel Amirault <mamirault@gitlab.com>
Approved-by: default avatarPedro Pombeiro <noreply@pedro.pombei.ro>
Reviewed-by: default avatarPedro Pombeiro <noreply@pedro.pombei.ro>
Co-authored-by: default avatarLysanne Pinto <lpinto@gitlab.com>
parents 7f1f56f6 4b2286be
No related branches found
No related tags found
1 merge request!171037Fixes broken links to docs from Ruby files
Pipeline #1519583505 passed
......@@ -6,7 +6,6 @@ Gitlab/DocumentationLinks/Link:
- '**/*.haml'
- 'app/controllers/jira_connect/app_descriptor_controller.rb'
- 'app/controllers/jwt_controller.rb'
- 'app/helpers/ci/jobs_helper.rb'
- 'app/helpers/ide_helper.rb'
- 'app/helpers/projects_helper.rb'
- 'app/helpers/releases_helper.rb'
......@@ -23,7 +22,6 @@ Gitlab/DocumentationLinks/Link:
- 'ee/app/helpers/projects/security/api_fuzzing_configuration_helper.rb'
- 'ee/app/helpers/vulnerabilities_helper.rb'
- 'ee/app/models/integrations/github.rb'
- 'ee/app/presenters/ee/merge_request_presenter.rb'
- 'ee/lib/api/managed_licenses.rb'
- 'ee/lib/ee/gitlab/namespace_storage_size_error_message.rb'
- 'ee/lib/gitlab/checks/secrets_check.rb'
......
......@@ -12,7 +12,7 @@ def jobs_data(project, build)
"artifact_help_url" => help_page_path('user/gitlab_com/index.md', anchor: 'gitlab-cicd'),
"deployment_help_url" => help_page_path('user/project/clusters/deploy_to_cluster.md', anchor: 'troubleshooting'),
"runner_settings_url" => project_runners_path(build.project, anchor: 'js-runners-settings'),
"retry_outdated_job_docs_url" => help_page_path('ci/pipelines/settings.md', anchor: 'retry-outdated-jobs'),
"retry_outdated_job_docs_url" => help_page_path('ci/pipelines/settings.md', anchor: 'prevent-outdated-deployment-jobs'),
"pipeline_test_report_url" => test_report_project_pipeline_path(project, build.pipeline),
"log_viewer_path" => viewer_project_job_path(project, build),
"job_gid" => build.to_gid.to_s
......
......@@ -28,7 +28,7 @@ def api_status_checks_path
end
def merge_immediately_docs_path
help_page_path('ci/pipelines/merge_trains.md', anchor: 'immediately-merge-a-merge-request-with-a-merge-train')
help_page_path('ci/pipelines/merge_trains.md', anchor: 'skip-the-merge-train-and-merge-immediately')
end
delegator_override :target_project
......
......@@ -27,7 +27,7 @@
"artifact_help_url" => "/help/user/gitlab_com/index.md#gitlab-cicd",
"deployment_help_url" => "/help/user/project/clusters/deploy_to_cluster.md#troubleshooting",
"runner_settings_url" => "/#{project.full_path}/-/runners#js-runners-settings",
"retry_outdated_job_docs_url" => "/help/ci/pipelines/settings.md#retry-outdated-jobs",
"retry_outdated_job_docs_url" => "/help/ci/pipelines/settings.md#prevent-outdated-deployment-jobs",
"pipeline_test_report_url" => "/#{project.full_path}/-/pipelines/#{job.pipeline.id}/test_report",
"log_viewer_path" => "/#{project.full_path}/-/jobs/#{job.id}/viewer",
"job_gid" => "gid://gitlab/Ci::Build/#{job.id}"
......
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