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?