Ensure branch cleanup regardless of whether the import process succeeds

parent 74849f97
...@@ -32,6 +32,9 @@ v 8.9.0 (unreleased) ...@@ -32,6 +32,9 @@ v 8.9.0 (unreleased)
- Cache project build count in sidebar nav - Cache project build count in sidebar nav
- Reduce number of queries needed to render issue labels in the sidebar - Reduce number of queries needed to render issue labels in the sidebar
v 8.8.4 (unreleased)
- Ensure branch cleanup regardless of whether the GitHub import process succeeds
v 8.8.3 v 8.8.3
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312 - 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 - Fixed JS error when trying to remove discussion form. !4303
......
...@@ -89,11 +89,11 @@ module Gitlab ...@@ -89,11 +89,11 @@ module Gitlab
end end
end end
delete_refs(branches_removed)
true true
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
raise Projects::ImportService::Error, e.message raise Projects::ImportService::Error, e.message
ensure
delete_refs(branches_removed)
end end
def create_refs(branches) def create_refs(branches)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment