summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-04-20 11:58:31 +0200
committerPawel Chojnacki <pawel@chojnacki.ws>2017-04-20 11:58:31 +0200
commit446994610546bcb43d6ace34c1c28357de306b19 (patch)
tree483b50071292a5a87ce1fa0044cf8893de0132f8
parent27cc95ab499c08b634990b4c9266bb5ac6b64734 (diff)
downloadgitlab-ce-446994610546bcb43d6ace34c1c28357de306b19.tar.gz
Reduce the amount of data deployment endpoint returns
-rw-r--r--app/serializers/deployment_entity.rb11
-rw-r--r--app/serializers/deployment_entity_detailed.rb28
-rw-r--r--app/serializers/environment_entity.rb2
-rw-r--r--spec/serializers/deployment_entity_spec.rb2
4 files changed, 30 insertions, 13 deletions
diff --git a/app/serializers/deployment_entity.rb b/app/serializers/deployment_entity.rb
index d9ade5d87e2..a8d6d80faad 100644
--- a/app/serializers/deployment_entity.rb
+++ b/app/serializers/deployment_entity.rb
@@ -9,20 +9,9 @@ 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
new file mode 100644
index 00000000000..a0de0f9666b
--- /dev/null
+++ b/app/serializers/deployment_entity_detailed.rb
@@ -0,0 +1,28 @@
+class DeploymentEntityDetailed < Grape::Entity
+ include RequestAwareEntity
+
+ expose :id
+ expose :iid
+ expose :sha
+
+ expose :ref do
+ 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/environment_entity.rb b/app/serializers/environment_entity.rb
index 4ff15a78115..2152a1dd499 100644
--- a/app/serializers/environment_entity.rb
+++ b/app/serializers/environment_entity.rb
@@ -6,7 +6,7 @@ class EnvironmentEntity < Grape::Entity
expose :state
expose :external_url
expose :environment_type
- expose :last_deployment, using: DeploymentEntity
+ expose :last_deployment, using: DeploymentEntityDetailed
expose :stop_action?
expose :metrics_path, if: -> (environment, _) { environment.has_metrics? } do |environment|
diff --git a/spec/serializers/deployment_entity_spec.rb b/spec/serializers/deployment_entity_spec.rb
index 73bd60b62e5..815837c13b0 100644
--- a/spec/serializers/deployment_entity_spec.rb
+++ b/spec/serializers/deployment_entity_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe DeploymentEntity do
+describe DeploymentEntityDetailed do
let(:user) { create(:user) }
let(:request) { double('request') }