diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-11 16:32:11 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-11 16:32:11 +0200 |
commit | e3c30bf2e84462810bd8eff941681682a7ce6dc7 (patch) | |
tree | b7755ec091db0a66292a19dc2a909bcfad4f67e9 /spec/spec_helper.rb | |
parent | cd606e17907071af5ddf1d844deec0365c254604 (diff) | |
parent | 4f461fd45f65dbd6900088149b48649b27a7c2ce (diff) | |
download | gitlab-ce-e3c30bf2e84462810bd8eff941681682a7ce6dc7.tar.gz |
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8442d3f4445..dfe855926c6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -28,6 +28,7 @@ RSpec.configure do |config| config.include LoginHelpers, type: :feature config.include LoginHelpers, type: :request config.include StubConfiguration + config.include RelativeUrl, type: feature config.include TestEnv config.include StubGitlabCalls config.include StubGitlabData |