diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2016-09-27 19:36:58 +0200 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2016-09-27 20:45:07 +0200 |
| commit | dca1acd6a6eaf78f31e90569ff008b1a26d63fbb (patch) | |
| tree | 2db692ff39d977b513cb544bbe0c2601861fa66d | |
| parent | e30bfb809afdbf5596176cf0fe0ea63e976cbb9f (diff) | |
| download | gitlab-ce-fix/optimize-github-importer-for-speed-and-memory.tar.gz | |
Call after_remove_branch only once after importing all GitHub PRsfix/optimize-github-importer-for-speed-and-memory
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/gitlab/github_import/importer.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index b5827cc128a..da3bb75fb43 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ v 8.13.0 (unreleased) - Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison) - Revoke button in Applications Settings underlines on hover. - Add organization field to user profile + - Optimize GitHub importing for speed and memory v 8.12.2 (unreleased) - Fix Import/Export not recognising correctly the imported services. diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb index 1d385dba0f5..b8321244473 100644 --- a/lib/gitlab/github_import/importer.rb +++ b/lib/gitlab/github_import/importer.rb @@ -108,6 +108,8 @@ module Gitlab end end end + + project.repository.after_remove_branch end def restore_source_branch(pull_request) @@ -127,8 +129,6 @@ module Gitlab def clean_up_restored_branches(pull_request) remove_branch(pull_request.source_branch_name) unless pull_request.source_branch_exists? remove_branch(pull_request.target_branch_name) unless pull_request.target_branch_exists? - - project.repository.after_remove_branch end def apply_labels(issuable, raw_issuable) |