Revert "Merge branch 'broadcast-messages-cache' into 'master'"

This reverts commit c19ea197c7195771ddd68fa298f72c28612cadd8, reversing
changes made to 0887a2bd10c3d774299b5b779d0335ddcb5064de.

3 files changed, 5 insertions, 45 deletions

diff --git a/db/migrate/20170809133343_add_broadcast_messages_index.rb b/db/migrate/20170809133343_add_broadcast_messages_index.rb
deleted file mode 100644
index 4ab2ddb059d..00000000000
--- a/db/migrate/20170809133343_add_broadcast_messages_index.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class AddBroadcastMessagesIndex < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  # Set this constant to true if this migration requires downtime.
-  DOWNTIME = false
-
-  disable_ddl_transaction!
-
-  COLUMNS = %i[starts_at ends_at id].freeze
-
-  def up
-    add_concurrent_index :broadcast_messages, COLUMNS
-  end
-
-  def down
-    remove_concurrent_index :broadcast_messages, COLUMNS
-  end
-end
diff --git a/db/migrate/20170809134534_add_broadcast_message_not_null_constraints.rb b/db/migrate/20170809134534_add_broadcast_message_not_null_constraints.rb
deleted file mode 100644
index 13e8ef52f22..00000000000
--- a/db/migrate/20170809134534_add_broadcast_message_not_null_constraints.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class AddBroadcastMessageNotNullConstraints < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  # Set this constant to true if this migration requires downtime.
-  DOWNTIME = false
-
-  COLUMNS = %i[starts_at ends_at created_at updated_at message_html]
-
-  def change
-    COLUMNS.each do |column|
-      change_column_null :broadcast_messages, column, false
-    end
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 6540ab80129..ec92b185be2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -163,18 +163,16 @@ ActiveRecord::Schema.define(version: 20170809142252) do
 
   create_table "broadcast_messages", force: :cascade do |t|
     t.text "message", null: false
-    t.datetime "starts_at", null: false
-    t.datetime "ends_at", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "starts_at"
+    t.datetime "ends_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string "color"
     t.string "font"
-    t.text "message_html", null: false
+    t.text "message_html"
     t.integer "cached_markdown_version"
   end
 
-  add_index "broadcast_messages", ["starts_at", "ends_at", "id"], name: "index_broadcast_messages_on_starts_at_and_ends_at_and_id", using: :btree
-
   create_table "chat_names", force: :cascade do |t|
     t.integer "user_id", null: false
     t.integer "service_id", null: false