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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
8352e2bc
Commit
8352e2bc
authored
Feb 13, 2019
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dashboard_project ambiguity
parent
63589d9a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
ee/app/serializers/dashboard_operations_project_entity.rb
ee/app/serializers/dashboard_operations_project_entity.rb
+7
-7
No files found.
ee/app/serializers/dashboard_operations_project_entity.rb
View file @
8352e2bc
...
...
@@ -5,8 +5,8 @@ class DashboardOperationsProjectEntity < Grape::Entity
expose
:project
,
merge:
true
,
using:
API
::
Entities
::
BasicProjectDetails
expose
:remove_path
do
|
dashboard_project
|
remove_operations_project_path
(
project_id:
dashboard_project
.
project
.
id
)
expose
:remove_path
do
|
dashboard_project
_object
|
remove_operations_project_path
(
project_id:
dashboard_project
_object
.
project
.
id
)
end
expose
:last_pipeline
,
if:
->
(
*
)
{
last_pipeline
}
do
|
_
,
options
|
...
...
@@ -21,15 +21,15 @@ class DashboardOperationsProjectEntity < Grape::Entity
pipeline_entity_for
(
downstream_pipelines
,
options
)
end
expose
:last_deployment
,
if:
->
(
*
)
{
last_deployment?
}
do
|
dashboard_project
,
options
|
DeploymentEntity
.
represent
(
dashboard_project
.
last_deployment
,
expose
:last_deployment
,
if:
->
(
*
)
{
last_deployment?
}
do
|
dashboard_project
_object
,
options
|
DeploymentEntity
.
represent
(
dashboard_project
_object
.
last_deployment
,
options
.
merge
(
request:
new_request
))
end
expose
:alert_count
expose
:alert_path
,
if:
->
(
*
)
{
last_deployment?
}
do
|
dashboard_project
|
project
=
dashboard_project
.
project
environment
=
dashboard_project
.
last_deployment
.
environment
expose
:alert_path
,
if:
->
(
*
)
{
last_deployment?
}
do
|
dashboard_project
_object
|
project
=
dashboard_project
_object
.
project
environment
=
dashboard_project
_object
.
last_deployment
.
environment
metrics_project_environment_path
(
project
,
environment
)
end
...
...
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