Able to fork repo to individuals

1 files changed, 11 insertions, 1 deletions

diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 78af58eac8..fec9c54161 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -160,7 +160,11 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
 			return
 		}
 		ctx.Repo.GitRepo = gitRepo
-		ctx.Repo.RepoLink = setting.AppSubUrl + "/" + u.Name + "/" + repo.Name
+		ctx.Repo.RepoLink, err = repo.RepoLink()
+		if err != nil {
+			ctx.Handle(500, "RepoLink", err)
+			return
+		}
 		ctx.Data["RepoLink"] = ctx.Repo.RepoLink
 
 		tags, err := ctx.Repo.GitRepo.GetTags()
@@ -171,6 +175,12 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
 		ctx.Data["Tags"] = tags
 		ctx.Repo.Repository.NumTags = len(tags)
 
+		// Non-fork repository will not return error in this method.
+		if err = repo.GetForkRepo(); err != nil {
+			ctx.Handle(500, "GetForkRepo", err)
+			return
+		}
+
 		ctx.Data["Title"] = u.Name + "/" + repo.Name
 		ctx.Data["Repository"] = repo
 		ctx.Data["Owner"] = ctx.Repo.Repository.Owner