diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-04 00:09:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-04 00:09:31 +0300 |
| commit | e173695d9b82004006cb5096d3fd8bb6c77069f5 (patch) | |
| tree | 427d76ae2e6e43bbd99cbca5166e8809dbb17038 /app/helpers | |
| parent | 782f2505315c3c66e524f3365827fce341527eb1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/ide_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/jobs_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/operations_helper.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/ide_helper.rb b/app/helpers/ide_helper.rb index d6145493ba6..2fd720de6b4 100644 --- a/app/helpers/ide_helper.rb +++ b/app/helpers/ide_helper.rb @@ -9,7 +9,7 @@ module IdeHelper "pipelines-empty-state-svg-path": image_path('illustrations/pipelines_empty.svg'), "promotion-svg-path": image_path('illustrations/web-ide_promotion.svg'), "ci-help-page-path" => help_page_path('ci/quick_start/README'), - "web-ide-help-page-path" => help_page_path('user/project/web_ide/index.html'), + "web-ide-help-page-path" => help_page_path('user/project/web_ide/index.md'), "clientside-preview-enabled": Gitlab::CurrentSettings.web_ide_clientside_preview_enabled?.to_s, "render-whitespace-in-code": current_user.render_whitespace_in_code.to_s, "codesandbox-bundler-url": Gitlab::CurrentSettings.web_ide_clientside_preview_bundler_url diff --git a/app/helpers/jobs_helper.rb b/app/helpers/jobs_helper.rb index 46edba261dd..780d945b353 100644 --- a/app/helpers/jobs_helper.rb +++ b/app/helpers/jobs_helper.rb @@ -5,8 +5,8 @@ module JobsHelper { "endpoint" => project_job_path(@project, @build, format: :json), "project_path" => @project.full_path, - "deployment_help_url" => help_page_path('user/project/clusters/index.html', anchor: 'troubleshooting-failed-deployment-jobs'), - "runner_help_url" => help_page_path('ci/runners/README.html', anchor: 'setting-maximum-job-timeout-for-a-runner'), + "deployment_help_url" => help_page_path('user/project/clusters/index.md', anchor: 'troubleshooting-failed-deployment-jobs'), + "runner_help_url" => help_page_path('ci/runners/README.md', anchor: 'setting-maximum-job-timeout-for-a-runner'), "runner_settings_url" => project_runners_path(@build.project, anchor: 'js-runners-settings'), "variables_settings_url" => project_variables_path(@build.project, anchor: 'js-cicd-variables-settings'), "page_path" => project_job_path(@project, @build), diff --git a/app/helpers/operations_helper.rb b/app/helpers/operations_helper.rb index faaa5f9d952..7500f7b1ff4 100644 --- a/app/helpers/operations_helper.rb +++ b/app/helpers/operations_helper.rb @@ -27,7 +27,7 @@ module OperationsHelper 'authorization_key' => alerts_service.token, 'prometheus_url' => notify_project_prometheus_alerts_url(@project, format: :json), 'url' => alerts_service.url, - 'alerts_setup_url' => help_page_path('user/project/integrations/generic_alerts.html', anchor: 'setting-up-generic-alerts'), + 'alerts_setup_url' => help_page_path('user/project/integrations/generic_alerts.md', anchor: 'setting-up-generic-alerts'), 'alerts_usage_url' => project_alert_management_index_path(@project) } end |