diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2018-11-03 08:57:20 +0100 |
|---|---|---|
| committer | Martin Wortschack <mwortschack@gitlab.com> | 2018-11-03 08:57:20 +0100 |
| commit | 35141f786b933b29f8c5102031436482c46f7d19 (patch) | |
| tree | a16914583e5a68010688017b2f15ff0a1f06de5f | |
| parent | d8b369ed677ba7420c124f03adec477961ae1c8a (diff) | |
| download | gitlab-ce-35141f786b933b29f8c5102031436482c46f7d19.tar.gz | |
Resolve discussions
| -rw-r--r-- | app/helpers/events_helper.rb | 9 | ||||
| -rw-r--r-- | app/views/events/event/_common.html.haml | 2 | ||||
| -rw-r--r-- | app/views/events/event/_note.html.haml | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index c77a41cfbc3..b6d3742e6e7 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -210,13 +210,10 @@ module EventsHelper end def event_user_info(event) - output = [] - - output << content_tag(:span, link_to_author(event), class: "author_name") - output << " #{content_tag(:span, event.author.to_reference, class: "username")}".html_safe - content_tag(:div, class: "event-user-info") do - output.join.html_safe + concat content_tag(:span, link_to_author(event), class: "author_name") + concat " ".html_safe + concat content_tag(:span, event.author.to_reference, class: "username") end end end diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index 4a8b73840a3..273afc5c708 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -11,7 +11,7 @@ = link_to [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip event-target-link append-right-4', title: event.target_title do = event.target.reference_link_text - unless event.milestone? - %span.event-target-title.append-right-4= ""#{event.target.title}"".html_safe + %span.event-target-title.append-right-4= """.html_safe + event.target.title + """.html_safe - else %span.event-type.d-inline-block.append-right-4{ 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 569de6c8c95..000bd48ecdc 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -7,7 +7,7 @@ %span.event-type.d-inline-block.append-right-4{ class: event.action_name } = event.action_name = event_note_title_html(event) - %span.event-target-title.append-right-4= ""#{event.target.title}"".html_safe + %span.event-target-title.append-right-4= """.html_safe + event.target.title + """.html_safe = render "events/event_scope", event: event |