Improve .haml-lint.yml, simplify the haml_lint task and remove CHANGELOG entryrc-use-haml_lint

Signed-off-by: Rémy Coutable <remy@rymai.me>

3 files changed, 2 insertions, 10 deletions

diff --git a/.haml-lint.yml b/.haml-lint.yml
index 6e3b35607b1..da9a43d9c6d 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -1,13 +1,9 @@
-# Default application configuration that all configurations inherit from.
-#
-# This is an opinionated list of which hooks are valuable to run and what their
-# out of the box settings should be.
-
 # Whether to ignore frontmatter at the beginning of HAML documents for
 # frameworks such as Jekyll/Middleman
 skip_frontmatter: false
 exclude:
   - 'vendor/**/*'
+  - 'spec/**/*'
 
 linters:
   AltText:
diff --git a/CHANGELOG b/CHANGELOG
index 2a39ac99d49..d69168985cd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,7 +20,6 @@ v 8.12.0 (unreleased)
   - Fix pagination on user snippets page
   - Fix sorting of issues in API
   - Ensure specs on sorting of issues in API are deterministic on MySQL
-  - Use haml_lint for views linting
   - Escape search term before passing it to Regexp.new !6241 (winniehell)
   - Fix pinned sidebar behavior in smaller viewports !6169
   - Fix file permissions change when updating a file on the Gitlab UI !5979
diff --git a/lib/tasks/haml-lint.rake b/lib/tasks/haml-lint.rake
index 80f70820853..609dfaa48e3 100644
--- a/lib/tasks/haml-lint.rake
+++ b/lib/tasks/haml-lint.rake
@@ -1,8 +1,5 @@
 unless Rails.env.production?
   require 'haml_lint/rake_task'
 
-  HamlLint::RakeTask.new do |t|
-    t.config = '.haml-lint.yml'
-    t.files = ['app/views']
-  end
+  HamlLint::RakeTask.new
 end