diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/views/ci | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/views/ci')
-rw-r--r-- | app/views/ci/group_variables/_index.html.haml | 2 | ||||
-rw-r--r-- | app/views/ci/status/_badge.html.haml | 2 | ||||
-rw-r--r-- | app/views/ci/variables/_content.html.haml | 2 | ||||
-rw-r--r-- | app/views/ci/variables/_index.html.haml | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/app/views/ci/group_variables/_index.html.haml b/app/views/ci/group_variables/_index.html.haml index eb49a9a0261..c8c970f3c2f 100644 --- a/app/views/ci/group_variables/_index.html.haml +++ b/app/views/ci/group_variables/_index.html.haml @@ -1,4 +1,4 @@ -- variables = @project.group.self_and_ancestors.map(&:variables).flatten +- variables = @project.group.self_and_ancestors.flat_map(&:variables) .ci-variable-table %table.gl-table.gl-w-full.gl-table-layout-fixed diff --git a/app/views/ci/status/_badge.html.haml b/app/views/ci/status/_badge.html.haml index 5114387984b..e3b409dea76 100644 --- a/app/views/ci/status/_badge.html.haml +++ b/app/views/ci/status/_badge.html.haml @@ -1,7 +1,7 @@ - status = local_assigns.fetch(:status) - link = local_assigns.fetch(:link, true) - title = local_assigns.fetch(:title, nil) -- css_classes = "ci-status ci-#{status.group} #{'has-tooltip' if title.present?}" +- css_classes = "gl-display-inline-flex gl-align-items-center gl-gap-2 gl-line-height-0 gl-px-3 gl-py-2 gl-rounded-base ci-status ci-#{status.group} #{'has-tooltip' if title.present?}" - if link && status.has_details? = link_to status.details_path, class: css_classes, title: title, data: { html: title.present? } do diff --git a/app/views/ci/variables/_content.html.haml b/app/views/ci/variables/_content.html.haml index 37043a207ff..65e57d68288 100644 --- a/app/views/ci/variables/_content.html.haml +++ b/app/views/ci/variables/_content.html.haml @@ -2,7 +2,7 @@ = link_to _('Learn more.'), help_page_path('ci/variables/index'), target: '_blank', rel: 'noopener noreferrer' %p = _('Variables can have several attributes.') - = link_to _('Learn more.'), help_page_path('ci/variables/index', anchor: 'add-a-cicd-variable-to-an-instance'), target: '_blank', rel: 'noopener noreferrer' + = link_to _('Learn more.'), help_page_path('ci/variables/index', anchor: 'define-a-cicd-variable-in-the-ui'), target: '_blank', rel: 'noopener noreferrer' %ul %li = html_escape(_('%{code_open}Protected:%{code_close} Only exposed to protected branches or protected tags.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } diff --git a/app/views/ci/variables/_index.html.haml b/app/views/ci/variables/_index.html.haml index fdbf5132d40..af98025d257 100644 --- a/app/views/ci/variables/_index.html.haml +++ b/app/views/ci/variables/_index.html.haml @@ -4,7 +4,7 @@ = render Pajamas::AlertComponent.new(variant: :warning, show_icon: false, dismissible: false, alert_options: { class: 'gl-mb-3'}) do |c| = c.body do - - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/index', anchor: 'protected-cicd-variables') } + - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/index', anchor: 'protect-a-cicd-variable') } = _('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 } - is_group = !@group.nil? @@ -23,10 +23,10 @@ aws_tip_deploy_link: help_page_path('ci/cloud_deployment/index.md', anchor: 'deploy-your-application-to-ecs'), aws_tip_commands_link: help_page_path('ci/cloud_deployment/index.md', anchor: 'use-an-image-to-run-aws-commands'), aws_tip_learn_link: help_page_path('ci/cloud_deployment/index.md'), - contains_variable_reference_link: help_page_path('ci/variables/index', anchor: 'expand-cicd-variables'), - protected_environment_variables_link: help_page_path('ci/variables/index', anchor: 'protected-cicd-variables'), + contains_variable_reference_link: help_page_path('ci/variables/index', anchor: 'prevent-cicd-variable-expansion'), + 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'), - environment_scope_link: help_page_path('ci/environments/index', anchor: 'scope-environments-with-specs') } } + environment_scope_link: help_page_path('ci/environments/index', anchor: 'limit-the-environment-scope-of-a-cicd-variable') } } - if !@group && @project.group .settings-header.border-top.gl-mt-6 |