diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-15 12:59:44 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-15 12:59:44 +0300 |
| commit | 07fd736d2ef0e258f585e4151ab7a906ede80e19 (patch) | |
| tree | a081ec541460635ef2936804ac85d0407cd63a58 /app/helpers/events_helper.rb | |
| parent | 735fbb43edc0f599f3cc754da135e1c67ab3cc79 (diff) | |
| parent | 9c6f4a2351e9b5757f4f508388bc099fbeea5788 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/helpers/events_helper.rb')
| -rw-r--r-- | app/helpers/events_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 7cce059c3ef..d440da050e1 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -168,8 +168,8 @@ module EventsHelper end end - def event_note(text) - text = first_line_in_markdown(text, 150) + def event_note(text, options = {}) + text = first_line_in_markdown(text, 150, options) sanitize(text, tags: %w(a img b pre code p span)) end |