diff options
| author | DJ Mountney <dj@gitlab.com> | 2017-07-10 21:20:52 +0000 |
|---|---|---|
| committer | DJ Mountney <dj@gitlab.com> | 2017-07-10 21:20:52 +0000 |
| commit | e643c0db35617d2b0ba607708322e827c15ce132 (patch) | |
| tree | 2094291da16a3c4021176f7441b865970cfeccf8 /spec/spec_helper.rb | |
| parent | ba4250c119df661f32bc7e72b8001798464a9785 (diff) | |
| parent | 26b6e299e1c97b956306572c5c9f6c02f428bfd7 (diff) | |
| download | gitlab-ce-e643c0db35617d2b0ba607708322e827c15ce132.tar.gz | |
Merge branch 'master' into 'catch-redis-address-error'
# Conflicts:
# lib/gitlab/current_settings.rb
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index fdef6fd5221..a497b8613bb 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -57,7 +57,7 @@ RSpec.configure do |config| config.include StubGitlabCalls config.include StubGitlabData config.include ApiHelpers, :api - config.include Rails.application.routes.url_helpers, type: :routing + config.include Gitlab::Routing, type: :routing config.include MigrationsHelpers, :migration config.infer_spec_type_from_file_location! |