diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-03 13:42:22 +0100 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-03 13:43:27 +0100 |
commit | 7dd6485a0fd7fc264f86f389da3ab846c62e8724 (patch) | |
tree | 1eea77c1b421655e3ec5d6d85f49eecbdb650214 | |
parent | 52d333b9f4793ca677b938317f4c8e480b835284 (diff) | |
download | gitlab-ce-7dd6485a0fd7fc264f86f389da3ab846c62e8724.tar.gz |
Add manual actions for deployment serialization
-rw-r--r-- | app/serializers/deployment_entity.rb | 2 | ||||
-rw-r--r-- | spec/serializers/environment_serializer_spec.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/serializers/deployment_entity.rb b/app/serializers/deployment_entity.rb index 3462b188337..d3ed6a5eef4 100644 --- a/app/serializers/deployment_entity.rb +++ b/app/serializers/deployment_entity.rb @@ -23,5 +23,5 @@ class DeploymentEntity < Grape::Entity expose :user, using: API::Entities::UserBasic expose :commit, using: CommitEntity expose :deployable, using: BuildEntity - expose :manual_actions + expose :manual_actions, using: BuildEntity end diff --git a/spec/serializers/environment_serializer_spec.rb b/spec/serializers/environment_serializer_spec.rb index f7de6c450ab..2c94a076aba 100644 --- a/spec/serializers/environment_serializer_spec.rb +++ b/spec/serializers/environment_serializer_spec.rb @@ -10,6 +10,11 @@ describe EnvironmentSerializer do let(:user) { create(:user) } context 'when there is a single object provided' do + before do + create(:ci_build, :manual, name: 'manual1', + pipeline: deployable.pipeline) + end + let(:deployment) do create(:deployment, deployable: deployable, user: user) |