diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/views/ci | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/views/ci')
-rw-r--r-- | app/views/ci/runner/_how_to_setup_runner.html.haml | 3 | ||||
-rw-r--r-- | app/views/ci/runner/_how_to_setup_runner_automatically.html.haml | 21 | ||||
-rw-r--r-- | app/views/ci/variables/_index.html.haml | 1 |
3 files changed, 2 insertions, 23 deletions
diff --git a/app/views/ci/runner/_how_to_setup_runner.html.haml b/app/views/ci/runner/_how_to_setup_runner.html.haml index cddea17efbf..24048a8b328 100644 --- a/app/views/ci/runner/_how_to_setup_runner.html.haml +++ b/app/views/ci/runner/_how_to_setup_runner.html.haml @@ -1,7 +1,6 @@ - link = link_to _("Install GitLab Runner and ensure it's running."), 'https://docs.gitlab.com/runner/install/', target: '_blank' .gl-mb-3 - %h5= _("Set up a %{type} runner manually") % { type: type } - + %h5= _("Set up a %{type} Runner for a project") % { type: type } %ol %li = link.html_safe diff --git a/app/views/ci/runner/_how_to_setup_runner_automatically.html.haml b/app/views/ci/runner/_how_to_setup_runner_automatically.html.haml deleted file mode 100644 index 7140c0f4e7c..00000000000 --- a/app/views/ci/runner/_how_to_setup_runner_automatically.html.haml +++ /dev/null @@ -1,21 +0,0 @@ -%h5= _('Set up a %{type} runner automatically') % { type: type } - -%p - - link_to_help_page = link_to(_('Learn more.'), - help_page_path('user/project/clusters/index'), - target: '_blank', - rel: 'noopener noreferrer') - - = _('Register a runner on a Kubernetes cluster. %{link_to_help_page}').html_safe % { link_to_help_page: link_to_help_page } - -%ol - %li - = _('Click the button below.') - %li - = _('Select an existing Kubernetes cluster or create a new one.') - %li - = _('From the Kubernetes cluster details view, applications list, install GitLab Runner.') - -= link_to _('Install GitLab Runner on Kubernetes'), - clusters_path, - class: 'gl-button btn btn-info' diff --git a/app/views/ci/variables/_index.html.haml b/app/views/ci/variables/_index.html.haml index 9db5ee23c3e..cdfc174ebf1 100644 --- a/app/views/ci/variables/_index.html.haml +++ b/app/views/ci/variables/_index.html.haml @@ -16,6 +16,7 @@ aws_tip_deploy_link: help_page_path('ci/cloud_deployment/index.md', anchor: 'deploy-your-application-to-the-aws-elastic-container-service-ecs'), aws_tip_commands_link: help_page_path('ci/cloud_deployment/index.md', anchor: 'run-aws-commands-from-gitlab-cicd'), aws_tip_learn_link: help_page_path('ci/cloud_deployment/index.md', anchor: 'aws'), + contains_variable_reference_link: help_page_path('ci/variables/index', anchor: 'use-variables-or-in-other-variables'), protected_environment_variables_link: help_page_path('ci/variables/index', anchor: 'protect-a-cicd-variable'), masked_environment_variables_link: help_page_path('ci/variables/index', anchor: 'mask-a-cicd-variable'), } } |