diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-04 16:13:48 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-04 16:13:48 +0000 |
| commit | 450fa60f48007182f83ac5d17b23bff7be7a7bdb (patch) | |
| tree | 8031cfd5cf0e3b084d0dfda4502a469e08df6e48 | |
| parent | e299d595c790c355eff9d3719dce824e8380f983 (diff) | |
| parent | b9075d22d7315bd9f408e0ec460b8b3c7273891d (diff) | |
| download | gitlab-ce-450fa60f48007182f83ac5d17b23bff7be7a7bdb.tar.gz | |
Merge branch 'revert-6291bc8c' into 'master'
Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"
See merge request !13292
| -rw-r--r-- | spec/support/test_env.rb | 1 |
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..." |