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

页面显示问题

This commit is contained in:
huang 2016-08-05 18:00:10 +08:00
parent 3afdeda4d3
commit 7c484b4f4a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
<p class="fontGrey2 mt5">请将新改动提交至源分支或者切换到其它目标分支</p>
<% else %>
<% if @request.state == "merged" %>
<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"> <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %></a>于<%= time_tag(@request.created_at) %> 前合并</span><br />
<p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p>
<% else %>
<% if is_project_manager?(User.current.id, @project.id) %>