From 0200590a702f572221e0d548c93d49a6b660780d Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 5 Aug 2016 18:42:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E6=97=A0=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E9=A1=B5=E5=B0=BE=E6=98=BE=E7=A4=BA=E5=81=8F=E7=A7=BBbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/pull_requests/_show.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb index 68386625e..30c640ee8 100644 --- a/app/views/pull_requests/_show.html.erb +++ b/app/views/pull_requests/_show.html.erb @@ -17,6 +17,7 @@ <%= @request.source_branch %>没有新内容可以合并至<%= @request.target_branch %>

请将新改动提交至源分支或者切换到其它目标分支

+ <% else %> <% if @request.state == "merged" %>