Commit f3f81340 authored by Igor Drozdov's avatar Igor Drozdov

Bump hamlit gem to 2.15.0

haml_lint gem has haml as dependency and hamlit
had conflicts with it:
https://github.com/k0kubun/hamlit/issues/184

The maintainer their kindly helped to resolve the issue!
parent d1fb29ff
...@@ -108,7 +108,7 @@ gem 'hashie-forbidden_attributes' ...@@ -108,7 +108,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
# HAML # HAML
gem 'hamlit', '~> 2.14.4' gem 'hamlit', '~> 2.15.0'
# Files attachments # Files attachments
gem 'carrierwave', '~> 1.3' gem 'carrierwave', '~> 1.3'
......
...@@ -592,7 +592,7 @@ GEM ...@@ -592,7 +592,7 @@ GEM
rainbow rainbow
rubocop (>= 0.50.0) rubocop (>= 0.50.0)
sysexits (~> 1.1) sysexits (~> 1.1)
hamlit (2.14.4) hamlit (2.15.0)
temple (>= 0.8.2) temple (>= 0.8.2)
thor thor
tilt tilt
...@@ -1461,7 +1461,7 @@ DEPENDENCIES ...@@ -1461,7 +1461,7 @@ DEPENDENCIES
gssapi gssapi
guard-rspec guard-rspec
haml_lint (~> 0.36.0) haml_lint (~> 0.36.0)
hamlit (~> 2.14.4) hamlit (~> 2.15.0)
hangouts-chat (~> 0.0.5) hangouts-chat (~> 0.0.5)
hashie hashie
hashie-forbidden_attributes hashie-forbidden_attributes
......
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