Merge branch 'main' into mention-user-exists

yardenshoham · web-flow · commit 9589e70b325e · 2022-10-22T10:50:43.000+03:00
diff --git a/modules/markup/markdown/meta.go b/modules/markup/markdown/meta.go
@@ -10,8 +10,6 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"code.gitea.io/gitea/modules/log"
-
 	"gopkg.in/yaml.v3"
 )
 
@@ -99,8 +97,6 @@ func ExtractMetadataBytes(contents []byte, out interface{}) ([]byte, error) {
 		return contents, errors.New("could not determine metadata")
 	}
 
-	log.Info("%s", string(front))
-
 	if err := yaml.Unmarshal(front, out); err != nil {
 		return contents, err
 	}
diff --git a/routers/web/web.go b/routers/web/web.go
@@ -591,6 +591,7 @@ func RegisterRoutes(m *web.Route) {
 		})
 	}, func(ctx *context.Context) {
 		ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable
+		ctx.Data["EnablePackages"] = setting.Packages.Enabled
 	}, adminReq)
 	// ***** END: Admin *****
 
diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl
@@ -12,9 +12,11 @@
 		<a class="{{if .PageIsAdminRepositories}}active{{end}} item" href="{{AppSubUrl}}/admin/repos">
 			{{.locale.Tr "admin.repositories"}}
 		</a>
-		<a class="{{if .PageIsAdminPackages}}active{{end}} item" href="{{AppSubUrl}}/admin/packages">
-			{{.locale.Tr "packages.title"}}
-		</a>
+		{{if .EnablePackages}}
+			<a class="{{if .PageIsAdminPackages}}active{{end}} item" href="{{AppSubUrl}}/admin/packages">
+				{{.locale.Tr "packages.title"}}
+			</a>
+		{{end}}
 		{{if not DisableWebhooks}}
 			<a class="{{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks}}active{{end}} item" href="{{AppSubUrl}}/admin/hooks">
 				{{.locale.Tr "admin.hooks"}}

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@ import (`
`10`	`10`	`"unicode"`
`11`	`11`	`"unicode/utf8"`
`12`	`12`
`13`		`- "code.gitea.io/gitea/modules/log"`
`14`		`-`
`15`	`13`	`"gopkg.in/yaml.v3"`
`16`	`14`	`)`
`17`	`15`
`@@ -99,8 +97,6 @@ func ExtractMetadataBytes(contents []byte, out interface{}) ([]byte, error) {`
`99`	`97`	`return contents, errors.New("could not determine metadata")`
`100`	`98`	`}`
`101`	`99`
`102`		`- log.Info("%s", string(front))`
`103`		`-`
`104`	`100`	`if err := yaml.Unmarshal(front, out); err != nil {`
`105`	`101`	`return contents, err`
`106`	`102`	`}`