From 8e329db4d8f8edff1d3ff3291e756a7af5736b9c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 3 Aug 2016 15:16:28 +0800
Subject: [PATCH] =?UTF-8?q?pull=20request=20commits=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pull_requests/_pull_request_commits.html.erb | 2 ++
 app/views/pull_requests/show.html.erb                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/pull_requests/_pull_request_commits.html.erb b/app/views/pull_requests/_pull_request_commits.html.erb
index cd6fb1f34..ffccccd8d 100644
--- a/app/views/pull_requests/_pull_request_commits.html.erb
+++ b/app/views/pull_requests/_pull_request_commits.html.erb
@@ -1,4 +1,5 @@
 <% @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>-->
@@ -13,4 +14,5 @@
       </span>
     </div>
     <div class="cl"></div>
+ </div>
 <% end %>
diff --git a/app/views/pull_requests/show.html.erb b/app/views/pull_requests/show.html.erb
index c7e52b8d5..634ed2916 100644
--- a/app/views/pull_requests/show.html.erb
+++ b/app/views/pull_requests/show.html.erb
@@ -16,13 +16,13 @@
   <li><%= link_to "改动<span class='project-number-dot'>1</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id), :remote => true, :class => "active" %></li>
 </ul>
 <div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
-<div class="new-merge-wrap" id="merge_record_0">
+<div id="merge_record_0">
   <%= render :partial => "pull_requests/pull_request_commits" %>
 </div>
 <% if @type == 2 %>
-    <div id="merge_record_1" class="undis">
-      <%= render :partial => "pull_requests/pull_request_changes" %>
-    </div>
+  <div id="merge_record_1" class="undis">
+     <%= render :partial => "pull_requests/pull_request_changes" %>
+  </div>
 <% end %>
 
 <script>