diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-14 16:55:07 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-14 16:55:07 +0000 |
| commit | c9cb9a8c382c6f741c6ef8c3ef0c73666b2a54b6 (patch) | |
| tree | b2b55f22d5d45bad6636f206b5d13b2979d973ce | |
| parent | 607289316902097e0d84bf86c9c396f03626d45a (diff) | |
| parent | f0a922840337f1114ae376ef43e28d480f2ad9fa (diff) | |
| download | gitlab-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
| -rw-r--r-- | app/views/users/show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/26286-most-recent-activity-profile-header.yml | 4 |
2 files changed, 6 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 diff --git a/changelogs/unreleased/26286-most-recent-activity-profile-header.yml b/changelogs/unreleased/26286-most-recent-activity-profile-header.yml new file mode 100644 index 00000000000..74d5a43a804 --- /dev/null +++ b/changelogs/unreleased/26286-most-recent-activity-profile-header.yml @@ -0,0 +1,4 @@ +--- +title: Added 'Most Recent Activity' header to the User Profile page +merge_request: 9189 +author: Jan Christophersen |