Commit 6e6a2518 authored by Jacob Schatz's avatar Jacob Schatz

Combining recent change to have username in header with my MR.

parent cabd228f
...@@ -26,12 +26,16 @@ ...@@ -26,12 +26,16 @@
Issue ##{@issue.iid} Issue ##{@issue.iid}
%span.creator %span.creator
by by
.editor-details
.editor-details .editor-details
%strong %strong
=link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-xs") =link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-xs")
=link_to_member(@project, @issue.author, size: 24, %span.hidden-xs
= '@' + @issue.author.username
%strong
=link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg",
by_username: true, avatar: false) by_username: true, avatar: false)
= time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago') = time_ago_with_tooltip(@issue.created_at)
.pull-right.issue-btn-group .pull-right.issue-btn-group
- if can?(current_user, :create_issue, @project) - if can?(current_user, :create_issue, @project)
......
...@@ -14,7 +14,10 @@ ...@@ -14,7 +14,10 @@
.editor-details .editor-details
%strong %strong
=link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-xs") =link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-xs")
=link_to_member(@project, @merge_request.author, size: 24, %span.hidden-xs
= '@' + @merge_request.author.username
%strong
=link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg",
by_username: true, avatar: false) by_username: true, avatar: false)
= time_ago_with_tooltip(@merge_request.created_at) = time_ago_with_tooltip(@merge_request.created_at)
......
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