1 files changed, 7 insertions, 5 deletions
diff --git a/lib/gitlab/git/user.rb b/lib/gitlab/git/user.rb
index ea634d39668..da74719ae87 100644
--- a/lib/gitlab/git/user.rb
+++ b/lib/gitlab/git/user.rb
@@ -1,24 +1,26 @@
 module Gitlab
   module Git
     class User
-      attr_reader :name, :email, :gl_id
+      attr_reader :username, :name, :email, :gl_id
 
       def self.from_gitlab(gitlab_user)
-        new(gitlab_user.name, gitlab_user.email, Gitlab::GlId.gl_id(gitlab_user))
+        new(gitlab_user.username, gitlab_user.name, gitlab_user.email, Gitlab::GlId.gl_id(gitlab_user))
       end
 
+      # TODO support the username field in Gitaly https://gitlab.com/gitlab-org/gitaly/issues/628
       def self.from_gitaly(gitaly_user)
-        new(gitaly_user.name, gitaly_user.email, gitaly_user.gl_id)
+        new('', gitaly_user.name, gitaly_user.email, gitaly_user.gl_id)
       end
 
-      def initialize(name, email, gl_id)
+      def initialize(username, name, email, gl_id)
+        @username = username
         @name = name
         @email = email
         @gl_id = gl_id
       end
 
       def ==(other)
-        [name, email, gl_id] == [other.name, other.email, other.gl_id]
+        [username, name, email, gl_id] == [other.username, other.name, other.email, other.gl_id]
       end
     end
   end