diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-24 22:34:36 +0200 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-24 22:34:36 +0200 |
commit | 33f7c40f3f7d2b342dcaa839b7cd56599a573c65 (patch) | |
tree | 96bcf4f5018b5f5c91b082767129fe503c8a7ac3 /app/serializers | |
parent | e057ad975c6ced8c9565fc8329db16b1ababcef8 (diff) | |
download | gitlab-ce-33f7c40f3f7d2b342dcaa839b7cd56599a573c65.tar.gz |
use represent_concise instead of separate entity
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/deployment_entity.rb | 12 | ||||
-rw-r--r-- | app/serializers/deployment_entity_detailed.rb | 15 | ||||
-rw-r--r-- | app/serializers/deployment_serializer.rb | 5 |
3 files changed, 17 insertions, 15 deletions
diff --git a/app/serializers/deployment_entity.rb b/app/serializers/deployment_entity.rb index a8d6d80faad..8b3de1bed0f 100644 --- a/app/serializers/deployment_entity.rb +++ b/app/serializers/deployment_entity.rb @@ -9,9 +9,21 @@ class DeploymentEntity < Grape::Entity expose :name do |deployment| deployment.ref end + + expose :ref_path do |deployment| + namespace_project_tree_path( + deployment.project.namespace, + deployment.project, + id: deployment.ref) + end end expose :created_at expose :tag expose :last? + + expose :user, using: UserEntity + expose :commit, using: CommitEntity + expose :deployable, using: BuildEntity + expose :manual_actions, using: BuildEntity end diff --git a/app/serializers/deployment_entity_detailed.rb b/app/serializers/deployment_entity_detailed.rb deleted file mode 100644 index 63df61dd51b..00000000000 --- a/app/serializers/deployment_entity_detailed.rb +++ /dev/null @@ -1,15 +0,0 @@ -class DeploymentEntityDetailed < DeploymentEntity - expose :ref do - expose :ref_path do |deployment| - namespace_project_tree_path( - deployment.project.namespace, - deployment.project, - id: deployment.ref) - end - end - - expose :user, using: UserEntity - expose :commit, using: CommitEntity - expose :deployable, using: BuildEntity - expose :manual_actions, using: BuildEntity -end diff --git a/app/serializers/deployment_serializer.rb b/app/serializers/deployment_serializer.rb index 4b4bf6cd526..cba5c3f311f 100644 --- a/app/serializers/deployment_serializer.rb +++ b/app/serializers/deployment_serializer.rb @@ -1,3 +1,8 @@ class DeploymentSerializer < BaseSerializer entity DeploymentEntity + + def represent_concise(resource, opts = {}) + opts[:only] = [:iid, :id, :sha, :created_at, :tag, :last?, :id, ref: [:name]] + represent(resource, opts) + end end |