Merge branch 'main' into migration-credentials

Author: zeripath

docs/Makefile

@@ -31,4 +31,4 @@ update: $(THEME)
 $(THEME): $(THEME)/theme.toml
 $(THEME)/theme.toml:
 	mkdir -p $$(dirname $@)
-	curl -s $(ARCHIVE) | tar xz -C $$(dirname $@)
+	curl -L -s $(ARCHIVE) | tar xz -C $$(dirname $@)

integrations/pull_merge_test.go

@@ -197,10 +197,8 @@ func TestCantMergeWorkInProgress(t *testing.T) {
 		text := strings.TrimSpace(htmlDoc.doc.Find(".merge-section > .item").Last().Text())
 		assert.NotEmpty(t, text, "Can't find WIP text")
 
-		// remove <strong /> from lang
-		expected := i18n.Tr("en", "repo.pulls.cannot_merge_work_in_progress", "[wip]")
-		replacer := strings.NewReplacer("<strong>", "", "</strong>", "")
-		assert.Equal(t, replacer.Replace(expected), text, "Unable to find WIP text")
+		assert.Contains(t, text, i18n.Tr("en", "repo.pulls.cannot_merge_work_in_progress"), "Unable to find WIP text")
+		assert.Contains(t, text, "[wip]", "Unable to find WIP text")
 	})
 }
 

modules/auth/sso/basic.go

@@ -51,7 +51,7 @@ func (b *Basic) IsEnabled() bool {
 func (b *Basic) VerifyAuthData(req *http.Request, w http.ResponseWriter, store DataStore, sess SessionStore) *models.User {
 
 	// Basic authentication should only fire on API, Download or on Git or LFSPaths
-	if middleware.IsInternalPath(req) || !middleware.IsAPIPath(req) && !isAttachmentDownload(req) && !isGitOrLFSPath(req) {
+	if middleware.IsInternalPath(req) || !middleware.IsAPIPath(req) && !isAttachmentDownload(req) && !isGitRawOrLFSPath(req) {
 		return nil
 	}
 

modules/auth/sso/reverseproxy.go

@@ -78,7 +78,7 @@ func (r *ReverseProxy) VerifyAuthData(req *http.Request, w http.ResponseWriter,
 	}
 
 	// Make sure requests to API paths, attachment downloads, git and LFS do not create a new session
-	if !middleware.IsAPIPath(req) && !isAttachmentDownload(req) && !isGitOrLFSPath(req) {
+	if !middleware.IsAPIPath(req) && !isAttachmentDownload(req) && !isGitRawOrLFSPath(req) {
 		if sess.Get("uid").(int64) != user.ID {
 			handleSignIn(w, req, sess, user)
 		}

modules/auth/sso/sso.go

@@ -104,11 +104,11 @@ func isAttachmentDownload(req *http.Request) bool {
 	return strings.HasPrefix(req.URL.Path, "/attachments/") && req.Method == "GET"
 }
 
-var gitPathRe = regexp.MustCompile(`^/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/(?:(?:git-(?:(?:upload)|(?:receive))-pack$)|(?:info/refs$)|(?:HEAD$)|(?:objects/))`)
+var gitRawPathRe = regexp.MustCompile(`^/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/(?:(?:git-(?:(?:upload)|(?:receive))-pack$)|(?:info/refs$)|(?:HEAD$)|(?:objects/)|raw/)`)
 var lfsPathRe = regexp.MustCompile(`^/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/info/lfs/`)
 
-func isGitOrLFSPath(req *http.Request) bool {
-	if gitPathRe.MatchString(req.URL.Path) {
+func isGitRawOrLFSPath(req *http.Request) bool {
+	if gitRawPathRe.MatchString(req.URL.Path) {
 		return true
 	}
 	if setting.LFS.StartServer {

modules/auth/sso/sso_test.go

@@ -12,7 +12,7 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 )
 
-func Test_isGitOrLFSPath(t *testing.T) {
+func Test_isGitRawOrLFSPath(t *testing.T) {
 
 	tests := []struct {
 		path string
@@ -63,6 +63,10 @@ func Test_isGitOrLFSPath(t *testing.T) {
 			"/owner/repo/objects/pack/pack-0123456789abcdef0123456789abcdef0123456.idx",
 			true,
 		},
+		{
+			"/owner/repo/raw/branch/foo/fanaso",
+			true,
+		},
 		{
 			"/owner/repo/stars",
 			false,
@@ -98,11 +102,11 @@ func Test_isGitOrLFSPath(t *testing.T) {
 		t.Run(tt.path, func(t *testing.T) {
 			req, _ := http.NewRequest("POST", "http://localhost"+tt.path, nil)
 			setting.LFS.StartServer = false
-			if got := isGitOrLFSPath(req); got != tt.want {
+			if got := isGitRawOrLFSPath(req); got != tt.want {
 				t.Errorf("isGitOrLFSPath() = %v, want %v", got, tt.want)
 			}
 			setting.LFS.StartServer = true
-			if got := isGitOrLFSPath(req); got != tt.want {
+			if got := isGitRawOrLFSPath(req); got != tt.want {
 				t.Errorf("isGitOrLFSPath() = %v, want %v", got, tt.want)
 			}
 		})
@@ -111,11 +115,11 @@ func Test_isGitOrLFSPath(t *testing.T) {
 		t.Run(tt, func(t *testing.T) {
 			req, _ := http.NewRequest("POST", tt, nil)
 			setting.LFS.StartServer = false
-			if got := isGitOrLFSPath(req); got != setting.LFS.StartServer {
-				t.Errorf("isGitOrLFSPath(%q) = %v, want %v, %v", tt, got, setting.LFS.StartServer, gitPathRe.MatchString(tt))
+			if got := isGitRawOrLFSPath(req); got != setting.LFS.StartServer {
+				t.Errorf("isGitOrLFSPath(%q) = %v, want %v, %v", tt, got, setting.LFS.StartServer, gitRawPathRe.MatchString(tt))
 			}
 			setting.LFS.StartServer = true
-			if got := isGitOrLFSPath(req); got != setting.LFS.StartServer {
+			if got := isGitRawOrLFSPath(req); got != setting.LFS.StartServer {
 				t.Errorf("isGitOrLFSPath(%q) = %v, want %v", tt, got, setting.LFS.StartServer)
 			}
 		})

modules/setting/indexer.go

@@ -5,7 +5,6 @@
 package setting
 
 import (
-	"path"
 	"path/filepath"
 	"strings"
 	"time"
@@ -68,23 +67,23 @@ var (
 func newIndexerService() {
 	sec := Cfg.Section("indexer")
 	Indexer.IssueType = sec.Key("ISSUE_INDEXER_TYPE").MustString("bleve")
-	Indexer.IssuePath = sec.Key("ISSUE_INDEXER_PATH").MustString(path.Join(AppDataPath, "indexers/issues.bleve"))
+	Indexer.IssuePath = filepath.ToSlash(sec.Key("ISSUE_INDEXER_PATH").MustString(filepath.ToSlash(filepath.Join(AppDataPath, "indexers/issues.bleve"))))
 	if !filepath.IsAbs(Indexer.IssuePath) {
-		Indexer.IssuePath = path.Join(AppWorkPath, Indexer.IssuePath)
+		Indexer.IssuePath = filepath.ToSlash(filepath.Join(AppWorkPath, Indexer.IssuePath))
 	}
 	Indexer.IssueConnStr = sec.Key("ISSUE_INDEXER_CONN_STR").MustString(Indexer.IssueConnStr)
 	Indexer.IssueIndexerName = sec.Key("ISSUE_INDEXER_NAME").MustString(Indexer.IssueIndexerName)
 
 	Indexer.IssueQueueType = sec.Key("ISSUE_INDEXER_QUEUE_TYPE").MustString(LevelQueueType)
-	Indexer.IssueQueueDir = sec.Key("ISSUE_INDEXER_QUEUE_DIR").MustString(path.Join(AppDataPath, "queues/common"))
+	Indexer.IssueQueueDir = filepath.ToSlash(sec.Key("ISSUE_INDEXER_QUEUE_DIR").MustString(filepath.ToSlash(filepath.Join(AppDataPath, "queues/common"))))
 	Indexer.IssueQueueConnStr = sec.Key("ISSUE_INDEXER_QUEUE_CONN_STR").MustString("")
 	Indexer.IssueQueueBatchNumber = sec.Key("ISSUE_INDEXER_QUEUE_BATCH_NUMBER").MustInt(20)
 
 	Indexer.RepoIndexerEnabled = sec.Key("REPO_INDEXER_ENABLED").MustBool(false)
 	Indexer.RepoType = sec.Key("REPO_INDEXER_TYPE").MustString("bleve")
-	Indexer.RepoPath = sec.Key("REPO_INDEXER_PATH").MustString(path.Join(AppDataPath, "indexers/repos.bleve"))
+	Indexer.RepoPath = filepath.ToSlash(sec.Key("REPO_INDEXER_PATH").MustString(filepath.ToSlash(filepath.Join(AppDataPath, "indexers/repos.bleve"))))
 	if !filepath.IsAbs(Indexer.RepoPath) {
-		Indexer.RepoPath = path.Join(AppWorkPath, Indexer.RepoPath)
+		Indexer.RepoPath = filepath.ToSlash(filepath.Join(AppWorkPath, Indexer.RepoPath))
 	}
 	Indexer.RepoConnStr = sec.Key("REPO_INDEXER_CONN_STR").MustString("")
 	Indexer.RepoIndexerName = sec.Key("REPO_INDEXER_NAME").MustString("gitea_codes")

modules/setting/queue.go

@@ -48,7 +48,7 @@ func GetQueueSettings(name string) QueueSettings {
 	q.Name = name
 
 	// DataDir is not directly inheritable
-	q.DataDir = filepath.Join(Queue.DataDir, "common")
+	q.DataDir = filepath.ToSlash(filepath.Join(Queue.DataDir, "common"))
 	// QueueName is not directly inheritable either
 	q.QueueName = name + Queue.QueueName
 	for _, key := range sec.Keys() {
@@ -91,9 +91,9 @@ func GetQueueSettings(name string) QueueSettings {
 // This is exported for tests to be able to use the queue
 func NewQueueService() {
 	sec := Cfg.Section("queue")
-	Queue.DataDir = sec.Key("DATADIR").MustString("queues/")
+	Queue.DataDir = filepath.ToSlash(sec.Key("DATADIR").MustString("queues/"))
 	if !filepath.IsAbs(Queue.DataDir) {
-		Queue.DataDir = filepath.Join(AppDataPath, Queue.DataDir)
+		Queue.DataDir = filepath.ToSlash(filepath.Join(AppDataPath, Queue.DataDir))
 	}
 	Queue.QueueLength = sec.Key("LENGTH").MustInt(20)
 	Queue.BatchLength = sec.Key("BATCH_LENGTH").MustInt(20)

modules/web/middleware/cookie.go

@@ -149,7 +149,7 @@ func SetCookie(resp http.ResponseWriter, name string, value string, others ...in
 	if len(others) > 2 {
 		if v, ok := others[2].(string); ok && len(v) > 0 {
 			cookie.Domain = v
-		} else if v, ok := others[1].(func(*http.Cookie)); ok {
+		} else if v, ok := others[2].(func(*http.Cookie)); ok {
 			v(&cookie)
 		}
 	}
@@ -170,7 +170,7 @@ func SetCookie(resp http.ResponseWriter, name string, value string, others ...in
 	if len(others) > 4 {
 		if v, ok := others[4].(bool); ok && v {
 			cookie.HttpOnly = true
-		} else if v, ok := others[1].(func(*http.Cookie)); ok {
+		} else if v, ok := others[4].(func(*http.Cookie)); ok {
 			v(&cookie)
 		}
 	}
@@ -179,7 +179,7 @@ func SetCookie(resp http.ResponseWriter, name string, value string, others ...in
 		if v, ok := others[5].(time.Time); ok {
 			cookie.Expires = v
 			cookie.RawExpires = v.Format(time.UnixDate)
-		} else if v, ok := others[1].(func(*http.Cookie)); ok {
+		} else if v, ok := others[5].(func(*http.Cookie)); ok {
 			v(&cookie)
 		}
 	}

options/locale/locale_de-DE.ini

@@ -1285,6 +1285,8 @@ issues.review.resolved_by=markierte diese Unterhaltung als gelöst
 issues.assignee.error=Aufgrund eines unerwarteten Fehlers konnten nicht alle Beauftragten hinzugefügt werden.
 issues.reference_issue.body=Beschreibung
 
+compare.compare_base=Basis
+compare.compare_head=vergleichen
 
 pulls.desc=Pull-Requests und Code-Reviews aktivieren.
 pulls.new=Neuer Pull-Request
@@ -1547,6 +1549,7 @@ settings.email_notifications.disable=E-Mail Benachrichtigungen deaktivieren
 settings.email_notifications.submit=E-Mail-Einstellungen festlegen
 settings.site=Webseite
 settings.update_settings=Einstellungen speichern
+settings.branches.update_default_branch=Standardbranch aktualisieren
 settings.advanced_settings=Erweiterte Einstellungen
 settings.wiki_desc=Repository-Uncyclo aktivieren
 settings.use_internal_wiki=Eingebautes Uncyclo verwenden
@@ -1887,6 +1890,7 @@ diff.file_image_width=Breite
 diff.file_image_height=Höhe
 diff.file_byte_size=Größe
 diff.file_suppressed=Datei-Diff unterdrückt, da er zu groß ist
+diff.file_suppressed_line_too_long=Dateidiff unterdrückt, weil mindestens eine Zeile zu lang ist
 diff.too_many_files=Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.
 diff.comment.placeholder=Kommentieren...
 diff.comment.markdown_info=Styling mit Markdown wird unterstützt.
@@ -1972,6 +1976,10 @@ branch.restore=Branch „%s“ wiederherstellen
 branch.download=Branch „%s“ herunterladen
 branch.included_desc=Dieser Branch ist im Standard-Branch enthalten
 branch.included=Enthalten
+branch.create_new_branch=Branch aus Branch erstellen:
+branch.confirm_create_branch=Branch erstellen
+branch.new_branch=Neue Branch erstellen
+branch.new_branch_from=Neue Branch von '%s' erstellen
 
 tag.create_tag=Tag <strong>%s</strong> erstellen
 tag.create_success=Tag "%s" wurde erstellt.
@@ -2308,6 +2316,7 @@ auths.allowed_domains_helper=Leer lassen, um alle Domains zuzulassen. Trenne meh
 auths.enable_tls=TLS-Verschlüsselung aktivieren
 auths.skip_tls_verify=TLS-Verifikation überspringen
 auths.pam_service_name=PAM-Dienstname
+auths.pam_email_domain=PAM E-Mail-Domain (optional)
 auths.oauth2_provider=OAuth2-Anbieter
 auths.oauth2_icon_url=Icon URL
 auths.oauth2_clientID=Client-ID (Schlüssel)

options/locale/locale_en-US.ini

@@ -1316,7 +1316,10 @@ pulls.manually_merged_as = The pull request has been manually merged as <a rel="
 pulls.is_closed = The pull request has been closed.
 pulls.has_merged = The pull request has been merged.
 pulls.title_wip_desc = `<a href="#">Start the title with <strong>%s</strong></a> to prevent the pull request from being merged accidentally.`
-pulls.cannot_merge_work_in_progress = This pull request is marked as a work in progress. Remove the <strong>%s</strong> prefix from the title when it's ready
+pulls.cannot_merge_work_in_progress = This pull request is marked as a work in progress. 
+pulls.still_in_progress = Still in progress?
+pulls.add_prefix = Add <strong>%s</strong> prefix
+pulls.remove_prefix = Remove <strong>%s</strong> prefix
 pulls.data_broken = This pull request is broken due to missing fork information.
 pulls.files_conflicted = This pull request has changes conflicting with the target branch.
 pulls.is_checking = "Merge conflict checking is in progress. Try again in few moments."

options/locale/locale_it-IT.ini

@@ -240,6 +240,7 @@ users=Utenti
 organizations=Organizzazioni
 search=Cerca
 code=Codice
+search.fuzzy=Fuzzy
 search.match=Corrispondenze
 repo_no_results=Nessuna repository corrispondente.
 user_no_results=Nessun utente corrispondente.
@@ -366,6 +367,7 @@ password_not_match=Le password non corrispondono.
 lang_select_error=Selezionare una lingua dall'elenco.
 
 username_been_taken=Il Nome utente esiste già.
+username_change_not_local_user=Gli utenti non locali non sono autorizzati a modificare il proprio nome utente.
 repo_name_been_taken=Il nome del repository esiste già.
 repository_files_already_exist=File già esistenti per questo repository. Contatta l'amministratore di sistema.
 repository_files_already_exist.adopt=I file esistono già per questo repository e possono essere solo Adottati.
@@ -455,6 +457,7 @@ update_language_not_found=La lingua '%s' non è disponibile.
 update_profile_success=Il tuo profilo è stato aggiornato.
 change_username=Il tuo nome utente è stato modificato.
 change_username_prompt=Nota: i cambiamenti al nome utente vanno a modificare anche l'URL del tuo account.
+change_username_redirect_prompt=Il vecchio nome utente verrà reindirizzato fino a quando non verrà richiesto da un nuovo utente.
 continue=Continua
 cancel=Annulla
 language=Lingua
@@ -542,6 +545,7 @@ add_principal_success=Il certificato SSH '%s' è stato aggiunto.
 delete_key=Rimuovi
 ssh_key_deletion=Rimuovi chiave SSH
 gpg_key_deletion=Rimuovi chiave GPG
+ssh_principal_deletion=Rimuovi certificato SSH principale
 ssh_key_deletion_desc=Rimuovere una chiave SSH ne revoca l'accesso al tuo account. Continuare?
 gpg_key_deletion_desc=La rimozione di una chiave GPG invalida i commits firmati da essa. Continuare?
 ssh_key_deletion_success=La chiave SSH è stata rimossa.
@@ -687,6 +691,7 @@ license=Licenza
 license_helper=Seleziona un file di licenza.
 readme=LEGGIMI
 readme_helper=Seleziona un template per il file LEGGIMI.
+readme_helper_desc=Qui puoi scrivere una descrizione completa del progetto.
 auto_init=Inizializza Repository (Aggiungi .gitignore, Licenza e LEGGIMI)
 trust_model_helper=Seleziona il modello di fiducia per la verifica della firma. Le opzioni possibili sono:
 trust_model_helper_collaborator=Collaboratore: Fidati delle firme da parte dei collaboratori
@@ -1024,6 +1029,7 @@ issues.filter_type.all_issues=Tutti i problemi
 issues.filter_type.assigned_to_you=Assegnati a te
 issues.filter_type.created_by_you=Creati da te
 issues.filter_type.mentioning_you=Che ti riguardano
+issues.filter_type.review_requested=Richiesta revisione
 issues.filter_sort=Ordina
 issues.filter_sort.latest=Più recenti
 issues.filter_sort.oldest=Più vecchi
@@ -1229,6 +1235,7 @@ pulls.reopen_to_merge=Riapri questa pull request per effettuare l'unione.
 pulls.cant_reopen_deleted_branch=Questa pull request non può essere riaperta perché il branch è stato eliminato.
 pulls.merged=Unito
 pulls.merged_as=La pull request è stata unita come <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
+pulls.manually_merged=Unito manualmente
 pulls.is_closed=La pull request è stata chiusa.
 pulls.has_merged=La pull request è stata unita.
 pulls.title_wip_desc=`<a href="#">Inizia il titolo con <strong>%s</strong></a> per evitare che la pull request venga unita accidentalmente.`
@@ -1424,6 +1431,7 @@ activity.git_stats_deletion_n=%d cancellazioni
 
 search=Ricerca
 search.search_repo=Ricerca repository
+search.fuzzy=Fuzzy
 search.results=Risultati della ricerca per "%s" in <a href="%s">%s</a>
 
 settings=Impostazioni
@@ -1766,10 +1774,12 @@ diff.protected=Protetto
 
 releases.desc=Tenere traccia di versioni e download del progetto.
 release.releases=Rilasci
+release.detail=Dettagli rilascio
 release.new_release=Nuovo Rilascio
 release.draft=Bozza
 release.prerelease=Pre-Rilascio
 release.stable=Stabile
+release.compare=Confronta
 release.edit=modifica
 release.source_code=Codice Sorgente
 release.new_subheader=Le release organizzano le versioni del progetto.