summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-04-07 13:34:39 +0200
committerJarka Kadlecova <jarka@gitlab.com>2017-04-07 17:08:14 +0200
commit703df2881bb137a79284baafe2cc12ff32ab9ff5 (patch)
tree3344312f2b52edb6ac00e50a06eb3a8e155bb3eb
parente0dc73527a478188cfa28b456b64798639aa73c9 (diff)
downloadgitlab-ce-29667-deploy-keys.tar.gz
expose additional values in deploy key entity29667-deploy-keys
-rw-r--r--app/serializers/deploy_key_entity.rb2
-rw-r--r--spec/serializers/deploy_key_entity_spec.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/app/serializers/deploy_key_entity.rb b/app/serializers/deploy_key_entity.rb
index cdedc2c7bd0..d75a83d0fa5 100644
--- a/app/serializers/deploy_key_entity.rb
+++ b/app/serializers/deploy_key_entity.rb
@@ -4,6 +4,8 @@ class DeployKeyEntity < Grape::Entity
expose :title
expose :fingerprint
expose :can_push
+ expose :destroyed_when_orphaned?, as: :destroyed_when_orphaned
+ expose :almost_orphaned?, as: :almost_orphaned
expose :created_at
expose :updated_at
expose :projects, using: ProjectEntity do |deploy_key|
diff --git a/spec/serializers/deploy_key_entity_spec.rb b/spec/serializers/deploy_key_entity_spec.rb
index da1d33b42ac..cc3fb193f1b 100644
--- a/spec/serializers/deploy_key_entity_spec.rb
+++ b/spec/serializers/deploy_key_entity_spec.rb
@@ -17,6 +17,8 @@ describe DeployKeyEntity do
title: deploy_key.title,
fingerprint: deploy_key.fingerprint,
can_push: deploy_key.can_push,
+ destroyed_when_orphaned: true,
+ almost_orphaned: false,
created_at: deploy_key.created_at,
updated_at: deploy_key.updated_at,
projects: [