diff options
Diffstat (limited to 'app/views/ci')
| -rw-r--r-- | app/views/ci/group_variables/_index.html.haml | 19 | ||||
| -rw-r--r-- | app/views/ci/variables/_content.html.haml | 10 | ||||
| -rw-r--r-- | app/views/ci/variables/_index.html.haml | 11 |
3 files changed, 16 insertions, 24 deletions
diff --git a/app/views/ci/group_variables/_index.html.haml b/app/views/ci/group_variables/_index.html.haml index c8c970f3c2f..86219d5f021 100644 --- a/app/views/ci/group_variables/_index.html.haml +++ b/app/views/ci/group_variables/_index.html.haml @@ -1,14 +1,5 @@ -- variables = @project.group.self_and_ancestors.flat_map(&:variables) - -.ci-variable-table - %table.gl-table.gl-w-full.gl-table-layout-fixed - = render 'ci/group_variables/variable_header' - - variables.each do |variable| - %tr - %td.gl-text-truncate - = variable.key - %td.gl-text-truncate - = variable.environment_scope - %td.gl-text-truncate - %a.group-origin-link{ href: group_settings_ci_cd_path(variable.group) } - = variable.group.name +#js-inherited-group-ci-variables{ + data: { + project_path: @project.full_path, + } +} diff --git a/app/views/ci/variables/_content.html.haml b/app/views/ci/variables/_content.html.haml index 65e57d68288..f7ab495111a 100644 --- a/app/views/ci/variables/_content.html.haml +++ b/app/views/ci/variables/_content.html.haml @@ -1,12 +1,2 @@ = format(s_('CiVariables|Variables store information, like passwords and secret keys, that you can use in job scripts. Each %{entity} can define a maximum of %{limit} variables.'), entity: entity, limit: variable_limit).html_safe = 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: '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 } - %li - = html_escape(_('%{code_open}Masked:%{code_close} Hidden in job logs. Must match masking requirements.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } - %li - = html_escape(_('%{code_open}Expanded:%{code_close} Variables with %{code_open}$%{code_close} will be treated as the start of a reference to another variable.')) % { 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 da2c8a71dcd..5eed4e92386 100644 --- a/app/views/ci/variables/_index.html.haml +++ b/app/views/ci/variables/_index.html.haml @@ -2,6 +2,17 @@ - is_group = !@group.nil? - is_project = !@project.nil? +%p + = _('Variables can have several attributes.') + = 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 } + %li + = html_escape(_('%{code_open}Masked:%{code_close} Hidden in job logs. Must match masking requirements.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } + %li + = html_escape(_('%{code_open}Expanded:%{code_close} Variables with %{code_open}$%{code_close} will be treated as the start of a reference to another variable.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } + #js-ci-variables{ data: { endpoint: save_endpoint, is_project: is_project.to_s, project_id: @project&.id || '', |