Merge master, resolve schema conflicts

db/migrate/20180409170433_add_visible_to_tickets.rb

@@ -2,7 +2,7 @@ class AddVisibleToTickets < ActiveRecord::Migration[5.0]
   def up
     add_column :tickets, :visible, :boolean, default: true
     Ticket.reset_column_information
-    Ticket.update_all(visible: true) # rubocop:disable Rails/SkipsModelValidations
+    Ticket.update_all(visible: true)
   end
 
   def down

db/migrate/20210215213515_add_submission_text_to_events.rb

@@ -0,0 +1,5 @@
+class AddSubmissionTextToEvents < ActiveRecord::Migration[5.2]
+  def change
+    add_column :events, :submission_text, :text
+  end
+end

db/schema.rb

@@ -258,6 +258,7 @@ ActiveRecord::Schema.define(version: 2021_03_03_052026) do
     t.integer "max_attendees"
     t.integer "comments_count", default: 0, null: false
     t.text "committee_review"
+    t.text "submission_text"
   end
 
   create_table "events_registrations", force: :cascade do |t|