diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-06-07 20:13:17 +0000 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-06-07 20:13:17 +0000 |
| commit | 99df0218f82b851b017bd0eea1b8351dc89df6ed (patch) | |
| tree | b01f884fbd1418dd5465fc1741f1620061ae8c5c /lib/api/group_variables.rb | |
| parent | 3eea6906747d10bea501426febaf15d2c209e06a (diff) | |
| parent | e07b2b277f79bc25cdce22ca2defba1ba80791aa (diff) | |
| download | gitlab-ce-99df0218f82b851b017bd0eea1b8351dc89df6ed.tar.gz | |
Merge branch 'master' into 'docs/fix-example-dot-net'
# Conflicts:
# doc/user/project/clusters/serverless/index.md
Diffstat (limited to 'lib/api/group_variables.rb')
| -rw-r--r-- | lib/api/group_variables.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/group_variables.rb b/lib/api/group_variables.rb index 3f048e0dc56..47fcbabb4d4 100644 --- a/lib/api/group_variables.rb +++ b/lib/api/group_variables.rb @@ -47,6 +47,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::GroupVariable.variable_types.keys, desc: 'The type of variable, must be one of env_var or file. Defaults to env_var' end post ':id/variables' do variable_params = declared_params(include_missing: false) @@ -67,6 +68,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::GroupVariable.variable_types.keys, desc: 'The type of variable, must be one of env_var or file' end # rubocop: disable CodeReuse/ActiveRecord put ':id/variables/:key' do |