diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-31 19:02:19 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-08-31 19:02:19 +0300 |
| commit | 92edb3edab89dcb7b87bad3ac0fe7fed404fea85 (patch) | |
| tree | b96e7b9d37a789ad252ee5c01a6c2811b9bc88d5 /spec/support | |
| parent | 7c215dd23dfa942d6b83252403ce326df96ab3ea (diff) | |
| parent | 9aef0427eb9986fc27a399ea6b47e1518d6ebdac (diff) | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# app/models/issue.rb
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 |