This commit is contained in:
huang 2016-08-05 18:23:03 +08:00
parent f54eafce76
commit 910fe0f48c
1 changed files with 30 additions and 30 deletions

View File

@ -24,12 +24,12 @@
<p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p>
</div>
<% else %>
<div class="merge-commit-option mt15">
<% if is_project_manager?(User.current.id, @project.id) %>
<div class="merge-commit-option mt15">
<%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn", :remote => true %>
<% end %>
</div>
<% end %>
<% end %>
</div>
<ul class="merge-record" style="border-top:1px solid #ddd;">