diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-12 13:02:37 +0300 |
|---|---|---|
| committer | Ian Baum <ibaum@gitlab.com> | 2018-02-12 20:20:35 +0300 |
| commit | 769f732111a4479e540eeb61eff9f609fb683a2d (patch) | |
| tree | 5b41f7a5ab9e77317c05b6b8e128c5bac4685598 /app | |
| parent | 3d40deb1b01cd856b3e7ab7b00fa0f3a6af0de58 (diff) | |
Merge branch '42928-default-protected-variables-to-off' into 'master'
Default CI variables to unprotected
Closes #42928
See merge request gitlab-org/gitlab-ce!17039
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/ci_variable_list/ci_variable_list.js | 2 | ||||
| -rw-r--r-- | app/views/ci/variables/_variable_row.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/ci_variable_list/ci_variable_list.js b/app/assets/javascripts/ci_variable_list/ci_variable_list.js index d91789c2192..3467e88119b 100644 --- a/app/assets/javascripts/ci_variable_list/ci_variable_list.js +++ b/app/assets/javascripts/ci_variable_list/ci_variable_list.js @@ -39,7 +39,7 @@ export default class VariableList { }, protected: { selector: '.js-ci-variable-input-protected', - default: 'true', + default: 'false', }, environment_scope: { // We can't use a `.js-` class here because diff --git a/app/views/ci/variables/_variable_row.html.haml b/app/views/ci/variables/_variable_row.html.haml index 495a55660cb..15201780451 100644 --- a/app/views/ci/variables/_variable_row.html.haml +++ b/app/views/ci/variables/_variable_row.html.haml @@ -5,7 +5,7 @@ - id = variable&.id - key = variable&.key - value = variable&.value -- is_protected = variable && !only_key_value ? variable.protected : true +- is_protected = variable && !only_key_value ? variable.protected : false - id_input_name = "#{form_field}[variables_attributes][][id]" - destroy_input_name = "#{form_field}[variables_attributes][][_destroy]" |