待处理合并无更新内容时，页尾显示偏移bug

9 years ago · 0200590a70
parent 910fe0f48c
commit 0200590a70
1 changed files with 1 additions and 0 deletions
--- a/app/views/pull_requests/_show.html.erb
+++ b/app/views/pull_requests/_show.html.erb
@ -17,6 +17,7 @@
          <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 %>
        <% if @request.state == "merged" %>
            <div class="merge-commit-option mt15">