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

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

app/assets/javascripts/admin/models/admin-user.js

@@ -77,6 +77,12 @@ const AdminUser = User.extend({
     });
   },
 
+  revokeApiKey() {
+    return ajax(`/admin/users/${this.id}/revoke_api_key`, {
+      type: "DELETE"
+    }).then(() => this.set("api_key", null));
+  },
+
   deleteAllPosts() {
     let deletedPosts = 0;
     const user = this;

app/assets/javascripts/admin/routes/admin-web-hooks-show.js

@@ -1,4 +1,5 @@
 import { get } from "@ember/object";
+import { isEmpty } from "@ember/utils";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
@@ -14,7 +15,7 @@ export default DiscourseRoute.extend({
   },
 
   setupController(controller, model) {
-    if (model.get("isNew")) {
+    if (model.get("isNew") || isEmpty(model.get("web_hook_event_types"))) {
       model.set("web_hook_event_types", controller.get("defaultEventTypes"));
     }