diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-12 10:42:46 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-12 10:42:46 +0000 |
| commit | 7a7b0cc1a824861ba8fe8a16e3a413cdd6a47a4d (patch) | |
| tree | 5c1bef67915689316f51fe77c11e5c83229dc76d | |
| parent | dc05bcd885e441e8cac0e5038141bca0775f049d (diff) | |
| parent | 96d2ce63acbfe6966ab16daeaf9accd38e8bf453 (diff) | |
| download | gitlab-ce-7a7b0cc1a824861ba8fe8a16e3a413cdd6a47a4d.tar.gz | |
Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master'
Bump scss-lint to 0.54.0
Closes #34858
See merge request !12733
| -rw-r--r-- | .scss-lint.yml | 4 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/34858-bump-scss-lint-to-0-54-0.yml | 4 |
4 files changed, 13 insertions, 5 deletions
diff --git a/.scss-lint.yml b/.scss-lint.yml index bf95b42a25c..b38e8b90c09 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -178,6 +178,10 @@ linters: SpaceAfterComma: enabled: true + # 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: @@ -334,7 +334,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 bb5b3602add..c27c06e9c34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -762,9 +762,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) @@ -1081,7 +1081,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 |