Commit 2c9e3bf5 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Upgrade hamlit and haml_lint

We need to upgrade these to support Rails 6
parent 1f651068
...@@ -101,7 +101,7 @@ gem 'hashie-forbidden_attributes' ...@@ -101,7 +101,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
# HAML # HAML
gem 'hamlit', '~> 2.8.8' gem 'hamlit', '~> 2.10.0'
# Files attachments # Files attachments
gem 'carrierwave', '~> 1.3' gem 'carrierwave', '~> 1.3'
...@@ -373,7 +373,7 @@ group :development, :test do ...@@ -373,7 +373,7 @@ group :development, :test do
gem 'rubocop-rspec', '~> 1.22.1' gem 'rubocop-rspec', '~> 1.22.1'
gem 'scss_lint', '~> 0.56.0', require: false gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.31.0', require: false gem 'haml_lint', '~> 0.34.0', require: false
gem 'simplecov', '~> 0.16.1', require: false gem 'simplecov', '~> 0.16.1', require: false
gem 'bundler-audit', '~> 0.5.0', require: false gem 'bundler-audit', '~> 0.5.0', require: false
......
...@@ -460,17 +460,16 @@ GEM ...@@ -460,17 +460,16 @@ GEM
guard (~> 2.1) guard (~> 2.1)
guard-compat (~> 1.1) guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0) rspec (>= 2.99.0, < 4.0)
haml (5.0.4) haml (5.1.2)
temple (>= 0.8.0) temple (>= 0.8.0)
tilt tilt
haml_lint (0.31.0) haml_lint (0.34.0)
haml (>= 4.0, < 5.1) haml (>= 4.0, < 5.2)
rainbow rainbow
rake (>= 10, < 13)
rubocop (>= 0.50.0) rubocop (>= 0.50.0)
sysexits (~> 1.1) sysexits (~> 1.1)
hamlit (2.8.8) hamlit (2.10.0)
temple (>= 0.8.0) temple (>= 0.8.2)
thor thor
tilt tilt
hangouts-chat (0.0.5) hangouts-chat (0.0.5)
...@@ -1017,7 +1016,7 @@ GEM ...@@ -1017,7 +1016,7 @@ GEM
sys-filesystem (1.1.6) sys-filesystem (1.1.6)
ffi ffi
sysexits (1.2.0) sysexits (1.2.0)
temple (0.8.1) temple (0.8.2)
terminal-table (1.8.0) terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (~> 1.1, >= 1.1.1)
test-prof (0.10.0) test-prof (0.10.0)
...@@ -1219,8 +1218,8 @@ DEPENDENCIES ...@@ -1219,8 +1218,8 @@ DEPENDENCIES
grpc (~> 1.24.0) grpc (~> 1.24.0)
gssapi gssapi
guard-rspec guard-rspec
haml_lint (~> 0.31.0) haml_lint (~> 0.34.0)
hamlit (~> 2.8.8) hamlit (~> 2.10.0)
hangouts-chat (~> 0.0.5) hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes hashie-forbidden_attributes
health_check (~> 2.6.0) health_check (~> 2.6.0)
......
module Hamlit Hamlit::RailsTemplate.set_options(attr_quote: '"')
class TemplateHandler
def call(template)
Engine.new(
generator: Temple::Generators::RailsOutputBuffer,
attr_quote: '"'
).call(template.source)
end
end
end
ActionView::Template.register_template_handler(
:haml,
Hamlit::TemplateHandler.new
)
Hamlit::Filters.remove_filter('coffee') Hamlit::Filters.remove_filter('coffee')
Hamlit::Filters.remove_filter('coffeescript') Hamlit::Filters.remove_filter('coffeescript')
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment