Commit e6776fea authored by Eric Eastwood's avatar Eric Eastwood Committed by Sean McGivern

Show service_desk_reply_to email next username in issue

parent ab5442af
...@@ -122,6 +122,13 @@ module IssuablesHelper ...@@ -122,6 +122,13 @@ module IssuablesHelper
author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "hidden-xs", tooltip: true) author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "hidden-xs", tooltip: true)
author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "hidden-sm hidden-md hidden-lg") author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "hidden-sm hidden-md hidden-lg")
end end
if issuable.respond_to?(:service_desk_reply_to) && !issuable.service_desk_reply_to.nil?
output << content_tag(:span) do
concat '('
concat link_to("#{issuable.service_desk_reply_to}", "mailto:#{issuable.service_desk_reply_to}", class: 'hidden-xs')
concat ')'
end
end
if issuable.tasks? if issuable.tasks?
output << "&ensp;".html_safe output << "&ensp;".html_safe
......
...@@ -71,8 +71,6 @@ class Project < ActiveRecord::Base ...@@ -71,8 +71,6 @@ class Project < ActiveRecord::Base
attr_accessor :new_default_branch attr_accessor :new_default_branch
attr_accessor :old_path_with_namespace attr_accessor :old_path_with_namespace
# TODO: remove
attr_accessor :service_desk_enabled
alias_attribute :title, :name alias_attribute :title, :name
......
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