pull request详情页面 显示源项目及目标项目的合并信息
This commit is contained in:
parent
c3745be0eb
commit
83da92a16c
|
@ -21,7 +21,10 @@
|
||||||
<div class="c_grey clear mt5">
|
<div class="c_grey clear mt5">
|
||||||
<p class="fl">由 <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "linkBlue2" %>于 <%= format_time(@request.created_at) %> 创建</p>
|
<p class="fl">由 <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "linkBlue2" %>于 <%= format_time(@request.created_at) %> 创建</p>
|
||||||
<span class="fl ml10">最近更新:<%= format_time(@request.updated_at) %></span>
|
<span class="fl ml10">最近更新:<%= format_time(@request.updated_at) %></span>
|
||||||
<p class="fr"><%= @request.source_branch %><span class="c_grey02 ml10 mr10">合并到</span><%= @request.target_branch %></p>
|
<p class="fr">
|
||||||
|
<%= find_gitlab_project(@request.source_project_id)+"/"+@request.source_branch %><span class="c_grey02 ml10 mr10">合并到</span><%= find_gitlab_project(@request.target_project_id)+"/"+@request.target_branch %>
|
||||||
|
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue