summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-06-23 23:51:08 +0000
committerRobert Speicher <robert@gitlab.com>2016-06-23 23:51:08 +0000
commit9e43fc151b7d0efca8795e5fbb1fa39d9ed21322 (patch)
tree7429c8b793151afe4ea441c01fac5880b6787dfb /doc/development
parent951b0a1a12ea16e815da0e483474b5ae61b7077a (diff)
parent262f902d9afd4c7ec13124141312726d68f5ca79 (diff)
downloadgitlab-ce-9e43fc151b7d0efca8795e5fbb1fa39d9ed21322.tar.gz
Merge branch 'hamlit-test' into 'master'
Replace Haml with Hamlit What this change does: - It replaces HAML with [Hamlit](https://github.com/k0kubun/hamlit), a much more efficient implementation of HAML. - It removes `haml-rails`. - It adds `hamlit.rb` and removes `haml.rb`. - It makes things faster and less memory-hungry! See also #13201. See merge request !3666
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/gotchas.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/gotchas.md b/doc/development/gotchas.md
index 21078c8d6f9..9d7fe7440d2 100644
--- a/doc/development/gotchas.md
+++ b/doc/development/gotchas.md
@@ -46,7 +46,7 @@ Rubocop](https://gitlab.com/gitlab-org/gitlab-ce/blob/8-4-stable/.rubocop.yml#L9
Using the inline `:coffee` or `:coffeescript` Haml filters comes with a
performance overhead.
-_**Note:** We've [removed these two filters](https://gitlab.com/gitlab-org/gitlab-ce/blob/8-5-stable/config/initializers/haml.rb)
+_**Note:** We've [removed these two filters](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/hamlit.rb)
in an initializer._
### Further reading