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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
dca1acd6
Commit
dca1acd6
authored
Sep 27, 2016
by
Ahmad Sherif
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Call after_remove_branch only once after importing all GitHub PRs
parent
e30bfb80
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/github_import/importer.rb
lib/gitlab/github_import/importer.rb
+2
-2
No files found.
CHANGELOG
View file @
dca1acd6
...
@@ -7,6 +7,7 @@ v 8.13.0 (unreleased)
...
@@ -7,6 +7,7 @@ v 8.13.0 (unreleased)
- Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison)
- Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison)
- Revoke button in Applications Settings underlines on hover.
- Revoke button in Applications Settings underlines on hover.
- Add organization field to user profile
- Add organization field to user profile
- Optimize GitHub importing for speed and memory
v 8.12.2 (unreleased)
v 8.12.2 (unreleased)
- Fix Import/Export not recognising correctly the imported services.
- Fix Import/Export not recognising correctly the imported services.
...
...
lib/gitlab/github_import/importer.rb
View file @
dca1acd6
...
@@ -108,6 +108,8 @@ module Gitlab
...
@@ -108,6 +108,8 @@ module Gitlab
end
end
end
end
end
end
project
.
repository
.
after_remove_branch
end
end
def
restore_source_branch
(
pull_request
)
def
restore_source_branch
(
pull_request
)
...
@@ -127,8 +129,6 @@ module Gitlab
...
@@ -127,8 +129,6 @@ module Gitlab
def
clean_up_restored_branches
(
pull_request
)
def
clean_up_restored_branches
(
pull_request
)
remove_branch
(
pull_request
.
source_branch_name
)
unless
pull_request
.
source_branch_exists?
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?
remove_branch
(
pull_request
.
target_branch_name
)
unless
pull_request
.
target_branch_exists?
project
.
repository
.
after_remove_branch
end
end
def
apply_labels
(
issuable
,
raw_issuable
)
def
apply_labels
(
issuable
,
raw_issuable
)
...
...
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