diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-02 13:01:15 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-04 09:06:57 -0500 |
| commit | 6e6a25187d54798074e18c47935e992f9e9588cd (patch) | |
| tree | 781dd0dcbc8421ce5b01ef950308db4ef1307bb2 | |
| parent | cabd228f70c9fef21d929eede06910b3d111fc29 (diff) | |
| download | gitlab-ce-6e6a25187d54798074e18c47935e992f9e9588cd.tar.gz | |
Combining recent change to have username in header with my MR.
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 14 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 5 |
2 files changed, 13 insertions, 6 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 0c225ee3fe1..e8ab7f7af72 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -27,11 +27,15 @@ %span.creator by .editor-details - %strong - =link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-xs") - =link_to_member(@project, @issue.author, size: 24, - by_username: true, avatar: false) - = time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago') + .editor-details + %strong + =link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-xs") + %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) + = time_ago_with_tooltip(@issue.created_at) .pull-right.issue-btn-group - if can?(current_user, :create_issue, @project) diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index c0e1839757b..c28e9d6f302 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -14,7 +14,10 @@ .editor-details %strong =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) = time_ago_with_tooltip(@merge_request.created_at) |