From e092efdab2c2e03bcda02f8d838fa829ac4b64e3 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 13 Dec 2015 23:16:47 -0500 Subject: [PATCH] remove dep to gogs --- submodule.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/submodule.go b/submodule.go index 3bd9362..64738a1 100644 --- a/submodule.go +++ b/submodule.go @@ -4,11 +4,7 @@ package git -import ( - "strings" - - "github.com/gogits/gogs/modules/setting" -) +import "strings" type SubModule struct { Name string @@ -33,7 +29,7 @@ func NewSubModuleFile(c *Commit, refUrl, refId string) *SubModuleFile { // FIXME: remove import of setting // RefUrl guesses and returns reference URL. -func (sf *SubModuleFile) RefUrl() string { +func (sf *SubModuleFile) RefUrl(urlPrefix string) string { if sf.refUrl == "" { return "" } @@ -55,8 +51,8 @@ func (sf *SubModuleFile) RefUrl() string { j := strings.LastIndex(url, ":") if i > -1 && j > -1 { // fix problem with reverse proxy works only with local server - if strings.Contains(setting.AppUrl, url[i+1:j]) { - return setting.AppUrl + url[j+1:] + if strings.Contains(urlPrefix, url[i+1:j]) { + return urlPrefix + url[j+1:] } else { return "http://" + url[i+1:j] + "/" + url[j+1:] }