Merge branch 'master' into rs-redactor-filter

5 files changed, 19 insertions, 19 deletions

diff --git a/app/views/events/_commit.html.haml b/app/views/events/_commit.html.haml
index 742b74a67c7..ad63841ccf3 100644
--- a/app/views/events/_commit.html.haml
+++ b/app/views/events/_commit.html.haml
@@ -1,5 +1,5 @@
 %li.commit
   .commit-row-title
     = link_to truncate_sha(commit[:id]), namespace_project_commit_path(project.namespace, project, commit[:id]), class: "commit_short_id", alt: ''
-     
+    ·
     = gfm event_commit_title(commit[:message]), project: project
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 0faab4458e9..9aacc79d686 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -3,8 +3,8 @@
     .event-item-timestamp
       #{time_ago_with_tooltip(event.created_at)}
 
-    = cache [event, "v1"] do
-      = image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:''
+    = cache [event, "v2.1"] do
+      = image_tag avatar_icon(event.author_email, 46), class: "avatar s46", alt:''
       - if event.created_project?
         = render "events/event/created_project", event: event
       - elsif event.push?
diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml
index 6a0c6cba41b..ffc37ad6178 100644
--- a/app/views/events/_event_last_push.html.haml
+++ b/app/views/events/_event_last_push.html.haml
@@ -1,14 +1,14 @@
 - if show_last_push_widget?(event)
-  .event-last-push
-    .event-last-push-text
-      %span You pushed to
-      = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
-        %strong= event.ref_name
-      %span at
-      %strong= link_to_project event.project
-      #{time_ago_with_tooltip(event.created_at)}
+  .gray-content-block.clear-block
+    .event-last-push
+      .event-last-push-text
+        %span You pushed to
+        = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
+          %strong= event.ref_name
+        %span at
+        %strong= link_to_project event.project
+        #{time_ago_with_tooltip(event.created_at)}
 
-    .pull-right
-      = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
-        Create Merge Request
-  %hr
+      .pull-right
+        = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
+          Create Merge Request
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index a39e62e9dac..4ecf1c33d2a 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -5,13 +5,14 @@
 
   - if event.target
     %strong= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target]
-    at
+
+  = event_preposition(event)
 
   - if event.project
     = link_to_project event.project
   - else
     = event.project_name
-    
+
 - if event.target.respond_to?(:title)
   .event-body
     .event-note
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index 07bec1697f5..830fec0b4ab 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -4,7 +4,7 @@
     = event.action_name
     = event_note_title_html(event)
     at
-    
+
   - if event.project
     = link_to_project event.project
   - else
@@ -13,7 +13,6 @@
 .event-body
   .event-note
     .md
-      %i.fa.fa-comment-o.event-note-icon
       = event_note(event.target.note, project: event.project)
     - note = event.target
     - if note.attachment.url