From 8a3745a4df89f5a5f980370dabfab8f95c92a5f8 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 25 Nov 2016 13:25:40 +0100
Subject: [PATCH] Remove stale entries from cache results
---
app/controllers/api/v1/accounts_controller.rb | 2 +-
app/controllers/api/v1/notifications_controller.rb | 2 +-
app/controllers/api/v1/timelines_controller.rb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 5546ee5883..ffa8b04fb9 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -128,6 +128,6 @@ class Api::V1::AccountsController < ApiController
end
end
- raw.map { |status| cached_keys_with_value[status.cache_key] || uncached[status.id] }
+ raw.map { |status| cached_keys_with_value[status.cache_key] || uncached[status.id] }.compact
end
end
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index d74b99a86d..b23d7570d7 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -39,6 +39,6 @@ class Api::V1::NotificationsController < ApiController
end
end
- raw.map { |notification| cached_keys_with_value[notification.cache_key] || uncached[notification.id] }
+ raw.map { |notification| cached_keys_with_value[notification.cache_key] || uncached[notification.id] }.compact
end
end
diff --git a/app/controllers/api/v1/timelines_controller.rb b/app/controllers/api/v1/timelines_controller.rb
index b1d7c3052b..3debbdfc46 100644
--- a/app/controllers/api/v1/timelines_controller.rb
+++ b/app/controllers/api/v1/timelines_controller.rb
@@ -87,6 +87,6 @@ class Api::V1::TimelinesController < ApiController
end
end
- raw.map { |status| cached_keys_with_value[status.cache_key] || uncached[status.id] }
+ raw.map { |status| cached_keys_with_value[status.cache_key] || uncached[status.id] }.compact
end
end
--
GitLab