Merge branch 'main' into fix-team-permission-when-create-or-edit

Author: 6543

CHANGELOG.md

@@ -4,7 +4,96 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
-## [1.19.0](https://github.com/go-gitea/gitea/releases/tag/1.19.0) - 2023-03-19
+## [1.19.1](https://github.com/go-gitea/gitea/releases/tag/v1.19.1) - 2023-04-12
+
+* BREAKING
+  * Rename actions unit to `repo.actions` and add docs for it (#23733) (#23881)
+* ENHANCEMENTS
+  * Add card type to org/user level project on creation, edit and view (#24043) (#24066)
+  * Refactor commit status for Actions jobs (#23786) (#24060)
+  * Show errors for KaTeX and mermaid on the preview tab (#24009) (#24019)
+  * Show protected branch rule names again (#23907) (#24018)
+  * Adjust sticky PR header to cover background (#23956) (#23999)
+  * Discolor pull request tab labels (#23950) (#23987)
+  * Treat PRs with agit flow as fork PRs when triggering actions. (#23884) (#23967)
+  * Left-align review comments (#23937)
+  * Fix image border-radius (#23886) (#23930)
+  * Scroll collapsed file into view (#23702) (#23929)
+  * Fix code view (diff) broken layout (#23096) (#23918)
+  * Org pages style fixes (#23901) (#23914)
+  * Fix user profile description rendering (#23882) (#23902)
+  * Fix review box viewport overflow issue (#23800) (#23898)
+  * Prefill input values in OAuth settings as intended (#23829) (#23871)
+  * CSS color tweaks (#23828) (#23842)
+  * Fix incorrect visibility dropdown list in add/edit user page (#23804) (#23833)
+  * Add CSS rules for basic colored labels (#23774) (#23777)
+  * Add creation time in tag list page (#23693) (#23773)
+  * Fix br display for packages curls (#23737) (#23764)
+  * Fix issue due date edit toggle bug (#23723) (#23758)
+  * Improve commit graph page UI alignment (#23751) (#23754)
+  * Use GitHub Actions compatible globbing for `branches`, `tag`, `path` filter (#22804) (#23740)
+  * Redirect to project again after editing it (#23326) (#23739)
+  * Remove row clicking from notification table (#22695) (#23706)
+  * Remove conflicting CSS rules on notifications, improve notifications table (#23565) (#23621)
+  * Fix diff tree height and adjust target file style (#23616)
+* BUGFIXES
+  * Improve error logging for LFS (#24072) (#24082)
+  * Fix custom mailer template on Windows platform (#24081)
+  * Update the value of `diffEnd` when clicking the `Show More` button in the DiffFileTree (#24069) (#24078)
+  * Make label templates have consistent behavior and priority (#23749)
+  * Fix accidental overwriting of LDAP team memberships (#24050) (#24065)
+  * Fix branch protection priority (#24045) (#24061)
+  * Use actions job link as commit status URL instead of run link (#24023) (#24032)
+  * Add actions support to package auth verification (#23729) (#24028)
+  * Fix protected branch for API (#24013) (#24027)
+  * Do not escape space between PyPI repository URL and package name… (#23981) (#24008)
+  * Fix redirect bug when creating issue from a project (#23971) (#23997)
+  * Set `ref` to fully-formed of the tag when trigger event is `release` (#23944) (#23989)
+  * Use Get/Set instead of Rename when regenerating session ID (#23975) (#23983)
+  * Ensure RSS icon is present on all repo tabs (#23904) (#23973)
+  * Remove `Repository.getFilesChanged` to fix Actions `paths` and `paths-ignore` filter (#23920) (#23969)
+  * Delete deleted release attachments immediately from storage (#23913) (#23958)
+  * Use ghost user if package creator does not exist (#23822) (#23915)
+  * User/Org Feed render description as per web (#23887) (#23906)
+  * Fix `cases.Title` crash for concurrency (#23885) (#23903)
+  * Convert .Source.SkipVerify to $cfg.SkipVerify (#23839) (#23899)
+  * Support "." char as user name for User/Orgs in RSS/ATOM/GPG/KEYS path ... (#23874) (#23878)
+  * Fix JS error when changing PR's target branch (#23862) (#23864)
+  * Fix 500 error if there is a name conflict when editing authentication source (#23832) (#23852)
+  * Fix closed PR also triggers Webhooks and actions (#23782) (#23834)
+  * Fix checks for `needs` in Actions (#23789) (#23831)
+  * Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (#23790) (#23825)
+  * Fix cancel button in the page of project edit not work (#23655) (#23813)
+  * Don't apply the group filter when listing LDAP group membership if it is empty (#23745) (#23788)
+  * Fix profile page email display, respect settings (#23747) (#23756)
+  * Fix project card preview select and template select (#23684) (#23731)
+  * Check LFS/Packages settings in dump and doctor command (#23631) (#23730)
+  * Add git dashes separator to some "log" and "diff" commands (#23606) (#23720)
+  * Create commit status when event is `pull_request_sync` (#23683) (#23691)
+  * Fix incorrect `HookEventType` of pull request review comments (#23650) (#23678)
+  * Fix incorrect `show-modal` and `show-panel` class (#23660) (#23663)
+  * Improve workflow event triggers (#23613) (#23648)
+  * Introduce path Clean/Join helper functions, partially backport&refactor (#23495) (#23607)
+  * Fix pagination on `/notifications/watching` (#23564) (#23603)
+  * Fix submodule is nil panic (#23588) (#23601)
+  * Polyfill the window.customElements (#23592) (#23595)
+  * Avoid too long names for actions (#23162) (#23190)
+* TRANSLATION
+  * Backport locales (with manual fixes) (#23808, #23634, #24083)
+* BUILD
+  * Hardcode the path to docker images (#23955) (#23968)
+* DOCS
+  * Update documentation to explain which projects allow Gitea to host static pages (#23993) (#24058)
+  * Merge `push to create`, `open PR from push`, and `push options` docs articles into one (#23744) (#23959)
+  * Fix code blocks in the cheat sheet (#23664) (#23669)
+* MISC
+  * Do not crash when parsing an invalid workflow file (#23972) (#23976)
+  * Remove assertion debug code for show/hide refactoring (#23576) (#23868)
+  * Add ONLY_SHOW_RELEVANT_REPOS back, fix explore page bug, make code more strict (#23766) (#23791)
+  * Make minio package support legacy MD5 checksum (#23768) (#23770)
+  * Improve template error reporting (#23396) (#23600)
+
+## [1.19.0](https://github.com/go-gitea/gitea/releases/tag/v1.19.0) - 2023-03-19
 
 * BREAKING
   * Add loading yaml label template files (#22976) (#23232)

custom/conf/app.example.ini

@@ -603,7 +603,7 @@ ROUTER = console
 ;ACCESS = file
 ;;
 ;; Sets the template used to create the access log.
-;ACCESS_LOG_TEMPLATE = {{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"
+;ACCESS_LOG_TEMPLATE = {{.Ctx.RemoteHost}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}" "{{.Ctx.Req.UserAgent}}"
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;

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

@@ -878,7 +878,7 @@ Default templates for project boards:
 
 - `ENABLE_ACCESS_LOG`: **false**: Creates an access.log in NCSA common log format, or as per the following template
 - `ACCESS`: **file**: Logging mode for the access logger, use a comma to separate values. Configure each mode in per mode log subsections `\[log.modename.access\]`. By default the file mode will log to `$ROOT_PATH/access.log`. (If you set this to `,` it will log to the default Gitea logger.)
-- `ACCESS_LOG_TEMPLATE`: **`{{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"`**: Sets the template used to create the access log.
+- `ACCESS_LOG_TEMPLATE`: **`{{.Ctx.RemoteHost}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}" "{{.Ctx.Req.UserAgent}}"`**: Sets the template used to create the access log.
   - The following variables are available:
   - `Ctx`: the `context.Context` of the request.
   - `Identity`: the SignedUserName or `"-"` if not logged in.

docs/content/doc/administration/config-cheat-sheet.zh-cn.md

@@ -265,7 +265,7 @@ test01.xls: application/vnd.ms-excel; charset=binary
 - `LEVEL`: 日志级别，默认为 `Trace`。
 - `DISABLE_ROUTER_LOG`: 关闭日志中的路由日志。
 - `ENABLE_ACCESS_LOG`: 是否开启 Access Log, 默认为 false。
-- `ACCESS_LOG_TEMPLATE`: `access.log` 输出内容的模板，默认模板：**`{{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"`**
+- `ACCESS_LOG_TEMPLATE`: `access.log` 输出内容的模板，默认模板：**`{{.Ctx.RemoteHost}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}" "{{.Ctx.Req.UserAgent}}"`**
   模板支持以下参数:
   - `Ctx`: 请求上下文。
   - `Identity`: 登录用户名，默认: “`-`”。

docs/content/doc/administration/logging-documentation.en-us.md

@@ -304,7 +304,7 @@ log using the value: `ACCESS = ,`
 
 This value represent a go template. It's default value is:
 
-`{{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"`
+`{{.Ctx.RemoteHost}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}" "{{.Ctx.Req.UserAgent}}"`
 
 The template is passed following options:
 

modules/context/access_log.go

@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"net"
 	"net/http"
 	"strings"
 	"text/template"
@@ -67,17 +68,23 @@ func AccessLogger() func(http.Handler) http.Handler {
 				requestID = parseRequestIDFromRequestHeader(req)
 			}
 
+			reqHost, _, err := net.SplitHostPort(req.RemoteAddr)
+			if err != nil {
+				reqHost = req.RemoteAddr
+			}
+
 			next.ServeHTTP(w, r)
 			rw := w.(ResponseWriter)
 
 			buf := bytes.NewBuffer([]byte{})
-			err := logTemplate.Execute(buf, routerLoggerOptions{
+			err = logTemplate.Execute(buf, routerLoggerOptions{
 				req:            req,
 				Identity:       &identity,
 				Start:          &start,
 				ResponseWriter: rw,
 				Ctx: map[string]interface{}{
 					"RemoteAddr": req.RemoteAddr,
+					"RemoteHost": reqHost,
 					"Req":        req,
 				},
 				RequestID: &requestID,

modules/setting/log.go

@@ -152,7 +152,7 @@ func loadLogFrom(rootCfg ConfigProvider) {
 	Log.EnableSSHLog = sec.Key("ENABLE_SSH_LOG").MustBool(false)
 	Log.EnableAccessLog = sec.Key("ENABLE_ACCESS_LOG").MustBool(false)
 	Log.AccessLogTemplate = sec.Key("ACCESS_LOG_TEMPLATE").MustString(
-		`{{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"`,
+		`{{.Ctx.RemoteHost}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}" "{{.Ctx.Req.UserAgent}}"`,
 	)
 	Log.RequestIDHeaders = sec.Key("REQUEST_ID_HEADERS").Strings(",")
 	// the `MustString` updates the default value, and `log.ACCESS` is used by `generateNamedLogger("access")` later