From c175fa1339982b5e39e2f96f96dcbd47aed7f124 Mon Sep 17 00:00:00 2001 From: "vilet.yy" Date: Fri, 2 Apr 2021 18:53:53 +0800 Subject: [PATCH] fix: commit author and fork create units --- app/services/projects/fork_service.rb | 2 ++ app/views/pull_requests/_commit.json.jbuilder | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/services/projects/fork_service.rb b/app/services/projects/fork_service.rb index 3204e5fc7..8ae787c52 100644 --- a/app/services/projects/fork_service.rb +++ b/app/services/projects/fork_service.rb @@ -24,6 +24,8 @@ class Projects::ForkService < ApplicationService new_repository.identifier = @project.identifier new_repository.save! + ProjectUnit.init_types(clone_project.id) + result = Gitea::Repository::ForkService.new(@project.owner, @target_owner, @project.identifier, @organization).call @project.update_column('forked_count', @project&.forked_count.to_i + 1) diff --git a/app/views/pull_requests/_commit.json.jbuilder b/app/views/pull_requests/_commit.json.jbuilder index 0b7db5893..072e53c91 100644 --- a/app/views/pull_requests/_commit.json.jbuilder +++ b/app/views/pull_requests/_commit.json.jbuilder @@ -1,11 +1,11 @@ json.author do author = User.find_by(login: commit['Author']['Name']) - json.partial! 'repositories/commit_author', locals: { user: author } + json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] } end json.committer do author = User.find_by(login: commit['Committer']['Name']) - json.partial! 'repositories/commit_author', locals: { user: author } + json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] } end json.timestamp render_unix_time(commit['Committer']['When']) json.time_from_now time_from_now(commit['Committer']['When'])