diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/views/ci | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/views/ci')
-rw-r--r-- | app/views/ci/runner/_how_to_setup_runner.html.haml | 4 | ||||
-rw-r--r-- | app/views/ci/runner/_how_to_setup_runner_automatically.html.haml | 2 | ||||
-rw-r--r-- | app/views/ci/variables/_index.html.haml | 48 |
3 files changed, 17 insertions, 37 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 6c2bd2a5d2f..0ff6fdc6354 100644 --- a/app/views/ci/runner/_how_to_setup_runner.html.haml +++ b/app/views/ci/runner/_how_to_setup_runner.html.haml @@ -15,7 +15,9 @@ = clipboard_button(target: '#registration_token', title: _("Copy token"), class: "btn-transparent btn-clipboard") .gl-mt-3.gl-mb-3 = button_to _("Reset runners registration token"), reset_token_url, - method: :put, class: 'btn btn-default', + method: :put, class: 'gl-button btn btn-default', data: { confirm: _("Are you sure you want to reset registration token?") } %li = _("Start the Runner!") + +#js-install-runner{ data: { project_path: project_path, group_path: group_path } } 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 index 42710039757..343abf6099e 100644 --- a/app/views/ci/runner/_how_to_setup_runner_automatically.html.haml +++ b/app/views/ci/runner/_how_to_setup_runner_automatically.html.haml @@ -19,4 +19,4 @@ = link_to _('Install Runner on Kubernetes'), clusters_path, - class: 'btn btn-info' + 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 b90e672cca9..660fd1a48a7 100644 --- a/app/views/ci/variables/_index.html.haml +++ b/app/views/ci/variables/_index.html.haml @@ -5,42 +5,20 @@ - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/README', anchor: 'protect-a-custom-variable') } = s_('Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } -- if Feature.enabled?(:new_variables_ui, @project || @group, default_enabled: true) - - is_group = !@group.nil? +- is_group = !@group.nil? - #js-ci-project-variables{ data: { endpoint: save_endpoint, - project_id: @project&.id || '', - group: is_group.to_s, - maskable_regex: ci_variable_maskable_regex, - protected_by_default: ci_variable_protected_by_default?.to_s, - aws_logo_svg_path: image_path('aws_logo.svg'), - 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'), - protected_environment_variables_link: help_page_path('ci/variables/README', anchor: 'protect-a-custom-variable'), - masked_environment_variables_link: help_page_path('ci/variables/README', anchor: 'mask-a-custom-variable'), - } } - -- else - .row - .col-lg-12.js-ci-variable-list-section{ data: { save_endpoint: save_endpoint, maskable_regex: ci_variable_maskable_regex } } - .hide.gl-alert.gl-alert-danger.js-ci-variable-error-box - - %ul.ci-variable-list - = render 'ci/variables/variable_header' - - @variables.each.each do |variable| - = render 'ci/variables/variable_row', form_field: 'variables', variable: variable - = render 'ci/variables/variable_row', form_field: 'variables' - .prepend-top-20 - %button.btn.btn-success.js-ci-variables-save-button{ type: 'button' } - %span.hide.js-ci-variables-save-loading-icon - .spinner.spinner-light.mr-1 - = _('Save variables') - %button.btn.btn-info.btn-inverted.gl-ml-3.js-secret-value-reveal-button{ type: 'button', data: { secret_reveal_status: "#{@variables.size == 0}" } } - - if @variables.size == 0 - = n_('Hide value', 'Hide values', @variables.size) - - else - = n_('Reveal value', 'Reveal values', @variables.size) +#js-ci-project-variables{ data: { endpoint: save_endpoint, + project_id: @project&.id || '', + group: is_group.to_s, + maskable_regex: ci_variable_maskable_regex, + protected_by_default: ci_variable_protected_by_default?.to_s, + aws_logo_svg_path: image_path('aws_logo.svg'), + 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'), + protected_environment_variables_link: help_page_path('ci/variables/README', anchor: 'protect-a-custom-variable'), + masked_environment_variables_link: help_page_path('ci/variables/README', anchor: 'mask-a-custom-variable'), +} } - if !@group && @project.group .settings-header.border-top.prepend-top-20 |