Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
3b4f03de
Commit
3b4f03de
authored
Jun 02, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure branch cleanup regardless of whether the import process succeeds
parent
74849f97
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
CHANGELOG
CHANGELOG
+3
-0
lib/gitlab/github_import/importer.rb
lib/gitlab/github_import/importer.rb
+2
-2
No files found.
CHANGELOG
View file @
3b4f03de
...
@@ -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
...
...
lib/gitlab/github_import/importer.rb
View file @
3b4f03de
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment