diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-11-22 09:55:57 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-11-22 09:55:57 +0100 |
| commit | f2365b12b7365ca0c9ae1f969e74114aa415db73 (patch) | |
| tree | 81e33cd6c6368e610fea2e1521700af365801b7a | |
| parent | cddd55bd889f7719bc9de95bcdc46b0bc16fed9b (diff) | |
| download | gitlab-ce-zj-slash-commands-improvements.tar.gz | |
Use Rails' truncatezj-slash-commands-improvements
| -rw-r--r-- | lib/mattermost/presenter.rb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/mattermost/presenter.rb b/lib/mattermost/presenter.rb index 39df73b73e0..2c706eb7c46 100644 --- a/lib/mattermost/presenter.rb +++ b/lib/mattermost/presenter.rb @@ -1,6 +1,7 @@ module Mattermost class Presenter class << self + include ActionView::Helpers::TextHelper include Gitlab::Routing.url_helpers def authorize_chat_name(url) @@ -54,7 +55,7 @@ module Mattermost return error(resource) if resource.errors.any? || !resource.persisted? message = title(resource) - message << "\n\n#{truncate(resource.description, 128)}" if resource.description + message << "\n\n#{resource.description}" if resource.description in_channel_response(message) end @@ -81,7 +82,7 @@ module Mattermost message = [header] items.each do |item| - message << "- #{truncate(item)}" + message << "- #{item}" end message.join("\n") @@ -112,14 +113,6 @@ module Mattermost status: 200 } end - - def truncate(string, length = 32) - if string.length > length - string[0..length].rstrip + '...' - else - string - end - end end end end |