floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-21 20:25:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
“xxq250”
2022-07-28 16:42:29 +08:00
parent 4ccf8ea5ff d5c141f892
commit fbc1f95cd1
8 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/api/v1/projects/contents_controller.rb
View File

@@ -2,7 +2,11 @@ class Api::V1::Projects::ContentsController < Api::V1::BaseController
before_action :require_operate_above, only: [:batch]
def batch
@result_object = Api::V1::Projects::Contents::BatchCreateService.call(@project, batch_content_params, current_user&.gitea_token)
@batch_content_params = batch_content_params
# 处理下author和committer信息，如果没传则默认为当前用户信息
@batch_content_params.merge!(author_email: current_user.mail, author_name: current_user.login) if batch_content_params[:author_email].blank? && batch_content_params[:author_name].blank?
@batch_content_params.merge!(committer_email: current_user.mail, committer_name: current_user.login) if batch_content_params[:committer_email].blank? && batch_content_params[:committer_name].blank?
@result_object = Api::V1::Projects::Contents::BatchCreateService.call(@project, @batch_content_params, current_user&.gitea_token)
puts @result_object
end

2
app/controllers/api/v1/projects/pulls_controller.rb → app/controllers/api/v1/projects/pulls/pulls_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::Projects::PullsController < Api::V1::BaseController
class Api::V1::Projects::Pulls::PullsController < Api::V1::BaseController
before_action :require_public_and_member_above
def index