From 5a883915793f0f89f850d5393dce497ff9c5f893 Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Tue, 18 Sep 2018 10:04:15 +0100 Subject: Guard against regressions in commit email specs --- app/models/project_wiki.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/models/project_wiki.rb') 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 -- cgit v1.2.3