Merge branch 'gitlab-ce-7033-port-to-ce' into 'master'

Port gitlab-org/gitlab-ce!7033 to EE

See merge request !814

features/support/capybara.rb

@@ -20,5 +20,5 @@ unless ENV['CI'] || ENV['CI_SERVER']
 end
 
 Spinach.hooks.before_run do
-  TestEnv.warm_asset_cache
+  TestEnv.warm_asset_cache unless ENV['CI'] || ENV['CI_SERVER']
 end

spec/support/ldap_helpers.rb

+require_relative 'ee/ldap_helpers'
+
 module LdapHelpers
   include EE::LdapHelpers