Commit 13810b39 authored by GitLab Bot's avatar GitLab Bot

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

parent 6438df3a
...@@ -308,7 +308,7 @@ rspec db-library-code pg12: ...@@ -308,7 +308,7 @@ rspec db-library-code pg12:
- .rails:rules:ee-and-foss-db-library-code - .rails:rules:ee-and-foss-db-library-code
script: script:
- *base-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: rspec fast_spec_helper:
extends: extends:
......
...@@ -75,6 +75,16 @@ function rspec_simple_job() { ...@@ -75,6 +75,16 @@ function rspec_simple_job() {
bin/rspec -Ispec -rspec_helper --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml ${rspec_opts} 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() { function rspec_paralellized_job() {
read -ra job_name <<< "${CI_JOB_NAME}" read -ra job_name <<< "${CI_JOB_NAME}"
local test_tool="${job_name[0]}" local test_tool="${job_name[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/
Leiningen.gitignore
\ No newline at end of file
# 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
# 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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment