diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-05-25 19:31:21 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-05-25 19:31:21 +0800 |
| commit | efebdba21db9e11b876ecb54db48358e13b08ad3 (patch) | |
| tree | 44c63974c56c24af642c5b6b358dbb137b307595 /app/views/projects/variables | |
| parent | 9f6dc8b2b5fe3d4790d67f13660eb8bfabd4dbca (diff) | |
| download | gitlab-ce-efebdba21db9e11b876ecb54db48358e13b08ad3.tar.gz | |
Frontend implementation, tests, and changelog
Diffstat (limited to 'app/views/projects/variables')
| -rw-r--r-- | app/views/projects/variables/_form.html.haml | 9 | ||||
| -rw-r--r-- | app/views/projects/variables/_table.html.haml | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/app/views/projects/variables/_form.html.haml b/app/views/projects/variables/_form.html.haml index 1ae86d258af..809628bc491 100644 --- a/app/views/projects/variables/_form.html.haml +++ b/app/views/projects/variables/_form.html.haml @@ -7,4 +7,13 @@ .form-group = f.label :value, "Value", class: "label-light" = f.text_area :value, class: "form-control", placeholder: "PROJECT_VARIABLE" + .form-group + .checkbox + = f.label :protected do + = f.check_box :protected + %strong Protected + .help-block + This variable will be passed only to pipelines running on protected branches and tags + = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'protected-variables'), target: '_blank' + = f.submit btn_text, class: "btn btn-save" diff --git a/app/views/projects/variables/_table.html.haml b/app/views/projects/variables/_table.html.haml index 0ce597dcf21..59cd3c4b592 100644 --- a/app/views/projects/variables/_table.html.haml +++ b/app/views/projects/variables/_table.html.haml @@ -3,10 +3,12 @@ %colgroup %col %col + %col %col{ width: 100 } %thead %th Key %th Value + %th Protected %th %tbody - @project.variables.order_key_asc.each do |variable| @@ -14,6 +16,7 @@ %tr %td.variable-key= variable.key %td.variable-value{ "data-value" => variable.value }****** + %td.variable-protected= Gitlab::Utils.boolean_to_yes_no(variable.protected) %td.variable-menu = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-edit" do %span.sr-only |