summaryrefslogtreecommitdiff
path: root/app/serializers
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2019-04-03 17:55:56 +0000
committerClement Ho <clemmakesapps@gmail.com>2019-04-03 17:55:56 +0000
commit3de4399406eab3a34d9c07c31a99bc5e32de310e (patch)
treed003954100bb7702fe80a80d586b81f93b0ff352 /app/serializers
parentee72dc1b34d893662fe0cb7793a1a960312b1f48 (diff)
parent02c99ec8ce0449f330f0fd9ca277ea4cdc82be23 (diff)
downloadgitlab-ce-3de4399406eab3a34d9c07c31a99bc5e32de310e.tar.gz
Merge branch '13784-validate-variables-for-masking' into 'master'
Simple masking frontend - CE See merge request gitlab-org/gitlab-ce!26751
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/group_variable_entity.rb1
-rw-r--r--app/serializers/variable_entity.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/app/serializers/group_variable_entity.rb b/app/serializers/group_variable_entity.rb
index 0edab4a3092..19c5fa26f34 100644
--- a/app/serializers/group_variable_entity.rb
+++ b/app/serializers/group_variable_entity.rb
@@ -6,4 +6,5 @@ class GroupVariableEntity < Grape::Entity
expose :value
expose :protected?, as: :protected
+ expose :masked?, as: :masked
end
diff --git a/app/serializers/variable_entity.rb b/app/serializers/variable_entity.rb
index 85cf367fe51..4d48e13cfca 100644
--- a/app/serializers/variable_entity.rb
+++ b/app/serializers/variable_entity.rb
@@ -6,4 +6,5 @@ class VariableEntity < Grape::Entity
expose :value
expose :protected?, as: :protected
+ expose :masked?, as: :masked
end