diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/views/events | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/views/events')
| -rw-r--r-- | app/views/events/event/_common.html.haml | 2 | ||||
| -rw-r--r-- | app/views/events/event/_note.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index dc16c46476e..a38d6dd3836 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -11,7 +11,7 @@ = link_to event.target_link_options, class: 'has-tooltip event-target-link gl-mr-2', title: event.target_title do = event.target.reference_link_text - unless event.milestone? - %span.event-target-title.gl-mr-2{ dir: "auto" } + %span.event-target-title.gl-text-overflow-ellipsis.gl-overflow-hidden.gl-mr-2{ dir: "auto" } = """.html_safe + event.target.title + """.html_safe - else %span.event-type.d-inline-block.gl-mr-2{ class: event.action_name } diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index a81b999acba..4e936025c74 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -9,7 +9,7 @@ = event_note_title_html(event) - title = note_target_title(event.target) - if title.present? - %span.event-target-title.gl-mr-2{ dir: "auto" } + %span.event-target-title.gl-text-overflow-ellipsis.gl-overflow-hidden.gl-mr-2{ dir: "auto" } = """.html_safe + title + """.html_safe = render "events/event_scope", event: event |