From e6baeabaa9651d90b03bb64ffce75a2c3cb89aab Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 25 Mar 2020 12:08:19 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/helpers/events_helper.rb | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'app/helpers/events_helper.rb') diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 09866ca75ff..ba8e046f504 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -68,10 +68,12 @@ module EventsHelper end def event_preposition(event) - if event.push_action? || event.commented_action? || event.target - "at" + if event.wiki_page? + 'in the wiki for' elsif event.milestone? - "in" + 'in' + elsif event.push_action? || event.commented_action? || event.target + 'at' end end @@ -172,6 +174,19 @@ module EventsHelper end end + def event_wiki_title_html(event) + capture do + concat content_tag(:span, _('wiki page'), class: "event-target-type append-right-4") + concat link_to(event.target_title, event_wiki_page_target_url(event), + title: event.target_title, + class: 'has-tooltip event-target-link append-right-4') + end + end + + def event_wiki_page_target_url(event) + project_wiki_url(event.project, event.target.canonical_slug) + end + def event_note_title_html(event) if event.note_target capture do -- cgit v1.2.3