From 0e41564762cd74c6cbf938dcc319c3b77a891dc7 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Thu, 13 Jun 2019 14:18:01 +0200 Subject: Backport gitlab.yml.example from EE To make this happen, we need to conditionally add the group_saml strategy when running tests, but only on EE. This requires some changes to Gitlab.ee? so that it can be used before/without loading the Rails environment. We also have to change how we require a few files, so this can run outside of Rails. --- spec/fast_spec_helper.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/fast_spec_helper.rb') diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb index 0b5ab16ad71..91ef7653822 100644 --- a/spec/fast_spec_helper.rb +++ b/spec/fast_spec_helper.rb @@ -3,6 +3,7 @@ require 'bundler/setup' ENV['GITLAB_ENV'] = 'test' ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true' +require 'active_support/dependencies' require_relative '../config/settings' require_relative 'support/rspec' require 'active_support/all' -- cgit v1.2.1