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 /lib/gitlab/url_builder.rb | |
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 'lib/gitlab/url_builder.rb')
-rw-r--r-- | lib/gitlab/url_builder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb index e157bb96f2a..f301d42939d 100644 --- a/lib/gitlab/url_builder.rb +++ b/lib/gitlab/url_builder.rb @@ -1,6 +1,6 @@ module Gitlab class UrlBuilder - include Gitlab::Application.routes.url_helpers + include Gitlab::Routing.url_helpers include GitlabRoutingHelper include ActionView::RecordIdentifier |