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