fix workaround for reverse proxy, ssh, submodule
parent
78a4e71245
commit
8b92f9cca6
|
@ -141,9 +141,6 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
|
|||
"AppName": func() string {
|
||||
return setting.AppName
|
||||
},
|
||||
"AppUrl": func() string {
|
||||
return setting.AppUrl
|
||||
},
|
||||
"AppSubUrl": func() string {
|
||||
return setting.AppSubUrl
|
||||
},
|
||||
|
|
|
@ -6,6 +6,7 @@ package git
|
|||
|
||||
import (
|
||||
"strings"
|
||||
"github.com/gogits/gogs/modules/setting"
|
||||
)
|
||||
|
||||
type SubModule struct {
|
||||
|
@ -30,7 +31,7 @@ func NewSubModuleFile(c *Commit, refUrl, refId string) *SubModuleFile {
|
|||
}
|
||||
|
||||
// RefUrl guesses and returns reference URL.
|
||||
func (sf *SubModuleFile) RefUrl(appUrl string) string {
|
||||
func (sf *SubModuleFile) RefUrl() string {
|
||||
if sf.refUrl == "" {
|
||||
return ""
|
||||
}
|
||||
|
@ -52,8 +53,8 @@ func (sf *SubModuleFile) RefUrl(appUrl string) string {
|
|||
j := strings.LastIndex(url, ":")
|
||||
if i > -1 && j > -1 {
|
||||
// fix problem with reverse proxy works only with local server
|
||||
if strings.Contains(appUrl,url[i+1:j]) {
|
||||
return appUrl + url[j+1:]
|
||||
if strings.Contains(setting.AppUrl,url[i+1:j]) {
|
||||
return setting.AppUrl + url[j+1:]
|
||||
} else {
|
||||
return "http://" + url[i+1:j] + "/" + url[j+1:]
|
||||
}
|
||||
|
|
|
@ -39,8 +39,8 @@
|
|||
<span class="octicon octicon-file-submodule"></span>
|
||||
</td>
|
||||
<td class="name">
|
||||
{{if $commit.RefUrl AppUrl}}
|
||||
<a href="{{$commit.RefUrl AppUrl}}" class="text-truncate">{{$entry.Name}}</a> @ <a href="{{$commit.RefUrl AppUrl}}/commit/{{$commit.RefId}}">{{ShortSha $commit.RefId}}</a>
|
||||
{{if $commit.RefUrl}}
|
||||
<a href="{{$commit.RefUrl}}" class="text-truncate">{{$entry.Name}}</a> @ <a href="{{$commit.RefUrl}}/commit/{{$commit.RefId}}">{{ShortSha $commit.RefId}}</a>
|
||||
{{else}}
|
||||
{{$entry.Name}} @ {{ShortSha $commit.RefId}}
|
||||
{{end}}
|
||||
|
|
Loading…
Reference in New Issue