From cda61e73fafcb93db32a0fc7e4d8bc17019a1417 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 5 Jun 2017 15:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E7=89=88?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E8=AE=BF=E9=97=AE500=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb | 2 +-
 app/views/repositories/show.html.erb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 85c22e661..d8fdb601d 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -284,7 +284,7 @@ class ShixunsController < ApplicationController
               raise "sync failed" if @shixun.gpid.blank?
             rescue Exception => e
               @shixun.update_attribute(:gpid, nil)
-              if @repository.id
+              if @repository && @repository.id
                 @repository.destroy
               end
             end
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index c5fa4876c..319fc9a4d 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,7 +2,7 @@
   <div class="repository_con" style="line-height:1.9;">
     <ul class="clearfix pro-top-info mb10">
       <li><i class="icon-time mr5 c_grey02 f16 fb"></i>
-        <%=link_to "#{choise_commit_count(@changesets_all_count, @g_project.commit_count.to_i)}",
+        <%=link_to "#{choise_commit_count(@changesets_all_count.to_i, @g_project.commit_count.to_i)}",
                    {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param,
                     :rev => @rev, :page => 1 ,:commit_count =>"#{@changesets_all_count}"}, :class => "linkBlue fb" %> 提交
       </li>