|
|
|
@ -4,7 +4,7 @@
|
|
|
|
|
|
|
|
|
|
<div id="pull_request_show">
|
|
|
|
|
<div id="mergeShow" class="f14 fontGrey2 merge-show">
|
|
|
|
|
<span class="mr10 open-status"><%= @request.state == "merged" ? "已合并" : "待处理" %></span><span class="mr10">合并请求</span> 由<%= 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) %>
|
|
|
|
|
<span class="mr10 open-status"><%= @request.state == "merged" ? "已合并" : "待处理" %></span><span class="mr10">合并请求</span> 由 <%= 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) %>
|
|
|
|
|
<!--<a href="javascript:void(0);" class="BlueCirBtnMini fr mt5">编辑</a>-->
|
|
|
|
|
<div class="cl"></div>
|
|
|
|
|
</div>
|
|
|
|
@ -25,14 +25,18 @@
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<ul class="merge-record" style="border-top:1px solid #ddd;">
|
|
|
|
|
<li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true, :class => "active" %></li>
|
|
|
|
|
<li><%= link_to "留言<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 0), :remote => true, :class => "active" %></li>
|
|
|
|
|
<li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true %></li>
|
|
|
|
|
<li><%= link_to "改动<span class='project-number-dot'>#{@changes_count}</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => 2), :remote => true %></li>
|
|
|
|
|
</ul>
|
|
|
|
|
<div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
|
|
|
|
|
<div id="merge_record_0">
|
|
|
|
|
<%= render :partial => "pull_requests/pull_request_commits" %>
|
|
|
|
|
留言
|
|
|
|
|
</div>
|
|
|
|
|
<div id="merge_record_1" class="undis">
|
|
|
|
|
<%= render :partial => "pull_requests/pull_request_commits" %>
|
|
|
|
|
</div>
|
|
|
|
|
<div id="merge_record_2" class="undis">
|
|
|
|
|
<%= render :partial => "pull_requests/pull_request_changes" %>
|
|
|
|
|
</div>
|
|
|
|
|
<% end %>
|
|
|
|
@ -54,7 +58,7 @@
|
|
|
|
|
|
|
|
|
|
var index = $(".merge-record li a").index(this);
|
|
|
|
|
|
|
|
|
|
$("#merge_record_0, #merge_record_1").hide();
|
|
|
|
|
$("#merge_record_0, #merge_record_1,#merge_record_2").hide();
|
|
|
|
|
$("#merge_record_" + index).show();
|
|
|
|
|
});
|
|
|
|
|
</script>
|