Merge branch 'fix_issue_mr_page_inconsistency' into 'master'

Fix inconsistency in the header of issue and merge request pages closes #13550 # For Issue Page ### Before ![Screen_Shot_2016-03-17_at_8.46.59_PM](/uploads/ede7f2b98395362ae87e6258cc10520a/Screen_Shot_2016-03-17_at_8.46.59_PM.png) ### After ![Screen_Shot_2016-03-17_at_8.48.56_PM](/uploads/da7adf17cb397ddc0677a6a5e8033b8e/Screen_Shot_2016-03-17_at_8.48.56_PM.png) # For Merge request Page ### Before ![Screen_Shot_2016-03-17_at_8.45.45_PM](/uploads/10137827c05c8166a0aa429687e50d1b/Screen_Shot_2016-03-17_at_8.45.45_PM.png) ### After ![Screen_Shot_2016-03-17_at_8.45.01_PM](/uploads/92151c03cfe29b71090a1e0ad31abd6e/Screen_Shot_2016-03-17_at_8.45.01_PM.png) See merge request !3279

Merge branch 'fix_issue_mr_page_inconsistency' into 'master'
09a32fa8 · Jacob Schatz · 73ba88b5 · 613e0bc5 · 09a32fa8 · 09a32fa8
Commit 09a32fa8 authored Mar 17, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 13 deletions

show.html.haml app/views/projects/issues/show.html.haml +5 -6

_mr_title.html.haml app/views/projects/merge_requests/show/_mr_title.html.haml +10 -7

No files found.
--- 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)

--- 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,21 @@
    = icon('angle-double-left')
  .issue-meta
    %strong.identifier
-      Merge Request ##{@merge_request.iid}
+      %span.hidden-sm.hidden-md.hidden-lg
+        MR
+      %span.hidden-xs
+        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)