Merge branch 'main' into fix/delete-action

Author: lunny

docs/content/doc/usage/push-options.en-us.md

@@ -1,18 +1,51 @@
 ---
 date: "2020-07-06T16:00:00+02:00"
-title: "Push To Create"
-slug: "push-to-create"
+title: "Usage: Push"
+slug: "push"
 weight: 15
 toc: false
 draft: false
 menu:
   sidebar:
     parent: "usage"
-    name: "Push To Create"
+    name: "Push"
     weight: 15
-    identifier: "push-to-create"
+    identifier: "push"
 ---
 
+**Table of Contents**
+
+{{< toc >}}
+
+There are some additional features when pushing commits to Gitea server.
+
+# Open PR through Push
+
+When you push commits to a non-default branch for the first time,
+you will receive a link you can click on to visit the compare page of your branch compared to your main branch.
+From there, it's easy to create a pull request, even if you want to target another branch.
+
+![Gitea Push Hint](/gitea-push-hint.png)
+
+# Push Options
+
+In Gitea `1.13`, support for some [push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt)
+were added.
+
+## Supported Options
+
+- `repo.private` (true|false) - Change the repository's visibility.
+
+  This is particularly useful when combined with push-to-create.
+
+- `repo.template` (true|false) - Change whether the repository is a template.
+
+Example of changing a repository's visibility to public:
+
+```shell
+git push -o repo.private=false -u origin main
+```
+
 # Push To Create
 
 Push to create is a feature that allows you to push to a repository that does not exist yet in Gitea. This is useful for automation and for allowing users to create repositories without having to go through the web interface. This feature is disabled by default.
@@ -35,6 +68,4 @@ git push -u origin main
 
 This assumes you are using an SSH remote, but you can also use HTTPS remotes as well.
 
-## Push options (bonus)
-
-Push-to-create will default to the visibility defined by `DEFAULT_PUSH_CREATE_PRIVATE` in `app.ini`. To explicitly set the visibility, you can use a [push option]({{< relref "doc/usage/push-options.en-us.md" >}}).
+Push-to-create will default to the visibility defined by `DEFAULT_PUSH_CREATE_PRIVATE` in `app.ini`.

docs/content/doc/usage/push-options.zh-tw.md

@@ -0,0 +1,69 @@
+---
+date: "2020-07-06T16:00:00+02:00"
+title: "使用: Push"
+slug: "push"
+weight: 15
+toc: false
+draft: false
+menu:
+  sidebar:
+    parent: "usage"
+    name: "Push"
+    weight: 15
+    identifier: "push"
+---
+
+**Table of Contents**
+
+{{< toc >}}
+
+There are some additional features when pushing commits to Gitea server.
+
+# Push Merge Hint
+
+When you pushing commits to a non-default branch, you will get an information from
+Gitea which is a link, you can click the link and go to a compare page. It's a quick
+way to create a pull request or a code review yourself in the Gitea UI.
+
+![Gitea Push Hint](/gitea-push-hint.png)
+
+# Push Options
+
+Gitea 從 `1.13` 版開始支援某些 [push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt)
+。
+
+## 支援的 Options
+
+- `repo.private` (true|false) - 修改儲存庫的可見性。
+
+  與 push-to-create 一起使用時特別有用。
+
+- `repo.template` (true|false) - 修改儲存庫是否為範本儲存庫。
+
+以下範例修改儲存庫的可見性為公開：
+
+```shell
+git push -o repo.private=false -u origin main
+```
+
+# Push To Create
+
+Push to create is a feature that allows you to push to a repository that does not exist yet in Gitea. This is useful for automation and for allowing users to create repositories without having to go through the web interface. This feature is disabled by default.
+
+## Enabling Push To Create
+
+In the `app.ini` file, set `ENABLE_PUSH_CREATE_USER` to `true` and `ENABLE_PUSH_CREATE_ORG` to `true` if you want to allow users to create repositories in their own user account and in organizations they are a member of respectively. Restart Gitea for the changes to take effect. You can read more about these two options in the [Configuration Cheat Sheet]({{< relref "doc/administration/config-cheat-sheet.zh-tw.md#repository-repository" >}}).
+
+## Using Push To Create
+
+Assuming you have a git repository in the current directory, you can push to a repository that does not exist yet in Gitea by running the following command:
+
+```shell
+# Add the remote you want to push to
+git remote add origin git@{domain}:{username}/{repo name that does not exist yet}.git
+
+# push to the remote
+git push -u origin main
+```
+
+This assumes you are using an SSH remote, but you can also use HTTPS remotes as well.

docs/content/doc/usage/push-to-create.en-us.md renamed to docs/content/doc/usage/push.en-us.md

@@ -155,14 +155,25 @@ func GetReviewers(ctx context.Context, repo *Repository, doerID, posterID int64)
 	return users, db.GetEngine(ctx).Where(cond).OrderBy(user_model.GetOrderByName()).Find(&users)
 }
 
-// GetIssuePosters returns all users that have authored an issue/pull request for the given repository
-func GetIssuePosters(ctx context.Context, repo *Repository, isPull bool) ([]*user_model.User, error) {
-	users := make([]*user_model.User, 0, 8)
+// GetIssuePostersWithSearch returns users with limit of 30 whose username started with prefix that have authored an issue/pull request for the given repository
+// If isShowFullName is set to true, also include full name prefix search
+func GetIssuePostersWithSearch(ctx context.Context, repo *Repository, isPull bool, search string, isShowFullName bool) ([]*user_model.User, error) {
+	users := make([]*user_model.User, 0, 30)
+	var prefixCond builder.Cond = builder.Like{"name", search + "%"}
+	if isShowFullName {
+		prefixCond = prefixCond.Or(builder.Like{"full_name", "%" + search + "%"})
+	}
+
 	cond := builder.In("`user`.id",
 		builder.Select("poster_id").From("issue").Where(
 			builder.Eq{"repo_id": repo.ID}.
 				And(builder.Eq{"is_pull": isPull}),
-		).GroupBy("poster_id"),
-	)
-	return users, db.GetEngine(ctx).Where(cond).OrderBy(user_model.GetOrderByName()).Find(&users)
+		).GroupBy("poster_id")).And(prefixCond)
+
+	return users, db.GetEngine(ctx).
+		Where(cond).
+		Cols("id", "name", "full_name", "avatar", "avatar_email", "use_custom_avatar").
+		OrderBy("name").
+		Limit(30).
+		Find(&users)
 }

docs/content/doc/usage/push.zh-tw.md

@@ -933,6 +933,7 @@ delete_preexisting = Delete pre-existing files
 delete_preexisting_content = Delete files in %s
 delete_preexisting_success = Deleted unadopted files in %s
 blame_prior = View blame prior to this change
+author_search_tooltip = Shows a maximum of 30 users
 
 transfer.accept = Accept Transfer
 transfer.accept_desc =  Transfer to "%s"

docs/static/gitea-push-hint.png

@@ -1168,7 +1168,7 @@ issues.ref_pull_from=<a href="%[3]s">මෙම අදින්න ඉල්ල
 issues.ref_closing_from=<a href="%[3]s">මෙම ගැටළුව වසා දමනු ඇත%[4]s මෙම ගැටළුව</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>
 issues.ref_reopening_from=<a href="%[3]s">මෙම ගැටළුව නැවත විවෘත කරනු ඇත%[4]s මෙම ගැටළුව</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>
 issues.ref_closed_from=<a href="%[3]s">මෙම නිකුතුව%[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>
-issues.ref_reopened_from=<a href="%[3]s">මෙම නිකුතුව%[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>
+issues.ref_reopened_from=<a href="%[3]s">මෙම නිකුතුව%[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>නැවත විවෘත කරන ලදි
 issues.ref_from=`හිම%[1]s`
 issues.poster=පෝස්ටර්
 issues.collaborator=සහයෝගීතාව

models/repo/user_repo.go

@@ -1104,6 +1104,7 @@ download_file=下载文件
 normal_view=普通视图
 line=行
 lines=行
+from_comment=(评论)
 
 editor.add_file=添加文件
 editor.new_file=新建文件

options/locale/locale_en-US.ini

@@ -0,0 +1,23 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repo
+
+import (
+	"sort"
+
+	"code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/context"
+)
+
+func makeSelfOnTop(ctx *context.Context, users []*user.User) []*user.User {
+	if ctx.Doer != nil {
+		sort.Slice(users, func(i, j int) bool {
+			if users[i].ID == users[j].ID {
+				return false
+			}
+			return users[i].ID == ctx.Doer.ID // if users[i] is self, put it before others, so less=true
+		})
+	}
+	return users
+}

options/locale/locale_si-LK.ini

@@ -0,0 +1,27 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repo
+
+import (
+	"testing"
+
+	"code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/context"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMakeSelfOnTop(t *testing.T) {
+	users := makeSelfOnTop(&context.Context{}, []*user.User{{ID: 2}, {ID: 1}})
+	assert.Len(t, users, 2)
+	assert.EqualValues(t, 2, users[0].ID)
+
+	users = makeSelfOnTop(&context.Context{Doer: &user.User{ID: 1}}, []*user.User{{ID: 2}, {ID: 1}})
+	assert.Len(t, users, 2)
+	assert.EqualValues(t, 1, users[0].ID)
+
+	users = makeSelfOnTop(&context.Context{Doer: &user.User{ID: 2}}, []*user.User{{ID: 2}, {ID: 1}})
+	assert.Len(t, users, 2)
+	assert.EqualValues(t, 2, users[0].ID)
+}

options/locale/locale_zh-CN.ini

@@ -303,17 +303,12 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
 	ctx.Data["CommitStatuses"] = commitStatuses
 
 	// Get assignees.
-	ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, repo)
+	assigneeUsers, err := repo_model.GetRepoAssignees(ctx, repo)
 	if err != nil {
-		ctx.ServerError("GetAssignees", err)
-		return
-	}
-
-	ctx.Data["Posters"], err = repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue())
-	if err != nil {
-		ctx.ServerError("GetIssuePosters", err)
+		ctx.ServerError("GetRepoAssignees", err)
 		return
 	}
+	ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers)
 
 	handleTeamMentions(ctx)
 	if ctx.Written() {
@@ -479,11 +474,12 @@ func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *repo_model.R
 		return
 	}
 
-	ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, repo)
+	assigneeUsers, err := repo_model.GetRepoAssignees(ctx, repo)
 	if err != nil {
-		ctx.ServerError("GetAssignees", err)
+		ctx.ServerError("GetRepoAssignees", err)
 		return
 	}
+	ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers)
 
 	handleTeamMentions(ctx)
 }
@@ -3354,3 +3350,46 @@ func handleTeamMentions(ctx *context.Context) {
 	ctx.Data["MentionableTeamsOrg"] = ctx.Repo.Owner.Name
 	ctx.Data["MentionableTeamsOrgAvatar"] = ctx.Repo.Owner.AvatarLink(ctx)
 }
+
+type userSearchInfo struct {
+	UserID     int64  `json:"user_id"`
+	UserName   string `json:"username"`
+	AvatarLink string `json:"avatar_link"`
+	FullName   string `json:"full_name"`
+}
+
+type userSearchResponse struct {
+	Results []*userSearchInfo `json:"results"`
+}
+
+// IssuePosters get posters for current repo's issues/pull requests
+func IssuePosters(ctx *context.Context) {
+	repo := ctx.Repo.Repository
+	isPullList := ctx.Params(":type") == "pulls"
+	search := strings.TrimSpace(ctx.FormString("q"))
+	posters, err := repo_model.GetIssuePostersWithSearch(ctx, repo, isPullList, search, setting.UI.DefaultShowFullName)
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, err)
+		return
+	}
+
+	if search == "" && ctx.Doer != nil {
+		// the returned posters slice only contains limited number of users,
+		// to make the current user (doer) can quickly filter their own issues, always add doer to the posters slice
+		if !util.SliceContainsFunc(posters, func(user *user_model.User) bool { return user.ID == ctx.Doer.ID }) {
+			posters = append(posters, ctx.Doer)
+		}
+	}
+
+	posters = makeSelfOnTop(ctx, posters)
+
+	resp := &userSearchResponse{}
+	resp.Results = make([]*userSearchInfo, len(posters))
+	for i, user := range posters {
+		resp.Results[i] = &userSearchInfo{UserID: user.ID, UserName: user.Name, AvatarLink: user.AvatarLink(ctx)}
+		if setting.UI.DefaultShowFullName {
+			resp.Results[i].FullName = user.FullName
+		}
+	}
+	ctx.JSON(http.StatusOK, resp)
+}