diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-02-27 17:17:57 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-03-10 08:11:20 -0700 |
| commit | 4218a2bfcf7a3f864268c3eafe8ead28bb7808d8 (patch) | |
| tree | d3860750b344916b1461386ac68990d8d42f439c /app/helpers/gitlab_markdown_helper.rb | |
| parent | 332413d7c4003c3718f8d91c54d7f3410710a5f9 (diff) | |
| download | gitlab-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/gitlab_markdown_helper.rb')
| -rw-r--r-- | app/helpers/gitlab_markdown_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb index ab30f498c01..daaefe90f18 100644 --- a/app/helpers/gitlab_markdown_helper.rb +++ b/app/helpers/gitlab_markdown_helper.rb @@ -31,7 +31,9 @@ module GitlabMarkdownHelper def markdown(text, options={}) unless (@markdown and options == @options) @options = options - gitlab_renderer = Redcarpet::Render::GitlabHTML.new(self, { + gitlab_renderer = Redcarpet::Render::GitlabHTML.new(self, + user_color_scheme_class, + { # see https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch- filter_html: true, with_toc_data: true, |