diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /app/views/ci | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/views/ci')
-rw-r--r-- | app/views/ci/runner/_how_to_setup_runner.html.haml | 2 | ||||
-rw-r--r-- | app/views/ci/runner/_setup_runner_in_aws.html.haml | 16 |
2 files changed, 17 insertions, 1 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 03a3c9b0de8..cddea17efbf 100644 --- a/app/views/ci/runner/_how_to_setup_runner.html.haml +++ b/app/views/ci/runner/_how_to_setup_runner.html.haml @@ -14,7 +14,7 @@ %br = _("And this registration token:") %br - %code#registration_token= registration_token + %code#registration_token{ data: {testid: 'registration_token' } }= registration_token = clipboard_button(target: '#registration_token', title: _("Copy token"), class: "btn-transparent btn-clipboard") .gl-mt-3.gl-mb-3 diff --git a/app/views/ci/runner/_setup_runner_in_aws.html.haml b/app/views/ci/runner/_setup_runner_in_aws.html.haml new file mode 100644 index 00000000000..b0a5b40f2ad --- /dev/null +++ b/app/views/ci/runner/_setup_runner_in_aws.html.haml @@ -0,0 +1,16 @@ +%h5= _('Use GitLab Runner in AWS') + +%p + = _('Use an AWS CloudFormation Template (CFT) to install and configure GitLab Runner in AWS.') + +%ol + %li + = _('Copy this registration token.') + %br + %code#registration_token{ data: { testid: 'registration_token' } }= registration_token + = clipboard_button(target: '#registration_token', title: _('Copy token'), class: 'btn-transparent btn-clipboard') + %li + = _('Choose the preferred Runner and populate the AWS CFT.') + = link_to _('Learn more.'), 'https://gitlab.com/guided-explorations/aws/gitlab-runner-autoscaling-aws-asg', target: '_blank', rel: 'noopener noreferrer' + +#js-runner-aws-deployments |