diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c937aa79..dfca5fa48 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -619,7 +619,7 @@ class ApplicationController < ActionController::Base def kaminari_paginate(relation) limit = params[:limit] || params[:per_page] - limit = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i + limit = (limit.to_i.zero? || limit.to_i > 25) ? 25 : limit.to_i page = params[:page].to_i.zero? ? 1 : params[:page].to_i relation.page(page).per(limit) diff --git a/app/models/trace_user.rb b/app/models/trace_user.rb index 1d2cd0b4c..69198706e 100644 --- a/app/models/trace_user.rb +++ b/app/models/trace_user.rb @@ -32,7 +32,7 @@ class TraceUser < ApplicationRecord self.username = user.login self.password = SecureRandom.hex self.unit = user.custom_department.blank? ? 'GitLink' : user.custom_department - self.telnumber = user.phone + self.telnumber = user.phone || "" self.email = user.mail self.name = user.nickname.blank? ? user.login : user.nickname @@ -41,7 +41,7 @@ class TraceUser < ApplicationRecord def build_token - return if username.blank? || password.blank? || unit.blank? || telnumber.blank? || email.blank? || name.blank? + return if username.blank? || password.blank? || unit.blank? || email.blank? || name.blank? response = Trace::AddUserService.call(username, password, unit, telnumber, email, name) self.token = response[1]['token'] @@ -49,7 +49,7 @@ class TraceUser < ApplicationRecord end def refresh_token - return if username.blank? || password.blank? || unit.blank? || telnumber.blank? || email.blank? || name.blank? + return if username.blank? || password.blank? || unit.blank? || email.blank? || name.blank? response = Trace::LoginService.call(username, password) self.token = response[1]['token'] diff --git a/app/services/api/v1/projects/pulls/versions/get_diff_service.rb b/app/services/api/v1/projects/pulls/versions/get_diff_service.rb index 1a4f144af..979bc33fb 100644 --- a/app/services/api/v1/projects/pulls/versions/get_diff_service.rb +++ b/app/services/api/v1/projects/pulls/versions/get_diff_service.rb @@ -26,6 +26,7 @@ class Api::V1::Projects::Pulls::Versions::GetDiffService < ApplicationService access_token: token } params.merge!(filepath: filepath) if filepath.present? + params end def load_gitea_data diff --git a/app/views/api/v1/projects/blame.json.jbuilder b/app/views/api/v1/projects/blame.json.jbuilder index 8dfa6c8a4..883eb2e70 100644 --- a/app/views/api/v1/projects/blame.json.jbuilder +++ b/app/views/api/v1/projects/blame.json.jbuilder @@ -16,6 +16,7 @@ json.blame_parts @result_object['blame_parts'] do |part| json.committed_time render_unix_time(part['commit']['committed_time']) json.created_time render_unix_time(part['commit']['created_time']) end + json.previous_number part['previous_number'] json.current_number part['current_number'] json.effect_line part['effect_line'] json.lines part['lines']