From 9823b03099cada338a9da978ca234354376a06cf Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Thu, 27 Aug 2020 15:05:09 +0800
Subject: [PATCH] FIX hash merge bug

---
 app/controllers/repositories_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index c968161b4..6dceb60a1 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -67,7 +67,7 @@ class RepositoriesController < ApplicationController
 
   def create_file
     content_params = content_params.merge(committer: {email: current_user.mail, name: current_user.login})
-    
+
     interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @project.owner.login, content_params)
     if interactor.success?
       @file = interactor.result
@@ -156,6 +156,10 @@ class RepositoriesController < ApplicationController
       new_branch: params[:new_branch],
       content: params[:content],
       message: params[:message],
+      committer: {
+        email: current_user.mail,
+        name: current_user.login
+      },
       identifier: @project.identifier
     }
   end