From 13810b39c4b177b36d5d629923c2a595f7fa6509 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 20 Jan 2021 23:01:21 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee

---
 vendor/gitignore/Clojure.gitignore                 |  15 +---------
 vendor/gitignore/Fortran.gitignore                 |  33 +--------------------
 vendor/gitignore/Kotlin.gitignore                  |  24 +--------------
 .../project_templates/kotlin_native_linux.tar.gz   | Bin 0 -> 60265 bytes
 .../learn_gitlab_gold_trial.tar.gz                 | Bin 0 -> 115096 bytes
 5 files changed, 3 insertions(+), 69 deletions(-)
 mode change 100644 => 120000 vendor/gitignore/Clojure.gitignore
 mode change 100644 => 120000 vendor/gitignore/Fortran.gitignore
 mode change 100644 => 120000 vendor/gitignore/Kotlin.gitignore
 create mode 100644 vendor/project_templates/kotlin_native_linux.tar.gz
 create mode 100644 vendor/project_templates/learn_gitlab_gold_trial.tar.gz

(limited to 'vendor')

diff --git a/vendor/gitignore/Clojure.gitignore b/vendor/gitignore/Clojure.gitignore
deleted file mode 100644
index a4cb69a32cc..00000000000
--- a/vendor/gitignore/Clojure.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-pom.xml
-pom.xml.asc
-*.jar
-*.class
-/lib/
-/classes/
-/target/
-/checkouts/
-.lein-deps-sum
-.lein-repl-history
-.lein-plugins/
-.lein-failures
-.nrepl-port
-.cpcache/
diff --git a/vendor/gitignore/Clojure.gitignore b/vendor/gitignore/Clojure.gitignore
new file mode 120000
index 00000000000..7657a270c45
--- /dev/null
+++ b/vendor/gitignore/Clojure.gitignore
@@ -0,0 +1 @@
+Leiningen.gitignore
\ No newline at end of file
diff --git a/vendor/gitignore/Fortran.gitignore b/vendor/gitignore/Fortran.gitignore
deleted file mode 100644
index 259148fa18f..00000000000
--- a/vendor/gitignore/Fortran.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-# Prerequisites
-*.d
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
diff --git a/vendor/gitignore/Fortran.gitignore b/vendor/gitignore/Fortran.gitignore
new file mode 120000
index 00000000000..5daba98a3e6
--- /dev/null
+++ b/vendor/gitignore/Fortran.gitignore
@@ -0,0 +1 @@
+C++.gitignore
\ No newline at end of file
diff --git a/vendor/gitignore/Kotlin.gitignore b/vendor/gitignore/Kotlin.gitignore
deleted file mode 100644
index a1c2a238a96..00000000000
--- a/vendor/gitignore/Kotlin.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
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/project_templates/kotlin_native_linux.tar.gz b/vendor/project_templates/kotlin_native_linux.tar.gz
new file mode 100644
index 00000000000..6c50c96ae9b
Binary files /dev/null and b/vendor/project_templates/kotlin_native_linux.tar.gz differ
diff --git a/vendor/project_templates/learn_gitlab_gold_trial.tar.gz b/vendor/project_templates/learn_gitlab_gold_trial.tar.gz
new file mode 100644
index 00000000000..2ec47956706
Binary files /dev/null and b/vendor/project_templates/learn_gitlab_gold_trial.tar.gz differ
-- 
cgit v1.2.3