Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 3 deletions

diff --git a/app/serializers/issue_board_entity.rb b/app/serializers/issue_board_entity.rb
index 4b9c48f3f7c..bcad28d6aad 100644
--- a/app/serializers/issue_board_entity.rb
+++ b/app/serializers/issue_board_entity.rb
@@ -37,7 +37,7 @@ class IssueBoardEntity < Grape::Entity
   end
 
   expose :real_path, if: -> (issue) { issue.project } do |issue|
-    project_issue_path(issue.project, issue)
+    Gitlab::UrlBuilder.build(issue, only_path: true)
   end
 
   expose :issue_sidebar_endpoint, if: -> (issue) { issue.project } do |issue|
diff --git a/app/serializers/issue_entity.rb b/app/serializers/issue_entity.rb
index fbcfcf84d9b..852a2e62b7d 100644
--- a/app/serializers/issue_entity.rb
+++ b/app/serializers/issue_entity.rb
@@ -31,7 +31,7 @@ class IssueEntity < IssuableEntity
   end
 
   expose :web_url do |issue|
-    project_issue_path(issue.project, issue)
+    Gitlab::UrlBuilder.build(issue, only_path: true)
   end
 
   expose :current_user do
diff --git a/app/serializers/linked_issue_entity.rb b/app/serializers/linked_issue_entity.rb
index 6ae3f4044db..769e3ed7310 100644
--- a/app/serializers/linked_issue_entity.rb
+++ b/app/serializers/linked_issue_entity.rb
@@ -18,7 +18,7 @@ class LinkedIssueEntity < Grape::Entity
   end
 
   expose :path do |link|
-    project_issue_path(link.project, link.iid)
+    Gitlab::UrlBuilder.build(link, only_path: true)
   end
 
   expose :relation_path