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