Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 16 deletions

diff --git a/app/presenters/commit_presenter.rb b/app/presenters/commit_presenter.rb
index 94fc8ac8e39..9ded00fcb7a 100644
--- a/app/presenters/commit_presenter.rb
+++ b/app/presenters/commit_presenter.rb
@@ -18,7 +18,7 @@ class CommitPresenter < Gitlab::View::Presenter::Delegated
   end
 
   def web_url
-    Gitlab::UrlBuilder.new(commit).url
+    url_builder.build(commit)
   end
 
   def signature_html
diff --git a/app/presenters/issue_presenter.rb b/app/presenters/issue_presenter.rb
index 3d55b00ac3b..004813d0374 100644
--- a/app/presenters/issue_presenter.rb
+++ b/app/presenters/issue_presenter.rb
@@ -4,20 +4,14 @@ class IssuePresenter < Gitlab::View::Presenter::Delegated
   presents :issue
 
   def web_url
-    url_builder.url
+    url_builder.build(issue)
   end
 
   def issue_path
-    url_builder.issue_path(issue)
+    url_builder.build(issue, only_path: true)
   end
 
   def subscribed?
     issue.subscribed?(current_user, issue.project)
   end
-
-  private
-
-  def url_builder
-    @url_builder ||= Gitlab::UrlBuilder.new(issue)
-  end
 end
diff --git a/app/presenters/milestone_presenter.rb b/app/presenters/milestone_presenter.rb
index 7d9045ddebe..6bf8203702f 100644
--- a/app/presenters/milestone_presenter.rb
+++ b/app/presenters/milestone_presenter.rb
@@ -4,12 +4,6 @@ class MilestonePresenter < Gitlab::View::Presenter::Delegated
   presents :milestone
 
   def milestone_path
-    url_builder.milestone_path(milestone)
-  end
-
-  private
-
-  def url_builder
-    @url_builder ||= Gitlab::UrlBuilder.new(milestone)
+    url_builder.build(milestone, only_path: true)
   end
 end