Add latest changes from gitlab-org/gitlab@13-8-stable-ee

7 files changed, 14 insertions, 70 deletions

diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 7f8dfa900ca..a2a16424f4a 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -308,7 +308,7 @@ rspec db-library-code pg12:
     - .rails:rules:ee-and-foss-db-library-code
   script:
     - *base-script
-    - rspec_simple_job "-- spec/lib/gitlab/database/ spec/support/helpers/database/ ee/spec/lib/gitlab/database/ ee/spec/lib/ee/gitlab/database_spec.rb"
+    - rspec_db_library_code
 
 rspec fast_spec_helper:
   extends:
diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh
index 85d7dcec476..d9957fb6ced 100644
--- a/scripts/rspec_helpers.sh
+++ b/scripts/rspec_helpers.sh
@@ -75,6 +75,16 @@ function rspec_simple_job() {
   bin/rspec -Ispec -rspec_helper --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml ${rspec_opts}
 }
 
+function rspec_db_library_code() {
+  local db_files="spec/lib/gitlab/database/ spec/support/helpers/database/"
+
+  if [[ -d "ee/" ]]; then
+    db_files="${db_files} ee/spec/lib/gitlab/database/ ee/spec/lib/ee/gitlab/database_spec.rb"
+  fi
+
+  rspec_simple_job "-- ${db_files}"
+}
+
 function rspec_paralellized_job() {
   read -ra job_name <<< "${CI_JOB_NAME}"
   local test_tool="${job_name[0]}"
diff --git a/vendor/gitignore/Clojure.gitignore b/vendor/gitignore/Clojure.gitignore
index a4cb69a32cc..7657a270c45 100644..120000
--- a/vendor/gitignore/Clojure.gitignore
+++ b/vendor/gitignore/Clojure.gitignore
@@ -1,14 +1 @@
-pom.xml
-pom.xml.asc
-*.jar
-*.class
-/lib/
-/classes/
-/target/
-/checkouts/
-.lein-deps-sum
-.lein-repl-history
-.lein-plugins/
-.lein-failures
-.nrepl-port
-.cpcache/
+Leiningen.gitignore
\ No newline at end of file
diff --git a/vendor/gitignore/Fortran.gitignore b/vendor/gitignore/Fortran.gitignore
index 259148fa18f..5daba98a3e6 100644..120000
--- a/vendor/gitignore/Fortran.gitignore
+++ b/vendor/gitignore/Fortran.gitignore
@@ -1,32 +1 @@
-# 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
+C++.gitignore
\ No newline at end of file
diff --git a/vendor/gitignore/Kotlin.gitignore b/vendor/gitignore/Kotlin.gitignore
index a1c2a238a96..c48376eebcf 100644..120000
--- a/vendor/gitignore/Kotlin.gitignore
+++ b/vendor/gitignore/Kotlin.gitignore
@@ -1,23 +1 @@
-# 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*
+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
--- /dev/null
+++ b/vendor/project_templates/kotlin_native_linux.tar.gz
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
--- /dev/null
+++ b/vendor/project_templates/learn_gitlab_gold_trial.tar.gz