Commit 440dc934 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'winh-upgrade-haml_lint' into 'master'

Upgrade haml_lint Gem to 0.26.0

See merge request !13304
parents e8a439ab bca5747d
...@@ -35,9 +35,18 @@ linters: ...@@ -35,9 +35,18 @@ linters:
HtmlAttributes: HtmlAttributes:
enabled: true enabled: true
IdNames:
enabled: false
ImplicitDiv: ImplicitDiv:
enabled: true enabled: true
InlineStyles:
enabled: false
InstanceVariables:
enabled: false
LeadingCommentSpace: LeadingCommentSpace:
enabled: false enabled: false
...@@ -54,6 +63,9 @@ linters: ...@@ -54,6 +63,9 @@ linters:
ObjectReferenceAttributes: ObjectReferenceAttributes:
enabled: true enabled: true
RepeatedId:
enabled: false
RuboCop: RuboCop:
enabled: false enabled: false
# These cops are incredibly noisy when it comes to HAML templates, so we # These cops are incredibly noisy when it comes to HAML templates, so we
...@@ -101,3 +113,6 @@ linters: ...@@ -101,3 +113,6 @@ linters:
UnnecessaryStringOutput: UnnecessaryStringOutput:
enabled: true enabled: true
ViewLength:
enabled: false
...@@ -342,7 +342,7 @@ group :development, :test do ...@@ -342,7 +342,7 @@ group :development, :test do
gem 'rubocop', '~> 0.49.1', require: false gem 'rubocop', '~> 0.49.1', require: false
gem 'rubocop-rspec', '~> 1.15.1', require: false gem 'rubocop-rspec', '~> 1.15.1', require: false
gem 'scss_lint', '~> 0.54.0', require: false gem 'scss_lint', '~> 0.54.0', require: false
gem 'haml_lint', '~> 0.21.0', require: false gem 'haml_lint', '~> 0.26.0', require: false
gem 'simplecov', '~> 0.14.0', require: false gem 'simplecov', '~> 0.14.0', require: false
gem 'flay', '~> 2.8.0', require: false gem 'flay', '~> 2.8.0', require: false
gem 'bundler-audit', '~> 0.5.0', require: false gem 'bundler-audit', '~> 0.5.0', require: false
......
...@@ -356,10 +356,11 @@ GEM ...@@ -356,10 +356,11 @@ GEM
googleauth (~> 0.5.1) googleauth (~> 0.5.1)
haml (4.0.7) haml (4.0.7)
tilt tilt
haml_lint (0.21.0) haml_lint (0.26.0)
haml (~> 4.0) haml (>= 4.0, < 5.1)
rainbow
rake (>= 10, < 13) rake (>= 10, < 13)
rubocop (>= 0.47.0) rubocop (>= 0.49.0)
sysexits (~> 1.1) sysexits (~> 1.1)
hamlit (2.6.1) hamlit (2.6.1)
temple (~> 0.7.6) temple (~> 0.7.6)
...@@ -987,7 +988,7 @@ DEPENDENCIES ...@@ -987,7 +988,7 @@ DEPENDENCIES
grape (~> 0.19.2) grape (~> 0.19.2)
grape-entity (~> 0.6.0) grape-entity (~> 0.6.0)
grape-route-helpers (~> 2.0.0) grape-route-helpers (~> 2.0.0)
haml_lint (~> 0.21.0) haml_lint (~> 0.26.0)
hamlit (~> 2.6.1) hamlit (~> 2.6.1)
hashie-forbidden_attributes hashie-forbidden_attributes
health_check (~> 2.6.0) health_check (~> 2.6.0)
......
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
%h4 Runner ##{@runner.id} %h4 Runner ##{@runner.id}
%hr %hr
= render 'form', runner: @runner, runner_form_url: runner_path(@runner) = render 'form', runner: @runner, runner_form_url: runner_path(@runner)
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