diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-05-08 14:56:53 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-05-08 14:56:53 -0500 |
| commit | 2f003b58645b3cbc987c240f844b1ff6eb0c026a (patch) | |
| tree | 07c2087939b6c6dce33620c57a6989d76547e681 /lib/api/variables.rb | |
| parent | 204dca4436f5b2c82611a873d05186ec4ff4c17c (diff) | |
| parent | 2084301b4ec863d65638cc0c30c124cb5fe4b3d8 (diff) | |
| download | gitlab-ce-11-11-stable-prepare-rc2.tar.gz | |
Merge branch 'rs-pre-freeze' into 11-11-stable-prepare-rc211-11-stable-prepare-rc2
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' |