代码没有改动时候提示

app/views/pull_requests/_pull_request_commits.html.erb

@@ -3,10 +3,11 @@
     <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>
-      <p class="mt10 fontGrey2"><%= link_to commit.author_name, user_path(get_user_by_mail(commit.author_email)), :class => "link-blue" %>创建于24小时前</p>
+
     </div>
     <div class="merge-commit-code">
       <span class="fontGrey3">

app/views/pull_requests/_show.html.erb

@@ -4,6 +4,15 @@
   <div class="cl"></div>
 </div>
 <div class="new-merge-row b_grey"><strong><%= @request.title %></strong><p class="mt10"><%= @request.description %></p></div>
+<% if @commits_count == 0 && @changes_count == 0 %>
+    <div class="mt10 mb15">
+      请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
+      <div class="merge-commit-option mt15">
+        <span class="fontGrey3 fb" style="font-size:13px;"><img src="/images/warning.png" width="16" class="mr5 mt2 fl"><%= @request.source_branch %>没有新内容可以合并至<%= @request.target_branch %></span><br />
+        <p class="fontGrey2 mt5">请将新改动提交至源分支或者切换到其它目标分支</p>
+      </div>
+    </div>
+<% else %>
     <div class="mt10 mb15">
       请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
       <div class="merge-commit-option mt15">
@@ -21,6 +30,7 @@
     <div id="merge_record_1" class="undis">
       <%= render :partial => "pull_requests/pull_request_changes" %>
     </div>
+<% end %>
 
 <script>
     $("#mergeShow").parent().css("width","730px");

app/views/pull_requests/show.html.erb

@@ -1,6 +1,2 @@
 <%= render :partial => "pull_requests/pull_request_container" %>
 <%= render :partial => "pull_requests/show" %>
-<div class="merge-commit-option mt15">
-    <span class="fontGrey3 fb" style="font-size:13px;"><img src="/images/warning.png" width="16" class="mr5 mt2 fl">dev_huang没有新内容可以合并至develop</span><br />
-    <p class="fontGrey2 mt5">请将新改动提交至源分支或者切换到其它目标分支</p>
-  </div>