merge master

app/models/event.rb

@@ -7,6 +7,7 @@
 #  id                           :bigint           not null, primary key
 #  abstract                     :text
 #  comments_count               :integer          default(0), not null
+#  committee_review             :text
 #  description                  :text
 #  guid                         :string           not null
 #  is_highlight                 :boolean          default(FALSE)

app/serializers/event_serializer.rb

@@ -7,6 +7,7 @@
 #  id                           :bigint           not null, primary key
 #  abstract                     :text
 #  comments_count               :integer          default(0), not null
+#  committee_review             :text
 #  description                  :text
 #  guid                         :string           not null
 #  is_highlight                 :boolean          default(FALSE)

app/views/payments/new.html.haml

@@ -8,6 +8,12 @@
       = render partial: 'payment'
   .row
     .col-md-13
+      %p.text-center
+        %strong
+          If you do not have a credit card, please reach out to use at
+          = mail_to(@conference.contact.email)
+      %hr
+
       %p.text-muted.text-center
         %small
           All payments are handled securely by our payment processor,

db/schema.rb

@@ -258,6 +258,7 @@ ActiveRecord::Schema.define(version: 2021_04_01_050437) do
     t.integer "program_id"
     t.integer "max_attendees"
     t.integer "comments_count", default: 0, null: false
+    t.text "committee_review"
     t.text "submission_text"
   end
 
@@ -268,6 +269,13 @@ ActiveRecord::Schema.define(version: 2021_04_01_050437) do
     t.datetime "created_at"
   end
 
+  create_table "events_users", id: false, force: :cascade do |t|
+    t.bigint "event_id"
+    t.bigint "user_id"
+    t.index ["event_id"], name: "index_events_users_on_event_id"
+    t.index ["user_id"], name: "index_events_users_on_user_id"
+  end
+
   create_table "lodgings", force: :cascade do |t|
     t.string "name"
     t.text "description"

spec/factories/events.rb

@@ -7,6 +7,7 @@
 #  id                           :bigint           not null, primary key
 #  abstract                     :text
 #  comments_count               :integer          default(0), not null
+#  committee_review             :text
 #  description                  :text
 #  guid                         :string           not null
 #  is_highlight                 :boolean          default(FALSE)

spec/models/event_spec.rb

@@ -7,6 +7,7 @@
 #  id                           :bigint           not null, primary key
 #  abstract                     :text
 #  comments_count               :integer          default(0), not null
+#  committee_review             :text
 #  description                  :text
 #  guid                         :string           not null
 #  is_highlight                 :boolean          default(FALSE)

spec/serializers/event_serializer_spec.rb

@@ -7,6 +7,7 @@
 #  id                           :bigint           not null, primary key
 #  abstract                     :text
 #  comments_count               :integer          default(0), not null
+#  committee_review             :text
 #  description                  :text
 #  guid                         :string           not null
 #  is_highlight                 :boolean          default(FALSE)