Merge remote-tracking branch 'giteaoffical/main'

* giteaoffical/main:
  fix: PR status layout on mobile (go-gitea#21547)
  Make rss/atom identifier globally unique (go-gitea#21550)
  Fix UI column width, button overflow Fomantic's grid (go-gitea#21559)
  Localize time units on activity heatmap (go-gitea#21570)
  Use right syntax for symbolic-ref command (go-gitea#21577)
  Update JS dependencies and misc tweaks (go-gitea#21583)
  Add index for hook_task table (go-gitea#21545)
  Revert: auto generate INTERNAL_TOKEN (go-gitea#21608)

.drone.yml

@@ -561,7 +561,7 @@ steps:
 
   # TODO: We should probably build all dependencies into a test image
   - name: test-e2e
-    image: mcr.microsoft.com/playwright:v1.27.0-focal
+    image: mcr.microsoft.com/playwright:v1.27.1-focal
     commands:
       - curl -sLO https://go.dev/dl/go1.19.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.19.linux-amd64.tar.gz
       - groupadd --gid 1001 gitea && useradd -m --gid 1001 --uid 1001 gitea

.eslintrc.yaml

@@ -254,7 +254,7 @@ rules:
   no-irregular-whitespace: [2]
   no-iterator: [2]
   no-label-var: [2]
-  no-labels: [2]
+  no-labels: [0]
   no-lone-blocks: [2]
   no-lonely-if: [0]
   no-loop-func: [0]
@@ -333,7 +333,7 @@ rules:
   no-void: [2]
   no-warning-comments: [0]
   no-whitespace-before-property: [2]
-  no-with: [2]
+  no-with: [0]
   nonblock-statement-body-position: [2]
   object-curly-newline: [0]
   object-curly-spacing: [2, never]
@@ -378,11 +378,11 @@ rules:
   sonarjs/no-duplicated-branches: [0]
   sonarjs/no-element-overwrite: [2]
   sonarjs/no-empty-collection: [2]
-  sonarjs/no-extra-arguments: [0]
+  sonarjs/no-extra-arguments: [2]
   sonarjs/no-gratuitous-expressions: [2]
   sonarjs/no-identical-conditions: [2]
-  sonarjs/no-identical-expressions: [0]
-  sonarjs/no-identical-functions: [0]
+  sonarjs/no-identical-expressions: [2]
+  sonarjs/no-identical-functions: [2, 5]
   sonarjs/no-ignored-return: [2]
   sonarjs/no-inverted-boolean-check: [2]
   sonarjs/no-nested-switch: [0]
@@ -394,7 +394,7 @@ rules:
   sonarjs/no-small-switch: [0]
   sonarjs/no-unused-collection: [2]
   sonarjs/no-use-of-empty-return-value: [2]
-  sonarjs/no-useless-catch: [0]
+  sonarjs/no-useless-catch: [2]
   sonarjs/non-existent-operator: [2]
   sonarjs/prefer-immediate-return: [0]
   sonarjs/prefer-object-literal: [0]

.stylelintrc.yaml

@@ -16,6 +16,7 @@ rules:
   declaration-empty-line-before: null
   function-no-unknown: null
   hue-degree-notation: null
+  import-notation: string
   indentation: 2
   max-line-length: null
   no-descending-specificity: null

models/migrations/migrations.go

@@ -423,6 +423,8 @@ var migrations = []Migration{
 	NewMigration("Update counts of all open milestones", updateOpenMilestoneCounts),
 	// v230 -> v231
 	NewMigration("Add ConfidentialClient column (default true) to OAuth2Application table", addConfidentialClientColumnToOAuth2ApplicationTable),
+	// v231 -> v232
+	NewMigration("Add index for hook_task", addIndexForHookTask),
 }
 
 // GetCurrentDBVersion returns the current db version

models/migrations/v231.go

@@ -0,0 +1,19 @@
+// Copyright 2022 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"xorm.io/xorm"
+)
+
+func addIndexForHookTask(x *xorm.Engine) error {
+	type HookTask struct {
+		ID     int64  `xorm:"pk autoincr"`
+		HookID int64  `xorm:"index"`
+		UUID   string `xorm:"unique"`
+	}
+
+	return x.Sync(new(HookTask))
+}

models/webhook/hooktask.go

@@ -103,9 +103,9 @@ type HookResponse struct {
 
 // HookTask represents a hook task.
 type HookTask struct {
-	ID              int64 `xorm:"pk autoincr"`
-	HookID          int64
-	UUID            string
+	ID              int64  `xorm:"pk autoincr"`
+	HookID          int64  `xorm:"index"`
+	UUID            string `xorm:"unique"`
 	api.Payloader   `xorm:"-"`
 	PayloadContent  string `xorm:"LONGTEXT"`
 	EventType       HookEventType
@@ -270,7 +270,7 @@ func CleanupHookTaskTable(ctx context.Context, cleanupType HookTaskCleanupType,
 				return db.ErrCancelledf("Before deleting hook_task records for hook id %d", hookID)
 			default:
 			}
-			if err = deleteDeliveredHookTasksByWebhook(hookID, numberToKeep); err != nil {
+			if err = deleteDeliveredHookTasksByWebhook(ctx, hookID, numberToKeep); err != nil {
 				return err
 			}
 		}
@@ -279,10 +279,10 @@ func CleanupHookTaskTable(ctx context.Context, cleanupType HookTaskCleanupType,
 	return nil
 }
 
-func deleteDeliveredHookTasksByWebhook(hookID int64, numberDeliveriesToKeep int) error {
+func deleteDeliveredHookTasksByWebhook(ctx context.Context, hookID int64, numberDeliveriesToKeep int) error {
 	log.Trace("Deleting hook_task rows for webhook %d, keeping the most recent %d deliveries", hookID, numberDeliveriesToKeep)
 	deliveryDates := make([]int64, 0, 10)
-	err := db.GetEngine(db.DefaultContext).Table("hook_task").
+	err := db.GetEngine(ctx).Table("hook_task").
 		Where("hook_task.hook_id = ? AND hook_task.is_delivered = ? AND hook_task.delivered is not null", hookID, true).
 		Cols("hook_task.delivered").
 		Join("INNER", "webhook", "hook_task.hook_id = webhook.id").
@@ -294,7 +294,7 @@ func deleteDeliveredHookTasksByWebhook(hookID int64, numberDeliveriesToKeep int)
 	}
 
 	if len(deliveryDates) > 0 {
-		deletes, err := db.GetEngine(db.DefaultContext).
+		deletes, err := db.GetEngine(ctx).
 			Where("hook_id = ? and is_delivered = ? and delivered <= ?", hookID, true, deliveryDates[0]).
 			Delete(new(HookTask))
 		if err != nil {

modules/doctor/heads.go

@@ -49,7 +49,7 @@ func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool)
 		}
 
 		// otherwise, let's try fixing HEAD
-		err := git.NewCommand(ctx, "symbolic-ref").AddDashesAndList("HEAD", repo.DefaultBranch).Run(runOpts)
+		err := git.NewCommand(ctx, "symbolic-ref").AddDashesAndList("HEAD", git.BranchPrefix+repo.DefaultBranch).Run(runOpts)
 		if err != nil {
 			logger.Warn("Failed to fix HEAD for %s/%s: %v", repo.OwnerName, repo.Name, err)
 			return nil

modules/setting/setting.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/modules/container"
+	"code.gitea.io/gitea/modules/generate"
 	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/user"
@@ -962,6 +963,11 @@ func loadFromConf(allowEmpty bool, extraConfig string) {
 	SuccessfulTokensCacheSize = sec.Key("SUCCESSFUL_TOKENS_CACHE_SIZE").MustInt(20)
 
 	InternalToken = loadSecret(sec, "INTERNAL_TOKEN_URI", "INTERNAL_TOKEN")
+	if InstallLock && InternalToken == "" {
+		// if Gitea has been installed but the InternalToken hasn't been generated (upgrade from an old release), we should generate
+		// some users do cluster deployment, they still depend on this auto-generating behavior.
+		generateSaveInternalToken()
+	}
 
 	cfgdata := sec.Key("PASSWORD_COMPLEXITY").Strings(",")
 	if len(cfgdata) == 0 {
@@ -1182,6 +1188,19 @@ func loadSecret(sec *ini.Section, uriKey, verbatimKey string) string {
 	}
 }
 
+// generateSaveInternalToken generates and saves the internal token to app.ini
+func generateSaveInternalToken() {
+	token, err := generate.NewInternalToken()
+	if err != nil {
+		log.Fatal("Error generate internal token: %v", err)
+	}
+
+	InternalToken = token
+	CreateOrAppendToCustomConf("security.INTERNAL_TOKEN", func(cfg *ini.File) {
+		cfg.Section("security").Key("INTERNAL_TOKEN").SetValue(token)
+	})
+}
+
 // MakeAbsoluteAssetURL returns the absolute asset url prefix without a trailing slash
 func MakeAbsoluteAssetURL(appURL, staticURLPrefix string) string {
 	parsedPrefix, err := url.Parse(strings.TrimSuffix(staticURLPrefix, "/"))