From 3cae1d4eb7f9ea8b9e9b884fdafbfb6867d86fb0 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Fri, 3 Jul 2020 17:35:34 +0800 Subject: [PATCH 1/2] FIX merge pr bug for gitea platform --- app/controllers/pull_requests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index f5b27526a..dec451376 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -188,7 +188,7 @@ class PullRequestsController < ApplicationController ActiveRecord::Base.transaction do begin requests_params = { - do: params[:do], + Do: params[:do], MergeMessageField: params[:body], MergeTitleField: params[:title] } From 3594ea01d2a7f212570ce2f7859087f463a05943 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 3 Jul 2020 17:35:35 +0800 Subject: [PATCH 2/2] show commmits --- app/controllers/repositories_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 840c8a1b0..1c426af1a 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -53,6 +53,8 @@ class RepositoriesController < ApplicationController @project_owner = @project.owner @hash_commit = Gitea::Repository::Commits::ListService.new(@project_owner.login, @project.identifier, sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call + Rails.logger.info("#####################_______hash_commit______############{@hash_commit}") + Rails.logger.info("#####################_______hash_commit_size______############{@hash_commit.size}") end def commit