jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

合并信息提交

This commit is contained in:
huang 2016-08-10 16:54:58 +08:00
parent 98a8702ba6
commit b046f24b44
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/pull_requests/_show.html.erb
View File

@ -24,10 +24,11 @@
<% else %> <% else %>
<% if @request.state == "merged" %> <% if @request.state == "merged" %>
<div class="merge-commit-option mt15"> <div class="merge-commit-option mt15">
<% unless accept_user(@request.id).blank? %> <% if accept_user(@request.id).blank? %>
<p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p>
<% else %>
<span class="fontGrey3 fb" style="font-size:13px;"><%= link_to User.find(accept_user(@request.id).user_id), user_path(accept_user(@request.id).user_id), :class => "link-blue" %> 于 <%= time_tag(accept_user(@request.id).created_at) %> 前合并</span><br /> <span class="fontGrey3 fb" style="font-size:13px;"><%= link_to User.find(accept_user(@request.id).user_id), user_path(accept_user(@request.id).user_id), :class => "link-blue" %> 于 <%= time_tag(accept_user(@request.id).created_at) %> 前合并</span><br />
<% end %> <% end %>
<p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p>
</div> </div>
<% else %> <% else %>
<% if is_project_manager?(User.current.id, @project.id) %> <% if is_project_manager?(User.current.id, @project.id) %>