diff options
author | Nick Thomas <nick@gitlab.com> | 2018-09-14 09:52:09 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-09-14 09:52:09 +0000 |
commit | fc0194b589238df6171ba3f4aeec79f8034b7128 (patch) | |
tree | cf61e7a7f0fa45b80de2a47f59d34bb60c1e4aab /lib/gitlab/git | |
parent | 9de6efe6d18b0c6881aa5074d6e805ac6202d5e5 (diff) | |
download | gitlab-ce-fc0194b589238df6171ba3f4aeec79f8034b7128.tar.gz |
Resolve "Add functionality to change what email address online actions commit using"
Diffstat (limited to 'lib/gitlab/git')
-rw-r--r-- | lib/gitlab/git/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/user.rb b/lib/gitlab/git/user.rb index e573cd0e143..338e1a30c45 100644 --- a/lib/gitlab/git/user.rb +++ b/lib/gitlab/git/user.rb @@ -4,7 +4,7 @@ module Gitlab attr_reader :username, :name, :email, :gl_id def self.from_gitlab(gitlab_user) - new(gitlab_user.username, gitlab_user.name, gitlab_user.email, Gitlab::GlId.gl_id(gitlab_user)) + new(gitlab_user.username, gitlab_user.name, gitlab_user.commit_email, Gitlab::GlId.gl_id(gitlab_user)) end def self.from_gitaly(gitaly_user) |