summaryrefslogtreecommitdiff
path: root/vendor/gitignore
diff options
context:
space:
mode:
authorAlessio Caiazza <acaiazza@gitlab.com>2017-09-07 11:25:06 +0200
committerAlessio Caiazza <acaiazza@gitlab.com>2017-09-07 11:25:06 +0200
commit3dafd75e471110109dc6c36b6acf56603f8a11e4 (patch)
tree7617bcb3d0a6d7c8dd4c56f1885aa6281a59d723 /vendor/gitignore
parent43f474901db9ca4192940af38519befb91c6f241 (diff)
downloadgitlab-ce-3dafd75e471110109dc6c36b6acf56603f8a11e4.tar.gz
Update templates for 10.0update-templates-for-10-0
Diffstat (limited to 'vendor/gitignore')
-rw-r--r--vendor/gitignore/Actionscript.gitignore5
-rw-r--r--vendor/gitignore/Drupal.gitignore3
l---------vendor/gitignore/Kotlin.gitignore1
-rw-r--r--vendor/gitignore/Nanoc.gitignore2
-rw-r--r--vendor/gitignore/Node.gitignore2
-rw-r--r--vendor/gitignore/Qt.gitignore2
-rw-r--r--vendor/gitignore/Swift.gitignore1
-rw-r--r--vendor/gitignore/Terraform.gitignore1
-rw-r--r--vendor/gitignore/VisualStudio.gitignore4
9 files changed, 16 insertions, 5 deletions
diff --git a/vendor/gitignore/Actionscript.gitignore b/vendor/gitignore/Actionscript.gitignore
index 11e612e9853..5d947ca8879 100644
--- a/vendor/gitignore/Actionscript.gitignore
+++ b/vendor/gitignore/Actionscript.gitignore
@@ -1,9 +1,8 @@
# Build and Release Folders
-bin/
bin-debug/
bin-release/
-[Oo]bj/ # FlashDevelop obj
-[Bb]in/ # FlashDevelop bin
+[Oo]bj/
+[Bb]in/
# Other files and folders
.settings/
diff --git a/vendor/gitignore/Drupal.gitignore b/vendor/gitignore/Drupal.gitignore
index 0d2fe537f46..072b683190f 100644
--- a/vendor/gitignore/Drupal.gitignore
+++ b/vendor/gitignore/Drupal.gitignore
@@ -1,10 +1,12 @@
# Ignore configuration files that may contain sensitive information.
sites/*/*settings*.php
+sites/example.sites.php
# Ignore paths that contain generated content.
files/
sites/*/files
sites/*/private
+sites/*/translations
# Ignore default text files
robots.txt
@@ -16,6 +18,7 @@ robots.txt
/UPGRADE.txt
/README.txt
sites/README.txt
+sites/all/libraries/README.txt
sites/all/modules/README.txt
sites/all/themes/README.txt
diff --git a/vendor/gitignore/Kotlin.gitignore b/vendor/gitignore/Kotlin.gitignore
new file mode 120000
index 00000000000..c48376eebcf
--- /dev/null
+++ b/vendor/gitignore/Kotlin.gitignore
@@ -0,0 +1 @@
+Java.gitignore \ No newline at end of file
diff --git a/vendor/gitignore/Nanoc.gitignore b/vendor/gitignore/Nanoc.gitignore
index 3f36ea2a878..6f35daaf478 100644
--- a/vendor/gitignore/Nanoc.gitignore
+++ b/vendor/gitignore/Nanoc.gitignore
@@ -4,7 +4,7 @@
output/
# Temporary file directory
-tmp/
+tmp/nanoc/
# Crash Log
crash.log
diff --git a/vendor/gitignore/Node.gitignore b/vendor/gitignore/Node.gitignore
index 00cbbdf53f6..97e28736892 100644
--- a/vendor/gitignore/Node.gitignore
+++ b/vendor/gitignore/Node.gitignore
@@ -29,7 +29,7 @@ bower_components
# node-waf configuration
.lock-wscript
-# Compiled binary addons (http://nodejs.org/api/addons.html)
+# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release
# Dependency directories
diff --git a/vendor/gitignore/Qt.gitignore b/vendor/gitignore/Qt.gitignore
index 5fa47c5a1f2..fe67fdf1ee6 100644
--- a/vendor/gitignore/Qt.gitignore
+++ b/vendor/gitignore/Qt.gitignore
@@ -26,6 +26,8 @@ moc_*.cpp
moc_*.h
qrc_*.cpp
ui_*.h
+*.qmlc
+*.jsc
Makefile*
*build-*
diff --git a/vendor/gitignore/Swift.gitignore b/vendor/gitignore/Swift.gitignore
index d5340449396..161179bff3e 100644
--- a/vendor/gitignore/Swift.gitignore
+++ b/vendor/gitignore/Swift.gitignore
@@ -37,6 +37,7 @@ playground.xcworkspace
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
+# Package.resolved
.build/
# CocoaPods
diff --git a/vendor/gitignore/Terraform.gitignore b/vendor/gitignore/Terraform.gitignore
index 41859c81f1c..f20453be963 100644
--- a/vendor/gitignore/Terraform.gitignore
+++ b/vendor/gitignore/Terraform.gitignore
@@ -1,5 +1,6 @@
# Compiled files
*.tfstate
+*.tfstate.*.backup
*.tfstate.backup
# Module directory
diff --git a/vendor/gitignore/VisualStudio.gitignore b/vendor/gitignore/VisualStudio.gitignore
index 89c66054885..f652b45c2ee 100644
--- a/vendor/gitignore/VisualStudio.gitignore
+++ b/vendor/gitignore/VisualStudio.gitignore
@@ -116,6 +116,10 @@ _TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
# Visual Studio code coverage results
*.coverage
*.coveragexml