diff options
| -rw-r--r-- | app/helpers/ci_variables_helper.rb | 15 | ||||
| -rw-r--r-- | app/views/ci/variables/_variable_row.html.haml | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/app/helpers/ci_variables_helper.rb b/app/helpers/ci_variables_helper.rb new file mode 100644 index 00000000000..e3728804c2a --- /dev/null +++ b/app/helpers/ci_variables_helper.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +module CiVariablesHelper + def ci_variable_protected_by_default? + Gitlab::CurrentSettings.current_application_settings.protected_ci_variables + end + + def ci_variable_protected?(variable, only_key_value) + if variable && !only_key_value + variable.protected + else + ci_variable_protected_by_default? + end + end +end diff --git a/app/views/ci/variables/_variable_row.html.haml b/app/views/ci/variables/_variable_row.html.haml index 151a329228e..16a7527c8ce 100644 --- a/app/views/ci/variables/_variable_row.html.haml +++ b/app/views/ci/variables/_variable_row.html.haml @@ -5,8 +5,8 @@ - id = variable&.id - key = variable&.key - value = variable&.value -- is_protected_default = Gitlab::CurrentSettings.current_application_settings.protected_ci_variables -- is_protected = variable && !only_key_value ? variable.protected : is_protected_default +- is_protected_default = ci_variable_protected_by_default? +- is_protected = ci_variable_protected?(variable, only_key_value) - id_input_name = "#{form_field}[variables_attributes][][id]" - destroy_input_name = "#{form_field}[variables_attributes][][_destroy]" |