Commit 13b1e4fe authored by Robert Speicher's avatar Robert Speicher

Merge branch 'dm-use-index-by' into 'master'

Use Enumerable#index_by where possible

See merge request !10011
parents e5dfcdf2 871bed7a
...@@ -23,10 +23,7 @@ module MergeRequests ...@@ -23,10 +23,7 @@ module MergeRequests
def opened_merge_requests_from_source_branches(branches) def opened_merge_requests_from_source_branches(branches)
merge_requests = MergeRequest.from_project(project).opened.from_source_branches(branches) merge_requests = MergeRequest.from_project(project).opened.from_source_branches(branches)
merge_requests.inject({}) do |hash, mr| merge_requests.index_by(&:source_branch)
hash[mr.source_branch] = mr
hash
end
end end
def get_branches(changes) def get_branches(changes)
......
...@@ -93,9 +93,7 @@ module Users ...@@ -93,9 +93,7 @@ module Users
end end
def current_authorizations_per_project def current_authorizations_per_project
current_authorizations.each_with_object({}) do |row, hash| current_authorizations.index_by(&:project_id)
hash[row.project_id] = row
end
end end
def current_authorizations def current_authorizations
......
...@@ -239,18 +239,13 @@ module Banzai ...@@ -239,18 +239,13 @@ module Banzai
# path. # path.
def projects_per_reference def projects_per_reference
@projects_per_reference ||= begin @projects_per_reference ||= begin
hash = {}
refs = Set.new refs = Set.new
references_per_project.each do |project_ref, _| references_per_project.each do |project_ref, _|
refs << project_ref refs << project_ref
end end
find_projects_for_paths(refs.to_a).each do |project| find_projects_for_paths(refs.to_a).index_by(&:full_path)
hash[project.path_with_namespace] = project
end
hash
end end
end end
......
...@@ -74,10 +74,7 @@ module Banzai ...@@ -74,10 +74,7 @@ module Banzai
# The keys of this Hash are the namespace paths, the values the # The keys of this Hash are the namespace paths, the values the
# corresponding Namespace objects. # corresponding Namespace objects.
def namespaces def namespaces
@namespaces ||= @namespaces ||= Namespace.where_full_path_in(usernames).index_by(&:full_path)
Namespace.where_full_path_in(usernames).each_with_object({}) do |row, hash|
hash[row.full_path] = row
end
end end
# Returns all usernames referenced in the current document. # Returns all usernames referenced in the current document.
......
...@@ -134,9 +134,7 @@ module Banzai ...@@ -134,9 +134,7 @@ module Banzai
ids = unique_attribute_values(nodes, attribute) ids = unique_attribute_values(nodes, attribute)
rows = collection_objects_for_ids(collection, ids) rows = collection_objects_for_ids(collection, ids)
rows.each_with_object({}) do |row, hash| rows.index_by(&:id)
hash[row.id] = row
end
end end
# Returns an Array containing all unique values of an attribute of the # Returns an Array containing all unique values of an attribute of the
......
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