diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-03 10:41:32 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-03 10:41:32 +0000 |
| commit | a7e24db6b33997cef44a6627844003ef0ba86aca (patch) | |
| tree | 959e88e81c216a9aaf3b1cd64c347fa2b2993cf7 /lib/api/variables.rb | |
| parent | 739c0ca11a62a966094feabe892e170b10a65d3c (diff) | |
| parent | 84bce2d954f6b633dab6ee56fd3c04338dd55c9a (diff) | |
| download | gitlab-ce-46806-env-table.tar.gz | |
Merge branch '46806-typed-ci-variables' into '46806-env-table'46806-env-table
# Conflicts:
# app/views/ci/variables/_variable_row.html.haml
Diffstat (limited to 'lib/api/variables.rb')
| -rw-r--r-- | lib/api/variables.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/variables.rb b/lib/api/variables.rb index 3489ba827e4..a1bb21b3a06 100644 --- a/lib/api/variables.rb +++ b/lib/api/variables.rb @@ -55,6 +55,7 @@ module API requires :key, type: String, desc: 'The key of the variable' requires :value, type: String, desc: 'The value of the variable' optional :protected, type: String, desc: 'Whether the variable is protected' + optional :variable_type, type: String, values: Ci::Variable.variable_types.keys, desc: 'The type of variable, must be one of env_var or file. Defaults to env_var' if Gitlab.ee? optional :environment_scope, type: String, desc: 'The environment_scope of the variable' @@ -80,6 +81,7 @@ module API optional :key, type: String, desc: 'The key of the variable' optional :value, type: String, desc: 'The value of the variable' optional :protected, type: String, desc: 'Whether the variable is protected' + optional :variable_type, type: String, values: Ci::Variable.variable_types.keys, desc: 'The type of variable, must be one of env_var or file' if Gitlab.ee? optional :environment_scope, type: String, desc: 'The environment_scope of the variable' |