summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-03-28 10:25:32 +0000
committerPhil Hughes <me@iamphill.com>2018-03-28 10:25:32 +0000
commit6e2384591a6adc4719b9ddc7ea434c4e3f6e0685 (patch)
treef7431a1d7c5da236563ed04cbdb272b8f29735fd
parent06afa5a3ff82e2d6edbcf668cc870e625784c09c (diff)
parentd6eb56d682f5b5226e1fae03a6324ce03a9e4a38 (diff)
downloadgitlab-ce-6e2384591a6adc4719b9ddc7ea434c4e3f6e0685.tar.gz
Merge branch 'ignore-jsconfig' into 'master'
gitignore for vscode config file See merge request gitlab-org/gitlab-ce!18037
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 447fb71bd64..e9ff0048c1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ eslint-report.html
/db/data.yml
/doc/code/*
/dump.rdb
+/jsconfig.json
/log/*.log*
/node_modules/
/nohup.out