summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-03-30 18:16:16 +0000
committerDJ Mountney <david@twkie.net>2017-04-04 14:17:23 -0700
commitdcca1500c62757fe820cdfd55441fbf305497401 (patch)
tree634f182bc05b20c1c703184accb65060d5e4fb02
parente431b4c49ea98ad4483e6cb0e9094fc6dc427cbe (diff)
downloadgitlab-ce-dcca1500c62757fe820cdfd55441fbf305497401.tar.gz
Merge branch '30284-fix-repo-clean-rules' into 'master'
Don't clean up the gitlab-test-fork_bare repo Closes #30284 See merge request !10342
-rw-r--r--spec/support/test_env.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 9da54cb886d..aad8ec38a9c 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -91,7 +91,7 @@ module TestEnv
tmp_test_path = Rails.root.join('tmp', 'tests', '**')
Dir[tmp_test_path].each do |entry|
- unless File.basename(entry) =~ /\Agitlab-(shell|test|test_bare|test-fork)\z/
+ unless File.basename(entry) =~ /\Agitlab-(shell|test|test_bare|test-fork|test-fork_bare)\z/
FileUtils.rm_rf(entry)
end
end