diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-09-18 10:04:15 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-09-18 12:04:49 +0100 |
| commit | 5a883915793f0f89f850d5393dce497ff9c5f893 (patch) | |
| tree | 14a8e12d7554affbd48b29bc2e8efec082cbb128 /app/models/project_wiki.rb | |
| parent | 12f9879295ac9abdd0d6aff47cc3828c9ca36dc7 (diff) | |
| download | gitlab-ce-5a883915793f0f89f850d5393dce497ff9c5f893.tar.gz | |
Guard against regressions in commit email specs
Diffstat (limited to 'app/models/project_wiki.rb')
| -rw-r--r-- | app/models/project_wiki.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb index d3c6312baf2..761359b3c9f 100644 --- a/app/models/project_wiki.rb +++ b/app/models/project_wiki.rb @@ -184,11 +184,12 @@ class ProjectWiki def commit_details(action, message = nil, title = nil) commit_message = message || default_message(action, title) + git_user = Gitlab::Git::User.from_gitlab(@user) Gitlab::Git::Wiki::CommitDetails.new(@user.id, - @user.username, - @user.name, - @user.commit_email, + git_user.username, + git_user.name, + git_user.email, commit_message) end |