Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-01-05 20:15:36 +0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-01-05 20:24:55 +0300
commit837a9065f0ff192d2efd55edcc2658a92c127b21 (patch)
tree5a2629b73e822221b91c368dc0d01cf3f8795fb7 /lib
parent2dc74b48a32c64b18ca684e3adfb51ab9d87cf2b (diff)
Ensure that we're only importing local pull requests
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/github_import/importer.rb2
-rw-r--r--lib/gitlab/github_import/pull_request_formatter.rb8
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 38ca7372202..2b0afbc7b39 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -42,7 +42,7 @@ module Gitlab
direction: :asc).each do |raw_data|
pull_request = PullRequestFormatter.new(project, raw_data)
- if pull_request.valid?
+ if !pull_request.cross_project? && pull_request.valid?
merge_request = MergeRequest.create!(pull_request.attributes)
import_comments(pull_request.number, merge_request)
import_comments_on_diff(pull_request.number, merge_request)
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index 42dc09c2ac5..b7c47958cc7 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -17,6 +17,10 @@ module Gitlab
}
end
+ def cross_project?
+ source_repo.fork == true
+ end
+
def number
raw_data.number
end
@@ -57,6 +61,10 @@ module Gitlab
project
end
+ def source_repo
+ raw_data.head.repo
+ end
+
def source_branch
source_project.repository.find_branch(raw_data.head.ref)
end