diff options
| -rw-r--r-- | app/helpers/application_helper.rb | 7 | ||||
| -rw-r--r-- | app/helpers/events_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/events/event/_push.html.haml | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0a49892ca0a..4209b081bfa 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -235,4 +235,11 @@ module ApplicationHelper "Search" end end + + def first_line(str) + lines = str.split("\n") + line = lines.first + line += "..." if lines.size > 1 + line + end end diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 3c637404c4f..cd8761a6113 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -123,6 +123,8 @@ module EventsHelper end def event_note(text) - sanitize(markdown(truncate(text, length: 150)), tags: %w(a img b pre p)) + text = first_line(text) + text = truncate(text, length: 150) + sanitize(markdown(text), tags: %w(a img b pre p)) end end diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index f2b8dc4238c..adba9a5f619 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -5,7 +5,7 @@ %strong= event.ref_name - else = link_to project_commits_path(event.project, event.ref_name) do - %strong= event.ref_name + %strong= truncate(event.ref_name, length: 30) at %strong= link_to_project event.project |