Revert "Merge branch 'master' of https://github.com/discourse/discourse"

This reverts commit e62a85cf6f, reversing
changes made to 2660c2e21d.

db/fixtures/007_web_hook_event_types.rb

@@ -30,6 +30,16 @@ WebHookEventType.seed do |b|
   b.name = "tag"
 end
 
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::FLAG
+  b.name = "flag"
+end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::QUEUED_POST
+  b.name = "queued_post"
+end
+
 WebHookEventType.seed do |b|
   b.id = WebHookEventType::REVIEWABLE
   b.name = "reviewable"

db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb

@@ -16,7 +16,6 @@ class CreateBookmarksFromPostActionBookmarks < ActiveRecord::Migration[6.0]
         INNER JOIN posts ON posts.id = post_actions.post_id
         LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id
         INNER JOIN topics ON topics.id = posts.topic_id
-        INNER JOIN users ON users.id = post_actions.user_id
         WHERE bookmarks.id IS NULL AND post_action_type_id = :type_id AND post_actions.deleted_at IS NULL AND posts.deleted_at IS NULL
         LIMIT 2000
         SQL

db/migrate/20200514075356_remove_flag_web_hooks.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveFlagWebHooks < ActiveRecord::Migration[6.0]
-  def up
-    flag_event_type_id = 7
-
-    DB.exec <<~SQL
-    DELETE FROM web_hook_event_types_hooks
-    WHERE web_hook_event_type_id = #{flag_event_type_id}
-    SQL
-
-    DB.exec <<~SQL
-    DELETE FROM web_hook_event_types
-    WHERE id = #{flag_event_type_id}
-    SQL
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end

db/migrate/20200514075407_remove_queued_post_web_hooks.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveQueuedPostWebHooks < ActiveRecord::Migration[6.0]
-  def up
-    queued_post_event_type_id = 8
-
-    DB.exec <<~SQL
-    DELETE FROM web_hook_event_types_hooks
-    WHERE web_hook_event_type_id = #{queued_post_event_type_id}
-    SQL
-
-    DB.exec <<~SQL
-    DELETE FROM web_hook_event_types
-    WHERE id = #{queued_post_event_type_id}
-    SQL
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end

db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveFksFromBookmarks < ActiveRecord::Migration[6.0]
-  def change
-    remove_foreign_key :bookmarks, :topics
-    remove_foreign_key :bookmarks, :posts
-    remove_foreign_key :bookmarks, :users
-  end
-end

db/post_migrate/20200522004855_remove_access_control_post_fk.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveAccessControlPostFk < ActiveRecord::Migration[6.0]
-  def change
-    remove_foreign_key :uploads, column: :access_control_post_id
-  end
-end