diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb index c46ebddb9..be3970d3a 100644 --- a/app/views/pull_requests/_show.html.erb +++ b/app/views/pull_requests/_show.html.erb @@ -17,7 +17,7 @@

请将新改动提交至源分支或者切换到其它目标分支

<% else %> <% if @request.state == "merged" %> - Hjqreturn于两小时前合并
+ <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %>于<%= time_tag(@request.created_at) %> 前合并

改动已合并至<%= @request.target_branch %>

<% else %> <% if is_project_manager?(User.current.id, @project.id) %>