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

Upgrade haml_lint Gem to 0.26.0

See merge request !2601

.haml-lint.yml

@@ -35,9 +35,18 @@ linters:
   HtmlAttributes:
     enabled: true
 
+  IdNames:
+    enabled: false
+
   ImplicitDiv:
     enabled: true
 
+  InlineStyles:
+    enabled: false
+
+  InstanceVariables:
+    enabled: false
+
   LeadingCommentSpace:
     enabled: false
 
@@ -54,6 +63,9 @@ linters:
   ObjectReferenceAttributes:
     enabled: true
 
+  RepeatedId:
+    enabled: false
+
   RuboCop:
     enabled: false
     # These cops are incredibly noisy when it comes to HAML templates, so we
@@ -101,3 +113,6 @@ linters:
 
   UnnecessaryStringOutput:
     enabled: true
+
+  ViewLength:
+    enabled: false

Gemfile

@@ -354,7 +354,7 @@ group :development, :test do
   gem 'rubocop', '~> 0.49.1', require: false
   gem 'rubocop-rspec', '~> 1.15.1', 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 'flay', '~> 2.8.0', require: false
   gem 'bundler-audit', '~> 0.5.0', require: false

Gemfile.lock

@@ -383,10 +383,11 @@ GEM
       ffi (>= 1.0.1)
     haml (4.0.7)
       tilt
-    haml_lint (0.21.0)
-      haml (~> 4.0)
+    haml_lint (0.26.0)
+      haml (>= 4.0, < 5.1)
+      rainbow
       rake (>= 10, < 13)
-      rubocop (>= 0.47.0)
+      rubocop (>= 0.49.0)
       sysexits (~> 1.1)
     hamlit (2.6.1)
       temple (~> 0.7.6)
@@ -1023,7 +1024,7 @@ DEPENDENCIES
   grape-entity (~> 0.6.0)
   grape-route-helpers (~> 2.0.0)
   gssapi
-  haml_lint (~> 0.21.0)
+  haml_lint (~> 0.26.0)
   hamlit (~> 2.6.1)
   hashie-forbidden_attributes
   health_check (~> 2.6.0)

app/views/projects/runners/edit.html.haml

@@ -3,4 +3,4 @@
 %h4 Runner ##{@runner.id}
 
 %hr
- = render 'form', runner: @runner, runner_form_url: runner_path(@runner)
+  = render 'form', runner: @runner, runner_form_url: runner_path(@runner)