Merge branch 'master' into slight-performance-improvement-for-last-commit-cache

Author: techknowlogick

custom/conf/app.example.ini

@@ -1145,6 +1145,14 @@ RUN_AT_START = false
 NO_SUCCESS_NOTICE = false
 SCHEDULE = @every 72h
 
+; Delete all old actions from database
+[cron.delete_old_actions]
+ENABLED = false
+RUN_AT_START = false
+NO_SUCCESS_NOTICE = false
+SCHEDULE = @every 168h
+OLDER_THAN = 8760h
+
 [git]
 ; The path of git executable. If empty, Gitea searches through the PATH environment.
 PATH =

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -786,6 +786,13 @@ NB: You must have `DISABLE_ROUTER_LOG` set to `false` for this option to take ef
 - `NO_SUCCESS_NOTICE`: **false**: Set to true to switch off success notices.
 - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`.
 
+#### Cron -  Delete all old actions from database ('cron.delete_old_actions')
+- `ENABLED`: **false**: Enable service.
+- `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
+- `NO_SUCCESS_NOTICE`: **false**: Set to true to switch off success notices.
+- `SCHEDULE`: **@every 128h**: Cron syntax for scheduling a work, e.g. `@every 128h`.
+- `OLDER_THAN`: **@every 8760h**: any action older than this expression will be deleted from database, suggest using `8760h` (1 year) because that's the max length of heatmap.
+
 ## Git (`git`)
 
 - `PATH`: **""**: The path of git executable. If empty, Gitea searches through the PATH environment.

integrations/mssql.ini.tmpl

@@ -10,9 +10,10 @@ PASSWD   = {{TEST_MSSQL_PASSWORD}}
 SSL_MODE = disable
 
 [indexer]
-ISSUE_INDEXER_PATH = integrations/indexers-mssql/issues.bleve
+ISSUE_INDEXER_PATH = integrations/gitea-integration-mssql/indexers/issues.bleve
+ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-mssql/indexers/issues.queue
 REPO_INDEXER_ENABLED = true
-REPO_INDEXER_PATH = integrations/indexers-mssql/repos.bleve
+REPO_INDEXER_PATH = integrations/gitea-integration-mssql/indexers/repos.bleve
 
 [queue.code_indexer]
 TYPE = immediate
@@ -24,8 +25,10 @@ TYPE = immediate
 ROOT = {{REPO_TEST_DIR}}integrations/gitea-integration-mssql/gitea-repositories
 
 [repository.local]
-LOCAL_COPY_PATH = tmp/local-repo-mssql
-LOCAL_WIKI_PATH = tmp/local-wiki-mssql
+LOCAL_COPY_PATH = integrations/gitea-integration-mssql/tmp/local-repo
+
+[repository.upload]
+TEMP_PATH = integrations/gitea-integration-mssql/tmp/uploads
 
 [repository.signing]
 SIGNING_KEY = none
@@ -39,14 +42,14 @@ SSH_LISTEN_HOST  = localhost
 SSH_PORT         = 2201
 START_SSH_SERVER = true
 LFS_START_SERVER = true
-LFS_CONTENT_PATH = integrations/gitea-integration-mssql/data/lfs-mssql
+LFS_CONTENT_PATH = integrations/gitea-integration-mssql/data/lfs
 OFFLINE_MODE     = false
 LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
 APP_DATA_PATH    = integrations/gitea-integration-mssql/data
 BUILTIN_SSH_SERVER_USER = git
 
 [attachment]
-PATH = integrations/gitea-integration-mssql/data
+PATH = integrations/gitea-integration-mssql/data/attachments
 
 [mailer]
 ENABLED = true

integrations/mysql.ini.tmpl

@@ -12,9 +12,9 @@ SSL_MODE = disable
 [indexer]
 ISSUE_INDEXER_TYPE = elasticsearch
 ISSUE_INDEXER_CONN_STR = http://elastic:changeme@elasticsearch:9200
-ISSUE_INDEXER_PATH = integrations/indexers-mysql/issues.bleve
+ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-mysql/indexers/issues.queue
 REPO_INDEXER_ENABLED = true
-REPO_INDEXER_PATH = integrations/indexers-mysql/repos.bleve
+REPO_INDEXER_PATH = integrations/gitea-integration-mysql/indexers/repos.bleve
 
 [queue.code_indexer]
 TYPE = immediate
@@ -26,8 +26,10 @@ TYPE = immediate
 ROOT = {{REPO_TEST_DIR}}integrations/gitea-integration-mysql/gitea-repositories
 
 [repository.local]
-LOCAL_COPY_PATH = tmp/local-repo-mysql
-LOCAL_WIKI_PATH = tmp/local-wiki-mysql
+LOCAL_COPY_PATH = integrations/gitea-integration-mysql/tmp/local-repo
+
+[repository.upload]
+TEMP_PATH = integrations/gitea-integration-mysql/tmp/uploads
 
 [repository.signing]
 SIGNING_KEY = none

integrations/mysql8.ini.tmpl

@@ -10,9 +10,10 @@ PASSWD   = {{TEST_MYSQL8_PASSWORD}}
 SSL_MODE = disable
 
 [indexer]
-ISSUE_INDEXER_PATH = integrations/indexers-mysql8/issues.bleve
+ISSUE_INDEXER_PATH = integrations/gitea-integration-mysql8/indexers/issues.bleve
+ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-mysql8/indexers/issues.queue
 REPO_INDEXER_ENABLED = true
-REPO_INDEXER_PATH = integrations/indexers-mysql8/repos.bleve
+REPO_INDEXER_PATH = integrations/gitea-integration-mysql8/indexers/repos.bleve
 
 [queue.code_indexer]
 TYPE = immediate
@@ -24,8 +25,10 @@ TYPE = immediate
 ROOT = {{REPO_TEST_DIR}}integrations/gitea-integration-mysql8/gitea-repositories
 
 [repository.local]
-LOCAL_COPY_PATH = tmp/local-repo-mysql8
-LOCAL_WIKI_PATH = tmp/local-wiki-mysql8
+LOCAL_COPY_PATH = integrations/gitea-integration-mysql8/tmp/local-repo
+
+[repository.upload]
+TEMP_PATH = integrations/gitea-integration-mysql8/tmp/uploads
 
 [repository.signing]
 SIGNING_KEY = none
@@ -39,12 +42,15 @@ SSH_LISTEN_HOST  = localhost
 SSH_PORT         = 2204
 START_SSH_SERVER = true
 LFS_START_SERVER = true
-LFS_CONTENT_PATH = data/lfs-mysql8
+LFS_CONTENT_PATH = integrations/gitea-integration-mysql8/data/lfs
 OFFLINE_MODE     = false
 LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
 APP_DATA_PATH    = integrations/gitea-integration-mysql8/data
 BUILTIN_SSH_SERVER_USER = git
 
+[attachment]
+PATH = integrations/gitea-integration-mysql8/data/attachments
+
 [mailer]
 ENABLED = false
 
@@ -60,12 +66,14 @@ DEFAULT_ALLOW_CREATE_ORGANIZATION = true
 NO_REPLY_ADDRESS                  = noreply.example.org
 
 [picture]
-DISABLE_GRAVATAR        = false
-ENABLE_FEDERATED_AVATAR = false
+DISABLE_GRAVATAR              = false
+ENABLE_FEDERATED_AVATAR       = false
+AVATAR_UPLOAD_PATH            = integrations/gitea-integration-mysql8/data/avatars
+REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-mysql8/data/repo-avatars
 
 [session]
 PROVIDER = file
-PROVIDER_CONFIG = data/sessions-mysql8
+PROVIDER_CONFIG = integrations/gitea-integration-mysql8/data/sessions
 
 [log]
 MODE                 = test,file
@@ -80,10 +88,8 @@ COLORIZE             = true
 [log.file]
 LEVEL                = Debug
 
-
 [security]
 DISABLE_GIT_HOOKS = false
 INSTALL_LOCK   = true
 SECRET_KEY     = 9pCviYTWSb
 INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE0OTU1NTE2MTh9.hhSVGOANkaKk3vfCd2jDOIww4pUk0xtg9JRde5UogyQ
-

integrations/pgsql.ini.tmpl

@@ -11,9 +11,10 @@ SCHEMA   = {{TEST_PGSQL_SCHEMA}}
 SSL_MODE = disable
 
 [indexer]
-ISSUE_INDEXER_PATH = integrations/indexers-pgsql/issues.bleve
+ISSUE_INDEXER_PATH = integrations/gitea-integration-pgsql/indexers/issues.bleve
+ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-pgsql/indexers/issues.queue
 REPO_INDEXER_ENABLED = true
-REPO_INDEXER_PATH = integrations/indexers-pgsql/repos.bleve
+REPO_INDEXER_PATH = integrations/gitea-integration-pgsql/indexers/repos.bleve
 
 [queue.code_indexer]
 TYPE = immediate
@@ -25,8 +26,10 @@ TYPE = immediate
 ROOT = {{REPO_TEST_DIR}}integrations/gitea-integration-pgsql/gitea-repositories
 
 [repository.local]
-LOCAL_COPY_PATH = tmp/local-repo-pgsql
-LOCAL_WIKI_PATH = tmp/local-wiki-pgsql
+LOCAL_COPY_PATH = integrations/gitea-integration-pgsql/tmp/local-repo
+
+[repository.upload]
+TEMP_PATH = integrations/gitea-integration-pgsql/tmp/uploads
 
 [repository.signing]
 SIGNING_KEY = none
@@ -40,14 +43,14 @@ SSH_LISTEN_HOST  = localhost
 SSH_PORT         = 2202
 START_SSH_SERVER = true
 LFS_START_SERVER = true
-LFS_CONTENT_PATH = integrations/gitea-integration-pgsql/data/lfs-pgsql
+LFS_CONTENT_PATH = integrations/gitea-integration-pgsql/data/lfs
 OFFLINE_MODE     = false
 LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
 APP_DATA_PATH    = integrations/gitea-integration-pgsql/data
 BUILTIN_SSH_SERVER_USER = git
 
 [attachment]
-PATH = integrations/gitea-integration-pgsql/data
+PATH = integrations/gitea-integration-pgsql/data/attachments
 
 [mailer]
 ENABLED = true

integrations/sqlite.ini.tmpl

@@ -6,9 +6,10 @@ DB_TYPE = sqlite3
 PATH    = integrations/gitea-integration-sqlite/gitea.db
 
 [indexer]
-ISSUE_INDEXER_PATH   = integrations/indexers-sqlite/issues.bleve
+ISSUE_INDEXER_PATH   = integrations/gitea-integration-sqlite/indexers/issues.bleve
+ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-sqlite/indexers/issues.queue
 REPO_INDEXER_ENABLED = true
-REPO_INDEXER_PATH    = integrations/indexers-sqlite/repos.bleve
+REPO_INDEXER_PATH    = integrations/gitea-integration-sqlite/indexers/repos.bleve
 
 [queue.code_indexer]
 TYPE = immediate
@@ -20,8 +21,10 @@ TYPE = immediate
 ROOT = {{REPO_TEST_DIR}}integrations/gitea-integration-sqlite/gitea-repositories
 
 [repository.local]
-LOCAL_COPY_PATH = tmp/local-repo-sqlite
-LOCAL_WIKI_PATH = tmp/local-wiki-sqlite
+LOCAL_COPY_PATH = integrations/gitea-integration-sqlite/tmp/local-repo
+
+[repository.upload]
+TEMP_PATH = integrations/gitea-integration-sqlite/tmp/uploads
 
 [repository.signing]
 SIGNING_KEY = none
@@ -35,15 +38,15 @@ SSH_LISTEN_HOST  = localhost
 SSH_PORT         = 2203
 START_SSH_SERVER = true
 LFS_START_SERVER = true
-LFS_CONTENT_PATH = integrations/gitea-integration-sqlite/data
+LFS_CONTENT_PATH = integrations/gitea-integration-sqlite/data/lfs
 OFFLINE_MODE     = false
 LFS_JWT_SECRET   = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
 APP_DATA_PATH    = integrations/gitea-integration-sqlite/data
 ENABLE_GZIP      = true
 BUILTIN_SSH_SERVER_USER = git
 
 [attachment]
-PATH = integrations/gitea-integration-sqlite/data
+PATH = integrations/gitea-integration-sqlite/data/attachments
 
 [mailer]
 ENABLED     = true
@@ -67,7 +70,6 @@ ENABLE_FEDERATED_AVATAR       = false
 AVATAR_UPLOAD_PATH            = integrations/gitea-integration-sqlite/data/avatars
 REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-sqlite/data/repo-avatars
 
-
 [session]
 PROVIDER = file
 PROVIDER_CONFIG = integrations/gitea-integration-sqlite/data/sessions

models/action.go

@@ -395,3 +395,13 @@ func activityQueryCondition(opts GetFeedsOptions) (builder.Cond, error) {
 
 	return cond, nil
 }
+
+// DeleteOldActions deletes all old actions from database.
+func DeleteOldActions(olderThan time.Duration) (err error) {
+	if olderThan <= 0 {
+		return nil
+	}
+
+	_, err = x.Where("created_unix < ?", time.Now().Add(-olderThan).Unix()).Delete(&Action{})
+	return
+}

modules/convert/user.go

@@ -38,13 +38,16 @@ func ToUserWithAccessMode(user *models.User, accessMode models.AccessMode) *api.
 // signed shall only be set if requester is logged in. authed shall only be set if user is site admin or user himself
 func toUser(user *models.User, signed, authed bool) *api.User {
 	result := &api.User{
-		ID:         user.ID,
-		UserName:   user.Name,
-		FullName:   markup.Sanitize(user.FullName),
-		Email:      user.GetEmail(),
-		AvatarURL:  user.AvatarLink(),
-		Created:    user.CreatedUnix.AsTime(),
-		Restricted: user.IsRestricted,
+		ID:          user.ID,
+		UserName:    user.Name,
+		FullName:    markup.Sanitize(user.FullName),
+		Email:       user.GetEmail(),
+		AvatarURL:   user.AvatarLink(),
+		Created:     user.CreatedUnix.AsTime(),
+		Restricted:  user.IsRestricted,
+		Location:    user.Location,
+		Website:     user.Website,
+		Description: user.Description,
 	}
 	// hide primary email if API caller is anonymous or user keep email private
 	if signed && (!user.KeepEmailPrivate || authed) {

modules/cron/tasks_extended.go

@@ -117,6 +117,20 @@ func registerRemoveRandomAvatars() {
 	})
 }
 
+func registerDeleteOldActions() {
+	RegisterTaskFatal("delete_old_actions", &OlderThanConfig{
+		BaseConfig: BaseConfig{
+			Enabled:    false,
+			RunAtStart: false,
+			Schedule:   "@every 168h",
+		},
+		OlderThan: 365 * 24 * time.Hour,
+	}, func(ctx context.Context, _ *models.User, config Config) error {
+		olderThanConfig := config.(*OlderThanConfig)
+		return models.DeleteOldActions(olderThanConfig.OlderThan)
+	})
+}
+
 func initExtendedTasks() {
 	registerDeleteInactiveUsers()
 	registerDeleteRepositoryArchives()
@@ -127,4 +141,5 @@ func initExtendedTasks() {
 	registerReinitMissingRepositories()
 	registerDeleteMissingRepositories()
 	registerRemoveRandomAvatars()
+	registerDeleteOldActions()
 }

modules/structs/user.go

@@ -33,6 +33,12 @@ type User struct {
 	Created time.Time `json:"created,omitempty"`
 	// Is user restricted
 	Restricted bool `json:"restricted"`
+	// the user's location
+	Location string `json:"location"`
+	// the user's website
+	Website string `json:"website"`
+	// the user's biography
+	Description string `json:"bio"`
 }
 
 // MarshalJSON implements the json.Marshaler interface for User, adding field(s) for backward compatibility

options/locale/locale_de-DE.ini

@@ -420,6 +420,7 @@ repositories=Repositories
 activity=Öffentliche Aktivität
 followers=Follower
 starred=Favoriten
+watched=Beobachtete Repositories
 projects=Projekte
 following=Folge ich
 follow=Folgen
@@ -725,6 +726,10 @@ mirror_address=Klonen via URL
 mirror_address_desc=Gib alle erforderlichen Anmeldedaten im Abschnitt "Autorisierung klonen" ein.
 mirror_address_url_invalid=Die angegebene URL ist ungültig. Achte darauf, alle URL-Komponenten korrekt zu maskieren.
 mirror_address_protocol_invalid=Die angegebene URL ist ungültig. Nur Pfade beginnend mit http(s):// oder git:// können gespiegelt werden.
+mirror_lfs=Großdatei-Speicher (LFS)
+mirror_lfs_desc=Mirroring von LFS-Dateien aktivieren.
+mirror_lfs_endpoint=LFS-Endpunkt
+mirror_lfs_endpoint_desc=Sync wird versuchen, die Klon-URL zu verwenden, um <a target="_blank" rel="noopener noreferrer" href="%s">den LFS-Server zu bestimmen</a>. Du kannst auch einen eigenen Endpunkt angeben, wenn die LFS-Dateien woanders gespeichert werden.
 mirror_last_synced=Zuletzt synchronisiert
 watchers=Beobachter
 stargazers=Favorisiert von
@@ -783,6 +788,11 @@ migrate_options=Migrationsoptionen
 migrate_service=Migrationsdienst
 migrate_options_mirror_helper=Dieses Repository wird ein <span class="text blue">Mirror</span> sein
 migrate_options_mirror_disabled=Dein Administrator hat neue Mirrors deaktiviert.
+migrate_options_lfs=LFS-Dateien migrieren
+migrate_options_lfs_endpoint.label=LFS-Endpunkt
+migrate_options_lfs_endpoint.description=Migration wird versuchen, über den entfernten Git-Server <a target="_blank" rel="noopener noreferrer" href="%s">den LFS-Server zu bestimmen</a>. Du kannst auch einen eigenen Endpunkt angeben, wenn die LFS-Dateien woanders gespeichert werden.
+migrate_options_lfs_endpoint.description.local=Ein lokaler Serverpfad wird ebenfalls unterstützt.
+migrate_options_lfs_endpoint.placeholder=Leer lassen, um aus der Klon-URL abzuleiten
 migrate_items=Migrationselemente
 migrate_items_wiki=Wiki
 migrate_items_milestones=Meilensteine
@@ -799,6 +809,7 @@ migrate.permission_denied=Du hast keine Berechtigung zum Importieren lokaler Rep
 migrate.permission_denied_blocked=Du darfst nicht von geblockten Hosts importieren.
 migrate.permission_denied_private_ip=Du darfst nicht von privaten IP-Addressen importieren.
 migrate.invalid_local_path=Der lokale Pfad ist ungültig, existiert nicht oder ist kein Ordner.
+migrate.invalid_lfs_endpoint=Ungültiger LFS Endpunkt.
 migrate.failed=Fehler bei der Migration: %v
 migrate.migrate_items_options=Zugangs-Token wird benötigt, um zusätzliche Elemente zu migrieren
 migrated_from=Migriert von <a href="%[1]s">%[2]s</a>
@@ -1112,6 +1123,8 @@ issues.context.edit=Bearbeiten
 issues.context.delete=Löschen
 issues.no_content=Hier gibt es bis jetzt noch keinen Inhalt.
 issues.close_issue=Schließen
+issues.pull_merged_at=`mergte den Commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> %[4]s in <b>%[3]s</b>`
+issues.manually_pull_merged_at=`mergte den Commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> %[4]s manuell in <b>%[3]s</b>`
 issues.close_comment_issue=Kommentieren und schließen
 issues.reopen_issue=Wieder öffnen
 issues.reopen_comment_issue=Kommentieren und wieder öffnen
@@ -1205,6 +1218,7 @@ issues.error_modifying_due_date=Fehler beim Ändern des Fälligkeitsdatums.
 issues.error_removing_due_date=Fehler beim Entfernen des Fälligkeitsdatums.
 issues.push_commit_1=hat %d Commit %s hinzugefügt
 issues.push_commits_n=hat %d Commits %s hinzugefügt
+issues.force_push_codes=`hat %[6]s %[1]s von <a class="ui sha" href="%[3]s"><code>%[2]s</code></a> zu <a class="ui sha" href="%[5]s"><code>%[4]s</code></a> force-gepusht`
 issues.due_date_form=JJJJ-MM-TT
 issues.due_date_form_add=Fälligkeitsdatum hinzufügen
 issues.due_date_form_edit=Bearbeiten