Merge remote-tracking branch 'upstream/main'

* upstream/main: [skip ci] Updated translations via Crowdin Add extra features to product comparison (go-gitea#23638)
zjjhot · Mar 23, 2023 · 795e9d1 · 795e9d1
2 parents 7095008 + 1d35fa0
commit 795e9d1
Show file tree

Hide file tree

Showing 3 changed files with 263 additions and 67 deletions.
diff --git a/docs/content/doc/features/comparison.en-us.md b/docs/content/doc/features/comparison.en-us.md
@@ -118,12 +118,15 @@ _Symbols used in table:_
 | Rebase merging                                  | ✓                                                  | ✓    | ✓         | ✓         | ✓         | ✓         | ✓            |
 | Pull/Merge request inline comments              | ✓                                                  | ✘    | ✓         | ✓         | ✓         | ✓         | ✓            |
 | Pull/Merge request approval                     | ✓                                                  | ✘    | ✓         | ✓         | ✓         | ✓         | ✓            |
+| Pull/Merge require approval                     | ✓                                                  | ✘    | ✓         | ✘         | ✓         | ✓         | ✓            |
+| Pull/Merge multiple reviewers                   | ✓                                                  | ✓    | ✓         | ✘         | ✓         | ✓         | ✓            |
 | Merge conflict resolution                       | [✘](https://github.com/go-gitea/gitea/issues/9014) | ✘    | ✓         | ✓         | ✓         | ✓         | ✘            |
 | Restrict push and merge access to certain users | ✓                                                  | ✘    | ✓         | ✓         | ✓         | ✓         | ✓            |
 | Revert specific commits                         | ✓                                                  | ✘    | ✓         | ✓         | ✓         | ✓         | ✘            |
 | Pull/Merge requests templates                   | ✓                                                  | ✓    | ✓         | ✓         | ✓         | ✘         | ✘            |
 | Cherry-picking changes                          | ✓                                                  | ✘    | ✘         | ✓         | ✓         | ✘         | ✘            |
 | Download Patch                                  | ✓                                                  | ✘    | ✓         | ✓         | ✓         | /         | ✘            |
+| Merge queues                                    | ✘                                                  | ✘    | ✓         | ✘         | ✓         | ✘         | ✘            |
 
 ## 3rd-party integrations