summaryrefslogtreecommitdiff
path: root/app/helpers/emails_helper.rb
diff options
context:
space:
mode:
authorStefan Tatschner <stefan@sevenbyte.org>2015-06-28 20:45:40 +0200
committerStefan Tatschner <rumpelsepp@sevenbyte.org>2015-07-29 07:40:58 +0200
commitf736721c5bb8f1f6031d36cc726cbd11cc499a72 (patch)
treeacd3e2d8af691d026b11977dd7010458f01a1aed /app/helpers/emails_helper.rb
parent5bdcef7b0b6fd9cfdc3498a40d2b2b2a9ddc682c (diff)
downloadgitlab-ce-f736721c5bb8f1f6031d36cc726cbd11cc499a72.tar.gz
Replace Rugments with Rouge
I have mainly created the rugments fork for the purpose of improving gitlab's highlighting. Nowadays IMO it works way better than the old highlight.js solution. But the development is stuck on my side because of a couple of personal reasons: * I have finished my studies; last months I was writing my master thesis. So there was a huge time problem. I am sorry for that. * I had to move to Munich due to getting a (paid) job. Searching a flat here is horrible... :) * Last but not least, maintaining the same code base in two seperate projects is a mess. I have decided to switch back to rouge due to several reasons: * In the beginning I was quite motivated, but since I start working on my new job next week, the best solution IMO is switching back to upstream rouge. * Rouge is continously improving: https://github.com/jneen/rouge/blob/master/CHANGELOG.md http://rouge.jneen.net/ * There should be absolutely no regressions with this change. Most likely this pull request will almost fix some minor bugs. * One less gem in gitlab is a good thing. since Gitlab is quite a huge bundle of gems. Reducing complexity should be a major milestone. Thanks a lot to @stanhu and @jneen for the review!
Diffstat (limited to 'app/helpers/emails_helper.rb')
-rw-r--r--app/helpers/emails_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb
index 128de18bc47..45788ba95ac 100644
--- a/app/helpers/emails_helper.rb
+++ b/app/helpers/emails_helper.rb
@@ -31,8 +31,8 @@ module EmailsHelper
end
def color_email_diff(diffcontent)
- formatter = Rugments::Formatters::HTML.new(cssclass: "highlight", inline_theme: :github)
- lexer = Rugments::Lexers::Diff.new
+ formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', inline_theme: 'github')
+ lexer = Rouge::Lexers::Diff
raw formatter.format(lexer.lex(diffcontent))
end