From 8010a8b56c4fe58a9ec3e18e023aa252852a4eb7 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 13 Apr 2017 22:54:56 +1200
Subject: [PATCH 1/3] Upgrade haml_lint

---
 Gemfile      | 2 +-
 Gemfile.lock | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 965398f79..d6e2cd9c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -122,7 +122,7 @@ group :development, :test do
   gem 'factory_girl_rails'              # for creating test data
   gem 'haml-i18n-extractor'
   gem 'haml-rails'                      # HTML templating language
-  gem 'haml_lint', '~> 0.20.0'          # Checks haml files for goodness
+  gem 'haml_lint'                       # Checks haml files for goodness
   gem 'i18n-tasks'                      # adds tests for finding missing and unused translations
   gem 'jasmine'                         # javascript unit testing
   gem 'poltergeist'                     # for headless JS testing
diff --git a/Gemfile.lock b/Gemfile.lock
index 03dc31040..beafae883 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -222,8 +222,9 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    haml_lint (0.20.0)
-      haml (~> 4.0)
+    haml_lint (0.24.0)
+      haml (>= 4.0, < 5.1)
+      rainbow
       rake (>= 10, < 13)
       rubocop (>= 0.47.0)
       sysexits (~> 1.1)
@@ -552,7 +553,7 @@ DEPENDENCIES
   haml
   haml-i18n-extractor
   haml-rails
-  haml_lint (~> 0.20.0)
+  haml_lint
   hashie (>= 3.5.3)
   heroku-api
   i18n-tasks

From 171e34914bb48050a0a81f1f6c7e86575efb0a74 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 13 Apr 2017 23:02:16 +1200
Subject: [PATCH 2/3] Allow instance variables in partials for now

---
 .haml-lint.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.haml-lint.yml b/.haml-lint.yml
index a68d3eed3..59fe632a7 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -1,3 +1,5 @@
 linters:
   LineLength:
     max: 120
+  InstanceVariables:
+    enabled: false

From 47c0f74f81549089b94ffad58fb32f6fb39c3c65 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Fri, 14 Apr 2017 09:43:16 +1200
Subject: [PATCH 3/3] Ignore ConsecutiveComments and IdNames in haml for now

---
 .haml-lint.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.haml-lint.yml b/.haml-lint.yml
index 59fe632a7..8b10436c0 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -3,3 +3,7 @@ linters:
     max: 120
   InstanceVariables:
     enabled: false
+  IdNames:
+    enabled: false
+  ConsecutiveComments:
+    enabled: false