diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-06-13 14:18:01 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-06-20 14:51:49 +0200 |
| commit | 0e41564762cd74c6cbf938dcc319c3b77a891dc7 (patch) | |
| tree | 1a1a67a7eb29e4e42de345fbd70a86c6dcd35477 /spec/fast_spec_helper.rb | |
| parent | 3cd038e3046a18e38e25d7904cca9e38ea6565dd (diff) | |
| download | gitlab-ce-0e41564762cd74c6cbf938dcc319c3b77a891dc7.tar.gz | |
Backport gitlab.yml.example from EEconfig-yaml-differences
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.
Diffstat (limited to 'spec/fast_spec_helper.rb')
| -rw-r--r-- | spec/fast_spec_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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' |