From 96d2ce63acbfe6966ab16daeaf9accd38e8bf453 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Sat, 8 Jul 2017 20:12:49 +0900
Subject: [PATCH] Bump scss-lint to 0.54.0

---
 .scss-lint.yml                                           | 4 ++++
 Gemfile                                                  | 2 +-
 Gemfile.lock                                             | 8 ++++----
 changelogs/unreleased/34858-bump-scss-lint-to-0-54-0.yml | 4 ++++
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 changelogs/unreleased/34858-bump-scss-lint-to-0-54-0.yml

diff --git a/.scss-lint.yml b/.scss-lint.yml
index db234ad739c..02fc586a1c4 100644
--- a/.scss-lint.yml
+++ b/.scss-lint.yml
@@ -178,6 +178,10 @@ linters:
   SpaceAfterComma:
     enabled: false
 
+  # Comment literals should be followed by a space.
+  SpaceAfterComment:
+    enabled: false
+
   # Properties should be formatted with a single space separating the colon
   # from the property's value.
   SpaceAfterPropertyColon:
diff --git a/Gemfile b/Gemfile
index 2c248a45175..7e6af981c33 100644
--- a/Gemfile
+++ b/Gemfile
@@ -336,7 +336,7 @@ group :development, :test do
 
   gem 'rubocop', '~> 0.47.1', require: false
   gem 'rubocop-rspec', '~> 1.15.0', require: false
-  gem 'scss_lint', '~> 0.47.0', require: false
+  gem 'scss_lint', '~> 0.54.0', require: false
   gem 'haml_lint', '~> 0.21.0', require: false
   gem 'simplecov', '~> 0.14.0', require: false
   gem 'flay', '~> 2.8.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index f356024506c..cb14649164e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -766,9 +766,9 @@ GEM
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    scss_lint (0.47.1)
-      rake (>= 0.9, < 11)
-      sass (~> 3.4.15)
+    scss_lint (0.54.0)
+      rake (>= 0.9, < 13)
+      sass (~> 3.4.20)
     securecompare (1.0.0)
     seed-fu (2.3.6)
       activerecord (>= 3.1)
@@ -1087,7 +1087,7 @@ DEPENDENCIES
   rugged (~> 0.25.1.1)
   sanitize (~> 2.0)
   sass-rails (~> 5.0.6)
-  scss_lint (~> 0.47.0)
+  scss_lint (~> 0.54.0)
   seed-fu (~> 2.3.5)
   select2-rails (~> 3.5.9)
   sentry-raven (~> 2.5.3)
diff --git a/changelogs/unreleased/34858-bump-scss-lint-to-0-54-0.yml b/changelogs/unreleased/34858-bump-scss-lint-to-0-54-0.yml
new file mode 100644
index 00000000000..e6cd834aed2
--- /dev/null
+++ b/changelogs/unreleased/34858-bump-scss-lint-to-0-54-0.yml
@@ -0,0 +1,4 @@
+---
+title: Bump scss-lint to 0.54.0
+merge_request: 12733
+author: Takuya Noguchi