Merge branch 'main' into improve-markdown-editor

Author: wxiaoguang

models/migrations/migrations.go

@@ -479,6 +479,8 @@ var migrations = []Migration{
 	NewMigration("Improve Action table indices v3", v1_20.ImproveActionTableIndices),
 	// v250 -> v251
 	NewMigration("Change Container Metadata", v1_20.ChangeContainerMetadataMultiArch),
+	// v251 -> v252
+	NewMigration("Fix incorrect owner team unit access mode", v1_20.FixIncorrectOwnerTeamUnitAccessMode),
 }
 
 // GetCurrentDBVersion returns the current db version

models/migrations/v1_20/v251.go

@@ -0,0 +1,47 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_20 //nolint
+
+import (
+	"code.gitea.io/gitea/modules/log"
+
+	"xorm.io/xorm"
+)
+
+func FixIncorrectOwnerTeamUnitAccessMode(x *xorm.Engine) error {
+	type UnitType int
+	type AccessMode int
+
+	type TeamUnit struct {
+		ID         int64    `xorm:"pk autoincr"`
+		OrgID      int64    `xorm:"INDEX"`
+		TeamID     int64    `xorm:"UNIQUE(s)"`
+		Type       UnitType `xorm:"UNIQUE(s)"`
+		AccessMode AccessMode
+	}
+
+	const (
+		// AccessModeOwner owner access
+		AccessModeOwner = 4
+	)
+
+	sess := x.NewSession()
+	defer sess.Close()
+
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+
+	count, err := sess.Table("team_unit").
+		Where("team_id IN (SELECT id FROM team WHERE authorize = ?)", AccessModeOwner).
+		Update(&TeamUnit{
+			AccessMode: AccessModeOwner,
+		})
+	if err != nil {
+		return err
+	}
+	log.Debug("Updated %d owner team unit access mode to belong to owner instead of none", count)
+
+	return sess.Commit()
+}

models/organization/org.go

@@ -338,9 +338,10 @@ func CreateOrganization(org *Organization, owner *user_model.User) (err error) {
 	units := make([]TeamUnit, 0, len(unit.AllRepoUnitTypes))
 	for _, tp := range unit.AllRepoUnitTypes {
 		units = append(units, TeamUnit{
-			OrgID:  org.ID,
-			TeamID: t.ID,
-			Type:   tp,
+			OrgID:      org.ID,
+			TeamID:     t.ID,
+			Type:       tp,
+			AccessMode: perm.AccessModeOwner,
 		})
 	}
 

routers/web/repo/pull.go

@@ -203,6 +203,7 @@ func Fork(ctx *context.Context) {
 func ForkPost(ctx *context.Context) {
 	form := web.GetForm(ctx).(*forms.CreateRepoForm)
 	ctx.Data["Title"] = ctx.Tr("new_fork")
+	ctx.Data["CanForkRepo"] = true
 
 	ctxUser := checkContextUser(ctx, form.UID)
 	if ctx.Written() {

web_src/css/review.css

@@ -227,28 +227,10 @@ a.blob-excerpt:hover {
   max-height: calc(100vh - 360px);
 }
 
-@media (max-width: 767px) {
-  .review-box-panel .CodeMirror-scroll {
-    max-width: calc(100vw - 70px);
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .review-box-panel .CodeMirror-scroll {
-    max-width: 700px;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1200px) {
-  .review-box-panel .CodeMirror-scroll {
-    max-width: 800px;
-  }
-}
-
-@media (min-width: 1201px) {
-  .review-box-panel .CodeMirror-scroll {
-    max-width: 900px;
-  }
+.review-box-panel .editor-toolbar,
+.review-box-panel .CodeMirror-scroll {
+  width: min(calc(100vw - 2em), 800px);
+  max-width: none;
 }
 
 .review-box-panel .combo-markdown-editor {