diff options
| author | Arinde Eniola <eniolaarinde1@gmail.com> | 2016-03-17 20:41:54 +0100 |
|---|---|---|
| committer | Arinde Eniola <eniolaarinde1@gmail.com> | 2016-03-17 20:41:54 +0100 |
| commit | 899c5c6abfe5b4fa518a0e55efa7892e89eb7496 (patch) | |
| tree | e22c97e244b7473572df74b0d45160109fc7417f | |
| parent | d1fd2cb8c1cad5299555c3e9cff54e1d8cde44c0 (diff) | |
| download | gitlab-ce-fix_issue_mr_page_inconsistency.tar.gz | |
Fix inconsistency in the header of issue and merge request pagesfix_issue_mr_page_inconsistency
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 11 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 13 |
2 files changed, 11 insertions, 13 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 1e8308277cc..494f58c57cd 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -25,17 +25,16 @@ %strong.identifier Issue ##{@issue.iid} %span.creator - by + opened .editor-details .editor-details + = time_ago_with_tooltip(@issue.created_at) + by %strong - = link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-xs") - %span.hidden-xs - = '@' + @issue.author.username + = link_to_member(@project, @issue.author, avatar: false, size: 24, mobile_classes: "hidden-xs") %strong - = link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg", + = link_to_member(@project, @issue.author, avatar: false, 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 a75c0d96c57..2885a650840 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -8,18 +8,17 @@ = icon('angle-double-left') .issue-meta %strong.identifier - Merge Request ##{@merge_request.iid} + Merge Request !#{@merge_request.iid} %span.creator - by + opened .editor-details + = time_ago_with_tooltip(@merge_request.created_at) + by %strong - = link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-xs") - %span.hidden-xs - = '@' + @merge_request.author.username + = link_to_member(@project, @merge_request.author, avatar: false, size: 24, mobile_classes: "hidden-xs") %strong - = link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg", + = link_to_member(@project, @merge_request.author, avatar: false, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg", by_username: true, avatar: false) - = time_ago_with_tooltip(@merge_request.created_at) .issue-btn-group.pull-right - if can?(current_user, :update_merge_request, @merge_request) |