From 7c484b4f4a2f29a38ba98eae96eafc60b2254157 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 5 Aug 2016 18:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pull_requests/_show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
     <p class="fontGrey2 mt5">请将新改动提交至源分支或者切换到其它目标分支</p>
 <% else %>
     <% if @request.state == "merged" %>
-        <span class="fontGrey3 fb" style="font-size:13px;"><a href="javascript:void(0);" class="link-blue"> Hjqreturn</a>于两小时前合并</span><br />
+        <span class="fontGrey3 fb" style="font-size:13px;"><a href="javascript:void(0);" class="link-blue"> <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %></a>于<%= time_tag(@request.created_at) %> 前合并</span><br />
         <p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p>
     <% else %>
             <% if is_project_manager?(User.current.id, @project.id) %>