diff options
| author | mrsdizzie <info@mrsdizzie.com> | 2020-09-07 20:08:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 20:08:10 -0400 |
| commit | 489c8a1478885737b8e42099fab673c6b1f3640d (patch) | |
| tree | 7e246c70f0224ed9c536f38895c789adac88d1b2 /routers/repo/view.go | |
| parent | 9af60ce0bb5d6fe19cf2c3ecd37e658e8952400a (diff) | |
| download | gitea-489c8a1478885737b8e42099fab673c6b1f3640d.tar.gz gitea-489c8a1478885737b8e42099fab673c6b1f3640d.zip | |
Compare SSH_DOMAIN when parsing submodule URLs (#12753)
Right now we only compare the hostname from a submodule with the prefixURL it is viewed from to check if the submodule is hosted on the same Gitea instance. This adds an additional check to compare it against SSH_DOMAIN as well since the same Gitea instance might have a different hostname for SSH and if the submodule uses that hostname we should also detect that and link to the proper DOMAIN value.
Fixes #12747, #9756
Diffstat (limited to 'routers/repo/view.go')
| -rw-r--r-- | routers/repo/view.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/routers/repo/view.go b/routers/repo/view.go index 3074ab7aae..a05c0b1366 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -365,6 +365,8 @@ func renderDirectory(ctx *context.Context, treeLink string) { ctx.Data["CanAddFile"] = !ctx.Repo.Repository.IsArchived ctx.Data["CanUploadFile"] = setting.Repository.Upload.Enabled && !ctx.Repo.Repository.IsArchived } + + ctx.Data["SSHDomain"] = setting.SSH.Domain } func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink string) { |