Upstream sync master

2020-06-09 06:35:40 +02:00
parent 64bda6eab6
commit cd5bbaeb62
26 changed files with 255 additions and 62 deletions
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -117,7 +117,7 @@ class Project < ApplicationRecord
    current_zoom_meeting = zoom_meetings.active.first

    unless current_zoom_meeting.present?
-      zoom_user = ZoomUser.free.first || ZoomUser.create
+      zoom_user = ZoomUser.for_new_meeting
      current_zoom_meeting = ZoomMeeting.create(zoom_user: zoom_user, project: self)
    end