Commit 4fbfe3f2 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'sh-upgrade-hamlit-2.14.2' into 'master'

Update hamlit to v2.14.4

See merge request gitlab-org/gitlab!53085
parents 07204eaf 0d486c55
...@@ -103,7 +103,7 @@ gem 'hashie-forbidden_attributes' ...@@ -103,7 +103,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
# HAML # HAML
gem 'hamlit', '~> 2.14.2' gem 'hamlit', '~> 2.14.4'
# Files attachments # Files attachments
gem 'carrierwave', '~> 1.3' gem 'carrierwave', '~> 1.3'
......
...@@ -559,7 +559,7 @@ GEM ...@@ -559,7 +559,7 @@ GEM
rainbow rainbow
rubocop (>= 0.50.0) rubocop (>= 0.50.0)
sysexits (~> 1.1) sysexits (~> 1.1)
hamlit (2.14.2) hamlit (2.14.4)
temple (>= 0.8.2) temple (>= 0.8.2)
thor thor
tilt tilt
...@@ -1392,7 +1392,7 @@ DEPENDENCIES ...@@ -1392,7 +1392,7 @@ DEPENDENCIES
gssapi gssapi
guard-rspec guard-rspec
haml_lint (~> 0.36.0) haml_lint (~> 0.36.0)
hamlit (~> 2.14.2) hamlit (~> 2.14.4)
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