diff --git a/CHANGELOG b/CHANGELOG index b876aee251d8637ba762460b2e55741157b283a1..7215a919d79a9b6390b29d095e91dbb831e274c4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,6 +40,9 @@ v 8.8.4 - Fix todos page throwing errors when you have a project pending deletion - Reduce number of SQL queries when rendering user references +v 8.8.4 (unreleased) + - Ensure branch cleanup regardless of whether the GitHub import process succeeds + v 8.8.3 - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312 - Fixed JS error when trying to remove discussion form. !4303 diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb index 408d9b796325c3f2b5403d137e0dc73f3ba7003e..9d077e79c3986187908cc240a643a2d3d827f917 100644 --- a/lib/gitlab/github_import/importer.rb +++ b/lib/gitlab/github_import/importer.rb @@ -89,11 +89,11 @@ module Gitlab end end - delete_refs(branches_removed) - true rescue ActiveRecord::RecordInvalid => e raise Projects::ImportService::Error, e.message + ensure + delete_refs(branches_removed) end def create_refs(branches)