Merge branch 'master' into fix-access-tests

Author: lunny

docs/config.yaml

@@ -58,7 +58,7 @@ menu:
       weight: 60
       pre: github
     - name: Discord Chat
-      url: https://discord.gg/NsatcWJ
+      url: https://discord.gg/Gitea
       weight: 70
       pre: comment
     - name: Forum
@@ -106,7 +106,7 @@ languages:
           weight: 60
           pre: github
         - name: Discord Chat
-          url: https://discord.gg/NsatcWJ
+          url: https://discord.gg/Gitea
           weight: 70
           pre: comment
         - name: Forum
@@ -149,7 +149,7 @@ languages:
           weight: 60
           pre: github
         - name: Discord Chat
-          url: https://discord.gg/NsatcWJ
+          url: https://discord.gg/Gitea
           weight: 70
           pre: comment
         - name: Forum
@@ -192,7 +192,7 @@ languages:
           weight: 60
           pre: github
         - name: Chat no Discord
-          url: https://discord.gg/NsatcWJ
+          url: https://discord.gg/Gitea
           weight: 70
           pre: comment
         - name: Forum
@@ -235,7 +235,7 @@ languages:
           weight: 60
           pre: github
         - name: Discord Chat
-          url: https://discord.gg/NsatcWJ
+          url: https://discord.gg/Gitea
           weight: 70
           pre: comment
         - name: Forum
@@ -278,7 +278,7 @@ languages:
           weight: 60
           pre: github
         - name: Discord Chat
-          url: https://discord.gg/NsatcWJ
+          url: https://discord.gg/Gitea
           weight: 70
           pre: comment
         - name: Forum

models/fixtures/repository.yml

@@ -4,6 +4,7 @@
   owner_name: user2
   lower_name: repo1
   name: repo1
+  is_empty: false
   is_private: false
   num_issues: 2
   num_closed_issues: 1

models/repo_indexer.go

@@ -34,6 +34,8 @@ func GetUnindexedRepos(indexerType RepoIndexerType, maxRepoID int64, page, pageS
 	ids := make([]int64, 0, 50)
 	cond := builder.Cond(builder.IsNull{
 		"repo_indexer_status.id",
+	}).And(builder.Eq{
+		"repository.is_empty": false,
 	})
 	sess := x.Table("repository").Join("LEFT OUTER", "repo_indexer_status", "repository.id = repo_indexer_status.repo_id AND repo_indexer_status.indexer_type = ?", indexerType)
 	if maxRepoID > 0 {
@@ -66,11 +68,11 @@ func (repo *Repository) getIndexerStatus(e Engine, indexerType RepoIndexerType)
 			return repo.StatsIndexerStatus, nil
 		}
 	}
-	status := &RepoIndexerStatus{RepoID: repo.ID, IndexerType: indexerType}
-	has, err := e.Get(status)
-	if err != nil {
+	status := &RepoIndexerStatus{RepoID: repo.ID}
+	if has, err := e.Where("`indexer_type` = ?", indexerType).Get(status); err != nil {
 		return nil, err
 	} else if !has {
+		status.IndexerType = indexerType
 		status.CommitSha = ""
 	}
 	switch indexerType {

models/repo_language_stats.go

@@ -125,10 +125,19 @@ func (repo *Repository) UpdateLanguageStats(commitID string, stats map[string]fl
 		}
 	}
 	// Delete old languages
-	if _, err := sess.Where("`id` IN (SELECT `id` FROM `language_stat` WHERE `repo_id` = ? AND `commit_id` != ?)", repo.ID, commitID).Delete(&LanguageStat{}); err != nil {
-		return err
+	statsToDelete := make([]int64, 0, len(oldstats))
+	for _, s := range oldstats {
+		if s.CommitID != commitID {
+			statsToDelete = append(statsToDelete, s.ID)
+		}
+	}
+	if len(statsToDelete) > 0 {
+		if _, err := sess.In("`id`", statsToDelete).Delete(&LanguageStat{}); err != nil {
+			return err
+		}
 	}
 
+	// Update indexer status
 	if err = repo.updateIndexerStatus(sess, RepoIndexerTypeStats, commitID); err != nil {
 		return err
 	}

modules/indexer/stats/queue.go

@@ -14,7 +14,7 @@ import (
 )
 
 // statsQueue represents a queue to handle repository stats updates
-var statsQueue queue.Queue
+var statsQueue queue.UniqueQueue
 
 // handle passed PR IDs and test the PRs
 func handle(data ...queue.Data) {
@@ -27,7 +27,7 @@ func handle(data ...queue.Data) {
 }
 
 func initStatsQueue() error {
-	statsQueue = queue.CreateQueue("repo_stats_update", handle, int64(0)).(queue.Queue)
+	statsQueue = queue.CreateUniqueQueue("repo_stats_update", handle, int64(0)).(queue.UniqueQueue)
 	if statsQueue == nil {
 		return fmt.Errorf("Unable to create repo_stats_update Queue")
 	}

options/locale/locale_es-ES.ini

@@ -833,7 +833,7 @@ issues.label_templates.use=Utilice la etiqueta
 issues.label_templates.fail_to_load_file=Error al cargar el archivo de plantilla de etiqueta '%s': %v
 issues.add_label_at=ha añadido la etiqueta <div class="ui label has-emoji" style="color: %s\; background-color: %s">%s</div> %s
 issues.remove_label_at=ha eliminado la etiqueta <div class="ui label has-emoji" style="color: %s\; background-color: %s">%s</div> %s
-issues.add_milestone_at=`ha añadido esto al hito <b>%s</b> %s '
+issues.add_milestone_at=`ha añadido esto al hito <b>%s</b> %s`
 issues.change_milestone_at=`modificó el hito de <b>%s</b> a <b>%s</b> %s`
 issues.remove_milestone_at=`eliminado esto del <b>%s</b> hito %s '
 issues.deleted_milestone=`(eliminado)`
@@ -902,7 +902,7 @@ issues.reopen_comment_issue=Comentar y reabrir
 issues.create_comment=Comentar
 issues.closed_at=`cerró <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`reabrió <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`mencionada esta incidencia en un commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.commit_ref_at=`referenció esta incidencia en un commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_issue_from=`<a href="%[3]s">referenció esta incidencia %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_pull_from=`<a href="%[3]s">referenció este pull request %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_closing_from=`<a href="%[3]s">referenció un pull request %[4]s que cerrará esta incidencia</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`

options/locale/locale_ja-JP.ini

@@ -79,6 +79,7 @@ write=書き込み
 preview=プレビュー
 loading=読み込み中…
 
+error404=アクセスしようとしたページは<strong>存在しない</strong>か、閲覧が<strong>許可されていません</strong>。
 
 [startpage]
 app_desc=痛みのない、自己ホスト型のGitサービス
@@ -1396,6 +1397,7 @@ settings.add_discord_hook_desc=<a href="%s">Discord</a>をリポジトリと組
 settings.add_dingtalk_hook_desc=<a href="%s">Dingtalk</a>をリポジトリと組み合わせます。
 settings.add_telegram_hook_desc=<a href="%s">Telegram</a>をリポジトリと組み合わせます。
 settings.add_msteams_hook_desc=<a href="%s">Microsoft Teams</a>をリポジトリと組み合わせます。
+settings.add_feishu_hook_desc=<a href="%s">Feishu</a>をリポジトリと組み合わせます。
 settings.deploy_keys=デプロイキー
 settings.add_deploy_key=デプロイキーを追加
 settings.deploy_key_desc=デプロイキーには、リポジトリの読み取り専用プルアクセス権が与えられます。

options/locale/locale_lv-LV.ini

@@ -103,6 +103,7 @@ user=Lietotāja vārds
 password=Parole
 db_name=Datu bāzes nosaukums
 db_helper=Piezīme MySQL lietotājiem: izmantojiet InnoDB glabāšanas programmu, un ja izmantojat "utf8mb4", tad InnoDB versijai ir jābūt lielākai par 5.6.
+db_schema=Shēma
 ssl_mode=SSL
 charset=Rakstzīmju kopa
 path=Ceļš
@@ -635,6 +636,7 @@ stargazers=Zvaigžņdevēji
 forks=Atdalītie repozitoriji
 pick_reaction=Izvēlieties reakciju
 reactions_more=un vēl %d
+language_other=Citas
 
 template.items=Sagataves ieraksti
 template.git_content=Git saturs (noklusētais atzars)
@@ -1074,6 +1076,7 @@ pulls.open_unmerged_pull_exists=`Jūs nevarat veikt atkārtotas atvēršanas dar
 pulls.status_checking=Dažas pārbaudes vēl tiek veiktas
 pulls.status_checks_success=Visas pārbaudes ir veiksmīgas
 pulls.status_checks_error=Dažas pārbaudes bija neveiksmīgas
+pulls.update_branch=Atjaunot atzaru
 
 milestones.new=Jauns atskaites punkts
 milestones.open_tab=%d atvērti
@@ -1534,6 +1537,7 @@ release.deletion_success=Laidiens tika izdzēsts.
 release.tag_name_already_exist=Laidiens ar šādu taga nosaukumu jau eksistē.
 release.tag_name_invalid=Nekorekts taga nosaukums.
 release.downloads=Lejupielādes
+release.download_count=Lejupielādes: %s
 
 branch.name=Atzara nosaukums
 branch.search=Meklēt atzarus
@@ -1585,6 +1589,7 @@ team_desc_helper=Aprakstiet komandas mērķi vai lomu.
 team_access_desc=Piekļuve repozitorijiem
 team_permission_desc=Atļauja
 team_unit_desc=Atļaut piekļuvi repozitorija sadaļām
+team_unit_disabled=(Atspējots)
 
 form.name_reserved=Organizācijas nosaukums '%s' ir rezervēts.
 form.name_pattern_not_allowed=Organizācijas nosaukums '%s' nav atļauts.
@@ -1747,6 +1752,7 @@ users.new_account=Izveidot lietotāja kontu
 users.name=Lietotājvārds
 users.activated=Aktivizēts
 users.admin=Administrators
+users.restricted=Ierobežots
 users.repos=Repozitoriji
 users.created=Izveidots
 users.last_login=Pēdējā autorizācija
@@ -1765,6 +1771,7 @@ users.max_repo_creation_desc=(Ievadiet -1 lai izmantotu noklusēto globālo iero
 users.is_activated=Lietotāja konts ir aktivizēts
 users.prohibit_login=Atspējota pieslēgšanās
 users.is_admin=Administratora tiesības
+users.is_restricted=Ir ierobežots
 users.allow_git_hook=Atļaut veidot git āķus
 users.allow_import_local=Atļauts importēt lokālus repozitorijus
 users.allow_create_organization=Atļauts veidot organizācijas
@@ -1819,6 +1826,7 @@ auths.attribute_surname=Uzvārda atribūts
 auths.attribute_mail=E-pasta atribūts
 auths.attribute_ssh_public_key=Publiskās SSH atslēgas atribūts
 auths.attributes_in_bind=Nolasīt atribūtus no saistīšanas DN konteksta
+auths.allow_deactivate_all=Atļaut tukšam datu izgūšanas rezultātam deaktivizēt visus lietotājus
 auths.use_paged_search=Izmantot, dalīto pa lapām, meklēšanu
 auths.search_page_size=Lapas izmērs
 auths.filter=Lietotāju filts
@@ -1920,6 +1928,7 @@ config.db_type=Veids
 config.db_host=Resursdators
 config.db_name=Nosaukums
 config.db_user=Lietotājvārds
+config.db_schema=Shēma
 config.db_ssl_mode=SSL
 config.db_path=Ceļš
 

options/locale/locale_pl-PL.ini

@@ -1521,7 +1521,7 @@ branch.name=Nazwa gałęzi
 branch.search=Szukaj gałęzi
 branch.already_exists=Gałąź z nazwą '%s' już istnieje.
 branch.delete_head=Usuń
-branch.delete=Usuń branch "%s"
+branch.delete=Usuń gałąź '%s'
 branch.delete_html=Usuń gałąź
 branch.delete_desc=Usunięcie gałęzi jest trwałe i <strong>NIE MOŻE</strong> zostać cofnięte. Kontynuować?
 branch.deletion_success=Gałąź '%s' została usunięta.
@@ -2026,7 +2026,7 @@ notices.delete_success=Powiadomienia systemu zostały usunięte.
 [action]
 create_repo=tworzy repozytorium <a href="%s">%s</a>
 rename_repo=zmienia nazwę repozytorium <code>%[1]s</code> na <a href="%[2]s">%[3]s</a>
-commit_repo=wypycha do <a href="%[1]s/src/branch/%[2]s">%[3]s</a> w<a href="%[1]s">%[4]s</a>
+commit_repo=wypycha do <a href="%[1]s/src/branch/%[2]s">%[3]s</a> w <a href="%[1]s">%[4]s</a>
 create_issue=`otwiera zgłoszenie <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`zamyka zgłoszenie <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`ponownie otwiera zgłoszenie <a href="%s/issues/%s">%s#%[2]s</a>`