Commit 73eb40dd authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'bump-hamlit' into 'master'

Bump hamlit to 2.11.0

See merge request gitlab-org/gitlab!21793
parents 26361940 b06ee275
...@@ -102,7 +102,7 @@ gem 'hashie-forbidden_attributes' ...@@ -102,7 +102,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
# HAML # HAML
gem 'hamlit', '~> 2.10.0' gem 'hamlit', '~> 2.11.0'
# Files attachments # Files attachments
gem 'carrierwave', '~> 1.3' gem 'carrierwave', '~> 1.3'
......
...@@ -471,7 +471,7 @@ GEM ...@@ -471,7 +471,7 @@ GEM
rainbow rainbow
rubocop (>= 0.50.0) rubocop (>= 0.50.0)
sysexits (~> 1.1) sysexits (~> 1.1)
hamlit (2.10.0) hamlit (2.11.0)
temple (>= 0.8.2) temple (>= 0.8.2)
thor thor
tilt tilt
...@@ -1029,10 +1029,10 @@ GEM ...@@ -1029,10 +1029,10 @@ GEM
daemons (~> 1.0, >= 1.0.9) daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4) eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3) rack (>= 1, < 3)
thor (0.19.4) thor (0.20.3)
thread_safe (0.3.6) thread_safe (0.3.6)
thrift (0.11.0.0) thrift (0.11.0.0)
tilt (2.0.9) tilt (2.0.10)
timecop (0.8.1) timecop (0.8.1)
timfel-krb5-auth (0.8.3) timfel-krb5-auth (0.8.3)
toml (0.2.0) toml (0.2.0)
...@@ -1224,7 +1224,7 @@ DEPENDENCIES ...@@ -1224,7 +1224,7 @@ DEPENDENCIES
gssapi gssapi
guard-rspec guard-rspec
haml_lint (~> 0.34.0) haml_lint (~> 0.34.0)
hamlit (~> 2.10.0) hamlit (~> 2.11.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)
......
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