From b8066e2cd0c8ae8384b68c81ea3a6c071cd44c51 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 30 Jul 2015 11:56:15 +0200
Subject: [PATCH] No more web url

---
 app/models/group.rb   |  5 -----
 app/models/project.rb |  3 +--
 app/models/user.rb    |  5 -----
 lib/api/entities.rb   | 12 ++++++++++--
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/models/group.rb b/app/models/group.rb
index 885d3b1e5a..cfb8faa149 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -17,7 +17,6 @@ require 'carrierwave/orm/activerecord'
 require 'file_size_validator'
 
 class Group < Namespace
-  include Rails.application.routes.url_helpers
   include Referable
 
   has_many :group_members, dependent: :destroy, as: :source, class_name: 'GroupMember'
@@ -63,10 +62,6 @@ class Group < Namespace
     end
   end
 
-  def web_url
-    group_url(self)
-  end
-
   def owners
     @owners ||= group_members.owners.map(&:user)
   end
diff --git a/app/models/project.rb b/app/models/project.rb
index 2d02996255..99be170731 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -36,7 +36,6 @@ class Project < ActiveRecord::Base
   include Gitlab::ConfigHelper
   include Gitlab::ShellAdapter
   include Gitlab::VisibilityLevel
-  include Rails.application.routes.url_helpers
   include Referable
   include Sortable
 
@@ -316,7 +315,7 @@ class Project < ActiveRecord::Base
   end
 
   def web_url
-    namespace_project_url(self.namespace, self)
+    Rails.application.routes.url_helpers.namespace_project_url(self.namespace, self)
   end
 
   def web_url_without_protocol
diff --git a/app/models/user.rb b/app/models/user.rb
index 6dd2271abe..4a10520b20 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -67,7 +67,6 @@ class User < ActiveRecord::Base
 
   include Gitlab::ConfigHelper
   include Gitlab::CurrentSettings
-  include Rails.application.routes.url_helpers
   include Referable
   include Sortable
   include TokenAuthenticatable
@@ -638,10 +637,6 @@ class User < ActiveRecord::Base
     end
   end
 
-  def web_url
-    user_url(self)
-  end
-
   def all_emails
     [self.email, *self.emails.map(&:email)]
   end
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index c1b0cece34..dcfd7a8e1a 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -5,7 +5,11 @@ module API
     end
 
     class UserBasic < UserSafe
-      expose :id, :state, :avatar_url, :web_url
+      expose :id, :state, :avatar_url
+
+      expose :web_url do |user, options|
+        Rails.application.routes.url_helpers.user_url(user)
+      end
     end
 
     class User < UserBasic
@@ -70,7 +74,11 @@ module API
 
     class Group < Grape::Entity
       expose :id, :name, :path, :description
-      expose :avatar_url, :web_url
+      expose :avatar_url
+
+      expose :web_url do |group, options|
+        Rails.application.routes.url_helpers.group_url(group)
+      end
     end
 
     class GroupDetail < Group