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
50590a05
Commit
50590a05
authored
Sep 27, 2019
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turn web_url into a method
parent
90ee3199
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
12 deletions
+8
-12
changelogs/unreleased/issue_11241.yml
changelogs/unreleased/issue_11241.yml
+2
-2
ee/lib/ee/api/entities.rb
ee/lib/ee/api/entities.rb
+6
-10
No files found.
changelogs/unreleased/issue_11241.yml
View file @
50590a05
---
title
:
Expose web_url for epics on API
merge_request
:
merge_request
:
17380
author
:
type
:
chang
ed
type
:
add
ed
ee/lib/ee/api/entities.rb
View file @
50590a05
...
...
@@ -241,8 +241,6 @@ module EE
class
Epic
<
Grape
::
Entity
can_admin_epic
=
->
(
epic
,
opts
)
{
Ability
.
allowed?
(
opts
[
:user
],
:admin_epic
,
epic
)
}
epic_url
=
->
(
epic
)
{
::
Gitlab
::
Routing
.
url_helpers
.
group_epic_path
(
epic
.
group
,
epic
)
}
expose
:id
expose
:iid
expose
:group_id
...
...
@@ -258,14 +256,8 @@ module EE
expose
:due_date_is_fixed?
,
as: :due_date_is_fixed
,
if:
can_admin_epic
expose
:due_date_fixed
,
:due_date_from_milestones
,
if:
can_admin_epic
expose
:state
expose
:web_edit_url
,
if:
can_admin_epic
do
|
epic
|
epic_url
.
call
(
epic
)
end
# web_edit_url is already exposed and has the same value of web_url
# this field has been added again with other name to be consistent with other API responses
expose
:web_url
do
|
epic
|
epic_url
.
call
(
epic
)
end
expose
:web_url
,
as: :web_edit_url
,
if:
can_admin_epic
# @deprecated
expose
:web_url
expose
:reference
,
if:
{
with_reference:
true
}
do
|
epic
|
epic
.
to_reference
(
full:
true
)
end
...
...
@@ -291,6 +283,10 @@ module EE
epic
.
downvotes
end
end
def
web_url
::
Gitlab
::
Routing
.
url_helpers
.
group_epic_path
(
object
.
group
,
object
)
end
end
class
EpicIssue
<
::
API
::
Entities
::
Issue
...
...
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