diff options
author | Marin Jankovski <maxlazio@gmail.com> | 2017-09-01 10:21:18 +0300 |
---|---|---|
committer | Marin Jankovski <maxlazio@gmail.com> | 2017-09-01 10:21:18 +0300 |
commit | 28060caa0ade7566a38e3ed17f2db8bf9116dc1b (patch) | |
tree | 3886373472541059bf04cd95dbc4595189f0d600 /spec/support | |
parent | 7d38df306c73af354286cecb24b19155e537797b (diff) | |
parent | 6f96ccaa7dd53a7462b86a0ebe8af66afde86aa2 (diff) |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/stub_env.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/support/stub_env.rb b/spec/support/stub_env.rb index b8928867174..19fbe572930 100644 --- a/spec/support/stub_env.rb +++ b/spec/support/stub_env.rb @@ -1,5 +1,7 @@ # Inspired by https://github.com/ljkbennett/stub_env/blob/master/lib/stub_env/helpers.rb module StubENV + include Gitlab::CurrentSettings + def stub_env(key_or_hash, value = nil) init_stub unless env_stubbed? if key_or_hash.is_a? Hash |