summaryrefslogtreecommitdiff
path: root/lib/api/internal.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-07-13 21:38:26 -0700
committerStan Hu <stanhu@gmail.com>2017-07-13 21:38:26 -0700
commit0e23d1a74ff6283076e9a1d74eccfc5ba6419fd8 (patch)
treeacbd4550fd800053fac5ee70acac972bd3c4ffe9 /lib/api/internal.rb
parentdbcc0e03ac82d6b90fc93b1fefac8ce80c741178 (diff)
downloadgitlab-ce-0e23d1a74ff6283076e9a1d74eccfc5ba6419fd8.tar.gz
Handle case when BroadcastMessage.current is nil
Somehow Rails.cache.fetch occasionally returns `nil` values, which causes this endpoint to crash. Closes #35094
Diffstat (limited to 'lib/api/internal.rb')
-rw-r--r--lib/api/internal.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index ef2c08e902c..465363da582 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -101,7 +101,7 @@ module API
end
get "/broadcast_message" do
- if message = BroadcastMessage.current.last
+ if message = BroadcastMessage.current&.last
present message, with: Entities::BroadcastMessage
else
{}