diff options
author | Rémy Coutable <remy@rymai.me> | 2017-03-13 13:12:27 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-03-13 13:12:27 +0300 |
commit | 31b6ca50c36c5e5e990633105ca5dcefb5e6f369 (patch) | |
tree | a3bb0a7bd13ef424e41f2ea0f149dce58cba1ca1 /app | |
parent | 23d7bd8b3e180139b31cd24b05ab594b5b94042d (diff) | |
parent | ac669df526a8cf42cd990b93f5a3f8f87e3eff9d (diff) |
Merge branch '24137-issuable-permalink' into 'master'
link issuable reference to itself in header
Closes #24137
See merge request !9641
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/issuables_helper.rb | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index c2b399041c6..aad83731b87 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -1,4 +1,6 @@ module IssuablesHelper + include GitlabRoutingHelper + def sidebar_gutter_toggle_icon sidebar_gutter_collapsed? ? icon('angle-double-left', { 'aria-hidden': 'true' }) : icon('angle-double-right', { 'aria-hidden': 'true' }) end @@ -95,8 +97,23 @@ module IssuablesHelper h(milestone_title.presence || default_label) end + def to_url_reference(issuable) + case issuable + when Issue + link_to issuable.to_reference, issue_url(issuable) + when MergeRequest + link_to issuable.to_reference, merge_request_url(issuable) + else + issuable.to_reference + end + end + def issuable_meta(issuable, project, text) - output = content_tag :strong, "#{text} #{issuable.to_reference}", class: "identifier" + output = content_tag(:strong, class: "identifier") do + concat("#{text} ") + concat(to_url_reference(issuable)) + end + output << " opened #{time_ago_with_tooltip(issuable.created_at)} by ".html_safe output << content_tag(:strong) do author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "hidden-xs", tooltip: true) |