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 /app/models | |
| 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 'app/models')
| -rw-r--r-- | app/models/milestone.rb | 2 | ||||
| -rw-r--r-- | app/models/project.rb | 4 | ||||
| -rw-r--r-- | app/models/project_services/gitlab_issue_tracker_service.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/jira_service.rb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 07196c0fca4..986184dd301 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -89,7 +89,7 @@ class Milestone < ActiveRecord::Base def to_reference(from_project = nil) escaped_title = self.title.gsub("]", "\\]") - h = Gitlab::Application.routes.url_helpers + h = Gitlab::Routing.url_helpers url = h.namespace_project_milestone_url(self.project.namespace, self.project, self) "[#{escaped_title}](#{url})" diff --git a/app/models/project.rb b/app/models/project.rb index f208965086d..c5022fd4ffc 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -471,7 +471,7 @@ class Project < ActiveRecord::Base end def web_url - Gitlab::Application.routes.url_helpers.namespace_project_url(self.namespace, self) + Gitlab::Routing.url_helpers.namespace_project_url(self.namespace, self) end def web_url_without_protocol @@ -592,7 +592,7 @@ class Project < ActiveRecord::Base if avatar.present? [gitlab_config.url, avatar.url].join elsif avatar_in_git - Gitlab::Application.routes.url_helpers.namespace_project_avatar_url(namespace, self) + Gitlab::Routing.url_helpers.namespace_project_avatar_url(namespace, self) end end diff --git a/app/models/project_services/gitlab_issue_tracker_service.rb b/app/models/project_services/gitlab_issue_tracker_service.rb index 05436cd0f79..eaa5654b9c6 100644 --- a/app/models/project_services/gitlab_issue_tracker_service.rb +++ b/app/models/project_services/gitlab_issue_tracker_service.rb @@ -20,7 +20,7 @@ # class GitlabIssueTrackerService < IssueTrackerService - include Gitlab::Application.routes.url_helpers + include Gitlab::Routing.url_helpers prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index aba37921c09..1ed42c4f3e7 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -21,7 +21,7 @@ class JiraService < IssueTrackerService include HTTParty - include Gitlab::Application.routes.url_helpers + include Gitlab::Routing.url_helpers DEFAULT_API_VERSION = 2 |