From 911c47df8dcb0875d6db766fe242635722e39df7 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 17 Aug 2022 18:05:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87?= =?UTF-8?q?=E4=BB=B6blame=20=E4=B8=8A=E4=B8=AA=E7=89=88=E6=9C=AC=E7=9A=84?= =?UTF-8?q?=E8=A1=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/api/v1/projects/blame.json.jbuilder | 1 + 1 file changed, 1 insertion(+) 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'] From 4b167dacbbea113c8bdff92f09a9b5e2677db56a Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 17 Aug 2022 18:39:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20trace=20user=20?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/trace_user.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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'] From 6168256897f5120933fd55250d25de85305b4b43 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 22 Aug 2022 10:48:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20diff=20filepath?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/projects/pulls/versions/get_diff_service.rb | 1 + 1 file changed, 1 insertion(+) 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 From 5c5b4b5d92fe6627cdfe95f8faed4d7d879a551f Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 24 Aug 2022 10:30:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)