kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master'

Browse source 
Bump scss-lint to 0.54.0

Closes #34858

See merge request !12733
This commit is contained in:
Rémy Coutable 2017-07-12 10:42:46 +00:00
commit 7a7b0cc1a8
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.scss-lint.yml
View file

@ -178,6 +178,10 @@ linters:
SpaceAfterComma: SpaceAfterComma:
enabled: true enabled: true
# Comment literals should be followed by a space.
SpaceAfterComment:
enabled: false
# Properties should be formatted with a single space separating the colon # Properties should be formatted with a single space separating the colon
# from the property's value. # from the property's value.
SpaceAfterPropertyColon: SpaceAfterPropertyColon:

2
Gemfile
View file

@ -334,7 +334,7 @@ group :development, :test do
gem 'rubocop', '~> 0.47.1', require: false gem 'rubocop', '~> 0.47.1', require: false
gem 'rubocop-rspec', '~> 1.15.0', 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 'haml_lint', '~> 0.21.0', require: false
gem 'simplecov', '~> 0.14.0', require: false gem 'simplecov', '~> 0.14.0', require: false
gem 'flay', '~> 2.8.0', require: false gem 'flay', '~> 2.8.0', require: false

8
Gemfile.lock
View file

@ -762,9 +762,9 @@ GEM
sawyer (0.8.1) sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6) addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0) faraday (~> 0.8, < 1.0)
scss_lint (0.47.1) scss_lint (0.54.0)
rake (>= 0.9, < 11) rake (>= 0.9, < 13)
sass (~> 3.4.15) sass (~> 3.4.20)
securecompare (1.0.0) securecompare (1.0.0)
seed-fu (2.3.6) seed-fu (2.3.6)
activerecord (>= 3.1) activerecord (>= 3.1)
@ -1081,7 +1081,7 @@ DEPENDENCIES
rugged (~> 0.25.1.1) rugged (~> 0.25.1.1)
sanitize (~> 2.0) sanitize (~> 2.0)
sass-rails (~> 5.0.6) sass-rails (~> 5.0.6)
scss_lint (~> 0.47.0) scss_lint (~> 0.54.0)
seed-fu (~> 2.3.5) seed-fu (~> 2.3.5)
select2-rails (~> 3.5.9) select2-rails (~> 3.5.9)
sentry-raven (~> 2.5.3) sentry-raven (~> 2.5.3)

4
changelogs/unreleased/34858-bump-scss-lint-to-0-54-0.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Bump scss-lint to 0.54.0
merge_request: 12733
author: Takuya Noguchi