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

新增: compare 支持sha对比

This commit is contained in:
yystopf 2022-06-30 16:33:09 +08:00
parent a608803aa8
commit 9dbb9a42d6
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/compare_controller.rb
View File

@ -6,6 +6,10 @@ class CompareController < ApplicationController
end end
def show def show
if params[:type] == "sha"
load_compare_params
@compare_result ||= gitea_compare(@base, @head)
else
load_compare_params load_compare_params
compare compare
@merge_status, @merge_message = get_merge_message @merge_status, @merge_message = get_merge_message
@ -14,6 +18,7 @@ class CompareController < ApplicationController
@page_offset = (@page_size -1) * @page_limit @page_offset = (@page_size -1) * @page_limit
Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}") Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}")
end end
end
private private
def get_merge_message def get_merge_message