summaryrefslogtreecommitdiff
path: root/Gemfile.lock
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 /Gemfile.lock
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 'Gemfile.lock')
-rw-r--r--Gemfile.lock18
1 files changed, 5 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ba16e4bf337..02c7b75aba3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -320,14 +320,10 @@ GEM
grape-entity (0.4.8)
activesupport
multi_json (>= 1.3.2)
- haml (4.0.7)
+ hamlit (2.5.0)
+ temple (~> 0.7.6)
+ thor
tilt
- haml-rails (0.9.0)
- actionpack (>= 4.0.1)
- activesupport (>= 4.0.1)
- haml (>= 4.0.6, < 5.0)
- html2haml (>= 1.0.1)
- railties (>= 4.0.1)
hashie (3.4.3)
health_check (1.5.1)
rails (>= 2.3.0)
@@ -337,11 +333,6 @@ GEM
html-pipeline (1.11.0)
activesupport (>= 2)
nokogiri (~> 1.4)
- html2haml (2.0.0)
- erubis (~> 2.7.0)
- haml (~> 4.0.0)
- nokogiri (~> 1.6.0)
- ruby_parser (~> 3.5)
htmlentities (4.3.4)
http_parser.rb (0.5.3)
httparty (0.13.7)
@@ -733,6 +724,7 @@ GEM
railties (>= 3.2.5, < 6)
teaspoon-jasmine (2.2.0)
teaspoon (>= 1.0.0)
+ temple (0.7.7)
term-ansicolor (1.3.2)
tins (~> 1.0)
test_after_commit (0.4.2)
@@ -882,7 +874,7 @@ DEPENDENCIES
gon (~> 6.0.1)
grape (~> 0.13.0)
grape-entity (~> 0.4.2)
- haml-rails (~> 0.9.0)
+ hamlit
health_check (~> 1.5.1)
hipchat (~> 1.5.0)
html-pipeline (~> 1.11.0)