diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-09-03 18:56:55 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-09-03 18:56:55 +0300 |
| commit | 4bf01ce52fc91445d44cd0e993770c030ad53a68 (patch) | |
| tree | f2bc7af41ab4ec912cd58e76bd976525e85a10e9 | |
| parent | 8d687c511738a01ac094316f6f834ac26378699f (diff) | |
| parent | 6ef271af8f0f6507e83acf54869380acc8a30a8d (diff) | |
Merge branch 'fixes-broken-master-on-anonymous-session' into 'master'
Uses spec_helper instead of rails_helper
Closes #66952
See merge request gitlab-org/gitlab-ce!32594
| -rw-r--r-- | spec/lib/gitlab/anonymous_session_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/anonymous_session_spec.rb b/spec/lib/gitlab/anonymous_session_spec.rb index 628aae81ada..94daa0f2470 100644 --- a/spec/lib/gitlab/anonymous_session_spec.rb +++ b/spec/lib/gitlab/anonymous_session_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require 'spec_helper' describe Gitlab::AnonymousSession, :clean_gitlab_redis_shared_state do let(:default_session_id) { '6919a6f1bb119dd7396fadc38fd18d0d' } |