Merge branch 'master' into new-resolvable-discussion

9 files changed, 11 insertions, 6 deletions

diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index e7f9bbbc62f..79da490675a 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -31,7 +31,7 @@
 
     svg {
       width: 20px;
-      height: auto;
+      height: 20px;
       fill: $gl-text-color-secondary;
     }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index c1be78fcd6e..94ea4c5c8c6 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -19,7 +19,7 @@ ul.notes {
 
     svg {
       width: 18px;
-      height: auto;
+      height: 18px;
       fill: $gray-darkest;
       position: absolute;
       left: 30px;
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb
index 3074921caff..1ea60e39386 100644
--- a/app/helpers/system_note_helper.rb
+++ b/app/helpers/system_note_helper.rb
@@ -7,7 +7,7 @@ module SystemNoteHelper
     'closed' => 'icon_status_closed',
     'time_tracking' => 'icon_stopwatch',
     'assignee' => 'icon_user',
-    'title' => 'icon_pencil',
+    'title' => 'icon_edit',
     'task' => 'icon_check_square_o',
     'label' => 'icon_tags',
     'cross_reference' => 'icon_random',
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index c0c11d00519..af97e9588a5 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -10,6 +10,7 @@
       = custom_icon("icon_code_fork")
 
 .event-title
+  %span.author_name= link_to_author event
   %span{ class: event.action_name }
   - if event.target
     = event.action_name
diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml
index 340d8c61026..fee85c94277 100644
--- a/app/views/events/event/_created_project.html.haml
+++ b/app/views/events/event/_created_project.html.haml
@@ -2,6 +2,7 @@
   = custom_icon("icon_status_open")
 
 .event-title
+  %span.author_name= link_to_author event
   %span{ class: event.action_name }
     = event_action_name(event)
 
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index cbcfe0ff71f..83709f5e4d0 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -2,6 +2,7 @@
   = custom_icon("icon_comment_o")
 
 .event-title
+  %span.author_name= link_to_author event
   = event.action_name
   = event_note_title_html(event)
 
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index 1583f380737..efdc8764acf 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -7,6 +7,7 @@
     = custom_icon("icon_commit")
 
 .event-title
+  %span.author_name= link_to_author event
   %span.pushed #{event.action_name} #{event.ref_type}
   %strong
     - commits_link = namespace_project_commits_path(project.namespace, project, event.ref_name)
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index 4ad77b6266d..35885b2c7b4 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -7,7 +7,7 @@
 
   #blob-content-holder.tree-holder
     .file-holder
-      = render "projects/blob/header", blob: @blob
+      = render "projects/blob/header", blob: @blob, blame: true
 
       .table-responsive.file-content.blame.code.js-syntax-highlight
         %table
diff --git a/app/views/projects/blob/_header.html.haml b/app/views/projects/blob/_header.html.haml
index 828f8e073a9..6c7d389e707 100644
--- a/app/views/projects/blob/_header.html.haml
+++ b/app/views/projects/blob/_header.html.haml
@@ -1,3 +1,4 @@
+- blame = local_assigns.fetch(:blame, false)
 .js-file-title.file-title-flex-parent
   .file-header-content
     = blob_icon blob.mode, blob.name
@@ -12,14 +13,14 @@
 
   .file-actions.hidden-xs
     .btn-group{ role: "group" }<
-      = copy_blob_content_button(blob) if blob_text_viewable?(blob)
+      = copy_blob_content_button(blob) if !blame && blob_text_viewable?(blob)
       = open_raw_file_button(namespace_project_raw_path(@project.namespace, @project, @id))
       = view_on_environment_button(@commit.sha, @path, @environment) if @environment
 
     .btn-group{ role: "group" }<
       -# only show normal/blame view links for text files
       - if blob_text_viewable?(blob)
-        - if current_page? namespace_project_blame_path(@project.namespace, @project, @id)
+        - if blame
           = link_to 'Normal view', namespace_project_blob_path(@project.namespace, @project, @id),
               class: 'btn btn-sm'
         - else