summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-05-12 16:06:14 +0100
committerSean McGivern <sean@gitlab.com>2016-05-17 13:23:17 +0100
commita9977f2b7a39d57d0633714616b4653aca103993 (patch)
tree40a8cb2fad0e80a01b056afe8be70c2b82f33b5e /app/helpers
parent28eea9bdfd0b28ad044f76bd4fcf988329ca9921 (diff)
downloadgitlab-ce-a9977f2b7a39d57d0633714616b4653aca103993.tar.gz
Syntax-highlight diffs in push emails17464-backport-email-syntax-highlighting
Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/emails_helper.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb
index 41b5bd7be90..8466d0aa0ba 100644
--- a/app/helpers/emails_helper.rb
+++ b/app/helpers/emails_helper.rb
@@ -32,12 +32,6 @@ module EmailsHelper
nil
end
- def color_email_diff(diffcontent)
- formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', inline_theme: 'github')
- lexer = Rouge::Lexers::Diff
- raw formatter.format(lexer.lex(diffcontent))
- end
-
def password_reset_token_valid_time
valid_hours = Devise.reset_password_within / 60 / 60
if valid_hours >= 24