Merge branch '26286-most-recent-activity-profile-header' into 'master'

Add 'Most Recent Activity' header to User Profile Closes #26286 See merge request !9189

Merge branch '26286-most-recent-activity-profile-header' into 'master'
c9cb9a8c · Annabel Dunstone Gray · 60728931 · f0a92284 · c9cb9a8c · c9cb9a8c
Commit c9cb9a8c authored Feb 14, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

show.html.haml app/views/users/show.html.haml +2 -0

26286-most-recent-activity-profile-header.yml .../unreleased/26286-most-recent-activity-profile-header.yml +4 -0

No files found.
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -106,6 +106,8 @@
              %i.fa.fa-spinner.fa-spin
          .user-calendar-activities

+        %h4.prepend-top-20
+          Most Recent Activity
        .content_list{ data: { href: user_path } }
        = spinner


--- a/changelogs/unreleased/26286-most-recent-activity-profile-header.yml
+++ b/changelogs/unreleased/26286-most-recent-activity-profile-header.yml
+---
+title: Added 'Most Recent Activity' header to the User Profile page
+merge_request: 9189
+author: Jan Christophersen