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_chain

This commit is contained in:
sylor_huang@126.com 2020-07-03 17:37:33 +08:00
parent c96dcb14e7 d92c57c1b9
commit 153496c089
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/pull_requests_controller.rb
View File

@ -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]
}

2
app/controllers/repositories_controller.rb
View File

@ -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