diff options
author | Diana Stanley <dstanley@gitlab.com> | 2018-09-07 22:26:32 -0700 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-09-10 10:30:17 +0200 |
commit | 3414f33d72c07c1fcd7c56318f9e9e6bbc39eed9 (patch) | |
tree | 8d96d3399f64df4b9543d1d0ee9cc86100e1bdc1 /vendor/gitignore/Global | |
parent | bea943aed45c235d4c72f57a2693c1024afa662a (diff) | |
download | gitlab-ce-3414f33d72c07c1fcd7c56318f9e9e6bbc39eed9.tar.gz |
Update templates and licenses for 11.3dks-update-templates-licenses-11-3
Diffstat (limited to 'vendor/gitignore/Global')
-rw-r--r-- | vendor/gitignore/Global/Diff.gitignore | 2 | ||||
-rw-r--r-- | vendor/gitignore/Global/JetBrains.gitignore | 3 | ||||
-rw-r--r-- | vendor/gitignore/Global/MicrosoftOffice.gitignore | 3 |
3 files changed, 8 insertions, 0 deletions
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* |