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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
d913febf
Commit
d913febf
authored
8 years ago
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide correct author info in header of issuable.
parent
2feb9eb1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+6
-2
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+4
-2
No files found.
app/helpers/projects_helper.rb
View file @
d913febf
...
...
@@ -38,12 +38,16 @@ module ProjectsHelper
author_html
<<
image_tag
(
avatar_icon
(
author
,
opts
[
:size
]),
width:
opts
[
:size
],
class:
"avatar avatar-inline
#{
"s
#{
opts
[
:size
]
}
"
if
opts
[
:size
]
}
"
,
alt
:''
)
if
opts
[
:avatar
]
# Build name span tag
author_html
<<
content_tag
(
:span
,
sanitize
(
author
.
name
),
class:
opts
[
:author_class
])
if
opts
[
:name
]
if
opts
[
:by_username
]
author_html
<<
content_tag
(
:span
,
sanitize
(
"@
#{
author
.
username
}
"
),
class:
opts
[
:author_class
])
if
opts
[
:name
]
else
author_html
<<
content_tag
(
:span
,
sanitize
(
author
.
name
),
class:
opts
[
:author_class
])
if
opts
[
:name
]
end
author_html
=
author_html
.
html_safe
if
opts
[
:name
]
link_to
(
author_html
,
user_path
(
author
),
class:
"author_link"
).
html_safe
link_to
(
author_html
,
user_path
(
author
),
class:
"author_link
#{
"
#{
opts
[
:mobile_classes
]
}
"
if
opts
[
:mobile_classes
]
}
"
).
html_safe
else
title
=
opts
[
:title
].
sub
(
":name"
,
sanitize
(
author
.
name
))
link_to
(
author_html
,
user_path
(
author
),
class:
"author_link has_tooltip"
,
data:
{
'original-title'
.
to_sym
=>
title
,
container:
'body'
}
).
html_safe
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
d913febf
...
...
@@ -9,8 +9,10 @@
Merge Request
#{
@merge_request
.
to_reference
}
%span
.creator
·
by
#{
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
)
}
=
'@'
+
@merge_request
.
author
.
username
by
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
by_username:
true
,
avatar:
false
)
·
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
...
...
This diff is collapsed.
Click to expand it.
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