Merge branch 'haml-lint-fix' into counter-caches

.haml-lint.yml

@@ -1,3 +1,9 @@
 linters:
   LineLength:
     max: 120
+  InstanceVariables:
+    enabled: false
+  IdNames:
+    enabled: false
+  ConsecutiveComments:
+    enabled: false

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

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