Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
This commit is contained in:
commit
6833cc5105
|
|
@ -1,3 +1,39 @@
|
|||
|
||||
<div class="pullreques_change_box">
|
||||
<div class="pullreques_pull_top clear">
|
||||
<p class="fl c_grey ml15">改动了<span class="fontBlue"> 4</span> 个文件</p>
|
||||
</div>
|
||||
<ul class="pullreques_change_list">
|
||||
<li><span class="fl ml15 mt12 pullreques_icons_add"></span><p class="pullreques_pull_txt ml5 fl">Chapter9-1-4/config-repo/didispace-dev.properties</p></li>
|
||||
<li><span class="fl ml15 mt12 pullreques_icons_del"></span><p class="pullreques_pull_txt ml5 fl">Chapter9-1-4/config-repo/didispace-dev.properties</p></li>
|
||||
<li><span class="fl ml15 mt12 pullreques_icons_add"></span><p class="pullreques_pull_txt ml5 fl">Chapter9-1-4/config-repo/didispace-dev.properties</p></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="pullreques_change_box">
|
||||
<div class="pullreques_pull_top clear">
|
||||
<span class="fl ml15 mt12 pullreques_icons_new"></span><p class="pullreques_pull_txt ml5 fl">Chapter9-1-4/config-repo/didispace-dev.properties</p>
|
||||
<p class="fr mr15">查看 <span class="fontBlue">8a46ce70</span></p>
|
||||
</div>
|
||||
<ul class="pullreques_change_list">
|
||||
<li><span class="fl ml15 mt12 pullreques_icons_add"></span><p class="pullreques_pull_txt ml5 fl">Chapter9-1-4/config-repo/didispace-dev.properties</p></li>
|
||||
<li><span class="fl ml15 mt12 pullreques_icons_del"></span><p class="pullreques_pull_txt ml5 fl">Chapter9-1-4/config-repo/didispace-dev.properties</p></li>
|
||||
<li><span class="fl ml15 mt12 pullreques_icons_add"></span><p class="pullreques_pull_txt ml5 fl">Chapter9-1-4/config-repo/didispace-dev.properties</p></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<% if !@changes.blank? && @type == "3" %>
|
||||
<% @changes.each do |cd| %>
|
||||
<div class="showing-changes-row fontGrey2">
|
||||
|
|
|
|||
|
|
@ -1,104 +1,79 @@
|
|||
|
||||
<div class="pullreques_pullbox">
|
||||
<div class="pullreques_pull_top clear">
|
||||
<p class="fl c_grey ml15">2016-09-12</p>
|
||||
<p class="fr c_green mr15">2个提交</p>
|
||||
</div>
|
||||
<ul class="pullreques_pull_list">
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 姚虫虫姚虫虫姚虫虫 </a>
|
||||
<p class="pullreques_pull_txt ml10 fl">项目导航栏数字错误</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 姚虫虫</a>
|
||||
<p class="pullreques_pull_txt ml10 fl">项目导航栏数字错误</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 尹刚 </a>
|
||||
<p class="pullreques_pull_txt ml10 fl">Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="pullreques_pullbox">
|
||||
<div class="pullreques_pull_top clear">
|
||||
<p class="fl c_grey ml15">2016-09-12</p>
|
||||
<p class="fr c_green mr15">2个提交</p>
|
||||
</div>
|
||||
<ul class="pullreques_pull_list">
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 姚虫虫姚虫虫姚虫虫 </a>
|
||||
<p class="pullreques_pull_txt ml10 fl">项目导航栏数字错误</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 姚虫虫</a>
|
||||
<p class="pullreques_pull_txt ml10 fl">项目导航栏数字错误</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 尹刚 </a>
|
||||
<p class="pullreques_pull_txt ml10 fl">Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
|
||||
<% if !@commits.blank? && @type == "2" %>
|
||||
<% @commits.each do |commit| %>
|
||||
<div class="new-merge-wrap">
|
||||
<div class="merge-commit-time">
|
||||
<img width="16" class="ui-datepicker-trigger mr15" style="cursor:default; margin-top:3px; margin-left:0;" /><span class="fontGrey3"><%= format_date(commit.created_at) %></span>
|
||||
<!--<p class="mt10 fontGrey2">1次提交</p>-->
|
||||
<p class="mt10 fontGrey2"><%= link_to commit.author_name, user_path(get_user_by_mail(commit.author_email)), :class => "link-blue" %> 创建于<%= time_tag(commit.created_at) %>前</p>
|
||||
</div>
|
||||
<div class="merge-commit-detail">
|
||||
<span class="fontGrey3 fb"><%= commit.title %></span>
|
||||
|
||||
</div>
|
||||
<div class="merge-commit-code">
|
||||
<span class="fontGrey3">
|
||||
<%= link_to truncate(commit.short_id, :length => 20), {:controller => 'repositories', :action => 'commit_diff', :id => @project.id, :changeset => commit.id}, :target => "_blank" %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<% end %>
|
||||
<div style="text-align:center;">
|
||||
<div class="pages" style="width:auto; display:inline-block;">
|
||||
<ul id="homework_pository_ref_pages">
|
||||
<%= pagination_links_full @pages, @count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
|
||||
</ul>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="pullreques_pullbox">
|
||||
<div class="pullreques_pull_top clear">
|
||||
<p class="fl c_grey ml15">2016-09-12</p>
|
||||
<p class="fr c_green mr15">2个提交</p>
|
||||
</div>
|
||||
<ul class="pullreques_pull_list">
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 姚虫虫姚虫虫姚虫虫 </a>
|
||||
<p class="pullreques_pull_txt ml10 fl">项目导航栏数字错误</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 姚虫虫</a>
|
||||
<p class="pullreques_pull_txt ml10 fl">项目导航栏数字错误</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 尹刚 </a>
|
||||
<p class="pullreques_pull_txt ml10 fl">Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="pullreques_pullbox">
|
||||
<div class="pullreques_pull_top clear">
|
||||
<p class="fl c_grey ml15">2016-09-12</p>
|
||||
<p class="fr c_green mr15">2个提交</p>
|
||||
</div>
|
||||
<ul class="pullreques_pull_list">
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 姚虫虫姚虫虫姚虫虫 </a>
|
||||
<p class="pullreques_pull_txt ml10 fl">项目导航栏数字错误</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 姚虫虫</a>
|
||||
<p class="pullreques_pull_txt ml10 fl">项目导航栏数字错误</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 尹刚 </a>
|
||||
<p class="pullreques_pull_txt ml10 fl">Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="pullreques_pullbox">
|
||||
<div class="pullreques_pull_top clear">
|
||||
<p class="fl c_grey ml15">2016-09-12</p>
|
||||
<p class="fr c_green mr15">2个提交</p>
|
||||
</div>
|
||||
<ul class="pullreques_pull_list">
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 姚虫虫姚虫虫姚虫虫 </a>
|
||||
<p class="pullreques_pull_txt ml10 fl">项目导航栏数字错误</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 姚虫虫</a>
|
||||
<p class="pullreques_pull_txt ml10 fl">项目导航栏数字错误</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
<li class="clear">
|
||||
<span class="fl c_grey ml15 ">19分钟前</span>
|
||||
<a href="javascript:void(0);" target="_blank" class="pullreques_pull_name fl ml10"> 尹刚 </a>
|
||||
<p class="pullreques_pull_txt ml10 fl">Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop</p>
|
||||
<span class="fr mr15 c_grey">acbc94af</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -41,19 +41,21 @@
|
|||
<%= link_to "改动<span class='new_roadmap_nav_tagnomal ml5' id='new_roadmap_num_3'>#{@changes_count}</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => "3"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_3" %></li>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<% if @type == nil || @type == "1" %>
|
||||
<div id="merge_record_1">
|
||||
<%= render :partial => "pull_requests/pull_request_comments" %>
|
||||
</div>
|
||||
<% end %>
|
||||
<div id="merge_record_2" class="undis">
|
||||
<%= render :partial => "pull_requests/pull_request_commits" %>
|
||||
</div>
|
||||
<div id="merge_record_3" class="undis">
|
||||
<%= render :partial => "pull_requests/pull_request_changes" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<% if @type == nil || @type == "1" %>
|
||||
<div id="merge_record_1">
|
||||
<%= render :partial => "pull_requests/pull_request_comments" %>
|
||||
</div>
|
||||
<% end %>
|
||||
<div id="merge_record_2" class="undis">
|
||||
<%= render :partial => "pull_requests/pull_request_commits" %>
|
||||
</div>
|
||||
<div id="merge_record_3" class="undis">
|
||||
<%= render :partial => "pull_requests/pull_request_changes" %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<!--PullReques结束-->
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue