Commit 228ab0f3 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'issue_33115' into 'master'

Expose epic web_url as URL

See merge request gitlab-org/gitlab!18013
parents 78fefd0d 5bf7b3dc
...@@ -294,7 +294,7 @@ module EE ...@@ -294,7 +294,7 @@ module EE
expose :due_date_is_fixed?, as: :due_date_is_fixed, if: can_admin_epic 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 :due_date_fixed, :due_date_from_milestones, if: can_admin_epic
expose :state expose :state
expose :web_url, as: :web_edit_url, if: can_admin_epic # @deprecated expose :web_edit_url, if: can_admin_epic # @deprecated
expose :web_url expose :web_url
expose :reference, if: { with_reference: true } do |epic| expose :reference, if: { with_reference: true } do |epic|
epic.to_reference(full: true) epic.to_reference(full: true)
...@@ -324,6 +324,10 @@ module EE ...@@ -324,6 +324,10 @@ module EE
end end
def web_url def web_url
::Gitlab::Routing.url_helpers.group_epic_url(object.group, object)
end
def web_edit_url
::Gitlab::Routing.url_helpers.group_epic_path(object.group, object) ::Gitlab::Routing.url_helpers.group_epic_path(object.group, object)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment