diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-07 09:35:11 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-07 15:59:39 -0500 |
| commit | 667fa9afa29d60ec38dfb787ea207f2e44a38ee8 (patch) | |
| tree | 6e824e0ccc48944a2e6f591e597b23f4b12b6246 /app/views/events | |
| parent | 6ca6ca89170f0e9db5f71a737d45dc01401d9f2d (diff) | |
| download | gitlab-ce-667fa9afa29d60ec38dfb787ea207f2e44a38ee8.tar.gz | |
Put back usernames in activity and profile feed
Diffstat (limited to 'app/views/events')
| -rw-r--r-- | app/views/events/event/_common.html.haml | 1 | ||||
| -rw-r--r-- | app/views/events/event/_created_project.html.haml | 1 | ||||
| -rw-r--r-- | app/views/events/event/_note.html.haml | 1 | ||||
| -rw-r--r-- | app/views/events/event/_push.html.haml | 1 |
4 files changed, 4 insertions, 0 deletions
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) |