summaryrefslogtreecommitdiff
path: root/app/helpers/events_helper.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-02-27 17:17:57 -0800
committerStan Hu <stanhu@gmail.com>2015-03-10 08:11:20 -0700
commit4218a2bfcf7a3f864268c3eafe8ead28bb7808d8 (patch)
treed3860750b344916b1461386ac68990d8d42f439c /app/helpers/events_helper.rb
parent332413d7c4003c3718f8d91c54d7f3410710a5f9 (diff)
downloadgitlab-ce-4218a2bfcf7a3f864268c3eafe8ead28bb7808d8.tar.gz
Fix code preview theme setting for comments, issues, merge requests, and snippets.
Also preserve code preview color scheme in events dashboard. Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]"> Closes #1139
Diffstat (limited to 'app/helpers/events_helper.rb')
-rw-r--r--app/helpers/events_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index d38b546e1b2..779cebc0136 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -166,7 +166,7 @@ module EventsHelper
def event_note(text)
text = first_line_in_markdown(text, 150)
- sanitize(text, tags: %w(a img b pre code p))
+ sanitize(text, tags: %w(a img b pre code p span))
end
def event_commit_title(message)