diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-10-08 10:55:57 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-10-08 10:55:57 +0000 |
| commit | e8f4bfd114f214e17f8777fdedc9aef79ee2552c (patch) | |
| tree | 4132da900e32ca7f0cb76a27cfe6ce3dac0e0fa0 | |
| parent | 651039ac5bd6cf617b6b497b8714430ace5cd43d (diff) | |
| parent | 339878e410cb3d24a405ff3f2fe0179fac837239 (diff) | |
| download | gitlab-ce-e8f4bfd114f214e17f8777fdedc9aef79ee2552c.tar.gz | |
Merge branch 'update-templates-11-4' into 'master'
Update templates for 11.4
See merge request gitlab-org/gitlab-ce!22188
| -rw-r--r-- | vendor/gitignore/Global/JetBrains.gitignore | 3 | ||||
| -rw-r--r-- | vendor/gitignore/Node.gitignore | 2 | ||||
| -rw-r--r-- | vendor/gitignore/TeX.gitignore | 6 | ||||
| -rw-r--r-- | vendor/gitignore/VisualStudio.gitignore | 6 |
4 files changed, 14 insertions, 3 deletions
diff --git a/vendor/gitignore/Global/JetBrains.gitignore b/vendor/gitignore/Global/JetBrains.gitignore index 343be1a3b8e..72f4d988a19 100644 --- a/vendor/gitignore/Global/JetBrains.gitignore +++ b/vendor/gitignore/Global/JetBrains.gitignore @@ -61,3 +61,6 @@ fabric.properties # Editor-based Rest Client .idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser diff --git a/vendor/gitignore/Node.gitignore b/vendor/gitignore/Node.gitignore index 3a4c8581b3a..c221276ebae 100644 --- a/vendor/gitignore/Node.gitignore +++ b/vendor/gitignore/Node.gitignore @@ -20,7 +20,7 @@ coverage # nyc test coverage .nyc_output -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) .grunt # Bower dependency directory (https://bower.io/) diff --git a/vendor/gitignore/TeX.gitignore b/vendor/gitignore/TeX.gitignore index ff87d483645..753f2b954ff 100644 --- a/vendor/gitignore/TeX.gitignore +++ b/vendor/gitignore/TeX.gitignore @@ -64,6 +64,9 @@ acs-*.bib # changes *.soc +# comment +*.cut + # cprotect *.cpt @@ -205,6 +208,9 @@ pythontex-files-*/ # easy-todo *.lod +# xcolor +*.xcp + # xmpincl *.xmpi diff --git a/vendor/gitignore/VisualStudio.gitignore b/vendor/gitignore/VisualStudio.gitignore index 94b41b913fb..4d13c54854e 100644 --- a/vendor/gitignore/VisualStudio.gitignore +++ b/vendor/gitignore/VisualStudio.gitignore @@ -4,6 +4,7 @@ ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # User-specific files +*.rsuser *.suo *.user *.userosscache @@ -76,6 +77,7 @@ StyleCopReport.xml *.tlh *.tmp *.tmp_proj +*_wpftmp.csproj *.log *.vspscc *.vssscc @@ -290,8 +292,8 @@ paket-files/ .idea/ *.sln.iml -# CodeRush -.cr/ +# CodeRush personal settings +.cr/personal # Python Tools for Visual Studio (PTVS) __pycache__/ |