Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown

Conflicts:
	Gemfile
	Gemfile.lock
This commit is contained in:
Dmitriy Zaporozhets 2012-04-21 01:44:15 +03:00
commit 9cb51c6ea2
7 changed files with 27 additions and 10 deletions

View file

@ -0,0 +1,9 @@
class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
def block_code(code, language)
if Pygments::Lexer.find(language)
Pygments.highlight(code, :lexer => language)
else
Pygments.highlight(code)
end
end
end