BigW Consortium Gitlab

Commit 6a9fb20f by Ahmad Sherif

Fix applying GitHub-imported labels when importing job is interrupted

Closes #24075
parent a3cc2f1e
...@@ -66,6 +66,7 @@ entry. ...@@ -66,6 +66,7 @@ entry.
- In all filterable drop downs, put input field in focus only after load is complete (Ido @leibo) - 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) - Improve search query parameter naming in /admin/users !7115 (YarNayar)
- Fix table pagination to be responsive - 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) - 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. - Updated commit SHA styling on the branches page.
......
...@@ -59,6 +59,8 @@ module Gitlab ...@@ -59,6 +59,8 @@ module Gitlab
end end
end end
end end
ensure_labels_are_cached
end end
def import_milestones def import_milestones
...@@ -234,6 +236,14 @@ module Gitlab ...@@ -234,6 +236,14 @@ module Gitlab
end end
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) def fetch_resources(resource_type, *opts)
return if imported?(resource_type) return if imported?(resource_type)
......
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