diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-09 21:25:30 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-02-15 10:42:56 -0500 |
| commit | 414d695db74e1a237aac7e0ca6a2543e7be1510e (patch) | |
| tree | 216a3a3063ff3ea09e95658c188a4311e26f82ca /lib | |
| parent | dd944bf14f4a0fd555db32d5833325fa459d9565 (diff) | |
| download | gitlab-ce-414d695db74e1a237aac7e0ca6a2543e7be1510e.tar.gz | |
Merge branch 'fix-github-import-MR-wrong-project' into 'security'
Fix labels being applied to wrong merge requests on GitHub import
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/github_import/importer.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb index ec1318ab33c..9a4ffd28438 100644 --- a/lib/gitlab/github_import/importer.rb +++ b/lib/gitlab/github_import/importer.rb @@ -115,7 +115,7 @@ module Gitlab begin issuable = if gh_issue.pull_request? - MergeRequest.find_by_iid(gh_issue.number) + MergeRequest.find_by(target_project_id: project.id, iid: gh_issue.number) else gh_issue.create! end @@ -212,8 +212,12 @@ module Gitlab comment = CommentFormatter.new(project, raw) # GH does not return info about comment's parent, so we guess it by checking its URL! *_, parent, iid = URI(raw.html_url).path.split('/') - issuable_class = parent == 'issues' ? Issue : MergeRequest - issuable = issuable_class.find_by_iid(iid) + if parent == 'issues' + issuable = Issue.find_by(project_id: project.id, iid: iid) + else + issuable = MergeRequest.find_by(target_project_id: project.id, iid: iid) + end + next unless issuable issuable.notes.create!(comment.attributes) |