3 files changed, 10 insertions, 4 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 35d8f9a0154..9b192a8ad37 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -665,6 +665,12 @@ class Project < ActiveRecord::Base
     end
   end
 
+  # This enables us to write `namespace_project_path(*project)` instead of
+  # `namespace_project_path(*project)` in views.
+  def to_a
+    [namespace, self]
+  end
+
   # `from` argument can be a Namespace or Project.
   def to_reference(from = nil, full: false)
     if full || cross_namespace_reference?(from)
@@ -683,7 +689,7 @@ class Project < ActiveRecord::Base
   end
 
   def web_url
-    Gitlab::Routing.url_helpers.namespace_project_url(self.namespace, self)
+    Gitlab::Routing.url_helpers.namespace_project_url(*self)
   end
 
   def new_issue_address(author)
diff --git a/app/models/project_services/gitlab_issue_tracker_service.rb b/app/models/project_services/gitlab_issue_tracker_service.rb
index ad4eb9536e1..3ba3401e820 100644
--- a/app/models/project_services/gitlab_issue_tracker_service.rb
+++ b/app/models/project_services/gitlab_issue_tracker_service.rb
@@ -12,7 +12,7 @@ class GitlabIssueTrackerService < IssueTrackerService
   end
 
   def project_url
-    namespace_project_issues_url(project.namespace, project)
+    namespace_project_issues_url(*project)
   end
 
   def new_issue_url
@@ -24,7 +24,7 @@ class GitlabIssueTrackerService < IssueTrackerService
   end
 
   def project_path
-    namespace_project_issues_path(project.namespace, project)
+    namespace_project_issues_path(*project)
   end
 
   def new_issue_path
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index f26ee57510c..1c54ce38167 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -31,7 +31,7 @@ class ProjectWiki
   end
 
   def web_url
-    Gitlab::Routing.url_helpers.namespace_project_wiki_url(@project.namespace, @project, :home)
+    Gitlab::Routing.url_helpers.namespace_project_wiki_url(*@project, :home)
   end
 
   def url_to_repo