From b046f24b44ad72a540787934bb3c4d595175210a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 10 Aug 2016 16:54:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BF=A1=E6=81=AF=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pull_requests/_show.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb
index d982ffd8c..d792dc823 100644
--- a/app/views/pull_requests/_show.html.erb
+++ b/app/views/pull_requests/_show.html.erb
@@ -24,10 +24,11 @@
     <% else %>
         <% if @request.state == "merged" %>
             <div class="merge-commit-option mt15">
-              <% unless accept_user(@request.id).blank? %>
+              <% if accept_user(@request.id).blank? %>
+                  <p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p>
+              <% else %>
                   <span class="fontGrey3 fb" style="font-size:13px;"><%= link_to User.find(accept_user(@request.id).user_id), user_path(accept_user(@request.id).user_id), :class => "link-blue" %> 于 <%= time_tag(accept_user(@request.id).created_at) %> 前合并</span><br />
               <% end %>
-              <p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p>
             </div>
         <% else %>
             <% if is_project_manager?(User.current.id, @project.id) %>