diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-19 03:10:47 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-19 03:10:47 -0500 |
| commit | 25a164be33958e9b09c3ac450485e965fa281b3b (patch) | |
| tree | 2863d3a737f8b65f0c75da31a2fe3986ad6b098b | |
| parent | bf44e58a1e3501b9193b903ed7de980b53e36a3b (diff) | |
| download | gitlab-ce-25a164be33958e9b09c3ac450485e965fa281b3b.tar.gz | |
Ignore stylesheets with prettier until we resolve conflicts with linter
| -rw-r--r-- | .prettierignore | 4 | ||||
| -rw-r--r-- | scripts/frontend/prettier.js | 2 |
2 files changed, 5 insertions, 1 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 diff --git a/scripts/frontend/prettier.js b/scripts/frontend/prettier.js index 06e3b1ac0dc..912cfacce25 100644 --- a/scripts/frontend/prettier.js +++ b/scripts/frontend/prettier.js @@ -3,7 +3,7 @@ const prettier = require('prettier'); const fs = require('fs'); const { getStagedFiles } = require('./frontend_script_utils'); -const TARGET_EXTENSIONS = ['js', 'vue', 'scss']; +const TARGET_EXTENSIONS = ['js', 'json', 'vue']; // This will improve glob performance by excluding certain directories. // The .prettierignore file will also be respected, but after the glob has executed. |