Merge branch 'main' into update-webhook-doc

Author: wxiaoguang

contrib/fhs-compliant-script/gitea

@@ -37,6 +37,6 @@ if [ -z "$APP_INI_SET" ]; then
 fi
 
 # Provide FHS compliant defaults to
-GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" "$GITEA" $CONF_ARG "$@"
+exec -a "$0" GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" "$GITEA" $CONF_ARG "$@"
 
 

docs/content/doc/usage/command-line.en-us.md

@@ -77,10 +77,22 @@ Admin operations:
         - One of `--id`, `--username` or `--email` is required. If more than one is provided then all have to match.
       - Examples:
         - `gitea admin user delete --id 1`
-    - `create`: - Options: - `--name value`: Username. Required. As of gitea 1.9.0, use the `--username` flag instead. - `--username value`: Username. Required. New in gitea 1.9.0. - `--password value`: Password. Required. - `--email value`: Email. Required. - `--admin`: If provided, this makes the user an admin. Optional. - `--access-token`: If provided, an access token will be created for the user. Optional. (default: false). - `--must-change-password`: If provided, the created user will be required to choose a newer password after
-      the initial login. Optional. (default: true). - `--random-password`: If provided, a randomly generated password will be used as the password of
-      the created user. The value of `--password` will be discarded. Optional. - `--random-password-length`: If provided, it will be used to configure the length of the randomly
-      generated password. Optional. (default: 12) - Examples: - `gitea admin user create --username myname --password asecurepassword --email [email protected]`
+    - `create`:
+      - Options:
+        - `--name value`: Username. Required. As of gitea 1.9.0, use the `--username` flag instead.
+        - `--username value`: Username. Required. New in gitea 1.9.0.
+        - `--password value`: Password. Required.
+        - `--email value`: Email. Required.
+        - `--admin`: If provided, this makes the user an admin. Optional.
+        - `--access-token`: If provided, an access token will be created for the user. Optional. (default: false).
+        - `--must-change-password`: If provided, the created user will be required to choose a newer password after the
+          initial login. Optional. (default: true).
+        - `--random-password`: If provided, a randomly generated password will be used as the password of the created
+          user. The value of `--password` will be discarded. Optional.
+        - `--random-password-length`: If provided, it will be used to configure the length of the randomly generated
+          password. Optional. (default: 12)
+      - Examples:
+        - `gitea admin user create --username myname --password asecurepassword --email [email protected]`
     - `change-password`:
       - Options:
         - `--username value`, `-u value`: Username. Required.

integrations/git_helper_for_declarative_test.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -55,7 +56,7 @@ func createSSHUrl(gitPath string, u *url.URL) *url.URL {
 	u2 := *u
 	u2.Scheme = "ssh"
 	u2.User = url.User("git")
-	u2.Host = fmt.Sprintf("%s:%d", setting.SSH.ListenHost, setting.SSH.ListenPort)
+	u2.Host = net.JoinHostPort(setting.SSH.ListenHost, strconv.Itoa(setting.SSH.ListenPort))
 	u2.Path = gitPath
 	return &u2
 }

models/migrations/v161.go

@@ -5,6 +5,8 @@
 package migrations
 
 import (
+	"context"
+
 	"xorm.io/xorm"
 )
 
@@ -42,8 +44,17 @@ func convertTaskTypeToString(x *xorm.Engine) error {
 		return err
 	}
 
+	// to keep the migration could be rerun
+	exist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "hook_task", "type")
+	if err != nil {
+		return err
+	}
+	if !exist {
+		return nil
+	}
+
 	for i, s := range hookTaskTypes {
-		if _, err := x.Exec("UPDATE hook_task set typ = ? where type=?", s, i); err != nil {
+		if _, err := x.Exec("UPDATE hook_task set typ = ? where `type`=?", s, i); err != nil {
 			return err
 		}
 	}

modules/convert/git_commit.go

@@ -147,8 +147,9 @@ func ToCommit(repo *models.Repository, commit *git.Commit, userCache map[string]
 
 	return &api.Commit{
 		CommitMeta: &api.CommitMeta{
-			URL: repo.APIURL() + "/git/commits/" + commit.ID.String(),
-			SHA: commit.ID.String(),
+			URL:     repo.APIURL() + "/git/commits/" + commit.ID.String(),
+			SHA:     commit.ID.String(),
+			Created: commit.Committer.When,
 		},
 		HTMLURL: repo.HTMLURL() + "/commit/" + commit.ID.String(),
 		RepoCommit: &api.RepoCommit{
@@ -169,8 +170,9 @@ func ToCommit(repo *models.Repository, commit *git.Commit, userCache map[string]
 			},
 			Message: commit.Message(),
 			Tree: &api.CommitMeta{
-				URL: repo.APIURL() + "/git/trees/" + commit.ID.String(),
-				SHA: commit.ID.String(),
+				URL:     repo.APIURL() + "/git/trees/" + commit.ID.String(),
+				SHA:     commit.ID.String(),
+				Created: commit.Committer.When,
 			},
 		},
 		Author:    apiAuthor,

modules/setting/log.go

@@ -120,7 +120,7 @@ func getLogLevel(section *ini.Section, key string, defaultValue log.Level) log.L
 }
 
 func getStacktraceLogLevel(section *ini.Section, key string, defaultValue string) string {
-	value := section.Key(key).MustString("none")
+	value := section.Key(key).MustString(defaultValue)
 	return log.FromString(value).String()
 }
 

modules/ssh/ssh.go

@@ -17,6 +17,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"sync"
 	"syscall"
@@ -264,7 +265,7 @@ func sshConnectionFailed(conn net.Conn, err error) {
 // Listen starts a SSH server listens on given port.
 func Listen(host string, port int, ciphers []string, keyExchanges []string, macs []string) {
 	srv := ssh.Server{
-		Addr:             fmt.Sprintf("%s:%d", host, port),
+		Addr:             net.JoinHostPort(host, strconv.Itoa(port)),
 		PublicKeyHandler: publicKeyHandler,
 		Handler:          sessionHandler,
 		ServerConfigCallback: func(ctx ssh.Context) *gossh.ServerConfig {

options/locale/locale_en-US.ini

@@ -149,8 +149,8 @@ lfs_path = Git LFS Root Path
 lfs_path_helper = Files tracked by Git LFS will be stored in this directory. Leave empty to disable.
 run_user = Run As Username
 run_user_helper = Enter the operating system username that Gitea runs as. Note that this user must have access to the repository root path.
-domain = SSH Server Domain
-domain_helper = Domain or host address for SSH clone URLs.
+domain = Server Domain
+domain_helper = Domain or host address for the server.
 ssh_port = SSH Server Port
 ssh_port_helper = Port number your SSH server listens on. Leave empty to disable.
 http_port = Gitea HTTP Listen Port
@@ -2547,7 +2547,7 @@ config.app_ver = Gitea Version
 config.app_url = Gitea Base URL
 config.custom_conf = Configuration File Path
 config.custom_file_root_path = "Custom File Root Path"
-config.domain = SSH Server Domain
+config.domain = Server Domain
 config.offline_mode = Local Mode
 config.disable_router_log = Disable Router Log
 config.run_user = Run As Username
@@ -2563,7 +2563,7 @@ config.reverse_auth_user = Reverse Authentication User
 config.ssh_config = SSH Configuration
 config.ssh_enabled = Enabled
 config.ssh_start_builtin_server = Use Built-In Server
-config.ssh_domain = Server Domain
+config.ssh_domain = SSH Server Domain
 config.ssh_port = Port
 config.ssh_listen_port = Listen Port
 config.ssh_root_path = Root Path

options/locale/locale_ja-JP.ini

@@ -490,6 +490,7 @@ form.name_chars_not_allowed=ユーザー名 '%s' には無効な文字が含ま
 [settings]
 profile=プロフィール
 account=アカウント
+appearance=外観
 password=パスワード
 security=セキュリティ
 avatar=アバター
@@ -514,7 +515,9 @@ website=Webサイト
 location=場所
 update_theme=テーマを更新
 update_profile=プロフィール更新
+update_language=言語を更新
 update_language_not_found=言語 '%s' は利用できません。
+update_language_success=言語が更新されました。
 update_profile_success=プロフィールを更新しました。
 change_username=ユーザー名を変更しました。
 change_username_prompt=注: ユーザー名を変更すると、アカウントのURLも変わります。
@@ -2783,6 +2786,7 @@ publish_release=`が <a href="%[1]s">%[3]s</a> の <a href="%[1]s/releases/tag/%
 review_dismissed=`が <b>%[4]s</b> の <a href="%[1]s/pulls/%[2]s">%[3]s#%[2]s</a> へのレビューを棄却しました`
 review_dismissed_reason=理由:
 create_branch=が <a href="%[1]s">%[4]s</a> にブランチ <a href="%[1]s/src/branch/%[2]s">%[3]s</a> を作成しました
+starred_repo=が <a href="%[1]s">%[2]s</a> にスターをつけました
 watched_repo=が <a href="%[1]s">%[2]s</a> のウォッチを開始しました
 
 [tool]

routers/init.go

@@ -6,8 +6,10 @@ package routers
 
 import (
 	"context"
+	"net"
 	"reflect"
 	"runtime"
+	"strconv"
 	"strings"
 
 	"code.gitea.io/gitea/models"
@@ -155,7 +157,9 @@ func GlobalInit(ctx context.Context) {
 
 	if setting.SSH.StartBuiltinServer {
 		ssh.Listen(setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers, setting.SSH.ServerKeyExchanges, setting.SSH.ServerMACs)
-		log.Info("SSH server started on %s:%d. Cipher list (%v), key exchange algorithms (%v), MACs (%v)", setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers, setting.SSH.ServerKeyExchanges, setting.SSH.ServerMACs)
+		log.Info("SSH server started on %s. Cipher list (%v), key exchange algorithms (%v), MACs (%v)",
+			net.JoinHostPort(setting.SSH.ListenHost, strconv.Itoa(setting.SSH.ListenPort)),
+			setting.SSH.ServerCiphers, setting.SSH.ServerKeyExchanges, setting.SSH.ServerMACs)
 	} else {
 		ssh.Unused()
 	}

routers/web/repo/issue.go

@@ -2577,9 +2577,33 @@ func combineLabelComments(issue *models.Issue) {
 		if cur.Label != nil { // now cur MUST be label comment
 			if prev.Type == models.CommentTypeLabel { // we can combine them only prev is a label comment
 				if cur.Content != "1" {
-					prev.RemovedLabels = append(prev.RemovedLabels, cur.Label)
+					// remove labels from the AddedLabels list if the label that was removed is already
+					// in this list, and if it's not in this list, add the label to RemovedLabels
+					addedAndRemoved := false
+					for i, label := range prev.AddedLabels {
+						if cur.Label.ID == label.ID {
+							prev.AddedLabels = append(prev.AddedLabels[:i], prev.AddedLabels[i+1:]...)
+							addedAndRemoved = true
+							break
+						}
+					}
+					if !addedAndRemoved {
+						prev.RemovedLabels = append(prev.RemovedLabels, cur.Label)
+					}
 				} else {
-					prev.AddedLabels = append(prev.AddedLabels, cur.Label)
+					// remove labels from the RemovedLabels list if the label that was added is already
+					// in this list, and if it's not in this list, add the label to AddedLabels
+					removedAndAdded := false
+					for i, label := range prev.RemovedLabels {
+						if cur.Label.ID == label.ID {
+							prev.RemovedLabels = append(prev.RemovedLabels[:i], prev.RemovedLabels[i+1:]...)
+							removedAndAdded = true
+							break
+						}
+					}
+					if !removedAndAdded {
+						prev.AddedLabels = append(prev.AddedLabels, cur.Label)
+					}
 				}
 				prev.CreatedUnix = cur.CreatedUnix
 				// remove the current comment since it has been combined to prev comment

routers/web/repo/issue_test.go

@@ -51,16 +51,7 @@ func TestCombineLabelComments(t *testing.T) {
 					PosterID:    1,
 					Content:     "1",
 					CreatedUnix: 0,
-					AddedLabels: []*models.Label{
-						{
-							Name: "kind/bug",
-						},
-					},
-					RemovedLabels: []*models.Label{
-						{
-							Name: "kind/bug",
-						},
-					},
+					AddedLabels: []*models.Label{},
 					Label: &models.Label{
 						Name: "kind/bug",
 					},
@@ -310,6 +301,66 @@ func TestCombineLabelComments(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "kase 6",
+			beforeCombined: []*models.Comment{
+				{
+					Type:     models.CommentTypeLabel,
+					PosterID: 1,
+					Content:  "1",
+					Label: &models.Label{
+						Name: "kind/bug",
+					},
+					CreatedUnix: 0,
+				},
+				{
+					Type:     models.CommentTypeLabel,
+					PosterID: 1,
+					Content:  "1",
+					Label: &models.Label{
+						Name: "reviewed/confirmed",
+					},
+					CreatedUnix: 0,
+				},
+				{
+					Type:     models.CommentTypeLabel,
+					PosterID: 1,
+					Content:  "",
+					Label: &models.Label{
+						Name: "kind/bug",
+					},
+					CreatedUnix: 0,
+				},
+				{
+					Type:     models.CommentTypeLabel,
+					PosterID: 1,
+					Content:  "1",
+					Label: &models.Label{
+						Name: "kind/feature",
+					},
+					CreatedUnix: 0,
+				},
+			},
+			afterCombined: []*models.Comment{
+				{
+					Type:     models.CommentTypeLabel,
+					PosterID: 1,
+					Content:  "1",
+					Label: &models.Label{
+						Name: "kind/bug",
+					},
+					AddedLabels: []*models.Label{
+						{
+							Name: "reviewed/confirmed",
+						},
+						{
+							Name: "kind/feature",
+						},
+					},
+					CreatedUnix: 0,
+				},
+			},
+		},
 	}
 
 	for _, kase := range kases {

templates/base/delete_modal_actions.tmpl

@@ -1,6 +1,6 @@
 <div class="actions">
 	<div class="ui red basic inverted cancel button">
-		{{svg "octicon-trash"}}
+		{{svg "octicon-x"}}
 		{{.i18n.Tr "modal.no"}}
 	</div>
 	<div class="ui green basic inverted ok button">

templates/repo/issue/view_content/comments.tmpl

@@ -158,7 +158,7 @@
 			{{if eq .RefAction 3}}</del>{{end}}
 
 			<div class="detail">
-				<span class="text grey"><a href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle | Str2html}}</b> {{.RefIssueIdent | Str2html}}</a></span>
+				<span class="text grey"><a href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle}}</b> {{.RefIssueIdent}}</a></span>
 			</div>
 		</div>
 	{{else if eq .Type 4}}