Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
7dd6485a
Commit
7dd6485a
authored
Nov 03, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add manual actions for deployment serialization
parent
52d333b9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/serializers/deployment_entity.rb
app/serializers/deployment_entity.rb
+1
-1
spec/serializers/environment_serializer_spec.rb
spec/serializers/environment_serializer_spec.rb
+5
-0
No files found.
app/serializers/deployment_entity.rb
View file @
7dd6485a
...
@@ -23,5 +23,5 @@ class DeploymentEntity < Grape::Entity
...
@@ -23,5 +23,5 @@ class DeploymentEntity < Grape::Entity
expose
:user
,
using:
API
::
Entities
::
UserBasic
expose
:user
,
using:
API
::
Entities
::
UserBasic
expose
:commit
,
using:
CommitEntity
expose
:commit
,
using:
CommitEntity
expose
:deployable
,
using:
BuildEntity
expose
:deployable
,
using:
BuildEntity
expose
:manual_actions
expose
:manual_actions
,
using:
BuildEntity
end
end
spec/serializers/environment_serializer_spec.rb
View file @
7dd6485a
...
@@ -10,6 +10,11 @@ describe EnvironmentSerializer do
...
@@ -10,6 +10,11 @@ describe EnvironmentSerializer do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
context
'when there is a single object provided'
do
context
'when there is a single object provided'
do
before
do
create
(
:ci_build
,
:manual
,
name:
'manual1'
,
pipeline:
deployable
.
pipeline
)
end
let
(
:deployment
)
do
let
(
:deployment
)
do
create
(
:deployment
,
deployable:
deployable
,
create
(
:deployment
,
deployable:
deployable
,
user:
user
)
user:
user
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment