diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-29 09:40:18 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-29 09:40:18 +0000 |
| commit | 74e1add2fcbd47ec748e04c65d3eb947dba73cf2 (patch) | |
| tree | d98e5395e472e818f697a722b079c5dedbdb892e | |
| parent | 9d0065f05455e1f9146ab30a3aaf903472c9b8f4 (diff) | |
| parent | 79123ec9986c8638b569daa02ac2ba2f3408c48e (diff) | |
| download | gitlab-ce-74e1add2fcbd47ec748e04c65d3eb947dba73cf2.tar.gz | |
Merge branch 'rs-revert-revert-remove-coffee-filters' into 'master'
Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""
This reverts commit b0145d765b94d2cef86b10b6dd22895779cfef33.
See merge request !2642
| -rw-r--r-- | config/initializers/haml.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/haml.rb b/config/initializers/haml.rb index 7e8ddb3716b..1516476815a 100644 --- a/config/initializers/haml.rb +++ b/config/initializers/haml.rb @@ -1 +1,7 @@ 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') |