summaryrefslogtreecommitdiff
path: root/app/views/users
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-14 16:55:07 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-14 16:55:07 +0000
commitc9cb9a8c382c6f741c6ef8c3ef0c73666b2a54b6 (patch)
treeb2b55f22d5d45bad6636f206b5d13b2979d973ce /app/views/users
parent607289316902097e0d84bf86c9c396f03626d45a (diff)
parentf0a922840337f1114ae376ef43e28d480f2ad9fa (diff)
downloadgitlab-ce-c9cb9a8c382c6f741c6ef8c3ef0c73666b2a54b6.tar.gz
Merge branch '26286-most-recent-activity-profile-header' into 'master'
Add 'Most Recent Activity' header to User Profile Closes #26286 See merge request !9189
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/show.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 44254040e4e..dc2fea450bd 100644
--- 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