summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-08-03 19:21:43 +0000
committerRobert Speicher <robert@gitlab.com>2017-08-03 19:21:43 +0000
commitb9075d22d7315bd9f408e0ec460b8b3c7273891d (patch)
tree9ef928f089e8892d8612f082a1a6748a1ef6472b
parentdb271a6b051f9630d5dfb3acbbd78f150cb3f23f (diff)
downloadgitlab-ce-b9075d22d7315bd9f408e0ec460b8b3c7273891d.tar.gz
Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"revert-6291bc8c
This reverts merge request !12761
-rw-r--r--spec/support/test_env.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index bed78928f14..c1298ed9cae 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -229,7 +229,6 @@ module TestEnv
# Otherwise they'd be created by the first test, often timing out and
# causing a transient test failure
def eager_load_driver_server
- return unless ENV['CI']
return unless defined?(Capybara)
puts "Starting the Capybara driver server..."