diff options
Diffstat (limited to 'app/views/ci')
-rw-r--r-- | app/views/ci/group_variables/_content.html.haml | 1 | ||||
-rw-r--r-- | app/views/ci/group_variables/_header.html.haml | 5 | ||||
-rw-r--r-- | app/views/ci/group_variables/_index.html.haml | 13 | ||||
-rw-r--r-- | app/views/ci/group_variables/_variable_header.html.haml | 5 | ||||
-rw-r--r-- | app/views/ci/variables/_index.html.haml | 5 |
5 files changed, 29 insertions, 0 deletions
diff --git a/app/views/ci/group_variables/_content.html.haml b/app/views/ci/group_variables/_content.html.haml new file mode 100644 index 00000000000..db5f1021f57 --- /dev/null +++ b/app/views/ci/group_variables/_content.html.haml @@ -0,0 +1 @@ += _("These variables are configured in the parent group settings, and will be active in the current project in addition to the project variables.") diff --git a/app/views/ci/group_variables/_header.html.haml b/app/views/ci/group_variables/_header.html.haml new file mode 100644 index 00000000000..71d123ec9f2 --- /dev/null +++ b/app/views/ci/group_variables/_header.html.haml @@ -0,0 +1,5 @@ +%h5 + = _('Group variables (inherited)') + +%p + = render "ci/group_variables/content" diff --git a/app/views/ci/group_variables/_index.html.haml b/app/views/ci/group_variables/_index.html.haml new file mode 100644 index 00000000000..c350ba5caf7 --- /dev/null +++ b/app/views/ci/group_variables/_index.html.haml @@ -0,0 +1,13 @@ +- variables = @project.group.self_and_ancestors.map(&:variables).flatten + +.row + .col-lg-12 + .group-variable-list + = render 'ci/group_variables/variable_header' + - variables.each do |variable| + .group-variable-row.d-flex.w-100.border-bottom.pt-2.pb-2 + .table-section.section-40.append-right-10.key + = variable.key + .table-section.section-40.append-right-10 + %a.group-origin-link{ href: group_settings_ci_cd_path(variable.group) } + = variable.group.name diff --git a/app/views/ci/group_variables/_variable_header.html.haml b/app/views/ci/group_variables/_variable_header.html.haml new file mode 100644 index 00000000000..1a3168cf781 --- /dev/null +++ b/app/views/ci/group_variables/_variable_header.html.haml @@ -0,0 +1,5 @@ +.group-variable-keys.d-flex.w-100.align-items-center.pb-2.border-bottom + .bold.table-section.section-40.append-right-10 + = s_('Key') + .bold.table-section.section-40.append-right-10 + = s_('Origin') diff --git a/app/views/ci/variables/_index.html.haml b/app/views/ci/variables/_index.html.haml index 94102b4dcd0..7ae5c48b93c 100644 --- a/app/views/ci/variables/_index.html.haml +++ b/app/views/ci/variables/_index.html.haml @@ -24,3 +24,8 @@ = n_('Hide value', 'Hide values', @variables.size) - else = n_('Reveal value', 'Reveal values', @variables.size) + - if !@group && @project.group + .settings-header.border-top.prepend-top-20 + = render 'ci/group_variables/header' + .settings-content.pr-0 + = render 'ci/group_variables/index' |