Merge branch 'ignore-jsconfig' into 'master'

gitignore for vscode config file

See merge request gitlab-org/gitlab-ce!18037

.gitignore

@@ -50,6 +50,7 @@ eslint-report.html
 /db/data.yml
 /doc/code/*
 /dump.rdb
+/jsconfig.json
 /log/*.log*
 /node_modules/
 /nohup.out