diff --git a/routers/repo/pull.go b/routers/repo/pull.go index b69592411b..ee66da73b0 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -45,7 +45,7 @@ func getForkRepository(ctx *middleware.Context) *models.Repository { } ctx.Data["repo_name"] = forkRepo.Name - ctx.Data["desc"] = forkRepo.Description + ctx.Data["description"] = forkRepo.Description ctx.Data["IsPrivate"] = forkRepo.IsPrivate if err = forkRepo.GetOwner(); err != nil { diff --git a/templates/repo/header_old.tmpl b/templates/repo/header_old.tmpl deleted file mode 100644 index 7a51009573..0000000000 --- a/templates/repo/header_old.tmpl +++ /dev/null @@ -1,42 +0,0 @@ -{{with .Repository}} -
-
-

- - {{.Owner.Name}} - / - {{.Name}} - {{if .IsMirror}}{{$.i18n.Tr "mirror"}}{{end}} - {{if .IsFork}}forked from {{SubStr .BaseRepo.RepoLink 1 -1}}{{end}} -

- -
-
-{{end}} diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index cc2005c226..c3e8e1e52c 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -52,8 +52,8 @@ {{.i18n.Tr "repo.fork_visiblity_helper"}}
- - + +
diff --git a/templates/repo/setting_nav.tmpl b/templates/repo/setting_nav.tmpl deleted file mode 100644 index 5aa77f0b85..0000000000 --- a/templates/repo/setting_nav.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -
- -
\ No newline at end of file