summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMario de la Ossa <mariodelaossa@gmail.com>2018-06-12 16:40:16 -0600
committerMario de la Ossa <mariodelaossa@gmail.com>2018-06-12 17:22:12 -0600
commit379a6a709a55f952133354febddf97854c2d5d4d (patch)
tree7ff8d93b96395d80dd7bf58473bac7aafd54d250 /lib
parent7530e4ec86a686dede8eb8535fd231c1a75d3659 (diff)
downloadgitlab-ce-379a6a709a55f952133354febddf97854c2d5d4d.tar.gz
Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regression
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb4
-rw-r--r--lib/gitlab/url_builder.rb2
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 22afcb9edf2..3c9c87ac1c4 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -412,6 +412,10 @@ module API
expose :state, :created_at, :updated_at
expose :due_date
expose :start_date
+
+ expose :web_url do |milestone, _options|
+ Gitlab::UrlBuilder.build(milestone)
+ end
end
class IssueBasic < ProjectEntity
diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb
index 824e2d7251f..e64033b0dba 100644
--- a/lib/gitlab/url_builder.rb
+++ b/lib/gitlab/url_builder.rb
@@ -26,6 +26,8 @@ module Gitlab
project_snippet_url(object.project, object)
when Snippet
snippet_url(object)
+ when Milestone
+ milestone_url(object)
else
raise NotImplementedError.new("No URL builder defined for #{object.class}")
end