aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2018-09-21 11:03:16 +0200
committerSonarTech <sonartech@sonarsource.com>2018-09-24 20:20:57 +0200
commitd2410ce9f3d79f1049c9981df9c349a3858a89e7 (patch)
tree7ababe82766dd97e6b48d57de2557dd4a18ee574
parent64d76164768f4b74d6bdc714191f65567baf8d10 (diff)
downloadsonarqube-d2410ce9f3d79f1049c9981df9c349a3858a89e7.tar.gz
sonarqube-d2410ce9f3d79f1049c9981df9c349a3858a89e7.zip
Remove duplicated .gitignore
-rw-r--r--.gitignore14
-rw-r--r--sonar-ws/.gitignore1
2 files changed, 11 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index eeaa0bc6f63..fd5aad0f75a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,12 @@ out/
# Directories generated on build on Windows
bin/
+# npm logs
+npm-debug.log*
+npm.tar.gz
+yarn-debug.log*
+yarn-error.log*
+
# ---- Eclipse
.classpath
.project
@@ -37,10 +43,12 @@ Thumbs.db
# Folder config file
Desktop.ini
-# ---- vscode
-.vscode
+# ---- frontend
+node/
+node_modules/
+.vscode/
-# ---- Sonar
+# ---- SonarQube
.sonar/
# scripts patches, they are local to each developer
diff --git a/sonar-ws/.gitignore b/sonar-ws/.gitignore
deleted file mode 100644
index b83d22266ac..00000000000
--- a/sonar-ws/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/