diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-14 10:06:32 +0300 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-14 10:06:32 +0300 |
| commit | 286a593849d1ee1b9908fd924d8272a5e03375df (patch) | |
| tree | 2c451fe9bf4d6e2fa9cc327372f9d6ca357bfcb0 /lib | |
| parent | 56c365bde8da581d2a3a8973bc60ed1b8f0e502e (diff) | |
| parent | 265e52bb80bda8bb5c894a69716d795620fd27a3 (diff) | |
Merge branch 'gitea_import_ignore_pull_request_comments' into 'master'
Don't import pull request comments from Gitea repos
Closes #63071
See merge request gitlab-org/gitlab-ce!29521
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/legacy_github_import/importer.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/legacy_github_import/importer.rb b/lib/gitlab/legacy_github_import/importer.rb index 70b18221a66..751726d4810 100644 --- a/lib/gitlab/legacy_github_import/importer.rb +++ b/lib/gitlab/legacy_github_import/importer.rb @@ -55,7 +55,12 @@ module Gitlab import_pull_requests import_issues import_comments(:issues) - import_comments(:pull_requests) + + # Gitea doesn't have an API endpoint for pull requests comments + unless project.gitea_import? + import_comments(:pull_requests) + end + import_wiki # Gitea doesn't have a Release API yet |