diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-18 17:58:43 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-18 17:58:43 +0000 |
| commit | eba00325520a08939f3cb4b5a71c8beb8b457266 (patch) | |
| tree | a10d6a5924a52c4344f831fe13993ed8495f7af6 | |
| parent | 16c62f0d9738cbe8a3d41c9a8261a16255a864ed (diff) | |
| parent | 5e39846e4b139428940c6a4677667c8b0fbb78ce (diff) | |
| download | gitlab-ce-eba00325520a08939f3cb4b5a71c8beb8b457266.tar.gz | |
Merge branch 'add_avatar_to_issue_mr_header' into 'master'
Add avatar to issue and MR pages header
closes #14395
# For Issues
### Before
### After
# For Merge Request
### Before
### After
See merge request !3301
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index ce5b84ee712..52df3de8a27 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -32,9 +32,9 @@ = time_ago_with_tooltip(@issue.created_at) by %strong - = link_to_member(@project, @issue.author, avatar: false, size: 24, mobile_classes: "hidden-xs") + = link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-xs") %strong - = link_to_member(@project, @issue.author, avatar: false, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg", + = link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg", by_username: true, avatar: false) .pull-right.issue-btn-group 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 c6cbe8589ef..eeb605e2dc5 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -19,9 +19,9 @@ = time_ago_with_tooltip(@merge_request.created_at) by %strong - = link_to_member(@project, @merge_request.author, avatar: false, size: 24, mobile_classes: "hidden-xs") + = link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-xs") %strong - = link_to_member(@project, @merge_request.author, avatar: false, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg", + = link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg", by_username: true, avatar: false) .issue-btn-group.pull-right |