From ff80ef7f42235910c66a08a00cf28c2c7387c023 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Thu, 24 Jul 2014 14:45:20 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/repository.rb                           | 10 ++++------
 app/views/projects/settings/_repositories.html.erb |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 5ad85e186..46e647f97 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -143,13 +143,11 @@ class Repository < ActiveRecord::Base
         # 兼容老git模式
         ip = RepositoriesHelper::REPO_IP_ADDRESS
         if ip.nil?
-          ip = Setting.repository_domain
+          self.url
+        else
+          project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
+          "http://" + self.login.to_s + self.identifier.to_s + ip + self.url.slice(project_path_cut, self.url.length)
         end
-        project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
-        if project_path_cut.nil?
-          project_path_cut = 40
-        end
-       "http://" + self.login.to_s +  self.identifier.to_s + ip + self.url.slice(project_path_cut, self.url.length)
       else
         self.url
       end
diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb
index e2d7544b8..4366057a1 100644
--- a/app/views/projects/settings/_repositories.html.erb
+++ b/app/views/projects/settings/_repositories.html.erb
@@ -21,7 +21,7 @@
       <td align="center"><%= checked_image repository.is_default? %></td>
       <td><%=h repository.scm_name %></td>
       <td><%=h repository.repos_url %></td>
-      
+
       <td class="buttons" style="text-align:left">
       	<% if repository.scm_name=="Subversion"%>
             <%if User.current.allowed_to?(:manage_repository, @project) %>