diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-15 08:19:13 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-15 08:19:13 +0000 |
| commit | d348702b4f3b746565cc2ff1206479e639bae543 (patch) | |
| tree | 5a95e6239af01038897d4af12f39a95b8d27d76f /lib | |
| parent | d32de821960332c4e53e2f9dc696d15b7bfe3d7a (diff) | |
| parent | 338d9b257ecfa6f088daaeb9d93ea8991f8965d0 (diff) | |
| download | gitlab-ce-d348702b4f3b746565cc2ff1206479e639bae543.tar.gz | |
Merge branch 'dm-fix-parser-cache' into 'master'
Don't return nil for missing objects from parser cache
See merge request !12168
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/reference_parser/base_parser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/banzai/reference_parser/base_parser.rb b/lib/banzai/reference_parser/base_parser.rb index 1e2536231d8..279fca8d043 100644 --- a/lib/banzai/reference_parser/base_parser.rb +++ b/lib/banzai/reference_parser/base_parser.rb @@ -171,7 +171,7 @@ module Banzai collection.where(id: to_query).each { |row| cache[row.id] = row } end - cache.values_at(*ids) + cache.values_at(*ids).compact else collection.where(id: ids) end |