Merge branch '22681-avoid-empty-queries-on-reference-parsers' into 'master'

"Banzai::ReferenceParser::BaseParser is executing queries that don't return results"

See merge request !6546
This commit is contained in:
Yorick Peterse 2016-09-28 10:37:16 +00:00
commit e8cce313a1
2 changed files with 6 additions and 1 deletions

View File

@ -5,6 +5,7 @@ v 8.13.0 (unreleased)
- Speed-up group milestones show page
- Log LDAP lookup errors and don't swallow unrelated exceptions. !6103 (Markus Koller)
- Add more tests for calendar contribution (ClemMakesApps)
- Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes without references
- Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison)
- Only update issuable labels if they have been changed
- Revoke button in Applications Settings underlines on hover.

View File

@ -79,7 +79,11 @@ module Banzai
def referenced_by(nodes)
ids = unique_attribute_values(nodes, self.class.data_attribute)
references_relation.where(id: ids)
if ids.empty?
references_relation.none
else
references_relation.where(id: ids)
end
end
# Returns the ActiveRecord::Relation to use for querying references in the