diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-01 16:51:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-01 16:51:20 +0000 |
| commit | 5627542fd4f2d24f7f5b13cc6143d2b75aaac0e1 (patch) | |
| tree | 50f2d4c0d6e806b0baca9d5aad1afa36e277837d /spec/lib | |
| parent | c8038dc2439aa52331c08793c5ee609ed53e94e4 (diff) | |
| parent | 84b0ab77667b85a42db8a5a02d9758657af66f16 (diff) | |
| download | gitlab-ce-5627542fd4f2d24f7f5b13cc6143d2b75aaac0e1.tar.gz | |
Merge branch 'routing' into 'master'
Added & use Gitlab::Routing for URL helpers
Extracted from !3389
See merge request !3486
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/extracts_path_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/closing_issue_extractor_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/extracts_path_spec.rb b/spec/lib/extracts_path_spec.rb index f38fadda9ba..566035c60d0 100644 --- a/spec/lib/extracts_path_spec.rb +++ b/spec/lib/extracts_path_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe ExtractsPath, lib: true do include ExtractsPath include RepoHelpers - include Gitlab::Application.routes.url_helpers + include Gitlab::Routing.url_helpers let(:project) { double('project') } diff --git a/spec/lib/gitlab/closing_issue_extractor_spec.rb b/spec/lib/gitlab/closing_issue_extractor_spec.rb index 844fd79c991..a1f51429a79 100644 --- a/spec/lib/gitlab/closing_issue_extractor_spec.rb +++ b/spec/lib/gitlab/closing_issue_extractor_spec.rb @@ -236,6 +236,6 @@ describe Gitlab::ClosingIssueExtractor, lib: true do end def urls - Gitlab::Application.routes.url_helpers + Gitlab::Routing.url_helpers end end |