From 407c742596ff4d246ff438c64e46f08aeaf4ec2e Mon Sep 17 00:00:00 2001 From: KOUNOIKE Yuusuke Date: Tue, 19 Sep 2017 23:06:04 +0900 Subject: [PATCH] Use account.fullName instead of userName for Web UI edit, Wiki uploads. --- .../scala/gitbucket/core/controller/FileUploadController.scala | 2 +- .../gitbucket/core/controller/RepositoryViewerController.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/FileUploadController.scala b/src/main/scala/gitbucket/core/controller/FileUploadController.scala index 9f27caacd..49915f0ab 100644 --- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala +++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala @@ -80,7 +80,7 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R builder.finish() val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), - Constants.HEAD, loginAccount.userName, loginAccount.mailAddress, s"Uploaded ${fileName}") + Constants.HEAD, loginAccount.fullName, loginAccount.mailAddress, s"Uploaded ${fileName}") fileName } diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index b13dde1a6..4114242bf 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -717,7 +717,7 @@ trait RepositoryViewerControllerBase extends ControllerBase { f(git, headTip, builder, inserter) val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter), - headName, loginAccount.userName, loginAccount.mailAddress, message) + headName, loginAccount.fullName, loginAccount.mailAddress, message) inserter.flush() inserter.close()