Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
GitLab FOSS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
4
Snippets
Groups
Projects
Show more breadcrumbs
GitLab.org
GitLab FOSS
Commits
707b3f0d
Commit
707b3f0d
authored
8 years ago
by
Ahmad Sherif
Browse files
Options
Downloads
Patches
Plain Diff
Fix applying GitHub-imported labels when importing job is interrupted
Closes
#24075
parent
ca1096e7
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
lib/gitlab/github_import/importer.rb
+10
-0
10 additions, 0 deletions
lib/gitlab/github_import/importer.rb
with
11 additions
and
0 deletions
CHANGELOG.md
+
1
−
0
View file @
707b3f0d
...
...
@@ -57,6 +57,7 @@ Please view this file on the master branch, on stable branches it's out of date.
-
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)
## 8.13.3
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/github_import/importer.rb
+
10
−
0
View file @
707b3f0d
...
...
@@ -59,6 +59,8 @@ def import_labels
end
end
end
ensure_labels_are_cached
end
def
import_milestones
...
...
@@ -234,6 +236,14 @@ def import_releases
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.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment