From 07ec114e9ad6b8070a9cc1ea22075806f199a2b3 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Wed, 13 Jul 2022 13:13:10 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E6=8F=90=E4=BA=A4=E6=97=A5=E5=BF=97?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/commit_logs_controller.rb | 4 ++--
app/models/project.rb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb
index 2cdb4232a..0064d2f07 100644
--- a/app/controllers/commit_logs_controller.rb
+++ b/app/controllers/commit_logs_controller.rb
@@ -5,8 +5,8 @@ class CommitLogsController < ApplicationController
ref = params[:ref]
commit_id = params[:commits][0][:id]
message = params[:commits][0][:message]
- user_name = params[:commits][0][:committer][:username]
- user_mail = params[:commits][0][:committer][:email]
+ user_name = params[:pusher][:login]
+ user_mail = params[:pusher][:email]
user = User.find_by(mail: user_mail)
user = User.find_by(login: user_name) if user.blank?
diff --git a/app/models/project.rb b/app/models/project.rb
index 030b68734..6ce31522c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -374,7 +374,7 @@ class Project < ApplicationRecord
logger.info "########namespace_path: #{namespace_path} ########identifier: #{identifier} "
user = Owner.find_by_login namespace_path
- user = Owner.new(login: namespace_path) if user.nil?
+ user = User.new(login: namespace_path) if user.nil?
project = user&.projects&.find_by(identifier: identifier) || Project.find_by(identifier: "#{namespace_path}/#{identifier}")
return nil if project.blank?