summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2019-05-27 08:53:47 +0000
committerJan Provaznik <jprovaznik@gitlab.com>2019-05-27 08:53:47 +0000
commit6cc11ff9936f2d019c4960fb096b26833179bf34 (patch)
tree9273e8aee801b404776b2460ae82a80dbb63f455 /lib
parent348d779beab593e0e852f5a4d285ea58db75a048 (diff)
parent9c5fa659a54139461c5ee3bc3af2c0ea9bf12ace (diff)
downloadgitlab-ce-6cc11ff9936f2d019c4960fb096b26833179bf34.tar.gz
Merge branch 'variables-boolean-type' into 'master'
Masked should be Boolean type See merge request gitlab-org/gitlab-ce!28758
Diffstat (limited to 'lib')
-rw-r--r--lib/api/variables.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index b07dd1bab79..38ff1b3d9cf 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -55,7 +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 :masked, type: String, desc: 'Whether the variable is masked'
+ optional :masked, type: Boolean, desc: 'Whether the variable is masked'
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?
@@ -82,7 +82,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 :masked, type: String, desc: 'Whether the variable is masked'
+ optional :masked, type: Boolean, desc: 'Whether the variable is masked'
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?