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

pull requtst show

This commit is contained in:
huang 2016-08-02 16:06:51 +08:00
parent d286d3fe06
commit 20bdd23665
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/pull_requests_controller.rb
View File

@ -9,7 +9,8 @@ class PullRequestsController < ApplicationController
end
def new
# id = params[:]
@request = @g.merge_request(@rpoject.gpid, id)
end
# Creates a merge request.

6
app/views/pull_requests/index.html.erb
View File

@ -14,10 +14,10 @@
<% @requests.each do |request| %>
<li>
<% request %>
<a href="javascript:void(0);" class="linkGrey3 fb fl"><%= request.title %></a>
<a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">关闭</span>
<%=link_to request.title, project_pull_request_path(request.id, :project_id => @project.id), :class => "linkGrey3 fb fl"%>
<!--<a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">关闭</span>-->
<div class="cl mb5"></div>
<span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue"><%= request.author.try(:username) %></a> 创建于<%= time_tag(request.created_at) %></span>
<span class="fontGrey2">#5 · <%= link_to request.author.try(:username), user_path(request.author), :class => "link-blue" %> 创建于<%= time_tag(request.created_at) %></span>
<span class="fr fontGrey2"><%= time_tag(request.updated_at) %>更新</span>
<div class="cl"></div>
</li>