pull request 添加一些判断

app/views/pull_requests/_show.html.erb

@@ -25,9 +25,24 @@
     </div>
   </div>
 </div>
-<div class="alert alert-orange mb15 ">
+
+<% if @request.state == "merged" %>
+    <div class="alert alert-orange mb15 ">
+      改动已合并至 <%= @request.target_branch %> 分支
+    </div>
+<% else %>
+    <% if is_project_manager?(User.current.id, @project.id) %>
+        <% if @request.state == "closed"  %>
+            该请求已被关闭
+        <% else %>
+            <div class="alert alert-orange mb15 ">
               在管理员接受后，将由系统自动合并。<%= link_to "接受", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "linkBlue2", :remote => true %></a>
-</div>
+            </div>
+        <% end %>
+    <% end %>
+<% end %>
+
+
 <div class="new_roadmap_conbox mb10" >
   <div class=" clear">
     <ul class="new_roadmap_nav fl"  >