diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-06-27 01:59:34 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-06-27 01:59:47 +0300 |
| commit | 615e1807998b986582f3baf08aa3f1693294c52a (patch) | |
| tree | ad9f2a4a3eda54a3b5d28cfb303d4b0bf05dbd75 /lib/gitlab/bitbucket_server_import | |
| parent | a5ca56eeeddc3cc1f1e92608b8b67e917d86837e (diff) | |
More work towards importing pull requests
Diffstat (limited to 'lib/gitlab/bitbucket_server_import')
| -rw-r--r-- | lib/gitlab/bitbucket_server_import/importer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb index dec393f053f..8cb0c7d1b1d 100644 --- a/lib/gitlab/bitbucket_server_import/importer.rb +++ b/lib/gitlab/bitbucket_server_import/importer.rb @@ -97,9 +97,9 @@ module Gitlab end def import_pull_request_comments(pull_request, merge_request) - comments = client.pull_request_comments(repo, pull_request.iid) + comments = client.activities(repo, pull_request.iid).select(&:commment?) - inline_comments, pr_comments = comments.partition(&:inline?) + inline_comments, pr_comments = comments.partition(&:inline_comment?) import_inline_comments(inline_comments, pull_request, merge_request) import_standalone_pr_comments(pr_comments, merge_request) |