Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e6776fea
Commit
e6776fea
authored
Apr 05, 2017
by
Eric Eastwood
Committed by
Sean McGivern
Apr 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show service_desk_reply_to email next username in issue
parent
ab5442af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+7
-0
app/models/project.rb
app/models/project.rb
+0
-2
No files found.
app/helpers/issuables_helper.rb
View file @
e6776fea
...
@@ -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
<<
" "
.
html_safe
output
<<
" "
.
html_safe
...
...
app/models/project.rb
View file @
e6776fea
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment