From 9784564c0193d728717c6ce1fa8cfc8f7fb53ca1 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 2 Jun 2020 15:45:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9commits=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 1 + app/views/repositories/commits.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 7f7173ee1..44eed5f08 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -45,6 +45,7 @@ class RepositoriesController < ApplicationController end def commits + @create_user = @project.owner @hash_commit = Gitea::Repository::Commits::ListService.new(@project.owner.login, @project.identifier, sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call end diff --git a/app/views/repositories/commits.json.jbuilder b/app/views/repositories/commits.json.jbuilder index 7cabe209e..fc300ca94 100644 --- a/app/views/repositories/commits.json.jbuilder +++ b/app/views/repositories/commits.json.jbuilder @@ -9,7 +9,7 @@ else json.message commit['commit']['message'] json.timestamp render_unix_time(commit['commit']['author']['date']) json.time_from_now time_from_now(commit['commit']['author']['date']) - json.partial! 'author', user: @project.owner + json.partial! 'author', locals: {user: @create_user} end end end