Merge branch 'master' into resolve-cov

Author: a1012112796

.eslintrc

@@ -24,6 +24,13 @@ globals:
   SimpleMDE: false
   u2fApi: false
 
+overrides:
+  - files: ["web_src/**/*.worker.js"]
+    env:
+      worker: true
+    rules:
+      no-restricted-globals: [0]
+
 rules:
   arrow-body-style: [0]
   arrow-parens: [2, always]

docs/content/doc/usage/backup-and-restore.en-us.md

@@ -75,7 +75,7 @@ mv custom/conf/app.ini /etc/gitea/conf/app.ini # or mv app.ini /etc/gitea/conf/a
 unzip gitea-repo.zip
 mv gitea-repo/* /var/lib/gitea/repositories/
 chown -R gitea:gitea /etc/gitea/conf/app.ini /var/lib/gitea/repositories/
-mysql -u$USER -p$PASS $DATABASE <gitea-db.sql
+mysql --default-character-set=utf8mb4 -u$USER -p$PASS $DATABASE <gitea-db.sql
 # or  sqlite3 $DATABASE_PATH <gitea-db.sql
 service gitea restart
 ```

docs/content/doc/usage/backup-and-restore.zh-cn.md

@@ -54,7 +54,7 @@ mv custom/conf/app.ini /etc/gitea/conf/app.ini
 unzip gitea-repo.zip
 mv gitea-repo/* /var/lib/gitea/repositories/
 chown -R gitea:gitea /etc/gitea/conf/app.ini /var/lib/gitea/repositories/
-mysql -u$USER -p$PASS $DATABASE <gitea-db.sql
+mysql --default-character-set=utf8mb4 -u$USER -p$PASS $DATABASE <gitea-db.sql
 # or  sqlite3 $DATABASE_PATH <gitea-db.sql
 service gitea restart
 ```

integrations/integration_test.go

@@ -330,14 +330,18 @@ func loginUserWithPassword(t testing.TB, userName, password string) *TestSession
 	return session
 }
 
+//token has to be unique this counter take care of
+var tokenCounter int64
+
 func getTokenForLoggedInUser(t testing.TB, session *TestSession) string {
 	t.Helper()
+	tokenCounter++
 	req := NewRequest(t, "GET", "/user/settings/applications")
 	resp := session.MakeRequest(t, req, http.StatusOK)
 	doc := NewHTMLParser(t, resp.Body)
 	req = NewRequestWithValues(t, "POST", "/user/settings/applications", map[string]string{
 		"_csrf": doc.GetCSRF(),
-		"name":  "api-testing-token",
+		"name":  fmt.Sprintf("api-testing-token-%d", tokenCounter),
 	})
 	resp = session.MakeRequest(t, req, http.StatusFound)
 	req = NewRequest(t, "GET", "/user/settings/applications")

models/issue.go

@@ -554,7 +554,7 @@ func updateIssueCols(e Engine, issue *Issue, cols ...string) error {
 	return nil
 }
 
-func (issue *Issue) changeStatus(e *xorm.Session, doer *User, isClosed bool) (*Comment, error) {
+func (issue *Issue) changeStatus(e *xorm.Session, doer *User, isClosed, isMergePull bool) (*Comment, error) {
 	// Reload the issue
 	currentIssue, err := getIssueByID(e, issue.ID)
 	if err != nil {
@@ -620,6 +620,8 @@ func (issue *Issue) changeStatus(e *xorm.Session, doer *User, isClosed bool) (*C
 	cmtType := CommentTypeClose
 	if !issue.IsClosed {
 		cmtType = CommentTypeReopen
+	} else if isMergePull {
+		cmtType = CommentTypeMergePull
 	}
 
 	return createComment(e, &CreateCommentOptions{
@@ -645,7 +647,7 @@ func (issue *Issue) ChangeStatus(doer *User, isClosed bool) (*Comment, error) {
 		return nil, err
 	}
 
-	comment, err := issue.changeStatus(sess, doer, isClosed)
+	comment, err := issue.changeStatus(sess, doer, isClosed, false)
 	if err != nil {
 		return nil, err
 	}

models/issue_comment.go

@@ -88,6 +88,8 @@ const (
 	CommentTypeDeleteTimeManual
 	// add or remove Request from one
 	CommentTypeReviewRequest
+	// merge pull request
+	CommentTypeMergePull
 )
 
 // CommentTag defines comment tag type

models/pull.go

@@ -390,7 +390,7 @@ func (pr *PullRequest) SetMerged() (bool, error) {
 		return false, err
 	}
 
-	if _, err := pr.Issue.changeStatus(sess, pr.Merger, true); err != nil {
+	if _, err := pr.Issue.changeStatus(sess, pr.Merger, true, true); err != nil {
 		return false, fmt.Errorf("Issue.changeStatus: %v", err)
 	}
 

models/token.go

@@ -77,6 +77,11 @@ func GetAccessTokenBySHA(token string) (*AccessToken, error) {
 	return nil, ErrAccessTokenNotExist{token}
 }
 
+// AccessTokenByNameExists checks if a token name has been used already by a user.
+func AccessTokenByNameExists(token *AccessToken) (bool, error) {
+	return x.Table("access_token").Where("name = ?", token.Name).And("uid = ?", token.UID).Exist()
+}
+
 // ListAccessTokens returns a list of access tokens belongs to given user.
 func ListAccessTokens(uid int64, listOptions ListOptions) ([]*AccessToken, error) {
 	sess := x.

models/token_test.go

@@ -27,6 +27,42 @@ func TestNewAccessToken(t *testing.T) {
 	assert.Error(t, NewAccessToken(invalidToken))
 }
 
+func TestAccessTokenByNameExists(t *testing.T) {
+
+	name := "Token Gitea"
+
+	assert.NoError(t, PrepareTestDatabase())
+	token := &AccessToken{
+		UID:  3,
+		Name: name,
+	}
+
+	// Check to make sure it doesn't exists already
+	exist, err := AccessTokenByNameExists(token)
+	assert.NoError(t, err)
+	assert.False(t, exist)
+
+	// Save it to the database
+	assert.NoError(t, NewAccessToken(token))
+	AssertExistsAndLoadBean(t, token)
+
+	// This token must be found by name in the DB now
+	exist, err = AccessTokenByNameExists(token)
+	assert.NoError(t, err)
+	assert.True(t, exist)
+
+	user4Token := &AccessToken{
+		UID:  4,
+		Name: name,
+	}
+
+	// Name matches but different user ID, this shouldn't exists in the
+	// database
+	exist, err = AccessTokenByNameExists(user4Token)
+	assert.NoError(t, err)
+	assert.False(t, exist)
+}
+
 func TestGetAccessTokenBySHA(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 	token, err := GetAccessTokenBySHA("d2c6c1ba3890b309189a8e618c72a162e4efbf36")

options/locale/locale_en-US.ini

@@ -517,6 +517,7 @@ new_token_desc = Applications using a token have full access to your account.
 token_name = Token Name
 generate_token = Generate Token
 generate_token_success = Your new token has been generated. Copy it now as it will not be shown again.
+generate_token_name_duplicate = <strong>%s</strong> has been used as an application name already. Please use a new one.
 delete_token = Delete
 access_token_deletion = Delete Access Token
 access_token_deletion_desc = Deleting a token will revoke access to your account for applications using it. Continue?
@@ -924,6 +925,7 @@ issues.context.edit = Edit
 issues.context.delete = Delete
 issues.no_content = There is no content yet.
 issues.close_issue = Close
+issues.pull_merged_at = `merged commit <a href="%[1]s">%[2]s</a> into <b>%[3]s</b> %[4]s`
 issues.close_comment_issue = Comment and Close
 issues.reopen_issue = Reopen
 issues.reopen_comment_issue = Comment and Reopen

options/locale/locale_ja-JP.ini

@@ -459,6 +459,7 @@ add_email=メールアドレスを追加
 add_openid=OpenID URIを追加する
 add_email_confirmation_sent='%s' に確認メールを送信しました。 %s以内に受信トレイを確認し、メールアドレス確認を行ってください。
 add_email_success=新しいメールアドレスを追加しました。
+email_preference_set_success=メール設定を保存しました。
 add_openid_success=新しいOpenIDアドレスを追加しました。
 keep_email_private=メールアドレスを隠す
 keep_email_private_popup=あなたのメールアドレスは他のユーザーから隠されます。
@@ -826,6 +827,7 @@ issues.desc=バグ報告、タスク、マイルストーンの作成。
 issues.filter_assignees=候補者の絞り込み
 issues.filter_milestones=マイルストーンの絞り込み
 issues.filter_labels=ラベルの絞り込み
+issues.filter_reviewers=レビューアの絞り込み
 issues.new=新しい課題
 issues.new.title_empty=タイトルは空にできません
 issues.new.labels=ラベル
@@ -843,7 +845,9 @@ issues.new.assignees=担当者
 issues.new.add_assignees_title=担当者の割り当て
 issues.new.clear_assignees=担当者をクリア
 issues.new.no_assignees=担当者なし
-issues.no_ref=ブランチ/タグが指定されていません
+issues.new.no_reviewers=レビューアなし
+issues.new.add_reviewer_title=レビュー依頼
+issues.no_ref=ブランチ/タグ指定なし
 issues.create=課題を作成
 issues.new_label=新しいラベル
 issues.new_label_placeholder=ラベル名
@@ -936,6 +940,9 @@ issues.ref_from=` %[1]s にて`
 issues.poster=投稿者
 issues.collaborator=共同作業者
 issues.owner=オーナー
+issues.re_request_review=レビューを再依頼
+issues.remove_request_review=レビュー依頼を取り消し
+issues.remove_request_review_block=レビュー依頼の取り消しはできません
 issues.sign_in_require_desc=<a href="%s">サインイン</a>してこの会話に参加。
 issues.edit=編集
 issues.cancel=キャンセル
@@ -1045,8 +1052,13 @@ issues.review.self.approval=自分のプルリクエストを承認すること
 issues.review.self.rejection=自分のプルリクエストに対して修正を要求することはできません。
 issues.review.approve=が変更を承認 %s
 issues.review.comment=がレビュー %s
+issues.review.left_comment=がコメント
 issues.review.content.empty=修正を指示するコメントを残す必要があります。
 issues.review.reject=が変更を要請 %s
+issues.review.wait=にレビュー依頼 %s
+issues.review.add_review_request=が %s にレビューを依頼 %s
+issues.review.remove_review_request=が %s へのレビュー依頼を取り消し %s
+issues.review.remove_review_request_self=がレビューを拒否 %s
 issues.review.pending=保留
 issues.review.review=レビュー
 issues.review.reviewers=レビューア
@@ -1095,6 +1107,8 @@ pulls.approve_count_1=承認 %d
 pulls.approve_count_n=承認 %d
 pulls.reject_count_1=変更要請 %d
 pulls.reject_count_n=変更要請 %d
+pulls.waiting_count_1=レビュー待ち %d
+pulls.waiting_count_n=レビュー待ち %d
 
 pulls.no_merge_desc=リポジトリのマージオプションがすべて無効になっているため、このプルリクエストをマージすることはできせん。
 pulls.no_merge_helper=リポジトリ設定でマージを有効にするか、手動でマージしてください。

package-lock.json

@@ -17,6 +17,7 @@
     "core-js": "3.6.4",
     "css-loader": "3.4.2",
     "cssnano": "4.1.10",
+    "domino": "2.1.4",
     "dropzone": "5.7.0",
     "fast-glob": "3.2.2",
     "fomantic-ui": "2.8.4",
@@ -44,7 +45,8 @@
     "vue-template-compiler": "2.6.11",
     "webpack": "4.42.0",
     "webpack-cli": "3.3.11",
-    "webpack-fix-style-only-entries": "0.4.0"
+    "webpack-fix-style-only-entries": "0.4.0",
+    "worker-loader": "2.0.0"
   },
   "devDependencies": {
     "eslint": "6.8.0",

package.json

@@ -6,6 +6,7 @@
 package user
 
 import (
+	"errors"
 	"net/http"
 
 	"code.gitea.io/gitea/models"
@@ -89,6 +90,17 @@ func CreateAccessToken(ctx *context.APIContext, form api.CreateAccessTokenOption
 		UID:  ctx.User.ID,
 		Name: form.Name,
 	}
+
+	exist, err := models.AccessTokenByNameExists(t)
+	if err != nil {
+		ctx.InternalServerError(err)
+		return
+	}
+	if exist {
+		ctx.Error(http.StatusBadRequest, "AccessTokenByNameExists", errors.New("access token name has been used already"))
+		return
+	}
+
 	if err := models.NewAccessToken(t); err != nil {
 		ctx.Error(http.StatusInternalServerError, "NewAccessToken", err)
 		return

routers/api/v1/user/app.go

@@ -43,6 +43,18 @@ func ApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm) {
 		UID:  ctx.User.ID,
 		Name: form.Name,
 	}
+
+	exist, err := models.AccessTokenByNameExists(t)
+	if err != nil {
+		ctx.ServerError("AccessTokenByNameExists", err)
+		return
+	}
+	if exist {
+		ctx.Flash.Error(ctx.Tr("settings.generate_token_name_duplicate", t.Name))
+		ctx.Redirect(setting.AppSubURL + "/user/settings/applications")
+		return
+	}
+
 	if err := models.NewAccessToken(t); err != nil {
 		ctx.ServerError("NewAccessToken", err)
 		return

routers/user/setting/applications.go

@@ -18,7 +18,7 @@
                 </h3>
 				<div>
 					{{range $term := .SearchResultLanguages}}
-					<a class="ui {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
+					<a class="ui language-label {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
 						<i class="color-icon" style="background-color: {{$term.Color}}"></i>
 						{{$term.Language}}
 						<div class="detail">{{$term.Count}}</div>

templates/explore/code.tmpl

@@ -7,7 +7,7 @@
 	 13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE,
 	 18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY, 21 = CODE,
 	 22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_UNLOCKED, 25 = TARGET_BRANCH_CHANGED,
-	 26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST -->
+	 26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST -->
 	{{if eq .Type 0}}
 		<div class="timeline-item comment" id="{{.HashTag}}">
 		{{if .OriginalAuthor }}
@@ -84,6 +84,18 @@
 			</a>
 			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
 		</div>
+	{{else if eq .Type 28}}
+		<div class="timeline-item event" id="{{.HashTag}}">
+			<span class="badge purple">{{svg "octicon-git-merge" 16}}</span>
+			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
+				<img src="{{.Poster.RelAvatarLink}}">
+			</a>
+			<span class="text grey">
+				<a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>  
+				{{$link := printf "%s/commit/%s" $.Repository.HTMLURL $.Issue.PullRequest.MergedCommitID}}
+				{{$.i18n.Tr "repo.issues.pull_merged_at" $link (ShortSha $.Issue.PullRequest.MergedCommitID) $.BaseTarget $createdStr | Str2html}}
+			</span>
+		</div>
 	{{else if eq .Type 3 5 6}}
 		{{ $refFrom:= "" }}
 		{{if ne .RefRepoID .Issue.RepoID}}

templates/repo/issue/view_content/comments.tmpl

@@ -18,7 +18,7 @@
 			</h3>
 			<div>
 				{{range $term := .SearchResultLanguages}}
-				<a class="ui {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{EscapePound $.SourcePath}}/search?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
+				<a class="ui language-label {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{EscapePound $.SourcePath}}/search?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
 					<i class="color-icon" style="background-color: {{$term.Color}}"></i>
 					{{$term.Language}}
 					<div class="detail">{{$term.Count}}</div>