diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-03-25 13:34:41 +0000 |
---|---|---|
committer | John Jarvis <jarv@gitlab.com> | 2019-03-25 15:16:46 +0100 |
commit | 7a83fbef76556be8fe9b4db8e98ad2bd60b13c48 (patch) | |
tree | c40a33795d4b1e2e5af1b39f2c111fc38271f09e /lib | |
parent | 8fbdecff94de50afd0f335b444bc7bffa3ba7b8c (diff) | |
download | gitlab-ce-7a83fbef76556be8fe9b4db8e98ad2bd60b13c48.tar.gz |
Merge branch 'sh-fix-github-import-creator' into 'master'
GitHub importer: Use the project creator to create branches from forks
Closes #59396
See merge request gitlab-org/gitlab-ce!26510
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/github_import/importer/pull_request_importer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/github_import/importer/pull_request_importer.rb b/lib/gitlab/github_import/importer/pull_request_importer.rb index 72451e5e01e..1b293ddc7c7 100644 --- a/lib/gitlab/github_import/importer/pull_request_importer.rb +++ b/lib/gitlab/github_import/importer/pull_request_importer.rb @@ -89,7 +89,7 @@ module Gitlab return if project.repository.branch_exists?(source_branch) - project.repository.add_branch(project.owner, source_branch, pull_request.source_branch_sha) + project.repository.add_branch(project.creator, source_branch, pull_request.source_branch_sha) rescue Gitlab::Git::CommandError => e Gitlab::Sentry.track_acceptable_exception(e, extra: { |