Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main:
  Add `must-change-password` cli parameter (go-gitea#27626)
  Include username in email headers (go-gitea#28981)
  Update tool dependencies (go-gitea#29030)
  Add artifacts v4 jwt to job message and accept it (go-gitea#28885)
  Pass es2020 to esbuild-loader as well (go-gitea#29027)
  Fix default avatar image size in PR diff page (go-gitea#28971)
  Update JS and PY dependencies, build for `es2020` browsers (go-gitea#28977)

.eslintrc.yaml

@@ -723,6 +723,7 @@ rules:
   unicorn/no-this-assignment: [2]
   unicorn/no-typeof-undefined: [2]
   unicorn/no-unnecessary-await: [2]
+  unicorn/no-unnecessary-polyfills: [2]
   unicorn/no-unreadable-array-destructuring: [0]
   unicorn/no-unreadable-iife: [2]
   unicorn/no-unused-properties: [2]

.stylelintrc.yaml

@@ -1,7 +1,7 @@
 plugins:
   - stylelint-declaration-strict-value
   - stylelint-declaration-block-no-ignored-properties
-  - stylelint-stylistic
+  - "@stylistic/stylelint-plugin"
 
 ignoreFiles:
   - "**/*.go"
@@ -17,6 +17,82 @@ overrides:
     customSyntax: postcss-html
 
 rules:
+  "@stylistic/at-rule-name-case": null
+  "@stylistic/at-rule-name-newline-after": null
+  "@stylistic/at-rule-name-space-after": null
+  "@stylistic/at-rule-semicolon-newline-after": null
+  "@stylistic/at-rule-semicolon-space-before": null
+  "@stylistic/block-closing-brace-empty-line-before": null
+  "@stylistic/block-closing-brace-newline-after": null
+  "@stylistic/block-closing-brace-newline-before": null
+  "@stylistic/block-closing-brace-space-after": null
+  "@stylistic/block-closing-brace-space-before": null
+  "@stylistic/block-opening-brace-newline-after": null
+  "@stylistic/block-opening-brace-newline-before": null
+  "@stylistic/block-opening-brace-space-after": null
+  "@stylistic/block-opening-brace-space-before": null
+  "@stylistic/color-hex-case": lower
+  "@stylistic/declaration-bang-space-after": never
+  "@stylistic/declaration-bang-space-before": null
+  "@stylistic/declaration-block-semicolon-newline-after": null
+  "@stylistic/declaration-block-semicolon-newline-before": null
+  "@stylistic/declaration-block-semicolon-space-after": null
+  "@stylistic/declaration-block-semicolon-space-before": never
+  "@stylistic/declaration-block-trailing-semicolon": null
+  "@stylistic/declaration-colon-newline-after": null
+  "@stylistic/declaration-colon-space-after": null
+  "@stylistic/declaration-colon-space-before": never
+  "@stylistic/function-comma-newline-after": null
+  "@stylistic/function-comma-newline-before": null
+  "@stylistic/function-comma-space-after": null
+  "@stylistic/function-comma-space-before": null
+  "@stylistic/function-max-empty-lines": 0
+  "@stylistic/function-parentheses-newline-inside": never-multi-line
+  "@stylistic/function-parentheses-space-inside": null
+  "@stylistic/function-whitespace-after": null
+  "@stylistic/indentation": 2
+  "@stylistic/linebreaks": null
+  "@stylistic/max-empty-lines": 1
+  "@stylistic/max-line-length": null
+  "@stylistic/media-feature-colon-space-after": null
+  "@stylistic/media-feature-colon-space-before": never
+  "@stylistic/media-feature-name-case": null
+  "@stylistic/media-feature-parentheses-space-inside": null
+  "@stylistic/media-feature-range-operator-space-after": always
+  "@stylistic/media-feature-range-operator-space-before": always
+  "@stylistic/media-query-list-comma-newline-after": null
+  "@stylistic/media-query-list-comma-newline-before": null
+  "@stylistic/media-query-list-comma-space-after": null
+  "@stylistic/media-query-list-comma-space-before": null
+  "@stylistic/no-empty-first-line": null
+  "@stylistic/no-eol-whitespace": true
+  "@stylistic/no-extra-semicolons": true
+  "@stylistic/no-missing-end-of-source-newline": null
+  "@stylistic/number-leading-zero": null
+  "@stylistic/number-no-trailing-zeros": null
+  "@stylistic/property-case": lower
+  "@stylistic/selector-attribute-brackets-space-inside": null
+  "@stylistic/selector-attribute-operator-space-after": null
+  "@stylistic/selector-attribute-operator-space-before": null
+  "@stylistic/selector-combinator-space-after": null
+  "@stylistic/selector-combinator-space-before": null
+  "@stylistic/selector-descendant-combinator-no-non-space": null
+  "@stylistic/selector-list-comma-newline-after": null
+  "@stylistic/selector-list-comma-newline-before": null
+  "@stylistic/selector-list-comma-space-after": always-single-line
+  "@stylistic/selector-list-comma-space-before": never-single-line
+  "@stylistic/selector-max-empty-lines": 0
+  "@stylistic/selector-pseudo-class-case": lower
+  "@stylistic/selector-pseudo-class-parentheses-space-inside": never
+  "@stylistic/selector-pseudo-element-case": lower
+  "@stylistic/string-quotes": double
+  "@stylistic/unicode-bom": null
+  "@stylistic/unit-case": lower
+  "@stylistic/value-list-comma-newline-after": null
+  "@stylistic/value-list-comma-newline-before": null
+  "@stylistic/value-list-comma-space-after": null
+  "@stylistic/value-list-comma-space-before": null
+  "@stylistic/value-list-max-empty-lines": 0
   alpha-value-notation: null
   annotation-no-unknown: true
   at-rule-allowed-list: null
@@ -137,82 +213,6 @@ rules:
   selector-type-no-unknown: [true, {ignore: [custom-elements]}]
   shorthand-property-no-redundant-values: true
   string-no-newline: true
-  stylistic/at-rule-name-case: null
-  stylistic/at-rule-name-newline-after: null
-  stylistic/at-rule-name-space-after: null
-  stylistic/at-rule-semicolon-newline-after: null
-  stylistic/at-rule-semicolon-space-before: null
-  stylistic/block-closing-brace-empty-line-before: null
-  stylistic/block-closing-brace-newline-after: null
-  stylistic/block-closing-brace-newline-before: null
-  stylistic/block-closing-brace-space-after: null
-  stylistic/block-closing-brace-space-before: null
-  stylistic/block-opening-brace-newline-after: null
-  stylistic/block-opening-brace-newline-before: null
-  stylistic/block-opening-brace-space-after: null
-  stylistic/block-opening-brace-space-before: null
-  stylistic/color-hex-case: lower
-  stylistic/declaration-bang-space-after: never
-  stylistic/declaration-bang-space-before: null
-  stylistic/declaration-block-semicolon-newline-after: null
-  stylistic/declaration-block-semicolon-newline-before: null
-  stylistic/declaration-block-semicolon-space-after: null
-  stylistic/declaration-block-semicolon-space-before: never
-  stylistic/declaration-block-trailing-semicolon: null
-  stylistic/declaration-colon-newline-after: null
-  stylistic/declaration-colon-space-after: null
-  stylistic/declaration-colon-space-before: never
-  stylistic/function-comma-newline-after: null
-  stylistic/function-comma-newline-before: null
-  stylistic/function-comma-space-after: null
-  stylistic/function-comma-space-before: null
-  stylistic/function-max-empty-lines: 0
-  stylistic/function-parentheses-newline-inside: never-multi-line
-  stylistic/function-parentheses-space-inside: null
-  stylistic/function-whitespace-after: null
-  stylistic/indentation: 2
-  stylistic/linebreaks: null
-  stylistic/max-empty-lines: 1
-  stylistic/max-line-length: null
-  stylistic/media-feature-colon-space-after: null
-  stylistic/media-feature-colon-space-before: never
-  stylistic/media-feature-name-case: null
-  stylistic/media-feature-parentheses-space-inside: null
-  stylistic/media-feature-range-operator-space-after: always
-  stylistic/media-feature-range-operator-space-before: always
-  stylistic/media-query-list-comma-newline-after: null
-  stylistic/media-query-list-comma-newline-before: null
-  stylistic/media-query-list-comma-space-after: null
-  stylistic/media-query-list-comma-space-before: null
-  stylistic/no-empty-first-line: null
-  stylistic/no-eol-whitespace: true
-  stylistic/no-extra-semicolons: true
-  stylistic/no-missing-end-of-source-newline: null
-  stylistic/number-leading-zero: null
-  stylistic/number-no-trailing-zeros: null
-  stylistic/property-case: lower
-  stylistic/selector-attribute-brackets-space-inside: null
-  stylistic/selector-attribute-operator-space-after: null
-  stylistic/selector-attribute-operator-space-before: null
-  stylistic/selector-combinator-space-after: null
-  stylistic/selector-combinator-space-before: null
-  stylistic/selector-descendant-combinator-no-non-space: null
-  stylistic/selector-list-comma-newline-after: null
-  stylistic/selector-list-comma-newline-before: null
-  stylistic/selector-list-comma-space-after: always-single-line
-  stylistic/selector-list-comma-space-before: never-single-line
-  stylistic/selector-max-empty-lines: 0
-  stylistic/selector-pseudo-class-case: lower
-  stylistic/selector-pseudo-class-parentheses-space-inside: never
-  stylistic/selector-pseudo-element-case: lower
-  stylistic/string-quotes: double
-  stylistic/unicode-bom: null
-  stylistic/unit-case: lower
-  stylistic/value-list-comma-newline-after: null
-  stylistic/value-list-comma-newline-before: null
-  stylistic/value-list-comma-space-after: null
-  stylistic/value-list-comma-space-before: null
-  stylistic/value-list-max-empty-lines: 0
   time-min-milliseconds: null
   unit-allowed-list: null
   unit-disallowed-list: null

CONTRIBUTING.md

@@ -167,7 +167,7 @@ Here's how to run the test suite:
 
 |  Command                               | Action                                           |              |
 | :------------------------------------- | :----------------------------------------------- | ------------ |
-|``make test[\#SpecificTestName]``       |  run unit test(s)  |
+|``make test[\#SpecificTestName]``       |  run unit test(s)  | |
 |``make test-sqlite[\#SpecificTestName]``|  run [integration](tests/integration) test(s) for SQLite |[More details](tests/integration/README.md)  |
 |``make test-e2e-sqlite[\#SpecificTestName]``|  run [end-to-end](tests/e2e) test(s) for SQLite |[More details](tests/e2e/README.md)  |
 

Makefile

@@ -25,17 +25,17 @@ COMMA := ,
 
 XGO_VERSION := go-1.21.x
 
-AIR_PACKAGE ?= github.com/cosmtrek/air@v1.44.0
+AIR_PACKAGE ?= github.com/cosmtrek/air@v1.49.0
 EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/[email protected]
-GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.5.0
-GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected].0
+GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.6.0
+GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected].2
 GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
 MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/[email protected]
 SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected]
 XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
 GO_LICENSES_PACKAGE ?= github.com/google/[email protected]
-GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/[email protected].1
-ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/[email protected].25
+GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/[email protected].3
+ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/[email protected].26
 
 DOCKER_IMAGE ?= gitea/gitea
 DOCKER_TAG ?= latest

README.md

@@ -178,5 +178,5 @@ Looking for an overview of the interface? Check it out!
 |![Dashboard](https://dl.gitea.com/screenshots/home_timeline.png)|![User Profile](https://dl.gitea.com/screenshots/user_profile.png)|![Global Issues](https://dl.gitea.com/screenshots/global_issues.png)|
 |:---:|:---:|:---:|
 |![Branches](https://dl.gitea.com/screenshots/branches.png)|![Web Editor](https://dl.gitea.com/screenshots/web_editor.png)|![Activity](https://dl.gitea.com/screenshots/activity.png)|
-|![New Migration](https://dl.gitea.com/screenshots/migration.png)|![Migrating](https://dl.gitea.com/screenshots/migration.gif)|![Pull Request View](https://image.ibb.co/e02dSb/6.png)
-![Pull Request Dark](https://dl.gitea.com/screenshots/pull_requests_dark.png)|![Diff Review Dark](https://dl.gitea.com/screenshots/review_dark.png)|![Diff Dark](https://dl.gitea.com/screenshots/diff_dark.png)|
+|![New Migration](https://dl.gitea.com/screenshots/migration.png)|![Migrating](https://dl.gitea.com/screenshots/migration.gif)|![Pull Request View](https://image.ibb.co/e02dSb/6.png)|
+|![Pull Request Dark](https://dl.gitea.com/screenshots/pull_requests_dark.png)|![Diff Review Dark](https://dl.gitea.com/screenshots/review_dark.png)|![Diff Dark](https://dl.gitea.com/screenshots/diff_dark.png)|

README_ZH.md

@@ -98,5 +98,5 @@ Fork -> Patch -> Push -> Pull Request
 |![Dashboard](https://dl.gitea.com/screenshots/home_timeline.png)|![User Profile](https://dl.gitea.com/screenshots/user_profile.png)|![Global Issues](https://dl.gitea.com/screenshots/global_issues.png)|
 |:---:|:---:|:---:|
 |![Branches](https://dl.gitea.com/screenshots/branches.png)|![Web Editor](https://dl.gitea.com/screenshots/web_editor.png)|![Activity](https://dl.gitea.com/screenshots/activity.png)|
-|![New Migration](https://dl.gitea.com/screenshots/migration.png)|![Migrating](https://dl.gitea.com/screenshots/migration.gif)|![Pull Request View](https://image.ibb.co/e02dSb/6.png)
-![Pull Request Dark](https://dl.gitea.com/screenshots/pull_requests_dark.png)|![Diff Review Dark](https://dl.gitea.com/screenshots/review_dark.png)|![Diff Dark](https://dl.gitea.com/screenshots/diff_dark.png)|
+|![New Migration](https://dl.gitea.com/screenshots/migration.png)|![Migrating](https://dl.gitea.com/screenshots/migration.gif)|![Pull Request View](https://image.ibb.co/e02dSb/6.png)|
+|![Pull Request Dark](https://dl.gitea.com/screenshots/pull_requests_dark.png)|![Diff Review Dark](https://dl.gitea.com/screenshots/review_dark.png)|![Diff Dark](https://dl.gitea.com/screenshots/diff_dark.png)|

cmd/admin_user_change_password.go

@@ -32,6 +32,10 @@ var microcmdUserChangePassword = &cli.Command{
 			Value:   "",
 			Usage:   "New password to set for user",
 		},
+		&cli.BoolFlag{
+			Name:  "must-change-password",
+			Usage: "User must change password",
+		},
 	},
 }
 
@@ -69,7 +73,11 @@ func runChangePassword(c *cli.Context) error {
 		return err
 	}
 
-	if err = user_model.UpdateUserCols(ctx, user, "passwd", "passwd_hash_algo", "salt"); err != nil {
+	if c.IsSet("must-change-password") {
+		user.MustChangePassword = c.Bool("must-change-password")
+	}
+
+	if err = user_model.UpdateUserCols(ctx, user, "must_change_password", "passwd", "passwd_hash_algo", "salt"); err != nil {
 		return err
 	}
 

docs/content/administration/command-line.en-us.md

@@ -95,6 +95,7 @@ Admin operations:
       - Options:
         - `--username value`, `-u value`: Username. Required.
         - `--password value`, `-p value`: New password. Required.
+        - `--must-change-password`: If provided, the user is required to choose a new password after the login. Optional.
       - Examples:
         - `gitea admin user change-password --username myname --password asecurepassword`
     - `must-change-password`:

docs/content/usage/packages/alpine.en-us.md

@@ -102,7 +102,7 @@ DELETE https://gitea.example.com/api/packages/{owner}/alpine/{branch}/{repositor
 | `branch`       | The branch to use. |
 | `repository`   | The repository to use. |
 | `architecture` | The package architecture. |
-| `filename`     | The file to delete.
+| `filename`     | The file to delete. |
 
 Example request using HTTP Basic authentication:
 

models/asymkey/gpg_key_verify.go

@@ -63,7 +63,6 @@ func VerifyGPGKey(ctx context.Context, ownerID int64, keyID, token, signature st
 	}
 	if signer == nil {
 		signer, err = hashAndVerifyWithSubKeys(sig, token+"\n", key)
-
 		if err != nil {
 			return "", ErrGPGInvalidTokenSignature{
 				ID:      key.KeyID,

models/user/user.go

@@ -443,6 +443,17 @@ func (u *User) GetDisplayName() string {
 	return u.Name
 }
 
+// GetCompleteName returns the the full name and username in the form of
+// "Full Name (@username)" if full name is not empty, otherwise it returns
+// "@username".
+func (u *User) GetCompleteName() string {
+	trimmedFullName := strings.TrimSpace(u.FullName)
+	if len(trimmedFullName) > 0 {
+		return fmt.Sprintf("%s (@%s)", trimmedFullName, u.Name)
+	}
+	return fmt.Sprintf("@%s", u.Name)
+}
+
 func gitSafeName(name string) string {
 	return strings.TrimSpace(strings.NewReplacer("\n", "", "<", "", ">", "").Replace(name))
 }

modules/lfs/http_client.go

@@ -168,7 +168,6 @@ func (c *HTTPClient) performOperation(ctx context.Context, objects []Pointer, dc
 			}
 
 			err = transferAdapter.Upload(ctx, link, object.Pointer, content)
-
 			if err != nil {
 				return err
 			}

modules/markup/markdown/goldmark.go

@@ -440,7 +440,6 @@ func (r *HTMLRenderer) renderIcon(w util.BufWriter, source []byte, node ast.Node
 
 	var err error
 	_, err = w.WriteString(fmt.Sprintf(`<i class="icon %s"></i>`, name))
-
 	if err != nil {
 		return ast.WalkStop, err
 	}

modules/templates/util_avatar.go

@@ -59,7 +59,7 @@ func (au *AvatarUtils) Avatar(item any, others ...any) template.HTML {
 		}
 	}
 
-	return ""
+	return AvatarHTML(avatars.DefaultAvatarLink(), size, class, "")
 }
 
 // AvatarByAction renders user avatars from action. args: action, size (int), class (string)