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
6a9fb20f
Commit
6a9fb20f
authored
8 years ago
by
Ahmad Sherif
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix applying GitHub-imported labels when importing job is interrupted
Closes #24075
parent
a3cc2f1e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
CHANGELOG.md
CHANGELOG.md
+1
-0
lib/gitlab/github_import/importer.rb
lib/gitlab/github_import/importer.rb
+10
-0
No files found.
CHANGELOG.md
View file @
6a9fb20f
...
...
@@ -66,6 +66,7 @@ entry.
-
In all filterable drop downs, put input field in focus only after load is complete (Ido @leibo)
-
Improve search query parameter naming in /admin/users !7115 (YarNayar)
-
Fix table pagination to be responsive
-
Fix applying GitHub-imported labels when importing job is interrupted
-
Allow to search for user by secondary email address in the admin interface(/admin/users) !7115 (YarNayar)
-
Updated commit SHA styling on the branches page.
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/github_import/importer.rb
View file @
6a9fb20f
...
...
@@ -59,6 +59,8 @@ module Gitlab
end
end
end
ensure_labels_are_cached
end
def
import_milestones
...
...
@@ -234,6 +236,14 @@ module Gitlab
end
end
def
ensure_labels_are_cached
return
unless
@labels
.
empty?
project
.
labels
.
select
(
:id
,
:title
).
find_each
do
|
label
|
@labels
[
label
.
title
]
=
label
.
id
end
end
def
fetch_resources
(
resource_type
,
*
opts
)
return
if
imported?
(
resource_type
)
...
...
This diff is collapsed.
Click to expand it.
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