diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-12 22:26:38 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-12 22:26:38 +0000 |
| commit | 8c67a9fb3638fa08d64c53423f83e84f0c7cbad5 (patch) | |
| tree | 9690061263ddbb128132138b95c632a3ccc22ed7 | |
| parent | 5c874f06fc170d8c12ccb647265e2073960b26d8 (diff) | |
| parent | b0145d765b94d2cef86b10b6dd22895779cfef33 (diff) | |
| download | gitlab-ce-8c67a9fb3638fa08d64c53423f83e84f0c7cbad5.tar.gz | |
Merge branch 'rs-revert-remove-filters' into 'master'
Revert "Remove the `:coffee` and `:coffeescript` Haml filters"
This reverts commit ae7de2f8510d6d4b69120f168122e26d69dda256.
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
| -rw-r--r-- | config/initializers/haml.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/initializers/haml.rb b/config/initializers/haml.rb index 1516476815a..7e8ddb3716b 100644 --- a/config/initializers/haml.rb +++ b/config/initializers/haml.rb @@ -1,7 +1 @@ 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') |