Merge remote-tracking branch 'upstream/main'

* upstream/main: (24 commits) Update zh-cn documentation (go-gitea#26406) Fix NuGet search endpoints (go-gitea#25613) Fix tooltip of commit select button (go-gitea#26472) fix grab cursor on default column (go-gitea#26476) Fix storage path logic especially for relative paths (go-gitea#26441) Rename `Sync2` -> `Sync` (go-gitea#26479) Add ThreadID parameter for Telegram webhooks (go-gitea#25996) Fix stderr usages (go-gitea#26477) Use correct pull request commit link instead of a generic commit link (go-gitea#26434) Close stdout correctly for "git blame" (go-gitea#26470) Refactor tests (go-gitea#26464) Remove last newline from config file (go-gitea#26468) Add matrix to support (go-gitea#26382) Refactor project templates (go-gitea#26448) Avoiding accessing undefined mentionValues (go-gitea#26461) Tweak actions menu (go-gitea#26278) Adjust minio new sequence, now it will check whether bucket exist first and then create one if it doesn't exist (go-gitea#26420) Set commit id when ref used explicitly (go-gitea#26447) Fix 404 error when remove self from an organization (go-gitea#26362) Update index doc (go-gitea#26455) ...
zjjhot · Aug 14, 2023 · 295d726 · 295d726
2 parents 6397195 + db7b0a1
commit 295d726
Show file tree

Hide file tree

Showing 205 changed files with 2,895 additions and 2,186 deletions.
diff --git a/cmd/admin_user_create.go b/cmd/admin_user_create.go
@@ -6,7 +6,6 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"os"
 
 	auth_model "code.gitea.io/gitea/models/auth"
 	user_model "code.gitea.io/gitea/models/user"
@@ -87,7 +86,7 @@ func runCreateUser(c *cli.Context) error {
 		username = c.String("username")
 	} else {
 		username = c.String("name")
-		fmt.Fprintf(os.Stderr, "--name flag is deprecated. Use --username instead.\n")
+		_, _ = fmt.Fprintf(c.App.ErrWriter, "--name flag is deprecated. Use --username instead.\n")
 	}
 
 	ctx, cancel := installSignals()

diff --git a/cmd/web.go b/cmd/web.go
@@ -208,8 +208,8 @@ func serveInstalled(ctx *cli.Context) error {
 	}
 
 	// Set up Chi routes
-	c := routers.NormalRoutes()
-	err := listen(c, true)
+	webRoutes := routers.NormalRoutes()
+	err := listen(webRoutes, true)
 	<-graceful.GetManager().Done()
 	log.Info("PID: %d Gitea Web Finished", os.Getpid())
 	log.GetManager().Close()

diff --git a/docs/content/administration/command-line.en-us.md b/docs/content/administration/command-line.en-us.md
@@ -403,7 +403,7 @@ Sometimes when there are migrations the old columns and default values may be le
 unchanged in the database schema. This may lead to warning such as:
 
 ```
-2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync2() [W] Table user Column keep_activity_private db default is , struct default is 0
+2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync() [W] Table user Column keep_activity_private db default is , struct default is 0
 ```
 
 You can cause Gitea to recreate these tables and copy the old data into the new table

diff --git a/docs/content/administration/command-line.zh-cn.md b/docs/content/administration/command-line.zh-cn.md
@@ -375,7 +375,7 @@ AuthorizedKeysCommand /path/to/gitea keys -e git -u %u -t %t -k %k
 有时，在迁移时，旧的列和默认值可能会在数据库模式中保持不变。这可能会导致警告，如下所示:
 
 ```
-2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync2() [W] Table user Column keep_activity_private db default is , struct default is 0
+2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync() [W] Table user Column keep_activity_private db default is , struct default is 0
 ```
 
 您可以通过以下方式让 Gitea 重新创建这些表，并将旧数据复制到新表中，并适当设置默认值：

diff --git a/docs/content/administration/config-cheat-sheet.zh-cn.md b/docs/content/administration/config-cheat-sheet.zh-cn.md
diff --git a/docs/content/help/faq.en-us.md b/docs/content/help/faq.en-us.md
@@ -410,7 +410,7 @@ Sometimes when there are migrations the old columns and default values may be le
 unchanged in the database schema. This may lead to warning such as:
 
 ```
-2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync2() [W] Table user Column keep_activity_private db default is , struct default is 0
+2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync() [W] Table user Column keep_activity_private db default is , struct default is 0
 ```
 
 These can safely be ignored, but you are able to stop these warnings by getting Gitea to recreate these tables using:

diff --git a/docs/content/help/faq.zh-cn.md b/docs/content/help/faq.zh-cn.md
@@ -424,7 +424,7 @@ SystemD 上的标准输出默认会写入日志记录中。您可以尝试使用
 这可能会导致警告，例如：
 
 ```
-2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync2() [W] Table user Column keep_activity_private db default is , struct default is 0
+2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync() [W] Table user Column keep_activity_private db default is , struct default is 0
 ```
 
 可以安全地忽略这些警告，但您可以通过让 Gitea 重新创建这些表来停止这些警告，使用以下命令：

diff --git a/docs/content/help/support.en-us.md b/docs/content/help/support.en-us.md
@@ -20,6 +20,8 @@ menu:
 - [Paid Commercial Support](https://about.gitea.com/)
 - [Discord](https://discord.gg/Gitea)
 - [Discourse Forum](https://discourse.gitea.io/)
+- [Matrix](https://matrix.to/#/#gitea-space:matrix.org)
+  - NOTE: Most of the Matrix channels are bridged with their counterpart in Discord and may experience some degree of flakiness with the bridge process.
 
 **NOTE:** When asking for support, it may be a good idea to have the following available so that the person helping has all the info they need:
 

diff --git a/docs/content/index.en-us.md b/docs/content/index.en-us.md
@@ -25,244 +25,27 @@ You can try it out using [the online demo](https://try.gitea.io/).
 
 ## Features
 
-- User Dashboard
-  - Context switcher (organization or current user)
-  - Activity timeline
-    - Commits
-    - Issues
-    - Pull requests
-    - Repository creation
-  - Searchable repository list
-  - List of organizations
-  - A list of mirror repositories
-- Issues dashboard
-  - Context switcher (organization or current user)
-  - Filter by
-    - Open
-    - Closed
-    - Your repositories
-    - Assigned issues
-    - Your issues
-    - Repository
-  - Sort by
-    - Oldest
-    - Last updated
-    - Number of comments
-- Pull request dashboard
-  - Same as issue dashboard
-- Repository types
-  - Mirror
-  - Normal
-  - Migrated
-- Notifications (email and web)
-  - Read
-  - Unread
-  - Pin
-- Explore page
-  - Users
-  - Repos
-  - Organizations
-  - Search
-- Custom templates
-- Override public files (logo, css, etc)
-- CSRF and XSS protection
-- HTTPS support
-- Set allowed upload sizes and types
-- Logging
-- Configuration
-  - Databases
-    - MySQL (>=5.7)
-    - PostgreSQL (>=10)
-    - SQLite3
-    - MSSQL (>=2008R2 SP3)
-    - TiDB (MySQL protocol)
-  - Configuration file
-    - [app.ini](https://github.com/go-gitea/gitea/blob/main/custom/conf/app.example.ini)
-  - Admin panel
-    - Statistics
-    - Actions
-      - Delete inactive accounts
-      - Delete cached repository archives
-      - Delete repositories records which are missing their files
-      - Run garbage collection on repositories
-      - Rewrite SSH keys
-      - Resync hooks
-      - Recreate repositories which are missing
-    - Server status
-      - Uptime
-      - Memory
-      - Current # of goroutines
-      - And more
-    - User management
-      - Search
-      - Sort
-      - Last login
-      - Authentication source
-      - Maximum repositories
-      - Disable account
-      - Admin permissions
-      - Permission to create Git Hooks
-      - Permission to create organizations
-      - Permission to import repositories
-    - Organization management
-      - Members
-      - Teams
-      - Avatar
-      - Hooks
-    - Repository management
-      - See all repository information and manage repositories
-    - Authentication sources
-      - OAuth
-      - PAM
-      - LDAP
-      - SMTP
-    - Configuration viewer
-      - Everything in config file
-    - System notices
-      - When something unexpected happens
-    - Monitoring
-      - Current processes
-      - Cron jobs
-        - Update mirrors
-        - Repository health check
-        - Check repository statistics
-        - Clean up old archives
-  - Environment variables
-  - Command line options
-- Multi-language support ([21 languages](https://github.com/go-gitea/gitea/tree/main/options/locale))
-- [Mermaid](https://mermaidjs.github.io/) diagrams in Markdown
-- Math syntax in Markdown
-- Mail service
-  - Notifications
-  - Registration confirmation
-  - Password reset
-- Reverse proxy support
-  - Includes subpaths
-- Users
-  - Profile
-    - Name
-    - Username
-    - Email
-    - Website
-    - Join date
-    - Followers and following
-    - Organizations
-    - Repositories
-    - Activity
-    - Starred repositories
-  - Settings
-    - Same as profile and more below
-    - Keep email private
-    - Avatar
-      - Gravatar
-      - Libravatar
-      - Custom
-    - Password
-    - Multiple email addresses
-    - SSH Keys
-    - Connected applications
-    - Two factor authentication
-    - Linked OAuth2 sources
-    - Delete account
-- Repositories
-  - Clone with SSH/HTTP/HTTPS
-  - Git LFS
-  - Watch, Star, Fork
-  - View watchers, stars, and forks
-  - Code
-    - Branch browser
-    - Web based file upload and creation
-    - Clone urls
-    - Download
-      - ZIP
-      - TAR.GZ
-    - Web based editor
-      - Markdown editor
-      - Plain text editor
-        - Syntax highlighting
-      - Diff preview
-      - Preview
-      - Choose where to commit to
-    - View file history
-    - Delete file
-    - View raw
-  - Issues
-    - Issue templates
-    - Milestones
-    - Labels
-    - Assign issues
-    - Track time
-    - Reactions
-    - Filter
-      - Open
-      - Closed
-      - Assigned person
-      - Created by you
-      - Mentioning you
-    - Sort
-      - Oldest
-      - Last updated
-      - Number of comments
-    - Search
-    - Comments
-    - Attachments
-  - Pull requests
-    - Same features as issues
-  - Commits
-    - Commit graph
-    - Commits by branch
-    - Search
-    - Search in all branches
-    - View diff
-    - View SHA
-    - View author
-    - Browse files in commit
-  - Releases
-    - Attachments
-    - Title
-    - Content
-    - Delete
-    - Mark as pre-release
-    - Choose branch
-  - Wiki
-    - Import
-    - Markdown editor
-  - Settings
-    - Options
-      - Name
-      - Description
-      - Private/Public
-      - Website
-      - Wiki
-        - Enabled/disabled
-        - Internal/external
-      - Issues
-        - Enabled/disabled
-        - Internal/external
-        - External supports url rewriting for better integration
-      - Enable/disable pull requests
-      - Transfer repository
-      - Delete wiki
-      - Delete repository
-    - Collaboration
-      - Read/write/admin
-    - Branches
-      - Default branch
-      - Branch protection
-    - Webhooks
-    - Git Hooks
-    - Deploy keys
-- Package Registries
-  - Composer
-  - Conan
-  - Container
-  - Generic
-  - Helm
-  - Maven
-  - NPM
-  - Nuget
-  - PyPI
-  - RubyGems
+- Code Hosting: Gitea supports creating and managing repositories, browsing commit history and code files, reviewing and merging code submissions, managing collaborators, handling branches, and more. It also supports many common Git features such as tags, Cherry-pick, hooks, integrated collaboration tools, and more.
+
+- Lightweight and Fast: One of Gitea's design goals is to be lightweight and fast in response. Unlike some large code hosting platforms, it remains lean, performing well in terms of speed, and is suitable for resource-limited server environments. Due to its lightweight design, Gitea has relatively low resource consumption and performs well in resource-constrained environments.
+
+- Easy Deployment and Maintenance: It can be easily deployed on various servers without complex configurations or dependencies. This makes it convenient for individual developers or small teams to set up and manage their own Git services.
+
+- Security: Gitea places a strong emphasis on security, offering features such as user permission management, access control lists, and more to ensure the security of code and data.
+
+- Code Review: Code review supports both the Pull Request workflow and AGit workflow. Reviewers can browse code online and provide review comments or feedback. Submitters can receive review comments and respond or modify code online. Code reviews can help individuals and organizations enhance code quality.
+
+- CI/CD: Gitea Actions supports CI/CD functionality, compatible with GitHub Actions. Users can write workflows in familiar YAML format and reuse a variety of existing Actions plugins. Actions plugins support downloading from any Git website.
+
+- Project Management: Gitea tracks project requirements, features, and bugs through boards and issues. Issues support features like branches, tags, milestones, assignments, time tracking, due dates, dependencies, and more.
+
+- Artifact Repository: Gitea supports over 20 different types of public or private software package management, including Cargo, Chef, Composer, Conan, Conda, Container, Helm, Maven, npm, NuGet, Pub, PyPI, RubyGems, Vagrant, and more.
+
+- Open Source Community Support: Gitea is an open-source project based on the MIT license. It has an active open-source community that continuously develops and improves the platform. The project also actively welcomes community contributions, ensuring updates and innovation.
+
+- Multilingual Support: Gitea provides interfaces in multiple languages, catering to users globally and promoting internationalization and localization.
+
+Additional Features: For more detailed information, please refer to: https://docs.gitea.com/installation/comparison#general-features
 
 ## System Requirements