diff options
| author | Hordur Freyr Yngvason <hfyngvason@gitlab.com> | 2019-08-08 21:51:52 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-08-08 21:51:52 +0300 |
| commit | 5f82ff1469510b4e51d531775a44e4bea92254fe (patch) | |
| tree | 2762023eb50a91cabb54f8b454db49c147f447d4 /app/views | |
| parent | 455d16d1bfd59000391a64f41ab86d5a847f008a (diff) | |
Bring scoped environment variables to core
As decided in https://gitlab.com/gitlab-org/gitlab-ce/issues/53593
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/ci/variables/_environment_scope.html.haml | 21 | ||||
| -rw-r--r-- | app/views/ci/variables/_environment_scope_header.html.haml | 2 |
2 files changed, 23 insertions, 0 deletions
diff --git a/app/views/ci/variables/_environment_scope.html.haml b/app/views/ci/variables/_environment_scope.html.haml new file mode 100644 index 00000000000..15e61d85881 --- /dev/null +++ b/app/views/ci/variables/_environment_scope.html.haml @@ -0,0 +1,21 @@ +- form_field = local_assigns.fetch(:form_field, nil) +- variable = local_assigns.fetch(:variable, nil) + +- if @project + - environment_scope = variable&.environment_scope || '*' + - environment_scope_label = environment_scope == '*' ? s_('CiVariable|All environments') : environment_scope + + %input{ type: "hidden", name: "#{form_field}[variables_attributes][][environment_scope]", value: environment_scope } + = dropdown_tag(environment_scope_label, + options: { wrapper_class: 'ci-variable-body-item js-variable-environment-dropdown-wrapper', + toggle_class: 'js-variable-environment-toggle wide', + filter: true, + dropdown_class: "dropdown-menu-selectable", + placeholder: s_('CiVariable|Search environments'), + footer_content: true, + data: { selected: environment_scope } }) do + %ul.dropdown-footer-list + %li + %button{ class: "dropdown-create-new-item-button js-dropdown-create-new-item", title: s_('CiVariable|New environment') } + = s_('CiVariable|Create wildcard') + %code diff --git a/app/views/ci/variables/_environment_scope_header.html.haml b/app/views/ci/variables/_environment_scope_header.html.haml new file mode 100644 index 00000000000..4ba4ceec16c --- /dev/null +++ b/app/views/ci/variables/_environment_scope_header.html.haml @@ -0,0 +1,2 @@ +.bold.table-section.section-15.append-right-10 + = s_('CiVariables|Scope') |