Merge master, resolve schema conflicts

app/models/ability.rb

@@ -68,6 +68,8 @@ class Ability
   end
 
   # Abilities for signed in users
+  # TODO: Refactor into multiple functions
+  # rubocop:disable Metrics/AbcSize
   def signed_in(user)
     # Abilities from not_signed_in user are also inherited
     not_signed_in
@@ -140,6 +142,7 @@ class Ability
       user == track.submitter && !(track.accepted? || track.confirmed?)
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   # Abilities for users with roles wandering around in non-admin views.
   def common_abilities_for_admins(user)

app/models/commercial.rb

@@ -30,7 +30,7 @@ class Commercial < ApplicationRecord
     begin
       resource = OEmbed::Providers.get(url, maxwidth: 560, maxheight: 315)
       { html: resource.html.html_safe }
-    rescue StandardError => exception
+    rescue StandardError
       { html: iframe_fallback(url) }
       # { error: exception.message }
     end

app/models/conference.rb

@@ -35,6 +35,7 @@
 #
 #  index_conferences_on_organization_id  (organization_id)
 #
+# rubocop:disable Metrics/ClassLength
 class Conference < ApplicationRecord
   include RevisionCount
   require 'uri'
@@ -1234,3 +1235,4 @@ class Conference < ApplicationRecord
     ]
   end
 end
+# rubocop:enable Metrics/ClassLength

app/models/event.rb

@@ -19,6 +19,7 @@
 #  require_registration         :boolean
 #  start_time                   :datetime
 #  state                        :string           default("new"), not null
+#  submission_text              :text
 #  subtitle                     :string
 #  title                        :string           not null
 #  week                         :integer
@@ -74,6 +75,7 @@ class Event < ApplicationRecord
   before_create :generate_guid
 
   validate :abstract_limit
+  validate :submission_limit
   validate :before_end_of_conference, on: :create
   validates :title, presence: true
   validates :abstract, presence: true
@@ -218,6 +220,10 @@ class Event < ApplicationRecord
     abstract.to_s.split.size
   end
 
+  def submission_word_count
+    submission_text.to_s.split.size
+  end
+
   def self.get_state_color(state)
     COLORS[state.to_sym] || '#00FFFF' # azure
   end
@@ -342,16 +348,28 @@ class Event < ApplicationRecord
     errors.add(:max_attendees, "cannot be more than the room's capacity (#{room.size})") if max_attendees && (max_attendees > room.size)
   end
 
-  def abstract_limit
-    # If we don't have an event type, there is no need to count anything
-    return unless event_type && abstract
+  def word_limit(field)
+    # If we don't have an event type or the requested field, don't count
+    return unless event_type && respond_to?(field) && self[field]
 
-    len = abstract.split.size
+    len = self[field].split.size
+    # TODO: Use different limits for different text fields
+    # Uncomment the two lines below this when the separate word limits are implemented.
+    # max_words = event_type["maximum_#{field}_length"]
+    # min_words = event_type["minimum_#{field}_length"]
     max_words = event_type.maximum_abstract_length
     min_words = event_type.minimum_abstract_length
 
-    errors.add(:abstract, "cannot have less than #{min_words} words") if len < min_words
-    errors.add(:abstract, "cannot have more than #{max_words} words") if len > max_words
+    errors.add(field.to_sym, "cannot have less than #{min_words} words") if len < min_words
+    errors.add(field.to_sym, "cannot have more than #{max_words} words") if len > max_words
+  end
+
+  def abstract_limit
+    word_limit(:abstract)
+  end
+
+  def submission_limit
+    word_limit(:submission_text)
   end
 
   # TODO: create a module to be mixed into model to perform same operation

app/models/user.rb

@@ -305,7 +305,7 @@ class User < ApplicationRecord
   # TODO: Use a real authorization in the right place....
   def manages_volunteers?(conference)
     organizer_roles = get_roles['organizer']
-    organizer_roles&.include?(conference.short_title) # TODO or Volunteer Coorinator.
+    organizer_roles&.include?(conference.short_title) # TODO: or Volunteer Coorinator.
   end
 
   def registered