Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main:
  Enable two vue eslint rules (go-gitea#24780)
  Add two eslint plugins (go-gitea#24776)
  Mark `models/fixtures` as generated (go-gitea#24775)
  Fix TestMinioStorageIterator skip message (go-gitea#24765)
  Fix missed table name on iterate lfs meta objects (go-gitea#24768)
  Revert "Fix missed table name on iterate lfs meta objects" (go-gitea#24764)
  Make the color of zero-contribution-squares in the activity heatmap more subtle (go-gitea#24758)
  Fix missed table name on iterate lfs meta objects
  Skip TestMinioStorageIterator on CI (go-gitea#24762)
  Support no label/assignee filter and batch clearing labels/assignees (go-gitea#24707)
  Support for status check pattern (go-gitea#24633)
  Updates to doc (go-gitea#24757)
  Ignore build for docs only (go-gitea#24761)
  Fix team members API endpoint pagination (go-gitea#24754)
  Make mailer SMTP check have timed context (go-gitea#24751)
  Add @garymoon to MAINTAINERS (go-gitea#24752)
  Skip TestRepoCommitsStatusParallel on CI (go-gitea#24741)
  Respect original content when creating secrets (go-gitea#24745)

Author: zjjhot

.eslintrc.yaml

@@ -10,10 +10,12 @@ parserOptions:
 
 plugins:
   - "@eslint-community/eslint-plugin-eslint-comments"
+  - eslint-plugin-array-func
   - eslint-plugin-custom-elements
   - eslint-plugin-import
   - eslint-plugin-jquery
   - eslint-plugin-no-jquery
+  - eslint-plugin-no-use-extend-native
   - eslint-plugin-regexp
   - eslint-plugin-sonarjs
   - eslint-plugin-unicorn
@@ -59,6 +61,12 @@ rules:
   array-bracket-spacing: [2, never]
   array-callback-return: [2, {checkForEach: true}]
   array-element-newline: [0]
+  array-func/avoid-reverse: [2]
+  array-func/from-map: [2]
+  array-func/no-unnecessary-this-arg: [2]
+  array-func/prefer-array-from: [2]
+  array-func/prefer-flat-map: [0] # handled by unicorn/prefer-array-flat-map
+  array-func/prefer-flat: [0] # handled by unicorn/prefer-array-flat
   arrow-body-style: [0]
   arrow-parens: [2, always]
   arrow-spacing: [2, {before: true, after: true}]
@@ -444,6 +452,7 @@ rules:
   no-unused-private-class-members: [2]
   no-unused-vars: [2, {args: all, argsIgnorePattern: ^_, varsIgnorePattern: ^_, caughtErrorsIgnorePattern: ^_, destructuredArrayIgnorePattern: ^_, ignoreRestSiblings: false}]
   no-use-before-define: [2, {functions: false, classes: true, variables: true, allowNamedExports: true}]
+  no-use-extend-native/no-use-extend-native: [2]
   no-useless-backreference: [2]
   no-useless-call: [2]
   no-useless-catch: [2]

.gitattributes

@@ -1,6 +1,7 @@
 * text=auto eol=lf
 *.tmpl linguist-language=Handlebars
 /assets/*.json linguist-generated
+/models/fixtures/** linguist-generated
 /public/img/svg/*.svg linguist-generated
 /public/vendor/** -text -eol linguist-vendored
 /templates/swagger/v1_json.tmpl linguist-generated

.github/workflows/pull-compliance-docsignore.yml

@@ -11,3 +11,33 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: echo "No build required"
+
+  lint-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "No build required"
+
+  lint-go-windows:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "No build required"
+
+  lint-go-gogit:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "No build required"
+
+  checks-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "No build required"
+
+  frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "No build required"
+
+  backend:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "No build required"

MAINTAINERS

@@ -50,3 +50,4 @@ Eddie Yang <[email protected]> (@yp05327)
 Dong Ge <[email protected]> (@sillyguodong)
 Xinyi Gong <[email protected]> (@HesterG)
 wxiaoguang <[email protected]> (@wxiaoguang)
+Gary Moon <[email protected]> (@garymoon)

docs/content/doc/administration/config-cheat-sheet.en-us.md

@@ -220,7 +220,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `SHOW_USER_EMAIL`: **true**: Whether the email of the user should be shown in the Explore Users page.
 - `THEMES`:  **auto,gitea,arc-green**: All available themes. Allow users select personalized themes.
   regardless of the value of `DEFAULT_THEME`.
-- `THEME_COLOR_META_TAG`: **\<empty\>**: Value of `theme-color` meta tag, used by some mobile browers for chrome and out-of-viewport areas. Default is unset which uses body color.
+- `THEME_COLOR_META_TAG`: **\<empty\>**: Value of `theme-color` meta tag, used by some mobile browsers for chrome and out-of-viewport areas. Default is unset which uses body color.
 - `MAX_DISPLAY_FILE_SIZE`: **8388608**: Max size of files to be displayed (default is 8MiB)
 - `REACTIONS`: All available reactions users can choose on issues/prs and comments
     Values can be emoji alias (:smile:) or a unicode emoji.

docs/content/doc/installation/from-source.en-us.md

@@ -201,7 +201,7 @@ This can be combined with `CC`, `GOOS`, and `GOARCH` as above.
 A script to enable bash-completion can be found at [`contrib/autocompletion/bash_autocomplete`](https://raw.githubusercontent.com/go-gitea/gitea/main/contrib/autocompletion/bash_autocomplete). This should be altered as appropriate and can be `source` in your `.bashrc`
 or copied as `/usr/share/bash-completion/completions/gitea`.
 
-Similary a script for zsh-completion can be found at [`contrib/autocompletion/zsh_autocomplete`](https://raw.githubusercontent.com/go-gitea/gitea/main/contrib/autocompletion/zsh_autocomplete). This can be copied to `/usr/share/zsh/_gitea` or sourced within your
+Similarly, a script for zsh-completion can be found at [`contrib/autocompletion/zsh_autocomplete`](https://raw.githubusercontent.com/go-gitea/gitea/main/contrib/autocompletion/zsh_autocomplete). This can be copied to `/usr/share/zsh/_gitea` or sourced within your
 `.zshrc`.
 
 YMMV and these scripts may need further improvement.

docs/content/doc/usage/packages/cargo.en-us.md

@@ -25,13 +25,13 @@ Publish [Cargo](https://doc.rust-lang.org/stable/cargo/) packages for your user
 
 To work with the Cargo package registry, you need [Rust and Cargo](https://www.rust-lang.org/tools/install).
 
-Cargo stores informations about the available packages in a package index stored in a git repository.
+Cargo stores information about the available packages in a package index stored in a git repository.
 This repository is needed to work with the registry.
 The following section describes how to create it.
 
 ## Index Repository
 
-Cargo stores informations about the available packages in a package index stored in a git repository.
+Cargo stores information about the available packages in a package index stored in a git repository.
 In Gitea this repository has the special name `_cargo-index`.
 After a package was uploaded, its metadata is automatically written to the index.
 The content of this repository should not be manually modified.

docs/content/doc/usage/packages/storage.en-us.md

@@ -28,7 +28,7 @@ If two identical files are uploaded only one blob is saved on the filesystem.
 This ensures no space is wasted for duplicated files.
 
 If two packages are uploaded with identical files, both packages will display the same size but on the filesystem they require only half of the size.
-Whenever a package gets deleted only the references to the underlaying blobs are removed.
+Whenever a package gets deleted, only the references to the underlying blobs are removed.
 The blobs get not removed at this moment, so they still require space on the filesystem.
 When a new package gets uploaded the existing blobs may get referenced again.
 

models/git/lfs.go

@@ -390,7 +390,7 @@ func IterateLFSMetaObjectsForRepo(ctx context.Context, repoID int64, f func(cont
 
 	for {
 		beans := make([]*CountLFSMetaObject, 0, batchSize)
-		sess := engine.Select("`lfs_meta_object`.*, COUNT(`l1`.oid) AS `count`").
+		sess := engine.Table("lfs_meta_object").Select("`lfs_meta_object`.*, COUNT(`l1`.oid) AS `count`").
 			Join("INNER", "`lfs_meta_object` AS l1", "`lfs_meta_object`.oid = `l1`.oid").
 			Where("`lfs_meta_object`.repository_id = ?", repoID)
 		if !opts.OlderThan.IsZero() {

models/issues/issue.go

@@ -1251,6 +1251,8 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) {
 
 	if opts.AssigneeID > 0 {
 		applyAssigneeCondition(sess, opts.AssigneeID)
+	} else if opts.AssigneeID == db.NoConditionID {
+		sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_assignees)")
 	}
 
 	if opts.PosterID > 0 {
@@ -1312,13 +1314,17 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) {
 		sess.And(builder.Eq{"repository.is_archived": opts.IsArchived.IsTrue()})
 	}
 
-	if opts.LabelIDs != nil {
-		for i, labelID := range opts.LabelIDs {
-			if labelID > 0 {
-				sess.Join("INNER", fmt.Sprintf("issue_label il%d", i),
-					fmt.Sprintf("issue.id = il%[1]d.issue_id AND il%[1]d.label_id = %[2]d", i, labelID))
-			} else {
-				sess.Where("issue.id not in (select issue_id from issue_label where label_id = ?)", -labelID)
+	if len(opts.LabelIDs) > 0 {
+		if opts.LabelIDs[0] == 0 {
+			sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_label)")
+		} else {
+			for i, labelID := range opts.LabelIDs {
+				if labelID > 0 {
+					sess.Join("INNER", fmt.Sprintf("issue_label il%d", i),
+						fmt.Sprintf("issue.id = il%[1]d.issue_id AND il%[1]d.label_id = %[2]d", i, labelID))
+				} else if labelID < 0 { // 0 is not supported here, so just ignore it
+					sess.Where("issue.id not in (select issue_id from issue_label where label_id = ?)", -labelID)
+				}
 			}
 		}
 	}
@@ -1705,17 +1711,21 @@ func getIssueStatsChunk(opts *IssueStatsOptions, issueIDs []int64) (*IssueStats,
 			sess.In("issue.id", issueIDs)
 		}
 
-		if len(opts.Labels) > 0 && opts.Labels != "0" {
+		if len(opts.Labels) > 0 {
 			labelIDs, err := base.StringsToInt64s(strings.Split(opts.Labels, ","))
 			if err != nil {
 				log.Warn("Malformed Labels argument: %s", opts.Labels)
 			} else {
-				for i, labelID := range labelIDs {
-					if labelID > 0 {
-						sess.Join("INNER", fmt.Sprintf("issue_label il%d", i),
-							fmt.Sprintf("issue.id = il%[1]d.issue_id AND il%[1]d.label_id = %[2]d", i, labelID))
-					} else {
-						sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_label WHERE label_id = ?)", -labelID)
+				if labelIDs[0] == 0 {
+					sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_label)")
+				} else {
+					for i, labelID := range labelIDs {
+						if labelID > 0 {
+							sess.Join("INNER", fmt.Sprintf("issue_label il%d", i),
+								fmt.Sprintf("issue.id = il%[1]d.issue_id AND il%[1]d.label_id = %[2]d", i, labelID))
+						} else if labelID < 0 { // 0 is not supported here, so just ignore it
+							sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_label WHERE label_id = ?)", -labelID)
+						}
 					}
 				}
 			}
@@ -1734,6 +1744,8 @@ func getIssueStatsChunk(opts *IssueStatsOptions, issueIDs []int64) (*IssueStats,
 
 		if opts.AssigneeID > 0 {
 			applyAssigneeCondition(sess, opts.AssigneeID)
+		} else if opts.AssigneeID == db.NoConditionID {
+			sess.Where("id NOT IN (SELECT issue_id FROM issue_assignees)")
 		}
 
 		if opts.PosterID > 0 {

models/organization/team_user.go

@@ -63,8 +63,8 @@ func GetTeamMembers(ctx context.Context, opts *SearchMembersOptions) ([]*user_mo
 				Where(builder.Eq{"team_id": opts.TeamID}),
 		)
 	}
-	if opts.PageSize > 0 && opts.Page > -1 {
-		sess = sess.Limit(opts.PageSize, opts.Page*opts.PageSize)
+	if opts.PageSize > 0 && opts.Page > 0 {
+		sess = sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize)
 	}
 	if err := sess.OrderBy("full_name, name").Find(&members); err != nil {
 		return nil, err

models/secret/secret.go

@@ -59,7 +59,7 @@ func newSecret(ownerID, repoID int64, name, data string) *Secret {
 
 // InsertEncryptedSecret Creates, encrypts, and validates a new secret with yet unencrypted data and insert into database
 func InsertEncryptedSecret(ctx context.Context, ownerID, repoID int64, name, data string) (*Secret, error) {
-	encrypted, err := secret_module.EncryptSecret(setting.SecretKey, strings.TrimSpace(data))
+	encrypted, err := secret_module.EncryptSecret(setting.SecretKey, data)
 	if err != nil {
 		return nil, err
 	}

modules/setting/mailer.go

@@ -4,6 +4,7 @@
 package setting
 
 import (
+	"context"
 	"net"
 	"net/mail"
 	"strings"
@@ -198,7 +199,7 @@ func loadMailerFrom(rootCfg ConfigProvider) {
 		ips := tryResolveAddr(MailService.SMTPAddr)
 		if MailService.Protocol == "smtp" {
 			for _, ip := range ips {
-				if !ip.IsLoopback() {
+				if !ip.IP.IsLoopback() {
 					log.Warn("connecting over insecure SMTP protocol to non-local address is not recommended")
 					break
 				}
@@ -258,20 +259,21 @@ func loadNotifyMailFrom(rootCfg ConfigProvider) {
 	log.Info("Notify Mail Service Enabled")
 }
 
-func tryResolveAddr(addr string) []net.IP {
+func tryResolveAddr(addr string) []net.IPAddr {
 	if strings.HasPrefix(addr, "[") && strings.HasSuffix(addr, "]") {
 		addr = addr[1 : len(addr)-1]
 	}
 	ip := net.ParseIP(addr)
 	if ip != nil {
-		ips := make([]net.IP, 1)
-		ips[0] = ip
-		return ips
+		return []net.IPAddr{{IP: ip}}
 	}
-	ips, err := net.LookupIP(addr)
+
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+	ips, err := net.DefaultResolver.LookupIPAddr(ctx, addr)
 	if err != nil {
 		log.Warn("could not look up mailer.SMTP_ADDR: %v", err)
-		return make([]net.IP, 0)
+		return nil
 	}
 	return ips
 }

modules/storage/minio_test.go

@@ -4,10 +4,15 @@
 package storage
 
 import (
+	"os"
 	"testing"
 )
 
 func TestMinioStorageIterator(t *testing.T) {
+	if os.Getenv("CI") == "" {
+		t.Skip("minioStorage not present outside of CI")
+		return
+	}
 	testStorageIterator(t, string(MinioStorageType), MinioStorageConfig{
 		Endpoint:        "127.0.0.1:9000",
 		AccessKeyID:     "123456",

options/locale/locale_en-US.ini

@@ -1361,6 +1361,7 @@ issues.delete_branch_at = `deleted branch <b>%s</b> %s`
 issues.filter_label = Label
 issues.filter_label_exclude = `Use <code>alt</code> + <code>click/enter</code> to exclude labels`
 issues.filter_label_no_select = All labels
+issues.filter_label_select_no_label = No Label
 issues.filter_milestone = Milestone
 issues.filter_milestone_all = All milestones
 issues.filter_milestone_none = No milestones
@@ -1371,6 +1372,7 @@ issues.filter_project_all = All projects
 issues.filter_project_none = No project
 issues.filter_assignee = Assignee
 issues.filter_assginee_no_select = All assignees
+issues.filter_assginee_no_assignee = No assignee
 issues.filter_poster = Author
 issues.filter_poster_no_select = All authors
 issues.filter_type = Type
@@ -2190,8 +2192,13 @@ settings.protect_merge_whitelist_committers_desc = Allow only whitelisted users
 settings.protect_merge_whitelist_users = Whitelisted users for merging:
 settings.protect_merge_whitelist_teams = Whitelisted teams for merging:
 settings.protect_check_status_contexts = Enable Status Check
-settings.protect_check_status_contexts_desc = Require status checks to pass before merging. Choose which status checks must pass before branches can be merged into a branch that matches this rule. When enabled, commits must first be pushed to another branch, then merged or pushed directly to a branch that matches this rule after status checks have passed. If no contexts are selected, the last commit must be successful regardless of context.
+settings.protect_status_check_patterns = Status check patterns:
+settings.protect_status_check_patterns_desc = Enter patterns to specify which status checks must pass before branches can be merged into a branch that matches this rule. Each line specifies a pattern. Patterns cannot be empty.
+settings.protect_check_status_contexts_desc = Require status checks to pass before merging. When enabled, commits must first be pushed to another branch, then merged or pushed directly to a branch that matches this rule after status checks have passed. If no contexts are matched, the last commit must be successful regardless of context.
 settings.protect_check_status_contexts_list = Status checks found in the last week for this repository
+settings.protect_status_check_matched = Matched
+settings.protect_invalid_status_check_pattern = Invalid status check pattern: "%s".
+settings.protect_no_valid_status_check_patterns = No valid status check patterns.
 settings.protect_required_approvals = Required approvals:
 settings.protect_required_approvals_desc = Allow only to merge pull request with enough positive reviews.
 settings.protect_approvals_whitelist_enabled = Restrict approvals to whitelisted users or teams