From 54a9fadbd195a2cf6535b76135c94ef2b7dd843c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 4 Aug 2016 14:24:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=90=88=E5=B9=B6=E5=92=8C?=
 =?UTF-8?q?=E6=9C=AA=E5=90=88=E5=B9=B6=E7=9A=84pr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pull_requests/_show.html.erb | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb
index 7ebdc1dde..0ba02d9b4 100644
--- a/app/views/pull_requests/_show.html.erb
+++ b/app/views/pull_requests/_show.html.erb
@@ -1,5 +1,5 @@
 <div id="mergeShow" class="f14 fontGrey2 merge-show">
-  <span class="mr10 open-status">待处理</span><span class="mr10">合并请求</span>   由<%= 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) %>提交 · 最后编辑时间<%= time_tag(@request.updated_at) %>
+  <span class="mr10 open-status"><%= @request.state == "merged" ? "已合并" : "待处理" %></span><span class="mr10">合并请求</span>   由<%= 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) %>提交 · 最后编辑时间<%= time_tag(@request.updated_at) %>
   <!--<a href="javascript:void(0);" class="BlueCirBtnMini fr mt5">编辑</a>-->
   <div class="cl"></div>
 </div>
@@ -13,12 +13,18 @@
       </div>
     </div>
 <% else %>
-    <div class="mt10 mb15">
-      请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
-      <div class="merge-commit-option mt15">
-        <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn" %>
-      </div>
-    </div>
+    <% if @request.state == "merged" %>
+
+
+        6666
+    <% else %>
+        <div class="mt10 mb15">
+          请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
+          <div class="merge-commit-option mt15">
+            <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn" %>
+          </div>
+        </div>
+    <% end %>
     <ul class="merge-record" style="border-top:1px solid #ddd;">
       <li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true, :class => "active" %></li>
       <li><%= link_to "改动<span class='project-number-dot'>#{@changes_count}</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => 2), :remote => true %></li>