diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 21:06:37 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 21:06:37 +0000 |
commit | 4682f5015a5a2d7eedb66b3c90aee931d3789d0b (patch) | |
tree | 6240a8a5cf3584a893c6c3351141446e7856dc12 /spec/spec_helper.rb | |
parent | 6d59e989185a7d2645792b713d1b5d95d46651fd (diff) | |
download | gitlab-ce-4682f5015a5a2d7eedb66b3c90aee931d3789d0b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 61e50fe5723..7a5e570558e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -88,6 +88,7 @@ RSpec.configure do |config| config.include FixtureHelpers config.include GitlabRoutingHelper config.include StubFeatureFlags + config.include StubExperiments config.include StubGitlabCalls config.include StubGitlabData config.include NextInstanceOf @@ -378,3 +379,6 @@ end # Prevent Rugged from picking up local developer gitconfig. Rugged::Settings['search_path_global'] = Rails.root.join('tmp/tests').to_s + +# Disable timestamp checks for invisible_captcha +InvisibleCaptcha.timestamp_enabled = false |