From 3414f33d72c07c1fcd7c56318f9e9e6bbc39eed9 Mon Sep 17 00:00:00 2001
From: Diana Stanley <dstanley@gitlab.com>
Date: Fri, 7 Sep 2018 22:26:32 -0700
Subject: Update templates and licenses for 11.3

---
 vendor/gitignore/Global/Diff.gitignore            |  2 ++
 vendor/gitignore/Global/JetBrains.gitignore       |  3 +++
 vendor/gitignore/Global/MicrosoftOffice.gitignore |  3 +++
 vendor/gitignore/KiCad.gitignore                  |  1 -
 vendor/gitignore/Processing.gitignore             |  2 ++
 vendor/gitignore/Python.gitignore                 |  7 +++++++
 vendor/gitignore/Rails.gitignore                  | 12 ++++++++++++
 vendor/gitignore/Swift.gitignore                  |  7 +++++++
 vendor/gitignore/Symfony.gitignore                |  4 ++++
 vendor/gitignore/TeX.gitignore                    |  3 +++
 vendor/gitignore/Terraform.gitignore              | 11 +++++++++++
 11 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 vendor/gitignore/Global/Diff.gitignore

(limited to 'vendor/gitignore')

diff --git a/vendor/gitignore/Global/Diff.gitignore b/vendor/gitignore/Global/Diff.gitignore
new file mode 100644
index 00000000000..59491b4440c
--- /dev/null
+++ b/vendor/gitignore/Global/Diff.gitignore
@@ -0,0 +1,2 @@
+*.patch
+*.diff
diff --git a/vendor/gitignore/Global/JetBrains.gitignore b/vendor/gitignore/Global/JetBrains.gitignore
index 0d95b087f19..343be1a3b8e 100644
--- a/vendor/gitignore/Global/JetBrains.gitignore
+++ b/vendor/gitignore/Global/JetBrains.gitignore
@@ -8,6 +8,9 @@
 .idea/**/dictionaries
 .idea/**/shelf
 
+# Generated files
+.idea/**/contentModel.xml
+
 # Sensitive or high-churn files
 .idea/**/dataSources/
 .idea/**/dataSources.ids
diff --git a/vendor/gitignore/Global/MicrosoftOffice.gitignore b/vendor/gitignore/Global/MicrosoftOffice.gitignore
index 0c203662d39..ddcc9cf6e38 100644
--- a/vendor/gitignore/Global/MicrosoftOffice.gitignore
+++ b/vendor/gitignore/Global/MicrosoftOffice.gitignore
@@ -3,6 +3,9 @@
 # Word temporary
 ~$*.doc*
 
+# Word Auto Backup File
+Backup of *.doc*
+
 # Excel temporary
 ~$*.xls*
 
diff --git a/vendor/gitignore/KiCad.gitignore b/vendor/gitignore/KiCad.gitignore
index 198392e551e..15fdf72ed48 100644
--- a/vendor/gitignore/KiCad.gitignore
+++ b/vendor/gitignore/KiCad.gitignore
@@ -9,7 +9,6 @@
 *~
 _autosave-*
 *.tmp
-*-cache.lib
 *-rescue.lib
 *-save.pro
 *-save.kicad_pcb
diff --git a/vendor/gitignore/Processing.gitignore b/vendor/gitignore/Processing.gitignore
index 85f269a89f6..333c0e0890a 100644
--- a/vendor/gitignore/Processing.gitignore
+++ b/vendor/gitignore/Processing.gitignore
@@ -1,5 +1,7 @@
 .DS_Store
 applet
+application.linux-arm64
+application.linux-armv6hf
 application.linux32
 application.linux64
 application.windows32
diff --git a/vendor/gitignore/Python.gitignore b/vendor/gitignore/Python.gitignore
index 894a44cc066..6f7a6d9c3d7 100644
--- a/vendor/gitignore/Python.gitignore
+++ b/vendor/gitignore/Python.gitignore
@@ -38,6 +38,7 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+.nox/
 .coverage
 .coverage.*
 .cache
@@ -72,6 +73,10 @@ target/
 # Jupyter Notebook
 .ipynb_checkpoints
 
+# IPython
+profile_default/
+ipython_config.py
+
 # pyenv
 .python-version
 
@@ -102,3 +107,5 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+.dmypy.json
+dmypy.json
diff --git a/vendor/gitignore/Rails.gitignore b/vendor/gitignore/Rails.gitignore
index e62f78e17bc..78eb74fdc26 100644
--- a/vendor/gitignore/Rails.gitignore
+++ b/vendor/gitignore/Rails.gitignore
@@ -47,3 +47,15 @@ bower.json
 # Ignore node_modules
 node_modules/
 
+# Ignore precompiled javascript packs
+/public/packs
+/public/packs-test
+
+# Ignore yarn files
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
+
+# Ignore uploaded files in development
+/storage/*
+!/storage/.keep
\ No newline at end of file
diff --git a/vendor/gitignore/Swift.gitignore b/vendor/gitignore/Swift.gitignore
index b8e04d98e33..7b0d62bc23a 100644
--- a/vendor/gitignore/Swift.gitignore
+++ b/vendor/gitignore/Swift.gitignore
@@ -69,3 +69,10 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots/**/*.png
 fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
diff --git a/vendor/gitignore/Symfony.gitignore b/vendor/gitignore/Symfony.gitignore
index d098259ffb0..3dab634c188 100644
--- a/vendor/gitignore/Symfony.gitignore
+++ b/vendor/gitignore/Symfony.gitignore
@@ -15,6 +15,10 @@
 !var/logs/.gitkeep
 !var/sessions/.gitkeep
 
+# Logs (Symfony4)
+/var/log/*
+!var/log/.gitkeep
+
 # Parameters
 /app/config/parameters.yml
 /app/config/parameters.ini
diff --git a/vendor/gitignore/TeX.gitignore b/vendor/gitignore/TeX.gitignore
index 79a66f9ebfa..ff87d483645 100644
--- a/vendor/gitignore/TeX.gitignore
+++ b/vendor/gitignore/TeX.gitignore
@@ -188,6 +188,9 @@ sympy-plots-for-*.tex/
 *.pytxcode
 pythontex-files-*/
 
+# tcolorbox
+*.listing
+
 # thmtools
 *.loe
 
diff --git a/vendor/gitignore/Terraform.gitignore b/vendor/gitignore/Terraform.gitignore
index d9397e2d7d9..a8935803468 100644
--- a/vendor/gitignore/Terraform.gitignore
+++ b/vendor/gitignore/Terraform.gitignore
@@ -13,3 +13,14 @@ crash.log
 # version control.
 #
 # example.tfvars
+
+# Ignore override files as they are usually used to override resources locally and so
+# are not checked in
+override.tf
+override.tf.json
+*_override.tf
+*_override.tf.json
+
+# Include override files you do wish to add to version control using negated pattern
+#
+# !example_override.tf
-- 
cgit v1.2.3