Merge branch '198661-variable_type-to-serializer' into 'master'

Add variable_type attribute to Variable serializer

See merge request gitlab-org/gitlab!23843

app/serializers/variable_entity.rb

@@ -4,6 +4,7 @@ class VariableEntity < Grape::Entity
   expose :id
   expose :key
   expose :value
+  expose :variable_type
 
   expose :protected?, as: :protected
   expose :masked?, as: :masked

spec/fixtures/api/schemas/variable.json

@@ -13,6 +13,7 @@
     "value": { "type": "string" },
     "masked": { "type": "boolean" },
     "protected": { "type": "boolean" },
+    "variable_type": { "type": "string" },
     "environment_scope": { "type": "string", "optional": true }
   },
   "additionalProperties": false

spec/serializers/variable_entity_spec.rb

@@ -10,7 +10,7 @@ describe VariableEntity do
     subject { entity.as_json }
 
     it 'contains required fields' do
-      expect(subject).to include(:id, :key, :value, :protected, :environment_scope)
+      expect(subject).to include(:id, :key, :value, :protected, :environment_scope, :variable_type)
     end
   end
 end