Merge branch 'main' into lunny/add_migration_and_doctor_fix_repo_runners

GiteaBot · web-flow · commit 0f947d859595 · 2025-03-02T05:26:14.000+08:00
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ go 1.24
 godebug x509negativeserial=1
 
 require (
-	code.gitea.io/actions-proto-go v0.4.0
+	code.gitea.io/actions-proto-go v0.4.1
 	code.gitea.io/gitea-vet v0.2.3
 	code.gitea.io/sdk/gitea v0.20.0
 	codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570
@@ -318,7 +318,7 @@ replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1
 
 replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0
 
-replace github.com/nektos/act => gitea.com/gitea/act v0.261.3
+replace github.com/nektos/act => gitea.com/gitea/act v0.261.4
 
 // TODO: the only difference is in `PutObject`: the fork doesn't use `NewVerifyingReader(r, sha256.New(), oid, expectedSize)`, need to figure out why
 replace github.com/charmbracelet/git-lfs-transfer => gitea.com/gitea/git-lfs-transfer v0.2.0
diff --git a/go.sum b/go.sum
@@ -1,7 +1,7 @@
 cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
 cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
-code.gitea.io/actions-proto-go v0.4.0 h1:OsPBPhodXuQnsspG1sQ4eRE1PeoZyofd7+i73zCwnsU=
-code.gitea.io/actions-proto-go v0.4.0/go.mod h1:mn7Wkqz6JbnTOHQpot3yDeHx+O5C9EGhMEE+htvHBas=
+code.gitea.io/actions-proto-go v0.4.1 h1:l0EYhjsgpUe/1VABo2eK7zcoNX2W44WOnb0MSLrKfls=
+code.gitea.io/actions-proto-go v0.4.1/go.mod h1:mn7Wkqz6JbnTOHQpot3yDeHx+O5C9EGhMEE+htvHBas=
 code.gitea.io/gitea-vet v0.2.3 h1:gdFmm6WOTM65rE8FUBTRzeQZYzXePKSSB1+r574hWwI=
 code.gitea.io/gitea-vet v0.2.3/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE=
 code.gitea.io/sdk/gitea v0.20.0 h1:Zm/QDwwZK1awoM4AxdjeAQbxolzx2rIP8dDfmKu+KoU=
@@ -16,8 +16,8 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg=
 git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs=
-gitea.com/gitea/act v0.261.3 h1:BhiYpGJQKGq0XMYYICCYAN4KnsEWHyLbA6dxhZwFcV4=
-gitea.com/gitea/act v0.261.3/go.mod h1:Pg5C9kQY1CEA3QjthjhlrqOC/QOT5NyWNjOjRHw23Ok=
+gitea.com/gitea/act v0.261.4 h1:Tf9eLlvsYFtKcpuxlMvf9yT3g4Hshb2Beqw6C1STuH8=
+gitea.com/gitea/act v0.261.4/go.mod h1:Pg5C9kQY1CEA3QjthjhlrqOC/QOT5NyWNjOjRHw23Ok=
 gitea.com/gitea/git-lfs-transfer v0.2.0 h1:baHaNoBSRaeq/xKayEXwiDQtlIjps4Ac/Ll4KqLMB40=
 gitea.com/gitea/git-lfs-transfer v0.2.0/go.mod h1:UrXUCm3xLQkq15fu7qlXHUMlrhdlXHoi13KH2Dfiits=
 gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed h1:EZZBtilMLSZNWtHHcgq2mt6NSGhJSZBuduAlinMEmso=
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
@@ -2579,7 +2579,6 @@ diff.commit=revize
 diff.git-notes=Poznámky
 diff.data_not_available=Rozdílový obsah není dostupný
 diff.options_button=Možnosti rozdílového porovnání
-diff.show_diff_stats=Zobrazit statistiky
 diff.download_patch=Stáhněte soubor záplaty
 diff.download_diff=Stáhněte rozdílový soubor
 diff.show_split_view=Rozdělené zobrazení
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
@@ -2568,7 +2568,6 @@ diff.commit=Commit
 diff.git-notes=Hinweise
 diff.data_not_available=Keine Diff-Daten verfügbar
 diff.options_button=Diff-Optionen
-diff.show_diff_stats=Statistiken anzeigen
 diff.download_patch=Patch-Datei herunterladen
 diff.download_diff=Vergleichs-Datei herunterladen
 diff.show_split_view=Geteilte Ansicht
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
@@ -2316,7 +2316,6 @@ diff.commit=υποβολή
 diff.git-notes=Σημειώσεις
 diff.data_not_available=Δεν Υπάρχει Διαθέσιμο Περιεχόμενο Diff
 diff.options_button=Επιλογές Diff
-diff.show_diff_stats=Εμφάνιση Στατιστικών
 diff.download_patch=Λήψη Αρχείου Patch
 diff.download_diff=Λήψη Αρχείου Diff
 diff.show_split_view=Διαιρεμένη Προβολή
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -2297,7 +2297,6 @@ diff.commit=commit
 diff.git-notes=Notas
 diff.data_not_available=El contenido del Diff no está disponible
 diff.options_button=Opciones de diferencias
-diff.show_diff_stats=Mostrar estadísticas
 diff.download_patch=Descargar archivo de parche
 diff.download_diff=Descargar archivo de diferencias
 diff.show_split_view=Dividir vista
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
@@ -1777,7 +1777,6 @@ diff.commit=کامیت
 diff.git-notes=یادداشت‌ها
 diff.data_not_available=محتوای تفاوت ها در دسترس نیست
 diff.options_button=تنظیمات (diff) تغییرات
-diff.show_diff_stats=نمایش وضعیت
 diff.download_patch=دانلود پرونده وصله
 diff.download_diff=دانلود فایل تغییرات diff
 diff.show_split_view=مشاهده تقسیم شده
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
@@ -2591,7 +2591,6 @@ diff.commit=révision
 diff.git-notes=Notes
 diff.data_not_available=Contenu de la comparaison indisponible
 diff.options_button=Option de Diff
-diff.show_diff_stats=Voir les Statistiques
 diff.download_patch=Télécharger le Fichier Patch
 diff.download_diff=Télécharger le Fichier des Différences
 diff.show_split_view=Vue séparée
diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini
@@ -2593,7 +2593,6 @@ diff.commit=tiomantas
 diff.git-notes=Nótaí
 diff.data_not_available=Níl Ábhar Difríochtaí Ar Fáil
 diff.options_button=Roghanna Diff
-diff.show_diff_stats=Taispeáin Staitisticí
 diff.download_patch=Íoslódáil an comhad paiste
 diff.download_diff=Íoslódáil Comhad Diff
 diff.show_split_view=Amharc Scoilt
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
@@ -1098,7 +1098,6 @@ diff.parent=szülő
 diff.commit=commit
 diff.git-notes=Megjegyzések
 diff.data_not_available=A különbségek nem megjeleníthetőek
-diff.show_diff_stats=Statisztikák mutatása
 diff.show_split_view=Osztott nézet
 diff.show_unified_view=Egyesített nézet
 diff.stats_desc=<strong>%d fájl</strong> változott, egészen pontosan <strong>%d új sor hozzáadva</strong> és <strong>%d régi sor törölve</strong>
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
@@ -1929,7 +1929,6 @@ diff.commit=commit
 diff.git-notes=Note
 diff.data_not_available=Dati Diff non disponibili
 diff.options_button=Opzioni Diff
-diff.show_diff_stats=Mostra statistiche
 diff.download_patch=Scarica il file Patch
 diff.download_diff=Scarica il file Diff
 diff.show_split_view=Visualizzazione separata
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
@@ -2591,7 +2591,6 @@ diff.commit=コミット
 diff.git-notes=Notes
 diff.data_not_available=差分はありません
 diff.options_button=差分オプション
-diff.show_diff_stats=統計情報を表示
 diff.download_patch=Patchファイルをダウンロード
 diff.download_diff=Diffファイルをダウンロード
 diff.show_split_view=分割表示
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
@@ -2316,7 +2316,6 @@ diff.commit=revīzija
 diff.git-notes=Piezīmes
 diff.data_not_available=Satura salīdzināšana nav pieejama
 diff.options_button=Salīdzināšanas iespējas
-diff.show_diff_stats=Rādīt statistiku
 diff.download_patch=Lejupielādēt ielāpa failu
 diff.download_diff=Lejupielādēt izmaiņu failu
 diff.show_split_view=Dalītais skats
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
@@ -1864,7 +1864,6 @@ diff.commit=commit
 diff.git-notes=Notities
 diff.data_not_available=Diff gegevens niet beschikbaar
 diff.options_button=Diff opties
-diff.show_diff_stats=Statistieken weergeven
 diff.download_patch=Download Patch-bestand
 diff.download_diff=Download Diff-bestand
 diff.show_split_view=Zij-aan-zij weergave
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
@@ -1728,7 +1728,6 @@ diff.commit=commit
 diff.git-notes=Notatki
 diff.data_not_available=Informacje nt. zmian nie są dostępne
 diff.options_button=Opcje porównania
-diff.show_diff_stats=Pokaż statystyki
 diff.download_patch=Ściągnij plik aktualizacji
 diff.download_diff=Ściągnij plik porównania
 diff.show_split_view=Widok podzielony
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -2281,7 +2281,6 @@ diff.commit=commit
 diff.git-notes=Notas
 diff.data_not_available=Conteúdo de diff não disponível
 diff.options_button=Opções de diferenças
-diff.show_diff_stats=Mostrar estatísticas
 diff.download_patch=Baixar arquivo de patch
 diff.download_diff=Baixar arquivo de diferenças
 diff.show_split_view=Visão dividida
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -2593,7 +2593,6 @@ diff.commit=cometimento
 diff.git-notes=Notas
 diff.data_not_available=O conteúdo das diferenças não está disponível
 diff.options_button=Opções das diferenças
-diff.show_diff_stats=Mostrar estatísticas
 diff.download_patch=Descarregar ficheiro patch
 diff.download_diff=Descarregar ficheiro diff
 diff.show_split_view=Visualização em 2 colunas
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
@@ -2267,7 +2267,6 @@ diff.commit=Коммит
 diff.git-notes=Заметки
 diff.data_not_available=Разница недоступна
 diff.options_button=Опции Diff
-diff.show_diff_stats=Показать статистику
 diff.download_patch=Скачать Patch файл
 diff.download_diff=Скачать Diff файл
 diff.show_split_view=Разделённый вид
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
@@ -1739,7 +1739,6 @@ diff.commit=කැප
 diff.git-notes=සටහන්
 diff.data_not_available=Diff අන්තර්ගත ලබාගත නොහැක
 diff.options_button=විවිධ විකල්ප
-diff.show_diff_stats=සංඛ්යාන පෙන්වන්න
 diff.download_patch=පැච් ගොනුව බාගත
 diff.download_diff=බාගත Dff ගොනුව
 diff.show_split_view=භේදය දැක්ම
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
@@ -2469,7 +2469,6 @@ diff.commit=işleme
 diff.git-notes=Notlar
 diff.data_not_available=Farklı İçerik Mevut Değil
 diff.options_button=Diff Seçenekleri
-diff.show_diff_stats=İstatistikleri Göster
 diff.download_patch=Yama Dosyasını İndir
 diff.download_diff=Diff Dosyasını İndir
 diff.show_split_view=Görünümü Böl
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
@@ -1789,7 +1789,6 @@ diff.commit=коміт
 diff.git-notes=Примітки
 diff.data_not_available=Різниця недоступна
 diff.options_button=Параметри порівняння
-diff.show_diff_stats=Показати статистику
 diff.download_patch=Завантажити патч
 diff.download_diff=Завантажити файл різниці
 diff.show_split_view=Розділений перегляд
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
@@ -2568,7 +2568,6 @@ diff.commit=当前提交
 diff.git-notes=Notes
 diff.data_not_available=比较内容不可用
 diff.options_button=Diff 选项
-diff.show_diff_stats=显示统计
 diff.download_patch=下载 Patch 文件
 diff.download_diff=下载 Diff 文件
 diff.show_split_view=分列视图
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
@@ -2559,7 +2559,6 @@ diff.commit=當前提交
 diff.git-notes=備註
 diff.data_not_available=沒有內容比較可以使用
 diff.options_button=差異選項
-diff.show_diff_stats=顯示統計資料
 diff.download_patch=下載 Patch 檔
 diff.download_diff=下載差異檔
 diff.show_split_view=分割檢視
diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go
@@ -18,6 +18,7 @@ import (
 	"sync"
 	"time"
 
+	user_model "code.gitea.io/gitea/models/user"
 	webhook_model "code.gitea.io/gitea/models/webhook"
 	"code.gitea.io/gitea/modules/graceful"
 	"code.gitea.io/gitea/modules/hostmatcher"
@@ -92,10 +93,10 @@ func newDefaultRequest(ctx context.Context, w *webhook_model.Webhook, t *webhook
 	}
 
 	body = []byte(t.PayloadContent)
-	return req, body, addDefaultHeaders(req, []byte(w.Secret), t, body)
+	return req, body, addDefaultHeaders(req, []byte(w.Secret), w, t, body)
 }
 
-func addDefaultHeaders(req *http.Request, secret []byte, t *webhook_model.HookTask, payloadContent []byte) error {
+func addDefaultHeaders(req *http.Request, secret []byte, w *webhook_model.Webhook, t *webhook_model.HookTask, payloadContent []byte) error {
 	var signatureSHA1 string
 	var signatureSHA256 string
 	if len(secret) > 0 {
@@ -112,10 +113,27 @@ func addDefaultHeaders(req *http.Request, secret []byte, t *webhook_model.HookTa
 
 	event := t.EventType.Event()
 	eventType := string(t.EventType)
+	targetType := "default"
+	if w.IsSystemWebhook {
+		targetType = "system"
+	} else if w.RepoID != 0 {
+		targetType = "repository"
+	} else if w.OwnerID != 0 {
+		owner, err := user_model.GetUserByID(req.Context(), w.OwnerID)
+		if owner != nil && err == nil {
+			if owner.IsOrganization() {
+				targetType = "organization"
+			} else {
+				targetType = "user"
+			}
+		}
+	}
+
 	req.Header.Add("X-Gitea-Delivery", t.UUID)
 	req.Header.Add("X-Gitea-Event", event)
 	req.Header.Add("X-Gitea-Event-Type", eventType)
 	req.Header.Add("X-Gitea-Signature", signatureSHA256)
+	req.Header.Add("X-Gitea-Hook-Installation-Target-Type", targetType)
 	req.Header.Add("X-Gogs-Delivery", t.UUID)
 	req.Header.Add("X-Gogs-Event", event)
 	req.Header.Add("X-Gogs-Event-Type", eventType)
@@ -125,6 +143,7 @@ func addDefaultHeaders(req *http.Request, secret []byte, t *webhook_model.HookTa
 	req.Header["X-GitHub-Delivery"] = []string{t.UUID}
 	req.Header["X-GitHub-Event"] = []string{event}
 	req.Header["X-GitHub-Event-Type"] = []string{eventType}
+	req.Header["X-GitHub-Hook-Installation-Target-Type"] = []string{targetType}
 	return nil
 }
 
diff --git a/services/webhook/matrix.go b/services/webhook/matrix.go
@@ -56,7 +56,7 @@ func newMatrixRequest(_ context.Context, w *webhook_model.Webhook, t *webhook_mo
 	}
 	req.Header.Set("Content-Type", "application/json")
 
-	return req, body, addDefaultHeaders(req, []byte(w.Secret), t, body) // likely useless, but has always been sent historially
+	return req, body, addDefaultHeaders(req, []byte(w.Secret), w, t, body) // likely useless, but has always been sent historially
 }
 
 const matrixPayloadSizeLimit = 1024 * 64
diff --git a/services/webhook/payloader.go b/services/webhook/payloader.go
@@ -107,7 +107,7 @@ func newJSONRequest[T any](pc payloadConvertor[T], w *webhook_model.Webhook, t *
 	req.Header.Set("Content-Type", "application/json")
 
 	if withDefaultHeaders {
-		return req, body, addDefaultHeaders(req, []byte(w.Secret), t, body)
+		return req, body, addDefaultHeaders(req, []byte(w.Secret), w, t, body)
 	}
 	return req, body, nil
 }
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
@@ -1,6 +1,6 @@
 {{$showFileTree := (and (not .DiffNotAvailable) (gt .Diff.NumFiles 1))}}
 <div>
-	<div class="diff-detail-box diff-box">
+	<div class="diff-detail-box">
 		<div class="tw-flex tw-items-center tw-flex-wrap tw-gap-2 tw-ml-0.5">
 			{{if $showFileTree}}
 				<button class="diff-toggle-file-tree-button not-mobile btn interact-fg" data-show-text="{{ctx.Locale.Tr "repo.diff.show_file_tree"}}" data-hide-text="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}">
@@ -80,7 +80,7 @@
 					{{$showFileViewToggle := or $isImage (and (not $file.IsIncomplete) $isCsv)}}
 					{{$isExpandable := or (gt $file.Addition 0) (gt $file.Deletion 0) $file.IsBin}}
 					{{$isReviewFile := and $.IsSigned $.PageIsPullFiles (not $.Repository.IsArchived) $.IsShowingAllCommits}}
-					<div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}} tw-mt-0" id="diff-{{$file.NameHash}}" data-old-filename="{{$file.OldName}}" data-new-filename="{{$file.Name}}" {{if or ($file.ShouldBeHidden) (not $isExpandable)}}data-folded="true"{{end}}>
+					<div class="diff-file-box file-content {{TabSizeClass $.Editorconfig $file.Name}} tw-mt-0" id="diff-{{$file.NameHash}}" data-old-filename="{{$file.OldName}}" data-new-filename="{{$file.Name}}" {{if or ($file.ShouldBeHidden) (not $isExpandable)}}data-folded="true"{{end}}>
 						<h4 class="diff-file-header sticky-2nd-row ui top attached header">
 							<div class="diff-file-name tw-flex tw-flex-1 tw-items-center tw-gap-1 tw-flex-wrap">
 								<button class="fold-file btn interact-bg tw-p-1{{if not $isExpandable}} tw-invisible{{end}}">
@@ -209,7 +209,7 @@
 				{{end}}
 
 				{{if .Diff.IsIncomplete}}
-					<div class="diff-file-box diff-box file-content tw-mt-2" id="diff-incomplete">
+					<div class="diff-file-box file-content tw-mt-2" id="diff-incomplete">
 						<h4 class="ui top attached header tw-font-normal tw-flex tw-items-center tw-justify-between">
 							{{ctx.Locale.Tr "repo.diff.too_many_files"}}
 							<a class="ui basic tiny button" id="diff-show-more-files" data-href="?skip-to={{.Diff.End}}&file-only=true">{{ctx.Locale.Tr "repo.diff.show_more"}}</a>
diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl
@@ -3,7 +3,7 @@
 	<a class="muted">{{svg "octicon-smiley"}}</a>
 	<div class="menu">
 		{{range $value := AllowedReactions}}
-		<a class="item emoji comment-reaction-button" data-tooltip-content="{{$value}}" aria-label="{{$value}}" data-reaction-content="{{$value}}">{{ReactionToEmoji $value}}</a>
+		<a class="item emoji" data-tooltip-content="{{$value}}" aria-label="{{$value}}" data-reaction-content="{{$value}}" data-global-click="onCommentReactionButtonClick">{{ReactionToEmoji $value}}</a>
 		{{end}}
 	</div>
 </div>
diff --git a/templates/repo/issue/view_content/conversation.tmpl b/templates/repo/issue/view_content/conversation.tmpl
@@ -40,7 +40,7 @@
 		{{if $diff}}
 			{{$file := (index $diff.Files 0)}}
 			<div id="code-preview-{{$comment.ID}}" class="ui table segment{{if $resolved}} tw-hidden{{end}}">
-				<div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}">
+				<div class="diff-file-box file-content {{TabSizeClass $.Editorconfig $file.Name}}">
 					<div class="file-body file-code code-view code-diff code-diff-unified unicode-escaped">
 						<table>
 							<tbody>
diff --git a/templates/repo/issue/view_content/reactions.tmpl b/templates/repo/issue/view_content/reactions.tmpl
@@ -1,9 +1,9 @@
 <div class="bottom-reactions" data-action-url="{{$.ActionURL}}">
 {{range $key, $value := .Reactions}}
 	{{$hasReacted := $value.HasUser ctx.RootData.SignedUserID}}
-	<a role="button" class="ui label basic{{if $hasReacted}} primary{{end}}{{if not ctx.RootData.IsSigned}} disabled{{end}} comment-reaction-button"
-		data-tooltip-content
-		title="{{$value.GetFirstUsers}}{{if gt ($value.GetMoreUserCount) 0}} {{ctx.Locale.Tr "repo.reactions_more" $value.GetMoreUserCount}}{{end}}"
+	<a role="button" class="ui label basic{{if $hasReacted}} primary{{end}}{{if not ctx.RootData.IsSigned}} disabled{{end}}"
+		data-global-click="onCommentReactionButtonClick"
+		data-tooltip-content title="{{$value.GetFirstUsers}}{{if gt ($value.GetMoreUserCount) 0}} {{ctx.Locale.Tr "repo.reactions_more" $value.GetMoreUserCount}}{{end}}"
 		aria-label="{{$value.GetFirstUsers}}{{if gt ($value.GetMoreUserCount) 0}} {{ctx.Locale.Tr "repo.reactions_more" $value.GetMoreUserCount}}{{end}}"
 		data-tooltip-placement="bottom-start"
 		data-reaction-content="{{$key}}" data-has-reacted="{{$hasReacted}}">
diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl
@@ -11,7 +11,7 @@
 <div class="repository search">
 	{{range $result := .SearchResults}}
 		{{$repo := or $.Repo (index $.RepoMaps .RepoID)}}
-		<div class="diff-file-box diff-box file-content non-diff-file-content repo-search-result">
+		<div class="diff-file-box file-content non-diff-file-content repo-search-result">
 			<h4 class="ui top attached header tw-font-normal tw-flex tw-flex-wrap">
 				{{if not $.Repo}}
 					<span class="file tw-flex-1">
diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go
@@ -530,7 +530,9 @@ func Test_WebhookStatus(t *testing.T) {
 	var triggeredEvent string
 	provider := newMockWebhookProvider(func(r *http.Request) {
 		assert.Contains(t, r.Header["X-Github-Event-Type"], "status", "X-GitHub-Event-Type should contain status")
+		assert.Contains(t, r.Header["X-Github-Hook-Installation-Target-Type"], "repository", "X-GitHub-Hook-Installation-Target-Type should contain repository")
 		assert.Contains(t, r.Header["X-Gitea-Event-Type"], "status", "X-Gitea-Event-Type should contain status")
+		assert.Contains(t, r.Header["X-Gitea-Hook-Installation-Target-Type"], "repository", "X-Gitea-Hook-Installation-Target-Type should contain repository")
 		assert.Contains(t, r.Header["X-Gogs-Event-Type"], "status", "X-Gogs-Event-Type should contain status")
 		content, _ := io.ReadAll(r.Body)
 		var payload api.CommitStatusPayload
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
@@ -1085,10 +1085,6 @@ td .commit-summary {
   height: 30px;
 }
 
-.repository .diff-box .resolved-placeholder .button {
-  padding: 8px 12px;
-}
-
 .repository .diff-file-box .header {
   background-color: var(--color-box-header);
 }
diff --git a/web_src/js/features/common-page.ts b/web_src/js/features/common-page.ts
diff --git a/web_src/js/features/comp/ReactionSelector.ts b/web_src/js/features/comp/ReactionSelector.ts
diff --git a/web_src/js/features/repo-diff.ts b/web_src/js/features/repo-diff.ts
diff --git a/web_src/js/features/repo-graph.ts b/web_src/js/features/repo-graph.ts
diff --git a/web_src/js/index.ts b/web_src/js/index.ts
diff --git a/web_src/js/modules/dirauto.ts b/web_src/js/modules/dirauto.ts
diff --git a/web_src/js/modules/observer.ts b/web_src/js/modules/observer.ts
