From 98f17234113f2ddea802dd29ff8a4bc3f87ab15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 16 Aug 2022 14:03:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fixed=20=E5=8F=91=E8=A1=8C=E7=89=88git?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/version_release.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/version_release.rb b/app/models/version_release.rb index 3c97420ea..00119f806 100644 --- a/app/models/version_release.rb +++ b/app/models/version_release.rb @@ -32,7 +32,8 @@ class VersionRelease < ApplicationRecord has_many :attachments, as: :container, dependent: :destroy def update_sha + return if version_gid.blank? git_release = Gitea::Versions::GetService.call(user.gitea_token, repository&.owner&.login, repository&.identifier, version_gid) - self.update(sha: git_release["sha"]) + self.update(sha: git_release["sha"]) if git_release.present? && git_release.is_a?(Hash) end end From 217ab920a98f784f747e48e8e26bb78842474643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 16 Aug 2022 15:33:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fixed=20commit=E6=97=A5=E5=BF=97=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/commit_logs_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb index c62c13000..3be1794a7 100644 --- a/app/controllers/commit_logs_controller.rb +++ b/app/controllers/commit_logs_controller.rb @@ -15,6 +15,7 @@ class CommitLogsController < ApplicationController owner = User.find_by(login: owner_name) project = Project.where(identifier: repository_name).where(user_id: owner&.id)&.first project = Project.where(identifier: repository_name).where(gpid: repository_id)&.first if project.blank? + project.update_column(:updated_on, Time.now) if project.present? params[:commits].each do |commit| commit_id = commit[:id] message = commit[:message] From a37d7b98409f7550cd62e74fa6322a330f3f0af3 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 17 Aug 2022 15:28:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E9=BB=98=E8=AE=A4=E4=B8=8D=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/trace_user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/trace_user.rb b/app/models/trace_user.rb index e89641565..1d2cd0b4c 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.blank? ? '13800000000' : user.phone + self.telnumber = user.phone self.email = user.mail self.name = user.nickname.blank? ? user.login : user.nickname