<%= @request.state == "merged" ? "已合并" : "待处理" %>合并请求由<%= 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) %>

<%= @request.title %>

<%= @request.description %>

请求将 <%= @request.source_branch %> 合并至 <%= @request.target_branch %>

<% if @commits_count == 0 && @changes_count == 0 %>

<%= @request.source_branch %>没有新内容可以合并至<%= @request.target_branch %>

请将新改动提交至源分支或者切换到其它目标分支

<% else %> <% if @request.state == "merged" %> <%= 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) %> 前合并

改动已合并至<%= @request.target_branch %>

<% else %> <% 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 %>

<%= link_to "提交#{@commits_count}".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true, :class => "active" %>
<%= link_to "改动#{@changes_count}".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => 2), :remote => true %>

根据最近提交时间排列

<%= render :partial => "pull_requests/pull_request_commits" %>

<%= render :partial => "pull_requests/pull_request_changes" %>

<% end %>