合并权限

yuanke_cache
huang 9 years ago
parent 3ef2509d27
commit af7e507279

@ -20,7 +20,9 @@
<span class="fontGrey3 fb" style="font-size:13px;"><a href="javascript:void(0);" class="link-blue"> Hjqreturn</a>于两小时前合并</span><br /> <span class="fontGrey3 fb" style="font-size:13px;"><a href="javascript:void(0);" class="link-blue"> Hjqreturn</a>于两小时前合并</span><br />
<p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p> <p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p>
<% else %> <% else %>
<%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn", :remote => true %> <% if is_project_manager?(User.current.id, @project.id) %>
<%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn", :remote => true %>
<% end %>
<% end %> <% end %>
</div> </div>
</div> </div>

Loading…
Cancel
Save