Merge branch 'main' into avatar-refactor

Author: 6543

integrations/compare_test.go

@@ -6,6 +6,7 @@ package integrations
 
 import (
 	"net/http"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -21,4 +22,8 @@ func TestCompareTag(t *testing.T) {
 	selection := htmlDoc.doc.Find(".choose.branch .filter.dropdown")
 	// A dropdown for both base and head.
 	assert.Lenf(t, selection.Nodes, 2, "The template has changed")
+
+	req = NewRequest(t, "GET", "/user2/repo1/compare/invalid")
+	resp = session.MakeRequest(t, req, http.StatusNotFound)
+	assert.False(t, strings.Contains(resp.Body.String(), "/assets/img/500.png"), "expect 404 page not 500")
 }

models/issue.go

@@ -17,7 +17,6 @@ import (
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/references"
-	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/structs"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
@@ -415,18 +414,6 @@ func (issue *Issue) HasLabel(labelID int64) bool {
 	return issue.hasLabel(db.GetEngine(db.DefaultContext), labelID)
 }
 
-// ReplyReference returns tokenized address to use for email reply headers
-func (issue *Issue) ReplyReference() string {
-	var path string
-	if issue.IsPull {
-		path = "pulls"
-	} else {
-		path = "issues"
-	}
-
-	return fmt.Sprintf("%s/%s/%d@%s", issue.Repo.FullName(), path, issue.Index, setting.Domain)
-}
-
 func (issue *Issue) addLabel(e db.Engine, label *Label, doer *User) error {
 	return newIssueLabel(e, issue, label, doer)
 }

models/statistic.go

@@ -18,28 +18,30 @@ type Statistic struct {
 		Comment, Oauth, Follow,
 		Mirror, Release, LoginSource, Webhook,
 		Milestone, Label, HookTask,
-		Team, UpdateTask, Attachment int64
+		Team, UpdateTask, Project,
+		ProjectBoard, Attachment int64
 	}
 }
 
 // GetStatistic returns the database statistics
 func GetStatistic() (stats Statistic) {
+	e := db.GetEngine(db.DefaultContext)
 	stats.Counter.User = CountUsers()
 	stats.Counter.Org = CountOrganizations()
-	stats.Counter.PublicKey, _ = db.GetEngine(db.DefaultContext).Count(new(PublicKey))
+	stats.Counter.PublicKey, _ = e.Count(new(PublicKey))
 	stats.Counter.Repo = CountRepositories(true)
-	stats.Counter.Watch, _ = db.GetEngine(db.DefaultContext).Count(new(Watch))
-	stats.Counter.Star, _ = db.GetEngine(db.DefaultContext).Count(new(Star))
-	stats.Counter.Action, _ = db.GetEngine(db.DefaultContext).Count(new(Action))
-	stats.Counter.Access, _ = db.GetEngine(db.DefaultContext).Count(new(Access))
+	stats.Counter.Watch, _ = e.Count(new(Watch))
+	stats.Counter.Star, _ = e.Count(new(Star))
+	stats.Counter.Action, _ = e.Count(new(Action))
+	stats.Counter.Access, _ = e.Count(new(Access))
 
 	type IssueCount struct {
 		Count    int64
 		IsClosed bool
 	}
 	issueCounts := []IssueCount{}
 
-	_ = db.GetEngine(db.DefaultContext).Select("COUNT(*) AS count, is_closed").Table("issue").GroupBy("is_closed").Find(&issueCounts)
+	_ = e.Select("COUNT(*) AS count, is_closed").Table("issue").GroupBy("is_closed").Find(&issueCounts)
 	for _, c := range issueCounts {
 		if c.IsClosed {
 			stats.Counter.IssueClosed = c.Count
@@ -50,17 +52,19 @@ func GetStatistic() (stats Statistic) {
 
 	stats.Counter.Issue = stats.Counter.IssueClosed + stats.Counter.IssueOpen
 
-	stats.Counter.Comment, _ = db.GetEngine(db.DefaultContext).Count(new(Comment))
+	stats.Counter.Comment, _ = e.Count(new(Comment))
 	stats.Counter.Oauth = 0
-	stats.Counter.Follow, _ = db.GetEngine(db.DefaultContext).Count(new(Follow))
-	stats.Counter.Mirror, _ = db.GetEngine(db.DefaultContext).Count(new(Mirror))
-	stats.Counter.Release, _ = db.GetEngine(db.DefaultContext).Count(new(Release))
+	stats.Counter.Follow, _ = e.Count(new(Follow))
+	stats.Counter.Mirror, _ = e.Count(new(Mirror))
+	stats.Counter.Release, _ = e.Count(new(Release))
 	stats.Counter.LoginSource = login.CountSources()
-	stats.Counter.Webhook, _ = db.GetEngine(db.DefaultContext).Count(new(Webhook))
-	stats.Counter.Milestone, _ = db.GetEngine(db.DefaultContext).Count(new(Milestone))
-	stats.Counter.Label, _ = db.GetEngine(db.DefaultContext).Count(new(Label))
-	stats.Counter.HookTask, _ = db.GetEngine(db.DefaultContext).Count(new(HookTask))
-	stats.Counter.Team, _ = db.GetEngine(db.DefaultContext).Count(new(Team))
-	stats.Counter.Attachment, _ = db.GetEngine(db.DefaultContext).Count(new(Attachment))
+	stats.Counter.Webhook, _ = e.Count(new(Webhook))
+	stats.Counter.Milestone, _ = e.Count(new(Milestone))
+	stats.Counter.Label, _ = e.Count(new(Label))
+	stats.Counter.HookTask, _ = e.Count(new(HookTask))
+	stats.Counter.Team, _ = e.Count(new(Team))
+	stats.Counter.Attachment, _ = e.Count(new(Attachment))
+	stats.Counter.Project, _ = e.Count(new(Project))
+	stats.Counter.ProjectBoard, _ = e.Count(new(ProjectBoard))
 	return
 }

modules/metrics/collector.go

@@ -30,6 +30,8 @@ type Collector struct {
 	Mirrors       *prometheus.Desc
 	Oauths        *prometheus.Desc
 	Organizations *prometheus.Desc
+	Projects      *prometheus.Desc
+	ProjectBoards *prometheus.Desc
 	PublicKeys    *prometheus.Desc
 	Releases      *prometheus.Desc
 	Repositories  *prometheus.Desc
@@ -119,6 +121,16 @@ func NewCollector() Collector {
 			"Number of Organizations",
 			nil, nil,
 		),
+		Projects: prometheus.NewDesc(
+			namespace+"projects",
+			"Number of projects",
+			nil, nil,
+		),
+		ProjectBoards: prometheus.NewDesc(
+			namespace+"projects_boards",
+			"Number of project boards",
+			nil, nil,
+		),
 		PublicKeys: prometheus.NewDesc(
 			namespace+"publickeys",
 			"Number of PublicKeys",
@@ -185,6 +197,8 @@ func (c Collector) Describe(ch chan<- *prometheus.Desc) {
 	ch <- c.Mirrors
 	ch <- c.Oauths
 	ch <- c.Organizations
+	ch <- c.Projects
+	ch <- c.ProjectBoards
 	ch <- c.PublicKeys
 	ch <- c.Releases
 	ch <- c.Repositories
@@ -275,6 +289,16 @@ func (c Collector) Collect(ch chan<- prometheus.Metric) {
 		prometheus.GaugeValue,
 		float64(stats.Counter.Org),
 	)
+	ch <- prometheus.MustNewConstMetric(
+		c.Projects,
+		prometheus.GaugeValue,
+		float64(stats.Counter.Project),
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.ProjectBoards,
+		prometheus.GaugeValue,
+		float64(stats.Counter.ProjectBoard),
+	)
 	ch <- prometheus.MustNewConstMetric(
 		c.PublicKeys,
 		prometheus.GaugeValue,

options/locale/locale_bg-BG.ini

@@ -902,7 +902,6 @@ settings.slack_username=Потребителско име
 settings.slack_icon_url=URL адрес на икона
 settings.discord_username=Потребителско име
 settings.discord_icon_url=URL адрес на икона
-settings.slack_color=Цвят
 settings.event_send_everything=Всички събития
 settings.event_create=Създаване
 settings.event_delete=Изтриване

options/locale/locale_cs-CZ.ini

@@ -935,7 +935,6 @@ commit_graph=Graf commitů
 commit_graph.select=Vybrat větve
 commit_graph.hide_pr_refs=Skrýt požadavky na natažení
 commit_graph.monochrome=Černobílé
-commit_graph.color=Barevné
 blame=Blame
 normal_view=Normální zobrazení
 line=řádek
@@ -1733,7 +1732,6 @@ settings.slack_username=Uživatelské jméno
 settings.slack_icon_url=URL ikony uživatele
 settings.discord_username=Uživatelské jméno
 settings.discord_icon_url=URL ikony
-settings.slack_color=Barva
 settings.event_desc=Spuštěno na:
 settings.event_push_only=Události nahrání
 settings.event_send_everything=Všechny události

options/locale/locale_de-DE.ini

@@ -345,8 +345,6 @@ reset_password.text=Bitte klicke innerhalb von <b>%s</b> auf folgenden Link, um
 
 register_success=Registrierung erfolgreich
 
-issue_assigned.pull=@%[1]s hat dich im Repository %[3]s dem Pull Request %[2]s zugewiesen.
-issue_assigned.issue=@%[1]s hat dich im Repository %[3]s dem Issue %[2]s zugewiesen.
 
 issue.x_mentioned_you=<b>@%s</b> hat dich erwähnt:
 issue.action.force_push=<b>%[1]s</b> hat %[3]s mit %[4]s auf <b>%[2]s</b> überschrieben.
@@ -977,7 +975,6 @@ commit_graph=Commit graph
 commit_graph.select=Branches auswählen
 commit_graph.hide_pr_refs=Pull-Requests ausblenden
 commit_graph.monochrome=Monochrom
-commit_graph.color=Bunt
 blame=Blame
 normal_view=Normale Ansicht
 line=zeile
@@ -1784,7 +1781,6 @@ settings.slack_username=Benutzername
 settings.slack_icon_url=Icon-URL
 settings.discord_username=Benutzername
 settings.discord_icon_url=Icon-URL
-settings.slack_color=Farbe
 settings.event_desc=Auslösen bei:
 settings.event_push_only=Push-Events
 settings.event_send_everything=Alle Events

options/locale/locale_el-GR.ini

@@ -345,8 +345,6 @@ reset_password.text=Κάντε κλικ στον παρακάτω σύνδεσμ
 
 register_success=Επιτυχής εγγραφή
 
-issue_assigned.pull=@%[1]s σας ανέθεσε στο Pull Request %[2]s στο αποθετήριο %[3]s.
-issue_assigned.issue=@%[1]s σας ανέθεσε στο θέμα %[2]s στο αποθετήριο %[3]s.
 
 issue.x_mentioned_you=<b>@%s</b> σας ανέφερε:
 issue.action.force_push=<b>%[1]s</b> έκανε force-push το <b>%[2]s</b> από %[3]s σε %[4]s.
@@ -977,7 +975,6 @@ commit_graph=Γράφημα Υποβολών
 commit_graph.select=Επιλογή κλάδων
 commit_graph.hide_pr_refs=Απόκρυψη Pull Requests
 commit_graph.monochrome=Μονόχρωμο
-commit_graph.color=Έγχρωμο
 blame=Ευθύνη
 normal_view=Κανονική Προβολή
 line=γραμμή
@@ -1786,7 +1783,6 @@ settings.slack_username=Όνομα Χρήστη
 settings.slack_icon_url=URL Εικονιδίου
 settings.discord_username=Όνομα Χρήστη
 settings.discord_icon_url=URL Εικονιδίου
-settings.slack_color=Χρώμα
 settings.event_desc=Ενεργοποίηση Σε:
 settings.event_push_only=Γεγονότα Push
 settings.event_send_everything=Όλα τα Γεγονότα

options/locale/locale_en-US.ini

@@ -970,6 +970,7 @@ file_view_rendered = View Rendered
 file_view_raw = View Raw
 file_permalink = Permalink
 file_too_large = The file is too large to be shown.
+file_copy_permalink = Copy Permalink
 video_not_supported_in_browser = Your browser does not support the HTML5 'video' tag.
 audio_not_supported_in_browser = Your browser does not support the HTML5 'audio' tag.
 stored_lfs = Stored with Git LFS

options/locale/locale_es-ES.ini

@@ -96,6 +96,7 @@ error=Error
 error404=La página a la que está intentando acceder o <strong>no existe</strong> o <strong>no está autorizado</strong> para verla.
 
 never=Nunca
+color=Color
 
 [error]
 occurred=Se ha producido un error
@@ -977,7 +978,6 @@ commit_graph=Gráfico de commits
 commit_graph.select=Seleccionar ramas
 commit_graph.hide_pr_refs=Ocultar Pull Requests
 commit_graph.monochrome=Mono
-commit_graph.color=Color
 blame=Blame
 normal_view=Vista normal
 line=línea
@@ -1786,7 +1786,6 @@ settings.slack_username=Nombre de usuario
 settings.slack_icon_url=URL de icono
 settings.discord_username=Usuario
 settings.discord_icon_url=URL de icono
-settings.slack_color=Color
 settings.event_desc=Activar:
 settings.event_push_only=Eventos Push
 settings.event_send_everything=Todos los eventos

options/locale/locale_fa-IR.ini

@@ -781,7 +781,6 @@ stored_lfs=ذخیره شده با GIT LFS
 symbolic_link=پیوند نمادین
 commit_graph=نمودار کامیت
 commit_graph.monochrome=مونو
-commit_graph.color=رنگ
 blame=سرزنش
 normal_view=نمایش عادی
 line=خط
@@ -1430,7 +1429,6 @@ settings.slack_username=نام‎کاربری
 settings.slack_icon_url=نشانی تمثال
 settings.discord_username=نام‎کاربری
 settings.discord_icon_url=نشانی تمثال
-settings.slack_color=رنگ
 settings.event_desc=ماشه بر روی:
 settings.event_push_only=رویداد درج کردن
 settings.event_send_everything=همه رویدادها

options/locale/locale_fi-FI.ini

@@ -903,7 +903,6 @@ settings.secret=Salaus
 settings.slack_username=Käyttäjätunnus
 settings.slack_icon_url=Kuvakkeen URL
 settings.discord_username=Käyttäjätunnus
-settings.slack_color=Väri
 settings.event_create=Luo
 settings.event_delete=Poista
 settings.event_release_desc=Julkaisu julkaistu, päivitetty tai poistettu varastosta.

options/locale/locale_fr-FR.ini

@@ -918,7 +918,6 @@ commit_graph=Graphique des révisions
 commit_graph.select=Sélectionner les branches
 commit_graph.hide_pr_refs=Masquer les demandes d'ajout
 commit_graph.monochrome=Monochrome
-commit_graph.color=Couleur
 blame=Annotations
 normal_view=Vue normale
 line=ligne
@@ -1707,7 +1706,6 @@ settings.slack_username=Nom d'utilisateur
 settings.slack_icon_url=URL de l'icône
 settings.discord_username=Nom d'utilisateur
 settings.discord_icon_url=URL de l'icône
-settings.slack_color=Couleur
 settings.event_desc=Événement déclencheur :
 settings.event_push_only=Événements de poussée
 settings.event_send_everything=Tous les événements

options/locale/locale_hu-HU.ini

@@ -1215,7 +1215,6 @@ settings.slack_username=Felhasználónév
 settings.slack_icon_url=Ikon URL
 settings.discord_username=Felhasználónév
 settings.discord_icon_url=Ikon URL
-settings.slack_color=Szín
 settings.event_desc=Bekapcsolás ha:
 settings.event_push_only=Feltöltésekkor
 settings.event_send_everything=Összes eseményre

options/locale/locale_id-ID.ini

@@ -981,7 +981,6 @@ settings.slack_username=Nama pengguna
 settings.slack_icon_url=Ikon URL
 settings.discord_username=Nama pengguna
 settings.discord_icon_url=URL ikon
-settings.slack_color=Warna
 settings.event_create=Menciptakan
 settings.event_push=Dorong
 settings.event_repository=Repositori

options/locale/locale_it-IT.ini

@@ -846,7 +846,6 @@ symbolic_link=Link Simbolico
 commit_graph=Grafico dei commit
 commit_graph.select=Seleziona rami
 commit_graph.monochrome=Mono
-commit_graph.color=Colore
 blame=Blame
 normal_view=Vista normale
 line=riga
@@ -1565,7 +1564,6 @@ settings.slack_username=Nome utente
 settings.slack_icon_url=URL icona
 settings.discord_username=Nome utente
 settings.discord_icon_url=URL icona
-settings.slack_color=Colore
 settings.event_desc=Attivato su:
 settings.event_push_only=Pusha eventi
 settings.event_send_everything=Tutti gli eventi

options/locale/locale_ja-JP.ini

@@ -345,8 +345,6 @@ reset_password.text=あなたのアカウントを回復するには、<b>%s</b>
 
 register_success=登録が完了しました
 
-issue_assigned.pull=リポジトリ %[3]s で @%[1]s さんが、あなたをプルリクエスト %[2]s の担当者にしました。
-issue_assigned.issue=リポジトリ %[3]s で @%[1]s さんが、あなたをイシュー %[2]s の担当者にしました。
 
 issue.x_mentioned_you=<b>@%s</b> さんが、あなたにメンションしました:
 issue.action.force_push=<b>%[1]s</b> さんが <b>%[2]s</b> に強制プッシュしました。(%[3]s から %[4]s へ)
@@ -977,7 +975,6 @@ commit_graph=コミットグラフ
 commit_graph.select=ブランチを選択
 commit_graph.hide_pr_refs=プルリクエストを非表示
 commit_graph.monochrome=モノクロ
-commit_graph.color=カラー
 blame=Blame
 normal_view=通常表示
 line=行
@@ -1791,7 +1788,6 @@ settings.slack_username=ユーザー名
 settings.slack_icon_url=アイコンのURL
 settings.discord_username=ユーザー名
 settings.discord_icon_url=アイコンのURL
-settings.slack_color=色
 settings.event_desc=トリガー:
 settings.event_push_only=プッシュのイベント
 settings.event_send_everything=すべてのイベント

options/locale/locale_ko-KR.ini

@@ -1067,7 +1067,6 @@ settings.slack_username=사용자 이름
 settings.slack_icon_url=아이콘 URL
 settings.discord_username=사용자명
 settings.discord_icon_url=아이콘 URL
-settings.slack_color=색
 settings.event_desc=트리거:
 settings.event_push_only=푸시 이벤트
 settings.event_send_everything=모든 이벤트

options/locale/locale_lv-LV.ini

@@ -345,8 +345,6 @@ reset_password.text=Nospiediet uz saites, lai atjaunotu savu kontu lapā <b>%s</
 
 register_success=Veiksmīga reģistrācija
 
-issue_assigned.pull=@%[1]s piešķīra jums izmaiņu pieprasījumu %[2]s repozitorijā %[3]s.
-issue_assigned.issue=@%[1]s piešķīra jums problēmu %[2]s repozitorijā %[3]s.
 
 issue.x_mentioned_you=<b>@%s</b> pieminēja Jūs:
 issue.action.force_push=<b>%[1]s</b> veica piespiedu izmaiņu iesūtīšanu atzarā <b>%[2]s</b> no revīzijas %[3]s uz %[4]s.
@@ -967,7 +965,6 @@ commit_graph=Revīziju grafs
 commit_graph.select=Izvēlieties atzarus
 commit_graph.hide_pr_refs=Paslēpt izmaiņu pieprasījumus
 commit_graph.monochrome=Melnbalts
-commit_graph.color=Krāsains
 blame=Vainot
 normal_view=Parastais skats
 line=rinda
@@ -1767,7 +1764,6 @@ settings.slack_username=Lietotājvārds
 settings.slack_icon_url=Ikonas URL
 settings.discord_username=Lietotāja vārds
 settings.discord_icon_url=Ikonas URL
-settings.slack_color=Krāsa
 settings.event_desc=Izsaukt notikumiem:
 settings.event_push_only=Izmaiņu nosūtīšanas notikumi
 settings.event_send_everything=Visus notikumus