Upstream sync

2020-08-31 18:19:00 +02:00
parent 896cec2259
commit 95a14ab2f6
37 changed files with 487 additions and 375 deletions
--- a/app/controllers/public/broadcasts_controller.rb
+++ b/app/controllers/public/broadcasts_controller.rb
@@ -44,7 +44,7 @@ class Public::BroadcastsController < Public::BaseController
  end

  def conference_url_for(broadcast)
-    broadcast.video_conference_url_override || broadcast_zoom_meeting_url(broadcast.token)
+    broadcast.video_conference_url_override.presence || broadcast_zoom_meeting_url(broadcast.token)
  end

  class MultiViewBroadcast