diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-24 15:12:38 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-24 15:12:38 +0000 |
| commit | a6af6bf6e21bb5b36a94ba334c99bc586cb3297b (patch) | |
| tree | 41a63f8d85f562573f45aa5898d749ceb51606a5 /.prettierignore | |
| parent | ac8f85805c0ff7dd00072b2974fdd05724863816 (diff) | |
| parent | a1ee2072f1a7c197e13bd2d5f8ca59ad1deb1c49 (diff) | |
| download | gitlab-ce-prettify-all-the-things-7.tar.gz | |
Merge branch 'master' into 'prettify-all-the-things-7'prettify-all-the-things-7
# Conflicts:
# app/assets/javascripts/activities.js
Diffstat (limited to '.prettierignore')
| -rw-r--r-- | .prettierignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.prettierignore b/.prettierignore index b674ccd50cf..dc9e572ab54 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,3 +3,7 @@ /public/ /vendor/ /tmp/ + +# ignore stylesheets for now as this clashes with our linter +*.css +*.scss |