Add project star and fork count, group avatar URL and user/group web URL attributes to API

2 files changed, 15 insertions, 0 deletions

diff --git a/app/models/group.rb b/app/models/group.rb
index 051c672cb33..adcbbec465e 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -17,6 +17,7 @@ require 'carrierwave/orm/activerecord'
 require 'file_size_validator'
 
 class Group < Namespace
+  include Gitlab::ConfigHelper
   include Referable
 
   has_many :group_members, dependent: :destroy, as: :source, class_name: 'GroupMember'
@@ -56,6 +57,16 @@ class Group < Namespace
     name
   end
 
+  def avatar_url(size = nil)
+    if avatar.present?
+      [gitlab_config.url, avatar.url].join
+    end
+  end
+
+  def web_url
+    [gitlab_config.url, "groups", self.path].join('/')
+  end
+
   def owners
     @owners ||= group_members.owners.map(&:user)
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4a10520b209..00a37cd9135 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -637,6 +637,10 @@ class User < ActiveRecord::Base
     end
   end
 
+  def web_url
+    [gitlab_config.url, "u", self.username].join('/')
+  end
+
   def all_emails
     [self.email, *self.emails.map(&:email)]
   end