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

Port gitlab-org/gitlab-ce!7033 to EE See merge request !814

Merge branch 'gitlab-ce-7033-port-to-ce' into 'master'
Port gitlab-org/gitlab-ce!7033 to EE See merge request !814
c41ed4d1 · Rémy Coutable · 964f7110 · 892d4c53 · c41ed4d1 · c41ed4d1
Commit c41ed4d1 authored Oct 21, 2016 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

features/support/capybara.rb features/support/capybara.rb +1 -1

spec/support/ldap_helpers.rb spec/support/ldap_helpers.rb +2 -0

No files found.
--- a/features/support/capybara.rb
+++ b/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
--- a/spec/support/ldap_helpers.rb
+++ b/spec/support/ldap_helpers.rb
+require_relative 'ee/ldap_helpers'
+
 module LdapHelpers
  include EE::LdapHelpers