合并信息提交

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) %>