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 @@ <%= checked_image repository.is_default? %> <%=h repository.scm_name %> <%=h repository.repos_url %> - + <% if repository.scm_name=="Subversion"%> <%if User.current.allowed_to?(:manage_repository, @project) %>