aboutsummaryrefslogtreecommitdiffstats
path: root/docs/content/doc
diff options
context:
space:
mode:
authorClaudius Ellsel <claudius.ellsel@live.de>2020-10-03 00:08:17 +0200
committerGitHub <noreply@github.com>2020-10-02 18:08:17 -0400
commit45727c32c3faeedf253f0f5209e50652ad5a3939 (patch)
treecf48eeb456e5e211aaf02fa1b069d7b8b9320250 /docs/content/doc
parent54091e074cfdedba71c8242994eed29ac70163c9 (diff)
downloadgitea-45727c32c3faeedf253f0f5209e50652ad5a3939.tar.gz
gitea-45727c32c3faeedf253f0f5209e50652ad5a3939.zip
Update comparison for GitLab CE (#13019)
* Update comparison for GitLab CE Fixes #13018. * Update docs/content/doc/features/comparison.en-us.md Co-authored-by: mrsdizzie <info@mrsdizzie.com> * Update comparison.en-us.md According to the linked issue it is there and just the documentation is lacking. * Update docs/content/doc/features/comparison.en-us.md Co-authored-by: techknowlogick <matti@mdranta.net> * Update docs/content/doc/features/comparison.en-us.md Co-authored-by: techknowlogick <matti@mdranta.net> Co-authored-by: mrsdizzie <info@mrsdizzie.com> Co-authored-by: techknowlogick <matti@mdranta.net>
Diffstat (limited to 'docs/content/doc')
-rw-r--r--docs/content/doc/features/comparison.en-us.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/content/doc/features/comparison.en-us.md b/docs/content/doc/features/comparison.en-us.md
index dae530438b..2a622a4b39 100644
--- a/docs/content/doc/features/comparison.en-us.md
+++ b/docs/content/doc/features/comparison.en-us.md
@@ -79,7 +79,7 @@ _Symbols used in table:_
| Labels | ✓ | ✓ | ✓ | ✓ | ✓ | ✘ | ✘ |
| Time tracking | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
| Multiple assignees for issues | ✓ | ✘ | ✓ | ✘ | ✓ | ✘ | ✘ |
-| Related issues | ✘ | ✘ | ⁄ | ✘ | ✓ | ✘ | ✘ |
+| Related issues | ✘ | ✘ | ⁄ | [✓](https://docs.gitlab.com/ce/user/project/issues/related_issues.html) | ✓ | ✘ | ✘ |
| Confidential issues | [✘](https://github.com/go-gitea/gitea/issues/3217) | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
| Comment reactions | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
| Lock Discussion | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
@@ -90,14 +90,14 @@ _Symbols used in table:_
| Global issue search | [✘](https://github.com/go-gitea/gitea/issues/2434) | ✘ | ✓ | ✓ | ✓ | ✓ | ✘ |
| Issue dependency | ✓ | ✘ | ✘ | ✘ | ✘ | ✘ | ✘ |
| Create issue via email | [✘](https://github.com/go-gitea/gitea/issues/6226) | [✘](https://github.com/gogs/gogs/issues/2602) | ✘ | ✘ | ✓ | ✓ | ✘ |
-| Service Desk | [✘](https://github.com/go-gitea/gitea/issues/6219) | ✘ | ✘ | ✘ | ✓ | ✘ | ✘ |
+| Service Desk | [✘](https://github.com/go-gitea/gitea/issues/6219) | ✘ | ✘ | [✓](https://gitlab.com/groups/gitlab-org/-/epics/3103) | ✓ | ✘ | ✘ |
#### Pull/Merge requests
| Feature | Gitea | Gogs | GitHub EE | GitLab CE | GitLab EE | BitBucket | RhodeCode CE |
|---------|-------|------|-----------|-----------|-----------|-----------|--------------|
| Pull/Merge requests | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
-| Squash merging | ✓ | ✘ | ✓ | ✘ | ✓ | ✓ | ✓ |
+| Squash merging | ✓ | ✘ | ✓ | [✓](https://docs.gitlab.com/ce/user/project/merge_requests/squash_and_merge.html) | ✓ | ✓ | ✓ |
| Rebase merging | ✓ | ✓ | ✓ | ✘ | ⁄ | ✘ | ✓ |
| Pull/Merge request inline comments | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Pull/Merge request approval | ✓ | ✘ | ⁄ | ✓ | ✓ | ✓ | ✓ |