diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 15:08:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 15:08:19 +0300 |
| commit | e6baeabaa9651d90b03bb64ffce75a2c3cb89aab (patch) | |
| tree | 85f3cbd6e437b17be59505cf3ac4794c1838609e /app/views/events | |
| parent | 5064bf8c5647d4c4430cbb4d097cf1592416de29 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/events')
| -rw-r--r-- | app/views/events/_event.html.haml | 4 | ||||
| -rw-r--r-- | app/views/events/event/_wiki.html.haml | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 647f0597adb..c042cd2c3e3 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -5,7 +5,9 @@ .event-item-timestamp #{time_ago_with_tooltip(event.created_at)} - - if event.created_project_action? + - if event.wiki_page? + = render "events/event/wiki", event: event + - elsif event.created_project_action? = render "events/event/created_project", event: event - elsif event.push_action? = render "events/event/push", event: event diff --git a/app/views/events/event/_wiki.html.haml b/app/views/events/event/_wiki.html.haml new file mode 100644 index 00000000000..7ca98294521 --- /dev/null +++ b/app/views/events/event/_wiki.html.haml @@ -0,0 +1,10 @@ += icon_for_profile_event(event) + += event_user_info(event) + +.event-title.d-flex.flex-wrap + = inline_event_icon(event) + %span.event-type.d-inline-block.append-right-4{ class: event.action_name } + = event.action_name + = event_wiki_title_html(event) + = render "events/event_scope", event: event |