summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-03-29 09:01:47 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-03-29 09:01:47 +0000
commitc395ef1d6e9e78833443c3410ec55bd041840f14 (patch)
tree8a9fa8a27a3490055e61f563c8eadaa68c1b289e
parenta241b5e3d0e3bc41ee822b456a196442a576bd67 (diff)
parentf022817797c03d013c8685387f93468fb3a5dc62 (diff)
downloadgitlab-ce-c395ef1d6e9e78833443c3410ec55bd041840f14.tar.gz
Merge branch 'leipert-port-scsslint' into 'master'
Backport scss-lint config from EE See merge request gitlab-org/gitlab-ce!26711
-rw-r--r--.scss-lint.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.scss-lint.yml b/.scss-lint.yml
index 3df66033fa8..2a1fa27fdb5 100644
--- a/.scss-lint.yml
+++ b/.scss-lint.yml
@@ -1,7 +1,9 @@
# Linter Documentation:
# https://github.com/brigade/scss-lint/blob/master/lib/scss_lint/linter/README.md
-scss_files: 'app/assets/stylesheets/**/*.scss'
+scss_files:
+ - 'app/assets/stylesheets/**/*.scss'
+ - 'ee/app/assets/stylesheets/**/*.scss'
exclude:
- 'app/assets/stylesheets/pages/emojis.scss'