Merge branch 'main' into fix-project-icons

.drone.yml

@@ -726,7 +726,7 @@ steps:
 
   # TODO: We should probably build all dependencies into a test image
   - name: test-e2e
-    image: mcr.microsoft.com/playwright:v1.29.2-focal
+    image: mcr.microsoft.com/playwright:v1.31.2-focal
     commands:
       - curl -sLO https://go.dev/dl/go1.20.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.20.linux-amd64.tar.gz
       - groupadd --gid 1001 gitea && useradd -m --gid 1001 --uid 1001 gitea

.npmrc

@@ -3,3 +3,4 @@ fund=false
 update-notifier=false
 package-lock=true
 save-exact=true
+lockfile-version=3

Makefile

@@ -273,7 +273,7 @@ fmt:
 
 .PHONY: fmt-check
 fmt-check: fmt
-	@diff=$$(git diff $(GO_SOURCES) templates $(WEB_DIRS)); \
+	@diff=$$(git diff --color=always $(GO_SOURCES) templates $(WEB_DIRS)); \
 	if [ -n "$$diff" ]; then \
 	  echo "Please run 'make fmt' and commit the result:"; \
 	  echo "$${diff}"; \
@@ -309,7 +309,7 @@ $(SWAGGER_SPEC): $(GO_SOURCES_NO_BINDATA)
 
 .PHONY: swagger-check
 swagger-check: generate-swagger
-	@diff=$$(git diff '$(SWAGGER_SPEC)'); \
+	@diff=$$(git diff --color=always '$(SWAGGER_SPEC)'); \
 	if [ -n "$$diff" ]; then \
 		echo "Please run 'make generate-swagger' and commit the result:"; \
 		echo "$${diff}"; \
@@ -414,7 +414,7 @@ vendor: go.mod go.sum
 
 .PHONY: tidy-check
 tidy-check: tidy
-	@diff=$$(git diff go.mod go.sum $(GO_LICENSE_FILE)); \
+	@diff=$$(git diff --color=always go.mod go.sum $(GO_LICENSE_FILE)); \
 	if [ -n "$$diff" ]; then \
 		echo "Please run 'make tidy' and commit the result:"; \
 		echo "$${diff}"; \
@@ -885,7 +885,7 @@ svg: node-check | node_modules
 .PHONY: svg-check
 svg-check: svg
 	@git add $(SVG_DEST_DIR)
-	@diff=$$(git diff --cached $(SVG_DEST_DIR)); \
+	@diff=$$(git diff --color=always --cached $(SVG_DEST_DIR)); \
 	if [ -n "$$diff" ]; then \
 		echo "Please run 'make svg' and 'git add $(SVG_DEST_DIR)' and commit the result:"; \
 		echo "$${diff}"; \
@@ -895,7 +895,7 @@ svg-check: svg
 .PHONY: lockfile-check
 lockfile-check:
 	npm install --package-lock-only
-	@diff=$$(git diff package-lock.json); \
+	@diff=$$(git diff --color=always package-lock.json); \
 	if [ -n "$$diff" ]; then \
 		echo "package-lock.json is inconsistent with package.json"; \
 		echo "Please run 'npm install --package-lock-only' and commit the result:"; \

models/migrations/migrations.go

@@ -471,6 +471,8 @@ var migrations = []Migration{
 	NewMigration("Rename Webhook org_id to owner_id", v1_20.RenameWebhookOrgToOwner),
 	// v246 -> v247
 	NewMigration("Add missed column owner_id for project table", v1_20.AddNewColumnForProject),
+	// v247 -> v248
+	NewMigration("Fix incorrect project type", v1_20.FixIncorrectProjectType),
 }
 
 // GetCurrentDBVersion returns the current db version

models/migrations/v1_20/v247.go

@@ -0,0 +1,50 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_20 //nolint
+
+import (
+	"code.gitea.io/gitea/modules/log"
+
+	"xorm.io/xorm"
+)
+
+// FixIncorrectProjectType: set individual project's type from 3(TypeOrganization) to 1(TypeIndividual)
+func FixIncorrectProjectType(x *xorm.Engine) error {
+	type User struct {
+		ID   int64 `xorm:"pk autoincr"`
+		Type int
+	}
+
+	const (
+		UserTypeIndividual int = 0
+
+		TypeIndividual   uint8 = 1
+		TypeOrganization uint8 = 3
+	)
+
+	type Project struct {
+		OwnerID int64 `xorm:"INDEX"`
+		Type    uint8
+		Owner   *User `xorm:"extends"`
+	}
+
+	sess := x.NewSession()
+	defer sess.Close()
+
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+
+	count, err := sess.Table("project").
+		Where("type = ? AND owner_id IN (SELECT id FROM `user` WHERE type = ?)", TypeOrganization, UserTypeIndividual).
+		Update(&Project{
+			Type: TypeIndividual,
+		})
+	if err != nil {
+		return err
+	}
+	log.Debug("Updated %d projects to belong to a user instead of an organization", count)
+
+	return sess.Commit()
+}

models/project/project.go

@@ -183,7 +183,7 @@ func GetCardConfig() []CardConfig {
 // IsTypeValid checks if a project type is valid
 func IsTypeValid(p Type) bool {
 	switch p {
-	case TypeRepository, TypeOrganization:
+	case TypeIndividual, TypeRepository, TypeOrganization:
 		return true
 	default:
 		return false

models/project/project_test.go

@@ -20,7 +20,7 @@ func TestIsProjectTypeValid(t *testing.T) {
 		typ   Type
 		valid bool
 	}{
-		{TypeIndividual, false},
+		{TypeIndividual, true},
 		{TypeRepository, true},
 		{TypeOrganization, true},
 		{UnknownType, false},

modules/packages/npm/creator.go

@@ -223,6 +223,7 @@ func ParsePackage(r io.Reader) (*Package, error) {
 				OptionalDependencies:    meta.OptionalDependencies,
 				Bin:                     meta.Bin,
 				Readme:                  meta.Readme,
+				Repository:              meta.Repository,
 			},
 		}
 

modules/packages/npm/creator_test.go

@@ -26,6 +26,10 @@ func TestParsePackage(t *testing.T) {
 	packageDescription := "Test Description"
 	data := "H4sIAAAAAAAA/ytITM5OTE/VL4DQelnF+XkMVAYGBgZmJiYK2MRBwNDcSIHB2NTMwNDQzMwAqA7IMDUxA9LUdgg2UFpcklgEdAql5kD8ogCnhwio5lJQUMpLzE1VslJQcihOzi9I1S9JLS7RhSYIJR2QgrLUouLM/DyQGkM9Az1D3YIiqExKanFyUWZBCVQ2BKhVwQVJDKwosbQkI78IJO/tZ+LsbRykxFXLNdA+HwWjYBSMgpENACgAbtAACAAA"
 	integrity := "sha512-yA4FJsVhetynGfOC1jFf79BuS+jrHbm0fhh+aHzCQkOaOBXKf9oBnC4a6DnLLnEsHQDRLYd00cwj8sCXpC+wIg=="
+	repository := Repository{
+		Type: "gitea",
+		URL:  "http://localhost:3000/gitea/test.git",
+	}
 
 	t.Run("InvalidUpload", func(t *testing.T) {
 		p, err := ParsePackage(bytes.NewReader([]byte{0}))
@@ -242,6 +246,7 @@ func TestParsePackage(t *testing.T) {
 						Dist: PackageDistribution{
 							Integrity: integrity,
 						},
+						Repository: repository,
 					},
 				},
 			},
@@ -272,5 +277,7 @@ func TestParsePackage(t *testing.T) {
 		assert.Equal(t, "https://gitea.io/", p.Metadata.ProjectURL)
 		assert.Contains(t, p.Metadata.Dependencies, "package")
 		assert.Equal(t, "1.2.0", p.Metadata.Dependencies["package"])
+		assert.Equal(t, repository.Type, p.Metadata.Repository.Type)
+		assert.Equal(t, repository.URL, p.Metadata.Repository.URL)
 	})
 }

modules/packages/npm/metadata.go

@@ -21,4 +21,5 @@ type Metadata struct {
 	OptionalDependencies    map[string]string `json:"optional_dependencies,omitempty"`
 	Bin                     map[string]string `json:"bin,omitempty"`
 	Readme                  string            `json:"readme,omitempty"`
+	Repository              Repository        `json:"repository,omitempty"`
 }

options/locale/locale_cs-CZ.ini

@@ -1423,7 +1423,6 @@ issues.context.reference_issue=Odkázat v novém úkolu
 issues.context.edit=Upravit
 issues.context.delete=Smazat
 issues.no_content=Není zde žádný obsah.
-issues.close_issue=Zavřít
 issues.pull_merged_at=`sloučil/a commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> do <b>%[3]s</b> %[4]s`
 issues.manually_pull_merged_at=`sloučil/a commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> do <b>%[3]s</b> ručně %[4]s`
 issues.close_comment_issue=Okomentovat a zavřít

options/locale/locale_de-DE.ini

@@ -1310,7 +1310,6 @@ issues.context.reference_issue=In neuem Issue referenzieren
 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

options/locale/locale_el-GR.ini

@@ -1331,7 +1331,6 @@ issues.context.reference_issue=Αναφορά σε νέο ζήτημα
 issues.context.edit=Επεξεργασία
 issues.context.delete=Διαγραφή
 issues.no_content=Δεν υπάρχει ακόμα περιεχόμενο.
-issues.close_issue=Κλείσιμο
 issues.pull_merged_at=`συγχώνευσε την υποβολή <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> σε <b>%[3]s</b> %[4]s`
 issues.manually_pull_merged_at=`συγχώνευσε την υποβολή <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> σε <b>%[3]s</b> %[4]s`
 issues.close_comment_issue=Σχόλιο και κλείσιμο

options/locale/locale_es-ES.ini

@@ -1330,7 +1330,6 @@ issues.context.reference_issue=Referencia en una nueva incidencia
 issues.context.edit=Editar
 issues.context.delete=Eliminar
 issues.no_content=Aún no existe contenido.
-issues.close_issue=Cerrar
 issues.pull_merged_at=`fusionado commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> en <b>%[3]s</b> %[4]s`
 issues.manually_pull_merged_at=`fusionado manualmente commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> en <b>%[3]s</b> %[4]s`
 issues.close_comment_issue=Comentar y cerrar

options/locale/locale_fa-IR.ini

@@ -1213,7 +1213,6 @@ issues.context.reference_issue=مرجع در شماره جدید
 issues.context.edit=ویرایش
 issues.context.delete=حذف
 issues.no_content=هنوز محتوایی ایجاد نشده.
-issues.close_issue=ببند
 issues.pull_merged_at=`ادغام شده commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> در <b>%[3]s</b> %[4]s`
 issues.manually_pull_merged_at=`ادغام شده commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> در <b>%[3]s</b> بصورت دستی %[4]s`
 issues.close_comment_issue=ثبت دیدگاه و بستن

options/locale/locale_fi-FI.ini

@@ -936,7 +936,6 @@ issues.context.reference_issue=Viittaa uudesa ongelmassa
 issues.context.edit=Muokkaa
 issues.context.delete=Poista
 issues.no_content=Sisältöä ei vielä ole.
-issues.close_issue=Sulje
 issues.close_comment_issue=Kommentoi ja sulje
 issues.reopen_issue=Avaa uudelleen
 issues.reopen_comment_issue=Kommentoi ja avaa uudelleen

options/locale/locale_fr-FR.ini

@@ -1195,7 +1195,6 @@ issues.context.reference_issue=Référencer dans un nouveau ticket
 issues.context.edit=Éditer
 issues.context.delete=Supprimer
 issues.no_content=Il n'existe pas encore de contenu.
-issues.close_issue=Fermer
 issues.pull_merged_at=`révision fusionnée <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> dans <b>%[3]s</b> %[4]s`
 issues.manually_pull_merged_at=`révision fusionnée <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> dans <b>%[3]s</b> manuellement %[4]s`
 issues.close_comment_issue=Commenter et Fermer

options/locale/locale_hu-HU.ini

@@ -881,7 +881,6 @@ issues.context.quote_reply=Válasz idézettel
 issues.context.edit=Szerkesztés
 issues.context.delete=Törlés
 issues.no_content=Még nincs tartalom.
-issues.close_issue=Lezárás
 issues.close_comment_issue=Hozzászólás és lezárás
 issues.reopen_issue=Újranyitás
 issues.reopen_comment_issue=Hozzászólás és újranyitás

options/locale/locale_id-ID.ini

@@ -752,7 +752,6 @@ issues.context.quote_reply=Kutip Balasan
 issues.context.edit=Sunting
 issues.context.delete=Hapus
 issues.no_content=Belum ada konten.
-issues.close_issue=Tutup
 issues.close_comment_issue=Komentar dan Tutup
 issues.reopen_issue=Buka kembali
 issues.reopen_comment_issue=Komentar dan Buka Kembali

options/locale/locale_is-IS.ini

@@ -823,7 +823,6 @@ issues.num_comments=%d ummæli
 issues.commented_at=`gerði ummæli <a href="#%s">%s</a>`
 issues.context.edit=Breyta
 issues.context.delete=Eyða
-issues.close_issue=Loka
 issues.manually_pull_merged_at=`sameinaði framlag <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> inni í <b>%[3]s</b> handvirkt %[4]s`
 issues.close_comment_issue=Senda ummæli og Loka
 issues.reopen_issue=Enduropna

options/locale/locale_it-IT.ini

@@ -1315,7 +1315,6 @@ issues.context.reference_issue=Fai riferimento in un nuovo problema
 issues.context.edit=Modifica
 issues.context.delete=Elimina
 issues.no_content=Non ci sono ancora contenuti.
-issues.close_issue=Chiudi
 issues.pull_merged_at=`merged commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> in <b>%[3]s</b> %[4]s`
 issues.manually_pull_merged_at=`merged commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> in <b>%[3]s</b> manualmente %[4]s`
 issues.close_comment_issue=Commenta e Chiudi

options/locale/locale_ja-JP.ini

@@ -821,6 +821,7 @@ remove_account_link=連携アカウントの削除
 remove_account_link_desc=連携アカウントを削除し、Giteaアカウントへのアクセス権を取り消します。 続行しますか？
 remove_account_link_success=連携アカウントを削除しました。
 
+hooks.desc=このユーザーが所有する<strong>すべてのリポジトリ</strong>でトリガーされるWebhookを追加します。
 
 orgs_none=あなたはどの組織のメンバーでもありません。
 repos_none=あなたはリポジトリを所有していません。
@@ -1368,7 +1369,7 @@ issues.context.reference_issue=新しいイシューから参照
 issues.context.edit=編集
 issues.context.delete=削除
 issues.no_content=まだ内容がありません
-issues.close_issue=クローズする
+issues.close=イシューをクローズ
 issues.pull_merged_at=`がコミット <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> を <b>%[3]s</b> にマージ %[4]s`
 issues.manually_pull_merged_at=`がコミット <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> を <b>%[3]s</b> に手動マージ %[4]s`
 issues.close_comment_issue=コメントしてクローズ
@@ -1653,6 +1654,7 @@ pulls.update_branch_rebase=リベースでブランチを更新
 pulls.update_branch_success=ブランチの更新が成功しました
 pulls.update_not_allowed=ブランチを更新する権限がありません
 pulls.outdated_with_base_branch=このブランチはベースブランチに対して最新ではありません
+pulls.close=プルリクエストをクローズ
 pulls.closed_at=`がプルリクエストをクローズ <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 pulls.reopened_at=`がプルリクエストを再オープン <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 pulls.merge_instruction_hint=`<a class="show-instruction">コマンドラインの手順</a>も確認できます。`
@@ -2289,6 +2291,8 @@ release.edit_subheader=リリースで、プロジェクトのバージョンを
 release.tag_name=タグ名
 release.target=ターゲット
 release.tag_helper=既存のタグを選択するか、新しいタグを作成します。
+release.tag_helper_new=新しいタグです。 このタグはターゲットから作成されます。
+release.tag_helper_existing=存在するタグです。
 release.title=タイトル
 release.content=内容
 release.prerelease_desc=プレリリース
@@ -2418,6 +2422,7 @@ settings.delete_prompt=組織は恒久的に削除され、元に戻すことは
 settings.confirm_delete_account=削除を確認
 settings.delete_org_title=組織の削除
 settings.delete_org_desc=組織を恒久的に削除します。 続行しますか？
+settings.hooks_desc=この組織の<strong>すべてのリポジトリ</strong>でトリガーされるWebhookを追加します。
 
 settings.labels_desc=この組織の<strong>すべてのリポジトリ</strong>で使用可能なイシューラベルを追加します。
 
@@ -2930,6 +2935,8 @@ config.git_disable_diff_highlight=Diffのシンタックスハイライトが無
 config.git_max_diff_lines=最大の差分行数(1ファイルあたり)
 config.git_max_diff_line_characters=最大の差分文字数(1行あたり)
 config.git_max_diff_files=差分を表示する最大ファイル数
+config.git_enable_reflogs=Reflog有効
+config.git_reflog_expiry_time=有効期間
 config.git_gc_args=GC引数
 config.git_migrate_timeout=移行タイムアウト
 config.git_mirror_timeout=ミラー更新タイムアウト
@@ -3234,6 +3241,9 @@ rubygems.required.ruby=必要なRubyバージョン
 rubygems.required.rubygems=必要なRubyGemバージョン
 rubygems.documentation=RubyGemsレジストリの詳細については、<a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/rubygems/">ドキュメント</a> を参照してください。
 swift.registry=このレジストリをコマンドラインからセットアップします:
+swift.install=あなたの <code>Package.swift</code> ファイルにパッケージを追加します:
+swift.install2=そして次のコマンドを実行します:
+swift.documentation=Swift レジストリの詳細については、 <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/swift/">ドキュメント</a> を参照してください。
 vagrant.install=Vagrant ボックスを追加するには、次のコマンドを実行します。
 vagrant.documentation=Vagrantレジストリの詳細については <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/vagrant/">ドキュメント</a>を参照してください。
 settings.link=このパッケージをリポジトリにリンク

options/locale/locale_ko-KR.ini

@@ -787,7 +787,6 @@ issues.delete_comment_confirm=이 댓글을 정말 삭제하시겠습니까?
 issues.context.edit=수정하기
 issues.context.delete=삭제
 issues.no_content=아직 콘텐츠가 없습니다.
-issues.close_issue=닫기
 issues.close_comment_issue=클로즈 및 코멘트
 issues.reopen_issue=다시 열기
 issues.reopen_comment_issue=다시 오픈 및 코멘트

options/locale/locale_lv-LV.ini

@@ -1461,7 +1461,6 @@ issues.context.reference_issue=Atsaukties uz šo jaunā problēmā
 issues.context.edit=Labot
 issues.context.delete=Dzēst
 issues.no_content=Vēl nav satura.
-issues.close_issue=Aizvērt
 issues.pull_merged_at=`sapludināja revīziju <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> atzarā <b>%[3]s</b> %[4]s`
 issues.manually_pull_merged_at=`manuāli sapludināja revīziju <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> atzarā <b>%[3]s</b> %[4]s`
 issues.close_comment_issue=Komentēt un aizvērt

options/locale/locale_nl-NL.ini

@@ -1315,7 +1315,6 @@ issues.context.reference_issue=Verwijs in nieuw issue
 issues.context.edit=Bewerken
 issues.context.delete=Verwijder
 issues.no_content=Er is nog geen inhoud.
-issues.close_issue=Sluit
 issues.pull_merged_at=`commit samengevoegd <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> in <b>%[3]s</b> %[4]s`
 issues.manually_pull_merged_at=`commit <a class="ui sha" href="%[1]s"> handmatig samengevoegd <code>%[2]s</code></a> in <b>%[3]s</b> %[4]s`
 issues.close_comment_issue=Reageer en sluit

options/locale/locale_pl-PL.ini

@@ -1208,7 +1208,6 @@ issues.context.quote_reply=Cytuj odpowiedź
 issues.context.edit=Edytuj
 issues.context.delete=Usuń
 issues.no_content=Nie ma jeszcze treści.
-issues.close_issue=Zamknij
 issues.close_comment_issue=Skomentuj i zamknij
 issues.reopen_issue=Otwórz ponownie
 issues.reopen_comment_issue=Skomentuj i otwórz ponownie

options/locale/locale_pt-BR.ini

@@ -1369,7 +1369,6 @@ issues.context.reference_issue=Referência em uma nova issue
 issues.context.edit=Editar
 issues.context.delete=Excluir
 issues.no_content=Ainda não há conteúdo.
-issues.close_issue=Fechar
 issues.pull_merged_at=`aplicou o merge do commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> em <b>%[3]s</b> %[4]s`
 issues.manually_pull_merged_at=`aplicou o merge do commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> em <b>%[3]s</b> manualmente %[4]s`
 issues.close_comment_issue=Comentar e fechar

options/locale/locale_pt-PT.ini

@@ -1369,7 +1369,7 @@ issues.context.reference_issue=Criar uma nova questão referindo esta
 issues.context.edit=Editar
 issues.context.delete=Eliminar
 issues.no_content=Ainda não há conteúdo.
-issues.close_issue=Fechar
+issues.close=Encerrar questão
 issues.pull_merged_at=`integrou o cometimento <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> no ramo <b>%[3]s</b> %[4]s`
 issues.manually_pull_merged_at=`integrou o cometimento <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> no ramo <b>%[3]s</b> manualmente %[4]s`
 issues.close_comment_issue=Comentar e fechar
@@ -1654,6 +1654,7 @@ pulls.update_branch_rebase=Modificar ramo mudando a base
 pulls.update_branch_success=A sincronização do ramo foi bem sucedida
 pulls.update_not_allowed=Não tem autorização para sincronizar o ramo
 pulls.outdated_with_base_branch=Este ramo é obsoleto em relação ao ramo base
+pulls.close=Encerrar pedido de integração
 pulls.closed_at=`fechou este pedido de integração <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 pulls.reopened_at=`reabriu este pedido de integração <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 pulls.merge_instruction_hint=`Também pode ver as <a class="show-instruction">instruções para a linha de comandos</a>.`