diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-06 00:09:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-06 00:09:04 +0300 |
| commit | 96e23b2017cbe56969771960f6c274c5d3599397 (patch) | |
| tree | b8b17da1ab080dd41fc64fc0262de2cf16754559 /app/views/ci | |
| parent | 2f1a81fd16ff9968d6b986f8a407d963bc2218f9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/ci')
| -rw-r--r-- | app/views/ci/group_variables/_index.html.haml | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/app/views/ci/group_variables/_index.html.haml b/app/views/ci/group_variables/_index.html.haml index c8c970f3c2f..538bbc486f3 100644 --- a/app/views/ci/group_variables/_index.html.haml +++ b/app/views/ci/group_variables/_index.html.haml @@ -1,14 +1,21 @@ - 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 +- if Feature.enabled?(:ci_vueify_inherited_group_variables) + #js-inherited-group-ci-variables{ + data: { + project_path: @project.full_path, + } + } +- else + .inherited-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 |