Merge branch 'rs-revert-remove-filters' into 'master'

Revert "Remove the `:coffee` and `:coffeescript` Haml filters" This reverts commit ae7de2f8. Several files in EE still use the `:coffeescript` filter and I don't have time to fix them before the CE-to-EE merge. See https://gitlab.com/gitlab-org/gitlab-ee/builds/553647 I will reintroduce this change in a future MR. See merge request !2400

Merge branch 'rs-revert-remove-filters' into 'master'
8c67a9fb · Robert Speicher · 5c874f06 · b0145d76 · 8c67a9fb
Commit 8c67a9fb authored Jan 12, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

haml.rb config/initializers/haml.rb +0 -6

No files found.
--- a/config/initializers/haml.rb
+++ b/config/initializers/haml.rb
 Haml::Template.options[:ugly] = true
-
-# Remove the `:coffee` and `:coffeescript` filters
-#
-# See https://git.io/vztMu and http://stackoverflow.com/a/17571242/223897
-Haml::Filters.remove_filter('coffee')
-Haml::Filters.remove_filter('coffeescript')