floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_trustie' into dev_devops

This commit is contained in:
Jasder 2020-08-27 15:05:24 +08:00
parent 43a8576089 9823b03099
commit f09a9bdedc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/repositories_controller.rb
View File

@ -67,7 +67,7 @@ class RepositoriesController < ApplicationController
def create_file def create_file
content_params = content_params.merge(committer: {email: current_user.mail, name: current_user.login}) 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) interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @project.owner.login, content_params)
if interactor.success? if interactor.success?
@file = interactor.result @file = interactor.result
@ -156,6 +156,10 @@ class RepositoriesController < ApplicationController
new_branch: params[:new_branch], new_branch: params[:new_branch],
content: params[:content], content: params[:content],
message: params[:message], message: params[:message],
committer: {
email: current_user.mail,
name: current_user.login
},
identifier: @project.identifier identifier: @project.identifier
} }
end end