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

Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality

This commit is contained in:
Tim 2016-08-02 16:10:34 +08:00
parent 7e440596ab 20bdd23665
commit 09f25588a8
3 changed files with 18 additions and 20 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.

0
app/views/pull_requests/_pull_request_container.html.erb Normal file
View File

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

@ -1,3 +1,4 @@
<%= render "pull_request_container" %>
<ul id="mergeBanner" class="project-merge-banner">
<li><a href="javascript:void(0);">打开<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">合并<span class="project-number-dot">1</span></a></li>
@ -8,26 +9,22 @@
</ul>
<div class="cl"></div>
<ul class="project-merge-content">
<li>
<a href="javascript:void(0);" class="linkGrey3 fb fl">第三次提交</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>
<div class="cl mb5"></div>
<span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
<div class="cl"></div>
</li>
<li>
<a href="javascript:void(0);" class="linkGrey3 fb fl">第二次提交</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>
<div class="cl mb5"></div>
<span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
<div class="cl"></div>
</li>
<li>
<a href="javascript:void(0);" class="linkGrey3 fb fl">第一次提交</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>
<div class="cl mb5"></div>
<span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
<div class="cl"></div>
</li>
</ul>
<% if @requests.nil? %>
<div class="no-merge-content">没有可显示的请求</div>
<% else %>
<% @requests.each do |request| %>
<li>
<% request %>
<%=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 · <%= 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>
<% end %>
<% end %>
</ul>
<script>
$("#mergeBanner").parent().css("width","730px");