Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main:
  Fix CI status popup (go-gitea#20737)
  Add documentation about pagination of the API (go-gitea#20740)
  [skip ci] Updated translations via Crowdin
  Change commit status icons to SVG (go-gitea#20736)
  Add support for NuGet API keys (go-gitea#20721)
  Keep download count on Container tag overwrite (go-gitea#20728)
  Replace fomantic popup module with tippy.js (go-gitea#20428)
  Add an option to create new issues from "/issues" page (go-gitea#20650)
  Restore history button and hide add button when unable to add (go-gitea#20718)
  Remove manual rollback for failed generated repositories (go-gitea#20639)

docs/content/doc/developers/api-usage.en-us.md

@@ -105,6 +105,18 @@ curl -X POST "http://localhost:4000/api/v1/repos/test1/test1/issues" \
 As mentioned above, the token used is the same one you would use in
 the `token=` string in a GET request.
 
+## Pagination
+
+The API supports pagination. The `page` and `limit` parameters are used to specify the page number and the number of items per page. As well, the `Link` header is returned with the next, previous, and last page links if there are more than one pages. The `x-total-count` is also returned to indicate the total number of items.
+
+```sh
+curl -v "http://localhost/api/v1/repos/search?limit=1"
+...
+< link: <http://localhost/api/v1/repos/search?limit=1&page=2>; rel="next",<http://localhost/api/v1/repos/search?limit=1&page=5252>; rel="last"
+...
+< x-total-count: 5252
+```
+
 ## API Guide:
 
 API Reference guide is auto-generated by swagger and available on:

docs/content/doc/packages/nuget.en-us.md

@@ -47,6 +47,8 @@ For example:
 dotnet nuget add source --name gitea --username testuser --password password123 https://gitea.example.com/api/packages/testuser/nuget/index.json
 ```
 
+You can add the source without credentials and use the [`--api-key`](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-nuget-push) parameter when publishing packages. In this case you need to provide a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}).
+
 ## Publish a package
 
 Publish a package by running the following command:

integrations/api_packages_container_test.go

@@ -276,11 +276,23 @@ func TestPackageContainer(t *testing.T) {
 							}
 						}
 
-						// Overwrite existing tag
+						req = NewRequest(t, "GET", fmt.Sprintf("%s/manifests/%s", url, tag))
+						addTokenAuthHeader(req, userToken)
+						MakeRequest(t, req, http.StatusOK)
+
+						pv, err = packages_model.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, image, tag)
+						assert.NoError(t, err)
+						assert.EqualValues(t, 1, pv.DownloadCount)
+
+						// Overwrite existing tag should keep the download count
 						req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, tag), strings.NewReader(manifestContent))
 						addTokenAuthHeader(req, userToken)
 						req.Header.Set("Content-Type", oci.MediaTypeDockerManifest)
 						MakeRequest(t, req, http.StatusCreated)
+
+						pv, err = packages_model.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, image, tag)
+						assert.NoError(t, err)
+						assert.EqualValues(t, 1, pv.DownloadCount)
 					})
 
 					t.Run("HeadManifest", func(t *testing.T) {

integrations/api_packages_nuget_test.go

@@ -24,9 +24,16 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func addNuGetAPIKeyHeader(request *http.Request, token string) *http.Request {
+	request.Header.Set("X-NuGet-ApiKey", token)
+	return request
+}
+
 func TestPackageNuGet(t *testing.T) {
 	defer prepareTestEnv(t)()
+
 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).(*user_model.User)
+	token := getUserToken(t, user.Name)
 
 	packageName := "test.package"
 	packageVersion := "1.0.3"
@@ -60,6 +67,10 @@ func TestPackageNuGet(t *testing.T) {
 
 		req := NewRequest(t, "GET", fmt.Sprintf("%s/index.json", url))
 		req = AddBasicAuthHeader(req, user.Name)
+		MakeRequest(t, req, http.StatusOK)
+
+		req = NewRequest(t, "GET", fmt.Sprintf("%s/index.json", url))
+		req = addNuGetAPIKeyHeader(req, token)
 		resp := MakeRequest(t, req, http.StatusOK)
 
 		var result nuget.ServiceIndexResponse

integrations/pull_status_test.go

@@ -56,11 +56,11 @@ func TestPullCreate_CommitStatus(t *testing.T) {
 		}
 
 		statesIcons := map[api.CommitStatusState]string{
-			api.CommitStatusPending: "circle icon yellow",
-			api.CommitStatusSuccess: "check icon green",
-			api.CommitStatusError:   "warning icon red",
-			api.CommitStatusFailure: "remove icon red",
-			api.CommitStatusWarning: "warning sign icon yellow",
+			api.CommitStatusPending: "octicon-dot-fill",
+			api.CommitStatusSuccess: "octicon-check",
+			api.CommitStatusError:   "gitea-exclamation",
+			api.CommitStatusFailure: "octicon-x",
+			api.CommitStatusWarning: "gitea-exclamation",
 		}
 
 		testCtx := NewAPITestContext(t, "user1", "repo1")
@@ -80,9 +80,9 @@ func TestPullCreate_CommitStatus(t *testing.T) {
 			assert.NotEmpty(t, commitURL)
 			assert.EqualValues(t, commitID, path.Base(commitURL))
 
-			cls, ok := doc.doc.Find("#commits-table tbody tr td.message i.commit-status").Last().Attr("class")
+			cls, ok := doc.doc.Find("#commits-table tbody tr td.message .commit-status").Last().Attr("class")
 			assert.True(t, ok)
-			assert.EqualValues(t, "commit-status "+statesIcons[status], cls)
+			assert.Contains(t, cls, statesIcons[status])
 		}
 	})
 }

integrations/repo_commits_test.go

@@ -55,7 +55,7 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
 
 	doc = NewHTMLParser(t, resp.Body)
 	// Check if commit status is displayed in message column
-	sel := doc.doc.Find("#commits-table tbody tr td.message a.commit-statuses-trigger i.commit-status")
+	sel := doc.doc.Find("#commits-table tbody tr td.message a.commit-statuses-trigger .commit-status")
 	assert.Equal(t, 1, sel.Length())
 	for _, class := range classes {
 		assert.True(t, sel.HasClass(class))
@@ -96,21 +96,21 @@ func testRepoCommitsWithStatus(t *testing.T, resp, respOne *httptest.ResponseRec
 }
 
 func TestRepoCommitsWithStatusPending(t *testing.T) {
-	doTestRepoCommitWithStatus(t, "pending", "circle", "yellow")
+	doTestRepoCommitWithStatus(t, "pending", "octicon-dot-fill", "yellow")
 }
 
 func TestRepoCommitsWithStatusSuccess(t *testing.T) {
-	doTestRepoCommitWithStatus(t, "success", "check", "green")
+	doTestRepoCommitWithStatus(t, "success", "octicon-check", "green")
 }
 
 func TestRepoCommitsWithStatusError(t *testing.T) {
-	doTestRepoCommitWithStatus(t, "error", "warning", "red")
+	doTestRepoCommitWithStatus(t, "error", "gitea-exclamation", "red")
 }
 
 func TestRepoCommitsWithStatusFailure(t *testing.T) {
-	doTestRepoCommitWithStatus(t, "failure", "remove", "red")
+	doTestRepoCommitWithStatus(t, "failure", "octicon-x", "red")
 }
 
 func TestRepoCommitsWithStatusWarning(t *testing.T) {
-	doTestRepoCommitWithStatus(t, "warning", "warning", "sign", "yellow")
+	doTestRepoCommitWithStatus(t, "warning", "gitea-exclamation", "yellow")
 }

options/locale/locale_it-IT.ini

@@ -1063,6 +1063,7 @@ normal_view=Vista normale
 line=riga
 lines=righe
 
+editor.add_file=Aggiungi file
 editor.new_file=Nuovo file
 editor.upload_file=Carica File
 editor.edit_file=Modifica File
@@ -1268,6 +1269,8 @@ issues.filter_milestone=Traguardo
 issues.filter_milestone_no_select=Tutte le pietre miliari
 issues.filter_assignee=Assegnatario
 issues.filter_assginee_no_select=Tutte le assegnazioni
+issues.filter_poster=Autore
+issues.filter_poster_no_select=Tutti gli autori
 issues.filter_type=Tipo
 issues.filter_type.all_issues=Tutti i problemi
 issues.filter_type.assigned_to_you=Assegnati a te
@@ -3111,6 +3114,9 @@ npm.dependencies.development=Dipendenze Di Sviluppo
 npm.dependencies.peer=Dipendenze Peer
 npm.dependencies.optional=Dipendenze Opzionali
 npm.details.tag=Tag
+pub.install=Per installare il pacchetto utilizzando NuGet, eseguire il seguente comando:
+pub.documentation=Per ulteriori informazioni sul registro Pub, consultare <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/pub/">la documentazione</a>.
+pub.details.repository_site=Sito Repository
 pypi.requires=Richiede Python
 pypi.install=Per installare il pacchetto usando pip, eseguire il seguente comando:
 pypi.documentation=Per ulteriori informazioni sul registro PyPI, consultare <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/pypi/">la documentazione</a>.

options/locale/locale_nl-NL.ini

@@ -1063,6 +1063,7 @@ normal_view=Normale weergave
 line=regel
 lines=regels
 
+editor.add_file=Bestand toevoegen
 editor.new_file=Nieuw bestand
 editor.upload_file=Upload bestand
 editor.edit_file=Bewerk bestand
@@ -1268,6 +1269,8 @@ issues.filter_milestone=Mijlpaal
 issues.filter_milestone_no_select=Alle mijlpalen
 issues.filter_assignee=Aangewezene
 issues.filter_assginee_no_select=Alle toegewezen personen
+issues.filter_poster=Auteur
+issues.filter_poster_no_select=Alle auteurs
 issues.filter_type=Type
 issues.filter_type.all_issues=Alle kwesties
 issues.filter_type.assigned_to_you=Aan jou toegewezen
@@ -1296,6 +1299,11 @@ issues.action_milestone_no_select=Geen mijlpaal
 issues.action_assignee=Toegewezene
 issues.action_assignee_no_select=Geen verantwoordelijke
 issues.opened_by=%[1]s geopend door <a href="%[2]s">%[3]s</a>
+pulls.merged_by=door <a href="%[2]s">%[3]s</a> was samengevoegd %[1]s
+pulls.merged_by_fake=bij %[2]s is %[1]s samengevoegd
+issues.closed_by=door <a href="%[2]s">%[3]s</a> was gesloten %[1]s
+issues.opened_by_fake=%[1]s geopend door %[2]s
+issues.closed_by_fake=door %[2]s was gesloten %[1]s
 issues.previous=Vorige
 issues.next=Volgende
 issues.open_title=Open
@@ -1311,6 +1319,8 @@ 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
 issues.reopen_issue=Heropen
 issues.reopen_comment_issue=Heropen en geef commentaar
@@ -1333,6 +1343,7 @@ issues.is_stale=Er zijn wijzigingen aangebracht in deze PR sinds deze beoordelin
 issues.remove_request_review=Verwijder beoordelingsverzoek
 issues.remove_request_review_block=Kan beoordelingsverzoek niet verwijderen
 issues.dismiss_review=Beoordeling afwijzen
+issues.dismiss_review_warning=Bent u zeker dat u deze beoordeling wilt afwijzen?
 issues.sign_in_require_desc=<a href="%s">Log in</a> om deel te nemen aan deze discussie.
 issues.edit=Bewerken
 issues.cancel=Annuleren
@@ -1406,6 +1417,7 @@ issues.error_modifying_due_date=Deadline aanpassen mislukt.
 issues.error_removing_due_date=Deadline verwijderen mislukt.
 issues.push_commit_1=toegevoegd %d commit %s
 issues.push_commits_n=toegevoegd %d commits %s
+issues.force_push_codes=`force-push %[1]s van <a class="ui sha" href="%[3]s"><code>%[2]s</code></a> naar <a class="ui sha" href="%[5]s"><code>%[4]s</code></a> %[6]s`
 issues.due_date_form=jjjj-mm-dd
 issues.due_date_form_add=Vervaldatum toevoegen
 issues.due_date_form_edit=Bewerk
@@ -1426,6 +1438,7 @@ issues.dependency.remove=Verwijder
 issues.dependency.remove_info=Verwijder afhankelijkheid
 issues.dependency.added_dependency=`voegde een nieuwe afhankelijkheid %s toe `
 issues.dependency.removed_dependency=`verwijderde een afhankelijkheid %s`
+issues.dependency.pr_closing_blockedby=Het sluiten van deze pull-aanvraag is geblokkeerd door de volgende issues
 issues.dependency.issue_closing_blockedby=Het sluiten van dit issue is geblokkeerd door de volgende problemen
 issues.dependency.issue_close_blocks=Deze kwestie blokkeert het sluiten van de volgende kwesties
 issues.dependency.pr_close_blocks=Deze pull-aanvraag blokkeert het sluiten van de volgende kwesties
@@ -1598,6 +1611,8 @@ pulls.auto_merge_newly_scheduled=De pull-verzoek was gepland om samen te voegen
 pulls.auto_merge_has_pending_schedule=%[1]s heeft deze pull-verzoek automatisch samengevoegd wanneer alle checks succesvol zijn geweest %[2]s.
 
 pulls.auto_merge_cancel_schedule=Automatisch samenvoegen annuleren
+pulls.auto_merge_not_scheduled=Deze pull-aanvraag is niet gepland om automatisch samen te voegen.
+pulls.auto_merge_canceled_schedule=De automatisch samenvoegen is geannuleerd voor deze pull-aanvraag.
 
 
 pulls.delete.title=Deze pull-verzoek verwijderen?
@@ -1761,6 +1776,7 @@ settings.hooks=Webhooks
 settings.githooks=Git-hooks
 settings.basic_settings=Basis instellingen
 settings.mirror_settings=Kopie Settings
+settings.mirror_settings.mirrored_repository=Gespiegelde repository
 settings.mirror_settings.direction=Richting
 settings.mirror_settings.direction.pull=Pull
 settings.mirror_settings.direction.push=Push
@@ -1790,6 +1806,8 @@ settings.tracker_url_format_error=Het URL-formaat van de externe wiki is geen ge
 settings.tracker_issue_style=Nummerformaat van de externe kwestie-tracker
 settings.tracker_issue_style.numeric=Nummeriek
 settings.tracker_issue_style.alphanumeric=Alfanummeriek
+settings.tracker_issue_style.regexp=Reguliere expressie
+settings.tracker_issue_style.regexp_pattern=Reguliere expressie patroon
 settings.tracker_url_format_desc=Gebruik de aanduidingen <code>{user}</code>, <code>{repo}</code> en <code>{index}</code> voor de gebruikersnaam, repositorynaam en kwestie-index.
 settings.enable_timetracker=Tijdregistratie inschakelen
 settings.allow_only_contributors_to_track_time=Sta alleen bijdragers toe tijdregistratie te gebruiken

options/locale/locale_pt-PT.ini

@@ -1269,6 +1269,8 @@ issues.filter_milestone=Etapa
 issues.filter_milestone_no_select=Todas as etapas
 issues.filter_assignee=Encarregado
 issues.filter_assginee_no_select=Todos os encarregados
+issues.filter_poster=Autor(a)
+issues.filter_poster_no_select=Todos os autores
 issues.filter_type=Tipo
 issues.filter_type.all_issues=Todas as questões
 issues.filter_type.assigned_to_you=Atribuídas a si

options/locale/locale_tr-TR.ini

@@ -1269,6 +1269,8 @@ issues.filter_milestone=Kilometre Taşı
 issues.filter_milestone_no_select=Tüm kilometre taşları
 issues.filter_assignee=Atanan
 issues.filter_assginee_no_select=Tüm atananlar
+issues.filter_poster=Yazar
+issues.filter_poster_no_select=Tüm yazarlar
 issues.filter_type=Tür
 issues.filter_type.all_issues=Tüm konular
 issues.filter_type.assigned_to_you=Size atanan

options/locale/locale_zh-CN.ini

@@ -179,6 +179,8 @@ log_root_path_helper=日志文件将写入此目录。
 
 optional_title=可选设置
 email_title=电子邮箱设置
+smtp_addr=SMTP 主机地址
+smtp_port=SMTP 端口
 smtp_from=电子邮件发件人
 smtp_from_helper=电子邮件地址 Gitea 将使用。输入一个普通的电子邮件地址或使用 "名称" <email@example.com> 格式。
 mailer_user=SMTP 用户名
@@ -798,6 +800,7 @@ email_notifications.enable=启用邮件通知
 email_notifications.onmention=只在被提到时邮件通知
 email_notifications.disable=停用邮件通知
 email_notifications.submit=邮件通知设置
+email_notifications.andyourown=和您自己的通知
 
 visibility=用户可见性
 visibility.public=公开
@@ -931,6 +934,7 @@ form.name_pattern_not_allowed=仓库名称中不允许使用模式 "%s"。
 need_auth=授权
 migrate_options=迁移选项
 migrate_service=迁移服务
+migrate_options_mirror_helper=该仓库将是一个镜像
 migrate_options_lfs=迁移 LFS 文件
 migrate_options_lfs_endpoint.label=LFS 网址
 migrate_options_lfs_endpoint.description=迁移将尝试使用你的 Git remote 来 <a target="_blank" rel="noopener noreferrer" href="%s">确定 LFS 服务器</a>。如果仓库 LFS 数据存储在其他位置，你还可以指定自定义网址。
@@ -1059,6 +1063,7 @@ normal_view=普通视图
 line=行
 lines=行
 
+editor.add_file=添加文件
 editor.new_file=新建文件
 editor.upload_file=上传文件
 editor.edit_file=编辑文件
@@ -1264,6 +1269,8 @@ issues.filter_milestone=里程碑筛选
 issues.filter_milestone_no_select=所有里程碑
 issues.filter_assignee=指派人筛选
 issues.filter_assginee_no_select=所有指派成员
+issues.filter_poster=作者
+issues.filter_poster_no_select=所有作者
 issues.filter_type=类型筛选
 issues.filter_type.all_issues=所有工单
 issues.filter_type.assigned_to_you=指派给您的
@@ -1418,6 +1425,7 @@ issues.due_date_form_remove=删除
 issues.due_date_not_writer=你需要仓库写入权限来修改工单到期时间。
 issues.due_date_not_set=未设置到期时间。
 issues.due_date_added=于 %[2]s 设置到期时间为 %[1]s
+issues.due_date_modified=将到期日从 %[2]s 修改为 %[1]s %[3]s
 issues.due_date_remove=于 %[2]s 删除了到期时间 %[1]s
 issues.due_date_overdue=过期
 issues.due_date_invalid=到期日期无效或超出范围。请使用 'yyyy-mm-dd' 格式。
@@ -1529,6 +1537,8 @@ pulls.remove_prefix=删除 <strong>%s</strong> 前缀
 pulls.data_broken=此合并请求因为派生仓库信息缺失而中断。
 pulls.files_conflicted=此合并请求有变更与目标分支冲突。
 pulls.is_checking=正在进行合并冲突检测，请稍后再试。
+pulls.is_ancestor=此分支已经包含在目标分支中，没有什么可以合并。
+pulls.is_empty=此分支上的更改已经在目标分支上。这将是一个空提交。
 pulls.required_status_check_failed=一些必要的检查没有成功
 pulls.required_status_check_missing=缺少一些必要的检查。
 pulls.required_status_check_administrator=作为管理员，您仍可合并此合并请求
@@ -2531,6 +2541,8 @@ users.delete_account=删除帐户
 users.cannot_delete_self=你不能删除自己
 users.still_own_repo=此用户仍然拥有一个或多个仓库。必须首先删除或转让这些仓库。
 users.still_has_org=此用户是组织的成员。必须先从组织中删除用户。
+users.purge=清理用户
+users.purge_help=强制删除用户和用户拥有的任何仓库、组织和软件包。所有评论也将被删除。
 users.still_own_packages=此用户仍然拥有一个或多个软件包。请先删除这些软件包。
 users.deletion_success=用户帐户已被删除。
 users.reset_2fa=重置两步验证
@@ -2787,13 +2799,19 @@ config.queue_length=队列长度
 config.deliver_timeout=推送超时
 config.skip_tls_verify=跳过 TLS 验证
 
+config.mailer_config=Mailer 配置
 config.mailer_enabled=启用服务
+config.mailer_enable_helo=启用HELO
 config.mailer_name=任务名称
+config.mailer_protocol=协议
+config.mailer_smtp_addr=SMTP 地址
+config.mailer_smtp_port=SMTP 端口
 config.mailer_user=发送者帐号
 config.mailer_use_sendmail=使用 Sendmail
 config.mailer_sendmail_path=Sendmail 路径
 config.mailer_sendmail_args=Sendmail 的额外参数
 config.mailer_sendmail_timeout=Sendmail 超时
+config.mailer_use_dummy=Dummy
 config.test_email_placeholder=电子邮址 (例如，test@example.com)
 config.send_test_mail=发送测试邮件
 config.test_mail_failed=发送测试邮件至 '%s' 时失败：%v
@@ -3030,6 +3048,7 @@ title=软件包
 desc=管理仓库软件包。
 empty=还没有软件包。
 empty.documentation=关于软件包注册中心的更多信息，请参阅 <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/overview"> 文档 </a>。
+empty.repo=您上传了一个包，但没有显示在这里吗？转到 <a href="%[1]s">包设置</a> 并将其链接到这个仓库中。
 filter.type=类型
 filter.type.all=所有
 filter.no_result=您的过滤器没有产生任何结果。
@@ -3095,6 +3114,10 @@ npm.dependencies.development=开发依赖
 npm.dependencies.peer=Peer 依赖
 npm.dependencies.optional=可选依赖
 npm.details.tag=标签
+pub.install=要使用 Dart 安装软件包，请运行以下命令：
+pub.documentation=关于 Pub 注册中心的信息，请参阅 <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/pub/">文档</a>。
+pub.details.repository_site=仓库站点
+pub.details.documentation_site=文档站点
 pypi.requires=需要 Python
 pypi.install=要使用 pip 安装软件包，请运行以下命令：
 pypi.documentation=关于 PyPI 注册中心的信息，请参阅 <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/pypi/">文档</a>。

routers/api/packages/api.go

@@ -46,6 +46,7 @@ func Routes() *web.Route {
 	authMethods := []auth.Method{
 		&auth.OAuth2{},
 		&auth.Basic{},
+		&nuget.Auth{},
 		&conan.Auth{},
 	}
 	if setting.Service.EnableReverseProxyAuth {