summaryrefslogtreecommitdiff
path: root/app/helpers/application_helper.rb
diff options
context:
space:
mode:
authorconnorshea <connor.james.shea@gmail.com>2016-04-11 15:27:07 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-06-22 16:09:51 -0600
commit80f576bb8aaab83ca78a21f20c03cb4b4fb18f11 (patch)
tree0675078c6192026dfeac14fab6631a2a0de71f76 /app/helpers/application_helper.rb
parent69479d3615df62c0c6c22fe20263413505b2ef8f (diff)
downloadgitlab-ce-80f576bb8aaab83ca78a21f20c03cb4b4fb18f11.tar.gz
Replace Haml with Hamlit.
Hamlit is a library that's faster than Haml while implementing most of its features: https://github.com/k0kubun/hamlit Not sure if this breaks anything, but as far as I can tell most things work the same. No obvious regressions that I've been able to find.
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 41859841834..62d13a4b4f3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -197,7 +197,7 @@ module ApplicationHelper
def render_markup(file_name, file_content)
if gitlab_markdown?(file_name)
- Haml::Helpers.preserve(markdown(file_content))
+ Hamlit::RailsHelpers.preserve(markdown(file_content))
elsif asciidoc?(file_name)
asciidoc(file_content)
elsif plain?(file_name)