From d4fc76b335d012275b06b7ce80d0c1b98f9db33d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 5 Mar 2020 16:29:49 -0500
Subject: [PATCH 001/633] Revert "FIX: Don't allow people to clear the upload
 bucket while it's enabled"

This reverts commit 4bb8db024c247f20af9245723ebea4c474eeb16a.
---
 lib/site_settings/validations.rb           | 2 --
 spec/lib/site_settings/validations_spec.rb | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rb
index 0bf13f7606..56987b0dfe 100644
--- a/lib/site_settings/validations.rb
+++ b/lib/site_settings/validations.rb
@@ -143,8 +143,6 @@ module SiteSettings::Validations
 
   def validate_s3_upload_bucket(new_val)
     validate_bucket_setting("s3_upload_bucket", new_val, SiteSetting.s3_backup_bucket)
-
-    validate_error(:s3_upload_bucket_is_required, setting_name: 's3_upload_bucket') if new_val.blank? && SiteSetting.enable_s3_uploads?
   end
 
   def validate_s3_backup_bucket(new_val)
diff --git a/spec/lib/site_settings/validations_spec.rb b/spec/lib/site_settings/validations_spec.rb
index 69ab73920b..7f346d4d5c 100644
--- a/spec/lib/site_settings/validations_spec.rb
+++ b/spec/lib/site_settings/validations_spec.rb
@@ -103,15 +103,6 @@ describe SiteSettings::Validations do
         SiteSetting.s3_backup_bucket = "my-awesome-bucket/foo"
         expect { validate("my-awesome-bucket/foo/uploads") }.to raise_error(Discourse::InvalidParameters, error_message)
       end
-
-      it "cannot be made blank unless the setting is false" do
-        SiteSetting.s3_backup_bucket = "really-real-cool-bucket"
-        SiteSetting.enable_s3_uploads = true
-
-        expect { validate("") }.to raise_error(Discourse::InvalidParameters)
-        SiteSetting.enable_s3_uploads = false
-        validate("")
-      end
     end
   end
 

From 54f67661acf04e8c501634823a1c7e183f48c95c Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 5 Mar 2020 19:21:38 -0300
Subject: [PATCH 002/633] FEATURE: Option to connect to Redis using SSL

---
 app/models/global_setting.rb   | 2 ++
 config/discourse_defaults.conf | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index eb3592d1e4..57d22d6618 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -172,6 +172,7 @@ class GlobalSetting
         c[:db] = redis_db if redis_db != 0
         c[:db] = 1 if Rails.env == "test"
         c[:id] = nil if redis_skip_client_commands
+        c[:ssl] = true if redis_use_ssl
 
         c.freeze
       end
@@ -195,6 +196,7 @@ class GlobalSetting
         c[:db] = message_bus_redis_db if message_bus_redis_db != 0
         c[:db] = 1 if Rails.env == "test"
         c[:id] = nil if message_bus_redis_skip_client_commands
+        c[:ssl] = true if redis_use_ssl
 
         c.freeze
       end
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index aee0f88ab2..0a4eb66dd7 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -120,6 +120,9 @@ redis_password =
 # skip configuring client id for cloud providers who support no client commands
 redis_skip_client_commands = false
 
+# uses SSL for all Redis connections if true
+redis_use_ssl = false
+
 # message bus redis server switch
 message_bus_redis_enabled = false
 

From 243284f998e213034f9f0c6b228f97f7c9834fdd Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Thu, 5 Mar 2020 13:55:35 -1000
Subject: [PATCH 003/633] FEATURE: prevent accidental canceling when drafting
 penalties (#9105)

Pop up a confirmation box when there is input. This prevents accidental closing
of the dialog boxes due to clicking outside.

This adds a development hook on modals in the form of a `beforeClose`
function. Modal windows can abort the close if the funtion returns false.

Additionally fixing a few issues with loop and state on the modal popups:

Escape key with bootbox is keyup.
Updating modal to close on keyup as well so escape key is working.
Fixes an issue where pressing esc will loop immediately back to the modal by:
keydown -> bootbox -> keyup -> acts as "cancel", restores modal

Needs a next call to reopenModal otherwise, keyup is handled again by the modal.
Fixes an issue where pressing esc will loop immediately back to the confirm:
esc keyup will be handled and bubble immediately back to the modal.

Additionally, only handle key events when the #discourse-modal is visible.
This resolves issues where escape or enter events were being handled by
a hidden modal window.
---
 .../admin/mixins/penalty-controller.js.es6    | 24 +++++++++++++++++-
 .../discourse/components/d-modal.js.es6       | 17 +++++++------
 .../discourse/routes/application.js.es6       | 15 +++++++++--
 config/locales/client.en.yml                  |  1 +
 .../acceptance/admin-suspend-user-test.js.es6 | 25 +++++++++++++++++++
 test/javascripts/acceptance/modal-test.js.es6 | 10 ++++----
 6 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
index cb07e9d2ca..f923710649 100644
--- a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
+++ b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
@@ -1,6 +1,7 @@
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Mixin from "@ember/object/mixin";
+import { next } from "@ember/runloop";
 import { Promise } from "rsvp";
 
 export default Mixin.create(ModalFunctionality, {
@@ -11,6 +12,7 @@ export default Mixin.create(ModalFunctionality, {
   user: null,
   postId: null,
   successCallback: null,
+  confirmClose: false,
 
   resetModal() {
     this.setProperties({
@@ -21,10 +23,30 @@ export default Mixin.create(ModalFunctionality, {
       postEdit: null,
       postAction: "delete",
       before: null,
-      successCallback: null
+      successCallback: null,
+      confirmClose: false
     });
   },
 
+  beforeClose() {
+    // prompt a confirmation if we have unsaved content
+    if (
+      (this.reason && this.reason.length > 1) ||
+      (this.message && this.message.length > 1 && !this.confirmClose)
+    ) {
+      this.send("hideModal");
+      bootbox.confirm(I18n.t("admin.user.confirm_cancel_penalty"), result => {
+        if (result) {
+          this.set("confirmClose", true);
+          this.send("closeModal");
+        } else {
+          next(() => this.send("reopenModal"));
+        }
+      });
+      return false;
+    }
+  },
+
   penalize(cb) {
     let before = this.before;
     let promise = before ? before() : Promise.resolve();
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index 300a3e585c..eeae7edc3f 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -31,13 +31,16 @@ export default Component.extend({
 
   @on("didInsertElement")
   setUp() {
-    $("html").on("keydown.discourse-modal", e => {
-      if (e.which === 27 && this.dismissable) {
-        next(() => $(".modal-header button.modal-close").click());
-      }
+    $("html").on("keyup.discourse-modal", e => {
+      //only respond to events when the modal is visible
+      if ($("#discourse-modal:visible").length > 0) {
+        if (e.which === 27 && this.dismissable) {
+          next(() => $(".modal-header button.modal-close").click());
+        }
 
-      if (e.which === 13 && this.triggerClickOnEnter(e)) {
-        next(() => $(".modal-footer .btn-primary").click());
+        if (e.which === 13 && this.triggerClickOnEnter(e)) {
+          next(() => $(".modal-footer .btn-primary").click());
+        }
       }
     });
 
@@ -46,7 +49,7 @@ export default Component.extend({
 
   @on("willDestroyElement")
   cleanUp() {
-    $("html").off("keydown.discourse-modal");
+    $("html").off("keyup.discourse-modal");
     this.appEvents.off("modal:body-shown", this, "_modalBodyShown");
   },
 
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index e877d8ceff..8dca333360 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -157,12 +157,23 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
     // Close the current modal, and destroy its state.
     closeModal() {
-      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
-
       const route = getOwner(this).lookup("route:application");
       let modalController = route.controllerFor("modal");
       const controllerName = modalController.get("name");
 
+      if (controllerName) {
+        const controller = getOwner(this).lookup(
+          `controller:${controllerName}`
+        );
+        if (controller && controller.beforeClose) {
+          if (false === controller.beforeClose()) {
+            return;
+          }
+        }
+      }
+
+      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
+
       if (controllerName) {
         const controller = getOwner(this).lookup(
           `controller:${controllerName}`
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 127c964d04..c7705ab948 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4291,6 +4291,7 @@ en:
           threshold_reached: "Received too many bounces from that email."
         trust_level_change_failed: "There was a problem changing the user's trust level."
         suspend_modal_title: "Suspend User"
+        confirm_cancel_penalty: "Are you sure you want to discard the penalty?"
         trust_level_2_users: "Trust Level 2 Users"
         trust_level_3_requirements: "Trust Level 3 Requirements"
         trust_level_locked_tip: "trust level is locked, system will not promote or demote user"
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
index d9983848ca..936f7080bb 100644
--- a/test/javascripts/acceptance/admin-suspend-user-test.js.es6
+++ b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
@@ -34,6 +34,31 @@ QUnit.test("suspend a user - cancel", async assert => {
   assert.equal(find(".suspend-user-modal:visible").length, 0);
 });
 
+QUnit.test("suspend a user - cancel with input", async assert => {
+  await visit("/admin/users/1234/regular");
+  await click(".suspend-user");
+
+  assert.equal(find(".suspend-user-modal:visible").length, 1);
+
+  await fillIn(".suspend-reason", "for breaking the rules");
+  await fillIn(".suspend-message", "this is an email reason why");
+
+  await click(".d-modal-cancel");
+
+  assert.equal(find(".bootbox.modal:visible").length, 1);
+
+  await click(".modal-footer .btn-default");
+  assert.equal(find(".suspend-user-modal:visible").length, 1);
+  assert.equal(
+    find(".suspend-message")[0].value,
+    "this is an email reason why"
+  );
+
+  await click(".d-modal-cancel");
+  await click(".modal-footer .btn-primary");
+  assert.equal(find(".suspend-user-modal:visible").length, 0);
+});
+
 QUnit.test("suspend, then unsuspend a user", async assert => {
   const suspendUntilCombobox = selectKit(".suspend-until .combobox");
 
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
index 13725f4d6c..4e43be89bb 100644
--- a/test/javascripts/acceptance/modal-test.js.es6
+++ b/test/javascripts/acceptance/modal-test.js.es6
@@ -28,7 +28,7 @@ QUnit.test("modal", async function(assert) {
   await click(".login-button");
   assert.ok(find(".d-modal:visible").length === 1, "modal should reappear");
 
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -47,7 +47,7 @@ QUnit.test("modal", async function(assert) {
     find(".d-modal:visible").length === 1,
     "modal should not disappear when you click outside"
   );
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 1,
     "ESC should not close the modal"
@@ -61,7 +61,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".toggle-admin-menu");
   await click(".topic-admin-status-update button");
-  await keyEvent(".d-modal", "keydown", 13);
+  await keyEvent(".d-modal", "keyup", 13);
 
   assert.ok(
     find("#modal-alert:visible").length === 1,
@@ -72,7 +72,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
     "hitting Enter does not dismiss modal due to alert error"
   );
 
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -82,7 +82,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".d-editor-button-bar .btn.link");
 
-  await keyEvent(".d-modal", "keydown", 13);
+  await keyEvent(".d-modal", "keyup", 13);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "modal should disappear on hitting Enter"

From 6fe91bbbbb9a9bd076db6371c1f814f71b0ee711 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Thu, 5 Mar 2020 15:29:51 -1000
Subject: [PATCH 004/633] Revert "FEATURE: prevent accidental canceling when
 drafting penalties (#9105)" (#9122)

This reverts commit 243284f998e213034f9f0c6b228f97f7c9834fdd.

There are some issues in how the JS tests interact that I will need to figure out here before this can be merged.
---
 .../admin/mixins/penalty-controller.js.es6    | 24 +-----------------
 .../discourse/components/d-modal.js.es6       | 17 ++++++-------
 .../discourse/routes/application.js.es6       | 15 ++---------
 config/locales/client.en.yml                  |  1 -
 .../acceptance/admin-suspend-user-test.js.es6 | 25 -------------------
 test/javascripts/acceptance/modal-test.js.es6 | 10 ++++----
 6 files changed, 15 insertions(+), 77 deletions(-)

diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
index f923710649..cb07e9d2ca 100644
--- a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
+++ b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
@@ -1,7 +1,6 @@
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Mixin from "@ember/object/mixin";
-import { next } from "@ember/runloop";
 import { Promise } from "rsvp";
 
 export default Mixin.create(ModalFunctionality, {
@@ -12,7 +11,6 @@ export default Mixin.create(ModalFunctionality, {
   user: null,
   postId: null,
   successCallback: null,
-  confirmClose: false,
 
   resetModal() {
     this.setProperties({
@@ -23,30 +21,10 @@ export default Mixin.create(ModalFunctionality, {
       postEdit: null,
       postAction: "delete",
       before: null,
-      successCallback: null,
-      confirmClose: false
+      successCallback: null
     });
   },
 
-  beforeClose() {
-    // prompt a confirmation if we have unsaved content
-    if (
-      (this.reason && this.reason.length > 1) ||
-      (this.message && this.message.length > 1 && !this.confirmClose)
-    ) {
-      this.send("hideModal");
-      bootbox.confirm(I18n.t("admin.user.confirm_cancel_penalty"), result => {
-        if (result) {
-          this.set("confirmClose", true);
-          this.send("closeModal");
-        } else {
-          next(() => this.send("reopenModal"));
-        }
-      });
-      return false;
-    }
-  },
-
   penalize(cb) {
     let before = this.before;
     let promise = before ? before() : Promise.resolve();
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index eeae7edc3f..300a3e585c 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -31,16 +31,13 @@ export default Component.extend({
 
   @on("didInsertElement")
   setUp() {
-    $("html").on("keyup.discourse-modal", e => {
-      //only respond to events when the modal is visible
-      if ($("#discourse-modal:visible").length > 0) {
-        if (e.which === 27 && this.dismissable) {
-          next(() => $(".modal-header button.modal-close").click());
-        }
+    $("html").on("keydown.discourse-modal", e => {
+      if (e.which === 27 && this.dismissable) {
+        next(() => $(".modal-header button.modal-close").click());
+      }
 
-        if (e.which === 13 && this.triggerClickOnEnter(e)) {
-          next(() => $(".modal-footer .btn-primary").click());
-        }
+      if (e.which === 13 && this.triggerClickOnEnter(e)) {
+        next(() => $(".modal-footer .btn-primary").click());
       }
     });
 
@@ -49,7 +46,7 @@ export default Component.extend({
 
   @on("willDestroyElement")
   cleanUp() {
-    $("html").off("keyup.discourse-modal");
+    $("html").off("keydown.discourse-modal");
     this.appEvents.off("modal:body-shown", this, "_modalBodyShown");
   },
 
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 8dca333360..e877d8ceff 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -157,23 +157,12 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
     // Close the current modal, and destroy its state.
     closeModal() {
+      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
+
       const route = getOwner(this).lookup("route:application");
       let modalController = route.controllerFor("modal");
       const controllerName = modalController.get("name");
 
-      if (controllerName) {
-        const controller = getOwner(this).lookup(
-          `controller:${controllerName}`
-        );
-        if (controller && controller.beforeClose) {
-          if (false === controller.beforeClose()) {
-            return;
-          }
-        }
-      }
-
-      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
-
       if (controllerName) {
         const controller = getOwner(this).lookup(
           `controller:${controllerName}`
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c7705ab948..127c964d04 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4291,7 +4291,6 @@ en:
           threshold_reached: "Received too many bounces from that email."
         trust_level_change_failed: "There was a problem changing the user's trust level."
         suspend_modal_title: "Suspend User"
-        confirm_cancel_penalty: "Are you sure you want to discard the penalty?"
         trust_level_2_users: "Trust Level 2 Users"
         trust_level_3_requirements: "Trust Level 3 Requirements"
         trust_level_locked_tip: "trust level is locked, system will not promote or demote user"
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
index 936f7080bb..d9983848ca 100644
--- a/test/javascripts/acceptance/admin-suspend-user-test.js.es6
+++ b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
@@ -34,31 +34,6 @@ QUnit.test("suspend a user - cancel", async assert => {
   assert.equal(find(".suspend-user-modal:visible").length, 0);
 });
 
-QUnit.test("suspend a user - cancel with input", async assert => {
-  await visit("/admin/users/1234/regular");
-  await click(".suspend-user");
-
-  assert.equal(find(".suspend-user-modal:visible").length, 1);
-
-  await fillIn(".suspend-reason", "for breaking the rules");
-  await fillIn(".suspend-message", "this is an email reason why");
-
-  await click(".d-modal-cancel");
-
-  assert.equal(find(".bootbox.modal:visible").length, 1);
-
-  await click(".modal-footer .btn-default");
-  assert.equal(find(".suspend-user-modal:visible").length, 1);
-  assert.equal(
-    find(".suspend-message")[0].value,
-    "this is an email reason why"
-  );
-
-  await click(".d-modal-cancel");
-  await click(".modal-footer .btn-primary");
-  assert.equal(find(".suspend-user-modal:visible").length, 0);
-});
-
 QUnit.test("suspend, then unsuspend a user", async assert => {
   const suspendUntilCombobox = selectKit(".suspend-until .combobox");
 
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
index 4e43be89bb..13725f4d6c 100644
--- a/test/javascripts/acceptance/modal-test.js.es6
+++ b/test/javascripts/acceptance/modal-test.js.es6
@@ -28,7 +28,7 @@ QUnit.test("modal", async function(assert) {
   await click(".login-button");
   assert.ok(find(".d-modal:visible").length === 1, "modal should reappear");
 
-  await keyEvent("#main-outlet", "keyup", 27);
+  await keyEvent("#main-outlet", "keydown", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -47,7 +47,7 @@ QUnit.test("modal", async function(assert) {
     find(".d-modal:visible").length === 1,
     "modal should not disappear when you click outside"
   );
-  await keyEvent("#main-outlet", "keyup", 27);
+  await keyEvent("#main-outlet", "keydown", 27);
   assert.ok(
     find(".d-modal:visible").length === 1,
     "ESC should not close the modal"
@@ -61,7 +61,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".toggle-admin-menu");
   await click(".topic-admin-status-update button");
-  await keyEvent(".d-modal", "keyup", 13);
+  await keyEvent(".d-modal", "keydown", 13);
 
   assert.ok(
     find("#modal-alert:visible").length === 1,
@@ -72,7 +72,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
     "hitting Enter does not dismiss modal due to alert error"
   );
 
-  await keyEvent("#main-outlet", "keyup", 27);
+  await keyEvent("#main-outlet", "keydown", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -82,7 +82,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".d-editor-button-bar .btn.link");
 
-  await keyEvent(".d-modal", "keyup", 13);
+  await keyEvent(".d-modal", "keydown", 13);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "modal should disappear on hitting Enter"

From 494379201d8e2927a08f7b3656eb7d1f2949d044 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 6 Mar 2020 12:57:12 +1100
Subject: [PATCH 005/633] DEV: attempt to stabilize flaky spec

Spec was checking implementation when it did not need to, temp file was blank
so optimized image should be blank
---
 spec/models/optimized_image_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/models/optimized_image_spec.rb b/spec/models/optimized_image_spec.rb
index a7c8e2e352..e90029bec3 100644
--- a/spec/models/optimized_image_spec.rb
+++ b/spec/models/optimized_image_spec.rb
@@ -312,9 +312,10 @@ describe OptimizedImage do
         end
       end
 
-      context "when an error happened while generatign the thumbnail" do
+      context "when we have a bad file returned" do
         it "returns nil" do
-          OptimizedImage.expects(:resize).returns(false)
+          # tempfile is empty
+          # this can not be resized
           expect(OptimizedImage.create_for(s3_upload, 100, 200)).to eq(nil)
         end
       end

From 29ccdf5d3527d61b655c28c8790c94a1bdd6dcba Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 6 Mar 2020 14:37:40 +1000
Subject: [PATCH 006/633] FIX: Show a nicer error if name/code missing for
 TOTP/Security Keys (#9124)

Meta: https://meta.discourse.org/t/improve-error-message-when-not-including-name-setting-up-totp/143339

* when the user creates a TOTP second factor method we want
to show them a nicer error if they forget to add a name
or the code from the app, instead of the param missing error
* also add a client-side check for this and for security key name,
no need to bother the server if we can help it
---
 .../second-factor-add-security-key.js.es6     |  7 +++
 .../controllers/second-factor-add-totp.js.es6 |  8 ++-
 .../modal/second-factor-add-security-key.hbs  |  4 +-
 app/controllers/users_controller.rb           |  8 ++-
 config/locales/client.en.yml                  |  2 +
 config/locales/server.en.yml                  |  2 +
 spec/requests/users_controller_spec.rb        | 60 ++++++++++++++++++-
 .../acceptance/preferences-test.js.es6        | 40 +++++++++++--
 8 files changed, 120 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
index 54f41fc405..2cb03f968f 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
@@ -53,6 +53,13 @@ export default Controller.extend(ModalFunctionality, {
 
   actions: {
     registerSecurityKey() {
+      if (!this.securityKeyName) {
+        this.set(
+          "errorMessage",
+          I18n.t("user.second_factor.security_key.name_required_error")
+        );
+        return;
+      }
       const publicKeyCredentialCreationOptions = {
         challenge: Uint8Array.from(this.challenge, c => c.charCodeAt(0)),
         rp: {
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6
index eab4f2943f..10752e41c7 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6
@@ -45,7 +45,13 @@ export default Controller.extend(ModalFunctionality, {
     },
 
     enableSecondFactor() {
-      if (!this.secondFactorToken) return;
+      if (!this.secondFactorToken || !this.secondFactorName) {
+        this.set(
+          "errorMessage",
+          I18n.t("user.second_factor.totp.name_and_code_required_error")
+        );
+        return;
+      }
       this.set("loading", true);
 
       this.model
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index d63b5fe8eb..36ede3f634 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -16,7 +16,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{input value=securityKeyName id='test' placeholder='security key name'}}
+        {{input value=securityKeyName id='security-key-name' placeholder='security key name'}}
       </div>
     </div>
 
@@ -24,7 +24,7 @@
       <div class="controls">
         {{#unless webauthnUnsupported}}
           {{d-button
-            class="btn-primary add-totp"
+            class="btn-primary add-security-key"
             action=(action "registerSecurityKey")
             label="user.second_factor.security_key.register"}}
         {{/unless}}
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e96a79c953..33e7bdce6c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1211,8 +1211,12 @@ class UsersController < ApplicationController
   end
 
   def enable_second_factor_totp
-    params.require(:second_factor_token)
-    params.require(:name)
+    if params[:second_factor_token].blank?
+      return render json: failed_json.merge(error: I18n.t("login.missing_second_factor_code"))
+    end
+    if params[:name].blank?
+      return render json: failed_json.merge(error: I18n.t("login.missing_second_factor_name"))
+    end
     auth_token = params[:second_factor_token]
 
     totp_data = secure_session["staged-totp-#{current_user.id}"]
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 127c964d04..a18720a293 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1023,6 +1023,7 @@ en:
           title: "Token-Based Authenticators"
           add: "New Authenticator"
           default_name: "My Authenticator"
+          name_and_code_required_error: "You must provide a name and the code from your authenticator app."
         security_key:
           register: "Register"
           title: "Security Keys"
@@ -1033,6 +1034,7 @@ en:
           edit: "Edit Security Key"
           edit_description: "Security Key Name"
           delete: "Delete"
+          name_required_error: "You must provide a name for your security key."
 
       change_about:
         title: "Change About Me"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index c4db42fb1c..3705e98f01 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2381,6 +2381,8 @@ en:
     second_factor_backup_title: "Two Factor Backup Code"
     invalid_second_factor_code: "Invalid authentication code. Each code can only be used once."
     invalid_security_key: "Invalid security key."
+    missing_second_factor_name: "Please provide a name."
+    missing_second_factor_code: "Please provide a code."
     second_factor_toggle:
       totp: "Use an authenticator app or security key instead"
       backup_code: "Use a backup code instead"
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index ed28cab650..13aebdfd2f 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3522,6 +3522,58 @@ describe UsersController do
     end
   end
 
+  describe "#enable_second_factor_totp" do
+    before do
+      sign_in(user)
+    end
+
+    def create_totp
+      stub_secure_session_confirmed
+      post "/users/create_second_factor_totp.json"
+    end
+
+    it "creates a totp for the user successfully" do
+      create_totp
+      staged_totp_key = read_secure_session["staged-totp-#{user.id}"]
+      token = ROTP::TOTP.new(staged_totp_key).now
+
+      post "/users/enable_second_factor_totp.json", params: { name: "test", second_factor_token: token }
+
+      expect(response.status).to eq(200)
+      expect(user.user_second_factors.count).to eq(1)
+    end
+
+    context "when an incorrect token is provided" do
+      before do
+        create_totp
+        post "/users/enable_second_factor_totp.json", params: { name: "test", second_factor_token: "123456" }
+      end
+      it "shows a helpful error message to the user" do
+        expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.invalid_second_factor_code"))
+      end
+    end
+
+    context "when a name is not provided" do
+      before do
+        create_totp
+        post "/users/enable_second_factor_totp.json", params: { second_factor_token: "123456" }
+      end
+      it "shows a helpful error message to the user" do
+        expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.missing_second_factor_name"))
+      end
+    end
+
+    context "when a token is not provided" do
+      before do
+        create_totp
+        post "/users/enable_second_factor_totp.json", params: { name: "test" }
+      end
+      it "shows a helpful error message to the user" do
+        expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.missing_second_factor_code"))
+      end
+    end
+  end
+
   describe '#update_second_factor' do
     let(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
 
@@ -3554,7 +3606,7 @@ describe UsersController do
 
         context 'when token is valid' do
           before do
-            ApplicationController.any_instance.stubs(:secure_session).returns("confirmed-password-#{user.id}" => "true")
+            stub_secure_session_confirmed
           end
           it 'should allow second factor for the user to be renamed' do
             put "/users/second_factor.json", params: {
@@ -4062,7 +4114,11 @@ describe UsersController do
 
   def create_second_factor_security_key
     sign_in(user)
-    UsersController.any_instance.stubs(:secure_session_confirmed?).returns(true)
+    stub_secure_session_confirmed
     post "/u/create_second_factor_security_key.json"
   end
+
+  def stub_secure_session_confirmed
+    UsersController.any_instance.stubs(:secure_session_confirmed?).returns(true)
+  end
 end
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index ce5d8f68b1..c651c67802 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -20,6 +20,16 @@ acceptance("User Preferences", {
       });
     });
 
+    server.post("/u/create_second_factor_security_key.json", () => {
+      return helper.response({
+        challenge:
+          "a6d393d12654c130b2273e68ca25ca232d1d7f4c2464c2610fb8710a89d4",
+        rp_id: "localhost",
+        rp_name: "Discourse",
+        supported_algoriths: [-7, -257]
+      });
+    });
+
     server.post("/u/enable_second_factor_totp.json", () => {
       return helper.response({ error: "invalid token" });
     });
@@ -211,7 +221,7 @@ QUnit.test("connected accounts", async assert => {
     .indexOf("Connect") > -1;
 });
 
-QUnit.test("second factor", async assert => {
+QUnit.test("second factor totp", async assert => {
   await visit("/u/eviltrout/preferences/second-factor");
 
   assert.ok(exists("#password"), "it has a password input");
@@ -223,14 +233,36 @@ QUnit.test("second factor", async assert => {
   await click(".new-totp");
   assert.ok(exists("#test-qr"), "shows qr code");
 
-  await fillIn("#second-factor-token", "111111");
   await click(".add-totp");
 
   assert.ok(
     find(".alert-error")
       .html()
-      .indexOf("invalid token") > -1,
-    "shows server validation error message"
+      .indexOf("provide a name and the code") > -1,
+    "shows name/token missing error message"
+  );
+});
+
+QUnit.test("second factor security keys", async assert => {
+  await visit("/u/eviltrout/preferences/second-factor");
+
+  assert.ok(exists("#password"), "it has a password input");
+
+  await fillIn("#password", "secrets");
+  await click(".user-preferences .btn-primary");
+  assert.notOk(exists("#password"), "it hides the password input");
+
+  await click(".new-security-key");
+  assert.ok(exists("#security-key-name"), "shows security key name input");
+
+  fillIn("#security-key-name", "");
+  await click(".add-security-key");
+
+  assert.ok(
+    find(".alert-error")
+      .html()
+      .indexOf("provide a name") > -1,
+    "shows name missing error message"
   );
 });
 

From ff62911a89d721ebec1716990c5e407e572d8960 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 6 Mar 2020 12:23:22 +0000
Subject: [PATCH 007/633] FEATURE: New route for loading multiple user cards
 simultaneously (#9078)

Introduces `/user-cards.json`

Also allows the client-side user model to be passed an existing promise when loading, so that multiple models can share the same AJAX request
---
 .../javascripts/discourse/models/user.js.es6  |  6 +++-
 app/controllers/users_controller.rb           | 24 ++++++++++++++++
 config/routes.rb                              |  2 ++
 spec/requests/users_controller_spec.rb        | 28 +++++++++++++++++++
 4 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 6927676805..84c2765f6f 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -536,8 +536,12 @@ const User = RestModel.extend({
     const user = this;
 
     return PreloadStore.getAndRemove(`user_${user.get("username")}`, () => {
-      const useCardRoute = options && options.forCard;
+      if (options && options.existingRequest) {
+        // Existing ajax request has been passed, use it
+        return options.existingRequest;
+      }
 
+      const useCardRoute = options && options.forCard;
       if (options) delete options.forCard;
 
       const path = useCardRoute
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 33e7bdce6c..5b7bbc7022 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -99,6 +99,30 @@ class UsersController < ApplicationController
     show(for_card: true)
   end
 
+  def cards
+    return redirect_to path('/login') if SiteSetting.hide_user_profiles_from_public && !current_user
+
+    user_ids = params.require(:user_ids).split(",").map(&:to_i)
+    raise Discourse::InvalidParameters.new(:user_ids) if user_ids.length > 50
+
+    users = User.where(id: user_ids).includes(:user_option,
+                                              :user_stat,
+                                              :default_featured_user_badges,
+                                              :user_profile,
+                                              :card_background_upload,
+                                              :primary_group,
+                                              :primary_email
+                                            )
+
+    users = users.filter { |u| guardian.can_see_profile?(u) }
+
+    preload_fields = User.whitelisted_user_custom_fields(guardian) + UserField.all.pluck(:id).map { |fid| "#{User::USER_FIELD_PREFIX}#{fid}" }
+    User.preload_custom_fields(users, preload_fields)
+    User.preload_recent_time_read(users)
+
+    render json: users, each_serializer: UserCardSerializer
+  end
+
   def badges
     raise Discourse::NotFound unless SiteSetting.enable_badges?
     show
diff --git a/config/routes.rb b/config/routes.rb
index 8fd2d19727..38047b91eb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -367,6 +367,8 @@ Discourse::Application.routes.draw do
   get "user_preferences" => "users#user_preferences_redirect"
   get ".well-known/change-password", to: redirect(relative_url_root + 'my/preferences/account', status: 302)
 
+  get "user-cards" => "users#cards", format: :json
+
   %w{users u}.each_with_index do |root_path, index|
     get "#{root_path}" => "users#index", constraints: { format: 'html' }
 
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 13aebdfd2f..7a15170e38 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3052,6 +3052,34 @@ describe UsersController do
     end
   end
 
+  describe "#cards" do
+    fab!(:user) { Discourse.system_user }
+    fab!(:user2) { Fabricate(:user) }
+
+    it "returns success" do
+      get "/user-cards.json?user_ids=#{user.id},#{user2.id}"
+      expect(response.status).to eq(200)
+      parsed = JSON.parse(response.body)["users"]
+
+      expect(parsed.map { |u| u["username"] }).to contain_exactly(user.username, user2.username)
+    end
+
+    it "should redirect to login page for anonymous user when profiles are hidden" do
+      SiteSetting.hide_user_profiles_from_public = true
+      get "/user-cards.json?user_ids=#{user.id},#{user2.id}"
+      expect(response).to redirect_to '/login'
+    end
+
+    it "does not include hidden profiles" do
+      user2.user_option.update(hide_profile_and_presence: true)
+      get "/user-cards.json?user_ids=#{user.id},#{user2.id}"
+      expect(response.status).to eq(200)
+      parsed = JSON.parse(response.body)["users"]
+
+      expect(parsed.map { |u| u["username"] }).to contain_exactly(user.username)
+    end
+  end
+
   describe '#badges' do
     it "renders fine by default" do
       get "/u/#{user.username}/badges"

From 665d8564d80902a3f9febe837466988ceb3fa33b Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 6 Mar 2020 11:19:34 -0300
Subject: [PATCH 008/633] DEV: Use the updated version of our mousetrap fork
 (#9111)

---
 yarn.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 2ff91e0b49..005db309fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1915,8 +1915,8 @@ moment@^2.10.2:
   integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
 
 "mousetrap@https://github.com/discourse/mousetrap#firefox-alt-key":
-  version "1.6.3"
-  resolved "https://github.com/discourse/mousetrap#0d41aa7b173abfb83a6bec3ad39a6a708bc49108"
+  version "1.6.5"
+  resolved "https://github.com/discourse/mousetrap#cc8e2c0b9229e1a01ce68de4f339b6fd35503041"
 
 ms@2.0.0:
   version "2.0.0"

From a5f61729e0593804051047df86f1a8e1d271794a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 6 Mar 2020 08:49:28 -0500
Subject: [PATCH 009/633] Revert "Revert "FIX: Don't allow people to clear the
 upload bucket while it's enabled""

This reverts commit d4fc76b335d012275b06b7ce80d0c1b98f9db33d.
---
 lib/site_settings/validations.rb           | 2 ++
 spec/lib/site_settings/validations_spec.rb | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rb
index 56987b0dfe..0bf13f7606 100644
--- a/lib/site_settings/validations.rb
+++ b/lib/site_settings/validations.rb
@@ -143,6 +143,8 @@ module SiteSettings::Validations
 
   def validate_s3_upload_bucket(new_val)
     validate_bucket_setting("s3_upload_bucket", new_val, SiteSetting.s3_backup_bucket)
+
+    validate_error(:s3_upload_bucket_is_required, setting_name: 's3_upload_bucket') if new_val.blank? && SiteSetting.enable_s3_uploads?
   end
 
   def validate_s3_backup_bucket(new_val)
diff --git a/spec/lib/site_settings/validations_spec.rb b/spec/lib/site_settings/validations_spec.rb
index 7f346d4d5c..69ab73920b 100644
--- a/spec/lib/site_settings/validations_spec.rb
+++ b/spec/lib/site_settings/validations_spec.rb
@@ -103,6 +103,15 @@ describe SiteSettings::Validations do
         SiteSetting.s3_backup_bucket = "my-awesome-bucket/foo"
         expect { validate("my-awesome-bucket/foo/uploads") }.to raise_error(Discourse::InvalidParameters, error_message)
       end
+
+      it "cannot be made blank unless the setting is false" do
+        SiteSetting.s3_backup_bucket = "really-real-cool-bucket"
+        SiteSetting.enable_s3_uploads = true
+
+        expect { validate("") }.to raise_error(Discourse::InvalidParameters)
+        SiteSetting.enable_s3_uploads = false
+        validate("")
+      end
     end
   end
 

From 91682408e0fc47e0c2d72a993988797eb2d095ac Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 6 Mar 2020 09:35:38 -0500
Subject: [PATCH 010/633] Remove very bad tests

---
 spec/models/admin_dashboard_problem_spec.rb | 104 --------------------
 1 file changed, 104 deletions(-)

diff --git a/spec/models/admin_dashboard_problem_spec.rb b/spec/models/admin_dashboard_problem_spec.rb
index c61b346224..84b596e17b 100644
--- a/spec/models/admin_dashboard_problem_spec.rb
+++ b/spec/models/admin_dashboard_problem_spec.rb
@@ -194,110 +194,6 @@ describe AdminDashboardData do
     end
   end
 
-  describe 's3_config_check' do
-    shared_examples 'problem detection for s3-dependent setting' do
-      subject { described_class.new.s3_config_check }
-      let(:access_keys) { [:s3_access_key_id, :s3_secret_access_key] }
-      let(:all_cred_keys) { access_keys + [:s3_use_iam_profile] }
-      let(:all_setting_keys) { all_cred_keys + [bucket_key] }
-
-      def all_setting_permutations(keys)
-        ['a', ''].repeated_permutation(keys.size) do |*values|
-          hash = Hash[keys.zip(values)]
-          hash.each do |key, value|
-            SiteSetting.set(key, value)
-          end
-          yield hash
-        end
-      end
-
-      context 'when setting is enabled' do
-        before do
-          all_setting_keys.each { |key| SiteSetting.set(key, 'foo') }
-          SiteSetting.set(setting[:key], setting[:enabled_value])
-          SiteSetting.set(bucket_key, bucket_value)
-        end
-
-        context 'when bucket is blank' do
-          let(:bucket_value) { '' }
-
-          it "always returns a string" do
-            all_setting_permutations(all_cred_keys) do
-              expect(subject).to_not be_nil
-            end
-          end
-        end
-
-        context 'when bucket is filled in' do
-          let(:bucket_value) { 'a' }
-          before do
-            SiteSetting.s3_use_iam_profile = use_iam_profile
-          end
-
-          context 'when using iam profile' do
-            let(:use_iam_profile) { true }
-
-            it 'always returns nil' do
-              all_setting_permutations(access_keys) do
-                expect(subject).to be_nil
-              end
-            end
-          end
-
-          context 'when not using iam profile' do
-            let(:use_iam_profile) { false }
-
-            it 'returns nil only if both access key fields are filled in' do
-              all_setting_permutations(access_keys) do |settings|
-                if settings.values.all?
-                  expect(subject).to be_nil
-                else
-                  expect(subject).to_not be_nil
-                end
-              end
-            end
-          end
-        end
-      end
-
-      context 'when setting is not enabled' do
-        before do
-          SiteSetting.set(setting[:key], setting[:disabled_value])
-        end
-
-        it "always returns nil" do
-          all_setting_permutations(all_setting_keys) do
-            expect(subject).to be_nil
-          end
-        end
-      end
-    end
-
-    describe 'uploads' do
-      let(:setting) do
-        {
-          key: :enable_s3_uploads,
-          enabled_value: true,
-          disabled_value: false
-        }
-      end
-      let(:bucket_key) { :s3_upload_bucket }
-      include_examples 'problem detection for s3-dependent setting'
-    end
-
-    describe 'backups' do
-      let(:setting) do
-        {
-          key: :backup_location,
-          enabled_value: BackupLocationSiteSetting::S3,
-          disabled_value: BackupLocationSiteSetting::LOCAL
-        }
-      end
-      let(:bucket_key) { :s3_backup_bucket }
-      include_examples 'problem detection for s3-dependent setting'
-    end
-  end
-
   describe 'force_https_check' do
     subject { described_class.new(check_force_https: true).force_https_check }
 

From a24f51278a954ebd2d0da9580580caf57c36b2ee Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 6 Mar 2020 17:35:18 +0100
Subject: [PATCH 011/633] DEV: enforces link-rel-noopener linting rule (#8936)

* DEV: enforces link-rel-noopener linting rule

* oops

* better syntax
---
 .template-lintrc.js                                  |  3 ++-
 .../javascripts/admin/templates/badges-index.hbs     |  2 +-
 .../admin/templates/customize-themes-edit.hbs        | 12 +++++++-----
 .../admin/templates/customize-themes-index.hbs       |  2 +-
 .../admin/templates/customize-themes-show.hbs        |  6 +++---
 .../admin/templates/modal/admin-install-theme.hbs    |  4 ++--
 .../admin/templates/modal/admin-theme-item.hbs       |  2 +-
 .../javascripts/admin/templates/plugins-index.hbs    |  2 +-
 .../javascripts/admin/templates/version-checks.hbs   |  2 +-
 .../discourse/templates/components/backup-codes.hbs  |  1 +
 .../discourse/templates/components/ip-lookup.hbs     |  2 +-
 .../templates/components/user-card-contents.hbs      |  3 ++-
 .../discourse/templates/review-topics.hbs            |  2 +-
 .../discourse/templates/user-invited-show.hbs        |  2 +-
 app/assets/javascripts/discourse/templates/user.hbs  |  3 ++-
 .../javascripts/discourse/templates/user/summary.hbs |  3 ++-
 .../wizard/templates/components/popular-themes.hbs   |  2 +-
 17 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 5731778fc0..3a85b721b0 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -6,6 +6,7 @@ module.exports = {
     "self-closing-void-elements": true,
     "table-groups": true,
     "style-concatenation": true,
-    "no-invalid-interactive": true
+    "no-invalid-interactive": true,
+    "link-rel-noopener": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index a3296fc23e..fd08e67279 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -5,7 +5,7 @@
       <h1>{{i18n 'admin.badges.badge_intro.title'}}</h1>
       <div class="external-resources">
         {{#each badgeIntroLinks as |link|}}
-          <a href={{link.href}} class="external-link" target="_blank">
+          <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
             {{d-icon link.icon}}
             <span>{{I18n link.text}}</span>
           </a>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index d17ab8d2f3..5fdaa76885 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -2,20 +2,22 @@
   <div class='wrapper'>
     <h2>{{i18n 'admin.customize.theme.edit_css_html'}} {{#link-to showRouteName model.id replace=true}}{{model.name}}{{/link-to}}</h2>
 
-    {{admin-theme-editor 
-      theme=model 
-      editRouteName=editRouteName 
+    {{admin-theme-editor
+      theme=model
+      editRouteName=editRouteName
       currentTargetName=currentTargetName
       fieldName=fieldName
       fieldAdded=(action 'fieldAdded')
       maximized=maximized
       onlyOverriddenChanged=(action 'onlyOverriddenChanged')
     }}
-    
+
     <div class='admin-footer'>
       <div class='status-actions'>
         {{#unless model.changed}}
-          <a class='preview-link' href={{previewUrl}} target='_blank' title="{{i18n 'admin.customize.explain_preview'}}">{{i18n 'admin.customize.preview'}}</a>
+          <a class='preview-link' href={{previewUrl}} rel="noopener" target='_blank' title="{{i18n 'admin.customize.explain_preview'}}">
+            {{i18n 'admin.customize.preview'}}
+          </a>
         {{/unless}}
       </div>
 
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 56438e5ae7..0a6060724b 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -7,7 +7,7 @@
     </div>
     <div class="external-resources">
       {{#each externalResources as |resource|}}
-        <a href={{resource.link}} class="external-link" target="_blank">
+        <a href={{resource.link}} class="external-link" rel="noopener" target="_blank">
           {{d-icon resource.icon}}
           {{I18n resource.key}}
         </a>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index de6b46da74..2687c6b692 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -206,7 +206,7 @@
       <ul class='removable-list'>
         {{#each model.uploads as |upload|}}
           <li>
-            <span class='col'>${{upload.name}}: <a href={{upload.url}} target='_blank'>{{upload.filename}}</a></span>
+            <span class='col'>${{upload.name}}: <a href={{upload.url}} rel="noopener" target='_blank'>{{upload.filename}}</a></span>
             <span class='col'>
               {{d-button action=(action "removeUpload") actionParam=upload class="second btn-default btn-default cancel-edit" icon="times"}}
             </span>
@@ -241,8 +241,8 @@
     </div>
   {{/if}}
 
-  <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
-  <a class="btn btn-default export" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
+  <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" rel="noopener" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
+  <a class="btn btn-default export" rel="noopener" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
 
   {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
 
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index 7307abb411..eec9151f90 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -11,7 +11,7 @@
         {{#each themes as |theme|}}
           <div class="popular-theme-item">
             <div class="popular-theme-name">
-              <a href="{{theme.meta_url}}" target="_blank">
+              <a href="{{theme.meta_url}}" rel="noopener" target="_blank">
                 {{#if theme.component}}
                   {{d-icon 'puzzle-piece' title='admin.customize.theme.component'}}
                 {{/if}}
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href="{{theme.preview}}" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
+                  <a href="{{theme.preview}}" rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index e1b6bd0fe8..27e5cd5ec5 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -2,7 +2,7 @@
   <div class="popular-theme-name">
     {{theme.name}}
     {{#if theme.preview}}
-      <a href="{{theme.preview}}" title="Preview" target="_blank">{{d-icon "far-eye"}}</a>
+      <a href="{{theme.preview}}" title="Preview" rel="noopener" target="_blank">{{d-icon "far-eye"}}</a>
     {{/if}}
   </div>
   <div class="popular-theme-buttons">
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index cf2be40ee4..9370d8457c 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -27,7 +27,7 @@
 
           <td class="plugin-name">
             {{#if plugin.url}}
-              <a href={{plugin.url}} target="_blank">{{plugin.name}}</a>
+              <a href={{plugin.url}} rel="noopener" target="_blank">{{plugin.name}}</a>
             {{else}}
               {{plugin.name}}
             {{/if}}
diff --git a/app/assets/javascripts/admin/templates/version-checks.hbs b/app/assets/javascripts/admin/templates/version-checks.hbs
index ced3da8b79..bd0bc3b981 100644
--- a/app/assets/javascripts/admin/templates/version-checks.hbs
+++ b/app/assets/javascripts/admin/templates/version-checks.hbs
@@ -8,7 +8,7 @@
         <h3>{{dash-if-empty versionCheck.installed_version}}</h3>
         {{#if versionCheck.gitLink}}
           <div class="sha-link">
-            (<a href={{versionCheck.gitLink}} target="_blank">{{versionCheck.shortSha}}</a>)
+            (<a href={{versionCheck.gitLink}} rel="noopener" target="_blank">{{versionCheck.shortSha}}</a>)
           </div>
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
index bd591ee6c3..046baed16a 100644
--- a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
@@ -8,6 +8,7 @@
 
   <a download="backup_codes.txt"
      class="btn no-text btn-icon backup-codes-download-btn"
+     rel="noopener"
      target="_blank"
      href="data:application/octet-stream;charset=utf-8;base64,{{base64BackupCode}}">
     {{d-icon "download"}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 9c9c2d3950..347823e2ef 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -25,7 +25,7 @@
         <dt>{{i18n "ip_lookup.location"}}</dt>
         <dd>
           {{#if location.location}}
-            <a href="https://maps.google.com/maps?q={{unbound location.latitude}},{{unbound location.longitude}}" target="_blank">
+            <a href="https://maps.google.com/maps?q={{unbound location.latitude}},{{unbound location.longitude}}" rel="noopener" target="_blank">
               {{location.location}}
             </a>
           {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index c96a9cb511..ba00265392 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -160,7 +160,8 @@
               <span class='website-name'>
                 {{d-icon "globe"}}
                 {{#if linkWebsite}}
-                  <a href="{{user.website}}" rel={{unless removeNoFollow 'nofollow ugc noopener'}}
+                  {{!-- template-lint-disable  --}}
+                  <a href="{{user.website}}" rel="noopener {{unless removeNoFollow 'nofollow ugc'}}"
                    target="_blank">{{user.website_name}}</a>
                 {{else}}
                   <span title={{user.website}}>{{user.website_name}}</span>
diff --git a/app/assets/javascripts/discourse/templates/review-topics.hbs b/app/assets/javascripts/discourse/templates/review-topics.hbs
index 029c5c310a..5e548c3215 100644
--- a/app/assets/javascripts/discourse/templates/review-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/review-topics.hbs
@@ -12,7 +12,7 @@
         <td class="topic-title">
           <div class='combined-title'>
             {{topic-status topic=rt}}
-            <a href={{rt.relative_url}} target="_blank">{{replace-emoji rt.fancy_title}}</a>
+            <a href={{rt.relative_url}} rel="noopener" target="_blank">{{replace-emoji rt.fancy_title}}</a>
           </div>
         </td>
         <td class="reviewable-count">
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 958b0a96af..5e95282ab4 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -17,7 +17,7 @@
               {{d-button icon="plus" action=(route-action "showInvite") label="user.invited.create"}}
               {{#if canBulkInvite}}
                 {{csv-uploader uploading=uploading}}
-                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
+                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" rel="noopener" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
               {{/if}}
               {{#if showBulkActionButtons}}
                 {{#if rescindedAll}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index a073738c35..520fb78e88 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -110,7 +110,8 @@
             <div class="user-profile-website">
               {{d-icon "globe"}}
               {{#if linkWebsite}}
-                <a href={{model.website}} rel={{unless removeNoFollow 'nofollow ugc noopener'}} target="_blank">{{model.website_name}}</a>
+                {{!-- template-lint-disable  --}}
+                <a href={{model.website}} rel="noopener {{unless removeNoFollow 'nofollow ugc'}}" target="_blank">{{model.website_name}}</a>
               {{else}}
                 <span title={{model.website}}>{{model.website_name}}</span>
               {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index e751d80e96..e7d92afb82 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -77,10 +77,11 @@
         <ul>
           {{#each model.links as |link|}}
             <li>
+              {{!-- template-lint-disable  --}}
               <a class='domain'
                  href='{{unbound link.url}}'
                  title='{{unbound link.title}}'
-                 rel='{{unless user.removeNoFollow 'nofollow ugc noopener'}}'
+                 rel='noopener {{unless user.removeNoFollow 'nofollow ugc'}}'
                  target='_blank'>
                 {{shorten-url link.url}}
               </a>
diff --git a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
index 95dda74dbb..42756d3ceb 100644
--- a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
+++ b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
@@ -1,5 +1,5 @@
 {{#each popular_components as |theme|}}
-  <a class="popular-theme-item" href="{{theme.meta_url}}" target="_blank">
+  <a class="popular-theme-item" href="{{theme.meta_url}}" rel="noopener" target="_blank">
     {{theme.name}}
   </a>
 {{/each}}

From 475f545557bb06924a790c6fb644d834e86892a0 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 6 Mar 2020 10:35:52 -0600
Subject: [PATCH 012/633] DEV: Test theme js compiler append_raw_template
 (#8950)

* DEV: Test for append_raw_template

* remove empty line
---
 lib/theme_javascript_compiler.rb           | 10 ++++++----
 spec/lib/theme_javascript_compiler_spec.rb | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index d7ea11362f..b0906eb356 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -186,15 +186,17 @@ class ThemeJavascriptCompiler
     raise CompileError.new e.instance_variable_get(:@error) # e.message contains the entire template, which could be very long
   end
 
+  def raw_template_name(name)
+    name = name.sub(/\.(raw|hbr)$/, '')
+    name.inspect
+  end
+
   def append_raw_template(name, hbs_template)
-    name = name.sub(/\.raw$/, '')
-    name = name.sub(/\.hbr$/, '.hbs')
-    name = name.inspect
     compiled = RawTemplatePrecompiler.new(@theme_id).compile(hbs_template)
     @content << <<~JS
       (function() {
         if ('Discourse' in window) {
-          Discourse.RAW_TEMPLATES[#{name}] = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled});
+          Discourse.RAW_TEMPLATES[#{raw_template_name(name)}] = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled});
         }
       })();
     JS
diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb
index 911ce18c09..ca0c9cd046 100644
--- a/spec/lib/theme_javascript_compiler_spec.rb
+++ b/spec/lib/theme_javascript_compiler_spec.rb
@@ -110,4 +110,21 @@ describe ThemeJavascriptCompiler do
     end
   end
 
+  describe "#append_raw_template" do
+    let(:compiler) { ThemeJavascriptCompiler.new(1, 'marks') }
+    it 'adds the correct template to "Discourse.RAW_TEMPLATES"' do
+      template = "<h1>hello</h1>"
+      name = "/path/to/templates1"
+      compiler.append_raw_template("#{name}.raw", template)
+      expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}\"]")
+
+      name = "/path/to/templates2"
+      compiler.append_raw_template("#{name}.hbr", template)
+      expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}\"]")
+
+      name = "/path/to/templates3"
+      compiler.append_raw_template("#{name}.hbs", template)
+      expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}.hbs\"]")
+    end
+  end
 end

From 03d5a80aef312d223d0db24d195a4d21aeb36009 Mon Sep 17 00:00:00 2001
From: Dan Dascalescu <ddascalescu+github@gmail.com>
Date: Sat, 7 Mar 2020 05:38:01 +1300
Subject: [PATCH 013/633] Elastic Email can now disable the UNSUB link for
 Discourse installs (#8986)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Elastic Email can now disable the UNSUB link for Discourse installs

* Update docs/INSTALL-email.md

Co-authored-by: Régis Hanol <regis@hanol.fr>
---
 docs/INSTALL-email.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/INSTALL-email.md b/docs/INSTALL-email.md
index e582a9ca85..bc4a8bf570 100644
--- a/docs/INSTALL-email.md
+++ b/docs/INSTALL-email.md
@@ -35,7 +35,7 @@ Go to [My Account page](https://app.mailjet.com/account) and click on the ["SMTP
     SMTP password?       [Elastic Email API Key]
     SMTP port?           2525
     
-NOTE: Elastic Email policy insists on an additional UNSUBSCRIBE link at the bottom of each sent email. If this is a problem for your needs, consider using other providers. [See discussion here](https://meta.discourse.org/t/remove-or-merge-elastic-email-unsubscribe/70236).
+NOTE: By default, Elastic Email will add an additional UNSUBSCRIBE link at the bottom of each sent email. You need to work with them to [disable that link](https://meta.discourse.org/t/remove-or-merge-elastic-email-unsubscribe/70236/39), so that Discourse users can manage their subscription through Discourse.
 
    [ee]: https://elasticemail.com
   [jet]: https://www.mailjet.com/pricing

From ef6b7bd77614152e98057a5f37678e635d1b9ae7 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 6 Mar 2020 17:41:41 +0100
Subject: [PATCH 014/633] DEV: Use aliased `inject` imports (#9086)

This is a common Ember idiom for easier differentiation between controller and service imports.
---
 .../admin/controllers/admin-backups-index.js.es6  |  5 ++---
 .../admin/controllers/admin-backups-logs.js.es6   |  6 +++---
 .../admin/controllers/admin-badges-show.js.es6    |  4 ++--
 .../admin-site-settings-category.js.es6           |  5 ++---
 .../admin/controllers/admin-user-badges.js.es6    |  5 ++---
 .../controllers/admin-watched-words-action.js.es6 |  5 ++---
 .../admin/controllers/admin-web-hooks-show.js.es6 |  5 ++---
 .../controllers/modals/admin-add-upload.js.es6    |  5 ++---
 .../modals/admin-color-scheme-select-base.js.es6  |  5 ++---
 .../controllers/modals/admin-install-theme.js.es6 |  7 +++----
 .../controllers/modals/admin-start-backup.js.es6  |  5 ++---
 .../discourse/controllers/activation-edit.js.es6  |  5 ++---
 .../discourse/controllers/badges/show.js.es6      |  5 ++---
 .../controllers/bulk-notification-level.js.es6    |  5 ++---
 .../discourse/controllers/create-account.js.es6   |  5 ++---
 .../discourse/controllers/discovery.js.es6        |  9 ++++-----
 .../controllers/discovery/categories.js.es6       |  4 ++--
 .../discourse/controllers/discovery/topics.js.es6 |  6 +++---
 .../discourse/controllers/full-page-search.js.es6 |  7 +++----
 .../controllers/group-activity-posts.js.es6       |  9 ++++-----
 .../discourse/controllers/group-index.js.es6      |  4 ++--
 .../controllers/group-manage-logs.js.es6          |  7 +++----
 .../discourse/controllers/group-requests.js.es6   |  4 ++--
 .../discourse/controllers/group.js.es6            |  5 ++---
 .../discourse/controllers/groups-index.js.es6     |  5 ++---
 .../discourse/controllers/login.js.es6            |  9 ++++-----
 .../controllers/navigation/default.js.es6         |  7 +++----
 .../discourse/controllers/static.js.es6           |  5 ++---
 .../discourse/controllers/tag-groups-edit.js.es6  |  5 ++---
 .../discourse/controllers/tag-groups-new.js.es6   |  4 ++--
 .../discourse/controllers/tags-show.js.es6        |  5 ++---
 .../discourse/controllers/topic.js.es6            | 15 +++++++--------
 .../discourse/controllers/user-activity.js.es6    |  7 +++----
 .../discourse/controllers/user-badges.js.es6      |  6 +++---
 .../discourse/controllers/user-card.js.es6        |  5 ++---
 .../controllers/user-notifications.js.es6         |  5 ++---
 .../discourse/controllers/user-posts.js.es6       |  5 ++---
 .../controllers/user-private-messages.js.es6      |  7 +++----
 .../discourse/controllers/user-topics-list.js.es6 |  5 ++---
 .../discourse/controllers/users.js.es6            |  5 ++---
 40 files changed, 100 insertions(+), 132 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
index 01103105e8..45f25dd617 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
@@ -1,12 +1,11 @@
 import { alias, equal } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 import { setting, i18n } from "discourse/lib/computed";
 
 export default Controller.extend({
-  adminBackups: inject(),
+  adminBackups: controller(),
   status: alias("adminBackups.model"),
   uploadLabel: i18n("admin.backups.upload.label"),
   backupLocation: setting("backup_location"),
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
index a32e216255..69a81f9b67 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
@@ -1,8 +1,8 @@
 import { alias } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
+
 export default Controller.extend({
-  adminBackups: inject(),
+  adminBackups: controller(),
   status: alias("adminBackups.model"),
 
   init() {
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
index 0586a33505..a860d2f992 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -1,13 +1,13 @@
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
-import Controller, { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { propertyNotEqual } from "discourse/lib/computed";
 import { run } from "@ember/runloop";
 
 export default Controller.extend(bufferedProperty("model"), {
-  adminBadges: inject(),
+  adminBadges: controller(),
   saving: false,
   savingStatus: "",
   badgeTypes: reads("adminBadges.badgeTypes"),
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
index bfd727e6ea..b2c29730ec 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
@@ -1,10 +1,9 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 
 export default Controller.extend({
+  adminSiteSettings: controller(),
   categoryNameKey: null,
-  adminSiteSettings: inject(),
 
   @discourseComputed("adminSiteSettings.visibleSiteSettings", "categoryNameKey")
   category(categories, nameKey) {
diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
index 3bedafb45c..a42bf58ca5 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,13 +1,12 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, sort } from "@ember/object/computed";
 import { next } from "@ember/runloop";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(GrantBadgeController, {
-  adminUser: inject(),
+  adminUser: controller(),
   user: alias("adminUser.model"),
   userBadges: alias("model"),
   allBadges: alias("badges"),
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
index d6f52c13fd..5de00031a5 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
@@ -1,16 +1,15 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import WatchedWord from "admin/models/watched-word";
 import { ajax } from "discourse/lib/ajax";
 import { fmt } from "discourse/lib/computed";
 import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend({
+  adminWatchedWords: controller(),
   actionNameKey: null,
-  adminWatchedWords: inject(),
   showWordsList: or(
     "adminWatchedWords.filtered",
     "adminWatchedWords.showWords"
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
index 4ba34034f3..4332f52d9c 100644
--- a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
@@ -1,14 +1,13 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { extractDomainFromUrl } from "discourse/lib/utilities";
 import EmberObject from "@ember/object";
 
 export default Controller.extend({
-  adminWebHooks: inject(),
+  adminWebHooks: controller(),
   eventTypes: alias("adminWebHooks.eventTypes"),
   defaultEventTypes: alias("adminWebHooks.defaultEventTypes"),
   contentTypes: alias("adminWebHooks.contentTypes"),
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
index c7d9447d8d..6fb2859618 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
@@ -1,7 +1,6 @@
 import { isEmpty } from "@ember/utils";
 import { and, not } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
@@ -54,7 +53,7 @@ const SCSS_VARIABLE_NAMES = [
 ];
 
 export default Controller.extend(ModalFunctionality, {
-  adminCustomizeThemesShow: inject(),
+  adminCustomizeThemesShow: controller(),
 
   uploadUrl: "/admin/themes/upload_asset",
 
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
index e0b7bfe7e6..1ea601202d 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
@@ -1,9 +1,8 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
-  adminCustomizeColors: inject(),
+  adminCustomizeColors: controller(),
 
   selectedBaseThemeId: null,
 
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6
index cfb61ccc8f..7c0036539c 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6
@@ -1,6 +1,5 @@
 import { equal, match, alias } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -12,12 +11,13 @@ import { set } from "@ember/object";
 const MIN_NAME_LENGTH = 4;
 
 export default Controller.extend(ModalFunctionality, {
+  adminCustomizeThemes: controller(),
+  themesController: controller("adminCustomizeThemes"),
   popular: equal("selection", "popular"),
   local: equal("selection", "local"),
   remote: equal("selection", "remote"),
   create: equal("selection", "create"),
   selection: "popular",
-  adminCustomizeThemes: inject(),
   loading: false,
   keyGenUrl: "/admin/themes/generate_key_pair",
   importUrl: "/admin/themes/import",
@@ -27,7 +27,6 @@ export default Controller.extend(ModalFunctionality, {
   uploadUrl: null,
   urlPlaceholder: "https://github.com/discourse/sample_theme",
   advancedVisible: false,
-  themesController: inject("adminCustomizeThemes"),
   selectedType: alias("themesController.currentTab"),
   component: equal("selectedType", COMPONENTS),
 
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
index b4cc2f188d..c2136e6cc6 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
@@ -1,9 +1,8 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
-  adminBackupsLogs: inject(),
+  adminBackupsLogs: controller(),
 
   actions: {
     startBackupWithUploads() {
diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
index 010878f720..334f6582c5 100644
--- a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
@@ -1,12 +1,11 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { extractError } from "discourse/lib/ajax-error";
 import { changeEmail } from "discourse/lib/user-activation";
 
 export default Controller.extend(ModalFunctionality, {
-  login: inject(),
+  login: controller(),
 
   currentEmail: null,
   newEmail: null,
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index e9d70aa80f..ae89c737ea 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -1,15 +1,14 @@
-import { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import EmberObject from "@ember/object";
-import Controller from "@ember/controller";
 import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
+  application: controller(),
   queryParams: ["username"],
   noMoreBadges: false,
   userBadges: null,
-  application: inject(),
   hiddenSetTitle: true,
 
   @discourseComputed("userBadgesAll")
diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6 b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
index d9627ee47f..7e0642c9fc 100644
--- a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
@@ -1,12 +1,11 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { empty } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { topicLevels } from "discourse/lib/notification-levels";
 
 // Support for changing the notification level of various topics
 export default Controller.extend({
-  topicBulkActions: inject(),
+  topicBulkActions: controller(),
   notificationLevelId: null,
 
   @discourseComputed
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 9e7c03d121..62085e548e 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -1,7 +1,6 @@
 import { isEmpty } from "@ember/utils";
 import { notEmpty, or, not } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { setting } from "discourse/lib/computed";
@@ -26,7 +25,7 @@ export default Controller.extend(
   NameValidation,
   UserFieldsValidation,
   {
-    login: inject(),
+    login: controller(),
 
     complete: false,
     accountChallenge: 0,
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index fa374b4372..9d666eb271 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -1,14 +1,13 @@
 import { alias, not } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 import Category from "discourse/models/category";
 import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  discoveryTopics: inject("discovery/topics"),
-  navigationCategory: inject("navigation/category"),
-  application: inject(),
+  discoveryTopics: controller("discovery/topics"),
+  navigationCategory: controller("navigation/category"),
+  application: controller(),
 
   loading: false,
 
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
index 69e59db2a9..c02dece344 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
@@ -1,6 +1,6 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
-import { inject } from "@ember/controller";
+import { inject as controller } from "@ember/controller";
 import DiscoveryController from "discourse/controllers/discovery";
 import { dasherize } from "@ember/string";
 
@@ -12,7 +12,7 @@ const subcategoryStyleComponentNames = {
 };
 
 export default DiscoveryController.extend({
-  discovery: inject(),
+  discovery: controller(),
 
   // this makes sure the composer isn't scoping to a specific category
   category: null,
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 047960ba8a..0ea6c59918 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -1,6 +1,6 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, not, gt, empty, notEmpty, equal } from "@ember/object/computed";
-import { inject } from "@ember/controller";
+import { inject as controller } from "@ember/controller";
 import DiscoveryController from "discourse/controllers/discovery";
 import { queryParams } from "discourse/controllers/discovery-sortable";
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
@@ -11,8 +11,8 @@ import TopicList from "discourse/models/topic-list";
 import Topic from "discourse/models/topic";
 
 const controllerOpts = {
-  discovery: inject(),
-  discoveryTopics: inject("discovery/topics"),
+  discovery: controller(),
+  discoveryTopics: controller("discovery/topics"),
 
   period: null,
 
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index a143203720..5a92e4a453 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -1,7 +1,6 @@
 import { isEmpty } from "@ember/utils";
 import { or } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import {
   translateResults,
@@ -26,8 +25,8 @@ const SortOrders = [
 const PAGE_LIMIT = 10;
 
 export default Controller.extend({
-  application: inject(),
-  composer: inject(),
+  application: controller(),
+  composer: controller(),
   bulkSelectEnabled: null,
 
   loading: false,
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
index d73bf08d2f..8a9604917f 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
@@ -1,12 +1,11 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { observes } from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 
 export default Controller.extend({
-  group: inject(),
-  groupActivity: inject(),
-  application: inject(),
+  group: controller(),
+  groupActivity: controller(),
+  application: controller(),
   canLoadMore: true,
   loading: false,
   emptyText: fmt("type", "groups.empty.%@"),
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js.es6
index 6916164dd6..b4168ba4c0 100644
--- a/app/assets/javascripts/discourse/controllers/group-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6
@@ -1,11 +1,11 @@
-import Controller, { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { alias } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseDebounce from "discourse/lib/debounce";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
 
   queryParams: ["order", "desc", "filter"],
 
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
index 41a12c2c98..80947cb9a6 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
@@ -1,13 +1,12 @@
-import { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import EmberObject from "@ember/object";
-import Controller from "@ember/controller";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  group: inject(),
+  group: controller(),
+  application: controller(),
   loading: false,
   offset: 0,
-  application: inject(),
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/controllers/group-requests.js.es6 b/app/assets/javascripts/discourse/controllers/group-requests.js.es6
index c1664f0c32..7212826c71 100644
--- a/app/assets/javascripts/discourse/controllers/group-requests.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-requests.js.es6
@@ -1,11 +1,11 @@
-import Controller, { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseDebounce from "discourse/lib/debounce";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
 
   queryParams: ["order", "desc", "filter"],
 
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index 71354f58d3..b66561f39c 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -1,6 +1,5 @@
 import EmberObject from "@ember/object";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import { inject as service } from "@ember/service";
 import { readOnly } from "@ember/object/computed";
@@ -15,7 +14,7 @@ const Tab = EmberObject.extend({
 });
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
   counts: null,
   showing: "members",
   destroying: null,
diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js.es6 b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
index 00276d0215..6674322677 100644
--- a/app/assets/javascripts/discourse/controllers/groups-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
@@ -1,10 +1,9 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
   queryParams: ["order", "asc", "filter", "type"],
   order: null,
   asc: null,
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index fe57a856ec..9d4c56f56e 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -4,8 +4,7 @@ import { alias, or, readOnly } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
 import { scheduleOnce } from "@ember/runloop";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import showModal from "discourse/lib/show-modal";
@@ -27,9 +26,9 @@ const AuthErrors = [
 ];
 
 export default Controller.extend(ModalFunctionality, {
-  createAccount: inject(),
-  forgotPassword: inject(),
-  application: inject(),
+  createAccount: controller(),
+  forgotPassword: controller(),
+  application: controller(),
 
   loggingIn: false,
   loggedIn: false,
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
index 02dd26acde..5dd5f167c7 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
@@ -1,11 +1,10 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import FilterModeMixin from "discourse/mixins/filter-mode";
 
 export default Controller.extend(FilterModeMixin, {
-  discovery: inject(),
-  discoveryTopics: inject("discovery/topics"),
+  discovery: controller(),
+  discoveryTopics: controller("discovery/topics"),
 
   @discourseComputed("discoveryTopics.model", "discoveryTopics.model.draft")
   draft: function() {
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index ad4f953105..9f139b6d92 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -1,12 +1,11 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
 
   showLoginButton: equal("model.path", "login"),
 
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
index 067a2f615b..5c6a7aefb7 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
@@ -1,8 +1,7 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 
 export default Controller.extend({
-  tagGroups: inject(),
+  tagGroups: controller(),
 
   actions: {
     onDestroy() {
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
index d2d3705866..f4825bdd35 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
@@ -1,7 +1,7 @@
-import Controller, { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 
 export default Controller.extend({
-  tagGroups: inject(),
+  tagGroups: controller(),
 
   actions: {
     onSave() {
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index c4d79e8643..a44cf850c8 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -1,6 +1,5 @@
 import { alias } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
 import NavItem from "discourse/models/nav-item";
@@ -8,7 +7,7 @@ import FilterModeMixin from "discourse/mixins/filter-mode";
 import { queryParams } from "discourse/controllers/discovery-sortable";
 
 export default Controller.extend(BulkTopicSelection, FilterModeMixin, {
-  application: inject(),
+  application: controller(),
 
   tag: null,
   additionalTags: null,
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index ec53fe427d..12c4ceaaea 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -3,8 +3,7 @@ import { or, and, not, alias } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
 import { scheduleOnce } from "@ember/runloop";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
 import DiscourseURL from "discourse/lib/url";
@@ -39,8 +38,8 @@ export function registerCustomPostMessageCallback(type, callback) {
 }
 
 export default Controller.extend(bufferedProperty("model"), {
-  composer: inject(),
-  application: inject(),
+  composer: controller(),
+  application: controller(),
   multiSelect: false,
   selectedPostIds: null,
   editingTopic: false,
@@ -696,10 +695,10 @@ export default Controller.extend(bufferedProperty("model"), {
 
     jumpToPostPrompt() {
       const topic = this.model;
-      const controller = showModal("jump-to-post", {
+      const modal = showModal("jump-to-post", {
         modalClass: "jump-to-post-modal"
       });
-      controller.setProperties({
+      modal.setProperties({
         topic,
         postNumber: null,
         jumpToIndex: index => this.send("jumpToIndex", index),
@@ -840,8 +839,8 @@ export default Controller.extend(bufferedProperty("model"), {
 
     addNotice(post) {
       return new Promise(function(resolve, reject) {
-        const controller = showModal("add-post-notice");
-        controller.setProperties({ post, resolve, reject });
+        const modal = showModal("add-post-notice");
+        modal.setProperties({ post, resolve, reject });
       });
     },
 
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 473f24c753..12333fcf07 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -1,14 +1,13 @@
 import { alias } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { exportUserArchive } from "discourse/lib/export-csv";
 import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
+  user: controller(),
   router: service(),
-  user: inject(),
   userActionType: null,
 
   canDownloadPosts: alias("user.viewingSelf"),
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
index 01df9566af..d5bfab5dc8 100644
--- a/app/assets/javascripts/discourse/controllers/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
@@ -1,8 +1,8 @@
 import { alias, sort } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
+
 export default Controller.extend({
-  user: inject(),
+  user: controller(),
   username: alias("user.model.username_lower"),
   sortedBadges: sort("model", "badgeSortOrder"),
 
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6
index 862fc92e73..a3584e9f10 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -1,10 +1,9 @@
 import { inject as service } from "@ember/service";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import DiscourseURL, { userPath, groupPath } from "discourse/lib/url";
 
 export default Controller.extend({
-  topic: inject(),
+  topic: controller(),
   router: service(),
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
index 23efcfc214..b6cceef185 100644
--- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
@@ -1,12 +1,11 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { readOnly } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
   router: service(),
   currentPath: readOnly("router._router.currentPath"),
 
diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js.es6 b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
index e5de7e9995..0e2852d60d 100644
--- a/app/assets/javascripts/discourse/controllers/user-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
@@ -1,9 +1,8 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
 
   @observes("model.canLoadMore")
   _showFooter: function() {
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
index 8a21698516..79cdc7822a 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -1,14 +1,13 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, equal, and } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import Topic from "discourse/models/topic";
 
 export default Controller.extend({
+  userTopicsList: controller("user-topics-list"),
+  user: controller(),
   router: service(),
-  userTopicsList: inject("user-topics-list"),
-  user: inject(),
 
   pmView: false,
   viewingSelf: alias("user.viewingSelf"),
diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
index f541ac01ca..91483bafc2 100644
--- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -1,10 +1,9 @@
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 
 // Lists of topics on a user's page.
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
 
   hideCategory: false,
   showPosters: false,
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js.es6
index 820e50b0af..89c20efa69 100644
--- a/app/assets/javascripts/discourse/controllers/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/users.js.es6
@@ -1,11 +1,10 @@
 import { equal } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
   queryParams: ["period", "order", "asc", "name", "group", "exclude_usernames"],
   period: "weekly",
   order: "likes_received",

From 43b54c631d0804ddb29cb72bdae3deba326f194d Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Fri, 6 Mar 2020 10:16:19 -0700
Subject: [PATCH 015/633] DEV: Reserve webhook event types to be used in
 plugins (#9110)

* DEV: Reserve webhook event types to be used in plugins

Based on feedback on the following PR's:

https://github.com/discourse/discourse-solved/pull/85

https://github.com/discourse/discourse-assign/pull/61

This commit reserves ID's to be used for webhook event types to ensure
that some other webhook or plugin doesn't end up using the same ID.

* Fix broken test

I don't think this test has to test ALL event types to verify that this
feature is working. Now that we added some event types that plugins are
using this test was failing for missing fabricators that exist in the
respective plugins.

* remove loop and just test first record
---
 app/models/web_hook_event_type.rb       |  2 ++
 db/fixtures/007_web_hook_event_types.rb | 10 ++++++++++
 spec/jobs/emit_web_hook_event_spec.rb   | 19 +++++++++----------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index 719ceaa712..c40c7a21a9 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -11,6 +11,8 @@ class WebHookEventType < ActiveRecord::Base
   QUEUED_POST = 8
   REVIEWABLE = 9
   NOTIFICATION = 10
+  SOLVED = 11
+  ASSIGN = 12
 
   has_and_belongs_to_many :web_hooks
 
diff --git a/db/fixtures/007_web_hook_event_types.rb b/db/fixtures/007_web_hook_event_types.rb
index 0645cfad8e..5cbcd3edc2 100644
--- a/db/fixtures/007_web_hook_event_types.rb
+++ b/db/fixtures/007_web_hook_event_types.rb
@@ -49,3 +49,13 @@ WebHookEventType.seed do |b|
   b.id = WebHookEventType::NOTIFICATION
   b.name = "notification"
 end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::SOLVED
+  b.name = "solved"
+end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::ASSIGN
+  b.name = "assign"
+end
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index e87d6b7c7c..453db11abb 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -239,17 +239,16 @@ describe Jobs::EmitWebHookEvent do
       stub_request(:post, post_hook.payload_url)
         .to_return(body: 'OK', status: 200)
 
-      WebHookEventType.all.pluck(:name).each do |name|
-        web_hook_id = Fabricate("#{name}_web_hook").id
+      topic_event_type = WebHookEventType.all.first
+      web_hook_id = Fabricate("#{topic_event_type.name}_web_hook").id
 
-        expect do
-          subject.execute(
-            web_hook_id: web_hook_id,
-            event_type: name,
-            payload: { test: "some payload" }.to_json
-          )
-        end.to change(WebHookEvent, :count).by(1)
-      end
+      expect do
+        subject.execute(
+          web_hook_id: web_hook_id,
+          event_type: topic_event_type.name,
+          payload: { test: "some payload" }.to_json
+        )
+      end.to change(WebHookEvent, :count).by(1)
     end
 
     it 'sets up proper request headers' do

From 87687c0819f8627fec36209ad4b3762fd85a3cee Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 6 Mar 2020 14:29:00 -0300
Subject: [PATCH 016/633] Drop unnecessary readonly_during_backup setting
 (#9112)

---
 config/locales/server.en.yml   | 1 -
 config/site_settings.yml       | 2 --
 lib/backup_restore/backuper.rb | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 3705e98f01..9bd64c7dbf 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1647,7 +1647,6 @@ en:
     discord_secret: "Discord Secret Key"
     discord_trusted_guilds: 'Only allow members of these Discord guilds to login via Discord. Use the numeric ID for the guild. For more information, check the instructions <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">here</a>. Leave blank to allow any guild.'
 
-    readonly_mode_during_backup: "Enable read only mode while taking a backup"
     enable_backups: "Allow administrators to create backups of the forum"
     allow_restore: "Allow restore, which can replace ALL site data! Leave false unless you plan to restore a backup"
     maximum_backups: "The maximum amount of backups to keep on disk. Older backups are automatically deleted"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 6ea8733db4..a2320348a1 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1649,8 +1649,6 @@ backups:
   enable_backups:
     default: true
     client: true
-  readonly_mode_during_backup:
-    default: false
   allow_restore:
     default: false
   backup_location:
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index 3068ecb2a4..0ae246dd88 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -106,7 +106,7 @@ module BackupRestore
         end
 
       @logs = []
-      @readonly_mode_was_enabled = Discourse.readonly_mode? || !SiteSetting.readonly_mode_during_backup
+      @readonly_mode_was_enabled = Discourse.readonly_mode?
     end
 
     def listen_for_shutdown_signal

From 86690155b3d619f0ad3c2d9e1991f9fbdbb3ff87 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Fri, 6 Mar 2020 07:36:56 -1000
Subject: [PATCH 017/633] FEATURE: prevent accidental canceling when drafting
 penalties (#9129)

Pop up a confirmation box when there is input. This prevents accidental closing
of the dialog boxes due to clicking outside.

This adds a development hook on modals in the form of a `beforeClose`
function. Modal windows can abort the close if the funtion returns false.

Additionally fixing a few issues with loop and state on the modal popups:

Escape key with bootbox is keyup.
Updating modal to close on keyup as well so escape key is working.
Fixes an issue where pressing esc will loop immediately back to the modal by:
keydown -> bootbox -> keyup -> acts as "cancel", restores modal

Needs a next call to reopenModal otherwise, keyup is handled again by the modal.
Fixes an issue where pressing esc will loop immediately back to the confirm:
esc keyup will be handled and bubble immediately back to the modal.

Additionally, only handle key events when the #discourse-modal is visible.
This resolves issues where escape or enter events were being handled by
a hidden modal window.
---
 .../admin/mixins/penalty-controller.js.es6    | 28 ++++++++++++++++++-
 .../discourse/components/d-modal.js.es6       | 17 ++++++-----
 .../discourse/routes/application.js.es6       | 15 ++++++++--
 config/locales/client.en.yml                  |  1 +
 .../acceptance/admin-suspend-user-test.js.es6 | 27 ++++++++++++++++++
 test/javascripts/acceptance/modal-test.js.es6 | 10 +++----
 6 files changed, 83 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
index cb07e9d2ca..46ba124e18 100644
--- a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
+++ b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
@@ -1,6 +1,7 @@
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Mixin from "@ember/object/mixin";
+import { next } from "@ember/runloop";
 import { Promise } from "rsvp";
 
 export default Mixin.create(ModalFunctionality, {
@@ -11,6 +12,7 @@ export default Mixin.create(ModalFunctionality, {
   user: null,
   postId: null,
   successCallback: null,
+  confirmClose: false,
 
   resetModal() {
     this.setProperties({
@@ -21,10 +23,33 @@ export default Mixin.create(ModalFunctionality, {
       postEdit: null,
       postAction: "delete",
       before: null,
-      successCallback: null
+      successCallback: null,
+      confirmClose: false
     });
   },
 
+  beforeClose() {
+    // prompt a confirmation if we have unsaved content
+    if (
+      !this.confirmClose &&
+      ((this.reason && this.reason.length > 1) ||
+        (this.message && this.message.length > 1))
+    ) {
+      this.send("hideModal");
+      bootbox.confirm(I18n.t("admin.user.confirm_cancel_penalty"), result => {
+        if (result) {
+          next(() => {
+            this.set("confirmClose", true);
+            this.send("closeModal");
+          });
+        } else {
+          next(() => this.send("reopenModal"));
+        }
+      });
+      return false;
+    }
+  },
+
   penalize(cb) {
     let before = this.before;
     let promise = before ? before() : Promise.resolve();
@@ -32,6 +57,7 @@ export default Mixin.create(ModalFunctionality, {
     return promise
       .then(() => cb())
       .then(result => {
+        this.set("confirmClose", true);
         this.send("closeModal");
         let callback = this.successCallback;
         if (callback) {
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index 300a3e585c..eeae7edc3f 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -31,13 +31,16 @@ export default Component.extend({
 
   @on("didInsertElement")
   setUp() {
-    $("html").on("keydown.discourse-modal", e => {
-      if (e.which === 27 && this.dismissable) {
-        next(() => $(".modal-header button.modal-close").click());
-      }
+    $("html").on("keyup.discourse-modal", e => {
+      //only respond to events when the modal is visible
+      if ($("#discourse-modal:visible").length > 0) {
+        if (e.which === 27 && this.dismissable) {
+          next(() => $(".modal-header button.modal-close").click());
+        }
 
-      if (e.which === 13 && this.triggerClickOnEnter(e)) {
-        next(() => $(".modal-footer .btn-primary").click());
+        if (e.which === 13 && this.triggerClickOnEnter(e)) {
+          next(() => $(".modal-footer .btn-primary").click());
+        }
       }
     });
 
@@ -46,7 +49,7 @@ export default Component.extend({
 
   @on("willDestroyElement")
   cleanUp() {
-    $("html").off("keydown.discourse-modal");
+    $("html").off("keyup.discourse-modal");
     this.appEvents.off("modal:body-shown", this, "_modalBodyShown");
   },
 
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index e877d8ceff..8dca333360 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -157,12 +157,23 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
     // Close the current modal, and destroy its state.
     closeModal() {
-      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
-
       const route = getOwner(this).lookup("route:application");
       let modalController = route.controllerFor("modal");
       const controllerName = modalController.get("name");
 
+      if (controllerName) {
+        const controller = getOwner(this).lookup(
+          `controller:${controllerName}`
+        );
+        if (controller && controller.beforeClose) {
+          if (false === controller.beforeClose()) {
+            return;
+          }
+        }
+      }
+
+      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
+
       if (controllerName) {
         const controller = getOwner(this).lookup(
           `controller:${controllerName}`
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a18720a293..5b632f3bfd 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4293,6 +4293,7 @@ en:
           threshold_reached: "Received too many bounces from that email."
         trust_level_change_failed: "There was a problem changing the user's trust level."
         suspend_modal_title: "Suspend User"
+        confirm_cancel_penalty: "Are you sure you want to discard the penalty?"
         trust_level_2_users: "Trust Level 2 Users"
         trust_level_3_requirements: "Trust Level 3 Requirements"
         trust_level_locked_tip: "trust level is locked, system will not promote or demote user"
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
index d9983848ca..812c1f704c 100644
--- a/test/javascripts/acceptance/admin-suspend-user-test.js.es6
+++ b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
@@ -34,6 +34,33 @@ QUnit.test("suspend a user - cancel", async assert => {
   assert.equal(find(".suspend-user-modal:visible").length, 0);
 });
 
+QUnit.test("suspend a user - cancel with input", async assert => {
+  await visit("/admin/users/1234/regular");
+  await click(".suspend-user");
+
+  assert.equal(find(".suspend-user-modal:visible").length, 1);
+
+  await fillIn(".suspend-reason", "for breaking the rules");
+  await fillIn(".suspend-message", "this is an email reason why");
+
+  await click(".d-modal-cancel");
+
+  assert.equal(find(".bootbox.modal:visible").length, 1);
+
+  await click(".modal-footer .btn-default");
+  assert.equal(find(".suspend-user-modal:visible").length, 1);
+  assert.equal(
+    find(".suspend-message")[0].value,
+    "this is an email reason why"
+  );
+
+  await click(".d-modal-cancel");
+  assert.equal(find(".bootbox.modal:visible").length, 1);
+  assert.equal(find(".suspend-user-modal:visible").length, 0);
+  await click(".modal-footer .btn-primary");
+  assert.equal(find(".bootbox.modal:visible").length, 0);
+});
+
 QUnit.test("suspend, then unsuspend a user", async assert => {
   const suspendUntilCombobox = selectKit(".suspend-until .combobox");
 
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
index 13725f4d6c..4e43be89bb 100644
--- a/test/javascripts/acceptance/modal-test.js.es6
+++ b/test/javascripts/acceptance/modal-test.js.es6
@@ -28,7 +28,7 @@ QUnit.test("modal", async function(assert) {
   await click(".login-button");
   assert.ok(find(".d-modal:visible").length === 1, "modal should reappear");
 
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -47,7 +47,7 @@ QUnit.test("modal", async function(assert) {
     find(".d-modal:visible").length === 1,
     "modal should not disappear when you click outside"
   );
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 1,
     "ESC should not close the modal"
@@ -61,7 +61,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".toggle-admin-menu");
   await click(".topic-admin-status-update button");
-  await keyEvent(".d-modal", "keydown", 13);
+  await keyEvent(".d-modal", "keyup", 13);
 
   assert.ok(
     find("#modal-alert:visible").length === 1,
@@ -72,7 +72,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
     "hitting Enter does not dismiss modal due to alert error"
   );
 
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -82,7 +82,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".d-editor-button-bar .btn.link");
 
-  await keyEvent(".d-modal", "keydown", 13);
+  await keyEvent(".d-modal", "keyup", 13);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "modal should disappear on hitting Enter"

From f2b95c19187278cfb04ea5e998e7c333f4f5d683 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 5 Mar 2020 16:10:12 -0800
Subject: [PATCH 018/633] FIX: Allow quoting from a closed topic while writing
 a reply

composer.(controller).visible is true as long as state is not 'closed'.
---
 app/assets/javascripts/discourse/controllers/topic.js.es6 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 12c4ceaaea..80e6124f6d 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -76,10 +76,10 @@ export default Controller.extend(bufferedProperty("model"), {
     }
   },
 
-  @discourseComputed("model.details.can_create_post")
-  embedQuoteButton(canCreatePost) {
+  @discourseComputed("model.details.can_create_post", "composer.visible")
+  embedQuoteButton(canCreatePost, composerOpened) {
     return (
-      canCreatePost &&
+      (canCreatePost || composerOpened) &&
       this.currentUser &&
       this.currentUser.get("enable_quoting")
     );

From 763a065df9bac25fb4d08ab83b975c0317f6dda7 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 6 Mar 2020 12:58:59 -0600
Subject: [PATCH 019/633] FIX: Correctly format select options for group poll
 by fields (#9131)

---
 plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index 21d24f512c..1f71dea021 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -454,7 +454,9 @@ createWidget("discourse-poll-info", {
 
 function transformUserFieldToLabel(fieldName) {
   let transformed = fieldName.split("_").filter(Boolean);
-  transformed[0] = classify(transformed[0]);
+  if (transformed.length > 1) {
+    transformed[0] = classify(transformed[0]);
+  }
   return transformed.join(" ");
 }
 

From 29c9d8a133858836162a97d7516fb300485a2816 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 6 Mar 2020 20:11:21 +0100
Subject: [PATCH 020/633] FIX: uses only global allow_uncategorized_topics for
 category drop (#9130)

---
 .../select-kit/components/category-drop.js.es6            | 8 ++------
 .../components/select-kit/category-drop-test.js.es6       | 8 +++++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6
index 5ee9a6d12b..c80f46bea9 100644
--- a/app/assets/javascripts/select-kit/components/category-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6
@@ -28,7 +28,6 @@ export default ComboBoxComponent.extend({
     subCategory: false,
     clearable: false,
     hideParentCategory: "hideParentCategory",
-    allowUncategorized: true,
     countSubcategories: false,
     autoInsertNoneItem: false,
     displayCategoryDescription: "displayCategoryDescription",
@@ -96,7 +95,7 @@ export default ComboBoxComponent.extend({
       content.title = category.title;
       content.label = categoryBadgeHTML(category, {
         link: false,
-        allowUncategorized: this.selectKit.options.allowUncategorized,
+        allowUncategorized: true,
         hideParent: true
       }).htmlSafe();
     }
@@ -174,10 +173,7 @@ export default ComboBoxComponent.extend({
   },
 
   _filterUncategorized(content) {
-    if (
-      !this.siteSettings.allow_uncategorized_topics ||
-      !this.selectKit.options.allowUncategorized
-    ) {
+    if (!this.siteSettings.allow_uncategorized_topics) {
       content = content.filter(
         c => c.id !== this.site.uncategorized_category_id
       );
diff --git a/test/javascripts/components/select-kit/category-drop-test.js.es6 b/test/javascripts/components/select-kit/category-drop-test.js.es6
index 2a3b7b6e56..5c45042cb9 100644
--- a/test/javascripts/components/select-kit/category-drop-test.js.es6
+++ b/test/javascripts/components/select-kit/category-drop-test.js.es6
@@ -187,10 +187,11 @@ componentTest("hideParentCategory (true)", {
   }
 });
 
-componentTest("allowUncategorized (default: true)", {
+componentTest("allow_uncategorized_topics (true)", {
   template: template(),
 
   beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = true;
     initCategories(this);
   },
 
@@ -203,10 +204,11 @@ componentTest("allowUncategorized (default: true)", {
   }
 });
 
-componentTest("allowUncategorized (false)", {
-  template: template(["allowUncategorized=false"]),
+componentTest("allow_uncategorized_topics (false)", {
+  template: template(),
 
   beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = false;
     initCategories(this);
   },
 

From bb5990781eb175c2d908dcc73f4438f0f4584076 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 6 Mar 2020 20:27:33 +0100
Subject: [PATCH 021/633] FIX: allows to define placement strategy of
 select-kit body (#9109)

---
 .../components/edit-category-security.hbs     |  6 +++
 .../components/edit-category-settings.hbs     | 44 +++++++++++++++++--
 .../select-kit/components/select-kit.js.es6   |  8 +++-
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index e6c7dd5634..cfde179c32 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -29,6 +29,9 @@
         value=selectedGroup
         valueProperty=null
         nameProperty=null
+        options=(hash
+          placementStrategy="absolute"
+        )
       }}
       {{combo-box
         class="permission-selector"
@@ -36,6 +39,9 @@
         content=category.availablePermissions
         onChange=(action "onSelectPermission")
         value=selectedPermission
+        options=(hash
+          placementStrategy="absolute"
+        )
       }}
       {{d-button
         action=(action "addPermission" selectedGroup selectedPermission)
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index fab2c089fd..dfb2e1c8d0 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -39,6 +39,9 @@
       content=searchPrioritiesOptions
       value=category.search_priority
       onChange=(action (mut category.search_priority))
+      options=(hash
+        placementStrategy="absolute"
+      )
     }}
     </div>
   </section>
@@ -148,7 +151,15 @@
       {{i18n "category.default_view"}}
     </label>
     <div class="controls">
-      {{combo-box valueProperty="value" id="category-default-view" content=availableViews value=category.default_view}}
+      {{combo-box
+        valueProperty="value"
+        id="category-default-view"
+        content=availableViews
+        value=category.default_view
+        options=(hash
+          placementStrategy="absolute"
+        )
+      }}
     </div>
   </section>
 
@@ -157,7 +168,15 @@
       {{i18n "category.default_top_period"}}
     </label>
     <div class="controls">
-      {{combo-box valueProperty="value" id="category-default-period" content=availableTopPeriods value=category.default_top_period}}
+      {{combo-box
+        valueProperty="value"
+        id="category-default-period"
+        content=availableTopPeriods
+        value=category.default_top_period
+        options=(hash
+          placementStrategy="absolute"
+        )
+      }}
     </div>
   </section>
 
@@ -168,7 +187,16 @@
     <div class="controls">
     {{combo-box valueProperty="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
     {{#unless isDefaultSortOrder}}
-      {{combo-box castBoolean=true valueProperty="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}}
+      {{combo-box
+        castBoolean=true
+        valueProperty="value"
+        content=sortAscendingOptions
+        value=category.sort_ascending
+        none="category.sort_options.default"
+        options=(hash
+          placementStrategy="absolute"
+        )
+      }}
     {{/unless}}
       </div>
   </section>
@@ -187,7 +215,15 @@
         <label for="subcategory-list-style">
           {{i18n "category.subcategory_list_style"}}
         </label>
-              {{combo-box valueProperty="value" id="subcategory-list-style" content=availableSubcategoryListStyles value=category.subcategory_list_style}}
+        {{combo-box
+          valueProperty="value"
+          id="subcategory-list-style"
+          content=availableSubcategoryListStyles
+          value=category.subcategory_list_style
+          options=(hash
+            placementStrategy="absolute"
+          )
+        }}
       </section>
     {{/if}}
 
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index ed78c9ed78..30a37cf450 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -267,6 +267,7 @@ export default Component.extend(
       closeOnChange: true,
       limitMatches: null,
       placement: "bottom-start",
+      placementStrategy: null,
       filterComponent: "select-kit/select-kit-filter",
       selectedNameComponent: "selected-name",
       castInteger: false
@@ -814,10 +815,15 @@ export default Component.extend(
           popper.style.width = `${anchor.offsetWidth}px`;
         }
 
+        let placementStrategy = this.selectKit.options.placementStrategy;
+        if (!placementStrategy) {
+          placementStrategy = this.inModal ? "fixed" : "absolute";
+        }
+
         /* global Popper:true */
         this.popper = Popper.createPopper(anchor, popper, {
           eventsEnabled: false,
-          strategy: inModal ? "fixed" : "absolute",
+          strategy: placementStrategy,
           placement: this.selectKit.options.placement,
           modifiers: [
             {

From 4c3bd50c13eef8f23545c7479d3ed8ac119ca319 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 6 Mar 2020 16:42:32 -0500
Subject: [PATCH 022/633] FIX: Prevent avatar flair image from repeating on
 user/group cards

---
 app/assets/stylesheets/common/components/user-card.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss
index bf65bdf70b..c5dad5d089 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -253,6 +253,7 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
     .avatar-flair {
       display: flex;
       background-size: contain;
+      background-repeat: no-repeat;
       width: $avatar_width;
       height: $avatar_width;
       color: $primary;

From f7ea2fdea56427ce9e7fff4298c171744d8531cd Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 6 Mar 2020 22:54:40 +0100
Subject: [PATCH 023/633] FIX: Import posts of missing users from phpbb3
 (#9085)

Posts without a user probably shouldn't happen unless there was some direct database tampering, but data like that has been seen in the wild.

The importer will assign those posts to the "system" user.
---
 script/import_scripts/phpbb3/database/database_3_0.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/import_scripts/phpbb3/database/database_3_0.rb b/script/import_scripts/phpbb3/database/database_3_0.rb
index 2b2c557d5f..0799b92ba7 100644
--- a/script/import_scripts/phpbb3/database/database_3_0.rb
+++ b/script/import_scripts/phpbb3/database/database_3_0.rb
@@ -83,7 +83,7 @@ module ImportScripts::PhpBB3
           CASE WHEN u.user_type = #{Constants::USER_TYPE_IGNORE} THEN p.post_username ELSE NULL END post_username
         FROM #{@table_prefix}posts p
           JOIN #{@table_prefix}topics t ON (p.topic_id = t.topic_id)
-          JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
+          LEFT OUTER JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
         WHERE p.post_id > #{last_post_id}
         ORDER BY p.post_id
         LIMIT #{@batch_size}

From 26da99a2d2d484968f4eecb25e10962cafe8912a Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Fri, 6 Mar 2020 11:05:46 -0800
Subject: [PATCH 024/633] FIX: Tolerate quotes with no username and no title

---
 .../discourse/components/quote-button.js.es6        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
index a703e5e3d7..2d8df37706 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -3,6 +3,12 @@ import Component from "@ember/component";
 import discourseDebounce from "discourse/lib/debounce";
 import { selectedText, selectedElement } from "discourse/lib/utilities";
 
+function getQuoteTitle(element) {
+  const titleEl = element.querySelector(".title");
+  if (!titleEl) return;
+  return titleEl.textContent.trim().replace(/:$/, "");
+}
+
 export default Component.extend({
   classNames: ["quote-button"],
   classNameBindings: ["visible"],
@@ -55,12 +61,7 @@ export default Component.extend({
       element = element.parentElement
     ) {
       if (element.tagName === "ASIDE" && element.classList.contains("quote")) {
-        opts.username =
-          element.dataset.username ||
-          element
-            .querySelector(".title")
-            .textContent.trim()
-            .replace(/:$/, "");
+        opts.username = element.dataset.username || getQuoteTitle(element);
         opts.post = element.dataset.post;
         opts.topic = element.dataset.topic;
       }

From 48ba65f406f882d14e2d6b33da5baddbeab6cd5a Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 6 Mar 2020 23:49:28 +0100
Subject: [PATCH 025/633] DEV: Clean up Ember imports (#8979)

Includes:
* Import `computed` helpers
* Import `@ember/application`
* Import `isBlank` from `@ember/utils`
* Import `A` from `@ember/array`
* Import `EmberArray` from `@ember/array`
* Import `ArrayProxy` from `@ember/array/proxy`
* Import `warn` from `@ember/debug`
* Import `EmberObject` from `@ember/object`
* Import `Application` from `@ember/application`
* Import `EmberRouter` from `@ember/routing/router`
* Import `isPresent` from `@ember/utils`
* Import `computed` from `@ember/object`
* Import `guidFor` from `@ember/object`
* Import `isArray` from `@ember/array`
* Import `TextField` from `@ember/component`
* Import `TextArea` from `@ember/component`
* Import `Promise` from `rsvp`
* Import `Evented` from `@ember/object/evented`
* Replace deprecated `ember-addons/ember-computed-decorators` imports
---
 .../controllers/admin-api-keys-new.js.es6     |  7 ++++---
 .../modals/admin-edit-badge-groupings.js.es6  |  3 ++-
 .../admin/mixins/setting-component.js.es6     |  3 ++-
 .../admin/models/color-scheme.js.es6          |  6 ++++--
 .../javascripts/admin/models/theme.js.es6     |  4 ++--
 app/assets/javascripts/discourse-loader.js    |  7 ++++---
 app/assets/javascripts/discourse.js.es6       |  6 +++---
 .../components/expanding-text-area.js.es6     |  3 ++-
 .../components/honeypot-input.js.es6          |  3 ++-
 .../discourse/components/number-field.js.es6  |  3 ++-
 .../discourse/components/text-field.js.es6    |  3 ++-
 .../controllers/create-account.js.es6         |  3 ++-
 .../helpers/topic-status-icons.js.es6         |  4 +++-
 .../javascripts/discourse/lib/computed.js.es6 | 19 +++++++++---------
 .../lib/posts-with-placeholders.js.es6        |  3 ++-
 .../discourse/mapping-router.js.es6           |  3 ++-
 .../discourse/mixins/upload.js.es6            |  3 ++-
 .../discourse/models/category-list.js.es6     |  3 ++-
 .../javascripts/discourse/models/rest.js.es6  |  3 ++-
 .../discourse/models/result-set.js.es6        |  3 ++-
 .../models/user-drafts-stream.js.es6          |  3 ++-
 .../discourse/models/user-stream.js.es6       |  3 ++-
 .../javascripts/discourse/models/user.js.es6  |  3 ++-
 .../pre-initializers/map-routes.js.es6        |  6 ++++--
 .../discourse/services/app-events.js.es6      |  3 ++-
 .../select-kit/components/multi-select.js.es6 |  2 +-
 .../select-kit/components/select-kit.js.es6   |  4 ++--
 app/assets/javascripts/wizard/router.js.es6   |  3 ++-
 app/assets/javascripts/wizard/wizard.js.es6   |  3 ++-
 .../discourse-local-dates-create-form.js.es6  | 20 ++++++++++---------
 .../composer-presence-display.js.es6          | 12 ++++++-----
 .../components/topic-presence-display.js.es6  |  7 ++++---
 .../initializers/extend-for-poll.js.es6       |  7 ++++---
 ...iscourse-poll-standard-results-test.js.es6 |  8 +++++---
 .../models/post-stream-test.js.es6            |  3 ++-
 35 files changed, 108 insertions(+), 71 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6
index 42391beaf8..9384e79557 100644
--- a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6
@@ -1,5 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
+import { isBlank } from "@ember/utils";
 import Controller from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
@@ -15,8 +16,8 @@ export default Controller.extend({
 
   @discourseComputed("model.description", "model.username", "userMode")
   saveDisabled(description, username, userMode) {
-    if (Ember.isBlank(description)) return true;
-    if (userMode === "single" && Ember.isBlank(username)) return true;
+    if (isBlank(description)) return true;
+    if (userMode === "single" && isBlank(username)) return true;
     return false;
   },
 
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
index 1629aab70b..7bc3603887 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { A } from "@ember/array";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { observes } from "discourse-common/utils/decorators";
@@ -7,7 +8,7 @@ export default Controller.extend(ModalFunctionality, {
   @observes("model")
   modelChanged() {
     const model = this.model;
-    const copy = Ember.A();
+    const copy = A();
     const store = this.store;
 
     if (model) {
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index c182abadd6..70384c1a27 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -1,3 +1,4 @@
+import { warn } from "@ember/debug";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, oneWay } from "@ember/object/computed";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
@@ -137,7 +138,7 @@ export default Mixin.create({
   }),
 
   _save() {
-    Ember.warn("You should define a `_save` method", {
+    warn("You should define a `_save` method", {
       id: "discourse.setting-component.missing-save"
     });
     return Promise.resolve();
diff --git a/app/assets/javascripts/admin/models/color-scheme.js.es6 b/app/assets/javascripts/admin/models/color-scheme.js.es6
index afabb1ed6e..ee60097b74 100644
--- a/app/assets/javascripts/admin/models/color-scheme.js.es6
+++ b/app/assets/javascripts/admin/models/color-scheme.js.es6
@@ -1,3 +1,5 @@
+import { A } from "@ember/array";
+import ArrayProxy from "@ember/array/proxy";
 import discourseComputed from "discourse-common/utils/decorators";
 import { not } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
@@ -33,7 +35,7 @@ const ColorScheme = EmberObject.extend({
     const newScheme = ColorScheme.create({
       name: this.name,
       can_edit: true,
-      colors: Ember.A()
+      colors: A()
     });
     this.colors.forEach(c => {
       newScheme.colors.pushObject(
@@ -111,7 +113,7 @@ const ColorScheme = EmberObject.extend({
   }
 });
 
-const ColorSchemes = Ember.ArrayProxy.extend({});
+const ColorSchemes = ArrayProxy.extend({});
 
 ColorScheme.reopenClass({
   findAll() {
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js.es6
index 543858c677..e63e9e1cce 100644
--- a/app/assets/javascripts/admin/models/theme.js.es6
+++ b/app/assets/javascripts/admin/models/theme.js.es6
@@ -1,5 +1,5 @@
 import { get } from "@ember/object";
-import { isEmpty } from "@ember/utils";
+import { isBlank, isEmpty } from "@ember/utils";
 import { or, gt } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -153,7 +153,7 @@ const Theme = RestModel.extend({
   @discourseComputed("theme_fields.[]")
   editedFields(fields) {
     return fields.filter(
-      field => !Ember.isBlank(field.value) && field.type_id !== SETTINGS_TYPE_ID
+      field => !isBlank(field.value) && field.type_id !== SETTINGS_TYPE_ID
     );
   },
 
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 9d14e3208c..cde52ac72c 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -12,7 +12,8 @@ var define, requirejs;
       jquery: { default: $ },
       "@ember/array": {
         default: Ember.Array,
-        A: Ember.A
+        A: Ember.A,
+        isArray: Ember.isArray
       },
       "@ember/array/proxy": {
         default: Ember.ArrayProxy
@@ -99,10 +100,10 @@ var define, requirejs;
         inject: Ember.inject.service
       },
       "@ember/utils": {
-        isPresent: Ember.isPresent,
         isBlank: Ember.isBlank,
         isEmpty: Ember.isEmpty,
-        isNone: Ember.isNone
+        isNone: Ember.isNone,
+        isPresent: Ember.isPresent
       },
       rsvp: {
         default: Ember.RSVP,
diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js.es6
index 8143ba27fc..10fb7dd407 100644
--- a/app/assets/javascripts/discourse.js.es6
+++ b/app/assets/javascripts/discourse.js.es6
@@ -1,14 +1,14 @@
 /*global Mousetrap:true*/
+import Application from "@ember/application";
+import EmberObject, { computed } from "@ember/object";
 import { buildResolver } from "discourse-common/resolver";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { computed } from "@ember/object";
 import FocusEvent from "discourse-common/mixins/focus-event";
-import EmberObject from "@ember/object";
 import deprecated from "discourse-common/lib/deprecated";
 
 const _pluginCallbacks = [];
 
-const Discourse = Ember.Application.extend(FocusEvent, {
+const Discourse = Application.extend(FocusEvent, {
   rootElement: "#main",
   _docTitle: document.title,
   RAW_TEMPLATES: {},
diff --git a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6 b/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
index 4c3432f277..ca215cc3f7 100644
--- a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
+++ b/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
@@ -1,8 +1,9 @@
+import { TextArea } from "@ember/component";
 import { scheduleOnce } from "@ember/runloop";
 import { on, observes } from "discourse-common/utils/decorators";
 import autosize from "discourse/lib/autosize";
 
-export default Ember.TextArea.extend({
+export default TextArea.extend({
   @on("didInsertElement")
   _startWatching() {
     scheduleOnce("afterRender", () => {
diff --git a/app/assets/javascripts/discourse/components/honeypot-input.js.es6 b/app/assets/javascripts/discourse/components/honeypot-input.js.es6
index 8231303da5..9eb256bc12 100644
--- a/app/assets/javascripts/discourse/components/honeypot-input.js.es6
+++ b/app/assets/javascripts/discourse/components/honeypot-input.js.es6
@@ -1,6 +1,7 @@
+import { TextField } from "@ember/component";
 import { on } from "discourse-common/utils/decorators";
 
-export default Ember.TextField.extend({
+export default TextField.extend({
   @on("init")
   _init() {
     // Chrome autocomplete is buggy per:
diff --git a/app/assets/javascripts/discourse/components/number-field.js.es6 b/app/assets/javascripts/discourse/components/number-field.js.es6
index ca2db4d124..6f78cc3707 100644
--- a/app/assets/javascripts/discourse/components/number-field.js.es6
+++ b/app/assets/javascripts/discourse/components/number-field.js.es6
@@ -1,6 +1,7 @@
+import { TextField } from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Ember.TextField.extend({
+export default TextField.extend({
   classNameBindings: ["invalid"],
 
   @discourseComputed("number")
diff --git a/app/assets/javascripts/discourse/components/text-field.js.es6 b/app/assets/javascripts/discourse/components/text-field.js.es6
index 1978cd0ab2..23440b291d 100644
--- a/app/assets/javascripts/discourse/components/text-field.js.es6
+++ b/app/assets/javascripts/discourse/components/text-field.js.es6
@@ -1,7 +1,8 @@
+import { TextField } from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction";
 
-export default Ember.TextField.extend({
+export default TextField.extend({
   attributeBindings: [
     "autocorrect",
     "autocapitalize",
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 62085e548e..3d93a61393 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -1,3 +1,4 @@
+import { A } from "@ember/array";
 import { isEmpty } from "@ember/utils";
 import { notEmpty, or, not } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
@@ -31,7 +32,7 @@ export default Controller.extend(
     accountChallenge: 0,
     accountHoneypot: 0,
     formSubmitted: false,
-    rejectedEmails: Ember.A([]),
+    rejectedEmails: A(),
     prefilledUsername: null,
     userFields: null,
     isDeveloper: false,
diff --git a/app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6 b/app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6
index 80076d725d..2f2da65a25 100644
--- a/app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6
+++ b/app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6
@@ -1,4 +1,6 @@
-export default Ember.ArrayProxy.extend({
+import ArrayProxy from "@ember/array/proxy";
+
+export default ArrayProxy.extend({
   render(topic, renderIcon) {
     const renderIconIf = (conditionProp, name, key) => {
       if (!topic.get(conditionProp)) {
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index 992029d293..acd6cde60b 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -1,3 +1,4 @@
+import { computed } from "@ember/object";
 import addonFmt from "ember-addons/fmt";
 
 /**
@@ -10,7 +11,7 @@ import addonFmt from "ember-addons/fmt";
 **/
 
 export function propertyEqual(p1, p2) {
-  return Ember.computed(p1, p2, function() {
+  return computed(p1, p2, function() {
     return this.get(p1) === this.get(p2);
   });
 }
@@ -24,19 +25,19 @@ export function propertyEqual(p1, p2) {
   @return {Function} discourseComputedProperty function
 **/
 export function propertyNotEqual(p1, p2) {
-  return Ember.computed(p1, p2, function() {
+  return computed(p1, p2, function() {
     return this.get(p1) !== this.get(p2);
   });
 }
 
 export function propertyGreaterThan(p1, p2) {
-  return Ember.computed(p1, p2, function() {
+  return computed(p1, p2, function() {
     return this.get(p1) > this.get(p2);
   });
 }
 
 export function propertyLessThan(p1, p2) {
-  return Ember.computed(p1, p2, function() {
+  return computed(p1, p2, function() {
     return this.get(p1) < this.get(p2);
   });
 }
@@ -51,7 +52,7 @@ export function propertyLessThan(p1, p2) {
 **/
 export function i18n(...args) {
   const format = args.pop();
-  return Ember.computed(...args, function() {
+  return computed(...args, function() {
     return I18n.t(addonFmt(format, ...args.map(a => this.get(a))));
   });
 }
@@ -67,7 +68,7 @@ export function i18n(...args) {
 **/
 export function fmt(...args) {
   const format = args.pop();
-  return Ember.computed(...args, function() {
+  return computed(...args, function() {
     return addonFmt(format, ...args.map(a => this.get(a)));
   });
 }
@@ -83,7 +84,7 @@ export function fmt(...args) {
 **/
 export function url(...args) {
   const format = args.pop();
-  return Ember.computed(...args, function() {
+  return computed(...args, function() {
     return Discourse.getURL(addonFmt(format, ...args.map(a => this.get(a))));
   });
 }
@@ -99,7 +100,7 @@ export function url(...args) {
 export function endWith() {
   const args = Array.prototype.slice.call(arguments, 0);
   const substring = args.pop();
-  return Ember.computed(...args, function() {
+  return computed(...args, function() {
     return args
       .map(a => this.get(a))
       .every(s => {
@@ -118,7 +119,7 @@ export function endWith() {
   @param {String} name of site setting
 **/
 export function setting(name) {
-  return Ember.computed(function() {
+  return computed(function() {
     return Discourse.SiteSettings[name];
   });
 }
diff --git a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
index 449c70ab79..dca23e1a85 100644
--- a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
+++ b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
@@ -1,3 +1,4 @@
+import EmberArray from "@ember/array";
 import EmberObject from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 
@@ -5,7 +6,7 @@ export function Placeholder(viewName) {
   this.viewName = viewName;
 }
 
-export default EmberObject.extend(Ember.Array, {
+export default EmberObject.extend(EmberArray, {
   posts: null,
   _appendingIds: null,
 
diff --git a/app/assets/javascripts/discourse/mapping-router.js.es6 b/app/assets/javascripts/discourse/mapping-router.js.es6
index c50eb9112c..38b8eec72e 100644
--- a/app/assets/javascripts/discourse/mapping-router.js.es6
+++ b/app/assets/javascripts/discourse/mapping-router.js.es6
@@ -1,3 +1,4 @@
+import EmberRouter from "@ember/routing/router";
 import { defaultHomepage } from "discourse/lib/utilities";
 import { rewritePath } from "discourse/lib/url";
 import ENV from "discourse-common/config/environment";
@@ -5,7 +6,7 @@ import Site from "discourse/models/site";
 
 const rootURL = Discourse.BaseUri;
 
-const BareRouter = Ember.Router.extend({
+const BareRouter = EmberRouter.extend({
   rootURL,
   location: ENV.environment === "test" ? "none" : "discourse-location",
 
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js.es6
index 820e2e912a..f7d568cb96 100644
--- a/app/assets/javascripts/discourse/mixins/upload.js.es6
+++ b/app/assets/javascripts/discourse/mixins/upload.js.es6
@@ -1,3 +1,4 @@
+import { warn } from "@ember/debug";
 import {
   displayErrorForUpload,
   validateUploadedFiles
@@ -11,7 +12,7 @@ export default Mixin.create({
   uploadProgress: 0,
 
   uploadDone() {
-    Ember.warn("You should implement `uploadDone`", {
+    warn("You should implement `uploadDone`", {
       id: "discourse.upload.missing-upload-done"
     });
   },
diff --git a/app/assets/javascripts/discourse/models/category-list.js.es6 b/app/assets/javascripts/discourse/models/category-list.js.es6
index b8437f706d..ce655978b3 100644
--- a/app/assets/javascripts/discourse/models/category-list.js.es6
+++ b/app/assets/javascripts/discourse/models/category-list.js.es6
@@ -1,10 +1,11 @@
+import ArrayProxy from "@ember/array/proxy";
 import PreloadStore from "preload-store";
 import { ajax } from "discourse/lib/ajax";
 import Topic from "discourse/models/topic";
 import Category from "discourse/models/category";
 import Site from "discourse/models/site";
 
-const CategoryList = Ember.ArrayProxy.extend({
+const CategoryList = ArrayProxy.extend({
   init() {
     this.set("content", []);
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6
index a140dad504..40b38e5107 100644
--- a/app/assets/javascripts/discourse/models/rest.js.es6
+++ b/app/assets/javascripts/discourse/models/rest.js.es6
@@ -1,3 +1,4 @@
+import { warn } from "@ember/debug";
 import { equal } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { Promise } from "rsvp";
@@ -24,7 +25,7 @@ const RestModel = EmberObject.extend({
         const payload = this.__munge(res.payload || res.responseJson);
 
         if (payload.success === "OK") {
-          Ember.warn("An update call should return the updated attributes", {
+          warn("An update call should return the updated attributes", {
             id: "discourse.rest-model.update-attributes"
           });
           res = props;
diff --git a/app/assets/javascripts/discourse/models/result-set.js.es6 b/app/assets/javascripts/discourse/models/result-set.js.es6
index 56e2c164b5..5ed3dd90cd 100644
--- a/app/assets/javascripts/discourse/models/result-set.js.es6
+++ b/app/assets/javascripts/discourse/models/result-set.js.es6
@@ -1,7 +1,8 @@
+import ArrayProxy from "@ember/array/proxy";
 import discourseComputed from "discourse-common/utils/decorators";
 import { Promise } from "rsvp";
 
-export default Ember.ArrayProxy.extend({
+export default ArrayProxy.extend({
   loading: false,
   loadingMore: false,
   totalRows: 0,
diff --git a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
index 7472cc8e67..07529f6ee7 100644
--- a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
@@ -1,3 +1,4 @@
+import { A } from "@ember/array";
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
@@ -70,7 +71,7 @@ export default RestModel.extend({
           this.set("noContentHelp", result.no_results_help);
         }
         if (result && result.drafts) {
-          const copy = Ember.A();
+          const copy = A();
           result.drafts.forEach(draft => {
             let draftData = JSON.parse(draft.data);
             draft.post_number = draftData.postId || null;
diff --git a/app/assets/javascripts/discourse/models/user-stream.js.es6 b/app/assets/javascripts/discourse/models/user-stream.js.es6
index 81af6b30f8..7bca68c8b3 100644
--- a/app/assets/javascripts/discourse/models/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-stream.js.es6
@@ -1,3 +1,4 @@
+import { A } from "@ember/array";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
@@ -104,7 +105,7 @@ export default RestModel.extend({
           this.set("noContentHelp", result.no_results_help);
         }
         if (result && result.user_actions) {
-          const copy = Ember.A();
+          const copy = A();
           result.user_actions.forEach(action => {
             action.title = emojiUnescape(
               Handlebars.Utils.escapeExpression(action.title)
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 84c2765f6f..b15c868d80 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -1,3 +1,4 @@
+import { A } from "@ember/array";
 import { isEmpty } from "@ember/utils";
 import { gt, equal, or } from "@ember/object/computed";
 import EmberObject, { computed } from "@ember/object";
@@ -884,7 +885,7 @@ User.reopenClass(Singleton, {
       responses.set("count", responses.get("count") + stat.get("count"));
     });
 
-    const result = Ember.A();
+    const result = A();
     result.pushObjects(stats.rejectBy("isResponse"));
 
     let insertAt = 0;
diff --git a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
index 312e56eee3..c48b697087 100644
--- a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
@@ -1,3 +1,4 @@
+import Application from "@ember/application";
 import { mapRoutes } from "discourse/mapping-router";
 
 export default {
@@ -10,8 +11,9 @@ export default {
 
     // HACK to fix: https://github.com/emberjs/ember.js/issues/10310
     const originalBuildInstance =
-      originalBuildInstance || Ember.Application.prototype.buildInstance;
-    Ember.Application.prototype.buildInstance = function() {
+      originalBuildInstance || Application.prototype.buildInstance;
+
+    Application.prototype.buildInstance = function() {
       this.buildRegistry();
       return originalBuildInstance.apply(this);
     };
diff --git a/app/assets/javascripts/discourse/services/app-events.js.es6 b/app/assets/javascripts/discourse/services/app-events.js.es6
index fa73e9d463..8a3e770c75 100644
--- a/app/assets/javascripts/discourse/services/app-events.js.es6
+++ b/app/assets/javascripts/discourse/services/app-events.js.es6
@@ -1,7 +1,8 @@
 import deprecated from "discourse-common/lib/deprecated";
+import Evented from "@ember/object/evented";
 import Service from "@ember/service";
 
-export default Service.extend(Ember.Evented, {
+export default Service.extend(Evented, {
   _events: {},
 
   on() {
diff --git a/app/assets/javascripts/select-kit/components/multi-select.js.es6 b/app/assets/javascripts/select-kit/components/multi-select.js.es6
index a37eff583f..51ce57dc94 100644
--- a/app/assets/javascripts/select-kit/components/multi-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select.js.es6
@@ -1,8 +1,8 @@
 import deprecated from "discourse-common/lib/deprecated";
 import SelectKitComponent from "select-kit/components/select-kit";
 import { computed } from "@ember/object";
-import { makeArray } from "discourse-common/lib/helpers";
 import { isPresent } from "@ember/utils";
+import { makeArray } from "discourse-common/lib/helpers";
 
 export default SelectKitComponent.extend({
   pluginApiIdentifiers: ["multi-select"],
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 30a37cf450..9c9d542431 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -1,4 +1,4 @@
-import { computed, default as EmberObject } from "@ember/object";
+import { computed, guidFor, default as EmberObject } from "@ember/object";
 import Component from "@ember/component";
 import deprecated from "discourse-common/lib/deprecated";
 import { makeArray } from "discourse-common/lib/helpers";
@@ -76,7 +76,7 @@ export default Component.extend(
       this.set(
         "selectKit",
         EmberObject.create({
-          uniqueID: Ember.guidFor(this),
+          uniqueID: guidFor(this),
           valueProperty: this.valueProperty,
           nameProperty: this.nameProperty,
           options: EmberObject.create(),
diff --git a/app/assets/javascripts/wizard/router.js.es6 b/app/assets/javascripts/wizard/router.js.es6
index 05921b0a5d..822d3d7aba 100644
--- a/app/assets/javascripts/wizard/router.js.es6
+++ b/app/assets/javascripts/wizard/router.js.es6
@@ -1,7 +1,8 @@
+import EmberRouter from "@ember/routing/router";
 import getUrl from "discourse-common/lib/get-url";
 import ENV from "discourse-common/config/environment";
 
-const Router = Ember.Router.extend({
+const Router = EmberRouter.extend({
   rootURL: getUrl("/wizard/"),
   location: ENV.environment === "test" ? "none" : "history"
 });
diff --git a/app/assets/javascripts/wizard/wizard.js.es6 b/app/assets/javascripts/wizard/wizard.js.es6
index 6934febba2..db33756586 100644
--- a/app/assets/javascripts/wizard/wizard.js.es6
+++ b/app/assets/javascripts/wizard/wizard.js.es6
@@ -1,6 +1,7 @@
+import Application from "@ember/application";
 import { buildResolver } from "discourse-common/resolver";
 
-export default Ember.Application.extend({
+export default Application.extend({
   rootElement: "#wizard-main",
   Resolver: buildResolver("wizard"),
 
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
index 4b562eaecc..374aacad93 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
@@ -1,13 +1,15 @@
+import EmberObject from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
+import { notEmpty } from "@ember/object/computed";
+import { Promise } from "rsvp";
 /* global Pikaday:true */
 import { propertyNotEqual } from "discourse/lib/computed";
 import loadScript from "discourse/lib/load-script";
-import computed from "discourse-common/utils/decorators";
+import computed, { observes } from "discourse-common/utils/decorators";
 import { cookAsync } from "discourse/lib/text";
 import discourseDebounce from "discourse/lib/debounce";
-import { observes } from "discourse-common/utils/decorators";
 
 export default Component.extend({
   timeFormat: "HH:mm:ss",
@@ -24,9 +26,9 @@ export default Component.extend({
   isValid: true,
   timezone: null,
   fromSelected: null,
-  fromFilled: Ember.computed.notEmpty("date"),
+  fromFilled: notEmpty("date"),
   toSelected: null,
-  toFilled: Ember.computed.notEmpty("toDate"),
+  toFilled: notEmpty("toDate"),
 
   init() {
     this._super(...arguments);
@@ -113,7 +115,7 @@ export default Component.extend({
       format = "LL";
     }
 
-    return Ember.Object.create({
+    return EmberObject.create({
       date: dateTime.format(this.dateFormat),
       time,
       dateTime,
@@ -146,7 +148,7 @@ export default Component.extend({
       format = "LL";
     }
 
-    return Ember.Object.create({
+    return EmberObject.create({
       date: dateTime.format(this.dateFormat),
       time,
       dateTime,
@@ -157,7 +159,7 @@ export default Component.extend({
 
   @computed("recurring", "timezones", "timezone", "format")
   options(recurring, timezones, timezone, format) {
-    return Ember.Object.create({
+    return EmberObject.create({
       recurring,
       timezones,
       timezone,
@@ -171,7 +173,7 @@ export default Component.extend({
     "options.{recurring,timezones,timezone,format}"
   )
   computedConfig(fromConfig, toConfig, options) {
-    return Ember.Object.create({
+    return EmberObject.create({
       from: fromConfig,
       to: toConfig,
       options
@@ -372,7 +374,7 @@ export default Component.extend({
   },
 
   _setupPicker() {
-    return new Ember.RSVP.Promise(resolve => {
+    return new Promise(resolve => {
       loadScript("/javascripts/pikaday.js").then(() => {
         const options = {
           field: this.$(`.fake-input`)[0],
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index 220c8dc07a..175f3a9985 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -2,6 +2,8 @@ import { once } from "@ember/runloop";
 import { debounce } from "@ember/runloop";
 import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
+import { equal, gt } from "@ember/object/computed";
+import { Promise } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
 import computed, { observes, on } from "discourse-common/utils/decorators";
 
@@ -22,6 +24,9 @@ export default Component.extend({
   presenceUsers: null,
   channel: null,
 
+  isReply: equal("action", "reply"),
+  shouldDisplay: gt("users.length", 0),
+
   @on("didInsertElement")
   composerOpened() {
     this._lastPublish = new Date();
@@ -113,7 +118,7 @@ export default Component.extend({
 
     // Don't publish presence if disabled
     if (this.currentUser.hide_profile_and_presence) {
-      return Ember.RSVP.Promise.resolve();
+      return Promise.resolve();
     }
 
     return ajax("/presence/publish", { type: "POST", data });
@@ -122,8 +127,5 @@ export default Component.extend({
   @computed("presenceUsers", "currentUser.id")
   users(users, currentUserId) {
     return (users || []).filter(user => user.id !== currentUserId);
-  },
-
-  isReply: Ember.computed.equal("action", "reply"),
-  shouldDisplay: Ember.computed.gt("users.length", 0)
+  }
 });
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
index c022cd50ed..c12573803d 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -1,6 +1,7 @@
 import { debounce } from "@ember/runloop";
 import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
+import { gt } from "@ember/object/computed";
 import computed, { on } from "discourse-common/utils/decorators";
 import {
   keepAliveDuration,
@@ -13,6 +14,8 @@ export default Component.extend({
   topicId: null,
   presenceUsers: null,
 
+  shouldDisplay: gt("users.length", 0),
+
   clear() {
     if (!this.isDestroyed) this.set("presenceUsers", []);
   },
@@ -53,7 +56,5 @@ export default Component.extend({
       user =>
         user.id !== currentUser.id && !ignoredUsers.includes(user.username)
     );
-  },
-
-  shouldDisplay: Ember.computed.gt("users.length", 0)
+  }
 });
diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
index 77d8513cee..13b209dd50 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import { observes } from "discourse-common/utils/decorators";
 import { getRegister } from "discourse-common/lib/get-owner";
@@ -44,7 +45,7 @@ function initializePolls(api) {
           if (existing) {
             this._polls[p.name].setProperties(p);
           } else {
-            this._polls[p.name] = Ember.Object.create(p);
+            this._polls[p.name] = EmberObject.create(p);
           }
         });
         this.set("pollsObject", this._polls);
@@ -78,8 +79,8 @@ function initializePolls(api) {
       if (quotedId) {
         const quotedPost = post.quoted[quotedId];
         if (quotedPost) {
-          post = Ember.Object.create(quotedPost);
-          poll = Ember.Object.create(
+          post = EmberObject.create(quotedPost);
+          poll = EmberObject.create(
             quotedPost.polls.find(p => p.name === pollName)
           );
           vote = quotedPost.polls_votes || {};
diff --git a/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6 b/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6
index 33ee000b0a..47705e2cb5 100644
--- a/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6
+++ b/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6
@@ -1,4 +1,6 @@
+import EmberObject from "@ember/object";
 import { moduleForWidget, widgetTest } from "helpers/widget-test";
+
 moduleForWidget("discourse-poll-standard-results");
 
 const template = `{{mount-widget
@@ -11,7 +13,7 @@ widgetTest("options in descending order", {
   beforeEach() {
     this.set(
       "poll",
-      Ember.Object.create({
+      EmberObject.create({
         options: [{ votes: 5 }, { votes: 4 }],
         voters: 9
       })
@@ -30,7 +32,7 @@ widgetTest("options in ascending order", {
   beforeEach() {
     this.set(
       "poll",
-      Ember.Object.create({
+      EmberObject.create({
         options: [{ votes: 4 }, { votes: 5 }],
         voters: 9
       })
@@ -50,7 +52,7 @@ widgetTest("multiple options in descending order", {
     this.set("isMultiple", true);
     this.set(
       "poll",
-      Ember.Object.create({
+      EmberObject.create({
         type: "multiple",
         options: [
           { votes: 5, html: "a" },
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js.es6
index f7a587333f..dbcc4b5ca8 100644
--- a/test/javascripts/models/post-stream-test.js.es6
+++ b/test/javascripts/models/post-stream-test.js.es6
@@ -1,3 +1,4 @@
+import ArrayProxy from "@ember/array/proxy";
 import Post from "discourse/models/post";
 import createStore from "helpers/create-store";
 import User from "discourse/models/user";
@@ -863,7 +864,7 @@ QUnit.test("postsWithPlaceholders", async assert => {
   const postsWithPlaceholders = postStream.get("postsWithPlaceholders");
   const store = postStream.store;
 
-  const testProxy = Ember.ArrayProxy.create({ content: postsWithPlaceholders });
+  const testProxy = ArrayProxy.create({ content: postsWithPlaceholders });
 
   const p1 = store.createRecord("post", { id: 1, post_number: 1 });
   const p2 = store.createRecord("post", { id: 2, post_number: 2 });

From e9b6b0194c822bed5d21692798e0a12c6f49113c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 7 Mar 2020 12:58:48 +0100
Subject: [PATCH 026/633] DEV: enforce ember-template-lint:
 no-unnecessary-concat (#9133)

---
 .template-lintrc.js                                    |  3 ++-
 .../templates/components/admin-report-counters.hbs     |  2 +-
 .../admin/templates/components/admin-report-counts.hbs |  2 +-
 .../templates/components/admin-report-inline-table.hbs |  2 +-
 .../components/admin-report-storage-stats.hbs          |  2 +-
 .../admin/templates/components/admin-report-table.hbs  |  2 +-
 .../admin/templates/components/admin-report.hbs        | 10 +++++-----
 .../admin/templates/components/admin-theme-editor.hbs  |  2 +-
 .../templates/components/admin-web-hook-event.hbs      |  2 +-
 .../admin/templates/components/flag-user.hbs           |  2 +-
 .../admin/templates/components/install-theme-item.hbs  |  2 +-
 .../admin/templates/customize-themes-edit.hbs          |  2 +-
 .../admin/templates/customize-themes-show.hbs          | 10 +++++-----
 .../javascripts/admin/templates/dashboard_general.hbs  |  2 +-
 .../admin/templates/dashboard_moderation.hbs           |  2 +-
 .../javascripts/admin/templates/email-received.hbs     |  2 +-
 app/assets/javascripts/admin/templates/email-sent.hbs  |  2 +-
 .../javascripts/admin/templates/email-skipped.hbs      |  2 +-
 app/assets/javascripts/admin/templates/emojis.hbs      |  2 +-
 .../admin/templates/logs/staff-action-logs.hbs         |  2 +-
 .../admin/templates/modal/admin-install-theme.hbs      |  4 ++--
 .../admin/templates/modal/admin-theme-item.hbs         |  2 +-
 app/assets/javascripts/admin/templates/permalinks.hbs  |  8 ++++----
 .../javascripts/admin/templates/search-logs-term.hbs   |  4 ++--
 .../javascripts/admin/templates/site-settings.hbs      |  2 +-
 app/assets/javascripts/admin/templates/user-badges.hbs |  2 +-
 app/assets/javascripts/admin/templates/user-index.hbs  |  2 +-
 .../javascripts/admin/templates/users-list-show.hbs    |  2 +-
 .../javascripts/admin/templates/watched-words.hbs      |  2 +-
 .../javascripts/discourse/templates/badges/show.hbs    |  2 +-
 .../templates/components/about-page-users.hbs          |  6 +++---
 .../discourse/templates/components/avatar-uploader.hbs |  2 +-
 .../discourse/templates/components/backup-uploader.hbs |  2 +-
 .../templates/components/categories-boxes-topic.hbs    |  2 +-
 .../templates/components/categories-topic-list.hbs     |  2 +-
 .../discourse/templates/components/category-unread.hbs |  4 ++--
 .../templates/components/discourse-banner.hbs          |  2 +-
 .../templates/components/edit-category-settings.hbs    |  4 ++--
 .../templates/components/edit-category-tab.hbs         |  2 +-
 .../discourse/templates/components/featured-topic.hbs  |  8 ++++----
 .../discourse/templates/components/google-search.hbs   |  4 ++--
 .../templates/components/group-card-contents.hbs       |  8 ++++----
 .../templates/components/group-flair-inputs.hbs        |  2 +-
 .../discourse/templates/components/group-post.hbs      |  4 ++--
 .../discourse/templates/components/images-uploader.hbs |  2 +-
 .../templates/components/latest-topic-list-item.hbs    |  2 +-
 .../templates/components/mobile-category-topic.hbs     |  2 +-
 .../discourse/templates/components/nav-item.hbs        |  2 +-
 .../discourse/templates/components/share-source.hbs    |  2 +-
 .../templates/components/topic-post-badges.hbs         |  6 +++---
 .../discourse/templates/components/topic-progress.hbs  |  4 ++--
 .../templates/components/topic-timer-info.hbs          |  4 ++--
 .../discourse/templates/components/user-badge.hbs      |  2 +-
 .../templates/components/user-card-contents.hbs        |  4 ++--
 .../templates/components/user-fields/confirm.hbs       |  2 +-
 .../templates/components/user-fields/dropdown.hbs      |  2 +-
 .../templates/components/user-fields/text.hbs          |  2 +-
 .../discourse/templates/components/user-info.hbs       |  4 ++--
 .../templates/components/user-stream-item.hbs          |  2 +-
 .../templates/components/user-summary-topic.hbs        |  2 +-
 .../javascripts/discourse/templates/composer.hbs       | 10 +++++-----
 .../discourse/templates/full-page-search.hbs           |  4 ++--
 .../templates/mobile/components/basic-topic-list.hbs   |  6 +++---
 .../templates/mobile/components/categories-only.hbs    |  6 +++---
 .../javascripts/discourse/templates/modal/history.hbs  |  4 ++--
 .../discourse/templates/modal/insert-hyperlink.hbs     |  4 ++--
 .../discourse/templates/modal/reorder-categories.hbs   |  2 +-
 .../javascripts/discourse/templates/password-reset.hbs |  2 +-
 .../discourse/templates/preferences/account.hbs        |  2 +-
 .../discourse/templates/preferences/categories.hbs     |  6 +++---
 app/assets/javascripts/discourse/templates/topic.hbs   | 10 +++++-----
 .../discourse/templates/user-invited-show.hbs          |  4 ++--
 app/assets/javascripts/discourse/templates/user.hbs    |  4 ++--
 .../wizard/templates/components/popular-themes.hbs     |  2 +-
 74 files changed, 125 insertions(+), 124 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 3a85b721b0..f36c6313d2 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -7,6 +7,7 @@ module.exports = {
     "table-groups": true,
     "style-concatenation": true,
     "no-invalid-interactive": true,
-    "link-rel-noopener": true
+    "link-rel-noopener": true,
+    "no-unnecessary-concat": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs
index 9f3882a3b4..05d456fdeb 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs
@@ -2,7 +2,7 @@
   {{#if model.icon}}
     {{d-icon model.icon}}
   {{/if}}
-  <a href="{{model.reportUrl}}">{{model.title}}</a>
+  <a href={{model.reportUrl}}>{{model.title}}</a>
 </div>
 
 <div class="cell value today-count">{{number model.todayCount}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
index 4b4a406c59..a1e64441f9 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
@@ -2,7 +2,7 @@
   {{#if report.icon}}
     {{d-icon report.icon}}
   {{/if}}
-  <a href="{{report.reportUrl}}">{{report.title}}</a>
+  <a href={{report.reportUrl}}>{{report.title}}</a>
 </td>
 
 <td class="value">{{number report.todayCount}}</td>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
index 70138f829d..76c8eacb0b 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
@@ -1,6 +1,6 @@
 <div class="table-container">
   {{#each model.data as |data|}}
-    <a class="table-cell user-{{data.key}}" href="{{data.url}}">
+    <a class="table-cell user-{{data.key}}" href={{data.url}}>
       <span class="label">
         {{#if data.icon}}
           {{d-icon data.icon}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index 054b91d707..fbb9f80a64 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -1,7 +1,7 @@
 {{#if showBackupStats}}
   <div class="backups">
     <h3 class="storage-stats-title">
-      <a href="{{get-url '/admin/backups'}}">{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
+      <a href={{get-url '/admin/backups'}}>{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
     </h3>
     <p>
       {{#if backupStats.free_bytes}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
index 6c7838e872..f42189eb9a 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
@@ -24,7 +24,7 @@
 
     {{#if showTotalForSample}}
       <tr class="total-row">
-        <td colspan="{{totalsForSample.length}}">
+        <td colspan={{totalsForSample.length}}>
           {{i18n 'admin.dashboard.reports.totals_for_sample'}}
         </td>
       </tr>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index cb0f333bb0..0c7009cc82 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -18,17 +18,17 @@
 
           {{#unless showNotFoundError}}
           <li class="item report">
-            <a href="{{model.reportUrl}}" class="report-url">
+            <a href={{model.reportUrl}} class="report-url">
               {{model.title}}
             </a>
 
             {{#if model.description}}
               {{#if model.description_link}}
-                <a target="_blank" rel="noopener" href="{{model.description_link}}" class="info" data-tooltip="{{model.description}}">
+                <a target="_blank" rel="noopener" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
                   {{d-icon "question-circle"}}
                 </a>
               {{else}}
-                <span class="info" data-tooltip="{{model.description}}">
+                <span class="info" data-tooltip={{model.description}}>
                   {{d-icon "question-circle"}}
                 </span>
               {{/if}}
@@ -40,7 +40,7 @@
 
       {{#if shouldDisplayTrend}}
         <div class="trend {{model.trend}}">
-          <span class="value" title="{{model.trendTitle}}">
+          <span class="value" title={{model.trendTitle}}>
             {{#if model.average}}
               {{number model.currentAverage}}{{#if model.percent}}%{{/if}}
             {{else}}
@@ -77,7 +77,7 @@
             <div class="alert alert-info report-alert no-data">
               {{d-icon "chart-pie"}}
               {{#if model.reportUrl}}
-                <a href="{{model.reportUrl}}" class="report-url">
+                <a href={{model.reportUrl}} class="report-url">
                   <span>
                     {{#if model.title}}
                       {{model.title}} —
diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
index bf9d2fd3cb..ad669f4d3d 100644
--- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
@@ -25,7 +25,7 @@
             <a {{action "toggleShowAdvanced"}}
                 class='no-text'
                 href
-                title="{{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}"
+                title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}
             >
                 {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
             </a>
diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
index ce952f3ec7..11977f1398 100644
--- a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
@@ -1,5 +1,5 @@
 <div class="col first status">
-  <span class="{{statusColorClasses}}">{{model.status}}</span>
+  <span class={{statusColorClasses}}>{{model.status}}</span>
 </div>
 <div class="col event-id">{{model.id}}</div>
 <div class="col timestamp">{{createdAt}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/flag-user.hbs b/app/assets/javascripts/admin/templates/components/flag-user.hbs
index 26087789e5..a6a4ce0f95 100644
--- a/app/assets/javascripts/admin/templates/components/flag-user.hbs
+++ b/app/assets/javascripts/admin/templates/components/flag-user.hbs
@@ -7,7 +7,7 @@
       {{#link-to 'adminUser' user.id user.username class="flag-user-username"}}
         {{user.username}}
       {{/link-to}}
-      <div class='flag-user-date' title='{{raw-date date}}'>
+      <div class='flag-user-date' title={{raw-date date}}>
         {{format-age date}}
       </div>
     </div>
diff --git a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
index ed4ddd242f..2697ffe8b9 100644
--- a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
@@ -1,5 +1,5 @@
 {{radio-button name="install-items" id=value value=value selection=selection}}
-<label class="radio" for="{{value}}">
+<label class="radio" for={{value}}>
   {{#if showIcon}}
     {{d-icon 'plus'}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index 5fdaa76885..5f6d29e953 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -15,7 +15,7 @@
     <div class='admin-footer'>
       <div class='status-actions'>
         {{#unless model.changed}}
-          <a class='preview-link' href={{previewUrl}} rel="noopener" target='_blank' title="{{i18n 'admin.customize.explain_preview'}}">
+          <a class='preview-link' href={{previewUrl}} rel="noopener" target='_blank' title={{i18n 'admin.customize.explain_preview'}}>
             {{i18n 'admin.customize.preview'}}
           </a>
         {{/unless}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 2687c6b692..9fb7fcb4cf 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -63,16 +63,16 @@
 
     {{#if model.remote_theme.remote_url}}
       {{#if sourceIsHttp}}
-        <a class="remote-url" href="{{model.remote_theme.remote_url}}">{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
+        <a class="remote-url" href={{model.remote_theme.remote_url}}>{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
       {{else}}
         <div class="remote-url"><code>{{model.remote_theme.remote_url}}</code></div>
       {{/if}}
     {{/if}}
     {{#if model.remote_theme.about_url}}
-      <a class="url about-url" href="{{model.remote_theme.about_url}}">{{i18n "admin.customize.theme.about_theme"}}{{d-icon "link"}}</a>
+      <a class="url about-url" href={{model.remote_theme.about_url}}>{{i18n "admin.customize.theme.about_theme"}}{{d-icon "link"}}</a>
     {{/if}}
     {{#if model.remote_theme.license_url}}
-      <a class="url license-url" href="{{model.remote_theme.license_url}}">{{i18n "admin.customize.theme.license"}}{{d-icon "link"}}</a>
+      <a class="url license-url" href={{model.remote_theme.license_url}}>{{i18n "admin.customize.theme.license"}}{{d-icon "link"}}</a>
     {{/if}}
 
     {{#if model.description}}
@@ -109,7 +109,7 @@
             {{#if model.remote_theme.commits_behind}}
               {{i18n 'admin.customize.theme.commits_behind' count=model.remote_theme.commits_behind}}
               {{#if model.remote_theme.github_diff_link}}
-                <a href="{{model.remote_theme.github_diff_link}}">
+                <a href={{model.remote_theme.github_diff_link}}>
                   {{i18n 'admin.customize.theme.compare_commits'}}
                 </a>
               {{/if}}
@@ -241,7 +241,7 @@
     </div>
   {{/if}}
 
-  <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" rel="noopener" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
+  <a href={{previewUrl}} title={{i18n 'admin.customize.explain_preview'}} rel="noopener" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
   <a class="btn btn-default export" rel="noopener" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
 
   {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index af0bb36ae9..19f892ab0f 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -5,7 +5,7 @@
     <div class="period-section">
       <div class="section-title">
         <h2>
-          <a href="{{get-url '/admin/dashboard/reports'}}">
+          <a href={{get-url '/admin/dashboard/reports'}}>
             {{i18n "admin.dashboard.community_health"}}
           </a>
         </h2>
diff --git a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
index c6091447ff..019ffb5990 100644
--- a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
@@ -4,7 +4,7 @@
   <div class="moderators-activity section">
     <div class="section-title">
       <h2>
-        <a href="{{get-url '/admin/reports/moderators_activity'}}">
+        <a href={{get-url '/admin/reports/moderators_activity'}}>
           {{i18n "admin.dashboard.moderators_activity"}}
         </a>
       </h2>
diff --git a/app/assets/javascripts/admin/templates/email-received.hbs b/app/assets/javascripts/admin/templates/email-received.hbs
index e711d5a0ba..5fc983557e 100644
--- a/app/assets/javascripts/admin/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/templates/email-received.hbs
@@ -42,7 +42,7 @@
           </td>
           <td>
             {{#if email.post_url}}
-              <a href="{{email.post_url}}">{{email.subject}}</a>
+              <a href={{email.post_url}}>{{email.subject}}</a>
             {{else}}
               {{email.subject}}
             {{/if}}
diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index 5c2bf4c49b..c1ad376b6c 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -36,7 +36,7 @@
           <td>{{l.email_type}}</td>
           <td class='post-link'>
             {{#if l.post_url}}
-              <a href="{{l.post_url}}">{{l.post_description}}</a>
+              <a href={{l.post_url}}>{{l.post_description}}</a>
               <span class='reply-key'>{{l.reply_key}}</span>
             {{else}}
               <span class='reply-key'>{{l.reply_key}}</span>
diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/templates/email-skipped.hbs
index f2463f3daf..76ddb1197e 100644
--- a/app/assets/javascripts/admin/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email-skipped.hbs
@@ -33,7 +33,7 @@
           <td>{{l.email_type}}</td>
           <td>
             {{#if l.post_url}}
-              <a href="{{l.post_url}}">{{l.skipped_reason}}</a>
+              <a href={{l.post_url}}>{{l.skipped_reason}}</a>
             {{else}}
               {{l.skipped_reason}}
             {{/if}}
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index 6281b15c05..d08f2ed547 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -18,7 +18,7 @@
         <tbody>
           {{#each sortedEmojis as |e|}}
             <tr>
-              <th><img class="emoji emoji-custom" src="{{unbound e.url}}" title="{{unbound e.name}}"></th>
+              <th><img class="emoji emoji-custom" src={{unbound e.url}} title={{unbound e.name}}></th>
               <th>:{{e.name}}:</th>
               <th>
                 {{d-button
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 799eda905b..02c4160b6a 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -65,7 +65,7 @@
                     {{#link-to 'adminUser' item.acting_user}}{{avatar item.acting_user imageSize="tiny"}}{{/link-to}}
                     <a href {{action "filterByStaffUser" item.acting_user}}>{{item.acting_user.username}}</a>
                   {{else}}
-                    <span class="deleted-user" title="{{i18n 'admin.user.deleted'}}">
+                    <span class="deleted-user" title={{i18n 'admin.user.deleted'}}>
                       {{d-icon "far-trash-alt"}}
                     </span>
                   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index eec9151f90..aab0b17d71 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -11,7 +11,7 @@
         {{#each themes as |theme|}}
           <div class="popular-theme-item">
             <div class="popular-theme-name">
-              <a href="{{theme.meta_url}}" rel="noopener" target="_blank">
+              <a href={{theme.meta_url}} rel="noopener" target="_blank">
                 {{#if theme.component}}
                   {{d-icon 'puzzle-piece' title='admin.customize.theme.component'}}
                 {{/if}}
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href="{{theme.preview}}" rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
+                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 27e5cd5ec5..7a5ddc1ea7 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -2,7 +2,7 @@
   <div class="popular-theme-name">
     {{theme.name}}
     {{#if theme.preview}}
-      <a href="{{theme.preview}}" title="Preview" rel="noopener" target="_blank">{{d-icon "far-eye"}}</a>
+      <a href={{theme.preview}} title="Preview" rel="noopener" target="_blank">{{d-icon "far-eye"}}</a>
     {{/if}}
   </div>
   <div class="popular-theme-buttons">
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index b86950bc2a..ac933f09c3 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -27,22 +27,22 @@
             <td class="col first url">{{pl.url}}</td>
             <td class="col topic">
               {{#if pl.topic_id}}
-                <a href='{{unbound pl.topic_url}}'>{{pl.topic_title}}</a>
+                <a href={{unbound pl.topic_url}}>{{pl.topic_title}}</a>
               {{/if}}
             </td>
             <td class="col post">
               {{#if pl.post_id}}
-                <a href='{{unbound pl.post_url}}'>#{{pl.post_number}} {{pl.post_topic_title}}</a>
+                <a href={{unbound pl.post_url}}>#{{pl.post_number}} {{pl.post_topic_title}}</a>
               {{/if}}
             </td>
             <td class="col category">
               {{#if pl.category_id}}
-                <a href='{{unbound pl.category_url}}'>{{pl.category_name}}</a>
+                <a href={{unbound pl.category_url}}>{{pl.category_name}}</a>
               {{/if}}
             </td>
             <td class="col external_url">
               {{#if pl.external_url}}
-                <a href='{{unbound pl.external_url}}'>{{pl.external_url}}</a>
+                <a href={{unbound pl.external_url}}>{{pl.external_url}}</a>
               {{/if}}
             </td>
             <td class="col action">
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 91d5d31361..339cf2d169 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -23,14 +23,14 @@
   {{#each model.search_result.posts as |result|}}
     <div class='fps-result'>
       <div class='author'>
-        <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
+        <a href={{result.userPath}} data-user-card={{unbound result.username}}>
           {{avatar result imageSize="large"}}
         </a>
       </div>
 
       <div class='fps-topic'>
         <div class='topic'>
-          <a class='search-link' href='{{unbound result.url}}'>
+          <a class='search-link' href={{unbound result.url}}>
             {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
           </a>
 
diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs
index 56ddbcd551..01264be5b5 100644
--- a/app/assets/javascripts/admin/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings.hbs
@@ -16,7 +16,7 @@
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
     {{#each visibleSiteSettings as |category|}}
-      <li class="{{category.nameKey}}">
+      <li class={{category.nameKey}}>
         {{#link-to 'adminSiteSettingsCategory' category.nameKey class=category.nameKey}}
           {{category.name}}
           {{#if category.count}}<span class="count">({{category.count}})</span>{{/if}}
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index f919867c4d..c93e7fb462 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -55,7 +55,7 @@
             </td>
             <td class='reason'>
               {{#if userBadge.postUrl}}
-              <a href="{{unbound userBadge.postUrl}}">{{userBadge.topic_title}}</a>
+              <a href={{unbound userBadge.postUrl}}>{{userBadge.topic_title}}</a>
               {{/if}}
             </td>
             <td>{{age-with-tooltip userBadge.granted_at}}</td>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index d69f3b9706..5707142ff3 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -97,7 +97,7 @@
     </div>
 
     <div class="display-row bounce-score">
-      <div class="field"><a href="{{model.bounceLink}}">{{i18n "admin.user.bounce_score"}}</a></div>
+      <div class="field"><a href={{model.bounceLink}}>{{i18n "admin.user.bounce_score"}}</a></div>
       <div class="value">{{model.bounceScore}}</div>
       <div class="controls">
         {{#if model.canResetBounceScore}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index d31a38c1f6..127b7446c0 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -40,7 +40,7 @@
         {{#each model as |user|}}
           <tr class="user {{user.selected}} {{unless user.active 'not-activated'}}">
             <td class="username">
-              <a href="{{unbound user.path}}" data-user-card="{{unbound user.username}}">
+              <a href={{unbound user.path}} data-user-card={{unbound user.username}}>
                 {{avatar user imageSize="small"}}
               </a>
               {{#link-to 'adminUser' user}}{{unbound user.username}}{{/link-to}}
diff --git a/app/assets/javascripts/admin/templates/watched-words.hbs b/app/assets/javascripts/admin/templates/watched-words.hbs
index 5fe3946dfb..6897721197 100644
--- a/app/assets/javascripts/admin/templates/watched-words.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words.hbs
@@ -9,7 +9,7 @@
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
     {{#each model as |action|}}
-      <li class="{{action.nameKey}}">
+      <li class={{action.nameKey}}>
         {{#link-to 'adminWatchedWords.action' action.nameKey}}
           {{action.name}}
           {{#if action.count}}<span class="count">({{action.count}})</span>{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 9eeb3d7fa2..12ba951aac 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -52,7 +52,7 @@
       {{#unless canLoadMore}}
         {{#if canShowOthers}}
         <div class='clearfix'>
-          <a class='btn' href='{{model.url}}'>{{i18n 'badges.others_count' count=othersCount}}</a>
+          <a class='btn' href={{model.url}}>{{i18n 'badges.others_count' count=othersCount}}</a>
         </div>
         {{/if}}
       {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
index 4c946af466..f7bfd9886b 100644
--- a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
@@ -1,8 +1,8 @@
 {{#each usersTemplates as |userTemplate|}}
-  <div data-username="{{userTemplate.username}}" class="user-info small">
+  <div data-username={{userTemplate.username}} class="user-info small">
     <div class="user-image">
       <div class="user-image-inner">
-        <a href="{{userTemplate.userPath}}" data-user-card="{{userTemplate.username}}">
+        <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
           {{{userTemplate.avatar}}}
         </a>
       </div>
@@ -10,7 +10,7 @@
     <div class="user-detail">
       <div class="name-line">
         <span class="username">
-          <a href="{{userTemplate.userPath}}" data-user-card="{{userTemplate.username}}">
+          <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
             {{userTemplate.username}}
           </a>
         </span>
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index f19538efea..6545208bb7 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn btn-default btn-icon-text" disabled={{uploading}} title="{{i18n 'user.change_avatar.upload_title'}}">
+<label class="btn btn-default btn-icon-text" disabled={{uploading}} title={{i18n 'user.change_avatar.upload_title'}}>
   {{d-icon "far-image"}}
   {{#if uploading}}
   {{i18n 'uploading'}} {{uploadProgress}}%
diff --git a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs b/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
index 255d2f01d5..77581a3598 100644
--- a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn" disabled={{uploading}} title="{{i18n 'admin.backups.upload.title'}}">
+<label class="btn" disabled={{uploading}} title={{i18n 'admin.backups.upload.title'}}>
   {{d-icon "upload"}}&nbsp;{{uploadButtonText}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".gz">
 </label>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
index 95ebe51a0d..1e6fd8be89 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
@@ -1,5 +1,5 @@
 {{d-icon topicStatusIcon}}
 
-<a class='title' href="{{unbound topic.lastUnreadUrl}}">
+<a class='title' href={{unbound topic.lastUnreadUrl}}>
   {{text-overflow class="overflow" text=topic.fancyTitle}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
index 4dcd89c71a..8a70f1b6fc 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
@@ -7,7 +7,7 @@
     {{latest-topic-list-item topic=t}}
   {{/each}}
   <div class="more-topics">
-    <a href="{{get-url (concat '/' filter)}}" class="btn btn-default pull-right">{{i18n "more"}}</a>
+    <a href={{get-url (concat '/' filter)}} class="btn btn-default pull-right">{{i18n "more"}}</a>
   </div>
 {{else}}
   <div class='no-topics'>
diff --git a/app/assets/javascripts/discourse/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
index a6a2251691..16eef33fc9 100644
--- a/app/assets/javascripts/discourse/templates/components/category-unread.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
@@ -1,6 +1,6 @@
 {{#if category.unreadTopics}}
-  <a href="{{unbound category.unreadUrl}}" class='badge new-posts badge-notification' title='{{i18n 'topic.unread_topics' count=category.unreadTopics}}'>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
+  <a href={{unbound category.unreadUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.unread_topics' count=category.unreadTopics}}>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
 {{/if}}
 {{#if category.newTopics}}
-  <a href="{{unbound category.newUrl}}" class='badge new-posts badge-notification' title='{{i18n 'topic.new_topics' count=category.newTopics}}'>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
+  <a href={{unbound category.newUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.new_topics' count=category.newTopics}}>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index f4864b3dc8..27025bedee 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -5,7 +5,7 @@
       <div id="banner-content">
         {{{content}}}
         {{#if currentUser.staff}}
-          <p><a href="{{banner.url}}">{{{i18n "banner.edit"}}}</a></p>
+          <p><a href={{banner.url}}>{{{i18n "banner.edit"}}}</a></p>
         {{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index dfb2e1c8d0..73ca697a71 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -13,7 +13,7 @@
   {{#unless showPositionInput}}
     <section class='field'>
       {{i18n 'category.position_disabled'}}
-      <a href="{{get-url '/admin/site_settings/category/basic'}}">{{i18n 'category.position_disabled_click'}}</a>
+      <a href={{get-url '/admin/site_settings/category/basic'}}>{{i18n 'category.position_disabled_click'}}</a>
     </section>
   {{/unless}}
 
@@ -261,7 +261,7 @@
   {{#unless emailInEnabled}}
     <section class='field'>
       {{i18n 'category.email_in_disabled'}}
-      <a href="{{get-url '/admin/site_settings/category/email'}}">{{i18n 'category.email_in_disabled_click'}}</a>
+      <a href={{get-url '/admin/site_settings/category/email'}}>{{i18n 'category.email_in_disabled_click'}}</a>
     </section>
   {{/unless}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
index 7be1e91060..f56683a3f6 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
@@ -1 +1 @@
-<a href {{action "select"}} class="{{if active 'active'}}">{{title}}</a>
+<a href {{action "select"}} class={{if active 'active'}}>{{title}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index 7061778b8e..aed5312bfa 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,12 +1,12 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href="{{unbound topic.lastUnreadUrl}}">{{{unbound topic.fancyTitle}}}</a>
+<a class='title' href={{unbound topic.lastUnreadUrl}}>{{{unbound topic.fancyTitle}}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
   <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href="{{{unbound topic.lastPosterUrl}}}">{{unbound topic.last_poster.username}}</a>
-    <a href="{{unbound topic.lastPostUrl}}">{{format-age topic.last_posted_at}}</a>
+    {{i18n 'categories.latest_by'}} <a href={{{unbound topic.lastPosterUrl}}}>{{unbound topic.last_poster.username}}</a>
+    <a href={{unbound topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
-  <a href="{{unbound topic.lastPostUrl}}" class="last-posted-at">{{format-age topic.last_posted_at}}</a>
+  <a href={{unbound topic.lastPostUrl}} class="last-posted-at">{{format-age topic.last_posted_at}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/google-search.hbs b/app/assets/javascripts/discourse/templates/components/google-search.hbs
index 766bf3a908..28893ffff8 100644
--- a/app/assets/javascripts/discourse/templates/components/google-search.hbs
+++ b/app/assets/javascripts/discourse/templates/components/google-search.hbs
@@ -1,7 +1,7 @@
 <div>
   <form action='//google.com/search' id='google-search'>
-    <input type="text" name="q" value="{{searchTerm}}">
-    <input type='hidden' name="as_sitesearch" value="{{siteUrl}}">
+    <input type="text" name="q" value={{searchTerm}}>
+    <input type='hidden' name="as_sitesearch" value={{siteUrl}}>
     <button class="btn btn-primary">{{i18n 'search.search_google_button'}}</button>
   </form>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index eee2b12ed0..22629d003d 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -3,7 +3,7 @@
 
     <div class="card-row first-row">
       <div class="group-card-avatar">
-        <a href="{{groupPath}}" {{action "showGroup" group}} class="card-huge-avatar">
+        <a href={{groupPath}} {{action "showGroup" group}} class="card-huge-avatar">
           {{avatar-flair
           flairURL=group.flair_url
           flairBgColor=group.flair_bg_color
@@ -13,8 +13,8 @@
       </div>
       <div class="names">
         <span>
-          <h1 class="{{group.name}}">
-            <a href="{{groupPath}}" {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a>
+          <h1 class={{group.name}}>
+            <a href={{groupPath}} {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a>
           </h1>
           {{#if group.full_name}}
             <h2 class='full-name'>{{group.full_name}}</h2>
@@ -74,7 +74,7 @@
             <a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
           {{/each}}
           {{#if showMoreMembers}}
-            <a href="{{groupPath}}" {{action "showGroup" group}} class="more-members-link"><span
+            <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link"><span
                class="more-members-count">+{{moreMembersCount}}
                 {{i18n "more"}}</span></a>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
index 5436915996..319fa80805 100644
--- a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
@@ -35,7 +35,7 @@
 
   <div class="avatar-flair-preview">
     <div class="avatar-wrapper">
-      <img width="45" height="45" src="{{demoAvatarUrl}}" class="avatar actor">
+      <img width="45" height="45" src={{demoAvatarUrl}} class="avatar actor">
     </div>
 
     {{#if flairPreviewImage}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index 9e56010fad..a39e71f9ae 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -1,5 +1,5 @@
 <div class='clearfix info'>
-    <a href="{{unbound post.user.userUrl}}" data-user-card="{{unbound post.user.username}}" class='avatar-link'>
+    <a href={{unbound post.user.userUrl}} data-user-card={{unbound post.user.username}} class='avatar-link'>
       {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
     </a>
     <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
@@ -19,7 +19,7 @@
         </div>
       {{/if}}
   </div>
-  
+
 </div>
 
 <div class='excerpt'>
diff --git a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
index 56aca01de4..ea9a23d1e4 100644
--- a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn" disabled={{uploading}} title="{{i18n "admin.site_settings.uploaded_image_list.upload.title"}}">
+<label class="btn" disabled={{uploading}} title={{i18n "admin.site_settings.uploaded_image_list.upload.title"}}>
   {{d-icon "far-image"}}&nbsp;{{uploadButtonText}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" multiple>
 </label>
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
index a3666f6842..a1f459f725 100644
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
@@ -20,6 +20,6 @@
 <div class='topic-stats'>
   {{raw "list/posts-count-column" topic=topic tagName="div"}}
   <div class="topic-last-activity">
-    <a href="{{topic.lastPostUrl}}" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
+    <a href={{topic.lastPostUrl}} title={{topic.bumpedAtTitle}}>{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
index 6cc45d2f1e..e9d901d880 100644
--- a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
@@ -5,7 +5,7 @@
     {{#if topic.unseen}}
       <span class="badge-notification new-topic"></span>
     {{/if}}
-    <span class="{{cold-age-class topic.last_posted_at}}" title='{{raw-date topic.last_posted_at}}'>{{{format-age topic.last_posted_at}}}</span>
+    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{{format-age topic.last_posted_at}}}</span>
   </div>
 </td>
 <td class='num posts'>{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/components/nav-item.hbs b/app/assets/javascripts/discourse/templates/components/nav-item.hbs
index 1205e1b36a..8817c4df61 100644
--- a/app/assets/javascripts/discourse/templates/components/nav-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/nav-item.hbs
@@ -3,5 +3,5 @@
 {{else if route}}
   {{#link-to route}}{{contents}}{{/link-to}}
 {{else}}
-  <a href="{{get-url path}}" data-auto-route="true">{{contents}}</a>
+  <a href={{get-url path}} data-auto-route="true">{{contents}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index 185f80ab9c..7680c6b861 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -1,4 +1,4 @@
-<a href {{action "share" source}} title="{{unbound source.title}}" aria-label="{{unbound source.title}}" >
+<a href {{action "share" source}} title={{unbound source.title}} aria-label={{unbound source.title}}>
   {{#if source.icon}}
     {{d-icon source.icon}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs b/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
index 0953efa293..1d992c500e 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
@@ -1,9 +1,9 @@
 {{#if unread }}
-  &nbsp;<a href='{{url}}' class='badge badge-notification unread' title='{{i18n "topic.unread_posts" count=unread}}'>{{unread}}</a>
+  &nbsp;<a href={{url}} class='badge badge-notification unread' title={{i18n "topic.unread_posts" count=unread}}>{{unread}}</a>
 {{/if}}
 {{#if newPosts}}
-  &nbsp;<a href='{{url}}' class='badge badge-notification new-posts' title='{{i18n "topic.total_unread_posts" count=newPosts}}'>{{newPosts}}</a>
+  &nbsp;<a href={{url}} class='badge badge-notification new-posts' title={{i18n "topic.total_unread_posts" count=newPosts}}>{{newPosts}}</a>
 {{/if}}
 {{#if unseen}}
-  &nbsp;<a href='{{url}}' class='badge badge-notification new-topic' title='{{i18n "topic.new"}}'>{{newDotText}}</a>
+  &nbsp;<a href={{url}} class='badge badge-notification new-topic' title={{i18n "topic.new"}}>{{newDotText}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index ab4ea02ff4..d9c0ff5802 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
@@ -8,9 +8,9 @@
   </div>
 {{/if}}
 
-<nav id='topic-progress' title="{{i18n 'topic.progress.title'}}" class="{{if hideProgress 'hidden'}}">
+<nav id='topic-progress' title={{i18n 'topic.progress.title'}} class={{if hideProgress 'hidden'}}>
   <div class='nums'>
-    <h4>{{progressPosition}}</h4><span class="{{if hugeNumberOfPosts 'hidden'}}">
+    <h4>{{progressPosition}}</h4><span class={{if hugeNumberOfPosts 'hidden'}}>
     <span>/</span>
     <h4>{{postStream.filteredPostsCount}}</h4></span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
index fe1f089d74..7741113b5d 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
@@ -1,10 +1,10 @@
 {{#if showTopicTimer}}
   <h3 class="topic-timer-heading">
-    <span title="{{title}}">
+    <span title={{title}}>
       {{clockIcon}} {{notice}}
     </span>
     {{#if showTrashCan}}
-      <button class="btn topic-timer-remove no-text" title="{{trashCanTitle}}">
+      <button class="btn topic-timer-remove no-text" title={{trashCanTitle}}>
         {{trashCanIcon}}
       </button>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-badge.hbs b/app/assets/javascripts/discourse/templates/components/user-badge.hbs
index 24334c6a7e..c1af47a6da 100644
--- a/app/assets/javascripts/discourse/templates/components/user-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-badge.hbs
@@ -1,4 +1,4 @@
-<a href="{{badgeUrl}}">
+<a href={{badgeUrl}}>
   {{#badge-button badge=badge}}
     {{#if showGrantCount}}
       <span class="count">(&times;&nbsp;{{count}})</span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index ba00265392..8319d233e1 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -25,7 +25,7 @@
           {{#if user.profile_hidden}}
             <span class="card-huge-avatar">{{bound-avatar user "huge"}}</span>
           {{else}}
-            <a href="{{user.path}}" {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
+            <a href={{user.path}} {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
           {{/if}}
           {{#if user.primary_group_name}}
             {{avatar-flair
@@ -43,7 +43,7 @@
                 {{if nameFirst user.name (format-username username)}}
               </span>
             {{else}}
-              <a href="{{user.path}}" {{action "showUser" user}} class='user-profile-link'>
+              <a href={{user.path}} {{action "showUser" user}} class='user-profile-link'>
                 <span class="name-username-wrapper">
                   {{if nameFirst user.name (format-username username)}}
                 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index f3bcf803c9..fe91090dde 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,5 +1,5 @@
 {{#if field.name}}
-  <label class="control-label" for="{{concat 'user-' elementId}}">
+  <label class="control-label" for={{concat 'user-' elementId}}>
     {{{field.name}}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
   </label>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index 568deb553d..136585cb03 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 8ed4b1ead9..4549f721af 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-info.hbs b/app/assets/javascripts/discourse/templates/components/user-info.hbs
index 7870de14a8..46691e39ea 100644
--- a/app/assets/javascripts/discourse/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-info.hbs
@@ -1,6 +1,6 @@
 <div class="user-image">
   <div class="user-image-inner">
-    <a href="{{unbound userPath}}" data-user-card="{{unbound user.username}}">{{avatar user imageSize="large"}}</a>
+    <a href={{unbound userPath}} data-user-card={{unbound user.username}}>{{avatar user imageSize="large"}}</a>
     {{#if user.primary_group_name}}
       {{avatar-flair
         flairURL=user.primary_group_flair_url
@@ -13,7 +13,7 @@
 
 <div class="user-detail">
   <div class='name-line'>
-    <span class="username"><a href="{{unbound userPath}}" data-user-card="{{unbound user.username}}">{{format-username user.username}}</a></span>
+    <span class="username"><a href={{unbound userPath}} data-user-card={{unbound user.username}}>{{format-username user.username}}</a></span>
     <span class="name">{{unbound name}}</span>
   </div>
   <div class="title">{{unbound user.title}}</div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index 823c447903..a87439ad35 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -35,7 +35,7 @@
   <p class='excerpt'>{{actionDescription}}</p>
 {{/if}}
 
-<p class='excerpt' data-topic-id="{{item.topic_id}}" data-post-id="{{item.post_id}}" data-user-id="{{item.user_id}}">
+<p class='excerpt' data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}}>
   {{~#if item.expandedExcerpt}}
     {{~{item.expandedExcerpt}~}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 056b9cf088..7b31dfff86 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -6,4 +6,4 @@
   {{/if}}
 </span>
 <br>
-<a href="{{unbound url}}">{{{topic.fancyTitle}}}</a>
+<a href={{unbound url}}>{{{topic.fancyTitle}}}</a>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index ffc9fb49a4..987e5e714f 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -138,7 +138,7 @@
                                        disableSubmit=disableSubmit}}
 
               {{#if site.mobileView}}
-                <a href {{action "cancel"}} class='cancel' tabindex="6" title="{{i18n 'cancel'}}">
+                <a href {{action "cancel"}} class='cancel' tabindex="6" title={{i18n 'cancel'}}>
                   {{#if canEdit}}
                     {{d-icon "times"}}
                   {{else}}
@@ -171,11 +171,11 @@
                   {{/if}}
                 </div>
               {{/if}}
-              <div id='draft-status' class="{{if isUploading 'hidden'}}">
+              <div id='draft-status' class={{if isUploading 'hidden'}}>
                 {{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
                 {{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
                 {{#if model.draftStatus}}
-                  <span title="{{model.draftStatus}}">
+                  <span title={{model.draftStatus}}>
                     {{#if model.draftConflictUser}}
                       {{avatar model.draftConflictUser imageSize="small"}} {{d-icon 'user-edit'}}
                     {{else}}
@@ -196,7 +196,7 @@
                   </a>
                 {{/if}}
 
-                <a href class="btn btn-default no-text mobile-preview" title="{{i18n 'composer.show_preview'}}" {{action "togglePreview"}}>
+                <a href class="btn btn-default no-text mobile-preview" title={{i18n 'composer.show_preview'}} {{action "togglePreview"}}>
                   {{d-icon "desktop"}}
                 </a>
 
@@ -213,7 +213,7 @@
       {{else}}
         <div class='saving-text'>
           {{#if model.createdPost}}
-            {{i18n 'composer.saved'}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+            {{i18n 'composer.saved'}} <a class='permalink' href={{unbound createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
           {{else}}
             {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index e903c5cd02..c60aaf0dd1 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -73,7 +73,7 @@
           {{#each model.posts as |result|}}
             <div class='fps-result'>
               <div class='author'>
-                <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
+                <a href={{result.userPath}} data-user-card={{unbound result.username}}>
                   {{avatar result imageSize="large"}}
                 </a>
               </div>
@@ -84,7 +84,7 @@
                     {{track-selected selectedList=selected selectedId=result.topic}}
                   {{/if}}
 
-                  <a class='search-link' href='{{unbound result.url}}' {{action "logClick" result.topic_id}}>
+                  <a class='search-link' href={{unbound result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
                     <span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
                   </a>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 7c68ac0d05..a7484723f1 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -26,10 +26,10 @@
                 <div class="topic-excerpt">
                   {{{t.excerpt}}}
                   {{#if t.excerptTruncated}}
-                    {{#unless t.canClearPin}}<a href="{{unbound t.url}}">{{i18n 'read_more'}}</a>{{/unless}}
+                    {{#unless t.canClearPin}}<a href={{unbound t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
                   {{#if t.canClearPin}}
-                    <a href {{action "clearPin" t}} title="{{i18n 'topic.clear_pin.help'}}">{{i18n 'topic.clear_pin.title'}}</a>
+                    <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
                   {{/if}}
                 </div>
               {{/if}}
@@ -42,7 +42,7 @@
               {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
               <div class="pull-right">
                 {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                <a href="{{t.lastPostUrl}}" title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
+                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
               </div>
               {{#unless hideCategory}}
                 <div class='category'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 41b86dda0b..5418fcb86a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -61,14 +61,14 @@
         </table>
         <footer class="clearfix">
 
-          <figure title="{{i18n 'all_time_desc'}}">{{number c.topics_all_time}} <figcaption>{{i18n 'all_time'}}</figcaption></figure>
+          <figure title={{i18n 'all_time_desc'}}>{{number c.topics_all_time}} <figcaption>{{i18n 'all_time'}}</figcaption></figure>
 
           {{#if c.pickMonth}}
-          <figure title="{{i18n 'month_desc'}}">{{number c.topics_month}} <figcaption>/ {{i18n 'month'}}</figcaption></figure>
+          <figure title={{i18n 'month_desc'}}>{{number c.topics_month}} <figcaption>/ {{i18n 'month'}}</figcaption></figure>
           {{/if}}
 
           {{#if c.pickWeek}}
-            <figure title="{{i18n 'week_desc'}}">{{number c.topics_week}} <figcaption>/ {{i18n 'week'}}</figcaption></figure>
+            <figure title={{i18n 'week_desc'}}>{{number c.topics_week}} <figcaption>/ {{i18n 'week'}}</figcaption></figure>
           {{/if}}
 
         </footer>
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index c96f042df3..6d9dbff78e 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -47,7 +47,7 @@
       {{/unless}}
     </div>
   </div>
-  <div id="revisions" data-post-id="{{model.post_id}}" class={{hiddenClasses}}>
+  <div id="revisions" data-post-id={{model.post_id}} class={{hiddenClasses}}>
     {{#if model.title_changes}}
       <div class="row">
         <h2>{{{titleDiff}}}</h2>
@@ -109,7 +109,7 @@
     <div id="revision-controls">
       {{d-button class="btn-default" action=(action "loadFirstVersion") icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}}
       {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
-      <div id="revision-numbers" class="{{unless displayRevisions 'invisible'}}">
+      <div id="revision-numbers" class={{unless displayRevisions 'invisible'}}>
         {{#conditional-loading-spinner condition=loading size="small"}}
           {{{revisionsText}}}
         {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
index b32fdc42fa..1be4aab6d5 100644
--- a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
@@ -14,9 +14,9 @@
           {{#each searchResults as |result|}}
             <a
               class="search-link"
-              href="{{result.url}}"
+              href={{result.url}}
               onclick={{action "linkClick"}}
-              data-title="{{result.title}}">
+              data-title={{result.title}}>
               {{topic-status topic=result disableActions=true}}
               {{replace-emoji result.fancy_title}}
               <div class="search-category">
diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
index 173df534af..9461b5d3c4 100644
--- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
@@ -7,7 +7,7 @@
     </thead>
     <tbody>
     {{#each categoriesOrdered as |cat|}}
-      <tr data-category-id="{{cat.id}}">
+      <tr data-category-id={{cat.id}}>
         <td>
           <div class={{concat 'reorder-categories-depth-' cat.depth}}>
             {{category-badge cat allowUncategorized="true"}}
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index de7a37ce5d..f641f8b0e0 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -11,7 +11,7 @@
         <p>{{i18n 'login.not_approved'}}</p>
       {{else}}
         {{#unless redirected}}
-          <a class="btn" href="{{redirectHref}}" {{action "done"}}>{{continueButtonText}}</a>
+          <a class="btn" href={{redirectHref}} {{action "done"}}>{{continueButtonText}}</a>
         {{/unless}}
       {{/if}}
     {{else}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 0aef40f2a0..2fe58dbf59 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -117,7 +117,7 @@
                   </td>
               </tr>
             {{else}}
-              <tr class="{{dasherize authProvider.method.name}}">
+              <tr class={{dasherize authProvider.method.name}}>
                 <td>{{authProvider.method.prettyName}}</td>
                   <td colspan=2>
                     {{#if authProvider.method.can_connect}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index e5314b6745..5bb791bcc0 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -4,7 +4,7 @@
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching"}} {{i18n 'user.watched_categories'}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href="{{unbound model.watchingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{unbound model.watchingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
     {{/if}}
     {{category-selector
       categories=model.watchedCategories
@@ -18,7 +18,7 @@
   <div class="controls tracking-controls">
     <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href="{{unbound model.trackingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{unbound model.trackingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
     {{/if}}
     {{category-selector
       categories=model.trackedCategories
@@ -43,7 +43,7 @@
     <div class="controls tracking-controls">
       <label>{{d-icon "d-muted"}} {{i18n 'user.muted_categories'}}</label>
       {{#if canSee}}
-        <a class="show-tracking" href="{{unbound model.mutedTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+        <a class="show-tracking" href={{unbound model.mutedTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
       {{/if}}
       {{category-selector
         categories=model.mutedCategories
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 1bd7d80f97..b2cdb56f26 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -48,7 +48,7 @@
               {{d-button action=(action "cancelEditingTopic") class="btn-default cancel-edit" icon="times"}}
 
               {{#if canRemoveTopicFeaturedLink}}
-                <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title="{{i18n "composer.remove_featured_link"}}">
+                <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title={{i18n "composer.remove_featured_link"}}>
                   {{d-icon "times-circle"}}
                   {{featuredLinkDomain}}
                 </a>
@@ -57,7 +57,7 @@
           </div>
 
         {{else}}
-          <h1 data-topic-id="{{unbound model.id}}">
+          <h1 data-topic-id={{unbound model.id}}>
             {{#unless model.is_warning}}
               {{#if siteSettings.enable_personal_messages}}
                 {{private-message-glyph
@@ -73,13 +73,13 @@
 
             {{#if model.details.loaded}}
               {{topic-status topic=model}}
-              <a href="{{unbound model.url}}" {{action "jumpTop"}} class="fancy-title">
+              <a href={{unbound model.url}} {{action "jumpTop"}} class="fancy-title">
                 {{{model.fancyTitle}}}
               </a>
             {{/if}}
 
             {{#if model.details.can_edit}}
-              <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{d-icon "pencil-alt"}}</a>
+              <a href {{action "editTopic"}} class="edit-topic" title={{i18n "edit"}}>{{d-icon "pencil-alt"}}</a>
             {{/if}}
           </h1>
 
@@ -170,7 +170,7 @@
       {{/topic-navigation}}
 
       <div class="row">
-        <section class="topic-area" id="topic" data-topic-id="{{unbound model.id}}">
+        <section class="topic-area" id="topic" data-topic-id={{unbound model.id}}>
 
           <div class="posts-wrapper">
             {{conditional-loading-spinner condition=model.postStream.loadingAbove}}
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 5e95282ab4..e15647621b 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -74,9 +74,9 @@
                       <td>{{number invite.user.posts_read_count}}</td>
                       <td>{{{format-duration invite.user.time_read}}}</td>
                       <td>
-                        <span title="{{i18n 'user.invited.days_visited'}}">{{{unbound invite.user.days_visited}}}</span>
+                        <span title={{i18n 'user.invited.days_visited'}}>{{{unbound invite.user.days_visited}}}</span>
                           /
-                        <span title="{{i18n 'user.invited.account_age_days'}}">{{{unbound invite.user.days_since_created}}}</span>
+                        <span title={{i18n 'user.invited.account_age_days'}}>{{{unbound invite.user.days_since_created}}}</span>
                       </td>
                     {{/if}}
                   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 520fb78e88..d1c61ab805 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -86,8 +86,8 @@
 
           <div class="primary-textual">
             <div class="user-profile-names">
-              <h1 class="{{if nameFirst "full-name" "username"}}">{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
-              <h2 class="{{if nameFirst "username" "full-name"}}">{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
+              <h1 class={{if nameFirst "full-name" "username"}}>{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
+              <h2 class={{if nameFirst "username" "full-name"}}>{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
               {{#if model.staged}}
                 <h2 class="staged">{{i18n 'user.staged'}}</h2>
               {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
index 42756d3ceb..6f6ddf02ed 100644
--- a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
+++ b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
@@ -1,5 +1,5 @@
 {{#each popular_components as |theme|}}
-  <a class="popular-theme-item" href="{{theme.meta_url}}" rel="noopener" target="_blank">
+  <a class="popular-theme-item" href={{theme.meta_url}} rel="noopener" target="_blank">
     {{theme.name}}
   </a>
 {{/each}}

From f14dd1f82d4742142734fc2c4cfe63777c320963 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Sat, 7 Mar 2020 14:36:54 +0200
Subject: [PATCH 027/633] FIX: Prevent race condition when post processing post
 (#8819)

If a post is being cooked twice (for example after an edit), there is a
chance the 'raw' and 'cooked' column to be inconsistent. This reduces
the chances of that happening.
---
 app/jobs/regular/process_post.rb | 68 ++++++++++++++++----------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index 20aa499e22..8dd7487f36 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -7,43 +7,45 @@ module Jobs
   class ProcessPost < ::Jobs::Base
 
     def execute(args)
-      post = Post.find_by(id: args[:post_id])
-      # two levels of deletion
-      return unless post.present? && post.topic.present?
+      DistributedMutex.synchronize("process_post_#{args[:post_id]}") do
+        post = Post.find_by(id: args[:post_id])
+        # two levels of deletion
+        return unless post.present? && post.topic.present?
 
-      orig_cooked = post.cooked
-      recooked = nil
+        orig_cooked = post.cooked
+        recooked = nil
 
-      if args[:cook].present?
-        cooking_options = args[:cooking_options] || {}
-        cooking_options[:topic_id] = post.topic_id
-        recooked = post.cook(post.raw, cooking_options.symbolize_keys)
-        post.update_columns(cooked: recooked, baked_at: Time.zone.now, baked_version: Post::BAKED_VERSION)
-      end
-
-      cp = CookedPostProcessor.new(post, args)
-      cp.post_process(bypass_bump: args[:bypass_bump], new_post: args[:new_post])
-
-      # If we changed the document, save it
-      cooked = cp.html
-
-      if cooked != (recooked || orig_cooked)
-
-        if orig_cooked.present? && cooked.blank?
-          # TODO stop/restart the worker if needed, let's gather a few here first
-          Rails.logger.warn("Cooked post processor in FATAL state, bypassing. You need to urgently restart sidekiq\norig: #{orig_cooked}\nrecooked: #{recooked}\ncooked: #{cooked}\npost id: #{post.id}")
-        else
-          post.update_column(:cooked, cp.html)
-          extract_links(post)
-          post.publish_change_to_clients! :revised
+        if args[:cook].present?
+          cooking_options = args[:cooking_options] || {}
+          cooking_options[:topic_id] = post.topic_id
+          recooked = post.cook(post.raw, cooking_options.symbolize_keys)
+          post.update_columns(cooked: recooked, baked_at: Time.zone.now, baked_version: Post::BAKED_VERSION)
         end
-      end
 
-      if !post.user&.staff? && !post.user&.staged?
-        s = post.cooked
-        s << " #{post.topic.title}" if post.post_number == 1
-        if !args[:bypass_bump] && WordWatcher.new(s).should_flag?
-          PostActionCreator.create(Discourse.system_user, post, :inappropriate)
+        cp = CookedPostProcessor.new(post, args)
+        cp.post_process(bypass_bump: args[:bypass_bump], new_post: args[:new_post])
+
+        # If we changed the document, save it
+        cooked = cp.html
+
+        if cooked != (recooked || orig_cooked)
+
+          if orig_cooked.present? && cooked.blank?
+            # TODO stop/restart the worker if needed, let's gather a few here first
+            Rails.logger.warn("Cooked post processor in FATAL state, bypassing. You need to urgently restart sidekiq\norig: #{orig_cooked}\nrecooked: #{recooked}\ncooked: #{cooked}\npost id: #{post.id}")
+          else
+            post.update_column(:cooked, cp.html)
+            extract_links(post)
+            post.publish_change_to_clients! :revised
+          end
+        end
+
+        if !post.user&.staff? && !post.user&.staged?
+          s = post.cooked
+          s << " #{post.topic.title}" if post.post_number == 1
+          if !args[:bypass_bump] && WordWatcher.new(s).should_flag?
+            PostActionCreator.create(Discourse.system_user, post, :inappropriate)
+          end
         end
       end
     end

From 20cfa7b810c48292fe7fe0b1a84e92a301fb9fa8 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Sat, 7 Mar 2020 15:04:12 +0200
Subject: [PATCH 028/633] FIX: Check if auth token exists before revocation
 (#9095)

---
 app/controllers/users_controller.rb    |  2 +-
 spec/requests/users_controller_spec.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5b7bbc7022..6afac2bacb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1347,7 +1347,7 @@ class UsersController < ApplicationController
     if params[:token_id]
       token = UserAuthToken.find_by(id: params[:token_id], user_id: user.id)
       # The user should not be able to revoke the auth token of current session.
-      raise Discourse::InvalidParameters.new(:token_id) if guardian.auth_token == token.auth_token
+      raise Discourse::InvalidParameters.new(:token_id) if !token || guardian.auth_token == token.auth_token
       UserAuthToken.where(id: params[:token_id], user_id: user.id).each(&:destroy!)
 
       MessageBus.publish "/file-change", ["refresh"], user_ids: [user.id]
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 7a15170e38..0507707482 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3935,6 +3935,20 @@ describe UsersController do
         expect(user.user_auth_tokens.first.id).to eq(ids[1])
       end
 
+      it 'checks if token exists' do
+        ids = user.user_auth_tokens.order(:created_at).pluck(:id)
+
+        post "/u/#{user.username}/preferences/revoke-auth-token.json",
+          params: { token_id: ids[0] }
+
+        expect(response.status).to eq(200)
+
+        post "/u/#{user.username}/preferences/revoke-auth-token.json",
+          params: { token_id: ids[0] }
+
+        expect(response.status).to eq(400)
+      end
+
       it 'does not let user log out of current session' do
         token = UserAuthToken.generate!(user_id: user.id)
         env = Rack::MockRequest.env_for("/", "HTTP_COOKIE" => "_t=#{token.unhashed_auth_token};")

From baea65e4bc7b7def050fb110c281146ea8c3cdcc Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 9 Mar 2020 09:22:08 +1000
Subject: [PATCH 029/633] FIX: Embarassing algoriths typo -> algorithms for
 security keys (#9126)

---
 .../controllers/second-factor-add-security-key.js.es6         | 4 ++--
 app/controllers/users_controller.rb                           | 2 +-
 spec/requests/users_controller_spec.rb                        | 2 +-
 test/javascripts/acceptance/preferences-test.js.es6           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
index 2cb03f968f..14b0524b1c 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
@@ -38,7 +38,7 @@ export default Controller.extend(ModalFunctionality, {
             id: response.rp_id,
             name: response.rp_name
           },
-          supported_algoriths: response.supported_algoriths,
+          supported_algorithms: response.supported_algorithms,
           user_secure_id: response.user_secure_id,
           existing_active_credential_ids:
             response.existing_active_credential_ids
@@ -71,7 +71,7 @@ export default Controller.extend(ModalFunctionality, {
           displayName: this.model.username_lower,
           name: this.model.username_lower
         },
-        pubKeyCredParams: this.supported_algoriths.map(alg => {
+        pubKeyCredParams: this.supported_algorithms.map(alg => {
           return { type: "public-key", alg: alg };
         }),
         excludeCredentials: this.existing_active_credential_ids.map(
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6afac2bacb..9af8c2aa7e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1197,7 +1197,7 @@ class UsersController < ApplicationController
       challenge: challenge_session.challenge,
       rp_id: challenge_session.rp_id,
       rp_name: challenge_session.rp_name,
-      supported_algoriths: ::Webauthn::SUPPORTED_ALGORITHMS,
+      supported_algorithms: ::Webauthn::SUPPORTED_ALGORITHMS,
       user_secure_id: current_user.create_or_fetch_secure_identifier,
       existing_active_credential_ids: current_user.second_factor_security_key_credential_ids
     )
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 0507707482..707c61d6ba 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3770,7 +3770,7 @@ describe UsersController do
       expect(response_parsed["user_secure_id"]).to eq(
         user.reload.create_or_fetch_secure_identifier
       )
-      expect(response_parsed["supported_algoriths"]).to eq(
+      expect(response_parsed["supported_algorithms"]).to eq(
         ::Webauthn::SUPPORTED_ALGORITHMS
       )
     end
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index c651c67802..46b11864ed 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -26,7 +26,7 @@ acceptance("User Preferences", {
           "a6d393d12654c130b2273e68ca25ca232d1d7f4c2464c2610fb8710a89d4",
         rp_id: "localhost",
         rp_name: "Discourse",
-        supported_algoriths: [-7, -257]
+        supported_algorithms: [-7, -257]
       });
     });
 

From b85095329465458827c36de380d9a25cc0252acf Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 10:01:50 +0100
Subject: [PATCH 030/633] FIX: ensure category and tags can be changed from
 reviewable (#9139)

---
 .../components/reviewable-field-category.js.es6        | 10 ++++++++++
 .../discourse/components/reviewable-field-tags.js.es6  |  2 ++
 .../templates/components/reviewable-field-category.hbs |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/discourse/components/reviewable-field-category.js.es6

diff --git a/app/assets/javascripts/discourse/components/reviewable-field-category.js.es6 b/app/assets/javascripts/discourse/components/reviewable-field-category.js.es6
new file mode 100644
index 0000000000..072a3720e2
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/reviewable-field-category.js.es6
@@ -0,0 +1,10 @@
+import Component from "@ember/component";
+
+export default Component.extend({
+  actions: {
+    onChange(category) {
+      this.set("value", category);
+      this.categoryChanged && this.categoryChanged(category);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6 b/app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6
index 9280d8ee4d..609c7c163e 100644
--- a/app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6
@@ -3,6 +3,8 @@ import Component from "@ember/component";
 export default Component.extend({
   actions: {
     onChange(tags) {
+      this.set("value", tags);
+
       this.valueChanged &&
         this.valueChanged({
           target: {
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs
index f77783036c..773ae4587e 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs
@@ -1,4 +1,4 @@
 {{category-chooser
   value=value
-  onChange=categoryChanged
+  onChange=(action "onChange")
 }}

From 8612bfb1529ef86027f4c321bbf4e2e5293fe502 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 10:03:46 +0100
Subject: [PATCH 031/633] DEV: enforces ember-template-lint:
 no-unused-block-params (#9138)

---
 .template-lintrc.js                                         | 3 ++-
 .../admin/templates/components/admin-report-table.hbs       | 2 +-
 app/assets/javascripts/discourse/templates/user/summary.hbs | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index f36c6313d2..32bbe415ed 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -8,6 +8,7 @@ module.exports = {
     "style-concatenation": true,
     "no-invalid-interactive": true,
     "link-rel-noopener": true,
-    "no-unnecessary-concat": true
+    "no-unnecessary-concat": true,
+    "no-unused-block-params": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
index f42189eb9a..8188fb3abd 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
@@ -2,7 +2,7 @@
   <thead>
     <tr>
       {{#if model.computedLabels}}
-        {{#each model.computedLabels as |label index|}}
+        {{#each model.computedLabels as |label|}}
           {{admin-report-table-header
             showSortingUI=showSortingUI
             currentSortDirection=sortDirection
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index e7d92afb82..b17c6b0254 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -75,12 +75,12 @@
     {{#user-summary-section title="top_links" class="links-section pull-left"}}
       {{#if model.links.length}}
         <ul>
+          {{!-- template-lint-disable --}}
           {{#each model.links as |link|}}
             <li>
-              {{!-- template-lint-disable  --}}
               <a class='domain'
-                 href='{{unbound link.url}}'
-                 title='{{unbound link.title}}'
+                 href={{unbound link.url}}
+                 title={{unbound link.title}}
                  rel='noopener {{unless user.removeNoFollow 'nofollow ugc'}}'
                  target='_blank'>
                 {{shorten-url link.url}}

From 60b47d622e4d8ed3644e82891138d60fb244db98 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 10:07:03 +0100
Subject: [PATCH 032/633] UX: adds support for a color setting type (#9016)

---
 .../admin/components/color-input.js.es6       | 44 +++++++++++------
 .../components/site-settings/color.js.es6     | 49 +++++++++++++++++++
 .../admin/mixins/setting-component.js.es6     |  3 +-
 .../components/site-settings/color.hbs        |  9 ++++
 .../templates/components/color-input.hbs      |  8 ++-
 .../stylesheets/common/admin/settings.scss    |  9 ++++
 config/site_settings.yml                      |  6 ++-
 lib/site_settings/type_supervisor.rb          |  1 +
 .../site_settings/type_supervisor_spec.rb     |  6 +++
 9 files changed, 117 insertions(+), 18 deletions(-)
 create mode 100644 app/assets/javascripts/admin/components/site-settings/color.js.es6
 create mode 100644 app/assets/javascripts/admin/templates/components/site-settings/color.hbs

diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js.es6
index 8648506bf9..44fe738b43 100644
--- a/app/assets/javascripts/admin/components/color-input.js.es6
+++ b/app/assets/javascripts/admin/components/color-input.js.es6
@@ -1,5 +1,6 @@
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
+import { computed, action } from "@ember/object";
 import loadScript, { loadCSS } from "discourse/lib/load-script";
 import { observes } from "discourse-common/utils/decorators";
 
@@ -13,28 +14,45 @@ import { observes } from "discourse-common/utils/decorators";
 export default Component.extend({
   classNames: ["color-picker"],
 
+  onlyHex: true,
+
+  styleSelection: true,
+
+  maxlength: computed("onlyHex", function() {
+    return this.onlyHex ? 6 : null;
+  }),
+
+  @action
+  onHexInput(color) {
+    this.attrs.onChangeColor &&
+      this.attrs.onChangeColor((color || "").replace(/^#/, ""));
+  },
+
   @observes("hexValue", "brightnessValue", "valid")
   hexValueChanged: function() {
-    var hex = this.hexValue;
+    const hex = this.hexValue;
     let text = this.element.querySelector("input.hex-input");
 
+    this.attrs.onChangeColor && this.attrs.onChangeColor(hex);
+
     if (this.valid) {
-      text.setAttribute(
-        "style",
-        "color: " +
-          (this.brightnessValue > 125 ? "black" : "white") +
-          "; background-color: #" +
-          hex +
-          ";"
-      );
+      this.styleSelection &&
+        text.setAttribute(
+          "style",
+          "color: " +
+            (this.brightnessValue > 125 ? "black" : "white") +
+            "; background-color: #" +
+            hex +
+            ";"
+        );
 
       if (this.pickerLoaded) {
         $(this.element.querySelector(".picker")).spectrum({
-          color: "#" + this.hexValue
+          color: "#" + hex
         });
       }
     } else {
-      text.setAttribute("style", "");
+      this.styleSelection && text.setAttribute("style", "");
     }
   },
 
@@ -51,8 +69,6 @@ export default Component.extend({
         });
       });
     });
-    schedule("afterRender", () => {
-      this.hexValueChanged();
-    });
+    schedule("afterRender", () => this.hexValueChanged());
   }
 });
diff --git a/app/assets/javascripts/admin/components/site-settings/color.js.es6 b/app/assets/javascripts/admin/components/site-settings/color.js.es6
new file mode 100644
index 0000000000..5b7e40e34c
--- /dev/null
+++ b/app/assets/javascripts/admin/components/site-settings/color.js.es6
@@ -0,0 +1,49 @@
+import Component from "@ember/component";
+import { computed, action } from "@ember/object";
+
+function RGBToHex(rgb) {
+  // Choose correct separator
+  let sep = rgb.indexOf(",") > -1 ? "," : " ";
+  // Turn "rgb(r,g,b)" into [r,g,b]
+  rgb = rgb
+    .substr(4)
+    .split(")")[0]
+    .split(sep);
+
+  let r = (+rgb[0]).toString(16),
+    g = (+rgb[1]).toString(16),
+    b = (+rgb[2]).toString(16);
+
+  if (r.length === 1) r = "0" + r;
+  if (g.length === 1) g = "0" + g;
+  if (b.length === 1) b = "0" + b;
+
+  return "#" + r + g + b;
+}
+
+export default Component.extend({
+  valid: computed("value", function() {
+    let value = this.value.toLowerCase();
+
+    let testColor = new Option().style;
+    testColor.color = value;
+
+    if (!testColor.color && !value.startsWith("#")) {
+      value = `#${value}`;
+      testColor = new Option().style;
+      testColor.color = value;
+    }
+
+    let hexifiedColor = RGBToHex(testColor.color);
+    if (hexifiedColor.includes("NaN")) {
+      hexifiedColor = testColor.color;
+    }
+
+    return testColor.color && hexifiedColor === value;
+  }),
+
+  @action
+  onChangeColor(color) {
+    this.set("value", color);
+  }
+});
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 70384c1a27..200ec00c1f 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -22,7 +22,8 @@ const CUSTOM_TYPES = [
   "secret_list",
   "upload",
   "group_list",
-  "tag_list"
+  "tag_list",
+  "color"
 ];
 
 const AUTO_REFRESH_ON_SAVE = ["logo", "logo_small", "large_icon"];
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
new file mode 100644
index 0000000000..33c66076a2
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
@@ -0,0 +1,9 @@
+{{color-input
+  hexValue=(readonly value)
+  valid=valid
+  onlyHex=false
+  styleSelection=false
+  onChangeColor=(action "onChangeColor")
+}}
+{{setting-validation-message message=validationMessage}}
+<div class="desc">{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/discourse/templates/components/color-input.hbs b/app/assets/javascripts/discourse/templates/components/color-input.hbs
index 3b8d76fbb8..f8d8503a38 100644
--- a/app/assets/javascripts/discourse/templates/components/color-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/color-input.hbs
@@ -1 +1,7 @@
-{{text-field class="hex-input" value=hexValue maxlength="6"}} <input class="picker" type="input">
+{{text-field
+  class="hex-input"
+  value=hexValue
+  maxlength=maxlength
+  input=(action "onHexInput" value="target.value")
+}}
+<input class="picker" type="input">
diff --git a/app/assets/stylesheets/common/admin/settings.scss b/app/assets/stylesheets/common/admin/settings.scss
index 1c0f902e04..0eb49fecb9 100644
--- a/app/assets/stylesheets/common/admin/settings.scss
+++ b/app/assets/stylesheets/common/admin/settings.scss
@@ -96,6 +96,15 @@
       font-size: $font-0;
       font-weight: normal;
     }
+
+    &.color {
+      .color-picker {
+        display: flex;
+        .picker + .sp-replacer {
+          border-left: none;
+        }
+      }
+    }
   }
   .setting.overridden {
     h3 {
diff --git a/config/site_settings.yml b/config/site_settings.yml
index a2320348a1..a1c1f93aba 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -942,7 +942,9 @@ email:
     default: false
     client: true
   apply_custom_styles_to_digest: true
-  email_accent_bg_color: "#2F70AC"
+  email_accent_bg_color:
+    type: color
+    default: "#2F70AC"
   email_accent_fg_color: "#FFFFFF"
   email_link_color: "#006699"
   show_topic_featured_link_in_digest: false
@@ -1480,7 +1482,7 @@ spam:
   auto_silence_fast_typers_max_trust_level: 0
   auto_silence_first_post_regex: ""
   high_trust_flaggers_auto_hide_posts: true
-  cooldown_hours_until_reflag: 
+  cooldown_hours_until_reflag:
     default: 24
     min: 0
 
diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
index 420c64f60b..26cc20b84e 100644
--- a/lib/site_settings/type_supervisor.rb
+++ b/lib/site_settings/type_supervisor.rb
@@ -34,6 +34,7 @@ class SiteSettings::TypeSupervisor
       group: 19,
       group_list: 20,
       tag_list: 21,
+      color: 22
     )
   end
 
diff --git a/spec/components/site_settings/type_supervisor_spec.rb b/spec/components/site_settings/type_supervisor_spec.rb
index c46cde843a..caea601178 100644
--- a/spec/components/site_settings/type_supervisor_spec.rb
+++ b/spec/components/site_settings/type_supervisor_spec.rb
@@ -82,6 +82,12 @@ describe SiteSettings::TypeSupervisor do
       it "'group_list' should be at the right position" do
         expect(SiteSettings::TypeSupervisor.types[:group_list]).to eq(20)
       end
+      it "'tag_list' should be at the right position" do
+        expect(SiteSettings::TypeSupervisor.types[:tag_list]).to eq(21)
+      end
+      it "'color' should be at the right position" do
+        expect(SiteSettings::TypeSupervisor.types[:color]).to eq(22)
+      end
     end
   end
 

From edc8d58ac345d0f2ca9a54cc7f4b97ffa3c7e2a0 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sat, 7 Mar 2020 23:34:28 +0100
Subject: [PATCH 033/633] FEATURE: Add site setting to disable staged user
 cleanup

... and disabled the cleanup during imports, otherwise a running Sidekiq might delete users before posts are created
---
 app/jobs/scheduled/clean_up_unused_staged_users.rb | 5 ++++-
 config/locales/server.en.yml                       | 1 +
 config/site_settings.yml                           | 4 ++++
 script/import_scripts/base.rb                      | 4 +++-
 spec/jobs/clean_up_unused_staged_users_spec.rb     | 5 +++++
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/jobs/scheduled/clean_up_unused_staged_users.rb b/app/jobs/scheduled/clean_up_unused_staged_users.rb
index 3769dffe6b..be2cd17313 100644
--- a/app/jobs/scheduled/clean_up_unused_staged_users.rb
+++ b/app/jobs/scheduled/clean_up_unused_staged_users.rb
@@ -6,12 +6,15 @@ module Jobs
     every 1.day
 
     def execute(args)
+      clean_up_after_days = SiteSetting.clean_up_unused_staged_users_after_days
+      return if clean_up_after_days <= 0
+
       destroyer = UserDestroyer.new(Discourse.system_user)
 
       User.joins("LEFT JOIN posts ON posts.user_id = users.id")
         .where("posts.user_id IS NULL")
         .where(staged: true, admin: false, moderator: false)
-        .where("users.created_at < ?", 1.year.ago)
+        .where("users.created_at < ?", clean_up_after_days.days.ago)
         .find_each do |user|
 
         begin
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 9bd64c7dbf..d0af9b7136 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1992,6 +1992,7 @@ en:
     ignored_users_message_gap_days: "How long to wait before notifying moderators again about a user who has been ignored by many others."
 
     clean_up_inactive_users_after_days: "Number of days before an inactive user (trust level 0 without any posts) is removed. To disable clean up set to 0."
+    clean_up_unused_staged_users_after_days: "Number of days before an unused staged user (without any posts) is removed. To disable clean up set to 0."
 
     user_selected_primary_groups: "Allow users to set their own primary group"
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index a1c1f93aba..d42c7f7b0b 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -589,6 +589,10 @@ users:
     default: 730
     min: 0
     max: 3650
+  clean_up_unused_staged_users_after_days:
+    default: 365
+    min: 0
+    max: 3650
   user_selected_primary_groups:
     default: false
     client: true
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index b5483d9a8b..c827bc5e7e 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -81,7 +81,9 @@ class ImportScripts::Base
       disable_emails: 'yes',
       max_attachment_size_kb: 102400,
       max_image_size_kb: 102400,
-      authorized_extensions: '*'
+      authorized_extensions: '*',
+      clean_up_inactive_users_after_days: 0,
+      clean_up_unused_staged_users_after_days: 0
     }
   end
 
diff --git a/spec/jobs/clean_up_unused_staged_users_spec.rb b/spec/jobs/clean_up_unused_staged_users_spec.rb
index ec5cad00b4..11612f75cb 100644
--- a/spec/jobs/clean_up_unused_staged_users_spec.rb
+++ b/spec/jobs/clean_up_unused_staged_users_spec.rb
@@ -32,6 +32,11 @@ RSpec.describe Jobs::CleanUpUnusedStagedUsers do
         before { staged_user.update!(moderator: true) }
         include_examples "does not delete"
       end
+
+      context "when job is disabled" do
+        before { SiteSetting.clean_up_unused_staged_users_after_days = 0 }
+        include_examples "does not delete"
+      end
     end
 
     context 'when staged user is not old enough' do

From 0e752db41106820554f1ce5c8b2a27762e161485 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 8 Mar 2020 01:20:02 +0100
Subject: [PATCH 034/633] DEV: Improve mbox import script

* Customizable email subject prefixes to remove "Re" and "Fwd" as well as localized prefixes.
* Configuration option for prefixes like [FOO] or (BAR) which can be replaced with tags during import.
* Bugfix: Import script might have skipped some users due to missing ORDER BY.
---
 script/import_scripts/mbox/importer.rb        | 39 ++++++++++++++++++-
 script/import_scripts/mbox/settings.yml       | 17 ++++++++
 .../import_scripts/mbox/support/database.rb   |  1 +
 script/import_scripts/mbox/support/indexer.rb | 32 +--------------
 .../import_scripts/mbox/support/settings.rb   | 19 +++++++++
 5 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/script/import_scripts/mbox/importer.rb b/script/import_scripts/mbox/importer.rb
index 3d823e197d..d4f8ec4794 100644
--- a/script/import_scripts/mbox/importer.rb
+++ b/script/import_scripts/mbox/importer.rb
@@ -30,6 +30,8 @@ module ImportScripts::Mbox
       if @settings.index_only
         @skip_updates = true
       else
+        SiteSetting.tagging_enabled = true if @settings.tags.present?
+
         import_categories
         import_users
         import_posts
@@ -142,9 +144,13 @@ module ImportScripts::Mbox
     end
 
     def map_first_post(row)
+      subject = row['subject']
+      tags = remove_tags!(subject)
+
       mapped = map_post(row)
       mapped[:category] = category_id_from_imported_category_id(row['category'])
-      mapped[:title] = row['subject'].strip[0...255]
+      mapped[:title] = subject.strip[0...255]
+      mapped[:tags] = tags if tags.present?
       mapped
     end
 
@@ -161,6 +167,37 @@ module ImportScripts::Mbox
       mapped
     end
 
+    def remove_tags!(subject)
+      tag_names = []
+      remove_prefixes!(subject)
+
+      loop do
+        old_length = subject.length
+
+        @settings.tags.each do |tag|
+          if subject.sub!(tag[:regex], "") && tag[:name].present?
+            tag_names << tag[:name]
+          end
+        end
+
+        remove_prefixes!(subject) if subject.length != old_length
+        break if subject.length == old_length
+      end
+
+      tag_names.uniq
+    end
+
+    def remove_prefixes!(subject)
+      # There could be multiple prefixes...
+      loop do
+        if subject.sub!(@settings.subject_prefix_regex, "")
+          subject.strip!
+        else
+          break
+        end
+      end
+    end
+
     def create_incoming_email(post, row)
       IncomingEmail.create(
         message_id: row['msg_id'],
diff --git a/script/import_scripts/mbox/settings.yml b/script/import_scripts/mbox/settings.yml
index cac3996a90..f118800100 100644
--- a/script/import_scripts/mbox/settings.yml
+++ b/script/import_scripts/mbox/settings.yml
@@ -16,3 +16,20 @@ staged: true
 index_only: false
 
 group_messages_by_subject: false
+
+# Remove prefixes like [FOO] or (BAR) from topic titles and replace them with tags.
+# You can map one or more case-insensitive prefixes to the same tag in Discourse.
+# "Tag name in Discourse": "foo"
+# "Tag name in Discourse": ["foo", "bar"]
+# You can use an empty tag name to remove prefixes without creating a tag in Discourse.
+tags:
+#  "off-topic": "ot"
+#  announcement: ["ann", "announce", "announcement"]
+#  "": ["foo", "bar"]
+
+# These prefixes will be removed from the beginning of topic titles. You can use regular expessions.
+# Prefixes are case-insensitive. You can add additional prefixes (e.g. localized prefixes from
+# https://en.wikipedia.org/wiki/List_of_email_subject_abbreviations#Abbreviations_in_other_languages).
+remove_subject_prefixes:
+  - "Re: "
+  - "Fwd?: "
\ No newline at end of file
diff --git a/script/import_scripts/mbox/support/database.rb b/script/import_scripts/mbox/support/database.rb
index ea1a6600d5..052f0d479a 100644
--- a/script/import_scripts/mbox/support/database.rb
+++ b/script/import_scripts/mbox/support/database.rb
@@ -168,6 +168,7 @@ module ImportScripts::Mbox
         SELECT email, name, date_of_first_message
         FROM user
         WHERE email > :last_email
+        ORDER BY email
         LIMIT #{@batch_size}
       SQL
 
diff --git a/script/import_scripts/mbox/support/indexer.rb b/script/import_scripts/mbox/support/indexer.rb
index fa51ef62c4..7017c2a59f 100644
--- a/script/import_scripts/mbox/support/indexer.rb
+++ b/script/import_scripts/mbox/support/indexer.rb
@@ -204,37 +204,7 @@ module ImportScripts::Mbox
 
     def extract_subject(receiver, list_name)
       subject = receiver.subject
-      return nil if subject.blank?
-
-      # TODO: make the list name (or maybe multiple names) configurable
-      # Strip mailing list name from subject
-      subject = subject.gsub(/\[#{Regexp.escape(list_name)}\]/i, '').strip
-
-      clean_subject(subject)
-    end
-
-    # TODO: refactor and move prefixes to settings
-    def clean_subject(subject)
-      original_length = subject.length
-
-      # Strip Reply prefix from title (Standard and localized)
-      subject = subject.gsub(/^Re: */i, '')
-      subject = subject.gsub(/^R: */i, '') #Italian
-      subject = subject.gsub(/^RIF: */i, '') #Italian
-
-      # Strip Forward prefix from title (Standard and localized)
-      subject = subject.gsub(/^Fwd: */i, '')
-      subject = subject.gsub(/^I: */i, '') #Italian
-
-      subject.strip
-
-      # In case of mixed localized prefixes there could be many of them
-      # if the mail client didn't strip the localized ones
-      if original_length > subject.length
-        clean_subject(subject)
-      else
-        subject
-      end
+      subject.blank? ? nil : subject.strip
     end
 
     def ignored_file?(path, checksums)
diff --git a/script/import_scripts/mbox/support/settings.rb b/script/import_scripts/mbox/support/settings.rb
index be8bd68e4c..f30c5d56d1 100644
--- a/script/import_scripts/mbox/support/settings.rb
+++ b/script/import_scripts/mbox/support/settings.rb
@@ -17,6 +17,9 @@ module ImportScripts::Mbox
     attr_reader :staged
     attr_reader :index_only
     attr_reader :group_messages_by_subject
+    attr_reader :subject_prefix_regex
+    attr_reader :automatically_remove_list_name_prefix
+    attr_reader :tags
 
     def initialize(yaml)
       @data_dir = yaml['data_dir']
@@ -27,6 +30,22 @@ module ImportScripts::Mbox
       @staged = yaml['staged']
       @index_only = yaml['index_only']
       @group_messages_by_subject = yaml['group_messages_by_subject']
+
+      unless yaml['remove_subject_prefixes'].empty?
+        prefix_regexes = yaml['remove_subject_prefixes'].map { |p| Regexp.new(p) }
+        @subject_prefix_regex = /^#{Regexp.union(prefix_regexes).source}/i
+      end
+
+      @automatically_remove_list_name_prefix = yaml['automatically_remove_list_name_prefix']
+
+      @tags = []
+      yaml['tags'].each do |tag_name, value|
+        prefixes = Regexp.union(value).source
+        @tags << {
+          regex: /^(?:(?:\[(?:#{prefixes})\])|(?:\((?:#{prefixes})\)))\s*/i,
+          name: tag_name
+        }
+      end
     end
   end
 end

From 4f372332085d1ff2dfbcc265d56e0ce7064d2899 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 13:44:34 +0100
Subject: [PATCH 035/633] DEV: enforces ember-template-lint: simple-unless
 (#9146)

---
 .template-lintrc.js                           |  3 +-
 .../templates/components/admin-report.hbs     | 46 +++++++++----------
 .../templates/components/themes-list-item.hbs |  8 ++--
 .../templates/logs/screened-ip-addresses.hbs  | 18 ++++----
 .../components/user-card-contents.hbs         |  8 ++--
 .../discourse/templates/full-page-search.hbs  |  8 ++--
 .../templates/components/multi-select.hbs     | 12 ++---
 .../templates/components/single-select.hbs    | 16 +++----
 8 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 32bbe415ed..f96f46f419 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -9,6 +9,7 @@ module.exports = {
     "no-invalid-interactive": true,
     "link-rel-noopener": true,
     "no-unnecessary-concat": true,
-    "no-unused-block-params": true
+    "no-unused-block-params": true,
+    "simple-unless": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 0c7009cc82..be9c2ee8d7 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -58,7 +58,28 @@
 
   <div class="body">
     <div class="main">
-      {{#unless showError}}
+      {{#if showError}}
+        {{#if showTimeoutError}}
+          <div class="alert alert-error report-alert timeout">
+            {{d-icon "exclamation-triangle"}}
+            <span>{{i18n "admin.dashboard.timeout_error"}}</span>
+          </div>
+        {{/if}}
+
+        {{#if showExceptionError}}
+          <div class="alert alert-error report-alert exception">
+            {{d-icon "exclamation-triangle"}}
+            <span>{{i18n "admin.dashboard.exception_error"}}</span>
+          </div>
+        {{/if}}
+
+        {{#if showNotFoundError}}
+          <div class="alert alert-error report-alert not-found">
+            {{d-icon "exclamation-triangle"}}
+            <span>{{i18n "admin.dashboard.not_found_error"}}</span>
+          </div>
+        {{/if}}
+      {{else}}
         {{#if hasData}}
           {{#if currentMode}}
             {{component modeComponent model=model options=options}}
@@ -91,28 +112,7 @@
             </div>
           {{/if}}
         {{/if}}
-      {{else}}
-        {{#if showTimeoutError}}
-          <div class="alert alert-error report-alert timeout">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.timeout_error"}}</span>
-          </div>
-        {{/if}}
-
-        {{#if showExceptionError}}
-          <div class="alert alert-error report-alert exception">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.exception_error"}}</span>
-          </div>
-        {{/if}}
-
-        {{#if showNotFoundError}}
-          <div class="alert alert-error report-alert not-found">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.not_found_error"}}</span>
-          </div>
-        {{/if}}
-      {{/unless}}
+      {{/if}}
     </div>
 
     {{#if showFilteringUI}}
diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
index 363ca394ec..1286937f8a 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
@@ -7,7 +7,9 @@
     </span>
 
     <span class="icons">
-      {{#unless theme.selected}}
+      {{#if theme.selected}}
+        {{d-icon "caret-right"}}
+      {{else}}
         {{#if theme.default}}
           {{d-icon "check" class="default-indicator" title="admin.customize.theme.default_theme_tooltip"}}
         {{/if}}
@@ -20,9 +22,7 @@
         {{#unless theme.enabled}}
           {{d-icon "ban" class="light-grey-icon" title="admin.customize.theme.disabled_component_tooltip"}}
         {{/unless}}
-      {{else}}
-        {{d-icon "caret-right"}}
-      {{/unless}}
+      {{/if}}
     </span>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
index f9220965a2..96a185fb17 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
@@ -76,7 +76,14 @@
             {{/if}}
           </td>
           <td class="col actions">
-            {{#unless item.editing}}
+            {{#if item.editing}}
+              {{d-button
+                class="btn-default"
+                action=(action "save")
+                actionParam=item
+                label="admin.logs.save"}}
+              <a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
+            {{else}}
               {{d-button
                 class="btn-default btn-danger"
                 action=(action "destroy")
@@ -102,14 +109,7 @@
                   icon="ban"
                   label="admin.logs.screened_ips.actions.block"}}
               {{/if}}
-            {{else}}
-              {{d-button
-                class="btn-default"
-                action=(action "save")
-                actionParam=item
-                label="admin.logs.save"}}
-              <a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
-            {{/unless}}
+            {{/if}}
           </td>
         </tr>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 8319d233e1..f6956782a9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -52,13 +52,13 @@
             {{/if}}
           </h1>
           {{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=''}}
-          {{#unless nameFirst}}
+          {{#if nameFirst}}
+            <h2 class='username'>{{username}}</h2>
+          {{else}}
             {{#if user.name}}
               <h2 class='full-name'>{{user.name}}</h2>
             {{/if}}
-          {{else}}
-            <h2 class='username'>{{username}}</h2>
-          {{/unless}}
+          {{/if}}
           {{#if user.title}}
             <h2>{{user.title}}</h2>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index c60aaf0dd1..760369fff8 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -67,7 +67,9 @@
 
     {{plugin-outlet name="full-page-search-below-search-info" args=(hash search=searchTerm)}}
 
-    {{#unless searching}}
+    {{#if searching}}
+      {{loading-spinner size="medium"}}
+    {{else}}
       <div class="search-results">
         {{#load-more selector=".fps-result" action=(action "loadMore")}}
           {{#each model.posts as |result|}}
@@ -172,9 +174,7 @@
           {{/conditional-loading-spinner}}
         {{/load-more}}
       </div>
-    {{else}}
-      {{loading-spinner size="medium"}}
-    {{/unless}}
+    {{/if}}
   </div>
 
   <div class="search-advanced-sidebar">
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
index 3d8399f48d..c2b12d8b7c 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
@@ -7,7 +7,11 @@
   }}
 
   {{#select-kit/select-kit-body selectKit=selectKit}}
-    {{#unless selectKit.isLoading}}
+    {{#if selectKit.isLoading}}
+      <span class="is-loading">
+        {{loading-spinner size="small"}}
+      </span>
+    {{else}}
       {{#if selectKit.filter}}
       {{#if selectKit.hasNoContent}}
         <span class="no-content">
@@ -23,11 +27,7 @@
           value=value
         }}
       {{/each}}
-    {{else}}
-      <span class="is-loading">
-        {{loading-spinner size="small"}}
-      </span>
-    {{/unless}}
+    {{/if}}
   {{/select-kit/select-kit-body}}
 
   <div class="select-kit-wrapper"></div>
diff --git a/app/assets/javascripts/select-kit/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
index 19f2d48d44..9e210f7317 100644
--- a/app/assets/javascripts/select-kit/templates/components/single-select.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
@@ -9,7 +9,13 @@
   {{#select-kit/select-kit-body selectKit=selectKit}}
     {{component selectKit.options.filterComponent selectKit=selectKit}}
 
-    {{#unless selectKit.isLoading}}
+    {{#if selectKit.isLoading}}
+      <span class="is-loading">
+        {{#if site}}
+          {{loading-spinner size="small"}}
+        {{/if}}
+      </span>
+    {{else}}
       {{#if selectKit.filter}}
       {{#if selectKit.hasNoContent}}
         <span class="no-content">
@@ -25,13 +31,7 @@
           value=value
         }}
       {{/each}}
-    {{else}}
-      <span class="is-loading">
-        {{#if site}}
-          {{loading-spinner size="small"}}
-        {{/if}}
-      </span>
-    {{/unless}}
+    {{/if}}
   {{/select-kit/select-kit-body}}
 
   <div class="select-kit-wrapper"></div>

From 345ac6cb67ba5097a13744d58c727550280cfb18 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 15:05:54 +0100
Subject: [PATCH 036/633] FIX: removes legacy refreshQueryWithoutTransition
 (#9145)

This was causing the history state from period query params to get messedup when going back.
---
 app/assets/javascripts/discourse/routes/users.js.es6 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/routes/users.js.es6 b/app/assets/javascripts/discourse/routes/users.js.es6
index b500a985b5..4fec3c1604 100644
--- a/app/assets/javascripts/discourse/routes/users.js.es6
+++ b/app/assets/javascripts/discourse/routes/users.js.es6
@@ -10,8 +10,6 @@ export default DiscourseRoute.extend({
     exclude_usernames: { refreshModel: true }
   },
 
-  refreshQueryWithoutTransition: true,
-
   titleToken() {
     return I18n.t("directory.title");
   },

From f1bb1db354ae3c2bef1232626cb54ef8bab78831 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 15:28:31 +0100
Subject: [PATCH 037/633] DEV: enforces ember-template-lint: no-unbound (#9147)

From ember-template-lint documentation (https://github.com/ember-template-lint/ember-template-lint/blob/master/docs/rule/no-unbound.md):

```
{{unbound}} is a legacy hold over from the days in which Ember's template engine was less performant. Its use today is vestigial, and it no longer offers performance benefits.

It is also a poor practice to use it for rendering only the initial value of a property that may later change.
```

Co-Authored-By: Jarek Radosz <jradosz@gmail.com>
---
 .template-lintrc.js                                       | 1 +
 .../admin/templates/components/site-setting.hbs           | 2 +-
 .../admin/templates/components/site-settings/bool.hbs     | 2 +-
 .../templates/components/site-settings/category-list.hbs  | 2 +-
 .../admin/templates/components/site-settings/category.hbs | 2 +-
 .../admin/templates/components/site-settings/color.hbs    | 2 +-
 .../templates/components/site-settings/compact-list.hbs   | 2 +-
 .../admin/templates/components/site-settings/enum.hbs     | 2 +-
 .../templates/components/site-settings/group-list.hbs     | 2 +-
 .../templates/components/site-settings/host-list.hbs      | 2 +-
 .../admin/templates/components/site-settings/list.hbs     | 2 +-
 .../templates/components/site-settings/secret-list.hbs    | 2 +-
 .../admin/templates/components/site-settings/string.hbs   | 2 +-
 .../admin/templates/components/site-settings/tag-list.hbs | 2 +-
 .../admin/templates/components/site-settings/upload.hbs   | 2 +-
 .../components/site-settings/uploaded-image-list.hbs      | 2 +-
 .../admin/templates/components/site-settings/url-list.hbs | 2 +-
 .../templates/components/site-settings/value-list.hbs     | 2 +-
 app/assets/javascripts/admin/templates/email-bounced.hbs  | 2 +-
 app/assets/javascripts/admin/templates/email-received.hbs | 4 ++--
 app/assets/javascripts/admin/templates/email-rejected.hbs | 6 +++---
 app/assets/javascripts/admin/templates/email-sent.hbs     | 2 +-
 app/assets/javascripts/admin/templates/email-skipped.hbs  | 2 +-
 app/assets/javascripts/admin/templates/emojis.hbs         | 2 +-
 app/assets/javascripts/admin/templates/permalinks.hbs     | 8 ++++----
 .../javascripts/admin/templates/search-logs-term.hbs      | 8 ++++----
 app/assets/javascripts/admin/templates/user-badges.hbs    | 2 +-
 app/assets/javascripts/admin/templates/user-index.hbs     | 4 ++--
 .../javascripts/admin/templates/users-list-show.hbs       | 6 +++---
 .../javascripts/discourse/templates/badges/show.hbs       | 2 +-
 .../templates/components/categories-boxes-topic.hbs       | 2 +-
 .../templates/components/categories-boxes-with-topics.hbs | 2 +-
 .../discourse/templates/components/categories-boxes.hbs   | 2 +-
 .../discourse/templates/components/category-unread.hbs    | 4 ++--
 .../discourse/templates/components/choose-message.hbs     | 2 +-
 .../discourse/templates/components/choose-topic.hbs       | 2 +-
 .../discourse/templates/components/featured-topic.hbs     | 8 ++++----
 .../discourse/templates/components/flag-action-type.hbs   | 4 ++--
 .../discourse/templates/components/group-post.hbs         | 2 +-
 .../discourse/templates/components/ip-lookup.hbs          | 2 +-
 .../discourse/templates/components/share-source.hbs       | 2 +-
 .../discourse/templates/components/user-info.hbs          | 8 ++++----
 .../discourse/templates/components/user-summary-topic.hbs | 2 +-
 app/assets/javascripts/discourse/templates/composer.hbs   | 2 +-
 .../javascripts/discourse/templates/full-page-search.hbs  | 8 ++++----
 .../templates/mobile/components/basic-topic-list.hbs      | 2 +-
 .../discourse/templates/modal/bulk-notification-level.hbs | 4 ++--
 .../javascripts/discourse/templates/outlet-list.hbs       | 2 +-
 .../discourse/templates/preferences/categories.hbs        | 6 +++---
 app/assets/javascripts/discourse/templates/topic.hbs      | 6 +++---
 .../javascripts/discourse/templates/user-invited-show.hbs | 6 +++---
 .../javascripts/discourse/templates/user/summary.hbs      | 6 +++---
 .../components/discourse-local-dates-create-form.hbs      | 4 ++--
 53 files changed, 86 insertions(+), 85 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index f96f46f419..6783c6d94e 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -10,6 +10,7 @@ module.exports = {
     "link-rel-noopener": true,
     "no-unnecessary-concat": true,
     "no-unused-block-params": true,
+    "no-unbound": true,
     "simple-unless": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 649df86a4f..23eee45b6d 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -1,5 +1,5 @@
 <div class='setting-label'>
-   <h3>{{unbound settingName}}</h3>
+   <h3>{{settingName}}</h3>
    {{#if defaultIsAvailable}}
      <a href onClick={{action 'setDefaultValues'}}>{{setting.setDefaultValuesLabel}}</a>
    {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
index 5892174168..1c6c2101ae 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
@@ -1,5 +1,5 @@
 <label>
   {{input type="checkbox" checked=enabled}}
-  <span>{{{unbound setting.description}}}</span>
+  <span>{{{setting.description}}}</span>
   {{setting-validation-message message=validationMessage}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index 14d7210604..6d8871b306 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -3,5 +3,5 @@
   onChange=(action "onChangeSelectedCategories")
 }}
 
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
index d6b6bee565..4f23fcc021 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
@@ -4,4 +4,4 @@
   onChange=(action (mut value))
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
index 33c66076a2..baf81ab389 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
@@ -6,4 +6,4 @@
   onChangeColor=(action "onChangeColor")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class="desc">{{{unbound setting.description}}}</div>
+<div class="desc">{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
index 86fce97f15..621baec0b1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
@@ -8,4 +8,4 @@
 }}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index 86faf57d75..dc33e28df5 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -15,5 +15,5 @@
 {{setting-validation-message message=validationMessage}}
 
 <div class='desc'>
-  {{{unbound setting.description}}}
+  {{{setting.description}}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
index 768311c3f9..8f4263a72e 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
@@ -7,4 +7,4 @@
   onChange=(action "onChangeGroupListSetting")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
index 5107f5b4af..5277c26c69 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_host"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
index 0abde37586..268723c92d 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value inputDelimiter="|" choices=setting.choices}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
index e77ddbb520..a4ff6f1bd4 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
@@ -1,3 +1,3 @@
 {{secret-value-list setting=setting values=value isSecret=isSecret}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index a2c53a1ee6..d71278f723 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -7,4 +7,4 @@
 {{/if}}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 84c6623cfb..271e4d0326 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
 {{tag-chooser tags=selectedTags}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
index 51711eee27..86940d8633 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
@@ -1,2 +1,2 @@
 {{site-settings-image-uploader imageUrl=value placeholderUrl=setting.placeholder type="site_setting"}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
index 86750e634d..82dc38d653 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,2 +1,2 @@
 {{d-button label="admin.site_settings.uploaded_image_list.label" action=(action "showUploadModal") actionParam=(hash value=value setting=setting)}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
index 41213777e3..67db58f8ea 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_url"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
index caaf3739d7..3003b375ee 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/email-bounced.hbs b/app/assets/javascripts/admin/templates/email-bounced.hbs
index 0387050d8f..9868012f2c 100644
--- a/app/assets/javascripts/admin/templates/email-bounced.hbs
+++ b/app/assets/javascripts/admin/templates/email-bounced.hbs
@@ -27,7 +27,7 @@
               &mdash;
             {{/if}}
           </td>
-          <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
+          <td><a href='mailto:{{l.to_address}}'>{{l.to_address}}</a></td>
           {{#if l.has_bounce_key}}
             <td><a href {{action "showIncomingEmail" l.id}}>{{l.email_type}}</a></td>
           {{else}}
diff --git a/app/assets/javascripts/admin/templates/email-received.hbs b/app/assets/javascripts/admin/templates/email-received.hbs
index 5fc983557e..aff40a6601 100644
--- a/app/assets/javascripts/admin/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/templates/email-received.hbs
@@ -34,10 +34,10 @@
           </td>
           <td class="addresses">
             {{#each email.to_addresses as |to|}}
-              <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
+              <p><a href="mailto:{{to}}" title="TO">{{to}}</a></p>
             {{/each}}
             {{#each email.cc_addresses as |cc|}}
-              <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
+              <p><a href="mailto:{{cc}}" title="CC">{{cc}}</a></p>
             {{/each}}
           </td>
           <td>
diff --git a/app/assets/javascripts/admin/templates/email-rejected.hbs b/app/assets/javascripts/admin/templates/email-rejected.hbs
index e3595a58bd..9cc9710660 100644
--- a/app/assets/javascripts/admin/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/templates/email-rejected.hbs
@@ -31,7 +31,7 @@
                 {{/link-to}}
               {{else}}
                 {{#if email.from_address}}
-                  <a href='mailto:{{unbound email.from_address}}'>{{email.from_address}}</a>
+                  <a href='mailto:{{email.from_address}}'>{{email.from_address}}</a>
                 {{else}}
                   &mdash;
                 {{/if}}
@@ -40,10 +40,10 @@
           </td>
           <td class="addresses">
             {{#each email.to_addresses as |to|}}
-              <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
+              <p><a href="mailto:{{to}}" title="TO">{{to}}</a></p>
             {{/each}}
             {{#each email.cc_addresses as |cc|}}
-              <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
+              <p><a href="mailto:{{cc}}" title="CC">{{cc}}</a></p>
             {{/each}}
           </td>
           <td>{{email.subject}}</td>
diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index c1ad376b6c..633b81cb3d 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -31,7 +31,7 @@
           </td>
           <td>
             {{#if l.bounced}}{{d-icon "redo" title="admin.email.bounced"}}{{/if}}
-            <a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a>
+            <a href='mailto:{{l.to_address}}'>{{l.to_address}}</a>
           </td>
           <td>{{l.email_type}}</td>
           <td class='post-link'>
diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/templates/email-skipped.hbs
index 76ddb1197e..da27e86914 100644
--- a/app/assets/javascripts/admin/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email-skipped.hbs
@@ -29,7 +29,7 @@
               &mdash;
             {{/if}}
           </td>
-          <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
+          <td><a href='mailto:{{l.to_address}}'>{{l.to_address}}</a></td>
           <td>{{l.email_type}}</td>
           <td>
             {{#if l.post_url}}
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index d08f2ed547..5f9de8104c 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -18,7 +18,7 @@
         <tbody>
           {{#each sortedEmojis as |e|}}
             <tr>
-              <th><img class="emoji emoji-custom" src={{unbound e.url}} title={{unbound e.name}}></th>
+              <th><img class="emoji emoji-custom" src={{e.url}} title={{e.name}}></th>
               <th>:{{e.name}}:</th>
               <th>
                 {{d-button
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index ac933f09c3..7c7ac2df6b 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -27,22 +27,22 @@
             <td class="col first url">{{pl.url}}</td>
             <td class="col topic">
               {{#if pl.topic_id}}
-                <a href={{unbound pl.topic_url}}>{{pl.topic_title}}</a>
+                <a href={{pl.topic_url}}>{{pl.topic_title}}</a>
               {{/if}}
             </td>
             <td class="col post">
               {{#if pl.post_id}}
-                <a href={{unbound pl.post_url}}>#{{pl.post_number}} {{pl.post_topic_title}}</a>
+                <a href={{pl.post_url}}>#{{pl.post_number}} {{pl.post_topic_title}}</a>
               {{/if}}
             </td>
             <td class="col category">
               {{#if pl.category_id}}
-                <a href={{unbound pl.category_url}}>{{pl.category_name}}</a>
+                <a href={{pl.category_url}}>{{pl.category_name}}</a>
               {{/if}}
             </td>
             <td class="col external_url">
               {{#if pl.external_url}}
-                <a href={{unbound pl.external_url}}>{{pl.external_url}}</a>
+                <a href={{pl.external_url}}>{{pl.external_url}}</a>
               {{/if}}
             </td>
             <td class="col action">
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 339cf2d169..78bd54afb9 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -23,15 +23,15 @@
   {{#each model.search_result.posts as |result|}}
     <div class='fps-result'>
       <div class='author'>
-        <a href={{result.userPath}} data-user-card={{unbound result.username}}>
+        <a href={{result.userPath}} data-user-card={{result.username}}>
           {{avatar result imageSize="large"}}
         </a>
       </div>
 
       <div class='fps-topic'>
         <div class='topic'>
-          <a class='search-link' href={{unbound result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
+          <a class='search-link' href={{result.url}}>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
           </a>
 
           <div class='search-category'>
@@ -55,7 +55,7 @@
 
           {{#if result.blurb}}
             {{#highlight-text highlight=term}}
-              {{{unbound result.blurb}}}
+              {{{result.blurb}}}
             {{/highlight-text}}
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index c93e7fb462..39d227bcf8 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -55,7 +55,7 @@
             </td>
             <td class='reason'>
               {{#if userBadge.postUrl}}
-              <a href={{unbound userBadge.postUrl}}>{{userBadge.topic_title}}</a>
+              <a href={{userBadge.postUrl}}>{{userBadge.topic_title}}</a>
               {{/if}}
             </td>
             <td>{{age-with-tooltip userBadge.granted_at}}</td>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 5707142ff3..207120eea8 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -59,7 +59,7 @@
           <div class="controls">{{i18n "admin.users.not_verified"}}</div>
         {{/unless}}
         {{#if model.email}}
-          <a href="mailto:{{unbound model.email}}">{{model.email}}</a>
+          <a href="mailto:{{model.email}}">{{model.email}}</a>
         {{else}}
           {{d-button
             class="btn-default"
@@ -79,7 +79,7 @@
           {{#if model.secondary_emails}}
             <ul>
               {{#each model.secondary_emails as |email| }}
-                <li><a href="mailto:{{unbound email}}">{{email}}</a></li>
+                <li><a href="mailto:{{email}}">{{email}}</a></li>
               {{/each}}
             </ul>
           {{else}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 127b7446c0..7d096573b0 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -40,16 +40,16 @@
         {{#each model as |user|}}
           <tr class="user {{user.selected}} {{unless user.active 'not-activated'}}">
             <td class="username">
-              <a href={{unbound user.path}} data-user-card={{unbound user.username}}>
+              <a href={{user.path}} data-user-card={{user.username}}>
                 {{avatar user imageSize="small"}}
               </a>
-              {{#link-to 'adminUser' user}}{{unbound user.username}}{{/link-to}}
+              {{#link-to 'adminUser' user}}{{user.username}}{{/link-to}}
               {{#if user.staged}}
                 {{d-icon "far-envelope" title="user.staged" }}
               {{/if}}
             </td>
             <td class='email'>
-              {{~unbound user.email~}}
+              {{~user.email~}}
             </td>
             <td class="last-emailed">
               <div class="label">{{i18n 'admin.users.last_emailed'}}</div>
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 12ba951aac..09ded422b3 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -42,7 +42,7 @@
           {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
             <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
             {{#if ub.post_number}}
-              <a class="post-link" href="{{unbound ub.topic.url}}/{{unbound ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
+              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
             {{/if}}
           {{/user-info}}
         {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
index 1e6fd8be89..b95a06db7a 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
@@ -1,5 +1,5 @@
 {{d-icon topicStatusIcon}}
 
-<a class='title' href={{unbound topic.lastUnreadUrl}}>
+<a class='title' href={{topic.lastUnreadUrl}}>
   {{text-overflow class="overflow" text=topic.fancyTitle}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index 6df50c4eef..4ce13a1584 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -1,5 +1,5 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{unbound c.slug}}' style={{border-color c.color}}>
+  <div class='category category-box category-box-{{c.slug}}' style={{border-color c.color}}>
     <div class='category-box-inner'>
       <div class='category-box-heading'>
         <a href={{c.url}}>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 888eefce97..5dc594c691 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -1,5 +1,5 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{unbound c.slug}}' style={{border-color c.color}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
+  <div class='category category-box category-box-{{c.slug}}' style={{border-color c.color}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
    data-url={{c.url}}>
     <div class='category-box-inner'>
       <div class="category-logo">
diff --git a/app/assets/javascripts/discourse/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
index 16eef33fc9..15604d0f3c 100644
--- a/app/assets/javascripts/discourse/templates/components/category-unread.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
@@ -1,6 +1,6 @@
 {{#if category.unreadTopics}}
-  <a href={{unbound category.unreadUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.unread_topics' count=category.unreadTopics}}>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
+  <a href={{category.unreadUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.unread_topics' count=category.unreadTopics}}>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
 {{/if}}
 {{#if category.newTopics}}
-  <a href={{unbound category.newUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.new_topics' count=category.newTopics}}>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
+  <a href={{category.newUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.new_topics' count=category.newTopics}}>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
index fa4f10d30e..6c21242484 100644
--- a/app/assets/javascripts/discourse/templates/components/choose-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
@@ -11,7 +11,7 @@
     {{#each messages as |m|}}
       <div class='controls existing-message'>
         <label class='radio'>
-          <input type='radio' id="choose-message-{{unbound m.id}}" name='choose_message_id' {{action "chooseMessage" m}}>
+          <input type='radio' id="choose-message-{{m.id}}" name='choose_message_id' {{action "chooseMessage" m}}>
           <span class="message-title">
             {{m.title}}
           </span>
diff --git a/app/assets/javascripts/discourse/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
index da9ca0a3de..2e5921d0e7 100644
--- a/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
@@ -11,7 +11,7 @@
     {{#each topics as |t|}}
       <div class='controls existing-topic'>
         <label class='radio'>
-          <input type='radio' id="choose-topic-{{unbound t.id}}" name='choose_topic_id' {{action "chooseTopic" t}}>
+          <input type='radio' id="choose-topic-{{t.id}}" name='choose_topic_id' {{action "chooseTopic" t}}>
           {{raw "topic-status" topic=t}}
           <span class="topic-title">
             {{t.title}}
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index aed5312bfa..655ca8c16e 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,12 +1,12 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href={{unbound topic.lastUnreadUrl}}>{{{unbound topic.fancyTitle}}}</a>
+<a class='title' href={{topic.lastUnreadUrl}}>{{{topic.fancyTitle}}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
   <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href={{{unbound topic.lastPosterUrl}}}>{{unbound topic.last_poster.username}}</a>
-    <a href={{unbound topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
+    {{i18n 'categories.latest_by'}} <a href={{{topic.lastPosterUrl}}}>{{topic.last_poster.username}}</a>
+    <a href={{topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
-  <a href={{unbound topic.lastPostUrl}} class="last-posted-at">{{format-age topic.last_posted_at}}</a>
+  <a href={{topic.lastPostUrl}} class="last-posted-at">{{format-age topic.last_posted_at}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index 4d7cf58049..e6fe7ca516 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -2,7 +2,7 @@
   <h3>{{formattedName}}</h3>
   <div class='controls'>
     <label class='radio'>
-      <input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
+      <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
 
       <div class='flag-action-type-details'>
         <span class='description'>{{{flag.description}}}</span>
@@ -20,7 +20,7 @@
 {{else}}
   <div class="controls {{flag.name_key}}">
     <label class='radio'>
-      <input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
+      <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
       <div class='flag-action-type-details'>
         <strong>{{formattedName}}</strong>
         {{#if showDescription}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index a39e71f9ae..d9880b54b6 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -1,5 +1,5 @@
 <div class='clearfix info'>
-    <a href={{unbound post.user.userUrl}} data-user-card={{unbound post.user.username}} class='avatar-link'>
+    <a href={{post.user.userUrl}} data-user-card={{post.user.username}} class='avatar-link'>
       {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
     </a>
     <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 347823e2ef..dce5918f52 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -25,7 +25,7 @@
         <dt>{{i18n "ip_lookup.location"}}</dt>
         <dd>
           {{#if location.location}}
-            <a href="https://maps.google.com/maps?q={{unbound location.latitude}},{{unbound location.longitude}}" rel="noopener" target="_blank">
+            <a href="https://maps.google.com/maps?q={{location.latitude}},{{location.longitude}}" rel="noopener" target="_blank">
               {{location.location}}
             </a>
           {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index 7680c6b861..32fa1adb65 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -1,4 +1,4 @@
-<a href {{action "share" source}} title={{unbound source.title}} aria-label={{unbound source.title}}>
+<a href {{action "share" source}} title={{source.title}} aria-label={{source.title}}>
   {{#if source.icon}}
     {{d-icon source.icon}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-info.hbs b/app/assets/javascripts/discourse/templates/components/user-info.hbs
index 46691e39ea..6c3e7aaceb 100644
--- a/app/assets/javascripts/discourse/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-info.hbs
@@ -1,6 +1,6 @@
 <div class="user-image">
   <div class="user-image-inner">
-    <a href={{unbound userPath}} data-user-card={{unbound user.username}}>{{avatar user imageSize="large"}}</a>
+    <a href={{userPath}} data-user-card={{user.username}}>{{avatar user imageSize="large"}}</a>
     {{#if user.primary_group_name}}
       {{avatar-flair
         flairURL=user.primary_group_flair_url
@@ -13,10 +13,10 @@
 
 <div class="user-detail">
   <div class='name-line'>
-    <span class="username"><a href={{unbound userPath}} data-user-card={{unbound user.username}}>{{format-username user.username}}</a></span>
-    <span class="name">{{unbound name}}</span>
+    <span class="username"><a href={{userPath}} data-user-card={{user.username}}>{{format-username user.username}}</a></span>
+    <span class="name">{{name}}</span>
   </div>
-  <div class="title">{{unbound user.title}}</div>
+  <div class="title">{{user.title}}</div>
 
   {{#if hasBlock}}
     <div class='details'>
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 7b31dfff86..07f7c03cd8 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -6,4 +6,4 @@
   {{/if}}
 </span>
 <br>
-<a href={{unbound url}}>{{{topic.fancyTitle}}}</a>
+<a href={{url}}>{{{topic.fancyTitle}}}</a>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 987e5e714f..ce1e7af458 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -213,7 +213,7 @@
       {{else}}
         <div class='saving-text'>
           {{#if model.createdPost}}
-            {{i18n 'composer.saved'}} <a class='permalink' href={{unbound createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+            {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
           {{else}}
             {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 760369fff8..355e18f1b8 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -75,7 +75,7 @@
           {{#each model.posts as |result|}}
             <div class='fps-result'>
               <div class='author'>
-                <a href={{result.userPath}} data-user-card={{unbound result.username}}>
+                <a href={{result.userPath}} data-user-card={{result.username}}>
                   {{avatar result imageSize="large"}}
                 </a>
               </div>
@@ -86,9 +86,9 @@
                     {{track-selected selectedList=selected selectedId=result.topic}}
                   {{/if}}
 
-                  <a class='search-link' href={{unbound result.url}} {{action "logClick" result.topic_id}}>
+                  <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
+                    <span class='topic-title'>{{#highlight-text highlight=q}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -113,7 +113,7 @@
 
                   {{#if result.blurb}}
                     {{#highlight-text highlight=highlightQuery}}
-                      {{{unbound result.blurb}}}
+                      {{{result.blurb}}}
                     {{/highlight-text}}
                   {{/if}}
                 </div>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index a7484723f1..d8a06c33c7 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -26,7 +26,7 @@
                 <div class="topic-excerpt">
                   {{{t.excerpt}}}
                   {{#if t.excerptTruncated}}
-                    {{#unless t.canClearPin}}<a href={{unbound t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
+                    {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
                   {{#if t.canClearPin}}
                     <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
index 8a780d2279..97f8003781 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
@@ -1,8 +1,8 @@
 {{#each notificationLevels as |level|}}
   <div class='controls'>
     <label class='radio'>
-      {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{unbound level.name}}</strong>
-      <div class='description'>{{{unbound level.description}}}</div>
+      {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
+      <div class='description'>{{{level.description}}}</div>
     </label>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/outlet-list.hbs b/app/assets/javascripts/discourse/templates/outlet-list.hbs
index a58e2acd7e..46605c7448 100644
--- a/app/assets/javascripts/discourse/templates/outlet-list.hbs
+++ b/app/assets/javascripts/discourse/templates/outlet-list.hbs
@@ -1 +1 @@
-{{connector templateId=(unbound templateId) class=(unbound outletClasses) tagName=(unbound tagName)}}
+{{connector templateId=templateId class=outletClasses tagName=tagName}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index 5bb791bcc0..2eef6ceac7 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -4,7 +4,7 @@
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching"}} {{i18n 'user.watched_categories'}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href={{unbound model.watchingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{model.watchingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
     {{/if}}
     {{category-selector
       categories=model.watchedCategories
@@ -18,7 +18,7 @@
   <div class="controls tracking-controls">
     <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href={{unbound model.trackingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{model.trackingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
     {{/if}}
     {{category-selector
       categories=model.trackedCategories
@@ -43,7 +43,7 @@
     <div class="controls tracking-controls">
       <label>{{d-icon "d-muted"}} {{i18n 'user.muted_categories'}}</label>
       {{#if canSee}}
-        <a class="show-tracking" href={{unbound model.mutedTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+        <a class="show-tracking" href={{model.mutedTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
       {{/if}}
       {{category-selector
         categories=model.mutedCategories
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index b2cdb56f26..bcb1a81b0f 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -57,7 +57,7 @@
           </div>
 
         {{else}}
-          <h1 data-topic-id={{unbound model.id}}>
+          <h1 data-topic-id={{model.id}}>
             {{#unless model.is_warning}}
               {{#if siteSettings.enable_personal_messages}}
                 {{private-message-glyph
@@ -73,7 +73,7 @@
 
             {{#if model.details.loaded}}
               {{topic-status topic=model}}
-              <a href={{unbound model.url}} {{action "jumpTop"}} class="fancy-title">
+              <a href={{model.url}} {{action "jumpTop"}} class="fancy-title">
                 {{{model.fancyTitle}}}
               </a>
             {{/if}}
@@ -170,7 +170,7 @@
       {{/topic-navigation}}
 
       <div class="row">
-        <section class="topic-area" id="topic" data-topic-id={{unbound model.id}}>
+        <section class="topic-area" id="topic" data-topic-id={{model.id}}>
 
           <div class="posts-wrapper">
             {{conditional-loading-spinner condition=model.postStream.loadingAbove}}
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index e15647621b..517e147e90 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -74,13 +74,13 @@
                       <td>{{number invite.user.posts_read_count}}</td>
                       <td>{{{format-duration invite.user.time_read}}}</td>
                       <td>
-                        <span title={{i18n 'user.invited.days_visited'}}>{{{unbound invite.user.days_visited}}}</span>
+                        <span title={{i18n 'user.invited.days_visited'}}>{{{invite.user.days_visited}}}</span>
                           /
-                        <span title={{i18n 'user.invited.account_age_days'}}>{{{unbound invite.user.days_since_created}}}</span>
+                        <span title={{i18n 'user.invited.account_age_days'}}>{{{invite.user.days_since_created}}}</span>
                       </td>
                     {{/if}}
                   {{else}}
-                    <td>{{unbound invite.email}}</td>
+                    <td>{{invite.email}}</td>
                     <td>{{format-date invite.updated_at}}</td>
                     <td>
                       {{#if invite.expired}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index b17c6b0254..71b4737522 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -79,15 +79,15 @@
           {{#each model.links as |link|}}
             <li>
               <a class='domain'
-                 href={{unbound link.url}}
-                 title={{unbound link.title}}
+                 href={{link.url}}
+                 title={{link.title}}
                  rel='noopener {{unless user.removeNoFollow 'nofollow ugc'}}'
                  target='_blank'>
                 {{shorten-url link.url}}
               </a>
               <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
               <br>
-              <a href="{{unbound link.post_url}}">{{{link.topic.fancyTitle}}}</a>
+              <a href="{{link.post_url}}">{{{link.topic.fancyTitle}}}</a>
             </li>
           {{/each}}
         </ul>
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index d229cb49cb..d7e73c3d08 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -55,7 +55,7 @@
         {{#if fromSelected}}
           <div class="time-pickers">
             {{d-icon "far-clock"}}
-            {{input maxlength=5 placeholder="hh:mm" input=(action "setTime") type="time" value=(unbound time) class="time-picker"}}
+            {{input maxlength=5 placeholder="hh:mm" input=(action "setTime") type="time" value=time class="time-picker"}}
           </div>
         {{/if}}
 
@@ -63,7 +63,7 @@
         {{#if toDate}}
           <div class="time-pickers">
             {{d-icon "far-clock"}}
-            {{input maxlength=5 placeholder="hh:mm" input=(action "setToTime") type="time" value=(unbound toTime) class="time-picker"}}
+            {{input maxlength=5 placeholder="hh:mm" input=(action "setToTime") type="time" value=toTime class="time-picker"}}
           </div>
         {{/if}}
         {{/if}}

From 174764be250d1b7c671913dafc890da238a915bc Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 9 Mar 2020 09:31:24 -0500
Subject: [PATCH 038/633] FEATURE: Add embed_set_canonical_url setting (#9134)

---
 config/locales/server.en.yml            |  1 +
 config/site_settings.yml                |  1 +
 lib/topic_view.rb                       |  4 ++++
 spec/requests/topics_controller_spec.rb | 16 ++++++++++++++++
 4 files changed, 22 insertions(+)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d0af9b7136..2b94222d74 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2057,6 +2057,7 @@ en:
 
     embed_any_origin: "Allow embeddable content regardless of origin. This is required for mobile apps with static HTML."
     embed_topics_list: "Support HTML embedding of topics lists"
+    embed_set_canonical_url: "Set the canonical URL for embeded topics to the embeded content's URL."
     embed_truncate: "Truncate the embedded posts."
     embed_support_markdown: "Support Markdown formatting for embedded posts."
     embed_whitelist_selector: "A comma separated list of CSS elements that are allowed in embeds."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index d42c7f7b0b..42acc80a84 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -880,6 +880,7 @@ posting:
       - code-fences
   embed_any_origin: false
   embed_topics_list: false
+  embed_set_canonical_url: false
   embed_truncate:
     default: true
   embed_support_markdown:
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 31c6729ac0..62f953b6fd 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -113,6 +113,10 @@ class TopicView
   end
 
   def canonical_path
+    if SiteSetting.embed_set_canonical_url
+      topic_embed = topic.topic_embed
+      return topic_embed.embed_url if topic_embed
+    end
     path = relative_url.dup
     path <<
       if @page > 1
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 3394894737..bb570a8674 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -3072,6 +3072,22 @@ RSpec.describe TopicsController do
         expect(body).to include('<link rel="prev" href="' + topic.relative_url + "?page=2")
       end
 
+      context "canonical_url" do
+        fab!(:topic_embed) { Fabricate(:topic_embed, embed_url: "https://markvanlan.com") }
+        let(:user_agent) { "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)" }
+
+        it "set to topic.url when embed_set_canonical_url is false" do
+          get topic_embed.topic.url, env: { "HTTP_USER_AGENT" => user_agent }
+          expect(response.body).to include('<link rel="canonical" href="' + topic_embed.topic.url)
+        end
+
+        it "set to topic_embed.embed_url when embed_set_canonical_url is true" do
+          SiteSetting.embed_set_canonical_url = true
+          get topic_embed.topic.url, env: { "HTTP_USER_AGENT" => user_agent }
+          expect(response.body).to include('<link rel="canonical" href="' + topic_embed.embed_url)
+        end
+      end
+
       context "wayback machine" do
         it "renders crawler layout" do
           get topic.url, env: { "HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36", "HTTP_VIA" => "HTTP/1.0 web.archive.org (Wayback Save Page)" }

From ae3220fb88bee7791c0c6575eb6990fa2c5ccb4f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 9 Mar 2020 15:20:00 +0000
Subject: [PATCH 039/633] FIX: Use `bio_excerpt` when checking for presence
 (#9148)

When `enable_new_user_card_route` is enabled, only `bio_excerpt` is serialized for user cards. `bio_cooked` is only loaded on the main user route.
---
 .../javascripts/discourse/components/user-card-contents.js.es6  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
index cf2502c552..ca6ec7dbda 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -40,7 +40,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   showDelete: and("viewingAdmin", "showName", "user.canBeDeleted"),
   linkWebsite: not("user.isBasic"),
   hasLocationOrWebsite: or("user.location", "user.website_name"),
-  isSuspendedOrHasBio: or("user.suspend_reason", "user.bio_cooked"),
+  isSuspendedOrHasBio: or("user.suspend_reason", "user.bio_excerpt"),
   showCheckEmail: and("user.staged", "canCheckEmails"),
 
   user: null,

From fff0e0980d0ba08481b1fbfb83984d904549e7d4 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 9 Mar 2020 17:37:32 +0100
Subject: [PATCH 040/633] FEATURE: Improve keyboard shortcuts help modal
 (#9143)

---
 .../keyboard-shortcuts-help.js.es6            | 24 +++++-----
 .../modal/keyboard-shortcuts-help.hbs         | 32 ++++++++-----
 .../stylesheets/common/base/topic-post.scss   |  8 ++--
 .../common/components/keyboard_shortcuts.scss | 47 ++++++++++++++-----
 4 files changed, 71 insertions(+), 40 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6 b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
index 7b3fbdcb5d..1c2d8f4221 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
@@ -14,23 +14,22 @@ const PLUS = I18n.t(`${KEY}.shortcut_key_delimiter_plus`);
 function buildHTML(keys1, keys2, keysDelimiter, shortcutsDelimiter) {
   const allKeys = [keys1, keys2]
     .reject(keys => keys.length === 0)
-    .map(keys => keys.map(k => `<kbd>${k}</kbd>`).join(keysDelimiter));
+    .map(keys => keys.map(k => `<kbd>${k}</kbd>`).join(keysDelimiter))
+    .map(keys => (shortcutsDelimiter !== "space" ? wrapInSpan(keys) : keys));
+
+  const [shortcut1, shortcut2] = allKeys;
 
   if (allKeys.length === 1) {
-    return wrapInSpan(allKeys[0]);
-  }
-
-  const context = { shortcut1: allKeys[0], shortcut2: allKeys[1] };
-  let result = "";
-  if (shortcutsDelimiter === "or") {
-    result = I18n.t(`${KEY}.shortcut_delimiter_or`, context);
+    return shortcut1;
+  } else if (shortcutsDelimiter === "or") {
+    return I18n.t(`${KEY}.shortcut_delimiter_or`, { shortcut1, shortcut2 });
   } else if (shortcutsDelimiter === "slash") {
-    result = I18n.t(`${KEY}.shortcut_delimiter_slash`, context);
+    return I18n.t(`${KEY}.shortcut_delimiter_slash`, { shortcut1, shortcut2 });
   } else if (shortcutsDelimiter === "space") {
-    result = I18n.t(`${KEY}.shortcut_delimiter_space`, context);
+    return wrapInSpan(
+      I18n.t(`${KEY}.shortcut_delimiter_space`, { shortcut1, shortcut2 })
+    );
   }
-
-  return wrapInSpan(result);
 }
 
 function wrapInSpan(shortcut) {
@@ -51,6 +50,7 @@ export default Controller.extend(ModalFunctionality, {
   onShow() {
     this.set("modal.modalClass", "keyboard-shortcuts-modal");
   },
+
   shortcuts: {
     jump_to: {
       home: buildShortcut("jump_to.home", { keys1: ["g", "h"] }),
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index ffd6c2eb4f..493a9e03a5 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body id="keyboard-shortcuts-help"}}
-  <div class="row">
-    <div>
-      <h4>{{i18n 'keyboard_shortcuts_help.jump_to.title'}}</h4>
+  <div class="column">
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.jump_to.title"}}</h4>
       <ul>
         <li>{{{shortcuts.jump_to.home}}}</li>
         <li>{{{shortcuts.jump_to.latest}}}</li>
@@ -16,7 +16,9 @@
         {{/if}}
         <li>{{{shortcuts.jump_to.drafts}}}</li>
       </ul>
-      <h4>{{i18n 'keyboard_shortcuts_help.navigation.title'}}</h4>
+    </section>
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.navigation.title"}}</h4>
       <ul>
         <li>{{{shortcuts.navigation.back}}}</li>
         <li>{{{shortcuts.navigation.jump}}}</li>
@@ -25,9 +27,11 @@
         <li>{{{shortcuts.navigation.next_prev}}}</li>
         <li>{{{shortcuts.navigation.go_to_unread_post}}}</li>
       </ul>
-    </div>
-    <div>
-      <h4>{{i18n 'keyboard_shortcuts_help.application.title'}}</h4>
+    </section>
+  </div>
+  <div class="column">
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.application.title"}}</h4>
       <ul>
         <li>{{{shortcuts.application.hamburger_menu}}}</li>
         <li>{{{shortcuts.application.user_profile_menu}}}</li>
@@ -38,7 +42,9 @@
         <li>{{{shortcuts.application.dismiss_topics}}}</li>
         <li>{{{shortcuts.application.log_out}}}</li>
       </ul>
-      <h4>{{i18n 'keyboard_shortcuts_help.composing.title'}}</h4>
+    </section>
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.composing.title"}}</h4>
       <ul>
         <li>{{{shortcuts.composing.return}}}</li>
         <li>{{{shortcuts.composing.fullscreen}}}</li>
@@ -48,9 +54,11 @@
         <li>{{{shortcuts.actions.reply_post}}}</li>
         <li>{{{shortcuts.actions.quote_post}}}</li>
       </ul>
-    </div>
-    <div>
-      <h4>{{i18n 'keyboard_shortcuts_help.actions.title'}}</h4>
+    </section>
+  </div>
+  <div class="column">
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.actions.title"}}</h4>
       <ul>
         <li>{{{shortcuts.actions.bookmark_topic}}}</li>
         <li>{{{shortcuts.actions.pin_unpin_topic}}}</li>
@@ -69,6 +77,6 @@
         <li>{{{shortcuts.actions.print}}}</li>
         <li>{{{shortcuts.actions.topic_admin_actions}}}</li>
       </ul>
-    </div>
+    </section>
   </div>
 {{/d-modal-body}}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 51df42d966..36ca696ab2 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -597,13 +597,11 @@ pre {
 }
 
 kbd {
-  background-color: $secondary;
-  border: 1px solid $primary-low;
   border-radius: 3px;
   box-shadow: shadow("kbd");
-  background: dark-light-choose(#fafafa, #333);
-  border: 1px solid dark-light-choose(#ccc, #555);
-  border-bottom: medium none dark-light-choose(#fff, #000);
+  background: dark-light-choose(#fafafa, #303030);
+  border: 1px solid dark-light-choose(#d0d0d0, #505050);
+  border-bottom: none;
 
   color: $primary;
   display: inline-block;
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index 3d05620c03..c40eaefee9 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -26,29 +26,54 @@
   max-height: 560px;
 }
 
+.keyboard-shortcuts-modal .modal-inner-container {
+  max-width: 880px;
+}
+
 #keyboard-shortcuts-help {
-  div.row {
-    width: 100%;
-    div {
-      float: left;
-      width: 32%;
-    }
+  display: flex;
+
+  .column {
+    width: 33.3%;
   }
+
   ul {
     list-style: none;
+    margin-bottom: 2rem;
     margin-left: 0;
 
     li {
-      margin: 5px 0;
+      align-items: center;
+      display: flex;
+      flex-wrap: wrap;
+      margin-bottom: 6px;
+    }
+
+    span {
+      background: #f2f2f2;
+      border-radius: 3px;
+      display: inline-flex;
+      margin: 0 6px;
+      padding: 1px 0 5px;
+    }
+
+    span:first-child {
+      margin-left: 0;
     }
 
     kbd {
-      font-size: $base-font-size;
+      align-items: center;
+      box-sizing: border-box;
+      color: dark-light-choose(#333, #aaa);
+      display: inline-flex;
       font-family: $base-font-family;
-      margin: 0;
-      color: dark-light-choose(#444, #aaa);
       font-weight: bold;
-      padding: 2px 6px;
+      height: 24px;
+      justify-content: center;
+      margin: 0 3px;
+      min-width: 24px;
+      padding: 0 6px;
+      vertical-align: bottom;
       white-space: nowrap;
     }
   }

From 85e03a7f68fc12114d8c24d6dd40b045832c908f Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 9 Mar 2020 17:37:49 +0100
Subject: [PATCH 041/633] DEV: Replace `Time.new` with `Time.now` (#9142)

(or `Time.zone.now`)
---
 app/jobs/regular/run_heartbeat.rb | 2 +-
 app/models/post.rb                | 2 +-
 config/unicorn.conf.rb            | 8 ++++----
 lib/distributed_memoizer.rb       | 4 ++--
 spec/jobs/heartbeat_spec.rb       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/jobs/regular/run_heartbeat.rb b/app/jobs/regular/run_heartbeat.rb
index 4d5c013053..4a0691171a 100644
--- a/app/jobs/regular/run_heartbeat.rb
+++ b/app/jobs/regular/run_heartbeat.rb
@@ -10,7 +10,7 @@ module Jobs
     end
 
     def execute(args)
-      Discourse.redis.set(self.class.heartbeat_key, Time.new.to_i.to_s)
+      Discourse.redis.set(self.class.heartbeat_key, Time.now.to_i.to_s)
     end
 
     def self.last_heartbeat
diff --git a/app/models/post.rb b/app/models/post.rb
index 7e56dfa66b..751d8b721f 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -714,7 +714,7 @@ class Post < ActiveRecord::Base
       self.cooked = cook(raw, topic_id: topic_id)
     end
 
-    self.baked_at = Time.new
+    self.baked_at = Time.zone.now
     self.baked_version = BAKED_VERSION
   end
 
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index 6c0ac9a7ef..dd698f379f 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -130,9 +130,9 @@ before_fork do |server, worker|
 
         def check_sidekiq_heartbeat
           @sidekiq_heartbeat_interval ||= 30.minutes
-          @sidekiq_next_heartbeat_check ||= Time.new.to_i + @sidekiq_heartbeat_interval
+          @sidekiq_next_heartbeat_check ||= Time.now.to_i + @sidekiq_heartbeat_interval
 
-          if @sidekiq_next_heartbeat_check < Time.new.to_i
+          if @sidekiq_next_heartbeat_check < Time.now.to_i
 
             last_heartbeat = Jobs::RunHeartbeat.last_heartbeat
             restart = false
@@ -142,13 +142,13 @@ before_fork do |server, worker|
               restart = true
             end
 
-            if last_heartbeat < Time.new.to_i - @sidekiq_heartbeat_interval
+            if last_heartbeat < Time.now.to_i - @sidekiq_heartbeat_interval
               STDERR.puts "Sidekiq heartbeat test failed, restarting"
               Rails.logger.warn "Sidekiq heartbeat test failed, restarting"
 
               restart = true
             end
-            @sidekiq_next_heartbeat_check = Time.new.to_i + @sidekiq_heartbeat_interval
+            @sidekiq_next_heartbeat_check = Time.now.to_i + @sidekiq_heartbeat_interval
 
             if restart
               Demon::Sidekiq.restart
diff --git a/lib/distributed_memoizer.rb b/lib/distributed_memoizer.rb
index 44a52806b4..559833f2b6 100644
--- a/lib/distributed_memoizer.rb
+++ b/lib/distributed_memoizer.rb
@@ -15,11 +15,11 @@ class DistributedMemoizer
     unless result = redis.get(redis_key)
       redis_lock_key = self.redis_lock_key(key)
 
-      start = Time.new
+      start = Time.now
       got_lock = false
 
       begin
-        while Time.new < start + MAX_WAIT && !got_lock
+        while Time.now < start + MAX_WAIT && !got_lock
           LOCK.synchronize do
             got_lock = get_lock(redis, redis_lock_key)
           end
diff --git a/spec/jobs/heartbeat_spec.rb b/spec/jobs/heartbeat_spec.rb
index fb39ffd36b..f86c88ef32 100644
--- a/spec/jobs/heartbeat_spec.rb
+++ b/spec/jobs/heartbeat_spec.rb
@@ -14,7 +14,7 @@ describe ::Jobs::Heartbeat do
 
     Sidekiq::Testing.inline! do
       ::Jobs::Heartbeat.new.perform(nil)
-      expect(::Jobs::RunHeartbeat.last_heartbeat).to eq(Time.new.to_i)
+      expect(::Jobs::RunHeartbeat.last_heartbeat).to eq(Time.now.to_i)
     end
   end
 end

From e35bc8bebd1243e40a507cbc9874bad20e54b535 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 9 Mar 2020 17:38:13 +0100
Subject: [PATCH 042/633] FIX: Preserve PostCreator's created_at resolution
 (#9140)

PostMover passes to PostCreator a `created_at` that is a `ActiveSupport::WithTimeZone` instance (and also `is_a? Time`). Previously it was always being passed through `Time.zone.parse` so it would lose sub-second information. Now, it takes `Time` input as-is, while still parsing other types.
---
 lib/post_creator.rb                  |  7 +++-
 spec/components/post_creator_spec.rb | 54 ++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 8340c6c7b7..25cd341eea 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -494,7 +494,12 @@ class PostCreator
     end
 
     post.extract_quoted_post_numbers
-    post.created_at = Time.zone.parse(@opts[:created_at].to_s) if @opts[:created_at].present?
+
+    post.created_at = if @opts[:created_at].is_a?(Time)
+      @opts[:created_at]
+    elsif @opts[:created_at].present?
+      Time.zone.parse(@opts[:created_at].to_s)
+    end
 
     if fields = @opts[:custom_fields]
       post.custom_fields = fields
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index d5bbb9fef5..07ec76bb78 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -944,24 +944,48 @@ describe PostCreator do
   end
 
   context 'setting created_at' do
-    created_at = 1.week.ago
-    let(:topic) do
-      PostCreator.create(user,
-                         raw: 'This is very interesting test post content',
-                         title: 'This is a very interesting test post title',
-                         created_at: created_at)
+    it 'supports Time instances' do
+      freeze_time
+
+      post1 = PostCreator.create(user,
+        raw: 'This is very interesting test post content',
+        title: 'This is a very interesting test post title',
+        created_at: 1.week.ago
+      )
+      topic = post1.topic
+
+      post2 = PostCreator.create(user,
+        raw: 'This is very interesting test post content',
+        topic_id: topic,
+        created_at: 1.week.ago
+      )
+
+      expect(post1.created_at).to be_within(1.second).of(1.week.ago)
+      expect(post2.created_at).to be_within(1.second).of(1.week.ago)
+      expect(topic.created_at).to be_within(1.second).of(1.week.ago)
     end
 
-    let(:post) do
-      PostCreator.create(user,
-                         raw: 'This is very interesting test post content',
-                         topic_id: Topic.last,
-                         created_at: created_at)
-    end
+    it 'supports strings' do
+      freeze_time
 
-    it 'acts correctly' do
-      expect(topic.created_at).to be_within(10.seconds).of(created_at)
-      expect(post.created_at).to be_within(10.seconds).of(created_at)
+      time = Time.zone.parse('2019-09-02')
+
+      post1 = PostCreator.create(user,
+        raw: 'This is very interesting test post content',
+        title: 'This is a very interesting test post title',
+        created_at: '2019-09-02'
+      )
+      topic = post1.topic
+
+      post2 = PostCreator.create(user,
+        raw: 'This is very interesting test post content',
+        topic_id: topic,
+        created_at: '2019-09-02 00:00:00 UTC'
+      )
+
+      expect(post1.created_at).to be_within(1.second).of(time)
+      expect(post2.created_at).to be_within(1.second).of(time)
+      expect(topic.created_at).to be_within(1.second).of(time)
     end
   end
 

From 5037b80c9c6e94ad01fb2f7b7971a2d533bd3c94 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 9 Mar 2020 17:38:37 +0100
Subject: [PATCH 043/633] Merge imports from the same module (#9144)

---
 .../admin/components/admin-report-chart.js.es6            | 3 +--
 .../admin/components/admin-report-stacked-chart.js.es6    | 3 +--
 .../javascripts/admin/components/resumable-upload.js.es6  | 3 +--
 .../discourse/components/composer-editor.js.es6           | 6 +-----
 .../discourse/components/composer-title.js.es6            | 4 +---
 .../javascripts/discourse/components/d-editor.js.es6      | 6 +-----
 .../discourse/components/discourse-topic.js.es6           | 5 +----
 .../discourse/components/discovery-topics-list.js.es6     | 3 +--
 .../javascripts/discourse/components/global-notice.js.es6 | 3 +--
 .../javascripts/discourse/components/invite-panel.js.es6  | 3 +--
 .../javascripts/discourse/components/mount-widget.js.es6  | 3 +--
 .../discourse/components/scrolling-post-stream.js.es6     | 4 +---
 .../discourse/components/search-advanced-options.js.es6   | 3 +--
 .../javascripts/discourse/components/share-popup.js.es6   | 3 +--
 .../javascripts/discourse/components/site-header.js.es6   | 4 +---
 .../discourse/components/suggested-topics.js.es6          | 3 +--
 .../discourse/components/topic-timer-info.js.es6          | 3 +--
 .../discourse/components/user-card-contents.js.es6        | 3 +--
 .../discourse/controllers/edit-topic-timer.js.es6         | 3 +--
 .../discourse/controllers/insert-hyperlink.js.es6         | 4 +---
 app/assets/javascripts/discourse/controllers/user.js.es6  | 3 +--
 .../initializers/subscribe-user-notifications.js.es6      | 3 +--
 app/assets/javascripts/discourse/lib/autocomplete.js.es6  | 3 +--
 .../javascripts/discourse/lib/keyboard-shortcuts.js.es6   | 3 +--
 app/assets/javascripts/discourse/lib/url.js.es6           | 3 +--
 .../discourse/mixins/card-contents-base.js.es6            | 4 +---
 app/assets/javascripts/discourse/models/composer.js.es6   | 8 ++------
 app/assets/javascripts/discourse/models/post.js.es6       | 3 +--
 app/assets/javascripts/discourse/models/site.js.es6       | 3 +--
 app/assets/javascripts/discourse/models/store.js.es6      | 3 +--
 .../discourse/models/topic-tracking-state.js.es6          | 3 +--
 app/assets/javascripts/discourse/models/topic.js.es6      | 3 +--
 app/assets/javascripts/discourse/models/user.js.es6       | 3 +--
 .../javascripts/discourse/routes/application.js.es6       | 3 +--
 app/assets/javascripts/discourse/routes/topic.js.es6      | 4 +---
 app/assets/javascripts/discourse/services/search.js.es6   | 3 +--
 app/assets/javascripts/discourse/widgets/glue.js.es6      | 3 +--
 app/assets/javascripts/discourse/widgets/post-menu.js.es6 | 3 +--
 .../javascripts/discourse/widgets/search-menu.js.es6      | 3 +--
 .../javascripts/select-kit/components/select-kit.js.es6   | 3 +--
 .../select-kit/components/selected-name.js.es6            | 3 +--
 .../discourse/components/composer-presence-display.js.es6 | 4 +---
 .../discourse/components/topic-presence-display.js.es6    | 3 +--
 43 files changed, 44 insertions(+), 105 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
index 5351a11952..7af8ce0474 100644
--- a/app/assets/javascripts/admin/components/admin-report-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
@@ -1,6 +1,5 @@
 import { makeArray } from "discourse-common/lib/helpers";
-import { debounce } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
+import { debounce, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
diff --git a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
index 911d858ba9..8980c93077 100644
--- a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
@@ -1,6 +1,5 @@
 import { makeArray } from "discourse-common/lib/helpers";
-import { debounce } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
+import { debounce, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index 830e560252..7425f174fe 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -1,5 +1,4 @@
-import { schedule } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { later, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 52f44e78f5..4ff3b961b1 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1,8 +1,4 @@
-import { throttle } from "@ember/runloop";
-import { next } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { debounce, later, next, scheduleOnce, throttle } from "@ember/runloop";
 import Component from "@ember/component";
 import userSearch from "discourse/lib/user-search";
 import discourseComputed, {
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index bd559a59f1..9ba4f501bf 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -1,7 +1,5 @@
 import { alias, or } from "@ember/object/computed";
-import { next } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
+import { debounce, next, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { load } from "pretty-text/oneboxer";
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index d9f156b63b..b83b667bca 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,8 +1,4 @@
-import { next } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { debounce, later, next, schedule, scheduleOnce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import Component from "@ember/component";
 /*global Mousetrap:true */
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
index 83e7bf6fa1..7e222e2e61 100644
--- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
@@ -1,8 +1,5 @@
 import { alias } from "@ember/object/computed";
-import { throttle } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { later, schedule, scheduleOnce, throttle } from "@ember/runloop";
 import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import AddArchetypeClass from "discourse/mixins/add-archetype-class";
diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
index f4329ba2f2..30a0118a33 100644
--- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
@@ -1,5 +1,4 @@
-import { schedule } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { schedule, scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "discourse-common/utils/decorators";
 import LoadMore from "discourse/mixins/load-more";
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 8ca725abaa..abaf730672 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,8 +1,7 @@
 import { bind, cancel } from "@ember/runloop";
 import Component from "@ember/component";
 import LogsNotice from "discourse/services/logs-notice";
-import EmberObject from "@ember/object";
-import { computed } from "@ember/object";
+import EmberObject, { computed } from "@ember/object";
 
 const _pluginNotices = [];
 
diff --git a/app/assets/javascripts/discourse/components/invite-panel.js.es6 b/app/assets/javascripts/discourse/components/invite-panel.js.es6
index 8622e97ac5..0748809131 100644
--- a/app/assets/javascripts/discourse/components/invite-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/invite-panel.js.es6
@@ -1,8 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
-import { computed } from "@ember/object";
+import EmberObject, { computed } from "@ember/object";
 import { alias, and, equal } from "@ember/object/computed";
-import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import { emailValid } from "discourse/lib/utilities";
 import Group from "discourse/models/group";
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index e62b7acab3..dc98bf9f6d 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js.es6
+++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6
@@ -1,5 +1,4 @@
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { cancel, scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { diff, patch } from "virtual-dom";
 import { WidgetClickHook } from "discourse/widgets/hooks";
diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
index 04f0897eb6..cb9b3dac27 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -1,6 +1,4 @@
-import { next } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { debounce, next, scheduleOnce } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import MountWidget from "discourse/components/mount-widget";
 import { cloak, uncloak } from "discourse/widgets/post-stream";
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
index eb61067167..9b3bac5035 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -1,5 +1,4 @@
-import { debounce } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { debounce, scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "discourse-common/utils/decorators";
 import { escapeExpression } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6
index ba32b26585..ca86058b73 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js.es6
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -1,6 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { bind } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { bind, scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { longDateNoYear } from "discourse/lib/formatter";
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index 38d42d9ea0..b8b6ed90e3 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -1,6 +1,4 @@
-import { cancel } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { cancel, later, schedule } from "@ember/runloop";
 import MountWidget from "discourse/components/mount-widget";
 import { observes } from "discourse-common/utils/decorators";
 import Docking from "discourse/mixins/docking";
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
index 53986a8303..9d5b83839a 100644
--- a/app/assets/javascripts/discourse/components/suggested-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
@@ -1,9 +1,8 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { get } from "@ember/object";
+import { computed, get } from "@ember/object";
 import Component from "@ember/component";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import Site from "discourse/models/site";
-import { computed } from "@ember/object";
 
 export default Component.extend({
   elementId: "suggested-topics",
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
index 4b758ed6a2..66663b062d 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -1,6 +1,5 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { cancel } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { cancel, later } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import Category from "discourse/models/category";
diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
index ca6ec7dbda..5ad24526dc 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -1,6 +1,6 @@
 import { isEmpty } from "@ember/utils";
 import { alias, gte, and, gt, not, or } from "@ember/object/computed";
-import EmberObject from "@ember/object";
+import EmberObject, { set } from "@ember/object";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import User from "discourse/models/user";
@@ -10,7 +10,6 @@ import CanCheckEmails from "discourse/mixins/can-check-emails";
 import CardContentsBase from "discourse/mixins/card-contents-base";
 import CleansUp from "discourse/mixins/cleans-up";
 import { prioritizeNameInUx } from "discourse/lib/settings";
-import { set } from "@ember/object";
 import { getOwner } from "@ember/application";
 
 export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
index a410f1fc90..e9117532f0 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
@@ -1,10 +1,9 @@
-import EmberObject from "@ember/object";
+import EmberObject, { setProperties } from "@ember/object";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import TopicTimer from "discourse/models/topic-timer";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { setProperties } from "@ember/object";
 
 export const CLOSE_STATUS_TYPE = "close";
 export const OPEN_STATUS_TYPE = "open";
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
index 21ea0603f8..57d751b56e 100644
--- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
+++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
@@ -1,7 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { debounce } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { cancel, debounce, scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { searchForTerm } from "discourse/lib/search";
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 90eeb3a837..cc2db042fb 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,7 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { alias, or, gt, not, and } from "@ember/object/computed";
-import EmberObject from "@ember/object";
+import EmberObject, { set, computed } from "@ember/object";
 import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -9,7 +9,6 @@ import CanCheckEmails from "discourse/mixins/can-check-emails";
 import User from "discourse/models/user";
 import optionalService from "discourse/lib/optional-service";
 import { prioritizeNameInUx } from "discourse/lib/settings";
-import { set, computed } from "@ember/object";
 
 export default Controller.extend(CanCheckEmails, {
   indexStream: false,
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
index 8efb204c36..14c2bc5f95 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -1,4 +1,4 @@
-import EmberObject from "@ember/object";
+import EmberObject, { set } from "@ember/object";
 // Subscribes to user events on the message bus
 import {
   init as initDesktopNotifications,
@@ -11,7 +11,6 @@ import {
   unsubscribe as unsubscribePushNotifications,
   isPushNotificationsEnabled
 } from "discourse/lib/push-notifications";
-import { set } from "@ember/object";
 import ENV from "discourse-common/config/environment";
 
 export default {
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index aeb7b836a2..4979760483 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -1,5 +1,4 @@
-import { cancel } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { cancel, later } from "@ember/runloop";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { setCaretPosition, caretPosition } from "discourse/lib/utilities";
 import Site from "discourse/models/site";
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 409ebc3190..cf22919b07 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -1,5 +1,4 @@
-import { run } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { later, run } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import Composer from "discourse/models/composer";
 import { minimumOffset } from "discourse/lib/offset-calculator";
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 93cad9b4c4..7892abafd9 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -1,7 +1,6 @@
 import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
+import { next, schedule } from "@ember/runloop";
 import offsetCalculator from "discourse/lib/offset-calculator";
 import LockOn from "discourse/lib/lock-on";
 import { defaultHomepage } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
index c5cdcc4a16..2f53c5276f 100644
--- a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
+++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
@@ -1,7 +1,5 @@
 import { alias, match } from "@ember/object/computed";
-import { throttle } from "@ember/runloop";
-import { next } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
+import { next, schedule, throttle } from "@ember/runloop";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import afterTransition from "discourse/lib/after-transition";
 import DiscourseURL from "discourse/lib/url";
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 2150396102..1b53ed8927 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,9 +1,7 @@
 import { isEmpty } from "@ember/utils";
 import { reads, equal, not, or, and } from "@ember/object/computed";
-import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import EmberObject, { set } from "@ember/object";
+import { cancel, later, next, throttle } from "@ember/runloop";
 import RestModel from "discourse/models/rest";
 import Topic from "discourse/models/topic";
 import { throwAjaxError } from "discourse/lib/ajax-error";
@@ -19,9 +17,7 @@ import {
   emailValid
 } from "discourse/lib/utilities";
 import { propertyNotEqual } from "discourse/lib/computed";
-import { throttle } from "@ember/runloop";
 import { Promise } from "rsvp";
-import { set } from "@ember/object";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
 import deprecated from "discourse-common/lib/deprecated";
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index a08f960ef0..4ba35b31ac 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -1,8 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { computed, get } from "@ember/object";
+import EmberObject, { computed, get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { equal, and, or, not } from "@ember/object/computed";
-import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index 5f9065d3d8..29de94c3a8 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -1,8 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { get } from "@ember/object";
+import EmberObject, { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { alias, sort } from "@ember/object/computed";
-import EmberObject from "@ember/object";
 import Archetype from "discourse/models/archetype";
 import PostActionType from "discourse/models/post-action-type";
 import Singleton from "discourse/mixins/singleton";
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index 2ee28b6620..1bc9fdf355 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -1,10 +1,9 @@
-import EmberObject from "@ember/object";
+import EmberObject, { set } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import ResultSet from "discourse/models/result-set";
 import { getRegister } from "discourse-common/lib/get-owner";
 import { underscore } from "@ember/string";
-import { set } from "@ember/object";
 import Category from "discourse/models/category";
 import { Promise } from "rsvp";
 
diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
index 8f79703ef7..7debe3f4ce 100644
--- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
@@ -1,10 +1,9 @@
-import { get } from "@ember/object";
+import EmberObject, { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
 import PreloadStore from "preload-store";
 import Category from "discourse/models/category";
-import EmberObject from "@ember/object";
 import User from "discourse/models/user";
 
 function isNew(topic) {
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index fcf1892ec8..fa97e11ea7 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -1,6 +1,5 @@
-import { get } from "@ember/object";
+import EmberObject, { get } from "@ember/object";
 import { not, notEmpty, equal, and, or } from "@ember/object/computed";
-import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { flushMap } from "discourse/models/store";
 import RestModel from "discourse/models/rest";
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index b15c868d80..7af461aa30 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -1,7 +1,7 @@
 import { A } from "@ember/array";
 import { isEmpty } from "@ember/utils";
 import { gt, equal, or } from "@ember/object/computed";
-import EmberObject, { computed } from "@ember/object";
+import EmberObject, { computed, getProperties } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
@@ -22,7 +22,6 @@ import { defaultHomepage } from "discourse/lib/utilities";
 import { userPath } from "discourse/lib/url";
 import Category from "discourse/models/category";
 import { Promise } from "rsvp";
-import { getProperties } from "@ember/object";
 import deprecated from "discourse-common/lib/deprecated";
 import Site from "discourse/models/site";
 
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 8dca333360..0a028cdceb 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -1,5 +1,4 @@
-import { once } from "@ember/runloop";
-import { next } from "@ember/runloop";
+import { next, once } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { setting } from "discourse/lib/computed";
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index d4c22f9b3e..33e60412c6 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,8 +1,6 @@
 import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { cancel, later, scheduleOnce } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
diff --git a/app/assets/javascripts/discourse/services/search.js.es6 b/app/assets/javascripts/discourse/services/search.js.es6
index d7a8edcd10..67ad9b16d8 100644
--- a/app/assets/javascripts/discourse/services/search.js.es6
+++ b/app/assets/javascripts/discourse/services/search.js.es6
@@ -1,5 +1,4 @@
-import { get } from "@ember/object";
-import EmberObject from "@ember/object";
+import EmberObject, { get } from "@ember/object";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default EmberObject.extend({
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js.es6
index 7d8a2a4561..2fe75def26 100644
--- a/app/assets/javascripts/discourse/widgets/glue.js.es6
+++ b/app/assets/javascripts/discourse/widgets/glue.js.es6
@@ -1,5 +1,4 @@
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { cancel, scheduleOnce } from "@ember/runloop";
 import { diff, patch } from "virtual-dom";
 import { queryRegistry } from "discourse/widgets/widget";
 import DirtyKeys from "discourse/lib/dirty-keys";
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index c833d8edf9..b5562aa2f1 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -1,5 +1,4 @@
-import { run } from "@ember/runloop";
-import { next } from "@ember/runloop";
+import { next, run } from "@ember/runloop";
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import { avatarAtts } from "discourse/widgets/actions-summary";
 import { h } from "virtual-dom";
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 5c3b3e08b1..690dc80bff 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -1,6 +1,5 @@
 import { get } from "@ember/object";
-import { debounce } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { debounce, later } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
 import { createWidget } from "discourse/widgets/widget";
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 9c9d542431..25aa3e68e7 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -1,8 +1,7 @@
-import { computed, guidFor, default as EmberObject } from "@ember/object";
+import EmberObject, { computed, get, guidFor } from "@ember/object";
 import Component from "@ember/component";
 import deprecated from "discourse-common/lib/deprecated";
 import { makeArray } from "discourse-common/lib/helpers";
-import { get } from "@ember/object";
 import UtilsMixin from "select-kit/mixins/utils";
 import PluginApiMixin from "select-kit/mixins/plugin-api";
 import Mixin from "@ember/object/mixin";
diff --git a/app/assets/javascripts/select-kit/components/selected-name.js.es6 b/app/assets/javascripts/select-kit/components/selected-name.js.es6
index 1f69a5e2ee..ac23c16446 100644
--- a/app/assets/javascripts/select-kit/components/selected-name.js.es6
+++ b/app/assets/javascripts/select-kit/components/selected-name.js.es6
@@ -1,8 +1,7 @@
-import { computed } from "@ember/object";
+import { computed, get } from "@ember/object";
 import Component from "@ember/component";
 import { makeArray } from "discourse-common/lib/helpers";
 import UtilsMixin from "select-kit/mixins/utils";
-import { get } from "@ember/object";
 
 export default Component.extend(UtilsMixin, {
   layoutName: "select-kit/templates/components/selected-name",
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index 175f3a9985..1e78297376 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -1,6 +1,4 @@
-import { once } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
+import { cancel, debounce, once } from "@ember/runloop";
 import Component from "@ember/component";
 import { equal, gt } from "@ember/object/computed";
 import { Promise } from "rsvp";
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
index c12573803d..1089246fb6 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -1,5 +1,4 @@
-import { debounce } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
+import { cancel, debounce } from "@ember/runloop";
 import Component from "@ember/component";
 import { gt } from "@ember/object/computed";
 import computed, { on } from "discourse-common/utils/decorators";

From 3ad5cb0cbcda50ee42f97665d456061a400b03f0 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 9 Mar 2020 11:41:07 -0500
Subject: [PATCH 044/633] FIX: Error message for 403 when featuring topic on
 profile (#9149)

---
 app/controllers/users_controller.rb | 5 ++++-
 config/locales/server.en.yml        | 4 ++++
 lib/guardian/user_guardian.rb       | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9af8c2aa7e..4d0adc5116 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1362,7 +1362,10 @@ class UsersController < ApplicationController
     user = fetch_user_from_params
     topic = Topic.find(params[:topic_id].to_i)
 
-    raise Discourse::InvalidAccess.new unless topic && guardian.can_feature_topic?(user, topic)
+    if !guardian.can_feature_topic?(user, topic)
+      return render_json_error(I18n.t('activerecord.errors.models.user_profile.attributes.featured_topic_id.invalid'), 403)
+    end
+
     user.user_profile.update(featured_topic_id: topic.id)
     render json: success_json
   end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 2b94222d74..f4f234f8ec 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -546,6 +546,10 @@ en:
               same_as_password: "is the same as your password."
             ip_address:
               signup_not_allowed: "Signup is not allowed from this account."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "This topic cannot be featured on your profile."
         user_email:
           attributes:
             user_id:
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 35dccb8481..26e726437b 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -129,6 +129,7 @@ module UserGuardian
   end
 
   def can_feature_topic?(user, topic)
+    return false if topic.nil?
     return false if !SiteSetting.allow_featured_topic_on_user_profiles?
     return false if !is_me?(user) && !is_staff?
     return false if !topic.visible

From ec21a15fa7234b8274b5b137afdd6dff78cf52a9 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 9 Mar 2020 12:53:32 -0400
Subject: [PATCH 045/633] FIX: Incorrect message when logging in via email

If `hide email address taken` was true, it would always display a
success message, rather than the non-comittal "maybe we emailed that
user" response.
---
 .../javascripts/discourse/controllers/login.js.es6       | 6 +++++-
 app/controllers/users_controller.rb                      | 1 +
 spec/requests/users_controller_spec.rb                   | 9 ++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 9d4c56f56e..de39f7ec8a 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -296,8 +296,12 @@ export default Controller.extend(ModalFunctionality, {
               "error"
             );
           } else {
+            let postfix = data.hide_taken ? "" : "_found";
             this.flash(
-              I18n.t(`${key}_found`, { email: loginName, username: loginName })
+              I18n.t(`${key}${postfix}`, {
+                email: loginName,
+                username: loginName
+              })
             );
           }
         })
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4d0adc5116..9405620286 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -748,6 +748,7 @@ class UsersController < ApplicationController
     end
 
     json = success_json
+    json[:hide_taken] = SiteSetting.hide_email_address_taken
     json[:user_found] = user_presence unless SiteSetting.hide_email_address_taken
     render json: json
   rescue RateLimiter::LimitExceeded
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 707c61d6ba..38dfe21e96 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3455,7 +3455,6 @@ describe UsersController do
 
       it 'should return the right response' do
         post "/u/email-login.json", params: { login: user.email }
-
         expect(response.status).to eq(404)
       end
     end
@@ -3465,7 +3464,9 @@ describe UsersController do
         post "/u/email-login.json", params: { login: '@random' }
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)['user_found']).to eq(false)
+        json = JSON.parse(response.body)
+        expect(json['user_found']).to eq(false)
+        expect(json['hide_taken']).to eq(false)
         expect(Jobs::CriticalUserEmail.jobs).to eq([])
       end
     end
@@ -3476,7 +3477,9 @@ describe UsersController do
         post "/u/email-login.json", params: { login: user.email }
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body).has_key?('user_found')).to eq(false)
+        json = JSON.parse(response.body)
+        expect(json.has_key?('user_found')).to eq(false)
+        expect(json['hide_taken']).to eq(true)
       end
     end
 

From 055cb558729616e2b25c6a9ead4bdfe47d4ccbcb Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Fri, 6 Mar 2020 15:15:55 -0800
Subject: [PATCH 046/633] DEV: shutdown_ok parameter to /srv/status

This allows probers to distinguish between liveness and readiness conditions
---
 app/controllers/forums_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 7192c59dd1..d11efb4b43 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -10,7 +10,7 @@ class ForumsController < ActionController::Base
 
   def status
     if $shutdown # rubocop:disable Style/GlobalVars
-      render plain: "shutting down", status: 500
+      render plain: "shutting down", status: (params[:shutdown_ok] ? 200 : 500)
     else
       render plain: "ok"
     end

From 218d3f5f44e9b0d318a60178ea6f6f054220a0be Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 9 Mar 2020 13:48:30 -0700
Subject: [PATCH 047/633] Add tests for /srv/status behavior

---
 spec/requests/forums_controller_spec.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/spec/requests/forums_controller_spec.rb b/spec/requests/forums_controller_spec.rb
index 865e7b9484..9f3ff2784c 100644
--- a/spec/requests/forums_controller_spec.rb
+++ b/spec/requests/forums_controller_spec.rb
@@ -19,4 +19,22 @@ RSpec.describe ForumsController do
     end
   end
 
+  describe "during shutdown" do
+    before(:each) do
+      $shutdown = true
+    end
+    after(:each) do
+      $shutdown = nil
+    end
+
+    it "returns a 500 response" do
+      get "/srv/status"
+      expect(response.status).to eq(500)
+    end
+    it "returns a 200 response when given shutdown_ok" do
+      get "/srv/status?shutdown_ok=1"
+      expect(response.status).to eq(200)
+    end
+  end
+
 end

From e3bbcb27d035dcac3163de9a5e3047ffc7239bbe Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 10 Mar 2020 16:57:14 +1000
Subject: [PATCH 048/633] FIX: Set current user timezone when saving profile
 timezone (#9155)

If you are changing your own profile timezone, then on save we set the current user timezone, in case this property needs to be accessed again before the user is reloaded.
---
 .../discourse/controllers/preferences/profile.js.es6        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
index 5d2e65f045..f6005e355d 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
@@ -93,6 +93,12 @@ export default Controller.extend(PreferencesTabController, {
       return model
         .save(this.saveAttrNames)
         .then(() => {
+          // update the timezone in memory so we can use the new
+          // one if we change routes without reloading the user
+          if (this.currentUser.id === this.model.id) {
+            this.currentUser.timezone = this.model.user_option.timezone;
+          }
+
           cookAsync(model.get("bio_raw"))
             .then(() => {
               model.set("bio_cooked");

From 78a6b7631095c07a576d11538cce0cf50400b118 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 10 Mar 2020 09:56:55 +0100
Subject: [PATCH 049/633] FIX: ensures pinned-options header is showing correct
 state (#9156)

---
 .../components/pinned-options.js.es6          | 28 +++++++++--------
 .../select-kit/pinned-options-test.js.es6     | 31 ++++++++++++++-----
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/pinned-options.js.es6 b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
index c04142667a..2b9263bc43 100644
--- a/app/assets/javascripts/select-kit/components/pinned-options.js.es6
+++ b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
@@ -1,6 +1,9 @@
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import { iconHTML } from "discourse-common/lib/icon-library";
-import { computed } from "@ember/object";
+import { computed, action } from "@ember/object";
+
+const UNPINNED = "unpinned";
+const PINNED = "pinned";
 
 export default DropdownSelectBoxComponent.extend({
   pluginApiIdentifiers: ["pinned-options"],
@@ -10,13 +13,13 @@ export default DropdownSelectBoxComponent.extend({
     const pinnedGlobally = this.get("topic.pinned_globally");
     const pinned = this.value;
     const globally = pinnedGlobally ? "_globally" : "";
-    const state = pinned === "pinned" ? `pinned${globally}` : "unpinned";
+    const state = pinned ? `pinned${globally}` : UNPINNED;
     const title = I18n.t(`topic_statuses.${state}.title`);
 
     content.label = `<span>${title}</span>${iconHTML("caret-down")}`.htmlSafe();
     content.title = title;
     content.name = state;
-    content.icon = `thumbtack${state === "unpinned" ? " unpinned" : ""}`;
+    content.icon = `thumbtack${state === UNPINNED ? " unpinned" : ""}`;
     return content;
   },
 
@@ -25,7 +28,7 @@ export default DropdownSelectBoxComponent.extend({
 
     return [
       {
-        id: "pinned",
+        id: PINNED,
         name: I18n.t(`topic_statuses.pinned${globally}.title`),
         description: this.site.mobileView
           ? null
@@ -33,7 +36,7 @@ export default DropdownSelectBoxComponent.extend({
         icon: "thumbtack"
       },
       {
-        id: "unpinned",
+        id: UNPINNED,
         name: I18n.t("topic_statuses.unpinned.title"),
         icon: "thumbtack unpinned",
         description: this.site.mobileView
@@ -43,15 +46,14 @@ export default DropdownSelectBoxComponent.extend({
     ];
   }),
 
-  actions: {
-    onSelect(value) {
-      const topic = this.topic;
+  @action
+  onChange(value) {
+    const topic = this.topic;
 
-      if (value === "unpinned") {
-        topic.clearPin();
-      } else {
-        topic.rePin();
-      }
+    if (value === UNPINNED) {
+      return topic.clearPin();
+    } else {
+      return topic.rePin();
     }
   }
 });
diff --git a/test/javascripts/components/select-kit/pinned-options-test.js.es6 b/test/javascripts/components/select-kit/pinned-options-test.js.es6
index 09bf69eb96..a32652498f 100644
--- a/test/javascripts/components/select-kit/pinned-options-test.js.es6
+++ b/test/javascripts/components/select-kit/pinned-options-test.js.es6
@@ -2,12 +2,12 @@ import selectKit from "helpers/select-kit-helper";
 import componentTest from "helpers/component-test";
 import Topic from "discourse/models/topic";
 
-const buildTopic = function() {
+const buildTopic = function(pinned = true) {
   return Topic.create({
     id: 1234,
     title: "Qunit Test Topic",
     deleted: false,
-    pinned: true
+    pinned
   });
 };
 
@@ -18,21 +18,38 @@ moduleForComponent("select-kit/pinned-options", {
   }
 });
 
-componentTest("updating the content refreshes the list", {
-  template: "{{pinned-options value=pinned topic=topic}}",
+componentTest("unpinning", {
+  template: "{{pinned-options value=topic.pinned topic=topic}}",
 
   beforeEach() {
     this.siteSettings.automatically_unpin_topics = false;
     this.set("topic", buildTopic());
-    this.set("pinned", "pinned");
   },
 
   async test(assert) {
     assert.equal(this.subject.header().name(), "pinned");
 
-    // we do it manually as clearPin is an ajax call
-    await this.set("pinned", false);
+    await this.subject.expand();
+    await this.subject.selectRowByValue("unpinned");
 
     assert.equal(this.subject.header().name(), "unpinned");
   }
 });
+
+componentTest("pinning", {
+  template: "{{pinned-options value=topic.pinned topic=topic}}",
+
+  beforeEach() {
+    this.siteSettings.automatically_unpin_topics = false;
+    this.set("topic", buildTopic(false));
+  },
+
+  async test(assert) {
+    assert.equal(this.subject.header().name(), "unpinned");
+
+    await this.subject.expand();
+    await this.subject.selectRowByValue("pinned");
+
+    assert.equal(this.subject.header().name(), "pinned");
+  }
+});

From 020c1b9cf354b8e84d23bed399baef8c3e4eaece Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 10 Mar 2020 12:22:56 +0100
Subject: [PATCH 050/633] FIX: correctly checks if component is in modal
 (#9157)

---
 app/assets/javascripts/select-kit/components/select-kit.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 25aa3e68e7..39e167a24e 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -816,7 +816,7 @@ export default Component.extend(
 
         let placementStrategy = this.selectKit.options.placementStrategy;
         if (!placementStrategy) {
-          placementStrategy = this.inModal ? "fixed" : "absolute";
+          placementStrategy = inModal ? "fixed" : "absolute";
         }
 
         /* global Popper:true */

From 826b4793c085bff591b5b4d67672207350e9cfac Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Tue, 10 Mar 2020 08:56:42 -0300
Subject: [PATCH 051/633] FEATURE: Approve suspect users is now true by
 default. The suspect users list was removed (#9151)

---
 .../admin/templates/users-list.hbs            |  1 -
 app/jobs/scheduled/enqueue_suspect_users.rb   |  9 ++++++--
 config/locales/client.en.yml                  |  2 --
 config/site_settings.yml                      |  2 +-
 lib/admin_user_index_query.rb                 | 11 ----------
 .../components/admin_user_index_query_spec.rb | 21 -------------------
 .../acceptance/admin-users-list-test.js.es6   |  4 ++--
 .../helpers/create-pretender.js.es6           |  2 +-
 8 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
index b533e10d92..2e1fe0c3ab 100644
--- a/app/assets/javascripts/admin/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/templates/users-list.hbs
@@ -6,7 +6,6 @@
       {{nav-item route='adminUsersList.show' routeParam='staff' label='admin.users.nav.staff'}}
       {{nav-item route='adminUsersList.show' routeParam='suspended' label='admin.users.nav.suspended'}}
       {{nav-item route='adminUsersList.show' routeParam='silenced' label='admin.users.nav.silenced'}}
-      {{nav-item route='adminUsersList.show' routeParam='suspect' label='admin.users.nav.suspect'}}
       {{nav-item route='adminUsersList.show' routeParam='staged' label='admin.users.nav.staged'}}
       {{nav-item route='groups' label='groups.index.title'}}
 
diff --git a/app/jobs/scheduled/enqueue_suspect_users.rb b/app/jobs/scheduled/enqueue_suspect_users.rb
index 529dd058c0..9fc5196d82 100644
--- a/app/jobs/scheduled/enqueue_suspect_users.rb
+++ b/app/jobs/scheduled/enqueue_suspect_users.rb
@@ -7,8 +7,13 @@ module Jobs
     def execute(_args)
       return unless SiteSetting.approve_suspect_users
 
-      users = AdminUserIndexQuery.new
-        .suspect_users
+      users = User
+        .activated
+        .human_users
+        .joins(:user_profile, :user_stat)
+        .where("users.created_at <= ?", 1.day.ago)
+        .where("LENGTH(COALESCE(user_profiles.bio_raw, user_profiles.website, '')) > 0")
+        .where("user_stats.posts_read_count <= 1 AND user_stats.topics_entered <= 1")
         .joins("LEFT OUTER JOIN reviewables r ON r.target_id = users.id AND r.target_type = 'User'")
         .where('r.id IS NULL')
         .limit(10)
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 5b632f3bfd..dfee767514 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4141,7 +4141,6 @@ en:
           staff: "Staff"
           suspended: "Suspended"
           silenced: "Silenced"
-          suspect: "Suspect"
           staged: "Staged"
         approved: "Approved?"
         titles:
@@ -4158,7 +4157,6 @@ en:
           moderators: "Moderators"
           silenced: "Silenced Users"
           suspended: "Suspended Users"
-          suspect: "Suspect Users"
           staged: "Staged Users"
         not_verified: "Not verified"
         check_email:
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 42acc80a84..07d0c5638d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -862,7 +862,7 @@ posting:
     default: 0
     enum: "TrustLevelSetting"
   approve_suspect_users:
-    default: false
+    default: true
   approve_unless_staged:
     default: false
   notify_about_queued_posts_after:
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index 74b5d403e9..4d04e61fd2 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -78,16 +78,6 @@ class AdminUserIndexQuery
     end
   end
 
-  def suspect_users
-    @query
-      .activated
-      .human_users
-      .joins(:user_profile, :user_stat)
-      .where("users.created_at <= ?", 1.day.ago)
-      .where("LENGTH(COALESCE(user_profiles.bio_raw, user_profiles.website, '')) > 0")
-      .where("user_stats.posts_read_count <= 1 AND user_stats.topics_entered <= 1")
-  end
-
   def filter_by_query_classification
     case params[:query]
     when 'staff'      then @query.where("admin or moderator")
@@ -96,7 +86,6 @@ class AdminUserIndexQuery
     when 'silenced'   then @query.silenced
     when 'suspended'  then @query.suspended
     when 'pending'    then @query.not_suspended.where(approved: false, active: true)
-    when 'suspect'    then suspect_users
     when 'staged'     then @query.where(staged: true)
     end
   end
diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb
index 8060066f88..971468523f 100644
--- a/spec/components/admin_user_index_query_spec.rb
+++ b/spec/components/admin_user_index_query_spec.rb
@@ -91,27 +91,6 @@ describe AdminUserIndexQuery do
 
   end
 
-  describe 'with a suspected user' do
-    fab!(:bot) { Fabricate(:active_user, id: -10, created_at: 1.day.ago) }
-    fab!(:regular_user) { Fabricate(:user, created_at: 1.day.ago) }
-    fab!(:user_with_bio) { Fabricate(:active_user, created_at: 1.day.ago) }
-    fab!(:user_with_website) { Fabricate(:user, created_at: 1.day.ago) }
-
-    before do
-      user_with_website.user_profile.website = 'https://example.com'
-      user_with_website.user_profile.save!
-    end
-
-    it 'finds the suspected user' do
-      bot
-      regular_user
-      user_with_bio
-      user_with_website
-      query = AdminUserIndexQuery.new(query: 'suspect')
-      expect(query.find_users).to contain_exactly(user_with_bio, user_with_website)
-    end
-  end
-
   describe "with a pending user" do
 
     fab!(:user) { Fabricate(:user, active: true, approved: false) }
diff --git a/test/javascripts/acceptance/admin-users-list-test.js.es6 b/test/javascripts/acceptance/admin-users-list-test.js.es6
index feb470bdda..1c41fce169 100644
--- a/test/javascripts/acceptance/admin-users-list-test.js.es6
+++ b/test/javascripts/acceptance/admin-users-list-test.js.es6
@@ -59,7 +59,7 @@ QUnit.test("switching tabs", async assert => {
   const activeUser = "eviltrout";
   const suspectUser = "sam";
   const activeTitle = I18n.t("admin.users.titles.active");
-  const suspectTitle = I18n.t("admin.users.titles.suspect");
+  const suspectTitle = I18n.t("admin.users.titles.new");
 
   await visit("/admin/users/list/active");
 
@@ -70,7 +70,7 @@ QUnit.test("switching tabs", async assert => {
       .includes(activeUser)
   );
 
-  await click('a[href="/admin/users/list/suspect"]');
+  await click('a[href="/admin/users/list/new"]');
 
   assert.equal(find(".admin-title h2").text(), suspectTitle);
   assert.ok(
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index 76cca6fa51..934b6a652b 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -637,7 +637,7 @@ export function applyDefaultHandlers(pretender) {
     return response(200, store);
   });
 
-  pretender.get("/admin/users/list/suspect.json", () => {
+  pretender.get("/admin/users/list/new.json", () => {
     return response(200, [
       {
         id: 2,

From e69b6379ad6989555a4cd5cc335d1b550b18522d Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 10 Mar 2020 09:01:40 -0400
Subject: [PATCH 052/633] FEATURE: Broader support for post uploads in video
 markup (#9152)

Ensures URLs in the following HTML attributes are included in post uploads:
- video poster
- source src
- track src
---
 app/models/post.rb       |  3 ++-
 spec/models/post_spec.rb | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 751d8b721f..85432556e7 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -949,8 +949,9 @@ class Post < ActiveRecord::Base
     ]
 
     fragments ||= Nokogiri::HTML::fragment(self.cooked)
+    selectors = fragments.css("a/@href", "img/@src", "source/@src", "track/@src", "video/@poster")
 
-    links = fragments.css("a/@href", "img/@src").map do |media|
+    links = selectors.map do |media|
       src = media.value
       next if src.blank?
 
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index b7a97d7d2e..325f4febcc 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1528,6 +1528,9 @@ describe Post do
       upload2 = Fabricate(:upload)
       upload3 = Fabricate(:video_upload)
       upload4 = Fabricate(:upload)
+      upload5 = Fabricate(:upload)
+      upload6 = Fabricate(:video_upload)
+      upload7 = Fabricate(:upload, extension: "vtt")
 
       set_cdn_url "https://awesome.com/somepath"
 
@@ -1542,6 +1545,11 @@ describe Post do
       ![](http://example.com/external.png)
 
       #{Discourse.base_url}#{upload3.short_path}
+
+      <video poster="#{Discourse.base_url}#{upload5.url}">
+        <source src="#{Discourse.base_url}#{upload6.url}" type="video/mp4" />
+        <track src="#{Discourse.base_url}#{upload7.url}" label="English" kind="subtitles" srclang="en" default />
+      </video>
       RAW
 
       urls = []
@@ -1556,14 +1564,20 @@ describe Post do
         "#{GlobalSetting.cdn_url}#{upload1.url}",
         "#{GlobalSetting.cdn_url}#{upload4.url}",
         "#{Discourse.base_url}#{upload2.url}",
-        "#{Discourse.base_url}#{upload3.short_path}"
+        "#{Discourse.base_url}#{upload3.short_path}",
+        "#{Discourse.base_url}#{upload5.url}",
+        "#{Discourse.base_url}#{upload6.url}",
+        "#{Discourse.base_url}#{upload7.url}"
       )
 
       expect(paths).to contain_exactly(
         upload1.url,
         upload4.url,
         upload2.url,
-        nil
+        nil,
+        upload5.url,
+        upload6.url,
+        upload7.url
       )
     end
 

From 68328d2d647d7ee5039980003482a04d15511aa7 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 10 Mar 2020 09:37:54 -0400
Subject: [PATCH 053/633] DEV: Replace save-button partial with a component
 (#9066)

---
 .../components/save-controls.js.es6              |  7 ++++++-
 .../controllers/preferences/account.js.es6       |  3 +--
 .../controllers/preferences/categories.js.es6    |  3 +--
 .../controllers/preferences/emails.js.es6        |  3 +--
 .../controllers/preferences/interface.js.es6     |  3 +--
 .../controllers/preferences/notifications.js.es6 |  3 +--
 .../controllers/preferences/profile.js.es6       |  3 +--
 .../controllers/preferences/tags.js.es6          |  3 +--
 .../controllers/preferences/users.js.es6         |  3 +--
 .../mixins/preferences-tab-controller.js.es6     | 11 -----------
 .../templates/components/save-controls.hbs       |  9 ++++-----
 .../discourse/templates/preferences/account.hbs  |  6 +-----
 .../templates/preferences/categories.hbs         |  6 +-----
 .../discourse/templates/preferences/emails.hbs   |  6 +-----
 .../templates/preferences/interface.hbs          |  6 +-----
 .../templates/preferences/notifications.hbs      |  6 +-----
 .../discourse/templates/preferences/profile.hbs  |  6 +-----
 .../discourse/templates/preferences/tags.hbs     |  7 ++-----
 .../discourse/templates/preferences/users.hbs    |  7 ++-----
 .../templates/user/preferences/_save-button.hbs  | 11 -----------
 .../stylesheets/common/admin/admin_base.scss     |  5 +----
 .../acceptance/admin-site-text-test.js.es6       |  7 +++----
 .../acceptance/preferences-test.js.es6           | 16 ++++++++--------
 23 files changed, 40 insertions(+), 100 deletions(-)
 rename app/assets/javascripts/{admin => discourse}/components/save-controls.js.es6 (72%)
 delete mode 100644 app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
 rename app/assets/javascripts/{admin => discourse}/templates/components/save-controls.hbs (50%)
 delete mode 100644 app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs

diff --git a/app/assets/javascripts/admin/components/save-controls.js.es6 b/app/assets/javascripts/discourse/components/save-controls.js.es6
similarity index 72%
rename from app/assets/javascripts/admin/components/save-controls.js.es6
rename to app/assets/javascripts/discourse/components/save-controls.js.es6
index 9da4e49fe2..d6d7d01e26 100644
--- a/app/assets/javascripts/admin/components/save-controls.js.es6
+++ b/app/assets/javascripts/discourse/components/save-controls.js.es6
@@ -3,10 +3,15 @@ import { or } from "@ember/object/computed";
 import Component from "@ember/component";
 
 export default Component.extend({
-  classNames: ["controls"],
+  classNames: ["controls", "save-button"],
 
   buttonDisabled: or("model.isSaving", "saveDisabled"),
 
+  didInsertElement() {
+    this._super(...arguments);
+    this.set("saved", false);
+  },
+
   @discourseComputed("model.isSaving")
   savingText(saving) {
     return saving ? "saving" : "save";
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 6cac06c1aa..463d5b9283 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -3,7 +3,6 @@ import Controller from "@ember/controller";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import discourseComputed from "discourse-common/utils/decorators";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
@@ -15,7 +14,7 @@ import logout from "discourse/lib/logout";
 // Number of tokens shown by default.
 const DEFAULT_AUTH_TOKENS_COUNT = 2;
 
-export default Controller.extend(CanCheckEmails, PreferencesTabController, {
+export default Controller.extend(CanCheckEmails, {
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
index 4628234524..13baaf6fd2 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
@@ -1,10 +1,9 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { or } from "@ember/object/computed";
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
index 2f7d0832c9..880b50f7bd 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
@@ -1,6 +1,5 @@
 import { equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
@@ -10,7 +9,7 @@ const EMAIL_LEVELS = {
   NEVER: 2
 };
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   emailMessagesLevelAway: equal(
     "model.user_option.email_messages_level",
     EMAIL_LEVELS.ONLY_WHEN_AWAY
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index 1fbed8353b..ea68080ccd 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -1,6 +1,5 @@
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { setDefaultHomepage } from "discourse/lib/utilities";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import {
@@ -27,7 +26,7 @@ const USER_HOMES = {
 const TEXT_SIZES = ["smaller", "normal", "larger", "largest"];
 const TITLE_COUNT_MODES = ["notifications", "contextual"];
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   @discourseComputed("makeThemeDefault")
   saveAttrNames(makeDefault) {
     let attrs = [
diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
index 8030885efb..078d0b3fbb 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
@@ -1,9 +1,8 @@
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
index f6005e355d..57d8759ac8 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
@@ -2,13 +2,12 @@ import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { cookAsync } from "discourse/lib/text";
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
index 1aede6792d..90d41ccfa1 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
@@ -1,9 +1,8 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
index ba3e866901..b0ac026025 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
@@ -2,10 +2,9 @@ import { makeArray } from "discourse-common/lib/helpers";
 import { alias, gte, or } from "@ember/object/computed";
 import { action, computed } from "@ember/object";
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   ignoredUsernames: alias("model.ignored_usernames"),
   userIsMemberOrAbove: gte("model.trust_level", 2),
   ignoredEnabled: or("userIsMemberOrAbove", "model.staff"),
diff --git a/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6 b/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
deleted file mode 100644
index 4dabeb3fa0..0000000000
--- a/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
+++ /dev/null
@@ -1,11 +0,0 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import Mixin from "@ember/object/mixin";
-
-export default Mixin.create({
-  saved: false,
-
-  @discourseComputed("model.isSaving")
-  saveButtonText(isSaving) {
-    return isSaving ? I18n.t("saving") : I18n.t("save");
-  }
-});
diff --git a/app/assets/javascripts/admin/templates/components/save-controls.hbs b/app/assets/javascripts/discourse/templates/components/save-controls.hbs
similarity index 50%
rename from app/assets/javascripts/admin/templates/components/save-controls.hbs
rename to app/assets/javascripts/discourse/templates/components/save-controls.hbs
index d6974ea108..013cb6e0b7 100644
--- a/app/assets/javascripts/admin/templates/components/save-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/save-controls.hbs
@@ -1,7 +1,6 @@
 {{d-button action=action disabled=buttonDisabled label=savingText class="btn-primary save-changes"}}
+{{#if saved}}
+  <span class='saved'>{{i18n 'saved'}}</span>
+{{/if}}
+
 {{yield}}
-<div class='save-messages'>
-  {{#if saved}}
-    <div class='saved'>{{i18n 'saved'}}</div>
-  {{/if}}
-</div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 2fe58dbf59..8a505401fa 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -215,11 +215,7 @@
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
 {{#if canSaveUser}}
-  <div class="control-group save-button">
-    <div class="controls">
-      {{partial 'user/preferences/save-button'}}
-    </div>
-  </div>
+  {{save-controls model=model action=(action "save") saved=saved}}
 {{/if}}
 
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index 2eef6ceac7..b0fc96c15b 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -62,11 +62,7 @@
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
 {{#if canSave}}
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+  {{save-controls model=model action=(action "save") saved=saved}}
 {{else}}
   {{i18n 'user.no_category_access'}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index ef99c5be12..d277cea511 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -93,8 +93,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+{{save-controls model=model action=(action "save") saved=saved}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index d3493d0127..338a7d883e 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -99,8 +99,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+{{save-controls model=model action=(action "save") saved=saved}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index 9b1b8b9858..03ca349d67 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -68,8 +68,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+{{save-controls model=model action=(action "save") saved=saved}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index 1a1909983b..b0040894dc 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -95,8 +95,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+{{save-controls model=model action=(action "save") saved=saved}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
index 5aa4ced4b2..906d7761c0 100644
--- a/app/assets/javascripts/discourse/templates/preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
@@ -59,9 +59,6 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+{{save-controls model=model action=(action "save") saved=saved}}
+
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/users.hbs b/app/assets/javascripts/discourse/templates/preferences/users.hbs
index 5080437149..d4c183c3a0 100644
--- a/app/assets/javascripts/discourse/templates/preferences/users.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/users.hbs
@@ -27,8 +27,5 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+
+{{#save-controls model=model action=(action "save") saved=saved}}{{/save-controls}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs b/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs
deleted file mode 100644
index c218e4e444..0000000000
--- a/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-{{#d-button
-  class="btn-primary save-user"
-  action=(action "save")
-  disabled=model.isSaving
-}}
-  {{saveButtonText}}
-{{/d-button}}
-
-{{#if saved}}
-  <span class='saved-user'>{{i18n 'saved'}}</span>
-{{/if}}
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 2af39f5675..61f73bc2b2 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -244,7 +244,7 @@ $mobile-breakpoint: 700px;
       width: 100%;
       max-width: 800px;
     }
-    .save-messages,
+    .save-button,
     .title {
       margin-bottom: 1em;
     }
@@ -423,9 +423,6 @@ $mobile-breakpoint: 700px;
   }
   .controls {
     @include clearfix;
-    .save-messages {
-      margin-top: 1em;
-    }
   }
 }
 
diff --git a/test/javascripts/acceptance/admin-site-text-test.js.es6 b/test/javascripts/acceptance/admin-site-text-test.js.es6
index ea8c8c5d90..0f25de85d0 100644
--- a/test/javascripts/acceptance/admin-site-text-test.js.es6
+++ b/test/javascripts/acceptance/admin-site-text-test.js.es6
@@ -27,15 +27,14 @@ QUnit.test("edit and revert a site text by key", async assert => {
   await visit("/admin/customize/site_texts/site.test");
 
   assert.equal(find(".title h3").text(), "site.test");
-  assert.ok(!exists(".save-messages .saved"));
-  assert.ok(!exists(".save-messages .saved"));
+  assert.ok(!exists(".saved"));
   assert.ok(!exists(".revert-site-text"));
 
   // Change the value
   await fillIn(".site-text-value", "New Test Value");
   await click(".save-changes");
 
-  assert.ok(exists(".save-messages .saved"));
+  assert.ok(exists(".saved"));
   assert.ok(exists(".revert-site-text"));
 
   // Revert the changes
@@ -45,6 +44,6 @@ QUnit.test("edit and revert a site text by key", async assert => {
 
   await click(".bootbox.modal .btn-primary");
 
-  assert.ok(!exists(".save-messages .saved"));
+  assert.ok(!exists(".saved"));
   assert.ok(!exists(".revert-site-text"));
 });
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index 46b11864ed..66af8348ab 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -77,10 +77,10 @@ QUnit.test("update some fields", async assert => {
   assert.ok(exists(".user-preferences"), "it shows the preferences");
 
   const savePreferences = async () => {
-    assert.ok(!exists(".saved-user"), "it hasn't been saved yet");
-    await click(".save-user");
-    assert.ok(exists(".saved-user"), "it displays the saved message");
-    find(".saved-user").remove();
+    assert.ok(!exists(".saved"), "it hasn't been saved yet");
+    await click(".save-changes");
+    assert.ok(exists(".saved"), "it displays the saved message");
+    find(".saved").remove();
   };
 
   fillIn(".pref-name input[type=text]", "Jon Snow");
@@ -124,10 +124,10 @@ QUnit.test("font size change", async assert => {
   $.removeCookie("text_size");
 
   const savePreferences = async () => {
-    assert.ok(!exists(".saved-user"), "it hasn't been saved yet");
-    await click(".save-user");
-    assert.ok(exists(".saved-user"), "it displays the saved message");
-    find(".saved-user").remove();
+    assert.ok(!exists(".saved"), "it hasn't been saved yet");
+    await click(".save-changes");
+    assert.ok(exists(".saved"), "it displays the saved message");
+    find(".saved").remove();
   };
 
   await visit("/u/eviltrout/preferences/interface");

From 25b74e252b1fef7c1675c2ae55bb164ffcc424f9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2020 10:14:52 -0400
Subject: [PATCH 054/633] Build(deps): Bump aws-sdk-s3 from 1.60.2 to 1.61.0
 (#9153)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.60.2 to 1.61.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.60.2...v1.61.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5d4ea41328..cc20805a01 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,16 +45,16 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.272.0)
-    aws-sdk-core (3.89.1)
+    aws-partitions (1.281.0)
+    aws-sdk-core (3.91.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.29.0)
+    aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.60.2)
+    aws-sdk-s3 (1.61.0)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)

From 08b992d2572cb035f36a79cd93a105289f401469 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2020 10:20:34 -0400
Subject: [PATCH 055/633] Build(deps): Bump aws-sdk-sns from 1.21.0 to 1.22.0
 (#9154)

Bumps [aws-sdk-sns](https://github.com/aws/aws-sdk-ruby) from 1.21.0 to 1.22.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-sns/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.21.0...1.22.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cc20805a01..e00fc70b37 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.21.0)
+    aws-sdk-sns (1.22.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.1)

From aec26ad2f01d6aa4b590878658f98fad38650e41 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 10 Mar 2020 15:35:40 +0100
Subject: [PATCH 056/633] FIX: Preserve TopicCreator's timestamp resolution
 (#9158)

Continuation of #9140 (e35bc8b). It's the last piece required for #9141.
---
 lib/topic_creator.rb                  | 12 +++++++++--
 spec/components/topic_creator_spec.rb | 30 ++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 654fc716f4..41558784f3 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -118,9 +118,9 @@ class TopicCreator
 
     topic_params[:category_id] = category.id if category.present?
 
-    topic_params[:created_at] = Time.zone.parse(@opts[:created_at].to_s) if @opts[:created_at].present?
+    topic_params[:created_at] = convert_time(@opts[:created_at]) if @opts[:created_at].present?
 
-    topic_params[:pinned_at] = Time.zone.parse(@opts[:pinned_at].to_s) if @opts[:pinned_at].present?
+    topic_params[:pinned_at] = convert_time(@opts[:pinned_at]) if @opts[:pinned_at].present?
     topic_params[:pinned_globally] = @opts[:pinned_globally] if @opts[:pinned_globally].present?
 
     if SiteSetting.topic_featured_link_enabled && @opts[:featured_link].present? && @guardian.can_edit_featured_link?(topic_params[:category_id])
@@ -130,6 +130,14 @@ class TopicCreator
     topic_params
   end
 
+  def convert_time(timestamp)
+    if timestamp.is_a?(Time)
+      timestamp
+    else
+      Time.zone.parse(timestamp.to_s)
+    end
+  end
+
   def find_category
     @category ||= begin
       # PM can't have a category
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index 36a8717b9a..d13d48c3f0 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -3,7 +3,6 @@
 require 'rails_helper'
 
 describe TopicCreator do
-
   fab!(:user)      { Fabricate(:user, trust_level: TrustLevel[2]) }
   fab!(:moderator) { Fabricate(:moderator) }
   fab!(:admin)     { Fabricate(:admin) }
@@ -237,5 +236,34 @@ describe TopicCreator do
         end
       end
     end
+
+    context 'setting timestamps' do
+      it 'supports Time instances' do
+        freeze_time
+
+        topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(
+          created_at: 1.week.ago,
+          pinned_at: 3.days.ago
+        ))
+
+        expect(topic.created_at).to be_within(1.second).of(1.week.ago)
+        expect(topic.pinned_at).to be_within(1.second).of(3.days.ago)
+      end
+
+      it 'supports strings' do
+        freeze_time
+
+        time1 = Time.zone.parse('2019-09-02')
+        time2 = Time.zone.parse('2020-03-10 15:17')
+
+        topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(
+          created_at: '2019-09-02',
+          pinned_at: '2020-03-10 15:17'
+        ))
+
+        expect(topic.created_at).to be_within(1.second).of(time1)
+        expect(topic.pinned_at).to be_within(1.second).of(time2)
+      end
+    end
   end
 end

From d436b600fba4cea846a5e96c235c507441965e05 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 10 Mar 2020 16:46:57 +0100
Subject: [PATCH 057/633] DEV: enforces ember-template-lint: no-triple-curlies
 (#9150)

This pr replaces `{{{ }}}` usage by a {{html-safe}} helper. While it doesn't solve the underlying issue, it gives us a path forward without risking breaking too much existing behavior.

Also introduces an htmlSafe computed macro:

```
import { htmlSafe } from "discourse/lib/computed";

htmlDescription: htmlSafe("description")
```

Overtime {{html-safe}} usage should be removed and moved to components properties or specialized components/helpers.
---
 .template-lintrc.js                           |  3 +-
 .../admin/templates/badges-award.hbs          |  6 +-
 .../admin/templates/badges-index.hbs          |  2 +-
 .../components/admin-report-storage-stats.hbs |  2 +-
 .../components/admin-report-table-cell.hbs    |  2 +-
 .../templates/components/admin-report.hbs     |  2 +-
 .../components/admin-user-field-item.hbs      |  2 +-
 .../components/penalty-post-action.hbs        |  2 +-
 .../templates/components/silence-details.hbs  |  2 +-
 .../components/site-settings/bool.hbs         |  2 +-
 .../site-settings/category-list.hbs           |  2 +-
 .../components/site-settings/category.hbs     |  2 +-
 .../components/site-settings/color.hbs        |  2 +-
 .../components/site-settings/compact-list.hbs |  2 +-
 .../components/site-settings/enum.hbs         |  2 +-
 .../components/site-settings/group-list.hbs   |  2 +-
 .../components/site-settings/host-list.hbs    |  2 +-
 .../components/site-settings/list.hbs         |  2 +-
 .../components/site-settings/secret-list.hbs  |  2 +-
 .../components/site-settings/string.hbs       |  2 +-
 .../components/site-settings/tag-list.hbs     |  2 +-
 .../components/site-settings/upload.hbs       |  2 +-
 .../site-settings/uploaded-image-list.hbs     |  2 +-
 .../components/site-settings/url-list.hbs     |  2 +-
 .../components/site-settings/value-list.hbs   |  2 +-
 .../components/suspension-details.hbs         |  4 +-
 .../templates/components/themes-list-item.hbs |  6 +-
 .../templates/components/themes-list.hbs      |  6 +-
 .../templates/customize-themes-index.hbs      |  4 +-
 .../admin/templates/customize-themes-show.hbs |  2 +-
 .../admin/templates/dashboard-problems.hbs    |  2 +-
 .../admin/templates/dashboard_general.hbs     |  2 +-
 .../admin/templates/email-advanced-test.hbs   |  4 +-
 .../admin/templates/email-preview-digest.hbs  |  2 +-
 .../javascripts/admin/templates/embedding.hbs |  2 +-
 .../templates/logs/staff-action-logs.hbs      |  2 +-
 .../templates/modal/admin-badge-preview.hbs   |  8 +-
 .../templates/modal/admin-install-theme.hbs   |  8 +-
 .../templates/modal/admin-theme-change.hbs    |  2 +-
 .../templates/modal/admin-theme-item.hbs      |  2 +-
 .../admin/templates/search-logs-term.hbs      |  4 +-
 .../admin/templates/user-index.hbs            |  8 +-
 .../admin/templates/users-list-show.hbs       |  8 +-
 .../discourse-common/helpers/html-safe.js.es6 |  6 ++
 .../discourse-common/helpers/i18n.js.es6      |  3 +-
 .../discourse/components/text-overflow.js.es6 | 11 +++
 .../discourse/helpers/application.js.es6      | 12 +--
 .../discourse/helpers/dir-span.js.es6         |  3 +-
 .../discourse/helpers/format-age.js.es6       |  5 +-
 .../javascripts/discourse/lib/computed.js.es6 | 16 ++++
 .../javascripts/discourse/templates/about.hbs |  2 +-
 .../templates/account-created/index.hbs       |  2 +-
 .../templates/account-created/resent.hbs      |  2 +-
 .../discourse/templates/badges/show.hbs       |  2 +-
 .../templates/components/about-page-users.hbs |  2 +-
 .../templates/components/badge-card.hbs       |  2 +-
 .../templates/components/categories-boxes.hbs |  2 +-
 .../templates/components/categories-only.hbs  |  8 +-
 .../templates/components/d-button.hbs         |  2 +-
 .../templates/components/d-editor.hbs         |  2 +-
 .../templates/components/discourse-banner.hbs |  4 +-
 .../components/discourse-linked-text.hbs      |  2 +-
 .../components/edit-category-general.hbs      |  6 +-
 .../components/edit-category-security.hbs     |  2 +-
 .../templates/components/featured-topic.hbs   |  4 +-
 .../templates/components/flag-action-type.hbs |  4 +-
 .../templates/components/footer-message.hbs   |  2 +-
 .../templates/components/global-notice.hbs    |  4 +-
 .../components/group-card-contents.hbs        |  2 +-
 .../templates/components/group-post.hbs       |  6 +-
 .../templates/components/invite-panel.hbs     |  4 +-
 .../templates/components/ip-lookup.hbs        |  2 +-
 .../components/mobile-category-topic.hbs      |  2 +-
 .../templates/components/related-messages.hbs |  2 +-
 .../reviewable-conversation-post.hbs          |  2 +-
 .../components/reviewable-flagged-post.hbs    |  2 +-
 .../templates/components/reviewable-item.hbs  |  2 +-
 .../templates/components/reviewable-score.hbs |  2 +-
 .../components/second-factor-form.hbs         |  2 +-
 .../templates/components/share-panel.hbs      |  2 +-
 .../templates/components/share-popup.hbs      |  2 +-
 .../templates/components/share-source.hbs     |  2 +-
 .../components/shared-draft-controls.hbs      |  2 +-
 .../templates/components/suggested-topics.hbs |  2 +-
 .../templates/components/tag-info.hbs         |  2 +-
 .../templates/components/text-overflow.hbs    |  2 +-
 .../templates/components/topic-entrance.hbs   |  4 +-
 .../components/user-card-contents.hbs         |  2 +-
 .../components/user-fields/confirm.hbs        |  4 +-
 .../components/user-fields/dropdown.hbs       |  4 +-
 .../templates/components/user-fields/text.hbs |  4 +-
 .../templates/components/user-stat.hbs        |  2 +-
 .../templates/components/user-stream-item.hbs |  8 +-
 .../components/user-summary-topic.hbs         |  2 +-
 .../discourse/templates/composer.hbs          |  4 +-
 .../templates/composer/custom-body.hbs        |  2 +-
 .../templates/composer/education.hbs          |  2 +-
 .../templates/composer/group-mentioned.hbs    |  2 +-
 .../discourse/templates/discovery.hbs         |  2 +-
 .../discourse/templates/full-page-search.hbs  |  6 +-
 .../javascripts/discourse/templates/group.hbs |  2 +-
 .../discourse/templates/groups/index.hbs      |  2 +-
 .../discourse/templates/invites/show.hbs      |  4 +-
 .../templates/list/activity-column.hbr        |  2 +-
 .../templates/list/topic-excerpt.hbr          |  2 +-
 .../mobile/components/basic-topic-list.hbs    |  4 +-
 .../mobile/components/categories-only.hbs     |  2 +-
 .../mobile/components/mobile-nav.hbs          |  2 +-
 .../templates/modal/activation-resent.hbs     |  2 +-
 .../discourse/templates/modal/auth-token.hbs  |  6 +-
 .../templates/modal/avatar-selector.hbs       |  6 +-
 .../discourse/templates/modal/bookmark.hbs    |  2 +-
 .../modal/bulk-notification-level.hbs         |  2 +-
 .../templates/modal/change-owner.hbs          |  2 +-
 .../templates/modal/create-account.hbs        |  2 +-
 .../modal/delete-topic-disallowed.hbs         |  2 +-
 .../templates/modal/edit-category.hbs         |  2 +-
 .../templates/modal/feature-topic.hbs         | 22 ++---
 .../templates/modal/forgot-password.hbs       |  2 +-
 .../discourse/templates/modal/history.hbs     | 10 +-
 .../modal/keyboard-shortcuts-help.hbs         | 94 +++++++++----------
 .../templates/modal/move-to-topic.hbs         | 10 +-
 .../templates/modal/not-activated.hbs         |  2 +-
 .../templates/modal/post-enqueued.hbs         |  2 +-
 .../modal/second-factor-add-security-key.hbs  |  2 +-
 .../modal/second-factor-add-totp.hbs          |  4 +-
 .../modal/second-factor-backup-edit.hbs       |  2 +-
 .../templates/modal/topic-bulk-actions.hbs    |  2 +-
 .../templates/navigation/category.hbs         |  2 +-
 .../templates/preferences-second-factor.hbs   |  2 +-
 .../templates/preferences/account.hbs         |  2 +-
 .../templates/preferences/emails.hbs          |  2 +-
 .../templates/preferences/profile.hbs         |  2 +-
 .../discourse/templates/static.hbs            |  2 +-
 .../javascripts/discourse/templates/topic.hbs |  6 +-
 .../discourse/templates/unknown.hbs           |  2 +-
 .../discourse/templates/user-invited-show.hbs |  8 +-
 .../javascripts/discourse/templates/user.hbs  |  4 +-
 .../discourse/templates/user/stream.hbs       |  2 +-
 .../discourse/templates/user/summary.hbs      |  2 +-
 .../templates/components/category-row.hbs     |  4 +-
 .../dropdown-select-box-row.hbs               |  4 +-
 .../templates/components/pinned-button.hbs    |  2 +-
 .../components/topic-notifications-button.hbs |  2 +-
 .../templates/components/radio-button.hbs     |  2 +-
 .../templates/components/wizard-field.hbs     |  4 +-
 .../templates/components/wizard-step.hbs      |  2 +-
 .../templates/discourse_topic_onebox.hbs      |  6 +-
 .../templates/discourse_user_onebox.hbs       | 10 +-
 .../discourse-local-dates-create-form.hbs     |  2 +-
 .../components/html-safe-helper-test.js.es6   | 14 +++
 test/javascripts/lib/computed-test.js.es6     | 12 ++-
 152 files changed, 345 insertions(+), 284 deletions(-)
 create mode 100644 app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
 create mode 100644 test/javascripts/components/html-safe-helper-test.js.es6

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 6783c6d94e..29bf420298 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -11,6 +11,7 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unused-block-params": true,
     "no-unbound": true,
-    "simple-unless": true
+    "simple-unless": true,
+    "no-triple-curlies": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/badges-award.hbs b/app/assets/javascripts/admin/templates/badges-award.hbs
index b13462bf33..d0082dc349 100644
--- a/app/assets/javascripts/admin/templates/badges-award.hbs
+++ b/app/assets/javascripts/admin/templates/badges-award.hbs
@@ -9,11 +9,11 @@
           {{icon-or-image model}}
           <span class="badge-display-name">{{model.name}}</span>
         {{else}}
-          <span class='badge-placeholder'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+          <span class='badge-placeholder'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
         {{/if}}
       </div>
       <div>
-        <h4>{{I18n 'admin.badges.mass_award.upload_csv'}}</h4>
+        <h4>{{i18n 'admin.badges.mass_award.upload_csv'}}</h4>
         <input type='file' id='massAwardCSVUpload' accept='.csv'>
       </div>
       <div>
@@ -34,6 +34,6 @@
       {{/link-to}}
     </form>
   {{else}}
-    <span class='badge-required'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+    <span class='badge-required'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index fd08e67279..49c5945ea1 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -7,7 +7,7 @@
         {{#each badgeIntroLinks as |link|}}
           <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
             {{d-icon link.icon}}
-            <span>{{I18n link.text}}</span>
+            <span>{{i18n link.text}}</span>
           </a>
         {{/each}}
       </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index fbb9f80a64..d6e42cd414 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -15,7 +15,7 @@
 
       {{#if backupStats.last_backup_taken_at}}
         <br>
-        {{{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}}
+        {{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}
       {{/if}}
     </p>
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
index 973e8412be..fb8f2e4cdc 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
@@ -1 +1 @@
-{{{formatedValue}}}
+{{html-safe formatedValue}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index be9c2ee8d7..48bd58cab9 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -199,6 +199,6 @@
 {{/conditional-loading-section}}
 {{else}}
   <div class="alert alert-info">
-    {{{disabledLabel}}}
+    {{html-safe disabledLabel}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index 269d6babc2..211cc00b51 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -46,7 +46,7 @@
     <div class="form-display">
       <strong>{{userField.name}}</strong>
       <br>
-      {{{userField.description}}}
+      {{html-safe userField.description}}
     </div>
     <div class="form-display">{{fieldName}}</div>
     <div class="form-element controls">
diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
index 1a672329cd..a6c848541f 100644
--- a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
+++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
@@ -1,7 +1,7 @@
 <div class='penalty-post-controls'>
   <label>
     <div class='penalty-post-label'>
-      {{{i18n 'admin.user.penalty_post_actions'}}}
+      {{i18n 'admin.user.penalty_post_actions'}}
     </div>
   </label>
   {{combo-box
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index 3f7c19d5ba..af1b4980d5 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -1,7 +1,7 @@
 <div class='reason-controls'>
   <label>
     <div class='silence-reason-label'>
-      {{{i18n 'admin.user.silence_reason_label'}}}
+      {{i18n 'admin.user.silence_reason_label'}}
     </div>
     </label>
     {{text-field
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
index 1c6c2101ae..11384580c1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
@@ -1,5 +1,5 @@
 <label>
   {{input type="checkbox" checked=enabled}}
-  <span>{{{setting.description}}}</span>
+  <span>{{html-safe setting.description}}</span>
   {{setting-validation-message message=validationMessage}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index 6d8871b306..b9609e2843 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -3,5 +3,5 @@
   onChange=(action "onChangeSelectedCategories")
 }}
 
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
index 4f23fcc021..4358b408de 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
@@ -4,4 +4,4 @@
   onChange=(action (mut value))
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
index baf81ab389..7b9b5bf2a8 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
@@ -6,4 +6,4 @@
   onChangeColor=(action "onChangeColor")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class="desc">{{{setting.description}}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
index 621baec0b1..1e7e369b93 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
@@ -8,4 +8,4 @@
 }}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index dc33e28df5..0b4104086e 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -15,5 +15,5 @@
 {{setting-validation-message message=validationMessage}}
 
 <div class='desc'>
-  {{{setting.description}}}
+  {{html-safe setting.description}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
index 8f4263a72e..091573eb53 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
@@ -7,4 +7,4 @@
   onChange=(action "onChangeGroupListSetting")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
index 5277c26c69..70366aba38 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_host"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
index 268723c92d..090cc2a5f1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value inputDelimiter="|" choices=setting.choices}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
index a4ff6f1bd4..7451959841 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
@@ -1,3 +1,3 @@
 {{secret-value-list setting=setting values=value isSecret=isSecret}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index d71278f723..160f041df9 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -7,4 +7,4 @@
 {{/if}}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 271e4d0326..21e7e1ab0a 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
 {{tag-chooser tags=selectedTags}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
index 86940d8633..2758b7be5a 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
@@ -1,2 +1,2 @@
 {{site-settings-image-uploader imageUrl=value placeholderUrl=setting.placeholder type="site_setting"}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
index 82dc38d653..146c9d3722 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,2 +1,2 @@
 {{d-button label="admin.site_settings.uploaded_image_list.label" action=(action "showUploadModal") actionParam=(hash value=value setting=setting)}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
index 67db58f8ea..7a6cdc517b 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_url"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
index 3003b375ee..234ec83f3c 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
index 0f2aa0fc84..4dcc606b2b 100644
--- a/app/assets/javascripts/admin/templates/components/suspension-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -2,9 +2,9 @@
   <label>
     <div class='suspend-reason-label'>
       {{#if siteSettings.hide_suspension_reasons}}
-        {{{i18n 'admin.user.suspend_reason_hidden_label'}}}
+        {{i18n 'admin.user.suspend_reason_hidden_label'}}
       {{else}}
-        {{{i18n 'admin.user.suspend_reason_label'}}}
+        {{i18n 'admin.user.suspend_reason_label'}}
       {{/if}}
     </div>
   </label>
diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
index 1286937f8a..0c253e0214 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
@@ -28,14 +28,14 @@
 
   {{#if displayComponents}}
     <div class="components-list">
-      <span class="components">{{{childrenString}}}</span>
+      <span class="components">{{html-safe childrenString}}</span>
 
       {{#if displayHasMore}}
         <a href {{action "toggleChildrenExpanded"}} class="others-count">
           {{#if childrenExpanded}}
-            {{I18n "admin.customize.theme.collapse"}}
+            {{i18n "admin.customize.theme.collapse"}}
           {{else}}
-            {{I18n "admin.customize.theme.and_x_more" count=moreCount}}
+            {{i18n "admin.customize.theme.and_x_more" count=moreCount}}
           {{/if}}
         </a>
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
index 29935b95b8..4654371a23 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -25,9 +25,9 @@
         <div class="themes-list-item inactive-indicator">
           <span class="empty">
             {{#if themesTabActive}}
-              {{I18n "admin.customize.theme.inactive_themes"}}
+              {{i18n "admin.customize.theme.inactive_themes"}}
             {{else}}
-              {{I18n "admin.customize.theme.inactive_components"}}
+              {{i18n "admin.customize.theme.inactive_components"}}
             {{/if}}
           </span>
         </div>
@@ -41,7 +41,7 @@
     {{/if}}
   {{else}}
     <div class="themes-list-item">
-      <span class="empty">{{I18n "admin.customize.theme.empty"}}</span>
+      <span class="empty">{{i18n "admin.customize.theme.empty"}}</span>
     </div>
   {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 0a6060724b..32ad33db10 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -1,7 +1,7 @@
 <div class="themes-intro admin-intro">
   <img src={{womanArtistEmojiURL}}>
   <div class="content-wrapper">
-    <h1>{{I18n "admin.customize.theme.themes_intro"}}</h1>
+    <h1>{{i18n "admin.customize.theme.themes_intro"}}</h1>
      <div class="create-actions">
       {{d-button action=(route-action "installModal") icon="upload" label="admin.customize.install" class="btn-primary"}}
     </div>
@@ -9,7 +9,7 @@
       {{#each externalResources as |resource|}}
         <a href={{resource.link}} class="external-link" rel="noopener" target="_blank">
           {{d-icon resource.icon}}
-          {{I18n resource.key}}
+          {{i18n resource.key}}
         </a>
       {{/each}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 9fb7fcb4cf..b4c4e9a8f4 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -89,7 +89,7 @@
 
         {{#if showRemoteError}}
           <div class="error-message">
-            {{d-icon "exclamation-triangle"}} {{I18n "admin.customize.theme.repo_unreachable"}}
+            {{d-icon "exclamation-triangle"}} {{i18n "admin.customize.theme.repo_unreachable"}}
           </div>
           <div class="raw-error">
             <code>{{model.remoteError}}</code>
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
index 0f0b1f9d29..5f95987e73 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
@@ -12,7 +12,7 @@
         <div class="problem-messages">
           <ul>
             {{#each problems as |problem|}}
-              <li>{{{problem}}}</li>
+              <li>{{html-safe problem}}</li>
             {{/each}}
           </ul>
         </div>
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index 19f892ab0f..d190b7664b 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -142,7 +142,7 @@
         filters=trendingSearchFilters
         isEnabled=logSearchQueriesEnabled
         disabledLabel=trendingSearchDisabledLabel}}
-      {{{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}}
+      {{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
index 97a479e2c5..f0dcaa5c6a 100644
--- a/app/assets/javascripts/admin/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
@@ -14,13 +14,13 @@
   <hr>
   <div class="text">
     <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
-    <pre class="full-reason">{{{text}}}</pre>
+    <pre class="full-reason">{{html-safe text}}</pre>
   </div>
 
   <hr>
   <div class="elided">
     <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
-    <pre class="full-reason">{{{elided}}}</pre>
+    <pre class="full-reason">{{html-safe elided}}</pre>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 078b642dd4..7a695659c5 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -53,7 +53,7 @@
           <iframe srcdoc={{model.html_content}} />
         {{/if}}
       {{else}}
-        <pre>{{{model.text_content}}}</pre>
+        <pre>{{html-safe model.text_content}}</pre>
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index f4ada49e1b..1777263674 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -23,7 +23,7 @@
 
 {{#if showSecondary}}
   <div class='embedding-secondary'>
-    <p>{{{i18n "admin.embedding.sample"}}}</p>
+    <p>{{i18n "admin.embedding.sample"}}</p>
     {{highlighted-code code=embeddingCode lang="html"}}
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 02c4160b6a..ab4c70d39e 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -88,7 +88,7 @@
               <td class="col value created-at">{{age-with-tooltip item.created_at}}</td>
               <td class="col value details">
                 <div>
-                  {{{item.formattedDetails}}}
+                  {{html-safe item.formattedDetails}}
                   {{#if item.useCustomModalForDetails}}
                     <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
                   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index ef36e4aa05..528ed5af24 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -17,9 +17,9 @@
   {{else}}
     <p class="grant-count">
       {{#if count}}
-        {{{i18n "admin.badges.preview.grant_count" count=count}}}
+        {{i18n "admin.badges.preview.grant_count" count=count}}
       {{else}}
-        {{{i18n "admin.badges.preview.no_grant_count"}}}
+        {{i18n "admin.badges.preview.no_grant_count"}}
       {{/if}}
     </p>
 
@@ -41,14 +41,14 @@
       </p>
       <ul>
         {{#each processedSample as |html|}}
-          <li>{{{html}}}</li>
+          <li>{{html-safe html}}</li>
         {{/each}}
       </ul>
     {{/if}}
 
     {{#if hasQueryPlan}}
       <div class="badge-query-plan">
-        {{{queryPlanHtml}}}
+        {{html-safe queryPlanHtml}}
       </div>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index aab0b17d71..5ed497ae57 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -24,7 +24,7 @@
 
             <div class="popular-theme-buttons">
               {{#if theme.installed}}
-                <span>{{I18n "admin.customize.theme.installed"}}</span>
+                <span>{{i18n "admin.customize.theme.installed"}}</span>
               {{else}}
                 {{d-button class='btn-small'
                   label="admin.customize.theme.install"
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
+                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{i18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
@@ -85,10 +85,10 @@
 
     {{#if create}}
       <div class="inputs">
-        <div class="label">{{I18n "admin.customize.theme.create_name"}}</div>
+        <div class="label">{{i18n "admin.customize.theme.create_name"}}</div>
         {{input value=name placeholder=placeholder}}
 
-        <div class="label">{{I18n "admin.customize.theme.create_type"}}</div>
+        <div class="label">{{i18n "admin.customize.theme.create_type"}}</div>
         {{combo-box
           valueProperty="value"
           content=createTypes
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
index ec26f608d8..7b3ffb5ca5 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
@@ -1,6 +1,6 @@
 <div>
   {{#d-modal-body title="admin.logs.staff_actions.modal_title"}}
-    {{{diff}}}
+    {{html-safe diff}}
   {{/d-modal-body}}
   <div class="modal-footer">
     {{d-button
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 7a5ddc1ea7..724af5ace4 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -7,7 +7,7 @@
   </div>
   <div class="popular-theme-buttons">
     {{#if theme.installed}}
-      <span>{{I18n "admin.customize.theme.installed"}}</span>
+      <span>{{i18n "admin.customize.theme.installed"}}</span>
     {{else}}
       {{d-button class='btn-small'
         label="admin.customize.theme.install"
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 78bd54afb9..27f61f2940 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
       <div class='fps-topic'>
         <div class='topic'>
           <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
           </a>
 
           <div class='search-category'>
@@ -55,7 +55,7 @@
 
           {{#if result.blurb}}
             {{#highlight-text highlight=term}}
-              {{{result.blurb}}}
+              {{html-safe result.blurb}}
             {{/highlight-text}}
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 207120eea8..23a1a6aae3 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -132,7 +132,7 @@
     <div class="field">{{i18n "user.avatar.title"}}</div>
     <div class="value">{{avatar model imageSize="large"}}</div>
     <div class="controls">
-      {{{i18n "admin.user.visit_profile" url=preferencesPath}}}
+      {{i18n "admin.user.visit_profile" url=preferencesPath}}
     </div>
   </div>
 
@@ -509,7 +509,7 @@
     <h1>{{i18n "admin.groups.title"}}</h1>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.automatic"}}</div>
-        <div class="value">{{{automaticGroups}}}</div>
+        <div class="value">{{html-safe automaticGroups}}</div>
       </div>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.custom"}}</div>
@@ -616,11 +616,11 @@
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.time_read"}}</div>
-    <div class="value">{{{format-duration model.time_read}}}</div>
+    <div class="value">{{format-duration model.time_read}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "user.invited.days_visited"}}</div>
-    <div class="value">{{{model.days_visited}}}</div>
+    <div class="value">{{html-safe model.days_visited}}</div>
   </div>
 </section>
 
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 7d096573b0..6b0253aeda 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -53,11 +53,11 @@
             </td>
             <td class="last-emailed">
               <div class="label">{{i18n 'admin.users.last_emailed'}}</div>
-              <div>{{{format-duration user.last_emailed_age}}}</div>
+              <div>{{format-duration user.last_emailed_age}}</div>
             </td>
             <td class="last-seen">
               <div class="label">{{i18n 'last_seen'}}</div>
-              <div>{{{format-duration user.last_seen_age}}}</div>
+              <div>{{format-duration user.last_seen_age}}</div>
             </td>
             <td class="topics-entered">
               <div class="label">{{i18n 'admin.user.topics_entered'}}</div>
@@ -69,12 +69,12 @@
             </td>
             <td class="time-read">
               <div class="label">{{i18n 'admin.user.time_read'}}</div>
-              <div>{{{format-duration user.time_read}}}</div>
+              <div>{{format-duration user.time_read}}</div>
             </td>
 
             <td class="created">
               <div class="label">{{i18n 'created'}}</div>
-              <div>{{{format-duration user.created_at_age}}}</div>
+              <div>{{format-duration user.created_at_age}}</div>
             </td>
 
             {{#if siteSettings.must_approve_users}}
diff --git a/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6 b/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
new file mode 100644
index 0000000000..dc6d5daf74
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
@@ -0,0 +1,6 @@
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
+
+registerUnbound("html-safe", function(string) {
+  return htmlSafe(string);
+});
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
index 902ed699bf..c3d7f1e448 100644
--- a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
@@ -1,6 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
-registerUnbound("i18n", (key, params) => I18n.t(key, params));
+registerUnbound("i18n", (key, params) => htmlSafe(I18n.t(key, params)));
 registerUnbound("i18n-yes-no", (value, params) =>
   I18n.t(value ? "yes_value" : "no_value", params)
 );
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index 90a9cc21a2..201172f1ef 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,8 +1,19 @@
 import { next } from "@ember/runloop";
+import { htmlSafe } from "@ember/template";
 import Component from "@ember/component";
+
 export default Component.extend({
+  text: null,
+
+  init() {
+    this._super(...arguments);
+
+    this.set("text", htmlSafe(this.text));
+  },
+
   didInsertElement() {
     this._super(...arguments);
+
     next(null, () => {
       const $this = $(this.element);
 
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6
index 71baa92c91..27727c1d84 100644
--- a/app/assets/javascripts/discourse/helpers/application.js.es6
+++ b/app/assets/javascripts/discourse/helpers/application.js.es6
@@ -4,14 +4,12 @@ import {
   autoUpdatingRelativeAge,
   number
 } from "discourse/lib/formatter";
+import { htmlSafe } from "@ember/template";
 
-const safe = Handlebars.SafeString;
+registerUnbound("raw-date", dt => htmlSafe(longDate(new Date(dt))));
 
-registerUnbound("raw-date", dt => longDate(new Date(dt)));
-
-registerUnbound(
-  "age-with-tooltip",
-  dt => new safe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
+registerUnbound("age-with-tooltip", dt =>
+  htmlSafe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
 );
 
 registerUnbound("number", (orig, params) => {
@@ -48,5 +46,5 @@ registerUnbound("number", (orig, params) => {
 
   result += ">" + n + "</span>";
 
-  return new safe(result);
+  return htmlSafe(result);
 });
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
index d41f1a332e..e210c471fd 100644
--- a/app/assets/javascripts/discourse/helpers/dir-span.js.es6
+++ b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
@@ -1,5 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { isRTL } from "discourse/lib/text-direction";
+import { htmlSafe } from "@ember/template";
 
 function setDir(text) {
   let content = text ? text : "";
@@ -11,5 +12,5 @@ function setDir(text) {
 }
 
 export default registerUnbound("dir-span", function(str) {
-  return new Handlebars.SafeString(setDir(str));
+  return htmlSafe(setDir(str));
 });
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js.es6 b/app/assets/javascripts/discourse/helpers/format-age.js.es6
index 3141a0da85..b8874820ed 100644
--- a/app/assets/javascripts/discourse/helpers/format-age.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-age.js.es6
@@ -1,11 +1,12 @@
 import { autoUpdatingRelativeAge, durationTiny } from "discourse/lib/formatter";
 import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
 registerUnbound("format-age", function(dt) {
   dt = new Date(dt);
-  return new Handlebars.SafeString(autoUpdatingRelativeAge(dt));
+  return htmlSafe(autoUpdatingRelativeAge(dt));
 });
 
 registerUnbound("format-duration", function(seconds) {
-  return new Handlebars.SafeString(durationTiny(seconds));
+  return htmlSafe(durationTiny(seconds));
 });
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index acd6cde60b..e238320a38 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -1,5 +1,6 @@
 import { computed } from "@ember/object";
 import addonFmt from "ember-addons/fmt";
+import { htmlSafe as htmlSafeTemplateHelper } from "@ember/template";
 
 /**
   Returns whether two properties are equal to each other.
@@ -56,6 +57,21 @@ export function i18n(...args) {
     return I18n.t(addonFmt(format, ...args.map(a => this.get(a))));
   });
 }
+/**
+  Returns htmlSafe version of a string.
+
+  @method htmlSafe
+  @params {String} properties* to htmlify
+  @return {Function} discourseComputedProperty function
+**/
+export function htmlSafe(...args) {
+  return computed(...args, {
+    get() {
+      const path = args.pop();
+      return htmlSafeTemplateHelper(this.get(path));
+    }
+  });
+}
 
 /**
   Uses an Ember String `fmt` call to format a string. See:
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index 6e75a04a6d..ad65dbb57e 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -112,7 +112,7 @@
       {{#if contactInfo}}
         <section class='about contact'>
             <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
-            <p>{{{contactInfo}}}</p>
+            <p>{{html-safe contactInfo}}</p>
         </section>
       {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/account-created/index.hbs b/app/assets/javascripts/discourse/templates/account-created/index.hbs
index 8c9babb1f9..8122270cd6 100644
--- a/app/assets/javascripts/discourse/templates/account-created/index.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/index.hbs
@@ -1,5 +1,5 @@
 <div class='ac-message'>
-  {{{accountCreated.message}}}
+  {{html-safe accountCreated.message}}
 </div>
 {{#if accountCreated.show_controls}}
   {{activation-controls sendActivationEmail=(action "sendActivationEmail")
diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
index 8647596a04..5ad9168986 100644
--- a/app/assets/javascripts/discourse/templates/account-created/resent.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
@@ -1,6 +1,6 @@
 <div class='ac-message'>
   {{#if email}}
-    {{{i18n 'login.sent_activation_email_again' currentEmail=email}}}
+    {{i18n 'login.sent_activation_email_again' currentEmail=email}}
   {{else}}
     {{i18n 'login.sent_activation_email_again_generic'}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 09ded422b3..fe7b489159 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -42,7 +42,7 @@
           {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
             <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
             {{#if ub.post_number}}
-              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
+              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
             {{/if}}
           {{/user-info}}
         {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
index f7bfd9886b..4b7161ba18 100644
--- a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
@@ -3,7 +3,7 @@
     <div class="user-image">
       <div class="user-image-inner">
         <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
-          {{{userTemplate.avatar}}}
+          {{html-safe userTemplate.avatar}}
         </a>
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 0fdc3bd275..4fb6aa77c0 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -11,7 +11,7 @@
   <div class='badge-info'>
     <div class='badge-info-item'>
       <h3><a href={{url}} class='badge-link'>{{badge.name}}</a></h3>
-      <div class='badge-summary'>{{{summary}}}</div>
+      <div class='badge-summary'>{{html-safe summary}}</div>
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 5dc594c691..232edea06b 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -24,7 +24,7 @@
         </div>
 
         <div class='description'>
-          {{{text-overflow class="overflow" text=c.description_excerpt}}}
+          {{text-overflow class="overflow" text=c.description_excerpt}}
         </div>
         {{#if c.isGrandParent}}
           {{#each c.subcategories as |subcategory|}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 4f153b4e7f..ae71465bf0 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -16,7 +16,7 @@
             {{category-title-link category=c}}
             {{#if c.description_excerpt}}
               <div class="category-description">
-                {{{dir-span c.description_excerpt}}}
+                {{dir-span c.description_excerpt}}
               </div>
             {{/if}}
             {{#if c.isGrandParent}}
@@ -28,7 +28,7 @@
                         {{category-title-link tagName="h4" category=subcategory}}
                         {{#if subcategory.description_excerpt}}
                           <div class="category-description subcategory-description">
-                            {{{dir-span subcategory.description_excerpt}}}
+                            {{dir-span subcategory.description_excerpt}}
                           </div>
                         {{/if}}
                         {{#if subcategory.subcategories}}
@@ -45,7 +45,7 @@
                         {{else}}
                           {{#if subcategory.description_excerpt}}
                             <div class="category-description subcategory-description">
-                              {{{dir-span subcategory.description_excerpt}}}
+                              {{dir-span subcategory.description_excerpt}}
                             </div>
                           {{/if}}
                         {{/if}}
@@ -69,7 +69,7 @@
             {{/if}}
           </td>
           <td class="topics">
-            <div title={{c.statTitle}}>{{{c.stat}}}</div>
+            <div title={{c.statTitle}}>{{html-safe c.stat}}</div>
             {{category-unread category=c tagName="div" class="unread-new"}}
           </td>
           {{#if showTopics}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index 755e4ea857..aeb5f6b6f6 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -3,7 +3,7 @@
 {{/if}}
 
 {{#if translatedLabel}}
-  <span class='d-button-label'>{{{translatedLabel}}}{{#if ellipsis}}&hellip;{{/if}}</span>
+  <span class='d-button-label'>{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index f868131b63..97effd78d4 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -46,7 +46,7 @@
   </div>
 
   <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
-    <div class="d-editor-preview">{{{preview}}}</div>
+    <div class="d-editor-preview">{{html-safe preview}}</div>
     {{plugin-outlet name="editor-preview" classNames="d-editor-plugin" args=outletArgs}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index 27025bedee..cda2c2069a 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -3,9 +3,9 @@
     <div id="banner" class={{overlay}}>
       {{d-button icon="times" action="dismiss" class="btn btn-flat close" title="banner.close"}}
       <div id="banner-content">
-        {{{content}}}
+        {{html-safe content}}
         {{#if currentUser.staff}}
-          <p><a href={{banner.url}}>{{{i18n "banner.edit"}}}</a></p>
+          <p><a href={{banner.url}}>{{i18n "banner.edit"}}</a></p>
         {{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
index dd15a6dc6a..78515d0404 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
@@ -1 +1 @@
-{{{translatedText}}}
+{{html-safe translatedText}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 19d6e724dc..7884f85e1f 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,7 +1,7 @@
 {{#if category.isUncategorizedCategory}}
   <p class="warning">
     {{d-icon "exclamation-triangle"}}
-    {{{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}}
+    {{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}
   </p>
 {{/if}}
 
@@ -36,7 +36,7 @@
     <section class='field'>
       <label>{{i18n 'category.description'}}</label>
       {{#if category.description}}
-        {{{category.description}}}
+        {{html-safe category.description}}
       {{else}}
         {{i18n 'category.no_description'}}
       {{/if}}
@@ -51,7 +51,7 @@
     <section class='field'>
       <label>{{i18n 'category.badge_colors'}}</label>
       <div class="category-color-editor">
-        {{{categoryBadgePreview}}}
+        {{html-safe categoryBadgePreview}}
 
         <div class='input-prepend input-append' style="margin-top: 10px;">
           <span class='color-title'>{{i18n 'category.background_color'}}:</span>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index cfde179c32..5b132092c4 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -11,7 +11,7 @@
       {{#each category.permissions as |p|}}
         <li>
           <span class="name"><span class="badge-group">{{p.group_name}}</span></span>
-          {{{i18n "category.can"}}}
+          {{i18n "category.can"}}
           <span class="permission">{{p.permission.description}}</span>
           {{#if editingPermissions}}
             <a class="remove-permission" href {{action "removePermission" p}}>{{d-icon "times-circle"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index 655ca8c16e..10d9d5fcba 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,10 +1,10 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href={{topic.lastUnreadUrl}}>{{{topic.fancyTitle}}}</a>
+<a class='title' href={{topic.lastUnreadUrl}}>{{html-safe topic.fancyTitle}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
   <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href={{{topic.lastPosterUrl}}}>{{topic.last_poster.username}}</a>
+    {{i18n 'categories.latest_by'}} <a href={{html-safe topic.lastPosterUrl}}>{{topic.last_poster.username}}</a>
     <a href={{topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index e6fe7ca516..cc7b592b42 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -5,7 +5,7 @@
       <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
 
       <div class='flag-action-type-details'>
-        <span class='description'>{{{flag.description}}}</span>
+        <span class='description'>{{html-safe flag.description}}</span>
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
           <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
@@ -24,7 +24,7 @@
       <div class='flag-action-type-details'>
         <strong>{{formattedName}}</strong>
         {{#if showDescription}}
-          <div class='description'>{{{description}}}</div>
+          <div class='description'>{{html-safe description}}</div>
         {{/if}}
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
diff --git a/app/assets/javascripts/discourse/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
index 65e3a460df..03e5c7b8ee 100644
--- a/app/assets/javascripts/discourse/templates/components/footer-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
@@ -1,4 +1,4 @@
-{{#if education}}<div class="education">{{{education}}}</div>{{/if}}
+{{#if education}}<div class="education">{{html-safe education}}</div>{{/if}}
 <h3>
   {{message}}
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
index c2b3b75e2e..08ff36603f 100644
--- a/app/assets/javascripts/discourse/templates/components/global-notice.hbs
+++ b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
@@ -2,9 +2,9 @@
   <div class="row">
     <div id="global-notice-{{notice.id}}" class="alert alert-{{notice.options.level}} {{notice.id}}">
       {{#if notice.options.html}}
-        {{{notice.options.html}}}
+        {{html-safe notice.options.html}}
       {{/if}}
-      <span class="text">{{{notice.text}}}</span>
+      <span class="text">{{html-safe notice.text}}</span>
 
       {{#if notice.options.dismissable}}
         {{d-button
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index 22629d003d..7f6104b836 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -43,7 +43,7 @@
 
     {{#if group.bio_cooked}}
       <div class="card-row second-row">
-        <div class='bio'>{{{group.bio_cooked}}}</div>
+        <div class='bio'>{{html-safe group.bio_cooked}}</div>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index d9880b54b6..d4a9673708 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -8,7 +8,7 @@
   <div class='stream-topic-details'>
       <div class='stream-topic-title'>
         <span class='title'>
-          <a href={{postUrl}}>{{{post.topic.fancyTitle}}}</a>
+          <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
         </span>
       </div>
       <div class="group-post-category">{{category-link post.category}}</div>
@@ -24,8 +24,8 @@
 
 <div class='excerpt'>
   {{#if post.expandedExcerpt}}
-    {{{post.expandedExcerpt}}}
+    {{html-safe post.expandedExcerpt}}
   {{else}}
-    {{{post.excerpt}}}
+    {{html-safe post.excerpt}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
index 3c13bea09e..cfdd1431bf 100644
--- a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
@@ -1,6 +1,6 @@
 {{#if inviteModel.error}}
   <div class="alert alert-error">
-    {{{errorMessage}}}
+    {{html-safe errorMessage}}
   </div>
 {{/if}}
 
@@ -10,7 +10,7 @@
       {{generated-invite-link link=inviteModel.inviteLink email=emailOrUsername}}
     {{else}}
       <div class="success-message">
-        {{{successMessage}}}
+        {{html-safe successMessage}}
       </div>
     {{/if}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index dce5918f52..9b7b7bebc4 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -14,7 +14,7 @@
       {{d-button action=(action "copy") class="pull-right no-text" icon="copy"}}
     {{/if}}
     <h4>{{i18n "ip_lookup.title"}}</h4>
-    <p class='powered-by'>{{{i18n "ip_lookup.powered_by"}}}</p>
+    <p class='powered-by'>{{i18n "ip_lookup.powered_by"}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
index e9d901d880..3c4fcf9491 100644
--- a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
@@ -5,7 +5,7 @@
     {{#if topic.unseen}}
       <span class="badge-notification new-topic"></span>
     {{/if}}
-    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{{format-age topic.last_posted_at}}}</span>
+    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{format-age topic.last_posted_at}}</span>
   </div>
 </td>
 <td class='num posts'>{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
index 84b7d42962..09e1abb1a1 100644
--- a/app/assets/javascripts/discourse/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
@@ -10,5 +10,5 @@
 </div>
 
 {{#if targetUser}}
-  <h3 class="see-all-pms-message">{{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}}</h3>
+  <h3 class="see-all-pms-message">{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}</h3>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
index 1bdcd280ff..25aeea0726 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
@@ -3,6 +3,6 @@
     {{#if showUsername}}
       {{#link-to 'user' post.user class="username"}}@{{post.user.username}}{{/link-to}}
     {{/if}}
-    {{{post.excerpt}}}
+    {{html-safe post.excerpt}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
index 09e196766f..2ac3b61ff7 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
@@ -17,7 +17,7 @@
       {{#if reviewable.blank_post}}
         <p>{{i18n "review.deleted_post"}}</p>
       {{else}}
-        {{{reviewable.cooked}}}
+        {{html-safe reviewable.cooked}}
       {{/if}}
     </div>
     {{plugin-outlet name="after-reviewable-flagged-post-body" args=(hash model=reviewable)}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
index 2d432a53b4..7b3a7a2f2a 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
@@ -46,7 +46,7 @@
   <div class='reviewable-actions'>
     {{#if claimEnabled}}
       <div class='claimed-actions'>
-        <span class='help'>{{{claimHelp}}}</span>
+        <span class='help'>{{html-safe claimHelp}}</span>
         {{reviewable-claimed-topic topicId=topicId claimedBy=reviewable.claimed_by}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
index aa9a2f0fe2..847cc42154 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
@@ -49,7 +49,7 @@
 {{#if rs.reason}}
   <tr>
     <td colspan='7'>
-      <div class='reviewable-score-reason'>{{{rs.reason}}}</div>
+      <div class='reviewable-score-reason'>{{html-safe rs.reason}}</div>
     </td>
   </tr>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
index 4c5c717be3..dc03f52d54 100644
--- a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
@@ -1,7 +1,7 @@
 <div id="second-factor">
   <h3>{{secondFactorTitle}}</h3>
   {{#if optionalText}}
-    <p>{{{optionalText}}}</p>
+    <p>{{html-safe optionalText}}</p>
   {{/if}}
   <p>{{secondFactorDescription}}</p>
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index b166c42071..1808d6cc1f 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -1,5 +1,5 @@
 <div class="header">
-  <h3 class="title">{{{shareTitle}}}</h3>
+  <h3 class="title">{{html-safe shareTitle}}</h3>
 </div>
 
 <div class="body">
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 6f0428b1aa..54e8029cf6 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -1,5 +1,5 @@
 <div class="title">
-  <h3>{{{shareTitle}}}</h3>
+  <h3>{{html-safe shareTitle}}</h3>
 
   {{#if date}}
     <span class="date">{{displayDate}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index 32fa1adb65..eaee0823d0 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -2,6 +2,6 @@
   {{#if source.icon}}
     {{d-icon source.icon}}
   {{else}}
-    {{{source.htmlIcon}}}
+    {{html-safe source.htmlIcon}}
   {{/if}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
index 23b2d45ae2..d42eb1b177 100644
--- a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
@@ -2,7 +2,7 @@
   {{#if publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
-    {{{i18n "shared_drafts.notice" category=topic.category.name}}}
+    {{i18n "shared_drafts.notice" category=topic.category.name}}
 
     <div class='publish-field'>
       <label>{{i18n "shared_drafts.destination_category"}}</label>
diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
index ffd142b1be..ae7db1c907 100644
--- a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
@@ -13,4 +13,4 @@
   {{/if}}
 </div>
 
-<h3 class="suggested-topics-message">{{{browseMoreMessage}}}</h3>
+<h3 class="suggested-topics-message">{{html-safe browseMoreMessage}}</h3>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
index 3b616fec81..aa1f4889d1 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
@@ -32,7 +32,7 @@
     {{#if tagInfo.synonyms}}
       <div class="synonyms-list">
         <h3>{{i18n "tagging.synonyms"}}</h3>
-        <div>{{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}}</div>
+        <div>{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}</div>
         <div class="tag-list">
           {{#each tagInfo.synonyms as |tag|}}
             <div class='tag-box'>
diff --git a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
index 05a4439029..3606bb98a0 100644
--- a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
+++ b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
@@ -1 +1 @@
-{{{text}}}
+{{html-safe text}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
index 7b7fb58b8b..227674d60c 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 {{#d-button action=(action "enterTop") class="full jump-top"}}
-  {{d-icon 'step-backward'}} {{{topDate}}}
+  {{d-icon 'step-backward'}} {{html-safe topDate}}
 {{/d-button}}
 
 {{#d-button action=(action "enterBottom") class="full jump-bottom"}}
-  {{{bottomDate}}} {{d-icon 'step-forward'}}
+  {{html-safe bottomDate}} {{d-icon 'step-forward'}}
 {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index f6956782a9..3bfdf96268 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -144,7 +144,7 @@
         <div class="card-row">
           <div class="featured-topic">
             <span class="desc">{{i18n 'user.featured_topic'}}</span>
-            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{{user.featured_topic.fancy_title}}}{{/link-to}}
+            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe user.featured_topic.fancy_title}}{{/link-to}}
           </div>
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index fe91090dde..c09e659301 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,6 +1,6 @@
 {{#if field.name}}
   <label class="control-label" for={{concat 'user-' elementId}}>
-    {{{field.name}}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
+    {{html-safe field.name}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
   </label>
 {{/if}}
 
@@ -8,7 +8,7 @@
   <label class="control-label checkbox-label">
     {{input id=(concat 'user-' elementId) checked=value type="checkbox"}}
     <span>
-      {{{field.description}}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
+      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
     </span>
   </label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index 136585cb03..fd3cb91917 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{combo-box
@@ -10,5 +10,5 @@
     none=noneLabel
     onChange=(action (mut value))
   }}
-  <div class="instructions">{{{field.description}}}</div>
+  <div class="instructions">{{html-safe field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 4549f721af..1c33ea1452 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,6 +1,6 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
-  <div class="instructions">{{{field.description}}}</div>
+  <div class="instructions">{{html-safe field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 87b1a220e1..69704bf892 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -9,5 +9,5 @@
 </span>
 <span class='label'>
   {{#if icon}}{{d-icon icon}}{{/if}}
-  {{{i18n label count=value}}}
+  {{i18n label count=value}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index a87439ad35..f6da96aa0c 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -2,7 +2,7 @@
   <a href={{item.userUrl}} data-user-card={{item.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
   <span class='time'>{{format-date item.created_at}}</span>
   {{#if item.draftType}}
-    <span class='draft-type'>{{{item.draftType}}}</span>
+    <span class='draft-type'>{{html-safe item.draftType}}</span>
   {{else}}
     {{expand-post item=item}}
   {{/if}}
@@ -11,9 +11,9 @@
       {{topic-status topic=item disableActions=true}}
       <span class="title">
         {{#if item.postUrl}}
-          <a href={{item.postUrl}}>{{{item.title}}}</a>
+          <a href={{item.postUrl}}>{{html-safe item.title}}</a>
         {{else}}
-          {{{item.title}}}
+          {{html-safe item.title}}
         {{/if}}
       </span>
     </div>
@@ -36,11 +36,13 @@
 {{/if}}
 
 <p class='excerpt' data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}}>
+  {{!-- template-lint-disable no-triple-curlies --}}
   {{~#if item.expandedExcerpt}}
     {{~{item.expandedExcerpt}~}}
   {{else}}
     {{~{item.excerpt}~}}
   {{/if~}}
+  {{!-- template-lint-enable --}}
 </p>
 
 {{#each item.children as |child|}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 07f7c03cd8..970592ece4 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -6,4 +6,4 @@
   {{/if}}
 </span>
 <br>
-<a href={{url}}>{{{topic.fancyTitle}}}</a>
+<a href={{url}}>{{html-safe topic.fancyTitle}}</a>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index ce1e7af458..43af40a527 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -204,7 +204,7 @@
                   {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
                 {{/if}}
               {{else}}
-                <a href {{action "togglePreview"}} class='toggle-preview'>{{{toggleText}}}</a>
+                <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
               {{/if}}
 
           </div>
@@ -221,7 +221,7 @@
 
         <div class='draft-text'>
           {{#if model.topic}}
-            {{d-icon "share"}} {{{draftTitle}}}
+            {{d-icon "share"}} {{html-safe draftTitle}}
           {{else}}
             {{i18n "composer.saved_draft"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
index e37bdb2aa0..238de27da0 100644
--- a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
-<p>{{{message.body}}}</p>
+<p>{{html-safe message.body}}</p>
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs
index c2d574cb69..269e44e595 100644
--- a/app/assets/javascripts/discourse/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/education.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{{message.body}}}
+{{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
index c2d574cb69..269e44e595 100644
--- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{{message.body}}}
+{{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 6801ab3f55..1c8f879125 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -1,5 +1,5 @@
 {{#if errorHtml}}
-  {{{errorHtml}}}
+  {{html-safe errorHtml}}
 {{else}}
   <div class="container">
     {{discourse-banner user=currentUser banner=site.banner}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 355e18f1b8..9394f35486 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -49,7 +49,7 @@
 
       <div class='search-info'>
         <div class='result-count'>
-          {{{resultCountLabel}}}
+          {{html-safe resultCountLabel}}
         </div>
         <div class='sort-by'>
           <span class='desc'>
@@ -88,7 +88,7 @@
 
                   <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
+                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -113,7 +113,7 @@
 
                   {{#if result.blurb}}
                     {{#highlight-text highlight=highlightQuery}}
-                      {{{result.blurb}}}
+                      {{html-safe result.blurb}}
                     {{/highlight-text}}
                   {{/if}}
                 </div>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 8385894c0c..1bc9734c13 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -26,7 +26,7 @@
       <hr>
 
       <div class='group-bio'>
-        <p>{{{model.bio_cooked}}}</p>
+        <p>{{html-safe model.bio_cooked}}</p>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index 21cbe557a9..36d0a644b1 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -51,7 +51,7 @@
                     </span>
                   </div>
 
-                  <div class="group-description">{{{group.bio_excerpt}}}</div>
+                  <div class="group-description">{{html-safe group.bio_excerpt}}</div>
 
                   <div class="group-membership">
                     {{#group-membership-button tagName='' model=group showLogin=(route-action "showLogin")}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 42216317ee..f2f1e73678 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -10,12 +10,12 @@
     <div class="col-form">
       {{#if successMessage}}
         <br><br>
-        <div class='alert alert-info'><p>{{{successMessage}}}</p></div>
+        <div class='alert alert-info'><p>{{html-safe successMessage}}</p></div>
       {{else}}
         <p>{{i18n 'invites.invited_by'}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
-        <p>{{{yourEmailMessage}}}
+        <p>{{html-safe yourEmailMessage}}
         {{#if externalAuthsEnabled}}
              {{i18n 'invites.social_login_available'}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.hbr b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
index 723bb80e84..384909db02 100644
--- a/app/assets/javascripts/discourse/templates/list/activity-column.hbr
+++ b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
@@ -1,4 +1,4 @@
-<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}">
+<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{html-safe topic.bumpedAtTitle}}">
   <a class="post-activity" href="{{topic.lastPostUrl}}">
     {{~raw-plugin-outlet name="topic-list-before-relative-date"~}}
     {{~format-date topic.bumpedAt format="tiny" noTitle="true"~}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
index 1c7b5eead0..2257a669cb 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
+++ b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
@@ -1,6 +1,6 @@
 {{#if topic.hasExcerpt}}
   <div class="topic-excerpt">
-    {{{dir-span topic.escapedExcerpt}}}
+    {{dir-span topic.escapedExcerpt}}
     {{#if topic.excerptTruncated}}
       <a href="{{topic.url}}">{{i18n 'read_more'}}</a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index d8a06c33c7..0949b56ee7 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -24,7 +24,7 @@
               {{/if}}
               {{#if t.hasExcerpt}}
                 <div class="topic-excerpt">
-                  {{{t.excerpt}}}
+                  {{html-safe t.excerpt}}
                   {{#if t.excerptTruncated}}
                     {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
@@ -42,7 +42,7 @@
               {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
               <div class="pull-right">
                 {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
+                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
               </div>
               {{#unless hideCategory}}
                 <div class='category'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 5418fcb86a..0421edce8a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -13,7 +13,7 @@
             {{#if c.description_excerpt}}
               <tr class="category-description">
                 <td colspan="3">
-                  {{{c.description_excerpt}}}
+                  {{html-safe c.description_excerpt}}
                 </td>
               </tr>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index bebe6a385e..ca6140be54 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -1,7 +1,7 @@
 {{#if selectedHtml}}
   <li>
     <a href class='expander' {{action 'toggleExpanded'}}>
-      <span>{{{selectedHtml}}}</span>
+      <span>{{html-safe selectedHtml}}</span>
       {{d-icon "caret-down"}}
     </a>
   </li>
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
index 5469574977..7439589d5c 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}}
+  {{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}
 {{/d-modal-body}}
 
 {{modal-footer-close closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index 1b08a4974b..5390227a2e 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="user.auth_tokens.was_this_you"}}
   <div>
     <p>{{i18n 'user.auth_tokens.was_this_you_description'}}</p>
-    <p>{{{i18n 'user.second_factor.extended_description'}}}</p>
+    <p>{{i18n 'user.second_factor.extended_description'}}</p>
   </div>
 
   <div>
@@ -21,9 +21,9 @@
       </h3>
 
       {{#if expanded}}
-        <blockquote>{{{latest_post.cooked}}}</blockquote>
+        <blockquote>{{html-safe latest_post.cooked}}</blockquote>
       {{else}}
-        <blockquote>{{{latest_post.excerpt}}}</blockquote>
+        <blockquote>{{html-safe latest_post.excerpt}}</blockquote>
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index cdaab1cc1c..10e5c4bf26 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -10,11 +10,11 @@
   {{else}}
     <div class="avatar-choice">
       {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
-      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{{i18n 'user.change_avatar.letter_based'}}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{i18n 'user.change_avatar.letter_based'}}</label>
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{{i18n 'user.change_avatar.gravatar'}}} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar'}} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
                  title="user.change_avatar.refresh_gravatar_title"
@@ -23,7 +23,7 @@
                  class="btn-default avatar-selector-refresh-gravatar"}}
 
       {{#if gravatarFailed}}
-        <p class="error">{{I18n 'user.change_avatar.gravatar_failed'}}</p>
+        <p class="error">{{i18n 'user.change_avatar.gravatar_failed'}}</p>
       {{/if}}
     </div>
     {{#if allowAvatarUpload}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 254f1bfbee..0098c5b237 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -38,7 +38,7 @@
           <!-- {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}} -->
         {{/tap-tile-grid}}
       {{else}}
-        <div class="alert alert-info">{{{i18n "bookmarks.no_timezone" basePath=basePath }}}</div>
+        <div class="alert alert-info">{{i18n "bookmarks.no_timezone" basePath=basePath }}</div>
       {{/if}}
     </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
index 97f8003781..0cfc45782d 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
@@ -2,7 +2,7 @@
   <div class='controls'>
     <label class='radio'>
       {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
-      <div class='description'>{{{level.description}}}</div>
+      <div class='description'>{{html-safe level.description}}</div>
     </label>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 0c0890f2b9..1069c0d2fa 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,6 +1,6 @@
 {{#d-modal-body class='change-ownership'}}
   <span>
-    {{{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}}
+    {{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}
   </span>
 
   <form>
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 448508de65..5c77b2a0a6 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -126,7 +126,7 @@
           {{/d-button}}
         {{/conditional-loading-spinner}}
 
-      <div class='disclaimer'>{{{disclaimerHtml}}}</div>
+      <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
       </div>
 
       {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
index e35eaecc19..61e693a9af 100644
--- a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  <p>{{{i18n "post.controls.delete_topic_disallowed_modal"}}}</p>
+  <p>{{i18n "post.controls.delete_topic_disallowed_modal"}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="close"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
index 6abe868295..0c3f9e443d 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
@@ -34,7 +34,7 @@
                    label="category.delete"}}
 
         <div class="cannot_delete_reason {{if hiddenTooltip "hidden" ""}}">
-          {{{model.cannot_delete_reason}}}
+          {{html-safe model.cannot_delete_reason}}
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index 965a407815..be55ea8460 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -6,9 +6,9 @@
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
               {{#if pinnedGloballyCount}}
-                {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
+                {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
               {{else}}
-                {{{i18n "topic.feature_topic.not_pinned_globally"}}}
+                {{i18n "topic.feature_topic.not_pinned_globally"}}
               {{/if}}
             {{/conditional-loading-spinner}}
           </p>
@@ -16,12 +16,12 @@
         {{else}}
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
-              {{{alreadyPinnedMessage}}}
+              {{html-safe alreadyPinnedMessage}}
             {{/conditional-loading-spinner}}
           </p>
           <p>{{i18n "topic.feature_topic.pin_note"}}</p>
         {{/if}}
-        <p>{{{unPinMessage}}}</p>
+        <p>{{html-safe unPinMessage}}</p>
         <p>{{d-button action=(action "unpin") icon="thumbtack" label="topic.feature.unpin" class="btn-primary"}}</p>
       </div>
     </div>
@@ -30,7 +30,7 @@
       <div class="desc">
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
-            {{{alreadyPinnedMessage}}}
+            {{html-safe alreadyPinnedMessage}}
           {{/conditional-loading-spinner}}
         </p>
         <p>
@@ -38,7 +38,7 @@
         </p>
         {{#if site.isMobileDevice}}
           <p>
-            {{{pinMessage}}}
+            {{html-safe pinMessage}}
           </p>
           <p class="with-validation">
             {{future-date-input
@@ -52,7 +52,7 @@
           </p>
         {{else}}
           <p class="with-validation">
-            {{{pinMessage}}}
+            {{html-safe pinMessage}}
             {{d-icon "far-clock"}}
             {{future-date-input
               class="pin-until"
@@ -74,9 +74,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if pinnedGloballyCount}}
-              {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
+              {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
             {{else}}
-              {{{i18n "topic.feature_topic.not_pinned_globally"}}}
+              {{i18n "topic.feature_topic.not_pinned_globally"}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
@@ -123,9 +123,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if bannerCount}}
-              {{{i18n "topic.feature_topic.banner_exists"}}}
+              {{i18n "topic.feature_topic.banner_exists"}}
             {{else}}
-              {{{i18n "topic.feature_topic.no_banner_exists"}}}
+              {{i18n "topic.feature_topic.no_banner_exists"}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 8d438dd80a..19be52ceb5 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -1,7 +1,7 @@
 <form>
   {{#d-modal-body class="forgot-password-modal"}}
     {{#if offerHelp}}
-      {{{offerHelp}}}
+      {{html-safe offerHelp}}
     {{else}}
       <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 6d9dbff78e..c81dfe2238 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -21,7 +21,7 @@
           &mdash; {{disabled-icon icon="shield-alt" disabled=postTypeDisabled}}
         {{/if}}
         {{#if model.category_id_changes}}
-          &mdash; {{{previousCategory}}} &rarr; {{{currentCategory}}}
+          &mdash; {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
         {{/if}}
       {{/unless}}
     </div>
@@ -50,7 +50,7 @@
   <div id="revisions" data-post-id={{model.post_id}} class={{hiddenClasses}}>
     {{#if model.title_changes}}
       <div class="row">
-        <h2>{{{titleDiff}}}</h2>
+        <h2>{{html-safe titleDiff}}</h2>
       </div>
     {{/if}}
     {{#if site.mobileView}}
@@ -72,7 +72,7 @@
       {{/if}}
       {{#if model.category_id_changes}}
         <div class="row">
-          {{{previousCategory}}} &rarr; {{{currentCategory}}}
+          {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
         </div>
       {{/if}}
     {{/if}}
@@ -100,7 +100,7 @@
     {{plugin-outlet name="post-revisions" args=(hash model=model)}}
 
     {{#links-redirect class="row"}}
-      {{{bodyDiff}}}
+      {{html-safe bodyDiff}}
     {{/links-redirect}}
   </div>
 {{/d-modal-body}}
@@ -111,7 +111,7 @@
       {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
       <div id="revision-numbers" class={{unless displayRevisions 'invisible'}}>
         {{#conditional-loading-spinner condition=loading size="small"}}
-          {{{revisionsText}}}
+          {{html-safe revisionsText}}
         {{/conditional-loading-spinner}}
       </div>
       {{d-button class="btn-default" action=(action "loadNextVersion") icon="forward" title="post.revisions.controls.next" disabled=loadNextDisabled}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 493a9e03a5..2203c90174 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -3,29 +3,29 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.jump_to.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.jump_to.home}}}</li>
-        <li>{{{shortcuts.jump_to.latest}}}</li>
-        <li>{{{shortcuts.jump_to.new}}}</li>
-        <li>{{{shortcuts.jump_to.unread}}}</li>
-        <li>{{{shortcuts.jump_to.categories}}}</li>
-        <li>{{{shortcuts.jump_to.top}}}</li>
-        <li>{{{shortcuts.jump_to.bookmarks}}}</li>
-        <li>{{{shortcuts.jump_to.profile}}}</li>
+        <li>{{html-safe shortcuts.jump_to.home}}</li>
+        <li>{{html-safe shortcuts.jump_to.latest}}</li>
+        <li>{{html-safe shortcuts.jump_to.new}}</li>
+        <li>{{html-safe shortcuts.jump_to.unread}}</li>
+        <li>{{html-safe shortcuts.jump_to.categories}}</li>
+        <li>{{html-safe shortcuts.jump_to.top}}</li>
+        <li>{{html-safe shortcuts.jump_to.bookmarks}}</li>
+        <li>{{html-safe shortcuts.jump_to.profile}}</li>
         {{#if siteSettings.enable_personal_messages}}
-          <li>{{{shortcuts.jump_to.messages}}}</li>
+          <li>{{html-safe shortcuts.jump_to.messages}}</li>
         {{/if}}
-        <li>{{{shortcuts.jump_to.drafts}}}</li>
+        <li>{{html-safe shortcuts.jump_to.drafts}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.navigation.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.navigation.back}}}</li>
-        <li>{{{shortcuts.navigation.jump}}}</li>
-        <li>{{{shortcuts.navigation.up_down}}}</li>
-        <li>{{{shortcuts.navigation.open}}}</li>
-        <li>{{{shortcuts.navigation.next_prev}}}</li>
-        <li>{{{shortcuts.navigation.go_to_unread_post}}}</li>
+        <li>{{html-safe shortcuts.navigation.back}}</li>
+        <li>{{html-safe shortcuts.navigation.jump}}</li>
+        <li>{{html-safe shortcuts.navigation.up_down}}</li>
+        <li>{{html-safe shortcuts.navigation.open}}</li>
+        <li>{{html-safe shortcuts.navigation.next_prev}}</li>
+        <li>{{html-safe shortcuts.navigation.go_to_unread_post}}</li>
       </ul>
     </section>
   </div>
@@ -33,26 +33,26 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.application.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.application.hamburger_menu}}}</li>
-        <li>{{{shortcuts.application.user_profile_menu}}}</li>
-        <li>{{{shortcuts.application.show_incoming_updated_topics}}}</li>
-        <li>{{{shortcuts.application.search}}}</li>
-        <li>{{{shortcuts.application.help}}}</li>
-        <li>{{{shortcuts.application.dismiss_new_posts}}}</li>
-        <li>{{{shortcuts.application.dismiss_topics}}}</li>
-        <li>{{{shortcuts.application.log_out}}}</li>
+        <li>{{html-safe shortcuts.application.hamburger_menu}}</li>
+        <li>{{html-safe shortcuts.application.user_profile_menu}}</li>
+        <li>{{html-safe shortcuts.application.show_incoming_updated_topics}}</li>
+        <li>{{html-safe shortcuts.application.search}}</li>
+        <li>{{html-safe shortcuts.application.help}}</li>
+        <li>{{html-safe shortcuts.application.dismiss_new_posts}}</li>
+        <li>{{html-safe shortcuts.application.dismiss_topics}}</li>
+        <li>{{html-safe shortcuts.application.log_out}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.composing.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.composing.return}}}</li>
-        <li>{{{shortcuts.composing.fullscreen}}}</li>
-        <li>{{{shortcuts.application.create}}}</li>
-        <li>{{{shortcuts.actions.reply_as_new_topic}}}</li>
-        <li>{{{shortcuts.actions.reply_topic}}}</li>
-        <li>{{{shortcuts.actions.reply_post}}}</li>
-        <li>{{{shortcuts.actions.quote_post}}}</li>
+        <li>{{html-safe shortcuts.composing.return}}</li>
+        <li>{{html-safe shortcuts.composing.fullscreen}}</li>
+        <li>{{html-safe shortcuts.application.create}}</li>
+        <li>{{html-safe shortcuts.actions.reply_as_new_topic}}</li>
+        <li>{{html-safe shortcuts.actions.reply_topic}}</li>
+        <li>{{html-safe shortcuts.actions.reply_post}}</li>
+        <li>{{html-safe shortcuts.actions.quote_post}}</li>
       </ul>
     </section>
   </div>
@@ -60,22 +60,22 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.actions.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.actions.bookmark_topic}}}</li>
-        <li>{{{shortcuts.actions.pin_unpin_topic}}}</li>
-        <li>{{{shortcuts.actions.share_topic}}}</li>
-        <li>{{{shortcuts.actions.share_post}}}</li>
-        <li>{{{shortcuts.actions.like}}}</li>
-        <li>{{{shortcuts.actions.flag}}}</li>
-        <li>{{{shortcuts.actions.bookmark}}}</li>
-        <li>{{{shortcuts.actions.edit}}}</li>
-        <li>{{{shortcuts.actions.delete}}}</li>
-        <li>{{{shortcuts.actions.mark_muted}}}</li>
-        <li>{{{shortcuts.actions.mark_regular}}}</li>
-        <li>{{{shortcuts.actions.mark_tracking}}}</li>
-        <li>{{{shortcuts.actions.mark_watching}}}</li>
-        <li>{{{shortcuts.actions.defer}}}</li>
-        <li>{{{shortcuts.actions.print}}}</li>
-        <li>{{{shortcuts.actions.topic_admin_actions}}}</li>
+        <li>{{html-safe shortcuts.actions.bookmark_topic}}</li>
+        <li>{{html-safe shortcuts.actions.pin_unpin_topic}}</li>
+        <li>{{html-safe shortcuts.actions.share_topic}}</li>
+        <li>{{html-safe shortcuts.actions.share_post}}</li>
+        <li>{{html-safe shortcuts.actions.like}}</li>
+        <li>{{html-safe shortcuts.actions.flag}}</li>
+        <li>{{html-safe shortcuts.actions.bookmark}}</li>
+        <li>{{html-safe shortcuts.actions.edit}}</li>
+        <li>{{html-safe shortcuts.actions.delete}}</li>
+        <li>{{html-safe shortcuts.actions.mark_muted}}</li>
+        <li>{{html-safe shortcuts.actions.mark_regular}}</li>
+        <li>{{html-safe shortcuts.actions.mark_tracking}}</li>
+        <li>{{html-safe shortcuts.actions.mark_watching}}</li>
+        <li>{{html-safe shortcuts.actions.defer}}</li>
+        <li>{{html-safe shortcuts.actions.print}}</li>
+        <li>{{html-safe shortcuts.actions.topic_admin_actions}}</li>
       </ul>
     </section>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index 893d934246..ae591397a7 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -17,7 +17,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -31,7 +31,7 @@
     {{/if}}
 
     {{#if existingMessage}}
-      <p>{{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}}</p>
+      <p>{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}</p>
       <form>
         {{choose-message currentTopicId=model.id selectedTopicId=selectedTopicId}}
 
@@ -64,7 +64,7 @@
     </div>
 
     {{#if existingTopic}}
-      <p>{{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}}</p>
+      <p>{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}</p>
       <form>
         {{choose-topic currentTopicId=model.id selectedTopicId=selectedTopicId}}
       </form>
@@ -72,7 +72,7 @@
 
     {{#if canSplitTopic}}
       {{#if newTopic}}
-        <p>{{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.split_topic.topic_name'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -93,7 +93,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index aa312d5125..e9d93aa8f6 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{{i18n 'login.not_activated' sentTo=sentTo}}}
+  {{i18n 'login.not_activated' sentTo=sentTo}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
index 46f37bfe80..3687b9fb2b 100644
--- a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body}}
   <p>{{i18n "review.approval.description"}}</p>
 
-  <p>{{{i18n "review.approval.pending_posts" count=model.pending_count}}}</p>
+  <p>{{i18n "review.approval.pending_posts" count=model.pending_count}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="review.approval.ok"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index 36ede3f634..c6539a2e52 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{{i18n 'user.second_factor.enable_security_key_description'}}}
+        {{i18n 'user.second_factor.enable_security_key_description'}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index 2b52edea7b..9caf24fc46 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{{i18n 'user.second_factor.enable_description'}}}
+        {{i18n 'user.second_factor.enable_description'}}
       </div>
     </div>
 
@@ -18,7 +18,7 @@
       <div class="controls">
         <div class="qr-code-container">
           <div class="qr-code">
-            {{{secondFactorImage}}}
+            {{html-safe secondFactorImage}}
           </div>
         </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
index 5981f4a118..713bdbfcc4 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
@@ -14,7 +14,7 @@
     {{/if}}
 
     {{#if backupEnabled}}
-      {{{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}}
+      {{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}
     {{/if}}
 
     <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index 9b10ef6c29..fe3ce8be48 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,4 +1,4 @@
 {{#d-modal-body}}
-  <p>{{{i18n 'topics.bulk.selected' count=model.topics.length}}}</p>
+  <p>{{i18n 'topics.bulk.selected' count=model.topics.length}}</p>
   {{outlet "bulkOutlet"}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index f45a2e5014..6d44492afe 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -9,7 +9,7 @@
         width=category.uploaded_logo.width
         height=category.uploaded_logo.height}}
       {{#if category.description}}
-        <p>{{{dir-span category.description}}}</p>
+        <p>{{dir-span category.description}}</p>
       {{/if}}
     {{/if}}
   </section>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index fd8f57c54c..fc6c00a13b 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -86,7 +86,7 @@
           <h2>{{i18n "user.second_factor_backup.title"}}</h2>
           {{#if model.second_factor_enabled}}
             {{#if model.second_factor_backup_enabled}}
-              {{{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}}
+              {{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}
             {{else}}
               {{i18n 'user.second_factor_backup.enable_long'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 8a505401fa..62743b5a5a 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -9,7 +9,7 @@
   </div>
   {{#if siteSettings.enable_mentions}}
     <div class='instructions'>
-      {{{i18n 'user.username.short_instructions' username=model.username}}}
+      {{i18n 'user.username.short_instructions' username=model.username}}
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index d277cea511..bd9aa411ac 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -73,7 +73,7 @@
   <div class='control-group pref-mailing-list-mode'>
     <label class="control-label">{{i18n 'user.mailing_list_mode.label'}}</label>
     {{preference-checkbox labelKey="user.mailing_list_mode.enabled" checked=model.user_option.mailing_list_mode}}
-    <div class='instructions'>{{{i18n 'user.mailing_list_mode.instructions'}}}</div>
+    <div class='instructions'>{{i18n 'user.mailing_list_mode.instructions'}}</div>
     {{#if model.user_option.mailing_list_mode}}
       <div class='controls controls-dropdown'>
         {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index b0040894dc..e6fe5381ed 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -66,7 +66,7 @@
     <label class="control-label">{{i18n 'user.featured_topic'}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
-      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
+      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
       </label>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index 107f4350f8..aee9390704 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -2,7 +2,7 @@
   {{#watch-read action=(action "markFaqRead") path=model.path}}
     <div class='contents clearfix body-page'>
       {{plugin-outlet name="above-static"}}
-      {{{model.html}}}
+      {{html-safe model.html}}
 
       {{#if showSignupButton}}
         {{d-button action=(route-action "showCreateAccount") class="btn-primary sign-up-button" label="sign_up"}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index bcb1a81b0f..7950ca19ec 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -74,7 +74,7 @@
             {{#if model.details.loaded}}
               {{topic-status topic=model}}
               <a href={{model.url}} {{action "jumpTop"}} class="fancy-title">
-                {{{model.fancyTitle}}}
+                {{html-safe model.fancyTitle}}
               </a>
             {{/if}}
 
@@ -264,7 +264,7 @@
               {{#if model.queued_posts_count}}
                 <div class="has-pending-posts">
                   <div>
-                    {{{i18n "review.topic_has_pending" count=model.queued_posts_count}}}
+                    {{i18n "review.topic_has_pending" count=model.queued_posts_count}}
                   </div>
 
                   {{#link-to 'review' (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
@@ -351,7 +351,7 @@
     <div class="container">
       {{#conditional-loading-spinner condition=noErrorYet}}
         {{#if model.errorHtml}}
-          <div class="not-found">{{{model.errorHtml}}}</div>
+          <div class="not-found">{{html-safe model.errorHtml}}</div>
         {{else}}
           <div class="topic-error">
             <div>{{model.errorMessage}}</div>
diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/templates/unknown.hbs
index 0e9e6b9625..5ff548e033 100644
--- a/app/assets/javascripts/discourse/templates/unknown.hbs
+++ b/app/assets/javascripts/discourse/templates/unknown.hbs
@@ -1,3 +1,3 @@
 <div class='container'>
-  {{{model}}}
+  {{html-safe model}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 517e147e90..f8f5effb60 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -72,11 +72,11 @@
                       <td>{{format-date invite.user.last_seen_at}}</td>
                       <td>{{number invite.user.topics_entered}}</td>
                       <td>{{number invite.user.posts_read_count}}</td>
-                      <td>{{{format-duration invite.user.time_read}}}</td>
+                      <td>{{format-duration invite.user.time_read}}</td>
                       <td>
-                        <span title={{i18n 'user.invited.days_visited'}}>{{{invite.user.days_visited}}}</span>
+                        <span title={{i18n 'user.invited.days_visited'}}>{{html-safe invite.user.days_visited}}</span>
                           /
-                        <span title={{i18n 'user.invited.account_age_days'}}>{{{invite.user.days_since_created}}}</span>
+                        <span title={{i18n 'user.invited.account_age_days'}}>{{html-safe invite.user.days_since_created}}</span>
                       </td>
                     {{/if}}
                   {{else}}
@@ -109,7 +109,7 @@
         {{else}}
           <div class="user-invite-none">
             {{#if canBulkInvite}}
-              {{{i18n 'user.invited.bulk_invite.none'}}}
+              {{i18n 'user.invited.bulk_invite.none'}}
             {{else}}
               {{i18n 'user.invited.none'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index d1c61ab805..377177843e 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -100,7 +100,7 @@
             {{#if showFeaturedTopic}}
               <h3 class="featured-topic">
                 <span>{{i18n 'user.featured_topic'}}</span>
-                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
+                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
               </h3>
             {{/if}}
 
@@ -137,7 +137,7 @@
                 </div>
               {{/if}}
               {{#if isNotSuspendedOrIsStaff}}
-                {{{model.bio_cooked}}}
+                {{html-safe model.bio_cooked}}
               {{/if}}
             </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index 1af06a86d9..de791d9420 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,4 +1,4 @@
 {{#if model.noContent}}
-  <div class='alert alert-info'>{{{model.noContentHelp}}}</div>
+  <div class='alert alert-info'>{{html-safe model.noContentHelp}}</div>
 {{/if}}
 {{user-stream stream=model}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 71b4737522..26ee193bde 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -87,7 +87,7 @@
               </a>
               <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
               <br>
-              <a href="{{link.post_url}}">{{{link.topic.fancyTitle}}}</a>
+              <a href="{{link.post_url}}">{{html-safe link.topic.fancyTitle}}</a>
             </li>
           {{/each}}
         </ul>
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index db51a397f8..cff579c047 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -9,8 +9,8 @@
   </div>
 
   {{#if shouldDisplayDescription}}
-    <div class="category-desc">{{{dir-span description}}}</div>
+    <div class="category-desc">{{dir-span description}}</div>
   {{/if}}
 {{else}}
-  {{{label}}}
+  {{html-safe label}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
index 1c070006ad..e654ef8a11 100644
--- a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
@@ -8,6 +8,6 @@
 {{/if}}
 
 <div class="texts">
-  <span class="name">{{{label}}}</span>
-  <span class="desc">{{{description}}}</span>
+  <span class="name">{{html-safe label}}</span>
+  <span class="desc">{{html-safe description}}</span>
 </div>
diff --git a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
index 31fc07f1dc..f54bdb6b5f 100644
--- a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
@@ -1,5 +1,5 @@
 {{pinned-options value=pinned topic=topic}}
 
 <p class="reason">
-  {{{reasonText}}}
+  {{html-safe reasonText}}
 </p>
diff --git a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
index 2bf3a9a122..a57b6b8584 100644
--- a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
@@ -10,6 +10,6 @@
 
 {{#if appendReason}}
   <p class="reason">
-    {{{topic.details.notificationReasonText}}}
+    {{html-safe topic.details.notificationReasonText}}
   </p>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index e93347513a..c3a82790be 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -8,7 +8,7 @@
   </span>
   {{#if extraLabel}}
     <span class='extra-label'>
-      {{{extraLabel}}}
+      {{html-safe extraLabel}}
     </span>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
index 8f804940fb..7510570b5d 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
@@ -2,7 +2,7 @@
   <span class='label-value'>{{field.label}}</span>
 
   {{#if field.description}}
-    <div class='field-description'>{{{field.description}}}</div>
+    <div class='field-description'>{{html-safe field.description}}</div>
   {{/if}}
 </label>
 
@@ -11,5 +11,5 @@
 </div>
 
 {{#if field.errorDescription}}
-  <div class='field-error-description'>{{{field.errorDescription}}}</div>
+  <div class='field-error-description'>{{html-safe field.errorDescription}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index beb821930d..4f0686acf7 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -8,7 +8,7 @@
   {{/if}}
 
   {{#if step.description}}
-    <p class='wizard-step-description'>{{{step.description}}}</p>
+    <p class='wizard-step-description'>{{html-safe step.description}}</p>
   {{/if}}
 
   {{#wizard-step-form step=step}}
diff --git a/lib/onebox/templates/discourse_topic_onebox.hbs b/lib/onebox/templates/discourse_topic_onebox.hbs
index 856d3342d4..63a04fcc76 100644
--- a/lib/onebox/templates/discourse_topic_onebox.hbs
+++ b/lib/onebox/templates/discourse_topic_onebox.hbs
@@ -1,10 +1,10 @@
 <aside class='quote' data-post="{{post_number}}" data-topic="{{topic_id}}">
   <div class='title'>
     <div class='quote-controls'></div>
-    {{{avatar}}}
-    <a href="{{original_url}}">{{{title}}}</a> {{{category_html}}}
+    {{html-safe avatar}}
+    <a href="{{original_url}}">{{html-safe title}}</a> {{html-safe category_html}}
   </div>
   <blockquote>
-    {{{quote}}}
+    {{html-safe quote}}
   </blockquote>
 </aside>
diff --git a/lib/onebox/templates/discourse_user_onebox.hbs b/lib/onebox/templates/discourse_user_onebox.hbs
index 60db7491c1..de1336dd92 100644
--- a/lib/onebox/templates/discourse_user_onebox.hbs
+++ b/lib/onebox/templates/discourse_user_onebox.hbs
@@ -1,7 +1,7 @@
 <aside class="onebox">
   <article class="onebox-body user-onebox">
-    {{{avatar}}}
-    <h3><a href="{{original_url}}">{{{username}}}</a></h3>
+    {{html-safe avatar}}
+    <h3><a href="{{original_url}}">{{html-safe username}}</a></h3>
     <div>
       {{#name}}
         <span class="full-name">{{name}}</span>
@@ -11,7 +11,7 @@
           <svg class="fa d-icon d-icon-map-marker-alt svg-icon" xmlns="http://www.w3.org/2000/svg">
             <use xlink:href="#map-marker-alt"></use>
           </svg>
-          {{{location}}}
+          {{html-safe location}}
         </span>
       {{/location}}
       {{#website}}
@@ -19,12 +19,12 @@
           <svg class="fa d-icon d-icon-globe-americas svg-icon" xmlns="http://www.w3.org/2000/svg">
             <use xlink:href="#globe-americas"></use>
           </svg>
-          <a href="{{website}}">{{{website_name}}}</a>
+          <a href="{{website}}">{{html-safe website_name}}</a>
         </span>
       {{/website}}
     </div>
     {{#bio}}
-      <p>{{{bio}}}</p>
+      <p>{{html-safe bio}}</p>
     {{/bio}}
     <span>{{joined}} {{created_at}}</span>
   </article>
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index d7e73c3d08..6fb9ecf7c6 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -85,7 +85,7 @@
             <label class="control-label">
               {{i18n "discourse_local_dates.create.form.recurring_title"}}
             </label>
-            <p>{{{i18n "discourse_local_dates.create.form.recurring_description"}}}</p>
+            <p>{{i18n "discourse_local_dates.create.form.recurring_description"}}</p>
             <div class="controls">
               {{combo-box
                 content=recurringOptions
diff --git a/test/javascripts/components/html-safe-helper-test.js.es6 b/test/javascripts/components/html-safe-helper-test.js.es6
new file mode 100644
index 0000000000..364f99a6e4
--- /dev/null
+++ b/test/javascripts/components/html-safe-helper-test.js.es6
@@ -0,0 +1,14 @@
+import componentTest from "helpers/component-test";
+moduleForComponent("html-safe-helper", { integration: true });
+
+componentTest("default", {
+  template: "{{html-safe string}}",
+
+  beforeEach() {
+    this.set("string", "<p class='cookies'>biscuits</p>");
+  },
+
+  async test(assert) {
+    assert.ok(exists("p.cookies"), "it displays the string as html");
+  }
+});
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js.es6
index 0a94485f44..253673e5b6 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -5,7 +5,8 @@ import {
   propertyNotEqual,
   fmt,
   i18n,
-  url
+  url,
+  htmlSafe
 } from "discourse/lib/computed";
 
 QUnit.module("lib:computed", {
@@ -154,3 +155,12 @@ QUnit.test("url", assert => {
     "it supports urls with a prefix"
   );
 });
+
+QUnit.test("htmlSafe", assert => {
+  const cookies = "<p>cookies and <b>biscuits</b></p>";
+  const t = EmberObject.extend({
+    desc: htmlSafe("cookies")
+  }).create({ cookies });
+
+  assert.equal(t.get("desc").string, cookies);
+});

From 3f2c0b42fecfa42dde620db22148757a1d7d4d7c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 10 Mar 2020 17:17:54 +0100
Subject: [PATCH 058/633] FIX: throttles topic tracking shortcut and enforces
 topic id (#9159)

---
 .../discourse/lib/keyboard-shortcuts.js.es6   | 27 +++++++------------
 .../topic-notifications-button.js.es6         | 11 ++++++++
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index cf22919b07..69f42cfee1 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -3,6 +3,7 @@ import DiscourseURL from "discourse/lib/url";
 import Composer from "discourse/models/composer";
 import { minimumOffset } from "discourse/lib/offset-calculator";
 import { ajax } from "discourse/lib/ajax";
+import { throttle } from "@ember/runloop";
 
 const bindings = {
   "!": { postAction: "showFlags" },
@@ -298,34 +299,26 @@ export default {
   },
 
   setTrackingToMuted(event) {
-    this.appEvents.trigger("topic-notifications-button:changed", {
-      type: "notification",
-      id: 0,
-      event
-    });
+    throttle(this, "_setTracking", { id: 0, event }, 250, true);
   },
 
   setTrackingToRegular(event) {
-    this.appEvents.trigger("topic-notifications-button:changed", {
-      type: "notification",
-      id: 1,
-      event
-    });
+    throttle(this, "_setTracking", { id: 1, event }, 250, true);
   },
 
   setTrackingToTracking(event) {
-    this.appEvents.trigger("topic-notifications-button:changed", {
-      type: "notification",
-      id: 2,
-      event
-    });
+    throttle(this, "_setTracking", { id: 2, event }, 250, true);
   },
 
   setTrackingToWatching(event) {
+    throttle(this, "_setTracking", { id: 3, event }, 250, true);
+  },
+
+  _setTracking(params) {
     this.appEvents.trigger("topic-notifications-button:changed", {
       type: "notification",
-      id: 3,
-      event
+      id: params.id,
+      event: params.event
     });
   },
 
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6
index 4ff6b5d151..747685c2ae 100644
--- a/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6
@@ -28,6 +28,17 @@ export default Component.extend({
   },
 
   _changeTopicNotificationLevel(level) {
+    // this change is coming from a keyboard event
+    if (level.event) {
+      const topicSectionNode = level.event.target.querySelector("#topic");
+      if (topicSectionNode && topicSectionNode.dataset.topicId) {
+        const topicId = parseInt(topicSectionNode.dataset.topicId, 10);
+        if (topicId && topicId !== this.topic.id) {
+          return;
+        }
+      }
+    }
+
     if (level.id !== this.notificationLevel) {
       this.topic.details.updateNotifications(level.id);
     }

From 74acbad505800a9a3317a631a2333be1e34992b5 Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Tue, 10 Mar 2020 13:20:11 -0400
Subject: [PATCH 059/633] FIX: don't break the private key when writing it out
 during theme import

* when importing a private theme using the themes:install rake task the SSH key is written out to a file for use by the git-clone command
* if the private key is written out without a newline at end-of-file (i.e. after it's been stripped) it's not recognized as a valid key by SSH
* so: don't strip it when writing it out, we should be fine
---
 lib/theme_store/git_importer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/theme_store/git_importer.rb b/lib/theme_store/git_importer.rb
index 0fccf3886c..c73d44f807 100644
--- a/lib/theme_store/git_importer.rb
+++ b/lib/theme_store/git_importer.rb
@@ -107,7 +107,7 @@ class ThemeStore::GitImporter
     ssh_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_ssh_#{SecureRandom.hex}"
     FileUtils.mkdir_p ssh_folder
 
-    File.write("#{ssh_folder}/id_rsa", @private_key.strip)
+    File.write("#{ssh_folder}/id_rsa", @private_key)
     FileUtils.chmod(0600, "#{ssh_folder}/id_rsa")
 
     begin

From f795c1b8e8610bfe7369c348ebadd33940dc9f53 Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Tue, 10 Mar 2020 15:00:12 -0300
Subject: [PATCH 060/633] Revert "DEV: enforces ember-template-lint:
 no-triple-curlies (#9150)"

This reverts commit d436b600fba4cea846a5e96c235c507441965e05.

Triple curlies are still necessary for some raw templates.
---
 .template-lintrc.js                           |  3 +-
 .../admin/templates/badges-award.hbs          |  6 +-
 .../admin/templates/badges-index.hbs          |  2 +-
 .../components/admin-report-storage-stats.hbs |  2 +-
 .../components/admin-report-table-cell.hbs    |  2 +-
 .../templates/components/admin-report.hbs     |  2 +-
 .../components/admin-user-field-item.hbs      |  2 +-
 .../components/penalty-post-action.hbs        |  2 +-
 .../templates/components/silence-details.hbs  |  2 +-
 .../components/site-settings/bool.hbs         |  2 +-
 .../site-settings/category-list.hbs           |  2 +-
 .../components/site-settings/category.hbs     |  2 +-
 .../components/site-settings/color.hbs        |  2 +-
 .../components/site-settings/compact-list.hbs |  2 +-
 .../components/site-settings/enum.hbs         |  2 +-
 .../components/site-settings/group-list.hbs   |  2 +-
 .../components/site-settings/host-list.hbs    |  2 +-
 .../components/site-settings/list.hbs         |  2 +-
 .../components/site-settings/secret-list.hbs  |  2 +-
 .../components/site-settings/string.hbs       |  2 +-
 .../components/site-settings/tag-list.hbs     |  2 +-
 .../components/site-settings/upload.hbs       |  2 +-
 .../site-settings/uploaded-image-list.hbs     |  2 +-
 .../components/site-settings/url-list.hbs     |  2 +-
 .../components/site-settings/value-list.hbs   |  2 +-
 .../components/suspension-details.hbs         |  4 +-
 .../templates/components/themes-list-item.hbs |  6 +-
 .../templates/components/themes-list.hbs      |  6 +-
 .../templates/customize-themes-index.hbs      |  4 +-
 .../admin/templates/customize-themes-show.hbs |  2 +-
 .../admin/templates/dashboard-problems.hbs    |  2 +-
 .../admin/templates/dashboard_general.hbs     |  2 +-
 .../admin/templates/email-advanced-test.hbs   |  4 +-
 .../admin/templates/email-preview-digest.hbs  |  2 +-
 .../javascripts/admin/templates/embedding.hbs |  2 +-
 .../templates/logs/staff-action-logs.hbs      |  2 +-
 .../templates/modal/admin-badge-preview.hbs   |  8 +-
 .../templates/modal/admin-install-theme.hbs   |  8 +-
 .../templates/modal/admin-theme-change.hbs    |  2 +-
 .../templates/modal/admin-theme-item.hbs      |  2 +-
 .../admin/templates/search-logs-term.hbs      |  4 +-
 .../admin/templates/user-index.hbs            |  8 +-
 .../admin/templates/users-list-show.hbs       |  8 +-
 .../discourse-common/helpers/html-safe.js.es6 |  6 --
 .../discourse-common/helpers/i18n.js.es6      |  3 +-
 .../discourse/components/text-overflow.js.es6 | 11 ---
 .../discourse/helpers/application.js.es6      | 12 ++-
 .../discourse/helpers/dir-span.js.es6         |  3 +-
 .../discourse/helpers/format-age.js.es6       |  5 +-
 .../javascripts/discourse/lib/computed.js.es6 | 16 ----
 .../javascripts/discourse/templates/about.hbs |  2 +-
 .../templates/account-created/index.hbs       |  2 +-
 .../templates/account-created/resent.hbs      |  2 +-
 .../discourse/templates/badges/show.hbs       |  2 +-
 .../templates/components/about-page-users.hbs |  2 +-
 .../templates/components/badge-card.hbs       |  2 +-
 .../templates/components/categories-boxes.hbs |  2 +-
 .../templates/components/categories-only.hbs  |  8 +-
 .../templates/components/d-button.hbs         |  2 +-
 .../templates/components/d-editor.hbs         |  2 +-
 .../templates/components/discourse-banner.hbs |  4 +-
 .../components/discourse-linked-text.hbs      |  2 +-
 .../components/edit-category-general.hbs      |  6 +-
 .../components/edit-category-security.hbs     |  2 +-
 .../templates/components/featured-topic.hbs   |  4 +-
 .../templates/components/flag-action-type.hbs |  4 +-
 .../templates/components/footer-message.hbs   |  2 +-
 .../templates/components/global-notice.hbs    |  4 +-
 .../components/group-card-contents.hbs        |  2 +-
 .../templates/components/group-post.hbs       |  6 +-
 .../templates/components/invite-panel.hbs     |  4 +-
 .../templates/components/ip-lookup.hbs        |  2 +-
 .../components/mobile-category-topic.hbs      |  2 +-
 .../templates/components/related-messages.hbs |  2 +-
 .../reviewable-conversation-post.hbs          |  2 +-
 .../components/reviewable-flagged-post.hbs    |  2 +-
 .../templates/components/reviewable-item.hbs  |  2 +-
 .../templates/components/reviewable-score.hbs |  2 +-
 .../components/second-factor-form.hbs         |  2 +-
 .../templates/components/share-panel.hbs      |  2 +-
 .../templates/components/share-popup.hbs      |  2 +-
 .../templates/components/share-source.hbs     |  2 +-
 .../components/shared-draft-controls.hbs      |  2 +-
 .../templates/components/suggested-topics.hbs |  2 +-
 .../templates/components/tag-info.hbs         |  2 +-
 .../templates/components/text-overflow.hbs    |  2 +-
 .../templates/components/topic-entrance.hbs   |  4 +-
 .../components/user-card-contents.hbs         |  2 +-
 .../components/user-fields/confirm.hbs        |  4 +-
 .../components/user-fields/dropdown.hbs       |  4 +-
 .../templates/components/user-fields/text.hbs |  4 +-
 .../templates/components/user-stat.hbs        |  2 +-
 .../templates/components/user-stream-item.hbs |  8 +-
 .../components/user-summary-topic.hbs         |  2 +-
 .../discourse/templates/composer.hbs          |  4 +-
 .../templates/composer/custom-body.hbs        |  2 +-
 .../templates/composer/education.hbs          |  2 +-
 .../templates/composer/group-mentioned.hbs    |  2 +-
 .../discourse/templates/discovery.hbs         |  2 +-
 .../discourse/templates/full-page-search.hbs  |  6 +-
 .../javascripts/discourse/templates/group.hbs |  2 +-
 .../discourse/templates/groups/index.hbs      |  2 +-
 .../discourse/templates/invites/show.hbs      |  4 +-
 .../templates/list/activity-column.hbr        |  2 +-
 .../templates/list/topic-excerpt.hbr          |  2 +-
 .../mobile/components/basic-topic-list.hbs    |  4 +-
 .../mobile/components/categories-only.hbs     |  2 +-
 .../mobile/components/mobile-nav.hbs          |  2 +-
 .../templates/modal/activation-resent.hbs     |  2 +-
 .../discourse/templates/modal/auth-token.hbs  |  6 +-
 .../templates/modal/avatar-selector.hbs       |  6 +-
 .../discourse/templates/modal/bookmark.hbs    |  2 +-
 .../modal/bulk-notification-level.hbs         |  2 +-
 .../templates/modal/change-owner.hbs          |  2 +-
 .../templates/modal/create-account.hbs        |  2 +-
 .../modal/delete-topic-disallowed.hbs         |  2 +-
 .../templates/modal/edit-category.hbs         |  2 +-
 .../templates/modal/feature-topic.hbs         | 22 ++---
 .../templates/modal/forgot-password.hbs       |  2 +-
 .../discourse/templates/modal/history.hbs     | 10 +-
 .../modal/keyboard-shortcuts-help.hbs         | 94 +++++++++----------
 .../templates/modal/move-to-topic.hbs         | 10 +-
 .../templates/modal/not-activated.hbs         |  2 +-
 .../templates/modal/post-enqueued.hbs         |  2 +-
 .../modal/second-factor-add-security-key.hbs  |  2 +-
 .../modal/second-factor-add-totp.hbs          |  4 +-
 .../modal/second-factor-backup-edit.hbs       |  2 +-
 .../templates/modal/topic-bulk-actions.hbs    |  2 +-
 .../templates/navigation/category.hbs         |  2 +-
 .../templates/preferences-second-factor.hbs   |  2 +-
 .../templates/preferences/account.hbs         |  2 +-
 .../templates/preferences/emails.hbs          |  2 +-
 .../templates/preferences/profile.hbs         |  2 +-
 .../discourse/templates/static.hbs            |  2 +-
 .../javascripts/discourse/templates/topic.hbs |  6 +-
 .../discourse/templates/unknown.hbs           |  2 +-
 .../discourse/templates/user-invited-show.hbs |  8 +-
 .../javascripts/discourse/templates/user.hbs  |  4 +-
 .../discourse/templates/user/stream.hbs       |  2 +-
 .../discourse/templates/user/summary.hbs      |  2 +-
 .../templates/components/category-row.hbs     |  4 +-
 .../dropdown-select-box-row.hbs               |  4 +-
 .../templates/components/pinned-button.hbs    |  2 +-
 .../components/topic-notifications-button.hbs |  2 +-
 .../templates/components/radio-button.hbs     |  2 +-
 .../templates/components/wizard-field.hbs     |  4 +-
 .../templates/components/wizard-step.hbs      |  2 +-
 .../templates/discourse_topic_onebox.hbs      |  6 +-
 .../templates/discourse_user_onebox.hbs       | 10 +-
 .../discourse-local-dates-create-form.hbs     |  2 +-
 .../components/html-safe-helper-test.js.es6   | 14 ---
 test/javascripts/lib/computed-test.js.es6     | 12 +--
 152 files changed, 284 insertions(+), 345 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
 delete mode 100644 test/javascripts/components/html-safe-helper-test.js.es6

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 29bf420298..6783c6d94e 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -11,7 +11,6 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unused-block-params": true,
     "no-unbound": true,
-    "simple-unless": true,
-    "no-triple-curlies": true
+    "simple-unless": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/badges-award.hbs b/app/assets/javascripts/admin/templates/badges-award.hbs
index d0082dc349..b13462bf33 100644
--- a/app/assets/javascripts/admin/templates/badges-award.hbs
+++ b/app/assets/javascripts/admin/templates/badges-award.hbs
@@ -9,11 +9,11 @@
           {{icon-or-image model}}
           <span class="badge-display-name">{{model.name}}</span>
         {{else}}
-          <span class='badge-placeholder'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+          <span class='badge-placeholder'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
         {{/if}}
       </div>
       <div>
-        <h4>{{i18n 'admin.badges.mass_award.upload_csv'}}</h4>
+        <h4>{{I18n 'admin.badges.mass_award.upload_csv'}}</h4>
         <input type='file' id='massAwardCSVUpload' accept='.csv'>
       </div>
       <div>
@@ -34,6 +34,6 @@
       {{/link-to}}
     </form>
   {{else}}
-    <span class='badge-required'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+    <span class='badge-required'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 49c5945ea1..fd08e67279 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -7,7 +7,7 @@
         {{#each badgeIntroLinks as |link|}}
           <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
             {{d-icon link.icon}}
-            <span>{{i18n link.text}}</span>
+            <span>{{I18n link.text}}</span>
           </a>
         {{/each}}
       </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index d6e42cd414..fbb9f80a64 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -15,7 +15,7 @@
 
       {{#if backupStats.last_backup_taken_at}}
         <br>
-        {{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}
+        {{{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}}
       {{/if}}
     </p>
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
index fb8f2e4cdc..973e8412be 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
@@ -1 +1 @@
-{{html-safe formatedValue}}
+{{{formatedValue}}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 48bd58cab9..be9c2ee8d7 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -199,6 +199,6 @@
 {{/conditional-loading-section}}
 {{else}}
   <div class="alert alert-info">
-    {{html-safe disabledLabel}}
+    {{{disabledLabel}}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index 211cc00b51..269d6babc2 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -46,7 +46,7 @@
     <div class="form-display">
       <strong>{{userField.name}}</strong>
       <br>
-      {{html-safe userField.description}}
+      {{{userField.description}}}
     </div>
     <div class="form-display">{{fieldName}}</div>
     <div class="form-element controls">
diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
index a6c848541f..1a672329cd 100644
--- a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
+++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
@@ -1,7 +1,7 @@
 <div class='penalty-post-controls'>
   <label>
     <div class='penalty-post-label'>
-      {{i18n 'admin.user.penalty_post_actions'}}
+      {{{i18n 'admin.user.penalty_post_actions'}}}
     </div>
   </label>
   {{combo-box
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index af1b4980d5..3f7c19d5ba 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -1,7 +1,7 @@
 <div class='reason-controls'>
   <label>
     <div class='silence-reason-label'>
-      {{i18n 'admin.user.silence_reason_label'}}
+      {{{i18n 'admin.user.silence_reason_label'}}}
     </div>
     </label>
     {{text-field
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
index 11384580c1..1c6c2101ae 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
@@ -1,5 +1,5 @@
 <label>
   {{input type="checkbox" checked=enabled}}
-  <span>{{html-safe setting.description}}</span>
+  <span>{{{setting.description}}}</span>
   {{setting-validation-message message=validationMessage}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index b9609e2843..6d8871b306 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -3,5 +3,5 @@
   onChange=(action "onChangeSelectedCategories")
 }}
 
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
index 4358b408de..4f23fcc021 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
@@ -4,4 +4,4 @@
   onChange=(action (mut value))
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
index 7b9b5bf2a8..baf81ab389 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
@@ -6,4 +6,4 @@
   onChangeColor=(action "onChangeColor")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class="desc">{{html-safe setting.description}}</div>
+<div class="desc">{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
index 1e7e369b93..621baec0b1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
@@ -8,4 +8,4 @@
 }}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index 0b4104086e..dc33e28df5 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -15,5 +15,5 @@
 {{setting-validation-message message=validationMessage}}
 
 <div class='desc'>
-  {{html-safe setting.description}}
+  {{{setting.description}}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
index 091573eb53..8f4263a72e 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
@@ -7,4 +7,4 @@
   onChange=(action "onChangeGroupListSetting")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
index 70366aba38..5277c26c69 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_host"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
index 090cc2a5f1..268723c92d 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value inputDelimiter="|" choices=setting.choices}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
index 7451959841..a4ff6f1bd4 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
@@ -1,3 +1,3 @@
 {{secret-value-list setting=setting values=value isSecret=isSecret}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index 160f041df9..d71278f723 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -7,4 +7,4 @@
 {{/if}}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 21e7e1ab0a..271e4d0326 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
 {{tag-chooser tags=selectedTags}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
index 2758b7be5a..86940d8633 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
@@ -1,2 +1,2 @@
 {{site-settings-image-uploader imageUrl=value placeholderUrl=setting.placeholder type="site_setting"}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
index 146c9d3722..82dc38d653 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,2 +1,2 @@
 {{d-button label="admin.site_settings.uploaded_image_list.label" action=(action "showUploadModal") actionParam=(hash value=value setting=setting)}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
index 7a6cdc517b..67db58f8ea 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_url"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
index 234ec83f3c..3003b375ee 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
index 4dcc606b2b..0f2aa0fc84 100644
--- a/app/assets/javascripts/admin/templates/components/suspension-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -2,9 +2,9 @@
   <label>
     <div class='suspend-reason-label'>
       {{#if siteSettings.hide_suspension_reasons}}
-        {{i18n 'admin.user.suspend_reason_hidden_label'}}
+        {{{i18n 'admin.user.suspend_reason_hidden_label'}}}
       {{else}}
-        {{i18n 'admin.user.suspend_reason_label'}}
+        {{{i18n 'admin.user.suspend_reason_label'}}}
       {{/if}}
     </div>
   </label>
diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
index 0c253e0214..1286937f8a 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
@@ -28,14 +28,14 @@
 
   {{#if displayComponents}}
     <div class="components-list">
-      <span class="components">{{html-safe childrenString}}</span>
+      <span class="components">{{{childrenString}}}</span>
 
       {{#if displayHasMore}}
         <a href {{action "toggleChildrenExpanded"}} class="others-count">
           {{#if childrenExpanded}}
-            {{i18n "admin.customize.theme.collapse"}}
+            {{I18n "admin.customize.theme.collapse"}}
           {{else}}
-            {{i18n "admin.customize.theme.and_x_more" count=moreCount}}
+            {{I18n "admin.customize.theme.and_x_more" count=moreCount}}
           {{/if}}
         </a>
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
index 4654371a23..29935b95b8 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -25,9 +25,9 @@
         <div class="themes-list-item inactive-indicator">
           <span class="empty">
             {{#if themesTabActive}}
-              {{i18n "admin.customize.theme.inactive_themes"}}
+              {{I18n "admin.customize.theme.inactive_themes"}}
             {{else}}
-              {{i18n "admin.customize.theme.inactive_components"}}
+              {{I18n "admin.customize.theme.inactive_components"}}
             {{/if}}
           </span>
         </div>
@@ -41,7 +41,7 @@
     {{/if}}
   {{else}}
     <div class="themes-list-item">
-      <span class="empty">{{i18n "admin.customize.theme.empty"}}</span>
+      <span class="empty">{{I18n "admin.customize.theme.empty"}}</span>
     </div>
   {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 32ad33db10..0a6060724b 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -1,7 +1,7 @@
 <div class="themes-intro admin-intro">
   <img src={{womanArtistEmojiURL}}>
   <div class="content-wrapper">
-    <h1>{{i18n "admin.customize.theme.themes_intro"}}</h1>
+    <h1>{{I18n "admin.customize.theme.themes_intro"}}</h1>
      <div class="create-actions">
       {{d-button action=(route-action "installModal") icon="upload" label="admin.customize.install" class="btn-primary"}}
     </div>
@@ -9,7 +9,7 @@
       {{#each externalResources as |resource|}}
         <a href={{resource.link}} class="external-link" rel="noopener" target="_blank">
           {{d-icon resource.icon}}
-          {{i18n resource.key}}
+          {{I18n resource.key}}
         </a>
       {{/each}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index b4c4e9a8f4..9fb7fcb4cf 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -89,7 +89,7 @@
 
         {{#if showRemoteError}}
           <div class="error-message">
-            {{d-icon "exclamation-triangle"}} {{i18n "admin.customize.theme.repo_unreachable"}}
+            {{d-icon "exclamation-triangle"}} {{I18n "admin.customize.theme.repo_unreachable"}}
           </div>
           <div class="raw-error">
             <code>{{model.remoteError}}</code>
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
index 5f95987e73..0f0b1f9d29 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
@@ -12,7 +12,7 @@
         <div class="problem-messages">
           <ul>
             {{#each problems as |problem|}}
-              <li>{{html-safe problem}}</li>
+              <li>{{{problem}}}</li>
             {{/each}}
           </ul>
         </div>
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index d190b7664b..19f892ab0f 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -142,7 +142,7 @@
         filters=trendingSearchFilters
         isEnabled=logSearchQueriesEnabled
         disabledLabel=trendingSearchDisabledLabel}}
-      {{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}
+      {{{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
index f0dcaa5c6a..97a479e2c5 100644
--- a/app/assets/javascripts/admin/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
@@ -14,13 +14,13 @@
   <hr>
   <div class="text">
     <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
-    <pre class="full-reason">{{html-safe text}}</pre>
+    <pre class="full-reason">{{{text}}}</pre>
   </div>
 
   <hr>
   <div class="elided">
     <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
-    <pre class="full-reason">{{html-safe elided}}</pre>
+    <pre class="full-reason">{{{elided}}}</pre>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 7a695659c5..078b642dd4 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -53,7 +53,7 @@
           <iframe srcdoc={{model.html_content}} />
         {{/if}}
       {{else}}
-        <pre>{{html-safe model.text_content}}</pre>
+        <pre>{{{model.text_content}}}</pre>
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index 1777263674..f4ada49e1b 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -23,7 +23,7 @@
 
 {{#if showSecondary}}
   <div class='embedding-secondary'>
-    <p>{{i18n "admin.embedding.sample"}}</p>
+    <p>{{{i18n "admin.embedding.sample"}}}</p>
     {{highlighted-code code=embeddingCode lang="html"}}
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index ab4c70d39e..02c4160b6a 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -88,7 +88,7 @@
               <td class="col value created-at">{{age-with-tooltip item.created_at}}</td>
               <td class="col value details">
                 <div>
-                  {{html-safe item.formattedDetails}}
+                  {{{item.formattedDetails}}}
                   {{#if item.useCustomModalForDetails}}
                     <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
                   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index 528ed5af24..ef36e4aa05 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -17,9 +17,9 @@
   {{else}}
     <p class="grant-count">
       {{#if count}}
-        {{i18n "admin.badges.preview.grant_count" count=count}}
+        {{{i18n "admin.badges.preview.grant_count" count=count}}}
       {{else}}
-        {{i18n "admin.badges.preview.no_grant_count"}}
+        {{{i18n "admin.badges.preview.no_grant_count"}}}
       {{/if}}
     </p>
 
@@ -41,14 +41,14 @@
       </p>
       <ul>
         {{#each processedSample as |html|}}
-          <li>{{html-safe html}}</li>
+          <li>{{{html}}}</li>
         {{/each}}
       </ul>
     {{/if}}
 
     {{#if hasQueryPlan}}
       <div class="badge-query-plan">
-        {{html-safe queryPlanHtml}}
+        {{{queryPlanHtml}}}
       </div>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index 5ed497ae57..aab0b17d71 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -24,7 +24,7 @@
 
             <div class="popular-theme-buttons">
               {{#if theme.installed}}
-                <span>{{i18n "admin.customize.theme.installed"}}</span>
+                <span>{{I18n "admin.customize.theme.installed"}}</span>
               {{else}}
                 {{d-button class='btn-small'
                   label="admin.customize.theme.install"
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{i18n "admin.customize.theme.preview"}}</a>
+                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
@@ -85,10 +85,10 @@
 
     {{#if create}}
       <div class="inputs">
-        <div class="label">{{i18n "admin.customize.theme.create_name"}}</div>
+        <div class="label">{{I18n "admin.customize.theme.create_name"}}</div>
         {{input value=name placeholder=placeholder}}
 
-        <div class="label">{{i18n "admin.customize.theme.create_type"}}</div>
+        <div class="label">{{I18n "admin.customize.theme.create_type"}}</div>
         {{combo-box
           valueProperty="value"
           content=createTypes
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
index 7b3ffb5ca5..ec26f608d8 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
@@ -1,6 +1,6 @@
 <div>
   {{#d-modal-body title="admin.logs.staff_actions.modal_title"}}
-    {{html-safe diff}}
+    {{{diff}}}
   {{/d-modal-body}}
   <div class="modal-footer">
     {{d-button
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 724af5ace4..7a5ddc1ea7 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -7,7 +7,7 @@
   </div>
   <div class="popular-theme-buttons">
     {{#if theme.installed}}
-      <span>{{i18n "admin.customize.theme.installed"}}</span>
+      <span>{{I18n "admin.customize.theme.installed"}}</span>
     {{else}}
       {{d-button class='btn-small'
         label="admin.customize.theme.install"
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 27f61f2940..78bd54afb9 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
       <div class='fps-topic'>
         <div class='topic'>
           <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
           </a>
 
           <div class='search-category'>
@@ -55,7 +55,7 @@
 
           {{#if result.blurb}}
             {{#highlight-text highlight=term}}
-              {{html-safe result.blurb}}
+              {{{result.blurb}}}
             {{/highlight-text}}
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 23a1a6aae3..207120eea8 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -132,7 +132,7 @@
     <div class="field">{{i18n "user.avatar.title"}}</div>
     <div class="value">{{avatar model imageSize="large"}}</div>
     <div class="controls">
-      {{i18n "admin.user.visit_profile" url=preferencesPath}}
+      {{{i18n "admin.user.visit_profile" url=preferencesPath}}}
     </div>
   </div>
 
@@ -509,7 +509,7 @@
     <h1>{{i18n "admin.groups.title"}}</h1>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.automatic"}}</div>
-        <div class="value">{{html-safe automaticGroups}}</div>
+        <div class="value">{{{automaticGroups}}}</div>
       </div>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.custom"}}</div>
@@ -616,11 +616,11 @@
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.time_read"}}</div>
-    <div class="value">{{format-duration model.time_read}}</div>
+    <div class="value">{{{format-duration model.time_read}}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "user.invited.days_visited"}}</div>
-    <div class="value">{{html-safe model.days_visited}}</div>
+    <div class="value">{{{model.days_visited}}}</div>
   </div>
 </section>
 
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 6b0253aeda..7d096573b0 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -53,11 +53,11 @@
             </td>
             <td class="last-emailed">
               <div class="label">{{i18n 'admin.users.last_emailed'}}</div>
-              <div>{{format-duration user.last_emailed_age}}</div>
+              <div>{{{format-duration user.last_emailed_age}}}</div>
             </td>
             <td class="last-seen">
               <div class="label">{{i18n 'last_seen'}}</div>
-              <div>{{format-duration user.last_seen_age}}</div>
+              <div>{{{format-duration user.last_seen_age}}}</div>
             </td>
             <td class="topics-entered">
               <div class="label">{{i18n 'admin.user.topics_entered'}}</div>
@@ -69,12 +69,12 @@
             </td>
             <td class="time-read">
               <div class="label">{{i18n 'admin.user.time_read'}}</div>
-              <div>{{format-duration user.time_read}}</div>
+              <div>{{{format-duration user.time_read}}}</div>
             </td>
 
             <td class="created">
               <div class="label">{{i18n 'created'}}</div>
-              <div>{{format-duration user.created_at_age}}</div>
+              <div>{{{format-duration user.created_at_age}}}</div>
             </td>
 
             {{#if siteSettings.must_approve_users}}
diff --git a/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6 b/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
deleted file mode 100644
index dc6d5daf74..0000000000
--- a/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import { registerUnbound } from "discourse-common/lib/helpers";
-import { htmlSafe } from "@ember/template";
-
-registerUnbound("html-safe", function(string) {
-  return htmlSafe(string);
-});
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
index c3d7f1e448..902ed699bf 100644
--- a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
@@ -1,7 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
-import { htmlSafe } from "@ember/template";
 
-registerUnbound("i18n", (key, params) => htmlSafe(I18n.t(key, params)));
+registerUnbound("i18n", (key, params) => I18n.t(key, params));
 registerUnbound("i18n-yes-no", (value, params) =>
   I18n.t(value ? "yes_value" : "no_value", params)
 );
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index 201172f1ef..90a9cc21a2 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,19 +1,8 @@
 import { next } from "@ember/runloop";
-import { htmlSafe } from "@ember/template";
 import Component from "@ember/component";
-
 export default Component.extend({
-  text: null,
-
-  init() {
-    this._super(...arguments);
-
-    this.set("text", htmlSafe(this.text));
-  },
-
   didInsertElement() {
     this._super(...arguments);
-
     next(null, () => {
       const $this = $(this.element);
 
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6
index 27727c1d84..71baa92c91 100644
--- a/app/assets/javascripts/discourse/helpers/application.js.es6
+++ b/app/assets/javascripts/discourse/helpers/application.js.es6
@@ -4,12 +4,14 @@ import {
   autoUpdatingRelativeAge,
   number
 } from "discourse/lib/formatter";
-import { htmlSafe } from "@ember/template";
 
-registerUnbound("raw-date", dt => htmlSafe(longDate(new Date(dt))));
+const safe = Handlebars.SafeString;
 
-registerUnbound("age-with-tooltip", dt =>
-  htmlSafe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
+registerUnbound("raw-date", dt => longDate(new Date(dt)));
+
+registerUnbound(
+  "age-with-tooltip",
+  dt => new safe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
 );
 
 registerUnbound("number", (orig, params) => {
@@ -46,5 +48,5 @@ registerUnbound("number", (orig, params) => {
 
   result += ">" + n + "</span>";
 
-  return htmlSafe(result);
+  return new safe(result);
 });
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
index e210c471fd..d41f1a332e 100644
--- a/app/assets/javascripts/discourse/helpers/dir-span.js.es6
+++ b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
@@ -1,6 +1,5 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { isRTL } from "discourse/lib/text-direction";
-import { htmlSafe } from "@ember/template";
 
 function setDir(text) {
   let content = text ? text : "";
@@ -12,5 +11,5 @@ function setDir(text) {
 }
 
 export default registerUnbound("dir-span", function(str) {
-  return htmlSafe(setDir(str));
+  return new Handlebars.SafeString(setDir(str));
 });
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js.es6 b/app/assets/javascripts/discourse/helpers/format-age.js.es6
index b8874820ed..3141a0da85 100644
--- a/app/assets/javascripts/discourse/helpers/format-age.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-age.js.es6
@@ -1,12 +1,11 @@
 import { autoUpdatingRelativeAge, durationTiny } from "discourse/lib/formatter";
 import { registerUnbound } from "discourse-common/lib/helpers";
-import { htmlSafe } from "@ember/template";
 
 registerUnbound("format-age", function(dt) {
   dt = new Date(dt);
-  return htmlSafe(autoUpdatingRelativeAge(dt));
+  return new Handlebars.SafeString(autoUpdatingRelativeAge(dt));
 });
 
 registerUnbound("format-duration", function(seconds) {
-  return htmlSafe(durationTiny(seconds));
+  return new Handlebars.SafeString(durationTiny(seconds));
 });
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index e238320a38..acd6cde60b 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -1,6 +1,5 @@
 import { computed } from "@ember/object";
 import addonFmt from "ember-addons/fmt";
-import { htmlSafe as htmlSafeTemplateHelper } from "@ember/template";
 
 /**
   Returns whether two properties are equal to each other.
@@ -57,21 +56,6 @@ export function i18n(...args) {
     return I18n.t(addonFmt(format, ...args.map(a => this.get(a))));
   });
 }
-/**
-  Returns htmlSafe version of a string.
-
-  @method htmlSafe
-  @params {String} properties* to htmlify
-  @return {Function} discourseComputedProperty function
-**/
-export function htmlSafe(...args) {
-  return computed(...args, {
-    get() {
-      const path = args.pop();
-      return htmlSafeTemplateHelper(this.get(path));
-    }
-  });
-}
 
 /**
   Uses an Ember String `fmt` call to format a string. See:
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index ad65dbb57e..6e75a04a6d 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -112,7 +112,7 @@
       {{#if contactInfo}}
         <section class='about contact'>
             <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
-            <p>{{html-safe contactInfo}}</p>
+            <p>{{{contactInfo}}}</p>
         </section>
       {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/account-created/index.hbs b/app/assets/javascripts/discourse/templates/account-created/index.hbs
index 8122270cd6..8c9babb1f9 100644
--- a/app/assets/javascripts/discourse/templates/account-created/index.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/index.hbs
@@ -1,5 +1,5 @@
 <div class='ac-message'>
-  {{html-safe accountCreated.message}}
+  {{{accountCreated.message}}}
 </div>
 {{#if accountCreated.show_controls}}
   {{activation-controls sendActivationEmail=(action "sendActivationEmail")
diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
index 5ad9168986..8647596a04 100644
--- a/app/assets/javascripts/discourse/templates/account-created/resent.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
@@ -1,6 +1,6 @@
 <div class='ac-message'>
   {{#if email}}
-    {{i18n 'login.sent_activation_email_again' currentEmail=email}}
+    {{{i18n 'login.sent_activation_email_again' currentEmail=email}}}
   {{else}}
     {{i18n 'login.sent_activation_email_again_generic'}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index fe7b489159..09ded422b3 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -42,7 +42,7 @@
           {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
             <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
             {{#if ub.post_number}}
-              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
+              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
             {{/if}}
           {{/user-info}}
         {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
index 4b7161ba18..f7bfd9886b 100644
--- a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
@@ -3,7 +3,7 @@
     <div class="user-image">
       <div class="user-image-inner">
         <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
-          {{html-safe userTemplate.avatar}}
+          {{{userTemplate.avatar}}}
         </a>
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 4fb6aa77c0..0fdc3bd275 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -11,7 +11,7 @@
   <div class='badge-info'>
     <div class='badge-info-item'>
       <h3><a href={{url}} class='badge-link'>{{badge.name}}</a></h3>
-      <div class='badge-summary'>{{html-safe summary}}</div>
+      <div class='badge-summary'>{{{summary}}}</div>
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 232edea06b..5dc594c691 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -24,7 +24,7 @@
         </div>
 
         <div class='description'>
-          {{text-overflow class="overflow" text=c.description_excerpt}}
+          {{{text-overflow class="overflow" text=c.description_excerpt}}}
         </div>
         {{#if c.isGrandParent}}
           {{#each c.subcategories as |subcategory|}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index ae71465bf0..4f153b4e7f 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -16,7 +16,7 @@
             {{category-title-link category=c}}
             {{#if c.description_excerpt}}
               <div class="category-description">
-                {{dir-span c.description_excerpt}}
+                {{{dir-span c.description_excerpt}}}
               </div>
             {{/if}}
             {{#if c.isGrandParent}}
@@ -28,7 +28,7 @@
                         {{category-title-link tagName="h4" category=subcategory}}
                         {{#if subcategory.description_excerpt}}
                           <div class="category-description subcategory-description">
-                            {{dir-span subcategory.description_excerpt}}
+                            {{{dir-span subcategory.description_excerpt}}}
                           </div>
                         {{/if}}
                         {{#if subcategory.subcategories}}
@@ -45,7 +45,7 @@
                         {{else}}
                           {{#if subcategory.description_excerpt}}
                             <div class="category-description subcategory-description">
-                              {{dir-span subcategory.description_excerpt}}
+                              {{{dir-span subcategory.description_excerpt}}}
                             </div>
                           {{/if}}
                         {{/if}}
@@ -69,7 +69,7 @@
             {{/if}}
           </td>
           <td class="topics">
-            <div title={{c.statTitle}}>{{html-safe c.stat}}</div>
+            <div title={{c.statTitle}}>{{{c.stat}}}</div>
             {{category-unread category=c tagName="div" class="unread-new"}}
           </td>
           {{#if showTopics}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index aeb5f6b6f6..755e4ea857 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -3,7 +3,7 @@
 {{/if}}
 
 {{#if translatedLabel}}
-  <span class='d-button-label'>{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
+  <span class='d-button-label'>{{{translatedLabel}}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 97effd78d4..f868131b63 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -46,7 +46,7 @@
   </div>
 
   <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
-    <div class="d-editor-preview">{{html-safe preview}}</div>
+    <div class="d-editor-preview">{{{preview}}}</div>
     {{plugin-outlet name="editor-preview" classNames="d-editor-plugin" args=outletArgs}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index cda2c2069a..27025bedee 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -3,9 +3,9 @@
     <div id="banner" class={{overlay}}>
       {{d-button icon="times" action="dismiss" class="btn btn-flat close" title="banner.close"}}
       <div id="banner-content">
-        {{html-safe content}}
+        {{{content}}}
         {{#if currentUser.staff}}
-          <p><a href={{banner.url}}>{{i18n "banner.edit"}}</a></p>
+          <p><a href={{banner.url}}>{{{i18n "banner.edit"}}}</a></p>
         {{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
index 78515d0404..dd15a6dc6a 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
@@ -1 +1 @@
-{{html-safe translatedText}}
+{{{translatedText}}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 7884f85e1f..19d6e724dc 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,7 +1,7 @@
 {{#if category.isUncategorizedCategory}}
   <p class="warning">
     {{d-icon "exclamation-triangle"}}
-    {{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}
+    {{{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}}
   </p>
 {{/if}}
 
@@ -36,7 +36,7 @@
     <section class='field'>
       <label>{{i18n 'category.description'}}</label>
       {{#if category.description}}
-        {{html-safe category.description}}
+        {{{category.description}}}
       {{else}}
         {{i18n 'category.no_description'}}
       {{/if}}
@@ -51,7 +51,7 @@
     <section class='field'>
       <label>{{i18n 'category.badge_colors'}}</label>
       <div class="category-color-editor">
-        {{html-safe categoryBadgePreview}}
+        {{{categoryBadgePreview}}}
 
         <div class='input-prepend input-append' style="margin-top: 10px;">
           <span class='color-title'>{{i18n 'category.background_color'}}:</span>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index 5b132092c4..cfde179c32 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -11,7 +11,7 @@
       {{#each category.permissions as |p|}}
         <li>
           <span class="name"><span class="badge-group">{{p.group_name}}</span></span>
-          {{i18n "category.can"}}
+          {{{i18n "category.can"}}}
           <span class="permission">{{p.permission.description}}</span>
           {{#if editingPermissions}}
             <a class="remove-permission" href {{action "removePermission" p}}>{{d-icon "times-circle"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index 10d9d5fcba..655ca8c16e 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,10 +1,10 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href={{topic.lastUnreadUrl}}>{{html-safe topic.fancyTitle}}</a>
+<a class='title' href={{topic.lastUnreadUrl}}>{{{topic.fancyTitle}}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
   <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href={{html-safe topic.lastPosterUrl}}>{{topic.last_poster.username}}</a>
+    {{i18n 'categories.latest_by'}} <a href={{{topic.lastPosterUrl}}}>{{topic.last_poster.username}}</a>
     <a href={{topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index cc7b592b42..e6fe7ca516 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -5,7 +5,7 @@
       <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
 
       <div class='flag-action-type-details'>
-        <span class='description'>{{html-safe flag.description}}</span>
+        <span class='description'>{{{flag.description}}}</span>
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
           <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
@@ -24,7 +24,7 @@
       <div class='flag-action-type-details'>
         <strong>{{formattedName}}</strong>
         {{#if showDescription}}
-          <div class='description'>{{html-safe description}}</div>
+          <div class='description'>{{{description}}}</div>
         {{/if}}
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
diff --git a/app/assets/javascripts/discourse/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
index 03e5c7b8ee..65e3a460df 100644
--- a/app/assets/javascripts/discourse/templates/components/footer-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
@@ -1,4 +1,4 @@
-{{#if education}}<div class="education">{{html-safe education}}</div>{{/if}}
+{{#if education}}<div class="education">{{{education}}}</div>{{/if}}
 <h3>
   {{message}}
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
index 08ff36603f..c2b3b75e2e 100644
--- a/app/assets/javascripts/discourse/templates/components/global-notice.hbs
+++ b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
@@ -2,9 +2,9 @@
   <div class="row">
     <div id="global-notice-{{notice.id}}" class="alert alert-{{notice.options.level}} {{notice.id}}">
       {{#if notice.options.html}}
-        {{html-safe notice.options.html}}
+        {{{notice.options.html}}}
       {{/if}}
-      <span class="text">{{html-safe notice.text}}</span>
+      <span class="text">{{{notice.text}}}</span>
 
       {{#if notice.options.dismissable}}
         {{d-button
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index 7f6104b836..22629d003d 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -43,7 +43,7 @@
 
     {{#if group.bio_cooked}}
       <div class="card-row second-row">
-        <div class='bio'>{{html-safe group.bio_cooked}}</div>
+        <div class='bio'>{{{group.bio_cooked}}}</div>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index d4a9673708..d9880b54b6 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -8,7 +8,7 @@
   <div class='stream-topic-details'>
       <div class='stream-topic-title'>
         <span class='title'>
-          <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
+          <a href={{postUrl}}>{{{post.topic.fancyTitle}}}</a>
         </span>
       </div>
       <div class="group-post-category">{{category-link post.category}}</div>
@@ -24,8 +24,8 @@
 
 <div class='excerpt'>
   {{#if post.expandedExcerpt}}
-    {{html-safe post.expandedExcerpt}}
+    {{{post.expandedExcerpt}}}
   {{else}}
-    {{html-safe post.excerpt}}
+    {{{post.excerpt}}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
index cfdd1431bf..3c13bea09e 100644
--- a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
@@ -1,6 +1,6 @@
 {{#if inviteModel.error}}
   <div class="alert alert-error">
-    {{html-safe errorMessage}}
+    {{{errorMessage}}}
   </div>
 {{/if}}
 
@@ -10,7 +10,7 @@
       {{generated-invite-link link=inviteModel.inviteLink email=emailOrUsername}}
     {{else}}
       <div class="success-message">
-        {{html-safe successMessage}}
+        {{{successMessage}}}
       </div>
     {{/if}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 9b7b7bebc4..dce5918f52 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -14,7 +14,7 @@
       {{d-button action=(action "copy") class="pull-right no-text" icon="copy"}}
     {{/if}}
     <h4>{{i18n "ip_lookup.title"}}</h4>
-    <p class='powered-by'>{{i18n "ip_lookup.powered_by"}}</p>
+    <p class='powered-by'>{{{i18n "ip_lookup.powered_by"}}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
index 3c4fcf9491..e9d901d880 100644
--- a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
@@ -5,7 +5,7 @@
     {{#if topic.unseen}}
       <span class="badge-notification new-topic"></span>
     {{/if}}
-    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{format-age topic.last_posted_at}}</span>
+    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{{format-age topic.last_posted_at}}}</span>
   </div>
 </td>
 <td class='num posts'>{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
index 09e1abb1a1..84b7d42962 100644
--- a/app/assets/javascripts/discourse/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
@@ -10,5 +10,5 @@
 </div>
 
 {{#if targetUser}}
-  <h3 class="see-all-pms-message">{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}</h3>
+  <h3 class="see-all-pms-message">{{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}}</h3>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
index 25aeea0726..1bdcd280ff 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
@@ -3,6 +3,6 @@
     {{#if showUsername}}
       {{#link-to 'user' post.user class="username"}}@{{post.user.username}}{{/link-to}}
     {{/if}}
-    {{html-safe post.excerpt}}
+    {{{post.excerpt}}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
index 2ac3b61ff7..09e196766f 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
@@ -17,7 +17,7 @@
       {{#if reviewable.blank_post}}
         <p>{{i18n "review.deleted_post"}}</p>
       {{else}}
-        {{html-safe reviewable.cooked}}
+        {{{reviewable.cooked}}}
       {{/if}}
     </div>
     {{plugin-outlet name="after-reviewable-flagged-post-body" args=(hash model=reviewable)}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
index 7b3a7a2f2a..2d432a53b4 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
@@ -46,7 +46,7 @@
   <div class='reviewable-actions'>
     {{#if claimEnabled}}
       <div class='claimed-actions'>
-        <span class='help'>{{html-safe claimHelp}}</span>
+        <span class='help'>{{{claimHelp}}}</span>
         {{reviewable-claimed-topic topicId=topicId claimedBy=reviewable.claimed_by}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
index 847cc42154..aa9a2f0fe2 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
@@ -49,7 +49,7 @@
 {{#if rs.reason}}
   <tr>
     <td colspan='7'>
-      <div class='reviewable-score-reason'>{{html-safe rs.reason}}</div>
+      <div class='reviewable-score-reason'>{{{rs.reason}}}</div>
     </td>
   </tr>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
index dc03f52d54..4c5c717be3 100644
--- a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
@@ -1,7 +1,7 @@
 <div id="second-factor">
   <h3>{{secondFactorTitle}}</h3>
   {{#if optionalText}}
-    <p>{{html-safe optionalText}}</p>
+    <p>{{{optionalText}}}</p>
   {{/if}}
   <p>{{secondFactorDescription}}</p>
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index 1808d6cc1f..b166c42071 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -1,5 +1,5 @@
 <div class="header">
-  <h3 class="title">{{html-safe shareTitle}}</h3>
+  <h3 class="title">{{{shareTitle}}}</h3>
 </div>
 
 <div class="body">
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 54e8029cf6..6f0428b1aa 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -1,5 +1,5 @@
 <div class="title">
-  <h3>{{html-safe shareTitle}}</h3>
+  <h3>{{{shareTitle}}}</h3>
 
   {{#if date}}
     <span class="date">{{displayDate}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index eaee0823d0..32fa1adb65 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -2,6 +2,6 @@
   {{#if source.icon}}
     {{d-icon source.icon}}
   {{else}}
-    {{html-safe source.htmlIcon}}
+    {{{source.htmlIcon}}}
   {{/if}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
index d42eb1b177..23b2d45ae2 100644
--- a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
@@ -2,7 +2,7 @@
   {{#if publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
-    {{i18n "shared_drafts.notice" category=topic.category.name}}
+    {{{i18n "shared_drafts.notice" category=topic.category.name}}}
 
     <div class='publish-field'>
       <label>{{i18n "shared_drafts.destination_category"}}</label>
diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
index ae7db1c907..ffd142b1be 100644
--- a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
@@ -13,4 +13,4 @@
   {{/if}}
 </div>
 
-<h3 class="suggested-topics-message">{{html-safe browseMoreMessage}}</h3>
+<h3 class="suggested-topics-message">{{{browseMoreMessage}}}</h3>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
index aa1f4889d1..3b616fec81 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
@@ -32,7 +32,7 @@
     {{#if tagInfo.synonyms}}
       <div class="synonyms-list">
         <h3>{{i18n "tagging.synonyms"}}</h3>
-        <div>{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}</div>
+        <div>{{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}}</div>
         <div class="tag-list">
           {{#each tagInfo.synonyms as |tag|}}
             <div class='tag-box'>
diff --git a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
index 3606bb98a0..05a4439029 100644
--- a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
+++ b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
@@ -1 +1 @@
-{{html-safe text}}
+{{{text}}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
index 227674d60c..7b7fb58b8b 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 {{#d-button action=(action "enterTop") class="full jump-top"}}
-  {{d-icon 'step-backward'}} {{html-safe topDate}}
+  {{d-icon 'step-backward'}} {{{topDate}}}
 {{/d-button}}
 
 {{#d-button action=(action "enterBottom") class="full jump-bottom"}}
-  {{html-safe bottomDate}} {{d-icon 'step-forward'}}
+  {{{bottomDate}}} {{d-icon 'step-forward'}}
 {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 3bfdf96268..f6956782a9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -144,7 +144,7 @@
         <div class="card-row">
           <div class="featured-topic">
             <span class="desc">{{i18n 'user.featured_topic'}}</span>
-            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe user.featured_topic.fancy_title}}{{/link-to}}
+            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{{user.featured_topic.fancy_title}}}{{/link-to}}
           </div>
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index c09e659301..fe91090dde 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,6 +1,6 @@
 {{#if field.name}}
   <label class="control-label" for={{concat 'user-' elementId}}>
-    {{html-safe field.name}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
+    {{{field.name}}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
   </label>
 {{/if}}
 
@@ -8,7 +8,7 @@
   <label class="control-label checkbox-label">
     {{input id=(concat 'user-' elementId) checked=value type="checkbox"}}
     <span>
-      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
+      {{{field.description}}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
     </span>
   </label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index fd3cb91917..136585cb03 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{combo-box
@@ -10,5 +10,5 @@
     none=noneLabel
     onChange=(action (mut value))
   }}
-  <div class="instructions">{{html-safe field.description}}</div>
+  <div class="instructions">{{{field.description}}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 1c33ea1452..4549f721af 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,6 +1,6 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
-  <div class="instructions">{{html-safe field.description}}</div>
+  <div class="instructions">{{{field.description}}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 69704bf892..87b1a220e1 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -9,5 +9,5 @@
 </span>
 <span class='label'>
   {{#if icon}}{{d-icon icon}}{{/if}}
-  {{i18n label count=value}}
+  {{{i18n label count=value}}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index f6da96aa0c..a87439ad35 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -2,7 +2,7 @@
   <a href={{item.userUrl}} data-user-card={{item.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
   <span class='time'>{{format-date item.created_at}}</span>
   {{#if item.draftType}}
-    <span class='draft-type'>{{html-safe item.draftType}}</span>
+    <span class='draft-type'>{{{item.draftType}}}</span>
   {{else}}
     {{expand-post item=item}}
   {{/if}}
@@ -11,9 +11,9 @@
       {{topic-status topic=item disableActions=true}}
       <span class="title">
         {{#if item.postUrl}}
-          <a href={{item.postUrl}}>{{html-safe item.title}}</a>
+          <a href={{item.postUrl}}>{{{item.title}}}</a>
         {{else}}
-          {{html-safe item.title}}
+          {{{item.title}}}
         {{/if}}
       </span>
     </div>
@@ -36,13 +36,11 @@
 {{/if}}
 
 <p class='excerpt' data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}}>
-  {{!-- template-lint-disable no-triple-curlies --}}
   {{~#if item.expandedExcerpt}}
     {{~{item.expandedExcerpt}~}}
   {{else}}
     {{~{item.excerpt}~}}
   {{/if~}}
-  {{!-- template-lint-enable --}}
 </p>
 
 {{#each item.children as |child|}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 970592ece4..07f7c03cd8 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -6,4 +6,4 @@
   {{/if}}
 </span>
 <br>
-<a href={{url}}>{{html-safe topic.fancyTitle}}</a>
+<a href={{url}}>{{{topic.fancyTitle}}}</a>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 43af40a527..ce1e7af458 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -204,7 +204,7 @@
                   {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
                 {{/if}}
               {{else}}
-                <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
+                <a href {{action "togglePreview"}} class='toggle-preview'>{{{toggleText}}}</a>
               {{/if}}
 
           </div>
@@ -221,7 +221,7 @@
 
         <div class='draft-text'>
           {{#if model.topic}}
-            {{d-icon "share"}} {{html-safe draftTitle}}
+            {{d-icon "share"}} {{{draftTitle}}}
           {{else}}
             {{i18n "composer.saved_draft"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
index 238de27da0..e37bdb2aa0 100644
--- a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
-<p>{{html-safe message.body}}</p>
+<p>{{{message.body}}}</p>
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs
index 269e44e595..c2d574cb69 100644
--- a/app/assets/javascripts/discourse/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/education.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{html-safe message.body}}
+{{{message.body}}}
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
index 269e44e595..c2d574cb69 100644
--- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{html-safe message.body}}
+{{{message.body}}}
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 1c8f879125..6801ab3f55 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -1,5 +1,5 @@
 {{#if errorHtml}}
-  {{html-safe errorHtml}}
+  {{{errorHtml}}}
 {{else}}
   <div class="container">
     {{discourse-banner user=currentUser banner=site.banner}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 9394f35486..355e18f1b8 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -49,7 +49,7 @@
 
       <div class='search-info'>
         <div class='result-count'>
-          {{html-safe resultCountLabel}}
+          {{{resultCountLabel}}}
         </div>
         <div class='sort-by'>
           <span class='desc'>
@@ -88,7 +88,7 @@
 
                   <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+                    <span class='topic-title'>{{#highlight-text highlight=q}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -113,7 +113,7 @@
 
                   {{#if result.blurb}}
                     {{#highlight-text highlight=highlightQuery}}
-                      {{html-safe result.blurb}}
+                      {{{result.blurb}}}
                     {{/highlight-text}}
                   {{/if}}
                 </div>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 1bc9734c13..8385894c0c 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -26,7 +26,7 @@
       <hr>
 
       <div class='group-bio'>
-        <p>{{html-safe model.bio_cooked}}</p>
+        <p>{{{model.bio_cooked}}}</p>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index 36d0a644b1..21cbe557a9 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -51,7 +51,7 @@
                     </span>
                   </div>
 
-                  <div class="group-description">{{html-safe group.bio_excerpt}}</div>
+                  <div class="group-description">{{{group.bio_excerpt}}}</div>
 
                   <div class="group-membership">
                     {{#group-membership-button tagName='' model=group showLogin=(route-action "showLogin")}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index f2f1e73678..42216317ee 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -10,12 +10,12 @@
     <div class="col-form">
       {{#if successMessage}}
         <br><br>
-        <div class='alert alert-info'><p>{{html-safe successMessage}}</p></div>
+        <div class='alert alert-info'><p>{{{successMessage}}}</p></div>
       {{else}}
         <p>{{i18n 'invites.invited_by'}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
-        <p>{{html-safe yourEmailMessage}}
+        <p>{{{yourEmailMessage}}}
         {{#if externalAuthsEnabled}}
              {{i18n 'invites.social_login_available'}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.hbr b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
index 384909db02..723bb80e84 100644
--- a/app/assets/javascripts/discourse/templates/list/activity-column.hbr
+++ b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
@@ -1,4 +1,4 @@
-<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{html-safe topic.bumpedAtTitle}}">
+<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}">
   <a class="post-activity" href="{{topic.lastPostUrl}}">
     {{~raw-plugin-outlet name="topic-list-before-relative-date"~}}
     {{~format-date topic.bumpedAt format="tiny" noTitle="true"~}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
index 2257a669cb..1c7b5eead0 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
+++ b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
@@ -1,6 +1,6 @@
 {{#if topic.hasExcerpt}}
   <div class="topic-excerpt">
-    {{dir-span topic.escapedExcerpt}}
+    {{{dir-span topic.escapedExcerpt}}}
     {{#if topic.excerptTruncated}}
       <a href="{{topic.url}}">{{i18n 'read_more'}}</a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 0949b56ee7..d8a06c33c7 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -24,7 +24,7 @@
               {{/if}}
               {{#if t.hasExcerpt}}
                 <div class="topic-excerpt">
-                  {{html-safe t.excerpt}}
+                  {{{t.excerpt}}}
                   {{#if t.excerptTruncated}}
                     {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
@@ -42,7 +42,7 @@
               {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
               <div class="pull-right">
                 {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
+                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
               </div>
               {{#unless hideCategory}}
                 <div class='category'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 0421edce8a..5418fcb86a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -13,7 +13,7 @@
             {{#if c.description_excerpt}}
               <tr class="category-description">
                 <td colspan="3">
-                  {{html-safe c.description_excerpt}}
+                  {{{c.description_excerpt}}}
                 </td>
               </tr>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index ca6140be54..bebe6a385e 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -1,7 +1,7 @@
 {{#if selectedHtml}}
   <li>
     <a href class='expander' {{action 'toggleExpanded'}}>
-      <span>{{html-safe selectedHtml}}</span>
+      <span>{{{selectedHtml}}}</span>
       {{d-icon "caret-down"}}
     </a>
   </li>
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
index 7439589d5c..5469574977 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}
+  {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}}
 {{/d-modal-body}}
 
 {{modal-footer-close closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index 5390227a2e..1b08a4974b 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="user.auth_tokens.was_this_you"}}
   <div>
     <p>{{i18n 'user.auth_tokens.was_this_you_description'}}</p>
-    <p>{{i18n 'user.second_factor.extended_description'}}</p>
+    <p>{{{i18n 'user.second_factor.extended_description'}}}</p>
   </div>
 
   <div>
@@ -21,9 +21,9 @@
       </h3>
 
       {{#if expanded}}
-        <blockquote>{{html-safe latest_post.cooked}}</blockquote>
+        <blockquote>{{{latest_post.cooked}}}</blockquote>
       {{else}}
-        <blockquote>{{html-safe latest_post.excerpt}}</blockquote>
+        <blockquote>{{{latest_post.excerpt}}}</blockquote>
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index 10e5c4bf26..cdaab1cc1c 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -10,11 +10,11 @@
   {{else}}
     <div class="avatar-choice">
       {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
-      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{i18n 'user.change_avatar.letter_based'}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{{i18n 'user.change_avatar.letter_based'}}}</label>
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar'}} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{{i18n 'user.change_avatar.gravatar'}}} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
                  title="user.change_avatar.refresh_gravatar_title"
@@ -23,7 +23,7 @@
                  class="btn-default avatar-selector-refresh-gravatar"}}
 
       {{#if gravatarFailed}}
-        <p class="error">{{i18n 'user.change_avatar.gravatar_failed'}}</p>
+        <p class="error">{{I18n 'user.change_avatar.gravatar_failed'}}</p>
       {{/if}}
     </div>
     {{#if allowAvatarUpload}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 0098c5b237..254f1bfbee 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -38,7 +38,7 @@
           <!-- {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}} -->
         {{/tap-tile-grid}}
       {{else}}
-        <div class="alert alert-info">{{i18n "bookmarks.no_timezone" basePath=basePath }}</div>
+        <div class="alert alert-info">{{{i18n "bookmarks.no_timezone" basePath=basePath }}}</div>
       {{/if}}
     </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
index 0cfc45782d..97f8003781 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
@@ -2,7 +2,7 @@
   <div class='controls'>
     <label class='radio'>
       {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
-      <div class='description'>{{html-safe level.description}}</div>
+      <div class='description'>{{{level.description}}}</div>
     </label>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 1069c0d2fa..0c0890f2b9 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,6 +1,6 @@
 {{#d-modal-body class='change-ownership'}}
   <span>
-    {{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}
+    {{{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}}
   </span>
 
   <form>
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 5c77b2a0a6..448508de65 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -126,7 +126,7 @@
           {{/d-button}}
         {{/conditional-loading-spinner}}
 
-      <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
+      <div class='disclaimer'>{{{disclaimerHtml}}}</div>
       </div>
 
       {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
index 61e693a9af..e35eaecc19 100644
--- a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  <p>{{i18n "post.controls.delete_topic_disallowed_modal"}}</p>
+  <p>{{{i18n "post.controls.delete_topic_disallowed_modal"}}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="close"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
index 0c3f9e443d..6abe868295 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
@@ -34,7 +34,7 @@
                    label="category.delete"}}
 
         <div class="cannot_delete_reason {{if hiddenTooltip "hidden" ""}}">
-          {{html-safe model.cannot_delete_reason}}
+          {{{model.cannot_delete_reason}}}
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index be55ea8460..965a407815 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -6,9 +6,9 @@
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
               {{#if pinnedGloballyCount}}
-                {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
+                {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
               {{else}}
-                {{i18n "topic.feature_topic.not_pinned_globally"}}
+                {{{i18n "topic.feature_topic.not_pinned_globally"}}}
               {{/if}}
             {{/conditional-loading-spinner}}
           </p>
@@ -16,12 +16,12 @@
         {{else}}
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
-              {{html-safe alreadyPinnedMessage}}
+              {{{alreadyPinnedMessage}}}
             {{/conditional-loading-spinner}}
           </p>
           <p>{{i18n "topic.feature_topic.pin_note"}}</p>
         {{/if}}
-        <p>{{html-safe unPinMessage}}</p>
+        <p>{{{unPinMessage}}}</p>
         <p>{{d-button action=(action "unpin") icon="thumbtack" label="topic.feature.unpin" class="btn-primary"}}</p>
       </div>
     </div>
@@ -30,7 +30,7 @@
       <div class="desc">
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
-            {{html-safe alreadyPinnedMessage}}
+            {{{alreadyPinnedMessage}}}
           {{/conditional-loading-spinner}}
         </p>
         <p>
@@ -38,7 +38,7 @@
         </p>
         {{#if site.isMobileDevice}}
           <p>
-            {{html-safe pinMessage}}
+            {{{pinMessage}}}
           </p>
           <p class="with-validation">
             {{future-date-input
@@ -52,7 +52,7 @@
           </p>
         {{else}}
           <p class="with-validation">
-            {{html-safe pinMessage}}
+            {{{pinMessage}}}
             {{d-icon "far-clock"}}
             {{future-date-input
               class="pin-until"
@@ -74,9 +74,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if pinnedGloballyCount}}
-              {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
+              {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
             {{else}}
-              {{i18n "topic.feature_topic.not_pinned_globally"}}
+              {{{i18n "topic.feature_topic.not_pinned_globally"}}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
@@ -123,9 +123,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if bannerCount}}
-              {{i18n "topic.feature_topic.banner_exists"}}
+              {{{i18n "topic.feature_topic.banner_exists"}}}
             {{else}}
-              {{i18n "topic.feature_topic.no_banner_exists"}}
+              {{{i18n "topic.feature_topic.no_banner_exists"}}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 19be52ceb5..8d438dd80a 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -1,7 +1,7 @@
 <form>
   {{#d-modal-body class="forgot-password-modal"}}
     {{#if offerHelp}}
-      {{html-safe offerHelp}}
+      {{{offerHelp}}}
     {{else}}
       <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index c81dfe2238..6d9dbff78e 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -21,7 +21,7 @@
           &mdash; {{disabled-icon icon="shield-alt" disabled=postTypeDisabled}}
         {{/if}}
         {{#if model.category_id_changes}}
-          &mdash; {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
+          &mdash; {{{previousCategory}}} &rarr; {{{currentCategory}}}
         {{/if}}
       {{/unless}}
     </div>
@@ -50,7 +50,7 @@
   <div id="revisions" data-post-id={{model.post_id}} class={{hiddenClasses}}>
     {{#if model.title_changes}}
       <div class="row">
-        <h2>{{html-safe titleDiff}}</h2>
+        <h2>{{{titleDiff}}}</h2>
       </div>
     {{/if}}
     {{#if site.mobileView}}
@@ -72,7 +72,7 @@
       {{/if}}
       {{#if model.category_id_changes}}
         <div class="row">
-          {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
+          {{{previousCategory}}} &rarr; {{{currentCategory}}}
         </div>
       {{/if}}
     {{/if}}
@@ -100,7 +100,7 @@
     {{plugin-outlet name="post-revisions" args=(hash model=model)}}
 
     {{#links-redirect class="row"}}
-      {{html-safe bodyDiff}}
+      {{{bodyDiff}}}
     {{/links-redirect}}
   </div>
 {{/d-modal-body}}
@@ -111,7 +111,7 @@
       {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
       <div id="revision-numbers" class={{unless displayRevisions 'invisible'}}>
         {{#conditional-loading-spinner condition=loading size="small"}}
-          {{html-safe revisionsText}}
+          {{{revisionsText}}}
         {{/conditional-loading-spinner}}
       </div>
       {{d-button class="btn-default" action=(action "loadNextVersion") icon="forward" title="post.revisions.controls.next" disabled=loadNextDisabled}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 2203c90174..493a9e03a5 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -3,29 +3,29 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.jump_to.title"}}</h4>
       <ul>
-        <li>{{html-safe shortcuts.jump_to.home}}</li>
-        <li>{{html-safe shortcuts.jump_to.latest}}</li>
-        <li>{{html-safe shortcuts.jump_to.new}}</li>
-        <li>{{html-safe shortcuts.jump_to.unread}}</li>
-        <li>{{html-safe shortcuts.jump_to.categories}}</li>
-        <li>{{html-safe shortcuts.jump_to.top}}</li>
-        <li>{{html-safe shortcuts.jump_to.bookmarks}}</li>
-        <li>{{html-safe shortcuts.jump_to.profile}}</li>
+        <li>{{{shortcuts.jump_to.home}}}</li>
+        <li>{{{shortcuts.jump_to.latest}}}</li>
+        <li>{{{shortcuts.jump_to.new}}}</li>
+        <li>{{{shortcuts.jump_to.unread}}}</li>
+        <li>{{{shortcuts.jump_to.categories}}}</li>
+        <li>{{{shortcuts.jump_to.top}}}</li>
+        <li>{{{shortcuts.jump_to.bookmarks}}}</li>
+        <li>{{{shortcuts.jump_to.profile}}}</li>
         {{#if siteSettings.enable_personal_messages}}
-          <li>{{html-safe shortcuts.jump_to.messages}}</li>
+          <li>{{{shortcuts.jump_to.messages}}}</li>
         {{/if}}
-        <li>{{html-safe shortcuts.jump_to.drafts}}</li>
+        <li>{{{shortcuts.jump_to.drafts}}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.navigation.title"}}</h4>
       <ul>
-        <li>{{html-safe shortcuts.navigation.back}}</li>
-        <li>{{html-safe shortcuts.navigation.jump}}</li>
-        <li>{{html-safe shortcuts.navigation.up_down}}</li>
-        <li>{{html-safe shortcuts.navigation.open}}</li>
-        <li>{{html-safe shortcuts.navigation.next_prev}}</li>
-        <li>{{html-safe shortcuts.navigation.go_to_unread_post}}</li>
+        <li>{{{shortcuts.navigation.back}}}</li>
+        <li>{{{shortcuts.navigation.jump}}}</li>
+        <li>{{{shortcuts.navigation.up_down}}}</li>
+        <li>{{{shortcuts.navigation.open}}}</li>
+        <li>{{{shortcuts.navigation.next_prev}}}</li>
+        <li>{{{shortcuts.navigation.go_to_unread_post}}}</li>
       </ul>
     </section>
   </div>
@@ -33,26 +33,26 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.application.title"}}</h4>
       <ul>
-        <li>{{html-safe shortcuts.application.hamburger_menu}}</li>
-        <li>{{html-safe shortcuts.application.user_profile_menu}}</li>
-        <li>{{html-safe shortcuts.application.show_incoming_updated_topics}}</li>
-        <li>{{html-safe shortcuts.application.search}}</li>
-        <li>{{html-safe shortcuts.application.help}}</li>
-        <li>{{html-safe shortcuts.application.dismiss_new_posts}}</li>
-        <li>{{html-safe shortcuts.application.dismiss_topics}}</li>
-        <li>{{html-safe shortcuts.application.log_out}}</li>
+        <li>{{{shortcuts.application.hamburger_menu}}}</li>
+        <li>{{{shortcuts.application.user_profile_menu}}}</li>
+        <li>{{{shortcuts.application.show_incoming_updated_topics}}}</li>
+        <li>{{{shortcuts.application.search}}}</li>
+        <li>{{{shortcuts.application.help}}}</li>
+        <li>{{{shortcuts.application.dismiss_new_posts}}}</li>
+        <li>{{{shortcuts.application.dismiss_topics}}}</li>
+        <li>{{{shortcuts.application.log_out}}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.composing.title"}}</h4>
       <ul>
-        <li>{{html-safe shortcuts.composing.return}}</li>
-        <li>{{html-safe shortcuts.composing.fullscreen}}</li>
-        <li>{{html-safe shortcuts.application.create}}</li>
-        <li>{{html-safe shortcuts.actions.reply_as_new_topic}}</li>
-        <li>{{html-safe shortcuts.actions.reply_topic}}</li>
-        <li>{{html-safe shortcuts.actions.reply_post}}</li>
-        <li>{{html-safe shortcuts.actions.quote_post}}</li>
+        <li>{{{shortcuts.composing.return}}}</li>
+        <li>{{{shortcuts.composing.fullscreen}}}</li>
+        <li>{{{shortcuts.application.create}}}</li>
+        <li>{{{shortcuts.actions.reply_as_new_topic}}}</li>
+        <li>{{{shortcuts.actions.reply_topic}}}</li>
+        <li>{{{shortcuts.actions.reply_post}}}</li>
+        <li>{{{shortcuts.actions.quote_post}}}</li>
       </ul>
     </section>
   </div>
@@ -60,22 +60,22 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.actions.title"}}</h4>
       <ul>
-        <li>{{html-safe shortcuts.actions.bookmark_topic}}</li>
-        <li>{{html-safe shortcuts.actions.pin_unpin_topic}}</li>
-        <li>{{html-safe shortcuts.actions.share_topic}}</li>
-        <li>{{html-safe shortcuts.actions.share_post}}</li>
-        <li>{{html-safe shortcuts.actions.like}}</li>
-        <li>{{html-safe shortcuts.actions.flag}}</li>
-        <li>{{html-safe shortcuts.actions.bookmark}}</li>
-        <li>{{html-safe shortcuts.actions.edit}}</li>
-        <li>{{html-safe shortcuts.actions.delete}}</li>
-        <li>{{html-safe shortcuts.actions.mark_muted}}</li>
-        <li>{{html-safe shortcuts.actions.mark_regular}}</li>
-        <li>{{html-safe shortcuts.actions.mark_tracking}}</li>
-        <li>{{html-safe shortcuts.actions.mark_watching}}</li>
-        <li>{{html-safe shortcuts.actions.defer}}</li>
-        <li>{{html-safe shortcuts.actions.print}}</li>
-        <li>{{html-safe shortcuts.actions.topic_admin_actions}}</li>
+        <li>{{{shortcuts.actions.bookmark_topic}}}</li>
+        <li>{{{shortcuts.actions.pin_unpin_topic}}}</li>
+        <li>{{{shortcuts.actions.share_topic}}}</li>
+        <li>{{{shortcuts.actions.share_post}}}</li>
+        <li>{{{shortcuts.actions.like}}}</li>
+        <li>{{{shortcuts.actions.flag}}}</li>
+        <li>{{{shortcuts.actions.bookmark}}}</li>
+        <li>{{{shortcuts.actions.edit}}}</li>
+        <li>{{{shortcuts.actions.delete}}}</li>
+        <li>{{{shortcuts.actions.mark_muted}}}</li>
+        <li>{{{shortcuts.actions.mark_regular}}}</li>
+        <li>{{{shortcuts.actions.mark_tracking}}}</li>
+        <li>{{{shortcuts.actions.mark_watching}}}</li>
+        <li>{{{shortcuts.actions.defer}}}</li>
+        <li>{{{shortcuts.actions.print}}}</li>
+        <li>{{{shortcuts.actions.topic_admin_actions}}}</li>
       </ul>
     </section>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index ae591397a7..893d934246 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -17,7 +17,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
+        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -31,7 +31,7 @@
     {{/if}}
 
     {{#if existingMessage}}
-      <p>{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}</p>
+      <p>{{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}}</p>
       <form>
         {{choose-message currentTopicId=model.id selectedTopicId=selectedTopicId}}
 
@@ -64,7 +64,7 @@
     </div>
 
     {{#if existingTopic}}
-      <p>{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}</p>
+      <p>{{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}}</p>
       <form>
         {{choose-topic currentTopicId=model.id selectedTopicId=selectedTopicId}}
       </form>
@@ -72,7 +72,7 @@
 
     {{#if canSplitTopic}}
       {{#if newTopic}}
-        <p>{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}</p>
+        <p>{{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}}</p>
         <form>
           <label>{{i18n 'topic.split_topic.topic_name'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -93,7 +93,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
+        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index e9d93aa8f6..aa312d5125 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{i18n 'login.not_activated' sentTo=sentTo}}
+  {{{i18n 'login.not_activated' sentTo=sentTo}}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
index 3687b9fb2b..46f37bfe80 100644
--- a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body}}
   <p>{{i18n "review.approval.description"}}</p>
 
-  <p>{{i18n "review.approval.pending_posts" count=model.pending_count}}</p>
+  <p>{{{i18n "review.approval.pending_posts" count=model.pending_count}}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="review.approval.ok"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index c6539a2e52..36ede3f634 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{i18n 'user.second_factor.enable_security_key_description'}}
+        {{{i18n 'user.second_factor.enable_security_key_description'}}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index 9caf24fc46..2b52edea7b 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{i18n 'user.second_factor.enable_description'}}
+        {{{i18n 'user.second_factor.enable_description'}}}
       </div>
     </div>
 
@@ -18,7 +18,7 @@
       <div class="controls">
         <div class="qr-code-container">
           <div class="qr-code">
-            {{html-safe secondFactorImage}}
+            {{{secondFactorImage}}}
           </div>
         </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
index 713bdbfcc4..5981f4a118 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
@@ -14,7 +14,7 @@
     {{/if}}
 
     {{#if backupEnabled}}
-      {{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}
+      {{{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}}
     {{/if}}
 
     <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index fe3ce8be48..9b10ef6c29 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,4 +1,4 @@
 {{#d-modal-body}}
-  <p>{{i18n 'topics.bulk.selected' count=model.topics.length}}</p>
+  <p>{{{i18n 'topics.bulk.selected' count=model.topics.length}}}</p>
   {{outlet "bulkOutlet"}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index 6d44492afe..f45a2e5014 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -9,7 +9,7 @@
         width=category.uploaded_logo.width
         height=category.uploaded_logo.height}}
       {{#if category.description}}
-        <p>{{dir-span category.description}}</p>
+        <p>{{{dir-span category.description}}}</p>
       {{/if}}
     {{/if}}
   </section>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index fc6c00a13b..fd8f57c54c 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -86,7 +86,7 @@
           <h2>{{i18n "user.second_factor_backup.title"}}</h2>
           {{#if model.second_factor_enabled}}
             {{#if model.second_factor_backup_enabled}}
-              {{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}
+              {{{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}}
             {{else}}
               {{i18n 'user.second_factor_backup.enable_long'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 62743b5a5a..8a505401fa 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -9,7 +9,7 @@
   </div>
   {{#if siteSettings.enable_mentions}}
     <div class='instructions'>
-      {{i18n 'user.username.short_instructions' username=model.username}}
+      {{{i18n 'user.username.short_instructions' username=model.username}}}
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index bd9aa411ac..d277cea511 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -73,7 +73,7 @@
   <div class='control-group pref-mailing-list-mode'>
     <label class="control-label">{{i18n 'user.mailing_list_mode.label'}}</label>
     {{preference-checkbox labelKey="user.mailing_list_mode.enabled" checked=model.user_option.mailing_list_mode}}
-    <div class='instructions'>{{i18n 'user.mailing_list_mode.instructions'}}</div>
+    <div class='instructions'>{{{i18n 'user.mailing_list_mode.instructions'}}}</div>
     {{#if model.user_option.mailing_list_mode}}
       <div class='controls controls-dropdown'>
         {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index e6fe5381ed..b0040894dc 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -66,7 +66,7 @@
     <label class="control-label">{{i18n 'user.featured_topic'}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
-      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
+      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
       </label>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index aee9390704..107f4350f8 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -2,7 +2,7 @@
   {{#watch-read action=(action "markFaqRead") path=model.path}}
     <div class='contents clearfix body-page'>
       {{plugin-outlet name="above-static"}}
-      {{html-safe model.html}}
+      {{{model.html}}}
 
       {{#if showSignupButton}}
         {{d-button action=(route-action "showCreateAccount") class="btn-primary sign-up-button" label="sign_up"}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 7950ca19ec..bcb1a81b0f 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -74,7 +74,7 @@
             {{#if model.details.loaded}}
               {{topic-status topic=model}}
               <a href={{model.url}} {{action "jumpTop"}} class="fancy-title">
-                {{html-safe model.fancyTitle}}
+                {{{model.fancyTitle}}}
               </a>
             {{/if}}
 
@@ -264,7 +264,7 @@
               {{#if model.queued_posts_count}}
                 <div class="has-pending-posts">
                   <div>
-                    {{i18n "review.topic_has_pending" count=model.queued_posts_count}}
+                    {{{i18n "review.topic_has_pending" count=model.queued_posts_count}}}
                   </div>
 
                   {{#link-to 'review' (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
@@ -351,7 +351,7 @@
     <div class="container">
       {{#conditional-loading-spinner condition=noErrorYet}}
         {{#if model.errorHtml}}
-          <div class="not-found">{{html-safe model.errorHtml}}</div>
+          <div class="not-found">{{{model.errorHtml}}}</div>
         {{else}}
           <div class="topic-error">
             <div>{{model.errorMessage}}</div>
diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/templates/unknown.hbs
index 5ff548e033..0e9e6b9625 100644
--- a/app/assets/javascripts/discourse/templates/unknown.hbs
+++ b/app/assets/javascripts/discourse/templates/unknown.hbs
@@ -1,3 +1,3 @@
 <div class='container'>
-  {{html-safe model}}
+  {{{model}}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index f8f5effb60..517e147e90 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -72,11 +72,11 @@
                       <td>{{format-date invite.user.last_seen_at}}</td>
                       <td>{{number invite.user.topics_entered}}</td>
                       <td>{{number invite.user.posts_read_count}}</td>
-                      <td>{{format-duration invite.user.time_read}}</td>
+                      <td>{{{format-duration invite.user.time_read}}}</td>
                       <td>
-                        <span title={{i18n 'user.invited.days_visited'}}>{{html-safe invite.user.days_visited}}</span>
+                        <span title={{i18n 'user.invited.days_visited'}}>{{{invite.user.days_visited}}}</span>
                           /
-                        <span title={{i18n 'user.invited.account_age_days'}}>{{html-safe invite.user.days_since_created}}</span>
+                        <span title={{i18n 'user.invited.account_age_days'}}>{{{invite.user.days_since_created}}}</span>
                       </td>
                     {{/if}}
                   {{else}}
@@ -109,7 +109,7 @@
         {{else}}
           <div class="user-invite-none">
             {{#if canBulkInvite}}
-              {{i18n 'user.invited.bulk_invite.none'}}
+              {{{i18n 'user.invited.bulk_invite.none'}}}
             {{else}}
               {{i18n 'user.invited.none'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 377177843e..d1c61ab805 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -100,7 +100,7 @@
             {{#if showFeaturedTopic}}
               <h3 class="featured-topic">
                 <span>{{i18n 'user.featured_topic'}}</span>
-                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
+                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
               </h3>
             {{/if}}
 
@@ -137,7 +137,7 @@
                 </div>
               {{/if}}
               {{#if isNotSuspendedOrIsStaff}}
-                {{html-safe model.bio_cooked}}
+                {{{model.bio_cooked}}}
               {{/if}}
             </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index de791d9420..1af06a86d9 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,4 +1,4 @@
 {{#if model.noContent}}
-  <div class='alert alert-info'>{{html-safe model.noContentHelp}}</div>
+  <div class='alert alert-info'>{{{model.noContentHelp}}}</div>
 {{/if}}
 {{user-stream stream=model}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 26ee193bde..71b4737522 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -87,7 +87,7 @@
               </a>
               <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
               <br>
-              <a href="{{link.post_url}}">{{html-safe link.topic.fancyTitle}}</a>
+              <a href="{{link.post_url}}">{{{link.topic.fancyTitle}}}</a>
             </li>
           {{/each}}
         </ul>
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index cff579c047..db51a397f8 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -9,8 +9,8 @@
   </div>
 
   {{#if shouldDisplayDescription}}
-    <div class="category-desc">{{dir-span description}}</div>
+    <div class="category-desc">{{{dir-span description}}}</div>
   {{/if}}
 {{else}}
-  {{html-safe label}}
+  {{{label}}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
index e654ef8a11..1c070006ad 100644
--- a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
@@ -8,6 +8,6 @@
 {{/if}}
 
 <div class="texts">
-  <span class="name">{{html-safe label}}</span>
-  <span class="desc">{{html-safe description}}</span>
+  <span class="name">{{{label}}}</span>
+  <span class="desc">{{{description}}}</span>
 </div>
diff --git a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
index f54bdb6b5f..31fc07f1dc 100644
--- a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
@@ -1,5 +1,5 @@
 {{pinned-options value=pinned topic=topic}}
 
 <p class="reason">
-  {{html-safe reasonText}}
+  {{{reasonText}}}
 </p>
diff --git a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
index a57b6b8584..2bf3a9a122 100644
--- a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
@@ -10,6 +10,6 @@
 
 {{#if appendReason}}
   <p class="reason">
-    {{html-safe topic.details.notificationReasonText}}
+    {{{topic.details.notificationReasonText}}}
   </p>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index c3a82790be..e93347513a 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -8,7 +8,7 @@
   </span>
   {{#if extraLabel}}
     <span class='extra-label'>
-      {{html-safe extraLabel}}
+      {{{extraLabel}}}
     </span>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
index 7510570b5d..8f804940fb 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
@@ -2,7 +2,7 @@
   <span class='label-value'>{{field.label}}</span>
 
   {{#if field.description}}
-    <div class='field-description'>{{html-safe field.description}}</div>
+    <div class='field-description'>{{{field.description}}}</div>
   {{/if}}
 </label>
 
@@ -11,5 +11,5 @@
 </div>
 
 {{#if field.errorDescription}}
-  <div class='field-error-description'>{{html-safe field.errorDescription}}</div>
+  <div class='field-error-description'>{{{field.errorDescription}}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 4f0686acf7..beb821930d 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -8,7 +8,7 @@
   {{/if}}
 
   {{#if step.description}}
-    <p class='wizard-step-description'>{{html-safe step.description}}</p>
+    <p class='wizard-step-description'>{{{step.description}}}</p>
   {{/if}}
 
   {{#wizard-step-form step=step}}
diff --git a/lib/onebox/templates/discourse_topic_onebox.hbs b/lib/onebox/templates/discourse_topic_onebox.hbs
index 63a04fcc76..856d3342d4 100644
--- a/lib/onebox/templates/discourse_topic_onebox.hbs
+++ b/lib/onebox/templates/discourse_topic_onebox.hbs
@@ -1,10 +1,10 @@
 <aside class='quote' data-post="{{post_number}}" data-topic="{{topic_id}}">
   <div class='title'>
     <div class='quote-controls'></div>
-    {{html-safe avatar}}
-    <a href="{{original_url}}">{{html-safe title}}</a> {{html-safe category_html}}
+    {{{avatar}}}
+    <a href="{{original_url}}">{{{title}}}</a> {{{category_html}}}
   </div>
   <blockquote>
-    {{html-safe quote}}
+    {{{quote}}}
   </blockquote>
 </aside>
diff --git a/lib/onebox/templates/discourse_user_onebox.hbs b/lib/onebox/templates/discourse_user_onebox.hbs
index de1336dd92..60db7491c1 100644
--- a/lib/onebox/templates/discourse_user_onebox.hbs
+++ b/lib/onebox/templates/discourse_user_onebox.hbs
@@ -1,7 +1,7 @@
 <aside class="onebox">
   <article class="onebox-body user-onebox">
-    {{html-safe avatar}}
-    <h3><a href="{{original_url}}">{{html-safe username}}</a></h3>
+    {{{avatar}}}
+    <h3><a href="{{original_url}}">{{{username}}}</a></h3>
     <div>
       {{#name}}
         <span class="full-name">{{name}}</span>
@@ -11,7 +11,7 @@
           <svg class="fa d-icon d-icon-map-marker-alt svg-icon" xmlns="http://www.w3.org/2000/svg">
             <use xlink:href="#map-marker-alt"></use>
           </svg>
-          {{html-safe location}}
+          {{{location}}}
         </span>
       {{/location}}
       {{#website}}
@@ -19,12 +19,12 @@
           <svg class="fa d-icon d-icon-globe-americas svg-icon" xmlns="http://www.w3.org/2000/svg">
             <use xlink:href="#globe-americas"></use>
           </svg>
-          <a href="{{website}}">{{html-safe website_name}}</a>
+          <a href="{{website}}">{{{website_name}}}</a>
         </span>
       {{/website}}
     </div>
     {{#bio}}
-      <p>{{html-safe bio}}</p>
+      <p>{{{bio}}}</p>
     {{/bio}}
     <span>{{joined}} {{created_at}}</span>
   </article>
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 6fb9ecf7c6..d7e73c3d08 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -85,7 +85,7 @@
             <label class="control-label">
               {{i18n "discourse_local_dates.create.form.recurring_title"}}
             </label>
-            <p>{{i18n "discourse_local_dates.create.form.recurring_description"}}</p>
+            <p>{{{i18n "discourse_local_dates.create.form.recurring_description"}}}</p>
             <div class="controls">
               {{combo-box
                 content=recurringOptions
diff --git a/test/javascripts/components/html-safe-helper-test.js.es6 b/test/javascripts/components/html-safe-helper-test.js.es6
deleted file mode 100644
index 364f99a6e4..0000000000
--- a/test/javascripts/components/html-safe-helper-test.js.es6
+++ /dev/null
@@ -1,14 +0,0 @@
-import componentTest from "helpers/component-test";
-moduleForComponent("html-safe-helper", { integration: true });
-
-componentTest("default", {
-  template: "{{html-safe string}}",
-
-  beforeEach() {
-    this.set("string", "<p class='cookies'>biscuits</p>");
-  },
-
-  async test(assert) {
-    assert.ok(exists("p.cookies"), "it displays the string as html");
-  }
-});
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js.es6
index 253673e5b6..0a94485f44 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -5,8 +5,7 @@ import {
   propertyNotEqual,
   fmt,
   i18n,
-  url,
-  htmlSafe
+  url
 } from "discourse/lib/computed";
 
 QUnit.module("lib:computed", {
@@ -155,12 +154,3 @@ QUnit.test("url", assert => {
     "it supports urls with a prefix"
   );
 });
-
-QUnit.test("htmlSafe", assert => {
-  const cookies = "<p>cookies and <b>biscuits</b></p>";
-  const t = EmberObject.extend({
-    desc: htmlSafe("cookies")
-  }).create({ cookies });
-
-  assert.equal(t.get("desc").string, cookies);
-});

From 29b35aa64c6e6c954f80004e58d41da9ef37c529 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 10 Mar 2020 22:13:17 +0100
Subject: [PATCH 061/633] DEV: Improve flaky time-sensitive specs (#9141)

---
 .../spec/controllers/posts_controller_spec.rb |  5 +-
 .../post_migrate/migrate_polls_data_spec.rb   |  2 +-
 .../default_current_user_provider_spec.rb     |  2 +-
 .../composer_messages_finder_spec.rb          |  8 +-
 .../concern/second_factor_manager_spec.rb     |  2 +-
 spec/components/cooked_post_processor_spec.rb |  4 +-
 spec/components/discourse_updates_spec.rb     | 10 +-
 spec/components/distributed_mutex_spec.rb     |  2 +-
 spec/components/email/receiver_spec.rb        |  5 +-
 spec/components/post_action_creator_spec.rb   |  1 +
 spec/components/post_creator_spec.rb          | 58 ++++++-----
 spec/components/post_revisor_spec.rb          |  5 +-
 spec/components/search_spec.rb                | 29 +++---
 spec/components/topic_creator_spec.rb         |  8 +-
 spec/components/topic_publisher_spec.rb       | 10 +-
 spec/components/topic_query_spec.rb           |  7 +-
 spec/integration/topic_auto_close_spec.rb     | 10 +-
 spec/integration/user_api_keys_spec.rb        |  6 +-
 spec/integrity/coding_style_spec.rb           |  2 +
 spec/jobs/auto_expire_user_api_keys_spec.rb   |  4 +-
 spec/jobs/periodical_updates_spec.rb          |  2 +-
 spec/jobs/publish_topic_to_category_spec.rb   | 25 ++---
 spec/jobs/pull_hotlinked_images_spec.rb       |  2 +-
 spec/jobs/truncate_user_flag_stats_spec.rb    |  9 ++
 spec/jobs/user_email_spec.rb                  | 24 +++--
 spec/models/category_spec.rb                  | 38 +++----
 spec/models/invite_spec.rb                    |  3 +-
 spec/models/post_action_spec.rb               |  4 +-
 spec/models/post_mover_spec.rb                | 46 ++++-----
 spec/models/post_spec.rb                      |  9 +-
 spec/models/quoted_post_spec.rb               |  1 -
 spec/models/remote_theme_spec.rb              |  4 +-
 spec/models/screened_email_spec.rb            |  4 +-
 spec/models/topic_spec.rb                     | 98 +++++++++----------
 spec/models/topic_tracking_state_spec.rb      |  2 +
 spec/models/user_action_spec.rb               | 19 ++--
 spec/models/user_auth_token_spec.rb           | 20 ++--
 spec/models/user_spec.rb                      | 52 +++++-----
 spec/models/user_stat_spec.rb                 |  2 +-
 spec/models/watched_word_spec.rb              |  2 +-
 spec/rails_helper.rb                          |  2 +
 spec/requests/admin/email_controller_spec.rb  |  4 +-
 spec/requests/groups_controller_spec.rb       |  2 +-
 spec/requests/posts_controller_spec.rb        | 16 +--
 spec/requests/topics_controller_spec.rb       | 35 +++----
 spec/services/badge_granter_spec.rb           | 20 ++--
 spec/services/post_owner_changer_spec.rb      |  5 +-
 spec/services/topic_timestamp_changer_spec.rb | 31 +++---
 spec/services/user_activator_spec.rb          |  4 +-
 49 files changed, 334 insertions(+), 331 deletions(-)

diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
index 8f9dae14a2..3cedf9017f 100644
--- a/plugins/poll/spec/controllers/posts_controller_spec.rb
+++ b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -11,7 +11,6 @@ describe PostsController do
   end
 
   describe "polls" do
-
     it "works" do
       post :create, params: {
         title: title, raw: "[poll]\n- A\n- B\n[/poll]"
@@ -39,7 +38,7 @@ describe PostsController do
     it "schedules auto-close job" do
       freeze_time
       name = "auto_close"
-      close_date = 1.month.from_now
+      close_date = 1.month.from_now.round
 
       expect do
         post :create, params: {
@@ -53,7 +52,7 @@ describe PostsController do
       json = ::JSON.parse(response.body)
       post_id = json["id"]
 
-      expect(Poll.find_by(post_id: post_id).close_at).to be_within_one_second_of(1.month.from_now)
+      expect(Poll.find_by(post_id: post_id).close_at).to eq_time(close_date)
 
       job = Jobs::ClosePoll.jobs.first
       job_args = job["args"].first
diff --git a/plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb b/plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb
index 50bc5d75ca..018f50ded8 100644
--- a/plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb
+++ b/plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb
@@ -267,7 +267,7 @@ RSpec.describe MigratePollsData do
       poll = Poll.find_by(name: "poll")
 
       expect(poll.post_id).to eq(post.id)
-      expect(poll.close_at).to eq("2018-10-08T00:00:00.000Z")
+      expect(poll.close_at).to eq_time(Time.parse("2018-10-08T00:00:00.000Z"))
 
       expect(poll.regular?).to eq(true)
       expect(poll.open?).to eq(true)
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 5495d4e46d..2e0650cf30 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -411,7 +411,7 @@ describe Auth::DefaultCurrentUserProvider do
       provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}")
       u = provider2.current_user
       u.reload
-      expect(u.last_seen_at).to eq_time(Time.now)
+      expect(u.last_seen_at).to eq_time(Time.zone.now)
 
       freeze_time 20.minutes.from_now
 
diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb
index 6b8214ea75..00cb9ac995 100644
--- a/spec/components/composer_messages_finder_spec.rb
+++ b/spec/components/composer_messages_finder_spec.rb
@@ -157,9 +157,11 @@ describe ComposerMessagesFinder do
       SiteSetting.educate_until_posts = 10
       user.stubs(:post_count).returns(11)
 
-      Fabricate(:post, topic: topic, user: user)
-      Fabricate(:post, topic: topic, user: user)
-      Fabricate(:post, topic: topic, user: user, post_type: Post.types[:small_action])
+      freeze_time(5.minutes.ago) do
+        Fabricate(:post, topic: topic, user: user)
+        Fabricate(:post, topic: topic, user: user)
+        Fabricate(:post, topic: topic, user: user, post_type: Post.types[:small_action])
+      end
 
       SiteSetting.sequential_replies_threshold = 2
     end
diff --git a/spec/components/concern/second_factor_manager_spec.rb b/spec/components/concern/second_factor_manager_spec.rb
index 5a049e2c41..e19d75e02f 100644
--- a/spec/components/concern/second_factor_manager_spec.rb
+++ b/spec/components/concern/second_factor_manager_spec.rb
@@ -69,7 +69,7 @@ RSpec.describe SecondFactorManager do
         token = user.user_second_factors.totps.first.totp_object.now
 
         expect(user.authenticate_totp(token)).to eq(true)
-        expect(user.user_second_factors.totps.first.last_used).to eq_time(DateTime.now)
+        expect(user.user_second_factors.totps.first.last_used).to eq_time(Time.zone.now)
         expect(user.authenticate_totp(token)).to eq(false)
       end
     end
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 5406d146df..799e3a3cd3 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -1777,14 +1777,14 @@ describe CookedPostProcessor do
       small_action = Fabricate(:post, topic: topic, post_type: Post.types[:small_action])
       reply = Fabricate(:post, topic: topic, raw: raw)
 
-      freeze_time Time.zone.now do
+      freeze_time do
         topic.bumped_at = 1.day.ago
         CookedPostProcessor.new(reply).remove_full_quote_on_direct_reply
 
         expect(topic.ordered_posts.pluck(:id))
           .to eq([post.id, hidden.id, small_action.id, reply.id])
 
-        expect(topic.bumped_at).to eq(1.day.ago)
+        expect(topic.bumped_at).to eq_time(1.day.ago)
         expect(reply.raw).to eq("and this is the third reply")
         expect(reply.revisions.count).to eq(1)
         expect(reply.revisions.first.modifications["raw"]).to eq([raw, reply.raw])
diff --git a/spec/components/discourse_updates_spec.rb b/spec/components/discourse_updates_spec.rb
index d57493d672..8e9ef2596b 100644
--- a/spec/components/discourse_updates_spec.rb
+++ b/spec/components/discourse_updates_spec.rb
@@ -24,7 +24,8 @@ describe DiscourseUpdates do
 
     context 'a good version check request happened recently' do
       context 'and server is up-to-date' do
-        before { stub_data(Discourse::VERSION::STRING, 0, false, 12.hours.ago) }
+        let(:time) { 12.hours.ago }
+        before { stub_data(Discourse::VERSION::STRING, 0, false, time) }
 
         it 'returns all the version fields' do
           expect(subject.latest_version).to eq(Discourse::VERSION::STRING)
@@ -35,12 +36,13 @@ describe DiscourseUpdates do
         end
 
         it 'returns the timestamp of the last version check' do
-          expect(subject.updated_at).to be_within_one_second_of(12.hours.ago)
+          expect(subject.updated_at).to eq_time(time)
         end
       end
 
       context 'and server is not up-to-date' do
-        before { stub_data('0.9.0', 2, false, 12.hours.ago) }
+        let(:time) { 12.hours.ago }
+        before { stub_data('0.9.0', 2, false, time) }
 
         it 'returns all the version fields' do
           expect(subject.latest_version).to eq('0.9.0')
@@ -50,7 +52,7 @@ describe DiscourseUpdates do
         end
 
         it 'returns the timestamp of the last version check' do
-          expect(subject.updated_at).to be_within_one_second_of(12.hours.ago)
+          expect(subject.updated_at).to eq_time(time)
         end
       end
     end
diff --git a/spec/components/distributed_mutex_spec.rb b/spec/components/distributed_mutex_spec.rb
index 97c3d0096c..23bfd90812 100644
--- a/spec/components/distributed_mutex_spec.rb
+++ b/spec/components/distributed_mutex_spec.rb
@@ -99,7 +99,7 @@ describe DistributedMutex do
       }.to raise_error(Discourse::ReadOnly)
 
       expect(done).to eq(false)
-      expect(Time.now - start).to be < (1.second)
+      expect(Time.now - start).to be <= 1.second
     end
   end
 
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index a7dd5e6b71..7644d6df06 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -656,8 +656,11 @@ describe Email::Receiver do
     end
 
     it "ensures posts aren't dated in the future" do
+      # PostCreator doesn't provide sub-second accuracy for created_at
+      now = freeze_time Time.zone.now.round
+
       expect { process(:from_the_future) }.to change { topic.posts.count }
-      expect(topic.posts.last.created_at).to be_within(1.minute).of(DateTime.now)
+      expect(topic.posts.last.created_at).to eq_time(now)
     end
 
     it "accepts emails with wrong reply key if the system knows about the forwarded email" do
diff --git a/spec/components/post_action_creator_spec.rb b/spec/components/post_action_creator_spec.rb
index acc31fa5b3..ad013f82f5 100644
--- a/spec/components/post_action_creator_spec.rb
+++ b/spec/components/post_action_creator_spec.rb
@@ -145,6 +145,7 @@ describe PostActionCreator do
         before { reviewable.perform(admin, :ignore) }
 
         it "fails because the post was recently reviewed" do
+          freeze_time 10.seconds.from_now
           result = PostActionCreator.create(user, post, :inappropriate)
 
           expect(result.success?).to eq(false)
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 07ec76bb78..1fae772752 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -145,19 +145,26 @@ describe PostCreator do
           _reply = PostCreator.new(admin, raw: "this is my test reply 123 testing", topic_id: created_post.topic_id).create
         end
 
-        # 2 for topic, one to notify of new topic another for tracking state
-        expect(messages.map { |m| m.channel }.sort).to eq([ "/new",
-                                                     "/u/#{admin.username}",
-                                                     "/u/#{admin.username}",
-                                                     "/unread/#{admin.id}",
-                                                     "/unread/#{admin.id}",
-                                                     "/latest",
-                                                     "/latest",
-                                                     "/topic/#{created_post.topic_id}",
-                                                     "/topic/#{created_post.topic_id}"
-                                                   ].sort)
-        admin_ids = [Group[:admins].id]
+        messages.filter! { |m| m.channel != "/distributed_hash" }
 
+        channels = messages.map { |m| m.channel }.sort
+
+        # 2 for topic, one to notify of new topic another for tracking state
+        expect(channels).to eq(
+          [
+            "/new",
+            "/u/#{admin.username}",
+            "/u/#{admin.username}",
+            "/unread/#{admin.id}",
+            "/unread/#{admin.id}",
+            "/latest",
+            "/latest",
+            "/topic/#{created_post.topic_id}",
+            "/topic/#{created_post.topic_id}"
+          ].sort
+        )
+
+        admin_ids = [Group[:admins].id]
         expect(messages.any? { |m| m.group_ids != admin_ids && m.user_ids != [admin.id] }).to eq(false)
       end
 
@@ -312,7 +319,7 @@ describe PostCreator do
         first_post = creator.create
         topic = first_post.topic.reload
 
-        expect(topic.last_posted_at).to be_within(1.seconds).of(first_post.created_at)
+        expect(topic.last_posted_at).to eq_time(first_post.created_at)
         expect(topic.last_post_user_id).to eq(first_post.user_id)
         expect(topic.word_count).to eq(4)
       end
@@ -351,8 +358,8 @@ describe PostCreator do
           topic.reload
 
           topic_status_update = TopicTimer.last
-          expect(topic_status_update.execute_at).to be_within(1.second).of(Time.zone.now + 12.hours)
-          expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
+          expect(topic_status_update.execute_at).to eq_time(12.hours.from_now)
+          expect(topic_status_update.created_at).to eq_time(Time.zone.now)
         end
 
         describe "topic's auto close based on last post" do
@@ -484,7 +491,6 @@ describe PostCreator do
     fab!(:topic) { Fabricate(:topic, user: user) }
 
     it 'whispers do not mess up the public view' do
-
       # turns out this can fail on leap years if we don't do this
       freeze_time DateTime.parse('2010-01-01 12:00')
 
@@ -538,7 +544,7 @@ describe PostCreator do
       expect(topic.reply_count).to eq(0)
       expect(topic.posts_count).to eq(1)
       expect(topic.highest_staff_post_number).to eq(3)
-      expect(topic.last_posted_at).to be_within(1.seconds).of(first.created_at)
+      expect(topic.last_posted_at).to eq_time(first.created_at)
       expect(topic.last_post_user_id).to eq(first.user_id)
       expect(topic.word_count).to eq(5)
 
@@ -554,7 +560,7 @@ describe PostCreator do
       topic.reload
       expect(topic.highest_post_number).to eq(1)
       expect(topic.posts_count).to eq(1)
-      expect(topic.last_posted_at).to eq(first.created_at)
+      expect(topic.last_posted_at).to eq_time(first.created_at)
       expect(topic.highest_staff_post_number).to eq(3)
     end
   end
@@ -684,7 +690,7 @@ describe PostCreator do
         post = creator.create
         topic.reload
 
-        expect(topic.last_posted_at).to be_within(1.seconds).of(post.created_at)
+        expect(topic.last_posted_at).to eq_time(post.created_at)
         expect(topic.last_post_user_id).to eq(post.user_id)
         expect(topic.word_count).to eq(6)
       end
@@ -695,7 +701,7 @@ describe PostCreator do
         post = creator.create
         topic.reload
 
-        expect(topic.last_posted_at).to be_within(1.seconds).of(post.created_at)
+        expect(topic.last_posted_at).to eq_time(post.created_at)
         expect(topic.last_post_user_id).to eq(post.user_id)
         expect(topic.word_count).to eq(6)
       end
@@ -960,9 +966,9 @@ describe PostCreator do
         created_at: 1.week.ago
       )
 
-      expect(post1.created_at).to be_within(1.second).of(1.week.ago)
-      expect(post2.created_at).to be_within(1.second).of(1.week.ago)
-      expect(topic.created_at).to be_within(1.second).of(1.week.ago)
+      expect(post1.created_at).to eq_time(1.week.ago)
+      expect(post2.created_at).to eq_time(1.week.ago)
+      expect(topic.created_at).to eq_time(1.week.ago)
     end
 
     it 'supports strings' do
@@ -983,9 +989,9 @@ describe PostCreator do
         created_at: '2019-09-02 00:00:00 UTC'
       )
 
-      expect(post1.created_at).to be_within(1.second).of(time)
-      expect(post2.created_at).to be_within(1.second).of(time)
-      expect(topic.created_at).to be_within(1.second).of(time)
+      expect(post1.created_at).to eq_time(time)
+      expect(post2.created_at).to eq_time(time)
+      expect(topic.created_at).to eq_time(time)
     end
   end
 
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index 7d4f4fc74a..e5467f44e8 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -138,7 +138,7 @@ describe PostRevisor do
         expect(post.version).to eq(1)
         expect(post.public_version).to eq(1)
         expect(post.revisions.size).to eq(0)
-        expect(post.last_version_at).to eq(first_version_at)
+        expect(post.last_version_at).to eq_time(first_version_at)
         expect(subject.category_changed).to be_blank
       end
 
@@ -209,6 +209,7 @@ describe PostRevisor do
       end
 
       it "resets the edit_reason attribute in post model" do
+        freeze_time
         SiteSetting.editing_grace_period = 5
         post = Fabricate(:post, raw: 'hello world')
         revisor = PostRevisor.new(post)
@@ -216,7 +217,7 @@ describe PostRevisor do
         post.reload
         expect(post.edit_reason).to eq('this is my reason')
 
-        revisor.revise!(post.user, { raw: 'hello world4321' }, revised_at: post.updated_at + 6.second)
+        revisor.revise!(post.user, { raw: 'hello world4321' }, revised_at: post.updated_at + 7.seconds)
         post.reload
         expect(post.edit_reason).not_to be_present
       end
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index c4578148d7..3f89e63cf3 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -374,9 +374,9 @@ describe Search do
 
     context 'search within topic' do
 
-      def new_post(raw, topic = nil)
+      def new_post(raw, topic = nil, created_at: nil)
         topic ||= Fabricate(:topic)
-        Fabricate(:post, topic: topic, topic_id: topic.id, user: topic.user, raw: raw)
+        Fabricate(:post, topic: topic, topic_id: topic.id, user: topic.user, raw: raw, created_at: created_at)
       end
 
       it 'works in Chinese' do
@@ -391,13 +391,13 @@ describe Search do
         topic = Fabricate(:topic)
         topic2 = Fabricate(:topic)
 
-        new_post('this is the other post I am posting', topic2)
-        new_post('this is my fifth post I am posting', topic2)
+        new_post('this is the other post I am posting', topic2, created_at: 6.minutes.ago)
+        new_post('this is my fifth post I am posting', topic2, created_at: 5.minutes.ago)
 
-        post1 = new_post('this is the other post I am posting', topic)
-        post2 = new_post('this is my first post I am posting', topic)
-        post3 = new_post('this is a real long and complicated bla this is my second post I am Posting birds with more stuff bla bla', topic)
-        post4 = new_post('this is my fourth post I am posting', topic)
+        post1 = new_post('this is the other post I am posting', topic, created_at: 4.minutes.ago)
+        post2 = new_post('this is my first post I am posting', topic, created_at: 3.minutes.ago)
+        post3 = new_post('this is a real long and complicated bla this is my second post I am Posting birds with more stuff bla bla', topic, created_at: 2.minutes.ago)
+        post4 = new_post('this is my fourth post I am posting', topic, created_at: 1.minute.ago)
 
         # update posts_count
         topic.reload
@@ -681,8 +681,8 @@ describe Search do
 
       it "should return posts in the right order" do
         raw = "The pure genuine evian"
-        post = Fabricate(:post, topic: category.topic, raw: raw)
-        post2 = Fabricate(:post, topic: category2.topic, raw: raw)
+        post = freeze_time(10.seconds.from_now) { Fabricate(:post, topic: category.topic, raw: raw) }
+        post2 = freeze_time(20.seconds.from_now) { Fabricate(:post, topic: category2.topic, raw: raw) }
 
         search = Search.execute(raw)
 
@@ -1145,9 +1145,8 @@ describe Search do
 
     it 'can find by latest' do
       topic1 = Fabricate(:topic, title: 'I do not like that Sam I am')
-      post1 = Fabricate(:post, topic: topic1)
-
-      post2 = Fabricate(:post, raw: 'that Sam I am, that Sam I am')
+      post1 = Fabricate(:post, topic: topic1, created_at: 10.minutes.ago)
+      post2 = Fabricate(:post, raw: 'that Sam I am, that Sam I am', created_at: 5.minutes.ago)
 
       expect(Search.execute('sam').posts.map(&:id)).to eq([post1.id, post2.id])
       expect(Search.execute('sam order:latest').posts.map(&:id)).to eq([post2.id, post1.id])
@@ -1332,8 +1331,8 @@ describe Search do
         cat1 = Fabricate(:category_with_definition, name: 'food')
         topic6 = Fabricate(:topic, tags: [tag1, tag2], category: cat1)
         topic7 = Fabricate(:topic, tags: [tag1, tag2, tag3], category: cat1)
-        post7 = Fabricate(:post, topic: topic6, raw: "Wakey, wakey, eggs and bakey.", like_count: 5)
-        post8 = Fabricate(:post, topic: topic7, raw: "Bakey, bakey, eggs to makey.", like_count: 2)
+        post7 = Fabricate(:post, topic: topic6, raw: "Wakey, wakey, eggs and bakey.", like_count: 5, created_at: 2.minutes.ago)
+        post8 = Fabricate(:post, topic: topic7, raw: "Bakey, bakey, eggs to makey.", like_count: 2, created_at: 1.minute.ago)
 
         expect(Search.execute('bakey tags:lunch order:latest').posts.map(&:id))
           .to eq([post8.id, post7.id])
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index d13d48c3f0..9d7230ece1 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -246,8 +246,8 @@ describe TopicCreator do
           pinned_at: 3.days.ago
         ))
 
-        expect(topic.created_at).to be_within(1.second).of(1.week.ago)
-        expect(topic.pinned_at).to be_within(1.second).of(3.days.ago)
+        expect(topic.created_at).to eq_time(1.week.ago)
+        expect(topic.pinned_at).to eq_time(3.days.ago)
       end
 
       it 'supports strings' do
@@ -261,8 +261,8 @@ describe TopicCreator do
           pinned_at: '2020-03-10 15:17'
         ))
 
-        expect(topic.created_at).to be_within(1.second).of(time1)
-        expect(topic.pinned_at).to be_within(1.second).of(time2)
+        expect(topic.created_at).to eq_time(time1)
+        expect(topic.pinned_at).to eq_time(time2)
       end
     end
   end
diff --git a/spec/components/topic_publisher_spec.rb b/spec/components/topic_publisher_spec.rb
index c684d3de77..1b2c14bfa2 100644
--- a/spec/components/topic_publisher_spec.rb
+++ b/spec/components/topic_publisher_spec.rb
@@ -33,8 +33,8 @@ describe TopicPublisher do
           topic.reload
           expect(topic.category).to eq(category)
           expect(topic).to be_visible
-          expect(topic.created_at).to eq(published_at)
-          expect(topic.updated_at).to eq(published_at)
+          expect(topic.created_at).to eq_time(published_at)
+          expect(topic.updated_at).to eq_time(published_at)
           expect(topic.shared_draft).to be_blank
 
           expect(UserHistory.where(
@@ -48,9 +48,9 @@ describe TopicPublisher do
           expect(op.revisions.size).to eq(0)
           expect(op.version).to eq(1)
           expect(op.public_version).to eq(1)
-          expect(op.created_at).to eq(published_at)
-          expect(op.updated_at).to eq(published_at)
-          expect(op.last_version_at).to eq(published_at)
+          expect(op.created_at).to eq_time(published_at)
+          expect(op.updated_at).to eq_time(published_at)
+          expect(op.last_version_at).to eq_time(published_at)
         end
       end
     end
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index 3793da7579..0bafbbb1b3 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -75,15 +75,13 @@ describe TopicQuery do
   end
 
   context "prioritize_pinned_topics" do
-
     it "does the pagination correctly" do
-
       num_topics = 15
       per_page = 3
 
       topics = []
       (num_topics - 1).downto(0).each do |i|
-        topics[i] = Fabricate(:topic)
+        topics[i] = freeze_time(i.seconds.ago) { Fabricate(:topic) }
       end
 
       topic_query = TopicQuery.new(user)
@@ -99,7 +97,6 @@ describe TopicQuery do
         page: 1)
       ).to eq(topics[per_page...num_topics])
     end
-
   end
 
   context 'bookmarks' do
@@ -926,7 +923,7 @@ describe TopicQuery do
           let!(:user) { group_user }
 
           it 'should return the group topics' do
-            expect(suggested_topics).to eq([private_group_topic.id, private_message.id])
+            expect(suggested_topics).to match_array([private_group_topic.id, private_message.id])
           end
         end
 
diff --git a/spec/integration/topic_auto_close_spec.rb b/spec/integration/topic_auto_close_spec.rb
index bd231687a4..8dcc2721e2 100644
--- a/spec/integration/topic_auto_close_spec.rb
+++ b/spec/integration/topic_auto_close_spec.rb
@@ -41,7 +41,7 @@ describe Topic do
           topic_status_update = TopicTimer.last
 
           expect(topic_status_update.topic).to eq(topic)
-          expect(topic.public_topic_timer.execute_at).to be_within_one_second_of(2.hours.from_now)
+          expect(topic.public_topic_timer.execute_at).to eq_time(2.hours.from_now)
 
           args = job_klass.jobs.last['args'].first
 
@@ -59,7 +59,7 @@ describe Topic do
             topic_status_update = TopicTimer.last
 
             expect(topic_status_update.topic).to eq(staff_topic)
-            expect(topic_status_update.execute_at).to be_within_one_second_of(2.hours.from_now)
+            expect(topic_status_update.execute_at).to eq_time(2.hours.from_now)
             expect(topic_status_update.user).to eq(admin)
 
             args = job_klass.jobs.last['args'].first
@@ -70,14 +70,12 @@ describe Topic do
 
           context 'topic is closed manually' do
             it 'should remove the schedule to auto-close the topic' do
-              freeze_time
-
               topic_timer_id = staff_topic.public_topic_timer.id
 
               staff_topic.update_status('closed', true, admin)
 
               expect(TopicTimer.with_deleted.find(topic_timer_id).deleted_at)
-                .to be_within(1.second).of(Time.zone.now)
+                .to eq_time(Time.zone.now)
             end
           end
         end
@@ -92,7 +90,7 @@ describe Topic do
             topic_status_update = TopicTimer.last
 
             expect(topic_status_update.topic).to eq(regular_user_topic)
-            expect(topic_status_update.execute_at).to be_within_one_second_of(2.hours.from_now)
+            expect(topic_status_update.execute_at).to eq_time(2.hours.from_now)
             expect(topic_status_update.user).to eq(Discourse.system_user)
 
             args = job_klass.jobs.last['args'].first
diff --git a/spec/integration/user_api_keys_spec.rb b/spec/integration/user_api_keys_spec.rb
index e094ed3a84..8cd4edcd7a 100644
--- a/spec/integration/user_api_keys_spec.rb
+++ b/spec/integration/user_api_keys_spec.rb
@@ -3,16 +3,16 @@
 require 'rails_helper'
 
 describe 'user api keys integration' do
-
   fab!(:user_api_key) { Fabricate(:readonly_user_api_key) }
 
   it 'updates last used time on use' do
-    user_api_key.update_columns(last_used_at: 7.days.ago)
-
     freeze_time
+
+    user_api_key.update_columns(last_used_at: 7.days.ago)
     get '/session/current.json', headers: {
       HTTP_USER_API_KEY: user_api_key.key,
     }
+
     expect(user_api_key.reload.last_used_at).to eq_time(Time.zone.now)
   end
 end
diff --git a/spec/integrity/coding_style_spec.rb b/spec/integrity/coding_style_spec.rb
index 864ff1d5a6..49a5737844 100644
--- a/spec/integrity/coding_style_spec.rb
+++ b/spec/integrity/coding_style_spec.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rails_helper"
+
 def list_files(base_dir, pattern = '*')
   Dir[File.join("#{base_dir}", pattern)]
 end
diff --git a/spec/jobs/auto_expire_user_api_keys_spec.rb b/spec/jobs/auto_expire_user_api_keys_spec.rb
index ef490a113e..13c7df6a06 100644
--- a/spec/jobs/auto_expire_user_api_keys_spec.rb
+++ b/spec/jobs/auto_expire_user_api_keys_spec.rb
@@ -7,7 +7,6 @@ RSpec.describe Jobs::AutoExpireUserApiKeys do
   fab!(:key2) { Fabricate(:readonly_user_api_key) }
 
   context 'when user api key is unused in last 1 days' do
-
     before do
       SiteSetting.expire_user_api_keys_days = 1
     end
@@ -16,10 +15,9 @@ RSpec.describe Jobs::AutoExpireUserApiKeys do
       freeze_time
 
       key1.update!(last_used_at: 2.days.ago)
-
       described_class.new.execute({})
 
-      expect(key1.reload.revoked_at).to be_within(1.second).of(Time.zone.now)
+      expect(key1.reload.revoked_at).to eq_time(Time.zone.now)
       expect(key2.reload.revoked_at).to eq(nil)
     end
   end
diff --git a/spec/jobs/periodical_updates_spec.rb b/spec/jobs/periodical_updates_spec.rb
index 52729471d4..40504960e8 100644
--- a/spec/jobs/periodical_updates_spec.rb
+++ b/spec/jobs/periodical_updates_spec.rb
@@ -33,6 +33,6 @@ describe Jobs::PeriodicalUpdates do
     # does not rebake
     Jobs::PeriodicalUpdates.new.execute
     post.reload
-    expect(post.baked_at).to eq(baked)
+    expect(post.baked_at).to eq_time(baked)
   end
 end
diff --git a/spec/jobs/publish_topic_to_category_spec.rb b/spec/jobs/publish_topic_to_category_spec.rb
index 3602eaa5b3..559065f750 100644
--- a/spec/jobs/publish_topic_to_category_spec.rb
+++ b/spec/jobs/publish_topic_to_category_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Jobs::PublishTopicToCategory do
 
   describe 'when topic has been deleted' do
     it 'should not publish the topic to the new category' do
-      freeze_time 1.hour.ago
+      created_at = freeze_time 1.hour.ago
       topic
 
       freeze_time 1.hour.from_now
@@ -32,7 +32,7 @@ RSpec.describe Jobs::PublishTopicToCategory do
 
       topic.reload
       expect(topic.category).to eq(category)
-      expect(topic.created_at).to be_within(1.second).of(Time.zone.now - 1.hour)
+      expect(topic.created_at).to eq_time(created_at)
     end
   end
 
@@ -41,6 +41,8 @@ RSpec.describe Jobs::PublishTopicToCategory do
       topic.update!(visible: false)
     end
 
+    now = freeze_time
+
     message = MessageBus.track_publish do
       described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
     end.find do |m|
@@ -54,19 +56,19 @@ RSpec.describe Jobs::PublishTopicToCategory do
     expect(message.channel).to eq("/topic/#{topic.id}")
 
     %w{created_at bumped_at updated_at last_posted_at}.each do |attribute|
-      expect(topic.public_send(attribute)).to be_within(1.second).of(Time.zone.now)
+      expect(topic.public_send(attribute)).to eq_time(now)
     end
   end
 
   describe 'when topic is a private message' do
-    before do
+    it 'should publish the topic to the new category' do
       freeze_time 1.hour.ago do
         expect { topic.convert_to_private_message(Discourse.system_user) }
           .to change { topic.private_message? }.to(true)
       end
-    end
 
-    it 'should publish the topic to the new category' do
+      now = freeze_time
+
       message = MessageBus.track_publish do
         described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
       end.last
@@ -77,7 +79,7 @@ RSpec.describe Jobs::PublishTopicToCategory do
       expect(topic.private_message?).to eq(false)
 
       %w{created_at bumped_at updated_at last_posted_at}.each do |attribute|
-        expect(topic.public_send(attribute)).to be_within(1.second).of(Time.zone.now)
+        expect(topic.public_send(attribute)).to eq_time(now)
       end
 
       expect(message.data[:reload_topic]).to be_present
@@ -86,11 +88,10 @@ RSpec.describe Jobs::PublishTopicToCategory do
   end
 
   describe 'when new category has a default auto-close' do
-    before do
-      another_category.update!(auto_close_hours: 5)
-    end
-
     it 'should apply the auto-close timer upon publishing' do
+      freeze_time
+
+      another_category.update!(auto_close_hours: 5)
       topic
 
       described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
@@ -99,7 +100,7 @@ RSpec.describe Jobs::PublishTopicToCategory do
       topic_timer = topic.public_topic_timer
       expect(topic.category).to eq(another_category)
       expect(topic_timer.status_type).to eq(TopicTimer.types[:close])
-      expect(topic_timer.execute_at).to be_within(1.second).of(5.hours.from_now)
+      expect(topic_timer.execute_at).to eq_time(5.hours.from_now)
     end
   end
 end
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index 6e3a21ca9a..de87e7e153 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -44,7 +44,7 @@ describe Jobs::PullHotlinkedImages do
 
       freeze_time 1.week.from_now
       Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
-      expect(orig).to be_within(1.second).of(post.reload.updated_at)
+      expect(orig).to eq_time(post.reload.updated_at)
     end
 
     it 'replaces images' do
diff --git a/spec/jobs/truncate_user_flag_stats_spec.rb b/spec/jobs/truncate_user_flag_stats_spec.rb
index b7e23fbb8b..9dc28c2a8b 100644
--- a/spec/jobs/truncate_user_flag_stats_spec.rb
+++ b/spec/jobs/truncate_user_flag_stats_spec.rb
@@ -37,15 +37,24 @@ describe Jobs::TruncateUserFlagStats do
     p2 = Fabricate(:post, user: user)
     p3 = Fabricate(:post)
 
+    freeze_time 10.minutes.ago
     r0 = PostActionCreator.spam(user, p0).reviewable
+    freeze_time 1.minute.from_now
     r1 = PostActionCreator.spam(user, p1).reviewable
+    freeze_time 1.minute.from_now
     r2 = PostActionCreator.spam(user, p2).reviewable
+    freeze_time 1.minute.from_now
     r3 = PostActionCreator.spam(user, p3).reviewable
 
+    freeze_time 1.minute.from_now
     PostActionCreator.spam(other_user, p3).reviewable
+    freeze_time 1.minute.from_now
     PostActionCreator.spam(other_user, p2).reviewable
+    freeze_time 1.minute.from_now
     PostActionCreator.spam(other_user, p1).reviewable
 
+    unfreeze_time
+
     r0.perform(Discourse.system_user, :agree_and_keep)
     r1.perform(Discourse.system_user, :disagree)
     r2.perform(Discourse.system_user, :ignore)
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index 263adba7e3..e6def350b2 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -192,18 +192,21 @@ describe Jobs::UserEmail do
   end
 
   context "email_log" do
-    fab!(:post) { Fabricate(:post) }
+    fab!(:post) { Fabricate(:post, created_at: 30.seconds.ago) }
 
     before do
       SiteSetting.editing_grace_period = 0
-      post
     end
 
     it "creates an email log when the mail is sent (via Email::Sender)" do
-      last_emailed_at = user.last_emailed_at
+      freeze_time
+
+      last_emailed_at = 7.days.ago
+      user.update!(last_emailed_at: last_emailed_at)
+      Topic.last.update(created_at: 1.minute.ago)
 
       expect do
-        Jobs::UserEmail.new.execute(type: :digest, user_id: user.id,)
+        Jobs::UserEmail.new.execute(type: :digest, user_id: user.id)
       end.to change { EmailLog.count }.by(1)
 
       email_log = EmailLog.last
@@ -211,12 +214,17 @@ describe Jobs::UserEmail do
       expect(email_log.user).to eq(user)
       expect(email_log.post).to eq(nil)
       # last_emailed_at should have changed
-      expect(email_log.user.last_emailed_at).to_not eq(last_emailed_at)
+      expect(email_log.user.last_emailed_at).to_not eq_time(last_emailed_at)
     end
 
     it "creates a skipped email log when the mail is skipped" do
-      last_emailed_at = user.last_emailed_at
-      user.update_columns(suspended_till: 1.year.from_now)
+      freeze_time
+
+      last_emailed_at = 7.days.ago
+      user.update!(
+        last_emailed_at: last_emailed_at,
+        suspended_till: 1.year.from_now
+      )
 
       expect do
         Jobs::UserEmail.new.execute(type: :digest, user_id: user.id)
@@ -231,7 +239,7 @@ describe Jobs::UserEmail do
       )).to eq(true)
 
       # last_emailed_at doesn't change
-      expect(user.last_emailed_at).to eq(last_emailed_at)
+      expect(user.last_emailed_at).to eq_time(last_emailed_at)
     end
 
     it "creates a skipped email log when the user isn't allowed to see the post" do
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 300fc5561e..68f037bf57 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -535,15 +535,15 @@ describe Category do
 
   describe 'latest' do
     it 'should be updated correctly' do
-      category = Fabricate(:category_with_definition)
-      post = create_post(category: category.id)
+      category = freeze_time(1.minute.ago) { Fabricate(:category_with_definition) }
+      post = create_post(category: category.id, created_at: 15.seconds.ago)
 
       category.reload
       expect(category.latest_post_id).to eq(post.id)
       expect(category.latest_topic_id).to eq(post.topic_id)
 
-      post2 = create_post(category: category.id)
-      post3 = create_post(topic_id: post.topic_id, category: category.id)
+      post2 = create_post(category: category.id, created_at: 10.seconds.ago)
+      post3 = create_post(topic_id: post.topic_id, category: category.id, created_at: 5.seconds.ago)
 
       category.reload
       expect(category.latest_post_id).to eq(post3.id)
@@ -858,22 +858,18 @@ describe Category do
     end
 
     it 'should correctly automatically bump topics' do
-      freeze_time 1.second.ago
-      category = Fabricate(:category_with_definition)
+      freeze_time
+      category = Fabricate(:category_with_definition, created_at: 1.minute.ago)
       category.clear_auto_bump_cache!
 
-      freeze_time 1.second.from_now
-      post1 = create_post(category: category)
-      freeze_time 1.second.from_now
-      _post2 = create_post(category: category)
-      freeze_time 1.second.from_now
-      _post3 = create_post(category: category)
+      post1 = create_post(category: category, created_at: 15.seconds.ago)
+      _post2 = create_post(category: category, created_at: 10.seconds.ago)
+      _post3 = create_post(category: category, created_at: 5.seconds.ago)
 
       # no limits on post creation or category creation please
       RateLimiter.enable
 
-      time = 1.month.from_now
-      freeze_time time
+      time = freeze_time 1.month.from_now
 
       expect(category.auto_bump_topic!).to eq(false)
       expect(Topic.where(bumped_at: time).count).to eq(0)
@@ -886,8 +882,7 @@ describe Category do
       # our extra bump message
       expect(post1.topic.reload.posts_count).to eq(2)
 
-      time = time + 13.hours
-      freeze_time time
+      time = freeze_time 13.hours.from_now
 
       expect(category.auto_bump_topic!).to eq(true)
       expect(Topic.where(bumped_at: time).count).to eq(1)
@@ -895,8 +890,7 @@ describe Category do
       expect(category.auto_bump_topic!).to eq(false)
       expect(Topic.where(bumped_at: time).count).to eq(1)
 
-      time = 1.month.from_now
-      freeze_time time
+      time = freeze_time 1.month.from_now
 
       category.auto_bump_limiter.clear!
       expect(Category.auto_bump_topic!).to eq(true)
@@ -909,18 +903,16 @@ describe Category do
     end
 
     it 'should not automatically bump topics with a bump scheduled' do
-      freeze_time 1.second.ago
-      category = Fabricate(:category_with_definition)
+      freeze_time
+      category = Fabricate(:category_with_definition, created_at: 1.second.ago)
       category.clear_auto_bump_cache!
 
-      freeze_time 1.second.from_now
       post1 = create_post(category: category)
 
       # no limits on post creation or category creation please
       RateLimiter.enable
 
-      time = 1.month.from_now
-      freeze_time time
+      time = freeze_time 1.month.from_now
 
       expect(category.auto_bump_topic!).to eq(false)
       expect(Topic.where(bumped_at: time).count).to eq(0)
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 15a6b9d0c0..fab7da2690 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -125,13 +125,14 @@ describe Invite do
           end
 
           it 'updates timestamp of existing invite' do
+            freeze_time
             invite.update!(created_at: 10.days.ago)
 
             resend_invite = Invite.invite_by_email(
               'iceking@adventuretime.ooo', inviter, topic
             )
 
-            expect(resend_invite.created_at).to be_within(1.minute).of(Time.zone.now)
+            expect(resend_invite.created_at).to eq_time(Time.zone.now)
           end
 
           it 'returns a new invite if the other has expired' do
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 82b10a871e..8cdc6591a1 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -729,7 +729,7 @@ describe PostAction do
         topic_status_update = TopicTimer.last
 
         expect(topic_status_update.topic).to eq(topic)
-        expect(topic_status_update.execute_at).to be_within(1.second).of(1.hour.from_now)
+        expect(topic_status_update.execute_at).to eq_time(1.hour.from_now)
         expect(topic_status_update.status_type).to eq(TopicTimer.types[:open])
       end
 
@@ -772,7 +772,7 @@ describe PostAction do
         Jobs::ToggleTopicClosed.new.execute(topic_timer_id: timer.id, state: false)
 
         expect(topic.reload.closed).to eq(true)
-        expect(timer.reload.execute_at).to eq(1.hour.from_now)
+        expect(timer.reload.execute_at).to eq_time(1.hour.from_now)
 
         freeze_time timer.execute_at
         SiteSetting.num_flaggers_to_close_topic = 10
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index 7ae87eab6a..d198e2d33c 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -24,10 +24,12 @@ describe PostMover do
 
   describe 'move_posts' do
     context 'topics' do
+      before { freeze_time }
+
       fab!(:user) { Fabricate(:user, admin: true) }
       fab!(:another_user) { evil_trout }
       fab!(:category) { Fabricate(:category, user: user) }
-      fab!(:topic) { Fabricate(:topic, user: user) }
+      fab!(:topic) { Fabricate(:topic, user: user, created_at: 4.hours.ago) }
       fab!(:p1) { Fabricate(:post, topic: topic, user: user, created_at: 3.hours.ago, reply_count: 2) }
 
       fab!(:p2) do
@@ -37,14 +39,15 @@ describe PostMover do
           user: another_user,
           raw: "Has a link to [evil trout](http://eviltrout.com) which is a cool site.",
           reply_to_post_number: p1.post_number,
-          reply_count: 1
+          reply_count: 1,
+          created_at: 2.hours.ago
         )
       end
 
-      fab!(:p3) { Fabricate(:post, topic: topic, reply_to_post_number: p1.post_number, user: user) }
-      fab!(:p4) { Fabricate(:post, topic: topic, reply_to_post_number: p2.post_number, user: user) }
-      fab!(:p5) { Fabricate(:post) }
-      let(:p6) { Fabricate(:post, topic: topic) }
+      fab!(:p3) { Fabricate(:post, topic: topic, reply_to_post_number: p1.post_number, user: user, created_at: 1.hour.ago) }
+      fab!(:p4) { Fabricate(:post, topic: topic, reply_to_post_number: p2.post_number, user: user, created_at: 45.minutes.ago) }
+      fab!(:p5) { Fabricate(:post, created_at: 30.minutes.ago) }
+      let(:p6) { Fabricate(:post, topic: topic, created_at: 15.minutes.ago) }
 
       before do
         SiteSetting.tagging_enabled = true
@@ -135,8 +138,6 @@ describe PostMover do
         before do
           TopicUser.update_last_read(user, topic.id, p4.post_number, p4.post_number, 0)
           TopicLink.extract_from(p2)
-
-          freeze_time Time.now
         end
 
         def create_post_timing(post, user, msecs)
@@ -216,7 +217,6 @@ describe PostMover do
         end
 
         context "to a new topic" do
-
           it "works correctly" do
             topic.expects(:add_moderator_post).once
             new_topic = topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name", category_id: category.id, tags: ["tag1", "tag2"])
@@ -238,8 +238,8 @@ describe PostMover do
 
             p4.reload
             expect(new_topic.last_post_user_id).to eq(p4.user_id)
-            expect(new_topic.last_posted_at).to eq(p4.created_at)
-            expect(new_topic.bumped_at).to be_within(1.second).of(Time.now)
+            expect(new_topic.last_posted_at).to eq_time(p4.created_at)
+            expect(new_topic.bumped_at).to eq_time(Time.zone.now)
 
             p2.reload
             expect(p2.sort_order).to eq(1)
@@ -511,8 +511,8 @@ describe PostMover do
             expect(moved_to.category_id).to eq(SiteSetting.uncategorized_category_id)
             p4.reload
             expect(moved_to.last_post_user_id).to eq(p4.user_id)
-            expect(moved_to.last_posted_at).to eq(p4.created_at)
-            expect(moved_to.bumped_at).to be_within(1.second).of(Time.now)
+            expect(moved_to.last_posted_at).to eq_time(p4.created_at)
+            expect(moved_to.bumped_at).to eq_time(Time.zone.now)
 
             # Posts should be re-ordered
             p2.reload
@@ -822,8 +822,8 @@ describe PostMover do
 
             p4.reload
             expect(new_topic.last_post_user_id).to eq(p4.user_id)
-            expect(new_topic.last_posted_at).to eq(p4.created_at)
-            expect(new_topic.bumped_at).to be_within(1.second).of(Time.now)
+            expect(new_topic.last_posted_at).to eq_time(p4.created_at)
+            expect(new_topic.bumped_at).to eq_time(Time.zone.now)
 
             p2.reload
             expect(p2.sort_order).to eq(1)
@@ -920,7 +920,6 @@ describe PostMover do
         end
 
         context "moving the first post" do
-
           it "copies the OP, doesn't delete it" do
             topic.expects(:add_moderator_post).once
             new_topic = topic.move_posts(user, [p1.id, p2.id], title: "new testing topic name")
@@ -940,7 +939,7 @@ describe PostMover do
             # New first post
             new_first = new_topic.posts.where(post_number: 1).first
             expect(new_first.reply_count).to eq(1)
-            expect(new_first.created_at).to be_within(1.second).of(p1.created_at)
+            expect(new_first.created_at).to eq_time(p1.created_at)
 
             # Second post is in a new topic
             p2.reload
@@ -1074,13 +1073,12 @@ describe PostMover do
       fab!(:user) { Fabricate(:user) }
       fab!(:another_user) { Fabricate(:user) }
       fab!(:regular_user) { Fabricate(:trust_level_4) }
-      fab!(:topic) { Fabricate(:topic) }
       fab!(:personal_message) { Fabricate(:private_message_topic, user: evil_trout) }
-      fab!(:p1) { Fabricate(:post, topic: personal_message, user: user) }
-      fab!(:p2) { Fabricate(:post, topic: personal_message, reply_to_post_number: p1.post_number, user: another_user) }
-      fab!(:p3) { Fabricate(:post, topic: personal_message, reply_to_post_number: p1.post_number, user: user) }
-      fab!(:p4) { Fabricate(:post, topic: personal_message, reply_to_post_number: p2.post_number, user: user) }
-      fab!(:p5) { Fabricate(:post, topic: personal_message, user: evil_trout) }
+      fab!(:p1) { Fabricate(:post, topic: personal_message, user: user, created_at: 4.hours.ago) }
+      fab!(:p2) { Fabricate(:post, topic: personal_message, reply_to_post_number: p1.post_number, user: another_user, created_at: 3.hours.ago) }
+      fab!(:p3) { Fabricate(:post, topic: personal_message, reply_to_post_number: p1.post_number, user: user, created_at: 2.hours.ago) }
+      fab!(:p4) { Fabricate(:post, topic: personal_message, reply_to_post_number: p2.post_number, user: user, created_at: 1.hour.ago) }
+      fab!(:p5) { Fabricate(:post, topic: personal_message, user: evil_trout, created_at: 30.minutes.ago) }
       let(:another_personal_message) do
         Fabricate(:private_message_topic, user: user, topic_allowed_users: [
           Fabricate.build(:topic_allowed_user, user: admin)
@@ -1181,6 +1179,8 @@ describe PostMover do
         end
 
         it "does not allow moving regular topic posts in personal message" do
+          topic = Fabricate(:topic, created_at: 4.hours.ago)
+
           expect {
             personal_message.move_posts(admin, [p2.id, p5.id], destination_topic_id: topic.id)
           }.to raise_error(Discourse::InvalidParameters)
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 325f4febcc..b09245460b 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1132,7 +1132,7 @@ describe Post do
       SiteSetting.newuser_spam_host_threshold = 1
       SiteSetting.newuser_max_links = 3
       user = Fabricate(:user, staged: true, trust_level: 0)
-      user.created_at = 1.day.ago
+      user.created_at = 2.days.ago
       user.unstage
       post = Fabricate(:post, raw: raw, user: user)
       expect(post.has_host_spam?).to eq(false)
@@ -1224,7 +1224,7 @@ describe Post do
       baked = post.baked_at
       Post.rebake_old(100)
       post.reload
-      expect(post.baked_at).to eq(baked)
+      expect(post.baked_at).to eq_time(baked)
     end
 
     it "will rate limit globally" do
@@ -1475,10 +1475,7 @@ describe Post do
     end
 
     def updates_topic_updated_at
-
-      freeze_time 1.day.from_now
-      time = Time.now
-
+      time = freeze_time 1.day.from_now
       result = yield
 
       topic.reload
diff --git a/spec/models/quoted_post_spec.rb b/spec/models/quoted_post_spec.rb
index a40025400e..35082b5af2 100644
--- a/spec/models/quoted_post_spec.rb
+++ b/spec/models/quoted_post_spec.rb
@@ -84,7 +84,6 @@ describe QuotedPost do
     quote.reload
 
     expect(original_date).to eq_time(quote.created_at)
-
     expect(post2.reply_quoted).to eq(false)
   end
 end
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index 59d026a18b..6f5bab1df1 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -103,7 +103,7 @@ describe RemoteTheme do
       expect(@theme.settings.length).to eq(1)
       expect(@theme.settings.first.value).to eq(true)
 
-      expect(remote.remote_updated_at).to eq(time)
+      expect(remote.remote_updated_at).to eq_time(time)
 
       scheme = ColorScheme.find_by(theme_id: @theme.id)
       expect(scheme.name).to eq("Amazing")
@@ -150,7 +150,7 @@ describe RemoteTheme do
       expect(@theme.settings.length).to eq(1)
       expect(@theme.settings.first.value).to eq(32)
 
-      expect(remote.remote_updated_at).to eq(time)
+      expect(remote.remote_updated_at).to eq_time(time)
       expect(remote.about_url).to eq("https://newsite.com/about")
 
       # It should be able to remove old colors as well
diff --git a/spec/models/screened_email_spec.rb b/spec/models/screened_email_spec.rb
index bb2bc0c4be..aeefe195d3 100644
--- a/spec/models/screened_email_spec.rb
+++ b/spec/models/screened_email_spec.rb
@@ -80,9 +80,9 @@ describe ScreenedEmail do
 
     shared_examples "when a ScreenedEmail record matches" do
       it "updates statistics" do
-        freeze_time(Time.zone.now) do
+        freeze_time do
           expect { subject }.to change { screened_email.reload.match_count }.by(1)
-          expect(screened_email.last_match_at).to be_within_one_second_of(Time.zone.now)
+          expect(screened_email.last_match_at).to eq_time(Time.zone.now)
         end
       end
     end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index e882c3fd05..17d49606ff 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -988,7 +988,7 @@ describe Topic do
     fab!(:topic) { Fabricate(:topic, bumped_at: 1.hour.ago) }
 
     before do
-      @original_bumped_at = topic.bumped_at.to_f
+      @original_bumped_at = topic.bumped_at
       @user = topic.user
       @user.admin = true
     end
@@ -1000,7 +1000,7 @@ describe Topic do
           topic.reload
           expect(topic).not_to be_visible
           expect(topic.moderator_posts_count).to eq(1)
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
         end
 
         it 'removes itself as featured topic on user profiles' do
@@ -1022,7 +1022,7 @@ describe Topic do
         it 'should be visible with correct counts' do
           expect(topic).to be_visible
           expect(topic.moderator_posts_count).to eq(1)
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
         end
       end
     end
@@ -1037,7 +1037,7 @@ describe Topic do
         it "doesn't have a pinned_at but has correct dates" do
           expect(topic.pinned_at).to be_blank
           expect(topic.moderator_posts_count).to eq(1)
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
         end
       end
 
@@ -1050,7 +1050,7 @@ describe Topic do
 
         it 'should enable correctly' do
           expect(topic.pinned_at).to be_present
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
           expect(topic.moderator_posts_count).to eq(1)
         end
 
@@ -1061,14 +1061,14 @@ describe Topic do
       context 'disable' do
         before do
           @archived_topic = Fabricate(:topic, archived: true, bumped_at: 1.hour.ago)
-          @original_bumped_at = @archived_topic.bumped_at.to_f
+          @original_bumped_at = @archived_topic.bumped_at
           @archived_topic.update_status('archived', false, @user)
           @archived_topic.reload
         end
 
         it 'should archive correctly' do
           expect(@archived_topic).not_to be_archived
-          expect(@archived_topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(@archived_topic.bumped_at).to eq_time(@original_bumped_at)
           expect(@archived_topic.moderator_posts_count).to eq(1)
         end
       end
@@ -1083,7 +1083,7 @@ describe Topic do
         it 'should be archived' do
           expect(topic).to be_archived
           expect(topic.moderator_posts_count).to eq(1)
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
         end
       end
     end
@@ -1092,7 +1092,7 @@ describe Topic do
       context 'disable' do
         before do
           @closed_topic = Fabricate(:topic, closed: true, bumped_at: 1.hour.ago)
-          @original_bumped_at = @closed_topic.bumped_at.to_f
+          @original_bumped_at = @closed_topic.bumped_at
           @closed_topic.update_status(status, false, @user)
           @closed_topic.reload
         end
@@ -1100,7 +1100,7 @@ describe Topic do
         it 'should not be pinned' do
           expect(@closed_topic).not_to be_closed
           expect(@closed_topic.moderator_posts_count).to eq(1)
-          expect(@closed_topic.bumped_at.to_f).not_to be_within(1e-4).of(@original_bumped_at)
+          expect(@closed_topic.bumped_at).not_to eq_time(@original_bumped_at)
         end
       end
 
@@ -1113,7 +1113,7 @@ describe Topic do
 
         it 'should be closed' do
           expect(topic).to be_closed
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
           expect(topic.moderator_posts_count).to eq(1)
           expect(topic.topic_timers.first).to eq(nil)
         end
@@ -1473,6 +1473,8 @@ describe Topic do
           end
 
           it 'should set a topic timer' do
+            freeze_time
+
             expect { topic.change_category_to_id(new_category.id) }
               .to change { TopicTimer.count }.by(1)
 
@@ -1481,7 +1483,7 @@ describe Topic do
             topic_timer = TopicTimer.last
 
             expect(topic_timer.topic).to eq(topic)
-            expect(topic_timer.execute_at).to be_within(1.second).of(Time.zone.now + 5.hours)
+            expect(topic_timer.execute_at).to eq_time(5.hours.from_now)
           end
 
           describe 'when topic is already closed' do
@@ -1506,11 +1508,8 @@ describe Topic do
               topic.change_category_to_id(new_category.id)
 
               expect(topic.reload.category).to eq(new_category)
-
               expect(topic.public_topic_timer).to eq(topic_timer)
-
-              expect(topic.public_topic_timer.execute_at)
-                .to be_within(1.second).of(topic_timer.execute_at)
+              expect(topic.public_topic_timer.execute_at).to eq_time(topic_timer.execute_at)
             end
           end
         end
@@ -1628,32 +1627,32 @@ describe Topic do
       freeze_time now
 
       topic.set_or_create_timer(TopicTimer.types[:close], 72, by_user: admin)
-      expect(topic.topic_timers.first.execute_at).to eq(3.days.from_now)
+      expect(topic.topic_timers.first.execute_at).to eq_time(3.days.from_now)
     end
 
     it 'can take a number of hours as a string' do
       freeze_time now
       topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin)
-      expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
+      expect(topic.topic_timers.first.execute_at).to eq_time(18.hours.from_now)
     end
 
     it 'can take a number of hours as a string and can handle based on last post' do
       freeze_time now
       topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin, based_on_last_post: true)
-      expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
+      expect(topic.topic_timers.first.execute_at).to eq_time(18.hours.from_now)
     end
 
     it "can take a timestamp for a future time" do
       freeze_time now
       topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-22 5:00', by_user: admin)
-      expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013, 11, 22, 5, 0))
+      expect(topic.topic_timers.first.execute_at).to eq_time(Time.zone.local(2013, 11, 22, 5, 0))
     end
 
     it "sets a validation error when given a timestamp in the past" do
       freeze_time now
       topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-19 5:00', by_user: admin)
 
-      expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013, 11, 19, 5, 0))
+      expect(topic.topic_timers.first.execute_at).to eq_time(Time.zone.local(2013, 11, 19, 5, 0))
       expect(topic.topic_timers.first.errors[:execute_at]).to be_present
     end
 
@@ -1672,7 +1671,7 @@ describe Topic do
     it "can take a timestamp with timezone" do
       freeze_time now
       topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-25T01:35:00-08:00', by_user: admin)
-      expect(topic.topic_timers.first.execute_at).to eq(Time.utc(2013, 11, 25, 9, 35))
+      expect(topic.topic_timers.first.execute_at).to eq_time(Time.utc(2013, 11, 25, 9, 35))
     end
 
     it 'sets topic status update user to given user if it is a staff or TL4 user' do
@@ -1716,7 +1715,7 @@ describe Topic do
     it 'updates topic status update execute_at if it was already set to close' do
       freeze_time now
       closing_topic.set_or_create_timer(TopicTimer.types[:close], 48)
-      expect(closing_topic.reload.public_topic_timer.execute_at).to eq(2.days.from_now)
+      expect(closing_topic.reload.public_topic_timer.execute_at).to eq_time(2.days.from_now)
     end
 
     it 'should not delete topic_timer of another status_type' do
@@ -1735,7 +1734,7 @@ describe Topic do
         TopicTimer.types[:publish_to_category], 72, by_user: admin
       )
 
-      expect(topic_timer.execute_at).to eq(3.days.from_now)
+      expect(topic_timer.execute_at).to eq_time(3.days.from_now)
     end
 
     it "does not update topic's topic status created_at it was already set to close" do
@@ -1792,7 +1791,7 @@ describe Topic do
           topic.set_or_create_timer(TopicTimer.types[:reminder], 11, by_user: admin)
         }.to_not change { TopicTimer.count }
         reminder.reload
-        expect(reminder.execute_at).to eq(11.hours.from_now)
+        expect(reminder.execute_at).to eq_time(11.hours.from_now)
       end
     end
   end
@@ -1810,19 +1809,19 @@ describe Topic do
       end
 
       it "doesn't return category topics" do
-        Fabricate(:category_with_definition)
+        Fabricate(:category_with_definition, created_at: 1.minute.ago)
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
       end
 
       it "returns regular topics" do
-        topic = Fabricate(:topic)
+        topic = Fabricate(:topic, created_at: 1.minute.ago)
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to eq([topic])
       end
 
       it "doesn't return topics from muted categories" do
         user = Fabricate(:user)
-        category = Fabricate(:category_with_definition)
-        Fabricate(:topic, category: category)
+        category = Fabricate(:category_with_definition, created_at: 2.minutes.ago)
+        Fabricate(:topic, category: category, created_at: 1.minute.ago)
 
         CategoryUser.set_notification_level_for_category(user, CategoryUser.notification_levels[:muted], category.id)
 
@@ -1830,7 +1829,7 @@ describe Topic do
       end
 
       it "doesn't return topics that a user has muted" do
-        topic = Fabricate(:topic)
+        topic = Fabricate(:topic, created_at: 1.minute.ago)
         user = Fabricate(:user)
 
         Fabricate(:topic_user,
@@ -1844,8 +1843,8 @@ describe Topic do
 
       it "doesn't return topics from suppressed categories" do
         user = Fabricate(:user)
-        category = Fabricate(:category_with_definition)
-        Fabricate(:topic, category: category)
+        category = Fabricate(:category_with_definition, created_at: 2.minutes.ago)
+        Fabricate(:topic, category: category, created_at: 1.minute.ago)
 
         SiteSetting.digest_suppress_categories = "#{category.id}"
 
@@ -1854,20 +1853,20 @@ describe Topic do
 
       it "doesn't return topics from TL0 users" do
         new_user = Fabricate(:user, trust_level: 0)
-        Fabricate(:topic, user: new_user)
+        Fabricate(:topic, user: new_user, created_at: 1.minute.ago)
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
       end
 
       it "returns topics from TL0 users if given include_tl0" do
         new_user = Fabricate(:user, trust_level: 0)
-        topic = Fabricate(:topic, user_id: new_user.id)
+        topic = Fabricate(:topic, user_id: new_user.id, created_at: 1.minute.ago)
 
         expect(Topic.for_digest(user, 1.year.ago, top_order: true, include_tl0: true)).to eq([topic])
       end
 
       it "returns topics from TL0 users if enabled in preferences" do
         new_user = Fabricate(:user, trust_level: 0)
-        topic = Fabricate(:topic, user: new_user)
+        topic = Fabricate(:topic, user: new_user, created_at: 1.minute.ago)
 
         u = Fabricate(:user)
         u.user_option.include_tl0_in_digests = true
@@ -1879,7 +1878,7 @@ describe Topic do
         user = Fabricate(:user)
         tag = Fabricate(:tag)
         TagUser.change(user.id, tag.id, TagUser.notification_levels[:muted])
-        Fabricate(:topic, tags: [tag])
+        Fabricate(:topic, tags: [tag], created_at: 1.minute.ago)
 
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
       end
@@ -1888,7 +1887,7 @@ describe Topic do
         user = Fabricate(:user)
         muted_tag, other_tag = Fabricate(:tag), Fabricate(:tag)
         TagUser.change(user.id, muted_tag.id, TagUser.notification_levels[:muted])
-        topic = Fabricate(:topic, tags: [muted_tag, other_tag])
+        topic = Fabricate(:topic, tags: [muted_tag, other_tag], created_at: 1.minute.ago)
 
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to eq([topic])
       end
@@ -1897,32 +1896,34 @@ describe Topic do
         user = Fabricate(:user)
         muted_tag = Fabricate(:tag)
         TagUser.change(user.id, muted_tag.id, TagUser.notification_levels[:muted])
-        _topic1 = Fabricate(:topic, tags: [muted_tag])
-        topic2 = Fabricate(:topic, tags: [Fabricate(:tag), Fabricate(:tag)])
-        topic3 = Fabricate(:topic)
-
+        _topic1 = Fabricate(:topic, tags: [muted_tag], created_at: 1.minute.ago)
+        topic2 = Fabricate(:topic, tags: [Fabricate(:tag), Fabricate(:tag)], created_at: 1.minute.ago)
+        topic3 = Fabricate(:topic, created_at: 1.minute.ago)
         topics = Topic.for_digest(user, 1.year.ago, top_order: true)
+
         expect(topics.size).to eq(2)
         expect(topics).to contain_exactly(topic2, topic3)
       end
 
       it "sorts by category notification levels" do
-        category1, category2 = Fabricate(:category_with_definition), Fabricate(:category_with_definition)
-        2.times { |i| Fabricate(:topic, category: category1) }
-        topic1 = Fabricate(:topic, category: category2)
-        2.times { |i| Fabricate(:topic, category: category1) }
+        category1, category2 = Fabricate(:category_with_definition), Fabricate(:category_with_definition, created_at: 2.minutes.ago)
+        2.times { |i| Fabricate(:topic, category: category1, created_at: 1.minute.ago) }
+        topic1 = Fabricate(:topic, category: category2, created_at: 1.minute.ago)
+        2.times { |i| Fabricate(:topic, category: category1, created_at: 1.minute.ago) }
         CategoryUser.create(user: user, category: category2, notification_level: CategoryUser.notification_levels[:watching])
         for_digest = Topic.for_digest(user, 1.year.ago, top_order: true)
+
         expect(for_digest.first).to eq(topic1)
       end
 
       it "sorts by topic notification levels" do
         topics = []
-        3.times { |i| topics << Fabricate(:topic) }
+        3.times { |i| topics << Fabricate(:topic, created_at: 1.minute.ago) }
         user = Fabricate(:user)
         TopicUser.create(user_id: user.id, topic_id: topics[0].id, notification_level: TopicUser.notification_levels[:tracking])
         TopicUser.create(user_id: user.id, topic_id: topics[2].id, notification_level: TopicUser.notification_levels[:watching])
         for_digest = Topic.for_digest(user, 1.year.ago, top_order: true).pluck(:id)
+
         expect(for_digest).to eq([topics[2].id, topics[0].id, topics[1].id])
       end
     end
@@ -2090,7 +2091,7 @@ describe Topic do
       topic_embed = TopicEmbed.create!(topic_id: topic.id, embed_url: "https://blog.codinghorror.com/password-rules-are-bullshit", post_id: post.id, deleted_at: 1.day.ago)
       topic.recover!
       topic_embed.reload
-      expect(topic_embed.deleted_at).to eq(nil)
+      expect(topic_embed.deleted_at).to be_nil
     end
   end
 
@@ -2256,7 +2257,6 @@ describe Topic do
   end
 
   it 'allows users to normalize counts' do
-
     topic = Fabricate(:topic, last_posted_at: 1.year.ago)
     post1 = Fabricate(:post, topic: topic, post_number: 1)
     post2 = Fabricate(:post, topic: topic, post_type: Post.types[:whisper], post_number: 2)
@@ -2267,7 +2267,7 @@ describe Topic do
     expect(topic.posts_count).to eq(1)
     expect(topic.highest_post_number).to eq(post1.post_number)
     expect(topic.highest_staff_post_number).to eq(post2.post_number)
-    expect(topic.last_posted_at).to be_within(1.second).of (post1.created_at)
+    expect(topic.last_posted_at).to eq_time(post1.created_at)
   end
 
   context 'featured link' do
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index e19c696eb7..a68239512d 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -458,6 +458,7 @@ describe TopicTrackingState do
   end
 
   it "correctly handles seen categories" do
+    freeze_time 1.minute.ago
     user = Fabricate(:user)
     post
 
@@ -473,6 +474,7 @@ describe TopicTrackingState do
     report = TopicTrackingState.report(user)
     expect(report.length).to eq(0)
 
+    unfreeze_time
     post.topic.touch(:created_at)
 
     report = TopicTrackingState.report(user)
diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb
index de0e3f1cdc..f4485f1c4c 100644
--- a/spec/models/user_action_spec.rb
+++ b/spec/models/user_action_spec.rb
@@ -226,22 +226,19 @@ describe UserAction do
   end
 
   describe 'when a user posts a new topic' do
-    def process_alerts(post)
-      PostAlerter.post_created(post)
-    end
-
     before do
-      @post = create_post(created_at: DateTime.now - 100)
-      process_alerts(@post)
+      freeze_time(100.days.ago) do
+        @post = create_post
+        PostAlerter.post_created(@post)
+      end
     end
 
     describe 'topic action' do
-      before do
-        @action = @post.user.user_actions.find_by(action_type: UserAction::NEW_TOPIC)
-      end
       it 'should exist' do
+        @action = @post.user.user_actions.find_by(action_type: UserAction::NEW_TOPIC)
+
         expect(@action).not_to eq(nil)
-        expect(@action.created_at).to be_within(1).of(@post.topic.created_at)
+        expect(@action.created_at).to eq_time(@post.topic.created_at)
       end
     end
 
@@ -256,7 +253,7 @@ describe UserAction do
 
         @response = PostCreator.new(@other_user, reply_to_post_number: 1, topic_id: @post.topic_id, raw: "perhaps @#{@mentioned.username} knows how this works?").create
 
-        process_alerts(@response)
+        PostAlerter.post_created(@response)
       end
 
       it 'should log user actions correctly' do
diff --git a/spec/models/user_auth_token_spec.rb b/spec/models/user_auth_token_spec.rb
index e9d17c84ec..27448880b4 100644
--- a/spec/models/user_auth_token_spec.rb
+++ b/spec/models/user_auth_token_spec.rb
@@ -83,23 +83,21 @@ describe UserAuthToken do
   end
 
   it "expires correctly" do
-
+    freeze_time Time.zone.now
     user = Fabricate(:user)
-
     user_token = UserAuthToken.generate!(user_id: user.id,
                                          user_agent: "some user agent 2",
                                          client_ip: "1.1.2.3")
 
     UserAuthToken.lookup(user_token.unhashed_auth_token, seen: true)
 
-    freeze_time (SiteSetting.maximum_session_age.hours - 1).from_now
+    freeze_time SiteSetting.maximum_session_age.hours.from_now - 1.second
 
     user_token.reload
-
     user_token.rotate!
     UserAuthToken.lookup(user_token.unhashed_auth_token, seen: true)
 
-    freeze_time (SiteSetting.maximum_session_age.hours - 1).from_now
+    freeze_time SiteSetting.maximum_session_age.hours.from_now - 1.second
 
     still_good = UserAuthToken.lookup(user_token.unhashed_auth_token, seen: true)
     expect(still_good).not_to eq(nil)
@@ -111,7 +109,7 @@ describe UserAuthToken do
   end
 
   it "can properly rotate tokens" do
-
+    freeze_time 3.days.ago
     user = Fabricate(:user)
 
     user_token = UserAuthToken.generate!(user_id: user.id,
@@ -126,12 +124,14 @@ describe UserAuthToken do
 
     user_token.update_columns(auth_token_seen: true)
 
+    rotation_time = freeze_time 1.day.from_now
+
     rotated = user_token.rotate!(user_agent: "a new user agent", client_ip: "1.1.2.4")
     expect(rotated).to eq(true)
 
     user_token.reload
 
-    expect(user_token.rotated_at).to be_within(5.second).of(Time.zone.now)
+    expect(user_token.rotated_at).to eq_time(rotation_time)
     expect(user_token.client_ip).to eq("1.1.2.4")
     expect(user_token.user_agent).to eq("a new user agent")
     expect(user_token.auth_token_seen).to eq(false)
@@ -139,17 +139,17 @@ describe UserAuthToken do
     expect(user_token.prev_auth_token).to eq(prev_auth_token)
 
     # ability to auth using an old token
-    freeze_time
+    seen_at = freeze_time 1.day.from_now
 
     looked_up = UserAuthToken.lookup(user_token.unhashed_auth_token, seen: true)
     expect(looked_up.id).to eq(user_token.id)
     expect(looked_up.auth_token_seen).to eq(true)
-    expect(looked_up.seen_at).to be_within(1.second).of(Time.zone.now)
+    expect(looked_up.seen_at).to eq_time(seen_at)
 
     looked_up = UserAuthToken.lookup(unhashed_prev, seen: true)
     expect(looked_up.id).to eq(user_token.id)
 
-    freeze_time(2.minute.from_now)
+    freeze_time 2.minutes.from_now
 
     looked_up = UserAuthToken.lookup(unhashed_prev)
     expect(looked_up).not_to eq(nil)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d23451fcfa..ef6b64d511 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -863,7 +863,6 @@ describe User do
   end
 
   describe "previous_visit_at" do
-
     let(:user) { Fabricate(:user) }
     let!(:first_visit_date) { Time.zone.now }
     let!(:second_visit_date) { 2.hours.from_now }
@@ -889,36 +888,36 @@ describe User do
       # second visit
       user.update_last_seen!(second_visit_date)
       user.reload
-      expect(user.previous_visit_at).to be_within_one_second_of(first_visit_date)
+      expect(user.previous_visit_at).to eq_time(first_visit_date)
 
       # third visit
       user.update_last_seen!(third_visit_date)
       user.reload
-      expect(user.previous_visit_at).to be_within_one_second_of(second_visit_date)
+      expect(user.previous_visit_at).to eq_time(second_visit_date)
     end
 
   end
 
   describe "update_last_seen!" do
-    let (:user) { Fabricate(:user) }
+    let(:user) { Fabricate(:user) }
     let!(:first_visit_date) { Time.zone.now }
     let!(:second_visit_date) { 2.hours.from_now }
 
     it "should update the last seen value" do
       expect(user.last_seen_at).to eq nil
       user.update_last_seen!(first_visit_date)
-      expect(user.reload.last_seen_at).to be_within_one_second_of(first_visit_date)
+      expect(user.reload.last_seen_at).to eq_time(first_visit_date)
     end
 
     it "should update the first seen value if it doesn't exist" do
       user.update_last_seen!(first_visit_date)
-      expect(user.reload.first_seen_at).to be_within_one_second_of(first_visit_date)
+      expect(user.reload.first_seen_at).to eq_time(first_visit_date)
     end
 
     it "should not update the first seen value if it doesn't exist" do
       user.update_last_seen!(first_visit_date)
       user.update_last_seen!(second_visit_date)
-      expect(user.reload.first_seen_at).to be_within_one_second_of(first_visit_date)
+      expect(user.reload.first_seen_at).to eq_time(first_visit_date)
     end
   end
 
@@ -976,58 +975,51 @@ describe User do
     end
 
     describe 'with no previous values' do
-      let!(:date) { Time.zone.now }
-
-      before do
-        freeze_time date
-        user.update_last_seen!
-      end
-
       after do
         Discourse.redis.flushall
       end
 
       it "updates last_seen_at" do
-        expect(user.last_seen_at).to be_within_one_second_of(date)
+        date = freeze_time
+        user.update_last_seen!
+
+        expect(user.last_seen_at).to eq_time(date)
       end
 
       it "should have 0 for days_visited" do
+        user.update_last_seen!
         user.reload
+
         expect(user.user_stat.days_visited).to eq(1)
       end
 
       it "should log a user_visit with the date" do
-        expect(user.user_visits.first.visited_at).to eq(date.to_date)
+        date = freeze_time
+        user.update_last_seen!
+
+        expect(user.user_visits.first.visited_at).to eq_time(date.to_date)
       end
 
       context "called twice" do
-
-        before do
-          freeze_time date
+        it "doesn't increase days_visited twice" do
+          freeze_time
           user.update_last_seen!
           user.update_last_seen!
           user.reload
-        end
 
-        it "doesn't increase days_visited twice" do
           expect(user.user_stat.days_visited).to eq(1)
         end
-
       end
 
       describe "after 3 days" do
-        let!(:future_date) { 3.days.from_now }
-
-        before do
-          freeze_time future_date
-          user.update_last_seen!
-        end
-
         it "should log a second visited_at record when we log an update later" do
+          user.update_last_seen!
+          future_date = freeze_time(3.days.from_now)
+          user.update_last_seen!
+
           expect(user.user_visits.count).to eq(2)
         end
       end
-
     end
   end
 
diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb
index d5c563770a..946e0fe3a1 100644
--- a/spec/models/user_stat_spec.rb
+++ b/spec/models/user_stat_spec.rb
@@ -86,7 +86,7 @@ describe UserStat do
       UserStat.ensure_consistency!
 
       post.user.user_stat.reload
-      expect(post.user.user_stat.first_unread_at).to eq_time(Time.now)
+      expect(post.user.user_stat.first_unread_at).to eq_time(Time.zone.now)
     end
   end
 
diff --git a/spec/models/watched_word_spec.rb b/spec/models/watched_word_spec.rb
index 31d4f2fae6..e58a9432b6 100644
--- a/spec/models/watched_word_spec.rb
+++ b/spec/models/watched_word_spec.rb
@@ -71,7 +71,7 @@ describe WatchedWord do
       expect {
         w = described_class.create_or_update_word(word: existing.word, action_key: :flag)
         expect(w.id).to eq(existing.id)
-        expect(w.updated_at).to eq(w.updated_at)
+        expect(w.updated_at).to eq_time(w.updated_at)
       }.to_not change { described_class.count }
     end
 
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 447a08d681..4bc237ab27 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -353,6 +353,8 @@ def freeze_time(now = Time.now)
     ensure
       unfreeze_time
     end
+  else
+    time
   end
 end
 
diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb
index 9b6a77b8ce..eb632bcbe1 100644
--- a/spec/requests/admin/email_controller_spec.rb
+++ b/spec/requests/admin/email_controller_spec.rb
@@ -90,8 +90,8 @@ describe Admin::EmailController do
 
   describe '#skipped' do
     fab!(:user) { Fabricate(:user) }
-    fab!(:log1) { Fabricate(:skipped_email_log, user: user) }
-    fab!(:log2) { Fabricate(:skipped_email_log) }
+    fab!(:log1) { Fabricate(:skipped_email_log, user: user, created_at: 20.minutes.ago) }
+    fab!(:log2) { Fabricate(:skipped_email_log, created_at: 10.minutes.ago) }
 
     it "succeeds" do
       get "/admin/email/skipped.json"
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index fa07869b54..e6326ccc56 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1367,7 +1367,7 @@ describe GroupsController do
 
           expect(response.status).to eq(200)
 
-          result = JSON.parse(response.body)["logs"].last
+          result = JSON.parse(response.body)["logs"].find { |entry| entry["subject"] == "public_exit" }
 
           expect(result["action"]).to eq(GroupHistory.actions[1].to_s)
           expect(result["subject"]).to eq('public_exit')
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 59042ed8e8..dd3afa7cf0 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -415,12 +415,14 @@ describe PostsController do
       end
 
       it "won't update bump date if post is a whisper" do
+        created_at = freeze_time 1.day.ago
         post = Fabricate(:post, post_type: Post.types[:whisper], user: user)
 
+        unfreeze_time
         put "/posts/#{post.id}.json", params: update_params
-        expect(response.status).to eq(200)
 
-        expect(post.topic.reload.bumped_at).to be < post.created_at
+        expect(response.status).to eq(200)
+        expect(post.topic.reload.bumped_at).to eq_time(created_at)
       end
     end
 
@@ -1314,10 +1316,10 @@ describe PostsController do
 
     context "topic bump" do
       shared_examples "it works" do
-        let(:original_bumped_at) { 1.day.ago }
-        let!(:topic) { Fabricate(:topic, bumped_at: original_bumped_at) }
-
         it "should be able to skip topic bumping" do
+          original_bumped_at = 1.day.ago
+          topic = Fabricate(:topic, bumped_at: original_bumped_at)
+
           post "/posts.json", params: {
             raw: 'this is the test content',
             topic_id: topic.id,
@@ -1325,7 +1327,7 @@ describe PostsController do
           }
 
           expect(response.status).to eq(200)
-          expect(topic.reload.bumped_at).to be_within_one_second_of(original_bumped_at)
+          expect(topic.reload.bumped_at).to eq_time(original_bumped_at)
         end
 
         it "should be able to post with topic bumping" do
@@ -1335,7 +1337,7 @@ describe PostsController do
           }
 
           expect(response.status).to eq(200)
-          expect(topic.reload.bumped_at).to eq(topic.posts.last.created_at)
+          expect(topic.reload.bumped_at).to eq_time(topic.posts.last.created_at)
         end
       end
 
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index bb570a8674..481de344e4 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -577,7 +577,11 @@ RSpec.describe TopicsController do
     end
 
     describe 'changing timestamps' do
-      before { sign_in(moderator) }
+      before do
+        freeze_time
+        sign_in(moderator)
+      end
+
       let(:old_timestamp) { Time.zone.now }
       let(:new_timestamp) { old_timestamp - 1.day }
       let!(:topic) { Fabricate(:topic, created_at: old_timestamp) }
@@ -594,9 +598,9 @@ RSpec.describe TopicsController do
         }
 
         expect(response.status).to eq(200)
-        expect(topic.reload.created_at).to be_within_one_second_of(new_timestamp)
-        expect(p1.reload.created_at).to be_within_one_second_of(new_timestamp)
-        expect(p2.reload.created_at).to be_within_one_second_of(old_timestamp)
+        expect(topic.reload.created_at).to eq_time(new_timestamp)
+        expect(p1.reload.created_at).to eq_time(new_timestamp)
+        expect(p2.reload.created_at).to eq_time(old_timestamp)
       end
 
       it 'should create a staff log entry' do
@@ -713,7 +717,6 @@ RSpec.describe TopicsController do
     end
 
     context 'for last post only' do
-
       it 'should allow you to retain topic timing but remove last post only' do
         freeze_time
 
@@ -777,9 +780,7 @@ RSpec.describe TopicsController do
 
         expect(PostTiming.where(topic: topic, user: user, post_number: 1).exists?).to eq(false)
         expect(TopicUser.where(topic: topic, user: user, last_read_post_number: nil, highest_seen_post_number: nil).exists?).to eq(true)
-
       end
-
     end
 
     context 'when logged in' do
@@ -1694,7 +1695,7 @@ RSpec.describe TopicsController do
       sign_in(user)
       get "/t/#{topic.slug}/#{topic.id}"
       topic_user = TopicUser.where(user: user, topic: topic).first
-      expect(topic_user.last_visited_at).to eq(topic_user.first_visited_at)
+      expect(topic_user.last_visited_at).to eq_time(topic_user.first_visited_at)
     end
 
     context 'consider for a promotion' do
@@ -2072,6 +2073,10 @@ RSpec.describe TopicsController do
     let(:post) { Fabricate(:post) }
     let(:topic) { post.topic }
 
+    after do
+      Discourse.redis.flushall
+    end
+
     it 'returns first post of the topic' do
       # we need one for suggested
       create_post
@@ -2594,6 +2599,7 @@ RSpec.describe TopicsController do
 
     context 'when logged in as an admin' do
       before do
+        freeze_time
         sign_in(admin)
       end
 
@@ -2608,14 +2614,12 @@ RSpec.describe TopicsController do
         topic_status_update = TopicTimer.last
 
         expect(topic_status_update.topic).to eq(topic)
-
-        expect(topic_status_update.execute_at)
-          .to be_within(1.second).of(24.hours.from_now)
+        expect(topic_status_update.execute_at).to eq_time(24.hours.from_now)
 
         json = JSON.parse(response.body)
 
         expect(DateTime.parse(json['execute_at']))
-          .to be_within(1.seconds).of(DateTime.parse(topic_status_update.execute_at.to_s))
+          .to eq_time(DateTime.parse(topic_status_update.execute_at.to_s))
 
         expect(json['duration']).to eq(topic_status_update.duration)
         expect(json['closed']).to eq(topic.reload.closed)
@@ -2652,10 +2656,7 @@ RSpec.describe TopicsController do
           topic_status_update = TopicTimer.last
 
           expect(topic_status_update.topic).to eq(topic)
-
-          expect(topic_status_update.execute_at)
-            .to be_within(1.second).of(24.hours.from_now)
-
+          expect(topic_status_update.execute_at).to eq_time(24.hours.from_now)
           expect(topic_status_update.status_type)
             .to eq(TopicTimer.types[:publish_to_category])
 
@@ -3134,7 +3135,7 @@ RSpec.describe TopicsController do
 
         put "/t/#{topic.id}/reset-bump-date.json"
         expect(response.status).to eq(200)
-        expect(topic.reload.bumped_at).to be_within_one_second_of(timestamp)
+        expect(topic.reload.bumped_at).to eq_time(timestamp)
       end
     end
   end
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index 6bfd968e4c..362e03dff3 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -119,21 +119,19 @@ describe BadgeGranter do
   describe 'grant' do
 
     it 'allows overriding of granted_at does not notify old bronze' do
+      freeze_time
       badge = Badge.create!(name: 'a badge', badge_type_id: BadgeType::Bronze)
+      user_badge = BadgeGranter.grant(badge, user, created_at: 1.year.ago)
 
-      time = 1.year.ago
-
-      user_badge = BadgeGranter.grant(badge, user, created_at: time)
-
-      expect(user_badge.granted_at).to eq(time)
+      expect(user_badge.granted_at).to eq_time(1.year.ago)
       expect(Notification.where(user_id: user.id).count).to eq(0)
     end
 
     it "doesn't grant disabled badges" do
+      freeze_time
       badge = Fabricate(:badge, badge_type_id: BadgeType::Bronze, enabled: false)
-      time = 1.year.ago
 
-      user_badge = BadgeGranter.grant(badge, user, created_at: time)
+      user_badge = BadgeGranter.grant(badge, user, created_at: 1.year.ago)
       expect(user_badge).to eq(nil)
     end
 
@@ -147,11 +145,10 @@ describe BadgeGranter do
     end
 
     it 'sets granted_at' do
-      time = 1.day.ago
-      freeze_time time
-
+      day_ago = freeze_time 1.day.ago
       user_badge = BadgeGranter.grant(badge, user)
-      expect(user_badge.granted_at).to be_within(1.second).of(time)
+
+      expect(user_badge.granted_at).to eq_time(day_ago)
     end
 
     it 'sets granted_by if the option is present' do
@@ -228,7 +225,6 @@ describe BadgeGranter do
   describe 'revoke_all' do
     it 'deletes every user_badge record associated with that badge' do
       described_class.grant(badge, user)
-
       described_class.revoke_all(badge)
 
       expect(UserBadge.exists?(badge: badge, user: user)).to eq(false)
diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb
index b32a0ed0b0..1cee8eeae9 100644
--- a/spec/services/post_owner_changer_spec.rb
+++ b/spec/services/post_owner_changer_spec.rb
@@ -23,16 +23,17 @@ describe PostOwnerChanger do
     end
 
     it "changes the user" do
-      bumped_at = topic.bumped_at
+      bumped_at = freeze_time topic.bumped_at
 
       old_user = p1.user
       PostActionCreator.like(user_a, p1)
       p1.reload
       expect(p1.topic.like_count).to eq(1)
+
       PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
       p1.reload
       expect(p1.topic.like_count).to eq(0)
-      expect(p1.topic.bumped_at).to be_within(1.second).of (bumped_at)
+      expect(p1.topic.bumped_at).to eq_time(bumped_at)
       expect(p1.topic.last_post_user_id).to eq(user_a.id)
       expect(old_user).not_to eq(p1.user)
       expect(p1.user).to eq(user_a)
diff --git a/spec/services/topic_timestamp_changer_spec.rb b/spec/services/topic_timestamp_changer_spec.rb
index 887aa71bfe..c94cecfb92 100644
--- a/spec/services/topic_timestamp_changer_spec.rb
+++ b/spec/services/topic_timestamp_changer_spec.rb
@@ -26,39 +26,32 @@ describe TopicTimestampChanger do
         TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
 
         topic.reload
-        [:created_at, :updated_at, :bumped_at].each do |column|
-          expect(topic.public_send(column)).to be_within(1.second).of(new_timestamp)
-        end
+        expect(topic.created_at).to eq_time(new_timestamp)
+        expect(topic.updated_at).to eq_time(new_timestamp)
+        expect(topic.bumped_at).to eq_time(new_timestamp)
 
         p1.reload
-        [:created_at, :updated_at].each do |column|
-          expect(p1.public_send(column)).to be_within(1.second).of(new_timestamp)
-        end
+        expect(p1.created_at).to eq_time(new_timestamp)
+        expect(p1.updated_at).to eq_time(new_timestamp)
 
         p2.reload
-        [:created_at, :updated_at].each do |column|
-          expect(p2.public_send(column)).to be_within(1.second).of(new_timestamp + 1.day)
-        end
+        expect(p2.created_at).to eq_time(new_timestamp + 1.day)
+        expect(p2.updated_at).to eq_time(new_timestamp + 1.day)
 
-        expect(topic.last_posted_at).to be_within(1.second).of(p2.reload.created_at)
+        expect(topic.last_posted_at).to eq_time(p2.reload.created_at)
       end
 
       describe 'when posts have timestamps in the future' do
-        let(:new_timestamp) { Time.zone.now }
-        let(:p3) { Fabricate(:post, topic: topic, created_at: new_timestamp + 3.day) }
-
         it 'should set the new timestamp as the default timestamp' do
-          freeze_time
-
-          p3
+          new_timestamp = freeze_time
 
+          p3 = Fabricate(:post, topic: topic, created_at: new_timestamp + 3.days)
           TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
 
           p3.reload
 
-          [:created_at, :updated_at].each do |column|
-            expect(p3.public_send(column)).to be_within(1.second).of(new_timestamp)
-          end
+          expect(p3.created_at).to eq_time(new_timestamp)
+          expect(p3.updated_at).to eq_time(new_timestamp)
         end
       end
     end
diff --git a/spec/services/user_activator_spec.rb b/spec/services/user_activator_spec.rb
index 9678fb5703..5172843319 100644
--- a/spec/services/user_activator_spec.rb
+++ b/spec/services/user_activator_spec.rb
@@ -16,6 +16,8 @@ describe UserActivator do
     end
 
     it 'creates and send new email token if the existing token expired' do
+      now = freeze_time
+
       SiteSetting.email_token_valid_hours = 24
       user = Fabricate(:user)
       email_token = user.email_tokens.first
@@ -27,7 +29,7 @@ describe UserActivator do
       activator.activate
 
       user.reload
-      expect(user.email_tokens.last.created_at).to be_within_one_second_of(Time.zone.now)
+      expect(user.email_tokens.last.created_at).to eq_time(now)
     end
 
   end

From 6fb4c333b035586c884a789bf225c7ab3d23e61e Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Tue, 10 Mar 2020 15:25:00 -0600
Subject: [PATCH 062/633] FIX: Throw error when removing a user from group
 fails (#9162)

This commit ensures that an error is thrown when a user fails to be
removed from a group instead of silently failing.

This means when using the api you will receive a 400 instead of a 200 if
there is a failure. The remove group endpoint allows the removal of
multiple users, this change means that if you try to delete 10 users,
but 1 of them fails you will receive a 400 instead of 200 even though
the other 9 were removed successfully. Rather than adding a bunch more
complexity I think this is more than adequate for most use cases.
---
 app/controllers/groups_controller.rb         |  8 +++++---
 app/models/group.rb                          |  4 +++-
 spec/requests/admin/users_controller_spec.rb |  5 +++--
 spec/requests/groups_controller_spec.rb      | 13 ++++++++-----
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index dc7f226110..126d0910af 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -398,14 +398,16 @@ class GroupsController < ApplicationController
     end
 
     users.each do |user|
-      group.remove(user)
-      GroupActionLogger.new(current_user, group).log_remove_user_from_group(user)
+      if group.remove(user)
+        GroupActionLogger.new(current_user, group).log_remove_user_from_group(user)
+      else
+        raise Discourse::InvalidParameters
+      end
     end
 
     render json: success_json.merge!(
       usernames: users.map(&:username)
     )
-
   end
 
   def request_membership
diff --git a/app/models/group.rb b/app/models/group.rb
index 497333b4fa..0f8f3d82d4 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -644,9 +644,11 @@ class Group < ActiveRecord::Base
   end
 
   def remove(user)
-    self.group_users.where(user: user).each(&:destroy)
+    result = self.group_users.where(user: user).each(&:destroy)
+    return false if result.blank?
     user.update_columns(primary_group_id: nil) if user.primary_group_id == self.id
     DiscourseEvent.trigger(:user_removed_from_group, user, self)
+    true
   end
 
   def add_owner(user)
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 92b79ce27f..fd82b1d1d9 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -347,8 +347,9 @@ RSpec.describe Admin::UsersController do
 
   describe '#remove_group' do
     it "also clears the user's primary group" do
-      g = Fabricate(:group)
-      u = Fabricate(:user, primary_group: g)
+      u = Fabricate(:user)
+      g = Fabricate(:group, users: [u])
+      u.update!(primary_group_id: g.id)
       delete "/admin/users/#{u.id}/groups/#{g.id}.json"
 
       expect(response.status).to eq(200)
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index e6326ccc56..f26f2483ee 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1192,6 +1192,11 @@ describe GroupsController do
         expect(response.status).to eq(400)
       end
 
+      it "raises an error when removing a valid user but is not a member of that group" do
+        delete "/groups/#{group.id}/members.json", params: { user_id: -1 }
+        expect(response.status).to eq(400)
+      end
+
       context "is able to remove a member" do
         it "removes by id" do
           expect do
@@ -1314,12 +1319,10 @@ describe GroupsController do
           end
 
           it "only removes users in that group" do
-            expect do
-              delete "/groups/#{group1.id}/members.json",
-                params: { usernames: [user.username, user2.username].join(",") }
-            end.to change { group1.users.count }.by(-1)
+            delete "/groups/#{group1.id}/members.json",
+              params: { usernames: [user.username, user2.username].join(",") }
 
-            expect(response.status).to eq(200)
+            expect(response.status).to eq(400)
           end
         end
       end

From 4e5dd4105c7d7d77e83e16c3d8ef9da1b03c8414 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 10 Mar 2020 23:22:26 +0100
Subject: [PATCH 063/633] DEV: Fix flaky `signed_url_for_path` spec

AWS gem uses internally `Time.now` to generate the presigned URLs, so often two consecutive calls with the same params would give different results.
---
 spec/requests/uploads_controller_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index 2f3333cacd..55139f9d05 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -386,6 +386,7 @@ describe UploadsController do
         end
 
         it "redirects to the signed_url_for_path" do
+          freeze_time
           get upload.short_path
 
           expect(response).to redirect_to(Discourse.store.signed_url_for_path(Discourse.store.get_path_for_upload(upload)))

From e848d9878285a206a04725a9e21480194e701a5c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 00:58:46 +0100
Subject: [PATCH 064/633] FIX: ensures category exists for hideParent in
 categoryBadgeHTML (#9161)

---
 .../javascripts/select-kit/components/category-chooser.js.es6   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
index d929bfac3e..76c47a6a18 100644
--- a/app/assets/javascripts/select-kit/components/category-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
@@ -54,7 +54,7 @@ export default ComboBoxComponent.extend({
         "label",
         categoryBadgeHTML(category, {
           link: false,
-          hideParent: !!category.parent_category_id,
+          hideParent: category ? !!category.parent_category_id : true,
           allowUncategorized: true,
           recursive: true
         }).htmlSafe()

From 23de188f89ea8ce988fb77b299d216124dd13a7c Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 11 Mar 2020 07:13:08 +0530
Subject: [PATCH 065/633] Update README to reflect current supported Ruby
 version

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 323a21e73b..8f9d748d06 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ To get your environment setup, follow the community setup guide for your operati
 
 If you're familiar with how Rails works and are comfortable setting up your own environment, you can also try out the [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md), which is aimed primarily at Ubuntu and macOS environments.
 
-Before you get started, ensure you have the following minimum versions: [Ruby 2.5+](https://www.ruby-lang.org/en/downloads/), [PostgreSQL 10+](https://www.postgresql.org/download/), [Redis 2.6+](https://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
+Before you get started, ensure you have the following minimum versions: [Ruby 2.6+](https://www.ruby-lang.org/en/downloads/), [PostgreSQL 10+](https://www.postgresql.org/download/), [Redis 2.6+](https://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
 
 ## Setting up Discourse
 

From 1f34f653bfb6ccb39a4f4f8085b07e9d94389e6f Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 11 Mar 2020 17:42:56 +1100
Subject: [PATCH 066/633] FIX: last ip address could point at wrong ip

Due to unicorn env object recycling request.ip could point at the wrong
ip address by the time defer block is called. This usually would happen
under load.

This also avoids keeping the entire request object as referenced by the
closure.
---
 lib/auth/default_current_user_provider.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index bdd304ef1b..5fe22b4adc 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -118,9 +118,11 @@ class Auth::DefaultCurrentUserProvider
 
     if current_user && should_update_last_seen?
       u = current_user
+      ip = request.ip
+
       Scheduler::Defer.later "Updating Last Seen" do
         u.update_last_seen!
-        u.update_ip_address!(request.ip)
+        u.update_ip_address!(ip)
       end
     end
 

From 683cb2809996c8268c69887a80646de4cf6e4923 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 09:23:10 +0100
Subject: [PATCH 067/633] DEV: enforces ember-template-lint: no-triple-curlies
 (#9165)

This pr replaces `{{{ }}}` usage by a {{html-safe}} helper. While it doesn't solve the underlying issue, it gives us a path forward without risking breaking too much existing behavior.

Also introduces an htmlSafe computed macro:

```
import { htmlSafe } from "discourse/lib/computed";

htmlDescription: htmlSafe("description")
```

Overtime {{html-safe}} usage should be removed and moved to components properties or specialized components/helpers.
---
 .template-lintrc.js                           |  3 +-
 .../admin/templates/badges-award.hbs          |  6 +-
 .../admin/templates/badges-index.hbs          |  2 +-
 .../components/admin-report-storage-stats.hbs |  2 +-
 .../components/admin-report-table-cell.hbs    |  2 +-
 .../templates/components/admin-report.hbs     |  2 +-
 .../components/admin-user-field-item.hbs      |  2 +-
 .../components/penalty-post-action.hbs        |  2 +-
 .../templates/components/silence-details.hbs  |  2 +-
 .../components/site-settings/bool.hbs         |  2 +-
 .../site-settings/category-list.hbs           |  2 +-
 .../components/site-settings/category.hbs     |  2 +-
 .../components/site-settings/color.hbs        |  2 +-
 .../components/site-settings/compact-list.hbs |  2 +-
 .../components/site-settings/enum.hbs         |  2 +-
 .../components/site-settings/group-list.hbs   |  2 +-
 .../components/site-settings/host-list.hbs    |  2 +-
 .../components/site-settings/list.hbs         |  2 +-
 .../components/site-settings/secret-list.hbs  |  2 +-
 .../components/site-settings/string.hbs       |  2 +-
 .../components/site-settings/tag-list.hbs     |  2 +-
 .../components/site-settings/upload.hbs       |  2 +-
 .../site-settings/uploaded-image-list.hbs     |  2 +-
 .../components/site-settings/url-list.hbs     |  2 +-
 .../components/site-settings/value-list.hbs   |  2 +-
 .../components/suspension-details.hbs         |  4 +-
 .../templates/components/themes-list-item.hbs |  6 +-
 .../templates/components/themes-list.hbs      |  6 +-
 .../templates/customize-themes-index.hbs      |  4 +-
 .../admin/templates/customize-themes-show.hbs |  2 +-
 .../admin/templates/dashboard-problems.hbs    |  2 +-
 .../admin/templates/dashboard_general.hbs     |  2 +-
 .../admin/templates/email-advanced-test.hbs   |  4 +-
 .../admin/templates/email-preview-digest.hbs  |  2 +-
 .../javascripts/admin/templates/embedding.hbs |  2 +-
 .../templates/logs/staff-action-logs.hbs      |  2 +-
 .../templates/modal/admin-badge-preview.hbs   |  8 +-
 .../templates/modal/admin-install-theme.hbs   |  8 +-
 .../templates/modal/admin-theme-change.hbs    |  2 +-
 .../templates/modal/admin-theme-item.hbs      |  2 +-
 .../admin/templates/search-logs-term.hbs      |  4 +-
 .../admin/templates/user-index.hbs            |  8 +-
 .../admin/templates/users-list-show.hbs       |  8 +-
 .../discourse-common/helpers/html-safe.js.es6 |  6 ++
 .../discourse-common/helpers/i18n.js.es6      |  3 +-
 .../discourse/components/text-overflow.js.es6 | 11 +++
 .../discourse/helpers/application.js.es6      | 12 +--
 .../discourse/helpers/dir-span.js.es6         |  3 +-
 .../discourse/helpers/format-age.js.es6       |  5 +-
 .../javascripts/discourse/lib/computed.js.es6 | 16 ++++
 .../javascripts/discourse/templates/about.hbs |  2 +-
 .../templates/account-created/index.hbs       |  2 +-
 .../templates/account-created/resent.hbs      |  2 +-
 .../discourse/templates/badges/show.hbs       |  2 +-
 .../templates/components/about-page-users.hbs |  2 +-
 .../templates/components/badge-card.hbs       |  2 +-
 .../templates/components/categories-boxes.hbs |  2 +-
 .../templates/components/categories-only.hbs  |  8 +-
 .../templates/components/d-button.hbs         |  2 +-
 .../templates/components/d-editor.hbs         |  2 +-
 .../templates/components/discourse-banner.hbs |  4 +-
 .../components/discourse-linked-text.hbs      |  2 +-
 .../components/edit-category-general.hbs      |  6 +-
 .../components/edit-category-security.hbs     |  2 +-
 .../templates/components/featured-topic.hbs   |  4 +-
 .../templates/components/flag-action-type.hbs |  4 +-
 .../templates/components/footer-message.hbs   |  2 +-
 .../templates/components/global-notice.hbs    |  4 +-
 .../components/group-card-contents.hbs        |  2 +-
 .../templates/components/group-post.hbs       |  6 +-
 .../templates/components/invite-panel.hbs     |  4 +-
 .../templates/components/ip-lookup.hbs        |  2 +-
 .../components/mobile-category-topic.hbs      |  2 +-
 .../templates/components/related-messages.hbs |  2 +-
 .../reviewable-conversation-post.hbs          |  2 +-
 .../components/reviewable-flagged-post.hbs    |  2 +-
 .../templates/components/reviewable-item.hbs  |  2 +-
 .../templates/components/reviewable-score.hbs |  2 +-
 .../components/second-factor-form.hbs         |  2 +-
 .../templates/components/share-panel.hbs      |  2 +-
 .../templates/components/share-popup.hbs      |  2 +-
 .../templates/components/share-source.hbs     |  2 +-
 .../components/shared-draft-controls.hbs      |  2 +-
 .../templates/components/suggested-topics.hbs |  2 +-
 .../templates/components/tag-info.hbs         |  2 +-
 .../templates/components/text-overflow.hbs    |  2 +-
 .../templates/components/topic-entrance.hbs   |  4 +-
 .../components/user-card-contents.hbs         |  2 +-
 .../components/user-fields/confirm.hbs        |  4 +-
 .../components/user-fields/dropdown.hbs       |  4 +-
 .../templates/components/user-fields/text.hbs |  4 +-
 .../templates/components/user-stat.hbs        |  2 +-
 .../templates/components/user-stream-item.hbs |  8 +-
 .../components/user-summary-topic.hbs         |  2 +-
 .../discourse/templates/composer.hbs          |  4 +-
 .../templates/composer/custom-body.hbs        |  2 +-
 .../templates/composer/education.hbs          |  2 +-
 .../templates/composer/group-mentioned.hbs    |  2 +-
 .../discourse/templates/discovery.hbs         |  2 +-
 .../discourse/templates/full-page-search.hbs  |  6 +-
 .../javascripts/discourse/templates/group.hbs |  2 +-
 .../discourse/templates/groups/index.hbs      |  2 +-
 .../discourse/templates/invites/show.hbs      |  4 +-
 .../templates/list/activity-column.hbr        |  2 +-
 .../templates/list/topic-excerpt.hbr          |  2 +-
 .../mobile/components/basic-topic-list.hbs    |  4 +-
 .../mobile/components/categories-only.hbs     |  2 +-
 .../mobile/components/mobile-nav.hbs          |  2 +-
 .../templates/modal/activation-resent.hbs     |  2 +-
 .../discourse/templates/modal/auth-token.hbs  |  6 +-
 .../templates/modal/avatar-selector.hbs       |  6 +-
 .../discourse/templates/modal/bookmark.hbs    |  2 +-
 .../modal/bulk-notification-level.hbs         |  2 +-
 .../templates/modal/change-owner.hbs          |  2 +-
 .../templates/modal/create-account.hbs        |  2 +-
 .../modal/delete-topic-disallowed.hbs         |  2 +-
 .../templates/modal/edit-category.hbs         |  2 +-
 .../templates/modal/feature-topic.hbs         | 22 ++---
 .../templates/modal/forgot-password.hbs       |  2 +-
 .../discourse/templates/modal/history.hbs     | 10 +-
 .../modal/keyboard-shortcuts-help.hbs         | 94 +++++++++----------
 .../templates/modal/move-to-topic.hbs         | 10 +-
 .../templates/modal/not-activated.hbs         |  2 +-
 .../templates/modal/post-enqueued.hbs         |  2 +-
 .../modal/second-factor-add-security-key.hbs  |  2 +-
 .../modal/second-factor-add-totp.hbs          |  4 +-
 .../modal/second-factor-backup-edit.hbs       |  2 +-
 .../templates/modal/topic-bulk-actions.hbs    |  2 +-
 .../templates/navigation/category.hbs         |  2 +-
 .../templates/preferences-second-factor.hbs   |  2 +-
 .../templates/preferences/account.hbs         |  2 +-
 .../templates/preferences/emails.hbs          |  2 +-
 .../templates/preferences/profile.hbs         |  2 +-
 .../discourse/templates/static.hbs            |  2 +-
 .../javascripts/discourse/templates/topic.hbs |  6 +-
 .../discourse/templates/unknown.hbs           |  2 +-
 .../discourse/templates/user-invited-show.hbs |  8 +-
 .../javascripts/discourse/templates/user.hbs  |  4 +-
 .../discourse/templates/user/stream.hbs       |  2 +-
 .../discourse/templates/user/summary.hbs      |  2 +-
 .../templates/components/category-row.hbs     |  4 +-
 .../dropdown-select-box-row.hbs               |  4 +-
 .../templates/components/pinned-button.hbs    |  2 +-
 .../components/topic-notifications-button.hbs |  2 +-
 .../templates/components/radio-button.hbs     |  2 +-
 .../templates/components/wizard-field.hbs     |  4 +-
 .../templates/components/wizard-step.hbs      |  2 +-
 .../discourse-local-dates-create-form.hbs     |  2 +-
 .../components/html-safe-helper-test.js.es6   | 14 +++
 test/javascripts/lib/computed-test.js.es6     | 12 ++-
 150 files changed, 337 insertions(+), 276 deletions(-)
 create mode 100644 app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
 create mode 100644 test/javascripts/components/html-safe-helper-test.js.es6

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 6783c6d94e..29bf420298 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -11,6 +11,7 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unused-block-params": true,
     "no-unbound": true,
-    "simple-unless": true
+    "simple-unless": true,
+    "no-triple-curlies": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/badges-award.hbs b/app/assets/javascripts/admin/templates/badges-award.hbs
index b13462bf33..d0082dc349 100644
--- a/app/assets/javascripts/admin/templates/badges-award.hbs
+++ b/app/assets/javascripts/admin/templates/badges-award.hbs
@@ -9,11 +9,11 @@
           {{icon-or-image model}}
           <span class="badge-display-name">{{model.name}}</span>
         {{else}}
-          <span class='badge-placeholder'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+          <span class='badge-placeholder'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
         {{/if}}
       </div>
       <div>
-        <h4>{{I18n 'admin.badges.mass_award.upload_csv'}}</h4>
+        <h4>{{i18n 'admin.badges.mass_award.upload_csv'}}</h4>
         <input type='file' id='massAwardCSVUpload' accept='.csv'>
       </div>
       <div>
@@ -34,6 +34,6 @@
       {{/link-to}}
     </form>
   {{else}}
-    <span class='badge-required'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+    <span class='badge-required'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index fd08e67279..49c5945ea1 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -7,7 +7,7 @@
         {{#each badgeIntroLinks as |link|}}
           <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
             {{d-icon link.icon}}
-            <span>{{I18n link.text}}</span>
+            <span>{{i18n link.text}}</span>
           </a>
         {{/each}}
       </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index fbb9f80a64..d6e42cd414 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -15,7 +15,7 @@
 
       {{#if backupStats.last_backup_taken_at}}
         <br>
-        {{{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}}
+        {{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}
       {{/if}}
     </p>
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
index 973e8412be..fb8f2e4cdc 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
@@ -1 +1 @@
-{{{formatedValue}}}
+{{html-safe formatedValue}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index be9c2ee8d7..48bd58cab9 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -199,6 +199,6 @@
 {{/conditional-loading-section}}
 {{else}}
   <div class="alert alert-info">
-    {{{disabledLabel}}}
+    {{html-safe disabledLabel}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index 269d6babc2..211cc00b51 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -46,7 +46,7 @@
     <div class="form-display">
       <strong>{{userField.name}}</strong>
       <br>
-      {{{userField.description}}}
+      {{html-safe userField.description}}
     </div>
     <div class="form-display">{{fieldName}}</div>
     <div class="form-element controls">
diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
index 1a672329cd..a6c848541f 100644
--- a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
+++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
@@ -1,7 +1,7 @@
 <div class='penalty-post-controls'>
   <label>
     <div class='penalty-post-label'>
-      {{{i18n 'admin.user.penalty_post_actions'}}}
+      {{i18n 'admin.user.penalty_post_actions'}}
     </div>
   </label>
   {{combo-box
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index 3f7c19d5ba..af1b4980d5 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -1,7 +1,7 @@
 <div class='reason-controls'>
   <label>
     <div class='silence-reason-label'>
-      {{{i18n 'admin.user.silence_reason_label'}}}
+      {{i18n 'admin.user.silence_reason_label'}}
     </div>
     </label>
     {{text-field
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
index 1c6c2101ae..11384580c1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
@@ -1,5 +1,5 @@
 <label>
   {{input type="checkbox" checked=enabled}}
-  <span>{{{setting.description}}}</span>
+  <span>{{html-safe setting.description}}</span>
   {{setting-validation-message message=validationMessage}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index 6d8871b306..b9609e2843 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -3,5 +3,5 @@
   onChange=(action "onChangeSelectedCategories")
 }}
 
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
index 4f23fcc021..4358b408de 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
@@ -4,4 +4,4 @@
   onChange=(action (mut value))
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
index baf81ab389..7b9b5bf2a8 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
@@ -6,4 +6,4 @@
   onChangeColor=(action "onChangeColor")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class="desc">{{{setting.description}}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
index 621baec0b1..1e7e369b93 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
@@ -8,4 +8,4 @@
 }}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index dc33e28df5..0b4104086e 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -15,5 +15,5 @@
 {{setting-validation-message message=validationMessage}}
 
 <div class='desc'>
-  {{{setting.description}}}
+  {{html-safe setting.description}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
index 8f4263a72e..091573eb53 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
@@ -7,4 +7,4 @@
   onChange=(action "onChangeGroupListSetting")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
index 5277c26c69..70366aba38 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_host"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
index 268723c92d..090cc2a5f1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value inputDelimiter="|" choices=setting.choices}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
index a4ff6f1bd4..7451959841 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
@@ -1,3 +1,3 @@
 {{secret-value-list setting=setting values=value isSecret=isSecret}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index d71278f723..160f041df9 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -7,4 +7,4 @@
 {{/if}}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 271e4d0326..21e7e1ab0a 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
 {{tag-chooser tags=selectedTags}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
index 86940d8633..2758b7be5a 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
@@ -1,2 +1,2 @@
 {{site-settings-image-uploader imageUrl=value placeholderUrl=setting.placeholder type="site_setting"}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
index 82dc38d653..146c9d3722 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,2 +1,2 @@
 {{d-button label="admin.site_settings.uploaded_image_list.label" action=(action "showUploadModal") actionParam=(hash value=value setting=setting)}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
index 67db58f8ea..7a6cdc517b 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_url"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
index 3003b375ee..234ec83f3c 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
index 0f2aa0fc84..4dcc606b2b 100644
--- a/app/assets/javascripts/admin/templates/components/suspension-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -2,9 +2,9 @@
   <label>
     <div class='suspend-reason-label'>
       {{#if siteSettings.hide_suspension_reasons}}
-        {{{i18n 'admin.user.suspend_reason_hidden_label'}}}
+        {{i18n 'admin.user.suspend_reason_hidden_label'}}
       {{else}}
-        {{{i18n 'admin.user.suspend_reason_label'}}}
+        {{i18n 'admin.user.suspend_reason_label'}}
       {{/if}}
     </div>
   </label>
diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
index 1286937f8a..0c253e0214 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
@@ -28,14 +28,14 @@
 
   {{#if displayComponents}}
     <div class="components-list">
-      <span class="components">{{{childrenString}}}</span>
+      <span class="components">{{html-safe childrenString}}</span>
 
       {{#if displayHasMore}}
         <a href {{action "toggleChildrenExpanded"}} class="others-count">
           {{#if childrenExpanded}}
-            {{I18n "admin.customize.theme.collapse"}}
+            {{i18n "admin.customize.theme.collapse"}}
           {{else}}
-            {{I18n "admin.customize.theme.and_x_more" count=moreCount}}
+            {{i18n "admin.customize.theme.and_x_more" count=moreCount}}
           {{/if}}
         </a>
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
index 29935b95b8..4654371a23 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -25,9 +25,9 @@
         <div class="themes-list-item inactive-indicator">
           <span class="empty">
             {{#if themesTabActive}}
-              {{I18n "admin.customize.theme.inactive_themes"}}
+              {{i18n "admin.customize.theme.inactive_themes"}}
             {{else}}
-              {{I18n "admin.customize.theme.inactive_components"}}
+              {{i18n "admin.customize.theme.inactive_components"}}
             {{/if}}
           </span>
         </div>
@@ -41,7 +41,7 @@
     {{/if}}
   {{else}}
     <div class="themes-list-item">
-      <span class="empty">{{I18n "admin.customize.theme.empty"}}</span>
+      <span class="empty">{{i18n "admin.customize.theme.empty"}}</span>
     </div>
   {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 0a6060724b..32ad33db10 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -1,7 +1,7 @@
 <div class="themes-intro admin-intro">
   <img src={{womanArtistEmojiURL}}>
   <div class="content-wrapper">
-    <h1>{{I18n "admin.customize.theme.themes_intro"}}</h1>
+    <h1>{{i18n "admin.customize.theme.themes_intro"}}</h1>
      <div class="create-actions">
       {{d-button action=(route-action "installModal") icon="upload" label="admin.customize.install" class="btn-primary"}}
     </div>
@@ -9,7 +9,7 @@
       {{#each externalResources as |resource|}}
         <a href={{resource.link}} class="external-link" rel="noopener" target="_blank">
           {{d-icon resource.icon}}
-          {{I18n resource.key}}
+          {{i18n resource.key}}
         </a>
       {{/each}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 9fb7fcb4cf..b4c4e9a8f4 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -89,7 +89,7 @@
 
         {{#if showRemoteError}}
           <div class="error-message">
-            {{d-icon "exclamation-triangle"}} {{I18n "admin.customize.theme.repo_unreachable"}}
+            {{d-icon "exclamation-triangle"}} {{i18n "admin.customize.theme.repo_unreachable"}}
           </div>
           <div class="raw-error">
             <code>{{model.remoteError}}</code>
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
index 0f0b1f9d29..5f95987e73 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
@@ -12,7 +12,7 @@
         <div class="problem-messages">
           <ul>
             {{#each problems as |problem|}}
-              <li>{{{problem}}}</li>
+              <li>{{html-safe problem}}</li>
             {{/each}}
           </ul>
         </div>
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index 19f892ab0f..d190b7664b 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -142,7 +142,7 @@
         filters=trendingSearchFilters
         isEnabled=logSearchQueriesEnabled
         disabledLabel=trendingSearchDisabledLabel}}
-      {{{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}}
+      {{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
index 97a479e2c5..f0dcaa5c6a 100644
--- a/app/assets/javascripts/admin/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
@@ -14,13 +14,13 @@
   <hr>
   <div class="text">
     <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
-    <pre class="full-reason">{{{text}}}</pre>
+    <pre class="full-reason">{{html-safe text}}</pre>
   </div>
 
   <hr>
   <div class="elided">
     <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
-    <pre class="full-reason">{{{elided}}}</pre>
+    <pre class="full-reason">{{html-safe elided}}</pre>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 078b642dd4..7a695659c5 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -53,7 +53,7 @@
           <iframe srcdoc={{model.html_content}} />
         {{/if}}
       {{else}}
-        <pre>{{{model.text_content}}}</pre>
+        <pre>{{html-safe model.text_content}}</pre>
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index f4ada49e1b..1777263674 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -23,7 +23,7 @@
 
 {{#if showSecondary}}
   <div class='embedding-secondary'>
-    <p>{{{i18n "admin.embedding.sample"}}}</p>
+    <p>{{i18n "admin.embedding.sample"}}</p>
     {{highlighted-code code=embeddingCode lang="html"}}
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 02c4160b6a..ab4c70d39e 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -88,7 +88,7 @@
               <td class="col value created-at">{{age-with-tooltip item.created_at}}</td>
               <td class="col value details">
                 <div>
-                  {{{item.formattedDetails}}}
+                  {{html-safe item.formattedDetails}}
                   {{#if item.useCustomModalForDetails}}
                     <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
                   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index ef36e4aa05..528ed5af24 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -17,9 +17,9 @@
   {{else}}
     <p class="grant-count">
       {{#if count}}
-        {{{i18n "admin.badges.preview.grant_count" count=count}}}
+        {{i18n "admin.badges.preview.grant_count" count=count}}
       {{else}}
-        {{{i18n "admin.badges.preview.no_grant_count"}}}
+        {{i18n "admin.badges.preview.no_grant_count"}}
       {{/if}}
     </p>
 
@@ -41,14 +41,14 @@
       </p>
       <ul>
         {{#each processedSample as |html|}}
-          <li>{{{html}}}</li>
+          <li>{{html-safe html}}</li>
         {{/each}}
       </ul>
     {{/if}}
 
     {{#if hasQueryPlan}}
       <div class="badge-query-plan">
-        {{{queryPlanHtml}}}
+        {{html-safe queryPlanHtml}}
       </div>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index aab0b17d71..5ed497ae57 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -24,7 +24,7 @@
 
             <div class="popular-theme-buttons">
               {{#if theme.installed}}
-                <span>{{I18n "admin.customize.theme.installed"}}</span>
+                <span>{{i18n "admin.customize.theme.installed"}}</span>
               {{else}}
                 {{d-button class='btn-small'
                   label="admin.customize.theme.install"
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
+                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{i18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
@@ -85,10 +85,10 @@
 
     {{#if create}}
       <div class="inputs">
-        <div class="label">{{I18n "admin.customize.theme.create_name"}}</div>
+        <div class="label">{{i18n "admin.customize.theme.create_name"}}</div>
         {{input value=name placeholder=placeholder}}
 
-        <div class="label">{{I18n "admin.customize.theme.create_type"}}</div>
+        <div class="label">{{i18n "admin.customize.theme.create_type"}}</div>
         {{combo-box
           valueProperty="value"
           content=createTypes
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
index ec26f608d8..7b3ffb5ca5 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
@@ -1,6 +1,6 @@
 <div>
   {{#d-modal-body title="admin.logs.staff_actions.modal_title"}}
-    {{{diff}}}
+    {{html-safe diff}}
   {{/d-modal-body}}
   <div class="modal-footer">
     {{d-button
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 7a5ddc1ea7..724af5ace4 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -7,7 +7,7 @@
   </div>
   <div class="popular-theme-buttons">
     {{#if theme.installed}}
-      <span>{{I18n "admin.customize.theme.installed"}}</span>
+      <span>{{i18n "admin.customize.theme.installed"}}</span>
     {{else}}
       {{d-button class='btn-small'
         label="admin.customize.theme.install"
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 78bd54afb9..27f61f2940 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
       <div class='fps-topic'>
         <div class='topic'>
           <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
           </a>
 
           <div class='search-category'>
@@ -55,7 +55,7 @@
 
           {{#if result.blurb}}
             {{#highlight-text highlight=term}}
-              {{{result.blurb}}}
+              {{html-safe result.blurb}}
             {{/highlight-text}}
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 207120eea8..23a1a6aae3 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -132,7 +132,7 @@
     <div class="field">{{i18n "user.avatar.title"}}</div>
     <div class="value">{{avatar model imageSize="large"}}</div>
     <div class="controls">
-      {{{i18n "admin.user.visit_profile" url=preferencesPath}}}
+      {{i18n "admin.user.visit_profile" url=preferencesPath}}
     </div>
   </div>
 
@@ -509,7 +509,7 @@
     <h1>{{i18n "admin.groups.title"}}</h1>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.automatic"}}</div>
-        <div class="value">{{{automaticGroups}}}</div>
+        <div class="value">{{html-safe automaticGroups}}</div>
       </div>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.custom"}}</div>
@@ -616,11 +616,11 @@
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.time_read"}}</div>
-    <div class="value">{{{format-duration model.time_read}}}</div>
+    <div class="value">{{format-duration model.time_read}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "user.invited.days_visited"}}</div>
-    <div class="value">{{{model.days_visited}}}</div>
+    <div class="value">{{html-safe model.days_visited}}</div>
   </div>
 </section>
 
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 7d096573b0..6b0253aeda 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -53,11 +53,11 @@
             </td>
             <td class="last-emailed">
               <div class="label">{{i18n 'admin.users.last_emailed'}}</div>
-              <div>{{{format-duration user.last_emailed_age}}}</div>
+              <div>{{format-duration user.last_emailed_age}}</div>
             </td>
             <td class="last-seen">
               <div class="label">{{i18n 'last_seen'}}</div>
-              <div>{{{format-duration user.last_seen_age}}}</div>
+              <div>{{format-duration user.last_seen_age}}</div>
             </td>
             <td class="topics-entered">
               <div class="label">{{i18n 'admin.user.topics_entered'}}</div>
@@ -69,12 +69,12 @@
             </td>
             <td class="time-read">
               <div class="label">{{i18n 'admin.user.time_read'}}</div>
-              <div>{{{format-duration user.time_read}}}</div>
+              <div>{{format-duration user.time_read}}</div>
             </td>
 
             <td class="created">
               <div class="label">{{i18n 'created'}}</div>
-              <div>{{{format-duration user.created_at_age}}}</div>
+              <div>{{format-duration user.created_at_age}}</div>
             </td>
 
             {{#if siteSettings.must_approve_users}}
diff --git a/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6 b/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
new file mode 100644
index 0000000000..dc6d5daf74
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
@@ -0,0 +1,6 @@
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
+
+registerUnbound("html-safe", function(string) {
+  return htmlSafe(string);
+});
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
index 902ed699bf..c3d7f1e448 100644
--- a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
@@ -1,6 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
-registerUnbound("i18n", (key, params) => I18n.t(key, params));
+registerUnbound("i18n", (key, params) => htmlSafe(I18n.t(key, params)));
 registerUnbound("i18n-yes-no", (value, params) =>
   I18n.t(value ? "yes_value" : "no_value", params)
 );
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index 90a9cc21a2..201172f1ef 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,8 +1,19 @@
 import { next } from "@ember/runloop";
+import { htmlSafe } from "@ember/template";
 import Component from "@ember/component";
+
 export default Component.extend({
+  text: null,
+
+  init() {
+    this._super(...arguments);
+
+    this.set("text", htmlSafe(this.text));
+  },
+
   didInsertElement() {
     this._super(...arguments);
+
     next(null, () => {
       const $this = $(this.element);
 
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6
index 71baa92c91..27727c1d84 100644
--- a/app/assets/javascripts/discourse/helpers/application.js.es6
+++ b/app/assets/javascripts/discourse/helpers/application.js.es6
@@ -4,14 +4,12 @@ import {
   autoUpdatingRelativeAge,
   number
 } from "discourse/lib/formatter";
+import { htmlSafe } from "@ember/template";
 
-const safe = Handlebars.SafeString;
+registerUnbound("raw-date", dt => htmlSafe(longDate(new Date(dt))));
 
-registerUnbound("raw-date", dt => longDate(new Date(dt)));
-
-registerUnbound(
-  "age-with-tooltip",
-  dt => new safe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
+registerUnbound("age-with-tooltip", dt =>
+  htmlSafe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
 );
 
 registerUnbound("number", (orig, params) => {
@@ -48,5 +46,5 @@ registerUnbound("number", (orig, params) => {
 
   result += ">" + n + "</span>";
 
-  return new safe(result);
+  return htmlSafe(result);
 });
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
index d41f1a332e..e210c471fd 100644
--- a/app/assets/javascripts/discourse/helpers/dir-span.js.es6
+++ b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
@@ -1,5 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { isRTL } from "discourse/lib/text-direction";
+import { htmlSafe } from "@ember/template";
 
 function setDir(text) {
   let content = text ? text : "";
@@ -11,5 +12,5 @@ function setDir(text) {
 }
 
 export default registerUnbound("dir-span", function(str) {
-  return new Handlebars.SafeString(setDir(str));
+  return htmlSafe(setDir(str));
 });
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js.es6 b/app/assets/javascripts/discourse/helpers/format-age.js.es6
index 3141a0da85..b8874820ed 100644
--- a/app/assets/javascripts/discourse/helpers/format-age.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-age.js.es6
@@ -1,11 +1,12 @@
 import { autoUpdatingRelativeAge, durationTiny } from "discourse/lib/formatter";
 import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
 registerUnbound("format-age", function(dt) {
   dt = new Date(dt);
-  return new Handlebars.SafeString(autoUpdatingRelativeAge(dt));
+  return htmlSafe(autoUpdatingRelativeAge(dt));
 });
 
 registerUnbound("format-duration", function(seconds) {
-  return new Handlebars.SafeString(durationTiny(seconds));
+  return htmlSafe(durationTiny(seconds));
 });
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index acd6cde60b..e238320a38 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -1,5 +1,6 @@
 import { computed } from "@ember/object";
 import addonFmt from "ember-addons/fmt";
+import { htmlSafe as htmlSafeTemplateHelper } from "@ember/template";
 
 /**
   Returns whether two properties are equal to each other.
@@ -56,6 +57,21 @@ export function i18n(...args) {
     return I18n.t(addonFmt(format, ...args.map(a => this.get(a))));
   });
 }
+/**
+  Returns htmlSafe version of a string.
+
+  @method htmlSafe
+  @params {String} properties* to htmlify
+  @return {Function} discourseComputedProperty function
+**/
+export function htmlSafe(...args) {
+  return computed(...args, {
+    get() {
+      const path = args.pop();
+      return htmlSafeTemplateHelper(this.get(path));
+    }
+  });
+}
 
 /**
   Uses an Ember String `fmt` call to format a string. See:
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index 6e75a04a6d..ad65dbb57e 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -112,7 +112,7 @@
       {{#if contactInfo}}
         <section class='about contact'>
             <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
-            <p>{{{contactInfo}}}</p>
+            <p>{{html-safe contactInfo}}</p>
         </section>
       {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/account-created/index.hbs b/app/assets/javascripts/discourse/templates/account-created/index.hbs
index 8c9babb1f9..8122270cd6 100644
--- a/app/assets/javascripts/discourse/templates/account-created/index.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/index.hbs
@@ -1,5 +1,5 @@
 <div class='ac-message'>
-  {{{accountCreated.message}}}
+  {{html-safe accountCreated.message}}
 </div>
 {{#if accountCreated.show_controls}}
   {{activation-controls sendActivationEmail=(action "sendActivationEmail")
diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
index 8647596a04..5ad9168986 100644
--- a/app/assets/javascripts/discourse/templates/account-created/resent.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
@@ -1,6 +1,6 @@
 <div class='ac-message'>
   {{#if email}}
-    {{{i18n 'login.sent_activation_email_again' currentEmail=email}}}
+    {{i18n 'login.sent_activation_email_again' currentEmail=email}}
   {{else}}
     {{i18n 'login.sent_activation_email_again_generic'}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 09ded422b3..fe7b489159 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -42,7 +42,7 @@
           {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
             <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
             {{#if ub.post_number}}
-              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
+              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
             {{/if}}
           {{/user-info}}
         {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
index f7bfd9886b..4b7161ba18 100644
--- a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
@@ -3,7 +3,7 @@
     <div class="user-image">
       <div class="user-image-inner">
         <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
-          {{{userTemplate.avatar}}}
+          {{html-safe userTemplate.avatar}}
         </a>
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 0fdc3bd275..4fb6aa77c0 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -11,7 +11,7 @@
   <div class='badge-info'>
     <div class='badge-info-item'>
       <h3><a href={{url}} class='badge-link'>{{badge.name}}</a></h3>
-      <div class='badge-summary'>{{{summary}}}</div>
+      <div class='badge-summary'>{{html-safe summary}}</div>
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 5dc594c691..232edea06b 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -24,7 +24,7 @@
         </div>
 
         <div class='description'>
-          {{{text-overflow class="overflow" text=c.description_excerpt}}}
+          {{text-overflow class="overflow" text=c.description_excerpt}}
         </div>
         {{#if c.isGrandParent}}
           {{#each c.subcategories as |subcategory|}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 4f153b4e7f..ae71465bf0 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -16,7 +16,7 @@
             {{category-title-link category=c}}
             {{#if c.description_excerpt}}
               <div class="category-description">
-                {{{dir-span c.description_excerpt}}}
+                {{dir-span c.description_excerpt}}
               </div>
             {{/if}}
             {{#if c.isGrandParent}}
@@ -28,7 +28,7 @@
                         {{category-title-link tagName="h4" category=subcategory}}
                         {{#if subcategory.description_excerpt}}
                           <div class="category-description subcategory-description">
-                            {{{dir-span subcategory.description_excerpt}}}
+                            {{dir-span subcategory.description_excerpt}}
                           </div>
                         {{/if}}
                         {{#if subcategory.subcategories}}
@@ -45,7 +45,7 @@
                         {{else}}
                           {{#if subcategory.description_excerpt}}
                             <div class="category-description subcategory-description">
-                              {{{dir-span subcategory.description_excerpt}}}
+                              {{dir-span subcategory.description_excerpt}}
                             </div>
                           {{/if}}
                         {{/if}}
@@ -69,7 +69,7 @@
             {{/if}}
           </td>
           <td class="topics">
-            <div title={{c.statTitle}}>{{{c.stat}}}</div>
+            <div title={{c.statTitle}}>{{html-safe c.stat}}</div>
             {{category-unread category=c tagName="div" class="unread-new"}}
           </td>
           {{#if showTopics}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index 755e4ea857..aeb5f6b6f6 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -3,7 +3,7 @@
 {{/if}}
 
 {{#if translatedLabel}}
-  <span class='d-button-label'>{{{translatedLabel}}}{{#if ellipsis}}&hellip;{{/if}}</span>
+  <span class='d-button-label'>{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index f868131b63..97effd78d4 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -46,7 +46,7 @@
   </div>
 
   <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
-    <div class="d-editor-preview">{{{preview}}}</div>
+    <div class="d-editor-preview">{{html-safe preview}}</div>
     {{plugin-outlet name="editor-preview" classNames="d-editor-plugin" args=outletArgs}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index 27025bedee..cda2c2069a 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -3,9 +3,9 @@
     <div id="banner" class={{overlay}}>
       {{d-button icon="times" action="dismiss" class="btn btn-flat close" title="banner.close"}}
       <div id="banner-content">
-        {{{content}}}
+        {{html-safe content}}
         {{#if currentUser.staff}}
-          <p><a href={{banner.url}}>{{{i18n "banner.edit"}}}</a></p>
+          <p><a href={{banner.url}}>{{i18n "banner.edit"}}</a></p>
         {{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
index dd15a6dc6a..78515d0404 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
@@ -1 +1 @@
-{{{translatedText}}}
+{{html-safe translatedText}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 19d6e724dc..7884f85e1f 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,7 +1,7 @@
 {{#if category.isUncategorizedCategory}}
   <p class="warning">
     {{d-icon "exclamation-triangle"}}
-    {{{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}}
+    {{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}
   </p>
 {{/if}}
 
@@ -36,7 +36,7 @@
     <section class='field'>
       <label>{{i18n 'category.description'}}</label>
       {{#if category.description}}
-        {{{category.description}}}
+        {{html-safe category.description}}
       {{else}}
         {{i18n 'category.no_description'}}
       {{/if}}
@@ -51,7 +51,7 @@
     <section class='field'>
       <label>{{i18n 'category.badge_colors'}}</label>
       <div class="category-color-editor">
-        {{{categoryBadgePreview}}}
+        {{html-safe categoryBadgePreview}}
 
         <div class='input-prepend input-append' style="margin-top: 10px;">
           <span class='color-title'>{{i18n 'category.background_color'}}:</span>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index cfde179c32..5b132092c4 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -11,7 +11,7 @@
       {{#each category.permissions as |p|}}
         <li>
           <span class="name"><span class="badge-group">{{p.group_name}}</span></span>
-          {{{i18n "category.can"}}}
+          {{i18n "category.can"}}
           <span class="permission">{{p.permission.description}}</span>
           {{#if editingPermissions}}
             <a class="remove-permission" href {{action "removePermission" p}}>{{d-icon "times-circle"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index 655ca8c16e..10d9d5fcba 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,10 +1,10 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href={{topic.lastUnreadUrl}}>{{{topic.fancyTitle}}}</a>
+<a class='title' href={{topic.lastUnreadUrl}}>{{html-safe topic.fancyTitle}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
   <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href={{{topic.lastPosterUrl}}}>{{topic.last_poster.username}}</a>
+    {{i18n 'categories.latest_by'}} <a href={{html-safe topic.lastPosterUrl}}>{{topic.last_poster.username}}</a>
     <a href={{topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index e6fe7ca516..cc7b592b42 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -5,7 +5,7 @@
       <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
 
       <div class='flag-action-type-details'>
-        <span class='description'>{{{flag.description}}}</span>
+        <span class='description'>{{html-safe flag.description}}</span>
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
           <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
@@ -24,7 +24,7 @@
       <div class='flag-action-type-details'>
         <strong>{{formattedName}}</strong>
         {{#if showDescription}}
-          <div class='description'>{{{description}}}</div>
+          <div class='description'>{{html-safe description}}</div>
         {{/if}}
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
diff --git a/app/assets/javascripts/discourse/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
index 65e3a460df..03e5c7b8ee 100644
--- a/app/assets/javascripts/discourse/templates/components/footer-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
@@ -1,4 +1,4 @@
-{{#if education}}<div class="education">{{{education}}}</div>{{/if}}
+{{#if education}}<div class="education">{{html-safe education}}</div>{{/if}}
 <h3>
   {{message}}
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
index c2b3b75e2e..08ff36603f 100644
--- a/app/assets/javascripts/discourse/templates/components/global-notice.hbs
+++ b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
@@ -2,9 +2,9 @@
   <div class="row">
     <div id="global-notice-{{notice.id}}" class="alert alert-{{notice.options.level}} {{notice.id}}">
       {{#if notice.options.html}}
-        {{{notice.options.html}}}
+        {{html-safe notice.options.html}}
       {{/if}}
-      <span class="text">{{{notice.text}}}</span>
+      <span class="text">{{html-safe notice.text}}</span>
 
       {{#if notice.options.dismissable}}
         {{d-button
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index 22629d003d..7f6104b836 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -43,7 +43,7 @@
 
     {{#if group.bio_cooked}}
       <div class="card-row second-row">
-        <div class='bio'>{{{group.bio_cooked}}}</div>
+        <div class='bio'>{{html-safe group.bio_cooked}}</div>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index d9880b54b6..d4a9673708 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -8,7 +8,7 @@
   <div class='stream-topic-details'>
       <div class='stream-topic-title'>
         <span class='title'>
-          <a href={{postUrl}}>{{{post.topic.fancyTitle}}}</a>
+          <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
         </span>
       </div>
       <div class="group-post-category">{{category-link post.category}}</div>
@@ -24,8 +24,8 @@
 
 <div class='excerpt'>
   {{#if post.expandedExcerpt}}
-    {{{post.expandedExcerpt}}}
+    {{html-safe post.expandedExcerpt}}
   {{else}}
-    {{{post.excerpt}}}
+    {{html-safe post.excerpt}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
index 3c13bea09e..cfdd1431bf 100644
--- a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
@@ -1,6 +1,6 @@
 {{#if inviteModel.error}}
   <div class="alert alert-error">
-    {{{errorMessage}}}
+    {{html-safe errorMessage}}
   </div>
 {{/if}}
 
@@ -10,7 +10,7 @@
       {{generated-invite-link link=inviteModel.inviteLink email=emailOrUsername}}
     {{else}}
       <div class="success-message">
-        {{{successMessage}}}
+        {{html-safe successMessage}}
       </div>
     {{/if}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index dce5918f52..9b7b7bebc4 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -14,7 +14,7 @@
       {{d-button action=(action "copy") class="pull-right no-text" icon="copy"}}
     {{/if}}
     <h4>{{i18n "ip_lookup.title"}}</h4>
-    <p class='powered-by'>{{{i18n "ip_lookup.powered_by"}}}</p>
+    <p class='powered-by'>{{i18n "ip_lookup.powered_by"}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
index e9d901d880..3c4fcf9491 100644
--- a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
@@ -5,7 +5,7 @@
     {{#if topic.unseen}}
       <span class="badge-notification new-topic"></span>
     {{/if}}
-    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{{format-age topic.last_posted_at}}}</span>
+    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{format-age topic.last_posted_at}}</span>
   </div>
 </td>
 <td class='num posts'>{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
index 84b7d42962..09e1abb1a1 100644
--- a/app/assets/javascripts/discourse/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
@@ -10,5 +10,5 @@
 </div>
 
 {{#if targetUser}}
-  <h3 class="see-all-pms-message">{{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}}</h3>
+  <h3 class="see-all-pms-message">{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}</h3>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
index 1bdcd280ff..25aeea0726 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
@@ -3,6 +3,6 @@
     {{#if showUsername}}
       {{#link-to 'user' post.user class="username"}}@{{post.user.username}}{{/link-to}}
     {{/if}}
-    {{{post.excerpt}}}
+    {{html-safe post.excerpt}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
index 09e196766f..2ac3b61ff7 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
@@ -17,7 +17,7 @@
       {{#if reviewable.blank_post}}
         <p>{{i18n "review.deleted_post"}}</p>
       {{else}}
-        {{{reviewable.cooked}}}
+        {{html-safe reviewable.cooked}}
       {{/if}}
     </div>
     {{plugin-outlet name="after-reviewable-flagged-post-body" args=(hash model=reviewable)}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
index 2d432a53b4..7b3a7a2f2a 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
@@ -46,7 +46,7 @@
   <div class='reviewable-actions'>
     {{#if claimEnabled}}
       <div class='claimed-actions'>
-        <span class='help'>{{{claimHelp}}}</span>
+        <span class='help'>{{html-safe claimHelp}}</span>
         {{reviewable-claimed-topic topicId=topicId claimedBy=reviewable.claimed_by}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
index aa9a2f0fe2..847cc42154 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
@@ -49,7 +49,7 @@
 {{#if rs.reason}}
   <tr>
     <td colspan='7'>
-      <div class='reviewable-score-reason'>{{{rs.reason}}}</div>
+      <div class='reviewable-score-reason'>{{html-safe rs.reason}}</div>
     </td>
   </tr>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
index 4c5c717be3..dc03f52d54 100644
--- a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
@@ -1,7 +1,7 @@
 <div id="second-factor">
   <h3>{{secondFactorTitle}}</h3>
   {{#if optionalText}}
-    <p>{{{optionalText}}}</p>
+    <p>{{html-safe optionalText}}</p>
   {{/if}}
   <p>{{secondFactorDescription}}</p>
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index b166c42071..1808d6cc1f 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -1,5 +1,5 @@
 <div class="header">
-  <h3 class="title">{{{shareTitle}}}</h3>
+  <h3 class="title">{{html-safe shareTitle}}</h3>
 </div>
 
 <div class="body">
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 6f0428b1aa..54e8029cf6 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -1,5 +1,5 @@
 <div class="title">
-  <h3>{{{shareTitle}}}</h3>
+  <h3>{{html-safe shareTitle}}</h3>
 
   {{#if date}}
     <span class="date">{{displayDate}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index 32fa1adb65..eaee0823d0 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -2,6 +2,6 @@
   {{#if source.icon}}
     {{d-icon source.icon}}
   {{else}}
-    {{{source.htmlIcon}}}
+    {{html-safe source.htmlIcon}}
   {{/if}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
index 23b2d45ae2..d42eb1b177 100644
--- a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
@@ -2,7 +2,7 @@
   {{#if publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
-    {{{i18n "shared_drafts.notice" category=topic.category.name}}}
+    {{i18n "shared_drafts.notice" category=topic.category.name}}
 
     <div class='publish-field'>
       <label>{{i18n "shared_drafts.destination_category"}}</label>
diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
index ffd142b1be..ae7db1c907 100644
--- a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
@@ -13,4 +13,4 @@
   {{/if}}
 </div>
 
-<h3 class="suggested-topics-message">{{{browseMoreMessage}}}</h3>
+<h3 class="suggested-topics-message">{{html-safe browseMoreMessage}}</h3>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
index 3b616fec81..aa1f4889d1 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
@@ -32,7 +32,7 @@
     {{#if tagInfo.synonyms}}
       <div class="synonyms-list">
         <h3>{{i18n "tagging.synonyms"}}</h3>
-        <div>{{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}}</div>
+        <div>{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}</div>
         <div class="tag-list">
           {{#each tagInfo.synonyms as |tag|}}
             <div class='tag-box'>
diff --git a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
index 05a4439029..3606bb98a0 100644
--- a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
+++ b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
@@ -1 +1 @@
-{{{text}}}
+{{html-safe text}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
index 7b7fb58b8b..227674d60c 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 {{#d-button action=(action "enterTop") class="full jump-top"}}
-  {{d-icon 'step-backward'}} {{{topDate}}}
+  {{d-icon 'step-backward'}} {{html-safe topDate}}
 {{/d-button}}
 
 {{#d-button action=(action "enterBottom") class="full jump-bottom"}}
-  {{{bottomDate}}} {{d-icon 'step-forward'}}
+  {{html-safe bottomDate}} {{d-icon 'step-forward'}}
 {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index f6956782a9..3bfdf96268 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -144,7 +144,7 @@
         <div class="card-row">
           <div class="featured-topic">
             <span class="desc">{{i18n 'user.featured_topic'}}</span>
-            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{{user.featured_topic.fancy_title}}}{{/link-to}}
+            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe user.featured_topic.fancy_title}}{{/link-to}}
           </div>
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index fe91090dde..c09e659301 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,6 +1,6 @@
 {{#if field.name}}
   <label class="control-label" for={{concat 'user-' elementId}}>
-    {{{field.name}}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
+    {{html-safe field.name}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
   </label>
 {{/if}}
 
@@ -8,7 +8,7 @@
   <label class="control-label checkbox-label">
     {{input id=(concat 'user-' elementId) checked=value type="checkbox"}}
     <span>
-      {{{field.description}}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
+      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
     </span>
   </label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index 136585cb03..fd3cb91917 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{combo-box
@@ -10,5 +10,5 @@
     none=noneLabel
     onChange=(action (mut value))
   }}
-  <div class="instructions">{{{field.description}}}</div>
+  <div class="instructions">{{html-safe field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 4549f721af..1c33ea1452 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,6 +1,6 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
-  <div class="instructions">{{{field.description}}}</div>
+  <div class="instructions">{{html-safe field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 87b1a220e1..69704bf892 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -9,5 +9,5 @@
 </span>
 <span class='label'>
   {{#if icon}}{{d-icon icon}}{{/if}}
-  {{{i18n label count=value}}}
+  {{i18n label count=value}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index a87439ad35..f6da96aa0c 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -2,7 +2,7 @@
   <a href={{item.userUrl}} data-user-card={{item.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
   <span class='time'>{{format-date item.created_at}}</span>
   {{#if item.draftType}}
-    <span class='draft-type'>{{{item.draftType}}}</span>
+    <span class='draft-type'>{{html-safe item.draftType}}</span>
   {{else}}
     {{expand-post item=item}}
   {{/if}}
@@ -11,9 +11,9 @@
       {{topic-status topic=item disableActions=true}}
       <span class="title">
         {{#if item.postUrl}}
-          <a href={{item.postUrl}}>{{{item.title}}}</a>
+          <a href={{item.postUrl}}>{{html-safe item.title}}</a>
         {{else}}
-          {{{item.title}}}
+          {{html-safe item.title}}
         {{/if}}
       </span>
     </div>
@@ -36,11 +36,13 @@
 {{/if}}
 
 <p class='excerpt' data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}}>
+  {{!-- template-lint-disable no-triple-curlies --}}
   {{~#if item.expandedExcerpt}}
     {{~{item.expandedExcerpt}~}}
   {{else}}
     {{~{item.excerpt}~}}
   {{/if~}}
+  {{!-- template-lint-enable --}}
 </p>
 
 {{#each item.children as |child|}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 07f7c03cd8..970592ece4 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -6,4 +6,4 @@
   {{/if}}
 </span>
 <br>
-<a href={{url}}>{{{topic.fancyTitle}}}</a>
+<a href={{url}}>{{html-safe topic.fancyTitle}}</a>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index ce1e7af458..43af40a527 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -204,7 +204,7 @@
                   {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
                 {{/if}}
               {{else}}
-                <a href {{action "togglePreview"}} class='toggle-preview'>{{{toggleText}}}</a>
+                <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
               {{/if}}
 
           </div>
@@ -221,7 +221,7 @@
 
         <div class='draft-text'>
           {{#if model.topic}}
-            {{d-icon "share"}} {{{draftTitle}}}
+            {{d-icon "share"}} {{html-safe draftTitle}}
           {{else}}
             {{i18n "composer.saved_draft"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
index e37bdb2aa0..238de27da0 100644
--- a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
-<p>{{{message.body}}}</p>
+<p>{{html-safe message.body}}</p>
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs
index c2d574cb69..269e44e595 100644
--- a/app/assets/javascripts/discourse/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/education.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{{message.body}}}
+{{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
index c2d574cb69..269e44e595 100644
--- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{{message.body}}}
+{{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 6801ab3f55..1c8f879125 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -1,5 +1,5 @@
 {{#if errorHtml}}
-  {{{errorHtml}}}
+  {{html-safe errorHtml}}
 {{else}}
   <div class="container">
     {{discourse-banner user=currentUser banner=site.banner}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 355e18f1b8..9394f35486 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -49,7 +49,7 @@
 
       <div class='search-info'>
         <div class='result-count'>
-          {{{resultCountLabel}}}
+          {{html-safe resultCountLabel}}
         </div>
         <div class='sort-by'>
           <span class='desc'>
@@ -88,7 +88,7 @@
 
                   <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
+                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -113,7 +113,7 @@
 
                   {{#if result.blurb}}
                     {{#highlight-text highlight=highlightQuery}}
-                      {{{result.blurb}}}
+                      {{html-safe result.blurb}}
                     {{/highlight-text}}
                   {{/if}}
                 </div>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 8385894c0c..1bc9734c13 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -26,7 +26,7 @@
       <hr>
 
       <div class='group-bio'>
-        <p>{{{model.bio_cooked}}}</p>
+        <p>{{html-safe model.bio_cooked}}</p>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index 21cbe557a9..36d0a644b1 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -51,7 +51,7 @@
                     </span>
                   </div>
 
-                  <div class="group-description">{{{group.bio_excerpt}}}</div>
+                  <div class="group-description">{{html-safe group.bio_excerpt}}</div>
 
                   <div class="group-membership">
                     {{#group-membership-button tagName='' model=group showLogin=(route-action "showLogin")}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 42216317ee..f2f1e73678 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -10,12 +10,12 @@
     <div class="col-form">
       {{#if successMessage}}
         <br><br>
-        <div class='alert alert-info'><p>{{{successMessage}}}</p></div>
+        <div class='alert alert-info'><p>{{html-safe successMessage}}</p></div>
       {{else}}
         <p>{{i18n 'invites.invited_by'}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
-        <p>{{{yourEmailMessage}}}
+        <p>{{html-safe yourEmailMessage}}
         {{#if externalAuthsEnabled}}
              {{i18n 'invites.social_login_available'}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.hbr b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
index 723bb80e84..384909db02 100644
--- a/app/assets/javascripts/discourse/templates/list/activity-column.hbr
+++ b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
@@ -1,4 +1,4 @@
-<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}">
+<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{html-safe topic.bumpedAtTitle}}">
   <a class="post-activity" href="{{topic.lastPostUrl}}">
     {{~raw-plugin-outlet name="topic-list-before-relative-date"~}}
     {{~format-date topic.bumpedAt format="tiny" noTitle="true"~}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
index 1c7b5eead0..2257a669cb 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
+++ b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
@@ -1,6 +1,6 @@
 {{#if topic.hasExcerpt}}
   <div class="topic-excerpt">
-    {{{dir-span topic.escapedExcerpt}}}
+    {{dir-span topic.escapedExcerpt}}
     {{#if topic.excerptTruncated}}
       <a href="{{topic.url}}">{{i18n 'read_more'}}</a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index d8a06c33c7..0949b56ee7 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -24,7 +24,7 @@
               {{/if}}
               {{#if t.hasExcerpt}}
                 <div class="topic-excerpt">
-                  {{{t.excerpt}}}
+                  {{html-safe t.excerpt}}
                   {{#if t.excerptTruncated}}
                     {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
@@ -42,7 +42,7 @@
               {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
               <div class="pull-right">
                 {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
+                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
               </div>
               {{#unless hideCategory}}
                 <div class='category'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 5418fcb86a..0421edce8a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -13,7 +13,7 @@
             {{#if c.description_excerpt}}
               <tr class="category-description">
                 <td colspan="3">
-                  {{{c.description_excerpt}}}
+                  {{html-safe c.description_excerpt}}
                 </td>
               </tr>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index bebe6a385e..ca6140be54 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -1,7 +1,7 @@
 {{#if selectedHtml}}
   <li>
     <a href class='expander' {{action 'toggleExpanded'}}>
-      <span>{{{selectedHtml}}}</span>
+      <span>{{html-safe selectedHtml}}</span>
       {{d-icon "caret-down"}}
     </a>
   </li>
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
index 5469574977..7439589d5c 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}}
+  {{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}
 {{/d-modal-body}}
 
 {{modal-footer-close closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index 1b08a4974b..5390227a2e 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="user.auth_tokens.was_this_you"}}
   <div>
     <p>{{i18n 'user.auth_tokens.was_this_you_description'}}</p>
-    <p>{{{i18n 'user.second_factor.extended_description'}}}</p>
+    <p>{{i18n 'user.second_factor.extended_description'}}</p>
   </div>
 
   <div>
@@ -21,9 +21,9 @@
       </h3>
 
       {{#if expanded}}
-        <blockquote>{{{latest_post.cooked}}}</blockquote>
+        <blockquote>{{html-safe latest_post.cooked}}</blockquote>
       {{else}}
-        <blockquote>{{{latest_post.excerpt}}}</blockquote>
+        <blockquote>{{html-safe latest_post.excerpt}}</blockquote>
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index cdaab1cc1c..10e5c4bf26 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -10,11 +10,11 @@
   {{else}}
     <div class="avatar-choice">
       {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
-      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{{i18n 'user.change_avatar.letter_based'}}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{i18n 'user.change_avatar.letter_based'}}</label>
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{{i18n 'user.change_avatar.gravatar'}}} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar'}} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
                  title="user.change_avatar.refresh_gravatar_title"
@@ -23,7 +23,7 @@
                  class="btn-default avatar-selector-refresh-gravatar"}}
 
       {{#if gravatarFailed}}
-        <p class="error">{{I18n 'user.change_avatar.gravatar_failed'}}</p>
+        <p class="error">{{i18n 'user.change_avatar.gravatar_failed'}}</p>
       {{/if}}
     </div>
     {{#if allowAvatarUpload}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 254f1bfbee..0098c5b237 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -38,7 +38,7 @@
           <!-- {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}} -->
         {{/tap-tile-grid}}
       {{else}}
-        <div class="alert alert-info">{{{i18n "bookmarks.no_timezone" basePath=basePath }}}</div>
+        <div class="alert alert-info">{{i18n "bookmarks.no_timezone" basePath=basePath }}</div>
       {{/if}}
     </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
index 97f8003781..0cfc45782d 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
@@ -2,7 +2,7 @@
   <div class='controls'>
     <label class='radio'>
       {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
-      <div class='description'>{{{level.description}}}</div>
+      <div class='description'>{{html-safe level.description}}</div>
     </label>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 0c0890f2b9..1069c0d2fa 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,6 +1,6 @@
 {{#d-modal-body class='change-ownership'}}
   <span>
-    {{{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}}
+    {{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}
   </span>
 
   <form>
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 448508de65..5c77b2a0a6 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -126,7 +126,7 @@
           {{/d-button}}
         {{/conditional-loading-spinner}}
 
-      <div class='disclaimer'>{{{disclaimerHtml}}}</div>
+      <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
       </div>
 
       {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
index e35eaecc19..61e693a9af 100644
--- a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  <p>{{{i18n "post.controls.delete_topic_disallowed_modal"}}}</p>
+  <p>{{i18n "post.controls.delete_topic_disallowed_modal"}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="close"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
index 6abe868295..0c3f9e443d 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
@@ -34,7 +34,7 @@
                    label="category.delete"}}
 
         <div class="cannot_delete_reason {{if hiddenTooltip "hidden" ""}}">
-          {{{model.cannot_delete_reason}}}
+          {{html-safe model.cannot_delete_reason}}
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index 965a407815..be55ea8460 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -6,9 +6,9 @@
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
               {{#if pinnedGloballyCount}}
-                {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
+                {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
               {{else}}
-                {{{i18n "topic.feature_topic.not_pinned_globally"}}}
+                {{i18n "topic.feature_topic.not_pinned_globally"}}
               {{/if}}
             {{/conditional-loading-spinner}}
           </p>
@@ -16,12 +16,12 @@
         {{else}}
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
-              {{{alreadyPinnedMessage}}}
+              {{html-safe alreadyPinnedMessage}}
             {{/conditional-loading-spinner}}
           </p>
           <p>{{i18n "topic.feature_topic.pin_note"}}</p>
         {{/if}}
-        <p>{{{unPinMessage}}}</p>
+        <p>{{html-safe unPinMessage}}</p>
         <p>{{d-button action=(action "unpin") icon="thumbtack" label="topic.feature.unpin" class="btn-primary"}}</p>
       </div>
     </div>
@@ -30,7 +30,7 @@
       <div class="desc">
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
-            {{{alreadyPinnedMessage}}}
+            {{html-safe alreadyPinnedMessage}}
           {{/conditional-loading-spinner}}
         </p>
         <p>
@@ -38,7 +38,7 @@
         </p>
         {{#if site.isMobileDevice}}
           <p>
-            {{{pinMessage}}}
+            {{html-safe pinMessage}}
           </p>
           <p class="with-validation">
             {{future-date-input
@@ -52,7 +52,7 @@
           </p>
         {{else}}
           <p class="with-validation">
-            {{{pinMessage}}}
+            {{html-safe pinMessage}}
             {{d-icon "far-clock"}}
             {{future-date-input
               class="pin-until"
@@ -74,9 +74,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if pinnedGloballyCount}}
-              {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
+              {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
             {{else}}
-              {{{i18n "topic.feature_topic.not_pinned_globally"}}}
+              {{i18n "topic.feature_topic.not_pinned_globally"}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
@@ -123,9 +123,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if bannerCount}}
-              {{{i18n "topic.feature_topic.banner_exists"}}}
+              {{i18n "topic.feature_topic.banner_exists"}}
             {{else}}
-              {{{i18n "topic.feature_topic.no_banner_exists"}}}
+              {{i18n "topic.feature_topic.no_banner_exists"}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 8d438dd80a..19be52ceb5 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -1,7 +1,7 @@
 <form>
   {{#d-modal-body class="forgot-password-modal"}}
     {{#if offerHelp}}
-      {{{offerHelp}}}
+      {{html-safe offerHelp}}
     {{else}}
       <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 6d9dbff78e..c81dfe2238 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -21,7 +21,7 @@
           &mdash; {{disabled-icon icon="shield-alt" disabled=postTypeDisabled}}
         {{/if}}
         {{#if model.category_id_changes}}
-          &mdash; {{{previousCategory}}} &rarr; {{{currentCategory}}}
+          &mdash; {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
         {{/if}}
       {{/unless}}
     </div>
@@ -50,7 +50,7 @@
   <div id="revisions" data-post-id={{model.post_id}} class={{hiddenClasses}}>
     {{#if model.title_changes}}
       <div class="row">
-        <h2>{{{titleDiff}}}</h2>
+        <h2>{{html-safe titleDiff}}</h2>
       </div>
     {{/if}}
     {{#if site.mobileView}}
@@ -72,7 +72,7 @@
       {{/if}}
       {{#if model.category_id_changes}}
         <div class="row">
-          {{{previousCategory}}} &rarr; {{{currentCategory}}}
+          {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
         </div>
       {{/if}}
     {{/if}}
@@ -100,7 +100,7 @@
     {{plugin-outlet name="post-revisions" args=(hash model=model)}}
 
     {{#links-redirect class="row"}}
-      {{{bodyDiff}}}
+      {{html-safe bodyDiff}}
     {{/links-redirect}}
   </div>
 {{/d-modal-body}}
@@ -111,7 +111,7 @@
       {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
       <div id="revision-numbers" class={{unless displayRevisions 'invisible'}}>
         {{#conditional-loading-spinner condition=loading size="small"}}
-          {{{revisionsText}}}
+          {{html-safe revisionsText}}
         {{/conditional-loading-spinner}}
       </div>
       {{d-button class="btn-default" action=(action "loadNextVersion") icon="forward" title="post.revisions.controls.next" disabled=loadNextDisabled}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 493a9e03a5..2203c90174 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -3,29 +3,29 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.jump_to.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.jump_to.home}}}</li>
-        <li>{{{shortcuts.jump_to.latest}}}</li>
-        <li>{{{shortcuts.jump_to.new}}}</li>
-        <li>{{{shortcuts.jump_to.unread}}}</li>
-        <li>{{{shortcuts.jump_to.categories}}}</li>
-        <li>{{{shortcuts.jump_to.top}}}</li>
-        <li>{{{shortcuts.jump_to.bookmarks}}}</li>
-        <li>{{{shortcuts.jump_to.profile}}}</li>
+        <li>{{html-safe shortcuts.jump_to.home}}</li>
+        <li>{{html-safe shortcuts.jump_to.latest}}</li>
+        <li>{{html-safe shortcuts.jump_to.new}}</li>
+        <li>{{html-safe shortcuts.jump_to.unread}}</li>
+        <li>{{html-safe shortcuts.jump_to.categories}}</li>
+        <li>{{html-safe shortcuts.jump_to.top}}</li>
+        <li>{{html-safe shortcuts.jump_to.bookmarks}}</li>
+        <li>{{html-safe shortcuts.jump_to.profile}}</li>
         {{#if siteSettings.enable_personal_messages}}
-          <li>{{{shortcuts.jump_to.messages}}}</li>
+          <li>{{html-safe shortcuts.jump_to.messages}}</li>
         {{/if}}
-        <li>{{{shortcuts.jump_to.drafts}}}</li>
+        <li>{{html-safe shortcuts.jump_to.drafts}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.navigation.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.navigation.back}}}</li>
-        <li>{{{shortcuts.navigation.jump}}}</li>
-        <li>{{{shortcuts.navigation.up_down}}}</li>
-        <li>{{{shortcuts.navigation.open}}}</li>
-        <li>{{{shortcuts.navigation.next_prev}}}</li>
-        <li>{{{shortcuts.navigation.go_to_unread_post}}}</li>
+        <li>{{html-safe shortcuts.navigation.back}}</li>
+        <li>{{html-safe shortcuts.navigation.jump}}</li>
+        <li>{{html-safe shortcuts.navigation.up_down}}</li>
+        <li>{{html-safe shortcuts.navigation.open}}</li>
+        <li>{{html-safe shortcuts.navigation.next_prev}}</li>
+        <li>{{html-safe shortcuts.navigation.go_to_unread_post}}</li>
       </ul>
     </section>
   </div>
@@ -33,26 +33,26 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.application.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.application.hamburger_menu}}}</li>
-        <li>{{{shortcuts.application.user_profile_menu}}}</li>
-        <li>{{{shortcuts.application.show_incoming_updated_topics}}}</li>
-        <li>{{{shortcuts.application.search}}}</li>
-        <li>{{{shortcuts.application.help}}}</li>
-        <li>{{{shortcuts.application.dismiss_new_posts}}}</li>
-        <li>{{{shortcuts.application.dismiss_topics}}}</li>
-        <li>{{{shortcuts.application.log_out}}}</li>
+        <li>{{html-safe shortcuts.application.hamburger_menu}}</li>
+        <li>{{html-safe shortcuts.application.user_profile_menu}}</li>
+        <li>{{html-safe shortcuts.application.show_incoming_updated_topics}}</li>
+        <li>{{html-safe shortcuts.application.search}}</li>
+        <li>{{html-safe shortcuts.application.help}}</li>
+        <li>{{html-safe shortcuts.application.dismiss_new_posts}}</li>
+        <li>{{html-safe shortcuts.application.dismiss_topics}}</li>
+        <li>{{html-safe shortcuts.application.log_out}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.composing.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.composing.return}}}</li>
-        <li>{{{shortcuts.composing.fullscreen}}}</li>
-        <li>{{{shortcuts.application.create}}}</li>
-        <li>{{{shortcuts.actions.reply_as_new_topic}}}</li>
-        <li>{{{shortcuts.actions.reply_topic}}}</li>
-        <li>{{{shortcuts.actions.reply_post}}}</li>
-        <li>{{{shortcuts.actions.quote_post}}}</li>
+        <li>{{html-safe shortcuts.composing.return}}</li>
+        <li>{{html-safe shortcuts.composing.fullscreen}}</li>
+        <li>{{html-safe shortcuts.application.create}}</li>
+        <li>{{html-safe shortcuts.actions.reply_as_new_topic}}</li>
+        <li>{{html-safe shortcuts.actions.reply_topic}}</li>
+        <li>{{html-safe shortcuts.actions.reply_post}}</li>
+        <li>{{html-safe shortcuts.actions.quote_post}}</li>
       </ul>
     </section>
   </div>
@@ -60,22 +60,22 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.actions.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.actions.bookmark_topic}}}</li>
-        <li>{{{shortcuts.actions.pin_unpin_topic}}}</li>
-        <li>{{{shortcuts.actions.share_topic}}}</li>
-        <li>{{{shortcuts.actions.share_post}}}</li>
-        <li>{{{shortcuts.actions.like}}}</li>
-        <li>{{{shortcuts.actions.flag}}}</li>
-        <li>{{{shortcuts.actions.bookmark}}}</li>
-        <li>{{{shortcuts.actions.edit}}}</li>
-        <li>{{{shortcuts.actions.delete}}}</li>
-        <li>{{{shortcuts.actions.mark_muted}}}</li>
-        <li>{{{shortcuts.actions.mark_regular}}}</li>
-        <li>{{{shortcuts.actions.mark_tracking}}}</li>
-        <li>{{{shortcuts.actions.mark_watching}}}</li>
-        <li>{{{shortcuts.actions.defer}}}</li>
-        <li>{{{shortcuts.actions.print}}}</li>
-        <li>{{{shortcuts.actions.topic_admin_actions}}}</li>
+        <li>{{html-safe shortcuts.actions.bookmark_topic}}</li>
+        <li>{{html-safe shortcuts.actions.pin_unpin_topic}}</li>
+        <li>{{html-safe shortcuts.actions.share_topic}}</li>
+        <li>{{html-safe shortcuts.actions.share_post}}</li>
+        <li>{{html-safe shortcuts.actions.like}}</li>
+        <li>{{html-safe shortcuts.actions.flag}}</li>
+        <li>{{html-safe shortcuts.actions.bookmark}}</li>
+        <li>{{html-safe shortcuts.actions.edit}}</li>
+        <li>{{html-safe shortcuts.actions.delete}}</li>
+        <li>{{html-safe shortcuts.actions.mark_muted}}</li>
+        <li>{{html-safe shortcuts.actions.mark_regular}}</li>
+        <li>{{html-safe shortcuts.actions.mark_tracking}}</li>
+        <li>{{html-safe shortcuts.actions.mark_watching}}</li>
+        <li>{{html-safe shortcuts.actions.defer}}</li>
+        <li>{{html-safe shortcuts.actions.print}}</li>
+        <li>{{html-safe shortcuts.actions.topic_admin_actions}}</li>
       </ul>
     </section>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index 893d934246..ae591397a7 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -17,7 +17,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -31,7 +31,7 @@
     {{/if}}
 
     {{#if existingMessage}}
-      <p>{{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}}</p>
+      <p>{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}</p>
       <form>
         {{choose-message currentTopicId=model.id selectedTopicId=selectedTopicId}}
 
@@ -64,7 +64,7 @@
     </div>
 
     {{#if existingTopic}}
-      <p>{{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}}</p>
+      <p>{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}</p>
       <form>
         {{choose-topic currentTopicId=model.id selectedTopicId=selectedTopicId}}
       </form>
@@ -72,7 +72,7 @@
 
     {{#if canSplitTopic}}
       {{#if newTopic}}
-        <p>{{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.split_topic.topic_name'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -93,7 +93,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index aa312d5125..e9d93aa8f6 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{{i18n 'login.not_activated' sentTo=sentTo}}}
+  {{i18n 'login.not_activated' sentTo=sentTo}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
index 46f37bfe80..3687b9fb2b 100644
--- a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body}}
   <p>{{i18n "review.approval.description"}}</p>
 
-  <p>{{{i18n "review.approval.pending_posts" count=model.pending_count}}}</p>
+  <p>{{i18n "review.approval.pending_posts" count=model.pending_count}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="review.approval.ok"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index 36ede3f634..c6539a2e52 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{{i18n 'user.second_factor.enable_security_key_description'}}}
+        {{i18n 'user.second_factor.enable_security_key_description'}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index 2b52edea7b..9caf24fc46 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{{i18n 'user.second_factor.enable_description'}}}
+        {{i18n 'user.second_factor.enable_description'}}
       </div>
     </div>
 
@@ -18,7 +18,7 @@
       <div class="controls">
         <div class="qr-code-container">
           <div class="qr-code">
-            {{{secondFactorImage}}}
+            {{html-safe secondFactorImage}}
           </div>
         </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
index 5981f4a118..713bdbfcc4 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
@@ -14,7 +14,7 @@
     {{/if}}
 
     {{#if backupEnabled}}
-      {{{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}}
+      {{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}
     {{/if}}
 
     <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index 9b10ef6c29..fe3ce8be48 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,4 +1,4 @@
 {{#d-modal-body}}
-  <p>{{{i18n 'topics.bulk.selected' count=model.topics.length}}}</p>
+  <p>{{i18n 'topics.bulk.selected' count=model.topics.length}}</p>
   {{outlet "bulkOutlet"}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index f45a2e5014..6d44492afe 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -9,7 +9,7 @@
         width=category.uploaded_logo.width
         height=category.uploaded_logo.height}}
       {{#if category.description}}
-        <p>{{{dir-span category.description}}}</p>
+        <p>{{dir-span category.description}}</p>
       {{/if}}
     {{/if}}
   </section>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index fd8f57c54c..fc6c00a13b 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -86,7 +86,7 @@
           <h2>{{i18n "user.second_factor_backup.title"}}</h2>
           {{#if model.second_factor_enabled}}
             {{#if model.second_factor_backup_enabled}}
-              {{{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}}
+              {{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}
             {{else}}
               {{i18n 'user.second_factor_backup.enable_long'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 8a505401fa..62743b5a5a 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -9,7 +9,7 @@
   </div>
   {{#if siteSettings.enable_mentions}}
     <div class='instructions'>
-      {{{i18n 'user.username.short_instructions' username=model.username}}}
+      {{i18n 'user.username.short_instructions' username=model.username}}
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index d277cea511..bd9aa411ac 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -73,7 +73,7 @@
   <div class='control-group pref-mailing-list-mode'>
     <label class="control-label">{{i18n 'user.mailing_list_mode.label'}}</label>
     {{preference-checkbox labelKey="user.mailing_list_mode.enabled" checked=model.user_option.mailing_list_mode}}
-    <div class='instructions'>{{{i18n 'user.mailing_list_mode.instructions'}}}</div>
+    <div class='instructions'>{{i18n 'user.mailing_list_mode.instructions'}}</div>
     {{#if model.user_option.mailing_list_mode}}
       <div class='controls controls-dropdown'>
         {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index b0040894dc..e6fe5381ed 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -66,7 +66,7 @@
     <label class="control-label">{{i18n 'user.featured_topic'}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
-      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
+      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
       </label>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index 107f4350f8..aee9390704 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -2,7 +2,7 @@
   {{#watch-read action=(action "markFaqRead") path=model.path}}
     <div class='contents clearfix body-page'>
       {{plugin-outlet name="above-static"}}
-      {{{model.html}}}
+      {{html-safe model.html}}
 
       {{#if showSignupButton}}
         {{d-button action=(route-action "showCreateAccount") class="btn-primary sign-up-button" label="sign_up"}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index bcb1a81b0f..7950ca19ec 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -74,7 +74,7 @@
             {{#if model.details.loaded}}
               {{topic-status topic=model}}
               <a href={{model.url}} {{action "jumpTop"}} class="fancy-title">
-                {{{model.fancyTitle}}}
+                {{html-safe model.fancyTitle}}
               </a>
             {{/if}}
 
@@ -264,7 +264,7 @@
               {{#if model.queued_posts_count}}
                 <div class="has-pending-posts">
                   <div>
-                    {{{i18n "review.topic_has_pending" count=model.queued_posts_count}}}
+                    {{i18n "review.topic_has_pending" count=model.queued_posts_count}}
                   </div>
 
                   {{#link-to 'review' (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
@@ -351,7 +351,7 @@
     <div class="container">
       {{#conditional-loading-spinner condition=noErrorYet}}
         {{#if model.errorHtml}}
-          <div class="not-found">{{{model.errorHtml}}}</div>
+          <div class="not-found">{{html-safe model.errorHtml}}</div>
         {{else}}
           <div class="topic-error">
             <div>{{model.errorMessage}}</div>
diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/templates/unknown.hbs
index 0e9e6b9625..5ff548e033 100644
--- a/app/assets/javascripts/discourse/templates/unknown.hbs
+++ b/app/assets/javascripts/discourse/templates/unknown.hbs
@@ -1,3 +1,3 @@
 <div class='container'>
-  {{{model}}}
+  {{html-safe model}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 517e147e90..f8f5effb60 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -72,11 +72,11 @@
                       <td>{{format-date invite.user.last_seen_at}}</td>
                       <td>{{number invite.user.topics_entered}}</td>
                       <td>{{number invite.user.posts_read_count}}</td>
-                      <td>{{{format-duration invite.user.time_read}}}</td>
+                      <td>{{format-duration invite.user.time_read}}</td>
                       <td>
-                        <span title={{i18n 'user.invited.days_visited'}}>{{{invite.user.days_visited}}}</span>
+                        <span title={{i18n 'user.invited.days_visited'}}>{{html-safe invite.user.days_visited}}</span>
                           /
-                        <span title={{i18n 'user.invited.account_age_days'}}>{{{invite.user.days_since_created}}}</span>
+                        <span title={{i18n 'user.invited.account_age_days'}}>{{html-safe invite.user.days_since_created}}</span>
                       </td>
                     {{/if}}
                   {{else}}
@@ -109,7 +109,7 @@
         {{else}}
           <div class="user-invite-none">
             {{#if canBulkInvite}}
-              {{{i18n 'user.invited.bulk_invite.none'}}}
+              {{i18n 'user.invited.bulk_invite.none'}}
             {{else}}
               {{i18n 'user.invited.none'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index d1c61ab805..377177843e 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -100,7 +100,7 @@
             {{#if showFeaturedTopic}}
               <h3 class="featured-topic">
                 <span>{{i18n 'user.featured_topic'}}</span>
-                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
+                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
               </h3>
             {{/if}}
 
@@ -137,7 +137,7 @@
                 </div>
               {{/if}}
               {{#if isNotSuspendedOrIsStaff}}
-                {{{model.bio_cooked}}}
+                {{html-safe model.bio_cooked}}
               {{/if}}
             </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index 1af06a86d9..de791d9420 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,4 +1,4 @@
 {{#if model.noContent}}
-  <div class='alert alert-info'>{{{model.noContentHelp}}}</div>
+  <div class='alert alert-info'>{{html-safe model.noContentHelp}}</div>
 {{/if}}
 {{user-stream stream=model}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 71b4737522..26ee193bde 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -87,7 +87,7 @@
               </a>
               <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
               <br>
-              <a href="{{link.post_url}}">{{{link.topic.fancyTitle}}}</a>
+              <a href="{{link.post_url}}">{{html-safe link.topic.fancyTitle}}</a>
             </li>
           {{/each}}
         </ul>
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index db51a397f8..cff579c047 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -9,8 +9,8 @@
   </div>
 
   {{#if shouldDisplayDescription}}
-    <div class="category-desc">{{{dir-span description}}}</div>
+    <div class="category-desc">{{dir-span description}}</div>
   {{/if}}
 {{else}}
-  {{{label}}}
+  {{html-safe label}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
index 1c070006ad..e654ef8a11 100644
--- a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
@@ -8,6 +8,6 @@
 {{/if}}
 
 <div class="texts">
-  <span class="name">{{{label}}}</span>
-  <span class="desc">{{{description}}}</span>
+  <span class="name">{{html-safe label}}</span>
+  <span class="desc">{{html-safe description}}</span>
 </div>
diff --git a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
index 31fc07f1dc..f54bdb6b5f 100644
--- a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
@@ -1,5 +1,5 @@
 {{pinned-options value=pinned topic=topic}}
 
 <p class="reason">
-  {{{reasonText}}}
+  {{html-safe reasonText}}
 </p>
diff --git a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
index 2bf3a9a122..a57b6b8584 100644
--- a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
@@ -10,6 +10,6 @@
 
 {{#if appendReason}}
   <p class="reason">
-    {{{topic.details.notificationReasonText}}}
+    {{html-safe topic.details.notificationReasonText}}
   </p>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index e93347513a..c3a82790be 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -8,7 +8,7 @@
   </span>
   {{#if extraLabel}}
     <span class='extra-label'>
-      {{{extraLabel}}}
+      {{html-safe extraLabel}}
     </span>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
index 8f804940fb..7510570b5d 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
@@ -2,7 +2,7 @@
   <span class='label-value'>{{field.label}}</span>
 
   {{#if field.description}}
-    <div class='field-description'>{{{field.description}}}</div>
+    <div class='field-description'>{{html-safe field.description}}</div>
   {{/if}}
 </label>
 
@@ -11,5 +11,5 @@
 </div>
 
 {{#if field.errorDescription}}
-  <div class='field-error-description'>{{{field.errorDescription}}}</div>
+  <div class='field-error-description'>{{html-safe field.errorDescription}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index beb821930d..4f0686acf7 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -8,7 +8,7 @@
   {{/if}}
 
   {{#if step.description}}
-    <p class='wizard-step-description'>{{{step.description}}}</p>
+    <p class='wizard-step-description'>{{html-safe step.description}}</p>
   {{/if}}
 
   {{#wizard-step-form step=step}}
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index d7e73c3d08..6fb9ecf7c6 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -85,7 +85,7 @@
             <label class="control-label">
               {{i18n "discourse_local_dates.create.form.recurring_title"}}
             </label>
-            <p>{{{i18n "discourse_local_dates.create.form.recurring_description"}}}</p>
+            <p>{{i18n "discourse_local_dates.create.form.recurring_description"}}</p>
             <div class="controls">
               {{combo-box
                 content=recurringOptions
diff --git a/test/javascripts/components/html-safe-helper-test.js.es6 b/test/javascripts/components/html-safe-helper-test.js.es6
new file mode 100644
index 0000000000..364f99a6e4
--- /dev/null
+++ b/test/javascripts/components/html-safe-helper-test.js.es6
@@ -0,0 +1,14 @@
+import componentTest from "helpers/component-test";
+moduleForComponent("html-safe-helper", { integration: true });
+
+componentTest("default", {
+  template: "{{html-safe string}}",
+
+  beforeEach() {
+    this.set("string", "<p class='cookies'>biscuits</p>");
+  },
+
+  async test(assert) {
+    assert.ok(exists("p.cookies"), "it displays the string as html");
+  }
+});
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js.es6
index 0a94485f44..253673e5b6 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -5,7 +5,8 @@ import {
   propertyNotEqual,
   fmt,
   i18n,
-  url
+  url,
+  htmlSafe
 } from "discourse/lib/computed";
 
 QUnit.module("lib:computed", {
@@ -154,3 +155,12 @@ QUnit.test("url", assert => {
     "it supports urls with a prefix"
   );
 });
+
+QUnit.test("htmlSafe", assert => {
+  const cookies = "<p>cookies and <b>biscuits</b></p>";
+  const t = EmberObject.extend({
+    desc: htmlSafe("cookies")
+  }).create({ cookies });
+
+  assert.equal(t.get("desc").string, cookies);
+});

From 6fdb4c33a653304fba14b16f9f9cf44e6dbb00cb Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 10:34:58 +0100
Subject: [PATCH 068/633] DEV: popperjs 2.0.6 (#9171)

---
 package.json                        |   2 +-
 vendor/assets/javascripts/popper.js | 126 ++++++++++++++++------------
 yarn.lock                           |   8 +-
 3 files changed, 78 insertions(+), 58 deletions(-)

diff --git a/package.json b/package.json
index 8a03086233..7c327e06eb 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "dependencies": {
     "@fortawesome/fontawesome-free": "5.11.2",
-    "@popperjs/core": "v2.0.5",
+    "@popperjs/core": "v2.0.6",
     "ace-builds": "1.4.2",
     "bootbox": "3.2.0",
     "bootstrap": "v3.4.1",
diff --git a/vendor/assets/javascripts/popper.js b/vendor/assets/javascripts/popper.js
index c4dc478488..69224d9c9d 100644
--- a/vendor/assets/javascripts/popper.js
+++ b/vendor/assets/javascripts/popper.js
@@ -1,5 +1,5 @@
 /**
- * @popperjs/core v2.0.5 - MIT License
+ * @popperjs/core v2.0.6 - MIT License
  */
 
 (function (global, factory) {
@@ -208,7 +208,7 @@
   function getTrueOffsetParent(element) {
     var offsetParent;
 
-    if (!isHTMLElement(element) || !(offsetParent = element.offsetParent) || // https://github.com/popperjs/popper.js/issues/837
+    if (!isHTMLElement(element) || !(offsetParent = element.offsetParent) || // https://github.com/popperjs/popper-core/issues/837
     isFirefox() && getComputedStyle(offsetParent).position === 'fixed') {
       return null;
     }
@@ -427,7 +427,22 @@
     return placement.split('-')[0];
   }
 
-  var INVALID_ELEMENT_ERROR = 'Popper: Invalid reference or popper argument provided to Popper, they must be either a valid DOM element, virtual element, or a jQuery-wrapped DOM element.';
+  function mergeByName(modifiers) {
+    var merged = modifiers.reduce(function (merged, current) {
+      var existing = merged[current.name];
+      merged[current.name] = existing ? Object.assign({}, existing, {}, current, {
+        options: Object.assign({}, existing.options, {}, current.options),
+        data: Object.assign({}, existing.data, {}, current.data)
+      }) : current;
+      return merged;
+    }, {}); // IE11 does not support Object.values
+
+    return Object.keys(merged).map(function (key) {
+      return merged[key];
+    });
+  }
+
+  var INVALID_ELEMENT_ERROR = 'Popper: Invalid reference or popper argument provided. They must be either a DOM element or virtual element.';
   var INFINITE_LOOP_ERROR = 'Popper: An infinite loop in the modifiers cycle has been detected! The cycle has been interrupted to prevent a browser crash.';
   var DEFAULT_OPTIONS = {
     placement: 'bottom',
@@ -485,29 +500,23 @@
           }; // Orders the modifiers based on their dependencies and `phase`
           // properties
 
-          var orderedModifiers = orderModifiers([].concat(state.options.modifiers.filter(function (modifier) {
-            return !defaultModifiers.find(function (_ref) {
-              var name = _ref.name;
-              return name === modifier.name;
-            });
-          }), defaultModifiers.map(function (defaultModifier) {
-            return Object.assign({}, defaultModifier, {}, state.options.modifiers.find(function (_ref2) {
-              var name = _ref2.name;
-              return name === defaultModifier.name;
-            }));
-          }))); // Validate the provided modifiers so that the consumer will get warned
+          var orderedModifiers = orderModifiers(mergeByName([].concat(defaultModifiers, state.options.modifiers))); // Strip out disabled modifiers
+
+          state.orderedModifiers = orderedModifiers.filter(function (m) {
+            return m.enabled;
+          }); // Validate the provided modifiers so that the consumer will get warned
           // if one of the modifiers is invalid for any reason
 
           {
-            var modifiers = uniqueBy([].concat(orderedModifiers, state.options.modifiers), function (_ref3) {
-              var name = _ref3.name;
+            var modifiers = uniqueBy([].concat(orderedModifiers, state.options.modifiers), function (_ref) {
+              var name = _ref.name;
               return name;
             });
             validateModifiers(modifiers);
 
             if (getBasePlacement(state.options.placement) === auto) {
-              var flipModifier = orderedModifiers.find(function (_ref4) {
-                var name = _ref4.name;
+              var flipModifier = state.orderedModifiers.find(function (_ref2) {
+                var name = _ref2.name;
                 return name === 'flip';
               });
 
@@ -529,12 +538,8 @@
             })) {
               console.warn(['Popper: CSS "margin" styles cannot be used to apply padding', 'between the popper and its reference element or boundary.', 'To replicate margin, use the `offset` modifier, as well as', 'the `padding` option in the `preventOverflow` and `flip`', 'modifiers.'].join(' '));
             }
-          } // Strip out disabled modifiers
+          }
 
-
-          state.orderedModifiers = orderedModifiers.filter(function (m) {
-            return m.enabled;
-          });
           runModifierEffects();
           return instance.update();
         },
@@ -647,11 +652,11 @@
       // one.
 
       function runModifierEffects() {
-        state.orderedModifiers.forEach(function (_ref5) {
-          var name = _ref5.name,
-              _ref5$options = _ref5.options,
-              options = _ref5$options === void 0 ? {} : _ref5$options,
-              effect = _ref5.effect;
+        state.orderedModifiers.forEach(function (_ref3) {
+          var name = _ref3.name,
+              _ref3$options = _ref3.options,
+              options = _ref3$options === void 0 ? {} : _ref3$options,
+              effect = _ref3.effect;
 
           if (typeof effect === 'function') {
             var cleanupFn = effect({
@@ -834,7 +839,8 @@
   function roundOffsets(_ref) {
     var x = _ref.x,
         y = _ref.y;
-    var dpr = window.devicePixelRatio || 1;
+    var win = window;
+    var dpr = win.devicePixelRatio || 1;
     return {
       x: Math.round(x * dpr) / dpr || 0,
       y: Math.round(y * dpr) / dpr || 0
@@ -860,6 +866,7 @@
     var hasY = offsets.hasOwnProperty('y');
     var sideX = left;
     var sideY = top;
+    var win = window;
 
     if (adaptive) {
       var offsetParent = getOffsetParent(popper);
@@ -891,7 +898,7 @@
     if (gpuAcceleration) {
       var _Object$assign;
 
-      return Object.assign({}, commonStyles, (_Object$assign = {}, _Object$assign[sideY] = hasY ? '0' : '', _Object$assign[sideX] = hasX ? '0' : '', _Object$assign.transform = (window.devicePixelRatio || 1) < 2 ? "translate(" + x + "px, " + y + "px)" : "translate3d(" + x + "px, " + y + "px, 0)", _Object$assign));
+      return Object.assign({}, commonStyles, (_Object$assign = {}, _Object$assign[sideY] = hasY ? '0' : '', _Object$assign[sideX] = hasX ? '0' : '', _Object$assign.transform = (win.devicePixelRatio || 1) < 2 ? "translate(" + x + "px, " + y + "px)" : "translate3d(" + x + "px, " + y + "px, 0)", _Object$assign));
     }
 
     return Object.assign({}, commonStyles, (_Object$assign2 = {}, _Object$assign2[sideY] = hasY ? y + "px" : '', _Object$assign2[sideX] = hasX ? x + "px" : '', _Object$assign2.transform = '', _Object$assign2));
@@ -906,8 +913,13 @@
         adaptive = _options$adaptive === void 0 ? true : _options$adaptive;
 
     {
-      if (adaptive && parseFloat(getComputedStyle(state.elements.popper).transitionDuration)) {
-        console.warn(['Popper: The "computeStyles" modifier\'s `adaptive` option must be', 'disabled if CSS transitions are applied to the popper element.'].join(' '));
+      var _getComputedStyle = getComputedStyle(state.elements.popper),
+          transitionProperty = _getComputedStyle.transitionProperty;
+
+      if (adaptive && ['transform', 'top', 'right', 'bottom', 'left'].some(function (property) {
+        return transitionProperty.indexOf(property) >= 0;
+      })) {
+        console.warn(['Popper: Detected CSS transitions on at least one of the following', 'CSS properties: "transform", "top", "right", "bottom", "left".', '\n\n', 'Disable the "computeStyles" modifier\'s `adaptive` option to allow', 'for smooth transitions, or remove these properties from the CSS', 'transition declaration on the popper element if only transitioning', 'opacity or background-color for example.', '\n\n', 'We recommend using the popper element as a wrapper around an inner', 'element that can have any CSS property transitioned for animations.'].join(' '));
       }
     }
 
@@ -977,22 +989,32 @@
   function effect$1(_ref2) {
     var state = _ref2.state;
     var initialStyles = {
-      position: 'absolute',
-      left: '0',
-      top: '0',
-      margin: '0'
+      popper: {
+        position: 'absolute',
+        left: '0',
+        top: '0',
+        margin: '0'
+      },
+      arrow: {
+        position: 'absolute'
+      },
+      reference: {}
     };
-    Object.assign(state.elements.popper.style, initialStyles);
+    Object.assign(state.elements.popper.style, initialStyles.popper);
+
+    if (state.elements.arrow) {
+      Object.assign(state.elements.arrow.style, initialStyles.arrow);
+    }
+
     return function () {
       Object.keys(state.elements).forEach(function (name) {
         var element = state.elements[name];
-        var styleProperties = Object.keys(state.styles.hasOwnProperty(name) ? Object.assign({}, state.styles[name]) : initialStyles);
-        var attributes = state.attributes[name] || {}; // Set all values to an empty string to unset them
+        var attributes = state.attributes[name] || {};
+        var styleProperties = Object.keys(state.styles.hasOwnProperty(name) ? state.styles[name] : initialStyles[name]); // Set all values to an empty string to unset them
 
         var style = styleProperties.reduce(function (style, property) {
-          var _Object$assign;
-
-          return Object.assign({}, style, (_Object$assign = {}, _Object$assign[String(property)] = '', _Object$assign));
+          style[property] = '';
+          return style;
         }, {}); // arrow is optional + virtual elements
 
         if (!isHTMLElement(element) || !getNodeName(element)) {
@@ -1004,7 +1026,7 @@
 
         Object.assign(element.style, style);
         Object.keys(attributes).forEach(function (attribute) {
-          return element.removeAttribute(attribute);
+          element.removeAttribute(attribute);
         });
       });
     };
@@ -1362,17 +1384,15 @@
     var basePlacement = getBasePlacement(preferredPlacement);
     var isBasePlacement = basePlacement === preferredPlacement;
     var fallbackPlacements = specifiedFallbackPlacements || (isBasePlacement || !flipVariations ? [getOppositePlacement(preferredPlacement)] : getExpandedFallbackPlacements(preferredPlacement));
-    var placements = uniqueBy([preferredPlacement].concat(fallbackPlacements).reduce(function (acc, placement) {
-      return getBasePlacement(placement) === auto ? acc.concat(computeAutoPlacement(state, {
+    var placements = [preferredPlacement].concat(fallbackPlacements).reduce(function (acc, placement) {
+      return acc.concat(getBasePlacement(placement) === auto ? computeAutoPlacement(state, {
         placement: placement,
         boundary: boundary,
         rootBoundary: rootBoundary,
         padding: padding,
         flipVariations: flipVariations
-      })) : acc.concat(placement);
-    }, []), function (placement) {
-      return placement;
-    });
+      }) : placement);
+    }, []);
     var referenceRect = state.rects.reference;
     var popperRect = state.rects.popper;
     var checksMap = new Map();
@@ -1528,14 +1548,14 @@
       // reference is not overflowing as well (e.g. virtual elements with no
       // width or height)
 
-      var arrowLen = within(0, Math.abs(referenceRect[len] - arrowRect[len]), arrowRect[len]);
+      var arrowLen = within(0, referenceRect[len], arrowRect[len]);
       var minOffset = isBasePlacement ? referenceRect[len] / 2 - additive - arrowLen - arrowPaddingMin - tetherOffsetValue : minLen - arrowLen - arrowPaddingMin - tetherOffsetValue;
       var maxOffset = isBasePlacement ? -referenceRect[len] / 2 + additive + arrowLen + arrowPaddingMax + tetherOffsetValue : maxLen + arrowLen + arrowPaddingMax + tetherOffsetValue;
       var offsetModifierValue = state.modifiersData.offset ? state.modifiersData.offset[state.placement][mainAxis] : 0;
-      var tetherMin = state.modifiersData.popperOffsets[mainAxis] + minOffset - offsetModifierValue;
-      var tetherMax = state.modifiersData.popperOffsets[mainAxis] + maxOffset - offsetModifierValue;
+      var tetherMin = popperOffsets[mainAxis] + minOffset - offsetModifierValue;
+      var tetherMax = popperOffsets[mainAxis] + maxOffset - offsetModifierValue;
       var preventedOffset = within(tether ? Math.min(min, tetherMin) : min, offset, tether ? Math.max(max, tetherMax) : max);
-      state.modifiersData.popperOffsets[mainAxis] = preventedOffset;
+      popperOffsets[mainAxis] = preventedOffset;
       data[mainAxis] = preventedOffset - offset;
     }
 
diff --git a/yarn.lock b/yarn.lock
index 005db309fd..94d8af25c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -134,10 +134,10 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@popperjs/core@v2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.0.5.tgz#90ff3013c747c499c8b1d9684b63a7334a057f7d"
-  integrity sha512-YOV1TitTNzJDXe/14sDJO/M/aL12Jhind0EkQRnqTX2167fqJsAICJfi0vsDdapPI1WaYsheyYYgy6PO02Nqqg==
+"@popperjs/core@v2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.0.6.tgz#5a39ac118811ca844155b0ad5190b8c24f35e533"
+  integrity sha512-zj7Gw8QC4jmR92eKUvtrZUEpl2ypRbq+qlE4pwf9n2hnUO9BOAcWUs4/Ht+gNIbFt98xtqhLvccdCfD469MzpQ==
 
 "@simple-dom/interface@^1.4.0":
   version "1.4.0"

From 0754c7c40479b95bb62db631008cc6dce6b6f708 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 11 Mar 2020 14:03:20 +0200
Subject: [PATCH 069/633] FIX: Various fixes to support posts with no user
 (#8877)

* Do not grant badges for posts with no user
* Ensure instructions are correct in Change Owner modal
* Hide user-dependent actions from posts with no user
* Make PostRevisor work with posts with no user
* Ensure posts with no user can be deleted
* discourse-narrative-bot should ignore posts with no user
* Skip TopicLink creation for posts with no user
---
 .../discourse/templates/modal/change-owner.hbs            | 4 +++-
 .../javascripts/discourse/widgets/post-admin-menu.js.es6  | 2 +-
 app/models/topic_link.rb                                  | 2 +-
 config/locales/client.en.yml                              | 3 +++
 lib/cooked_post_processor.rb                              | 2 +-
 lib/guardian/post_guardian.rb                             | 4 ++--
 lib/post_destroyer.rb                                     | 2 ++
 lib/post_revisor.rb                                       | 4 ++--
 plugins/discourse-narrative-bot/plugin.rb                 | 8 ++++----
 9 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 1069c0d2fa..a4e0a35c9b 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,6 +1,8 @@
 {{#d-modal-body class='change-ownership'}}
   <span>
-    {{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}
+    {{i18n (if selectedPostsUsername 'topic.change_owner.instructions' 'topic.change_owner.instructions_without_old_user')
+           count=selectedPostsCount
+           old_user=selectedPostsUsername}}
   </span>
 
   <form>
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
index 83e7734757..40dc1d3c85 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
@@ -73,7 +73,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
     });
   }
 
-  if (currentUser.staff) {
+  if (attrs.user_id && currentUser.staff) {
     if (siteSettings.enable_badges) {
       contents.push({
         icon: "certificate",
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index ed0633ecd7..2fc9fd0b84 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -108,7 +108,7 @@ class TopicLink < ActiveRecord::Base
   end
 
   def self.extract_from(post)
-    return if post.blank? || post.whisper?
+    return if post.blank? || post.whisper? || post.user_id.blank?
 
     current_urls = []
     reflected_ids = []
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index dfee767514..ea18a5b17a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2420,6 +2420,9 @@ en:
         instructions:
           one: "Please choose a new owner for the post by <b>@{{old_user}}</b>"
           other: "Please choose a new owner for the {{count}} posts by <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Please choose a new owner for the post"
+          other: "Please choose a new owner for the {{count}} posts"
 
       change_timestamp:
         title: "Change Timestamp..."
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 3d85718fb5..bd56c12ca0 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -56,7 +56,7 @@ class CookedPostProcessor
   end
 
   def grant_badges
-    return unless Guardian.new.can_see?(@post)
+    return if @post.user.blank? || !Guardian.new.can_see?(@post)
 
     BadgeGranter.grant(Badge.find(Badge::FirstEmoji), @post.user, post_id: @post.id) if has_emoji?
     BadgeGranter.grant(Badge.find(Badge::FirstOnebox), @post.user, post_id: @post.id) if @has_oneboxes
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 60936e7480..2bbc48f88f 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -30,7 +30,7 @@ module PostGuardian
     return false unless (can_see_post.nil? && can_see_post?(post)) || can_see_post
 
     # no warnings except for staff
-    return false if (action_key == :notify_user && !is_staff? && opts[:is_warning].present? && opts[:is_warning] == 'true')
+    return false if action_key == :notify_user && (post.user.blank? || (!is_staff? && opts[:is_warning].present? && opts[:is_warning] == 'true'))
 
     taken = opts[:taken_actions].try(:keys).to_a
     is_flag = PostActionType.notify_flag_types[action_key]
@@ -71,7 +71,7 @@ module PostGuardian
       not(post.trashed?) &&
 
       # don't like your own stuff
-      not(action_key == :like && is_my_own?(post))
+      not(action_key == :like && (post.user.blank? || is_my_own?(post)))
     end
 
     !!result
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index 1247346f26..578722543f 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -276,6 +276,8 @@ class PostDestroyer
   end
 
   def notify_deletion(reviewable)
+    return if @post.user.blank?
+
     allowed_user = @user.human? && @user.staff?
     return unless allowed_user && rs = reviewable.reviewable_scores.order('created_at DESC').first
 
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 981ff45f36..2685292e69 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -180,13 +180,13 @@ class PostRevisor
       @fields.has_key?('raw') &&
       @editor.staff? &&
       @editor != Discourse.system_user &&
-      !@post.user.staff?
+      !@post.user&.staff?
     )
       PostLocker.new(@post, @editor).lock
     end
 
     # We log staff edits to posts
-    if @editor.staff? && @editor.id != @post.user.id && @fields.has_key?('raw') && !@opts[:skip_staff_log]
+    if @editor.staff? && @editor.id != @post.user_id && @fields.has_key?('raw') && !@opts[:skip_staff_log]
       StaffActionLogger.new(@editor).log_post_edit(
         @post,
         old_raw: old_raw
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 5ea07c9090..ea145c4873 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -178,7 +178,7 @@ after_initialize do
   self.on(:post_created) do |post, options|
     user = post.user
 
-    if user.enqueue_narrative_bot_job? && !options[:skip_bot]
+    if user&.enqueue_narrative_bot_job? && !options[:skip_bot]
       Jobs.enqueue(:bot_input,
         user_id: user.id,
         post_id: post.id,
@@ -188,7 +188,7 @@ after_initialize do
   end
 
   self.on(:post_edited) do |post|
-    if post.user.enqueue_narrative_bot_job?
+    if post.user&.enqueue_narrative_bot_job?
       Jobs.enqueue(:bot_input,
         user_id: post.user.id,
         post_id: post.id,
@@ -198,7 +198,7 @@ after_initialize do
   end
 
   self.on(:post_destroyed) do |post, options, user|
-    if user.enqueue_narrative_bot_job? && !options[:skip_bot]
+    if user&.enqueue_narrative_bot_job? && !options[:skip_bot]
       Jobs.enqueue(:bot_input,
         user_id: user.id,
         post_id: post.id,
@@ -209,7 +209,7 @@ after_initialize do
   end
 
   self.on(:post_recovered) do |post, _, user|
-    if user.enqueue_narrative_bot_job?
+    if user&.enqueue_narrative_bot_job?
       Jobs.enqueue(:bot_input,
         user_id: user.id,
         post_id: post.id,

From d1474e94a1bd46c9ddf21ba10c1270eb60cb3812 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 11 Mar 2020 13:30:45 +0000
Subject: [PATCH 070/633] FEATURE: Allow themes to specify modifiers in their
 about.json file (#9097)

There are three modifiers:
- serialize_topic_excerpts (boolean)
- csp_extensions (array of strings)
- svg_icons (array of strings)

When multiple themes are active, the values will be combined. The combination method varies based on the setting. CSP/SVG arrays will be combined. serialize_topic_excerpts will use `Enumerable#any`.
---
 app/models/remote_theme.rb                    |  7 ++
 app/models/theme.rb                           | 27 +++++++-
 app/models/theme_modifier_set.rb              | 69 +++++++++++++++++++
 app/serializers/listable_topic_serializer.rb  |  2 +-
 config/locales/server.en.yml                  |  1 +
 .../20200302120829_add_theme_modifier_set.rb  | 11 +++
 lib/content_security_policy/extension.rb      |  8 ++-
 lib/svg_sprite/svg_sprite.rb                  |  2 +
 lib/theme_modifier_helper.rb                  | 12 ++++
 spec/components/svg_sprite/svg_sprite_spec.rb | 10 +++
 .../theme_store/zip_exporter_spec.rb          |  1 +
 spec/lib/content_security_policy_spec.rb      | 15 ++++
 spec/lib/theme_flag_modifier_spec.rb          | 17 +++++
 spec/models/remote_theme_spec.rb              |  5 ++
 spec/models/theme_modifier_set_spec.rb        | 24 +++++++
 15 files changed, 205 insertions(+), 6 deletions(-)
 create mode 100644 app/models/theme_modifier_set.rb
 create mode 100644 db/migrate/20200302120829_add_theme_modifier_set.rb
 create mode 100644 lib/theme_modifier_helper.rb
 create mode 100644 spec/lib/theme_flag_modifier_spec.rb
 create mode 100644 spec/models/theme_modifier_set_spec.rb

diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index 24336ee4ff..6afa44c2a1 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -145,6 +145,13 @@ class RemoteTheme < ActiveRecord::Base
       raise ImportError, I18n.t("themes.import_error.about_json_values", errors: self.errors.full_messages.join(","))
     end
 
+    ThemeModifierSet::MODIFIERS.keys.each do |modifier_name|
+      theme.theme_modifier_set.public_send(:"#{modifier_name}=", theme_info.dig("modifiers", modifier_name.to_s))
+    end
+    if !theme.theme_modifier_set.valid?
+      raise ImportError, I18n.t("themes.import_error.modifier_values", errors: theme.theme_modifier_set.errors.full_messages.join(","))
+    end
+
     importer.all_files.each do |filename|
       next unless opts = ThemeField.opts_from_file_path(filename)
       value = importer[filename]
diff --git a/app/models/theme.rb b/app/models/theme.rb
index cce0005a60..35fd663092 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -17,6 +17,7 @@ class Theme < ActiveRecord::Base
   has_many :parent_themes, -> { order(:name) }, through: :parent_theme_relation, source: :parent_theme
   has_many :color_schemes
   belongs_to :remote_theme, dependent: :destroy
+  has_one :theme_modifier_set, dependent: :destroy
 
   has_one :settings_field, -> { where(target_id: Theme.targets[:settings], name: "yaml") }, class_name: 'ThemeField'
   has_one :javascript_cache, dependent: :destroy
@@ -34,6 +35,10 @@ class Theme < ActiveRecord::Base
     changed_schemes << scheme if scheme
   end
 
+  def theme_modifier_set
+    super || build_theme_modifier_set
+  end
+
   after_save do
     changed_colors.each(&:save!)
     changed_schemes.each(&:save!)
@@ -44,6 +49,8 @@ class Theme < ActiveRecord::Base
     changed_fields.each(&:save!)
     changed_fields.clear
 
+    theme_modifier_set.save!
+
     if saved_change_to_name?
       theme_fields.select(&:basic_html_field?).each(&:invalidate_baked!)
     end
@@ -112,8 +119,8 @@ class Theme < ActiveRecord::Base
   end
 
   def self.get_set_cache(key, &blk)
-    if val = @cache[key]
-      return val
+    if @cache.hash.key? key.to_s
+      return @cache[key]
     end
     @cache[key] = blk.call
   end
@@ -247,6 +254,15 @@ class Theme < ActiveRecord::Base
     (@cache[cache_key] = val || "").html_safe
   end
 
+  def self.lookup_modifier(theme_ids, modifier_name)
+    theme_ids = [theme_ids] unless Array === theme_ids
+
+    theme_ids = transform_ids(theme_ids)
+    get_set_cache("#{theme_ids.join(",")}:modifier:#{modifier_name}:#{ThemeField::COMPILER_VERSION}") do
+      ThemeModifierSet.resolve_modifier_for_themes(theme_ids, modifier_name)
+    end
+  end
+
   def self.remove_from_cache!
     clear_cache!
   end
@@ -521,6 +537,13 @@ class Theme < ActiveRecord::Base
         end
       end
 
+      meta[:modifiers] = {}.tap do |hash|
+        ThemeModifierSet::MODIFIERS.keys.each do |modifier|
+          value = self.theme_modifier_set.public_send(modifier)
+          hash[modifier] = value if !value.nil?
+        end
+      end
+
       meta[:learn_more] = "https://meta.discourse.org/t/beginners-guide-to-using-discourse-themes/91966"
 
     end
diff --git a/app/models/theme_modifier_set.rb b/app/models/theme_modifier_set.rb
new file mode 100644
index 0000000000..262b0638ae
--- /dev/null
+++ b/app/models/theme_modifier_set.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+class ThemeModifierSet < ActiveRecord::Base
+  class ThemeModifierSetError < StandardError; end
+
+  belongs_to :theme
+
+  MODIFIERS ||= {
+    serialize_topic_excerpts: { combine_mode: :any, type: :boolean },
+    csp_extensions: { combine_mode: :flatten, type: :string_array },
+    svg_icons: { combine_mode: :flatten, type: :string_array },
+  }
+
+  validate :type_validator
+
+  def type_validator
+    MODIFIERS.each do |k, config|
+      value = public_send(k)
+      next if value.nil?
+
+      case config[:type]
+      when :boolean
+        next if [true, false].include?(value)
+      when :string_array
+        next if value.is_a?(Array) && value.all? { |v| v.is_a?(String) }
+      end
+      errors.add(k, :invalid)
+    end
+  end
+
+  after_save do
+    if saved_change_to_svg_icons?
+      SvgSprite.expire_cache
+    end
+    if saved_change_to_csp_extensions?
+      CSP::Extension.clear_theme_extensions_cache!
+    end
+  end
+
+  # Given the ids of multiple active themes / theme components, this function
+  # will combine them into a 'resolved' behavior
+  def self.resolve_modifier_for_themes(theme_ids, modifier_name)
+    return nil if !(config = MODIFIERS[modifier_name])
+
+    all_values = self.where(theme_id: theme_ids).where.not(modifier_name => nil).pluck(modifier_name)
+    case config[:combine_mode]
+    when :any
+      all_values.any?
+    when :flatten
+      all_values.flatten(1)
+    else
+      raise ThemeModifierSetError "Invalid theme modifier combine_mode"
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: theme_modifier_sets
+#
+#  id                       :bigint           not null, primary key
+#  theme_id                 :bigint           not null
+#  serialize_topic_excerpts :boolean
+#  csp_extensions           :string           is an Array
+#  svg_icons                :string           is an Array
+#
+# Indexes
+#
+#  index_theme_modifier_sets_on_theme_id  (theme_id) UNIQUE
+#
diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb
index 8a169eb194..a00cd2f619 100644
--- a/app/serializers/listable_topic_serializer.rb
+++ b/app/serializers/listable_topic_serializer.rb
@@ -111,7 +111,7 @@ class ListableTopicSerializer < BasicTopicSerializer
   alias :include_new_posts? :has_user_data
 
   def include_excerpt?
-    pinned || SiteSetting.always_include_topic_excerpts
+    pinned || SiteSetting.always_include_topic_excerpts || ThemeModifierHelper.new(request: scope.request).serialize_topic_excerpts
   end
 
   def pinned
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f4f234f8ec..0b1011a46c 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -83,6 +83,7 @@ en:
       generic: An error occured while importing that theme
       about_json: "Import Error: about.json does not exist, or is invalid"
       about_json_values: "about.json contains invalid values: %{errors}"
+      flag_values: "about.json flags contain invalid values: %{errors}"
       git: "Error cloning git repository, access is denied or repository is not found"
       unpack_failed: "Failed to unpack file"
       file_too_big: "The uncompressed file is too big."
diff --git a/db/migrate/20200302120829_add_theme_modifier_set.rb b/db/migrate/20200302120829_add_theme_modifier_set.rb
new file mode 100644
index 0000000000..a01be51985
--- /dev/null
+++ b/db/migrate/20200302120829_add_theme_modifier_set.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+class AddThemeModifierSet < ActiveRecord::Migration[6.0]
+  def change
+    create_table(:theme_modifier_sets) do |t|
+      t.references :theme, index: { unique: true }, null: false
+      t.column :serialize_topic_excerpts, :boolean
+      t.column :csp_extensions, :string, array: true
+      t.column :svg_icons, :string, array: true
+    end
+  end
+end
diff --git a/lib/content_security_policy/extension.rb b/lib/content_security_policy/extension.rb
index f782f91e26..5dd70223d0 100644
--- a/lib/content_security_policy/extension.rb
+++ b/lib/content_security_policy/extension.rb
@@ -44,16 +44,18 @@ class ContentSecurityPolicy
 
       Theme.where(id: Theme.transform_ids(theme_ids)).find_each do |theme|
         theme.cached_settings.each do |setting, value|
-          extensions << build_theme_extension(value) if setting.to_s == THEME_SETTING
+          extensions << build_theme_extension(value.split("|")) if setting.to_s == THEME_SETTING
         end
       end
 
+      extensions << build_theme_extension(ThemeModifierHelper.new(theme_ids: theme_ids).csp_extensions)
+
       extensions
     end
 
-    def build_theme_extension(raw)
+    def build_theme_extension(entries)
       {}.tap do |extension|
-        raw.split('|').each do |entry|
+        entries.each do |entry|
           directive, source = entry.split(':', 2).map(&:strip)
 
           extension[directive] ||= []
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 264154d3a6..8751f114dc 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -399,6 +399,8 @@ License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL
       end
     end
 
+    theme_icon_settings |= ThemeModifierHelper.new(theme_ids: theme_ids).svg_icons
+
     theme_icon_settings
   end
 
diff --git a/lib/theme_modifier_helper.rb b/lib/theme_modifier_helper.rb
new file mode 100644
index 0000000000..3d72a6d35a
--- /dev/null
+++ b/lib/theme_modifier_helper.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+class ThemeModifierHelper
+  def initialize(request: nil, theme_ids: nil)
+    @theme_ids = theme_ids || request&.env&.[](:resolved_theme_ids)
+  end
+
+  ThemeModifierSet::MODIFIERS.keys.each do |modifier|
+    define_method(modifier) do
+      Theme.lookup_modifier(@theme_ids, modifier)
+    end
+  end
+end
diff --git a/spec/components/svg_sprite/svg_sprite_spec.rb b/spec/components/svg_sprite/svg_sprite_spec.rb
index f8acc0028b..a9614c5548 100644
--- a/spec/components/svg_sprite/svg_sprite_spec.rb
+++ b/spec/components/svg_sprite/svg_sprite_spec.rb
@@ -142,6 +142,16 @@ describe SvgSprite do
     expect(SvgSprite.all_icons([parent_theme.id])).to include("dragon")
   end
 
+  it 'includes icons defined in theme flags' do
+    theme = Fabricate(:theme)
+
+    expect(SvgSprite.all_icons([theme.id])).not_to include("dragon")
+
+    theme.theme_modifier_set.svg_icons = ["dragon"]
+    theme.save!
+    expect(SvgSprite.all_icons([theme.id])).to include("dragon")
+  end
+
   it 'includes custom icons from a sprite in a theme' do
     theme = Fabricate(:theme)
     fname = "custom-theme-icon-sprite.svg"
diff --git a/spec/components/theme_store/zip_exporter_spec.rb b/spec/components/theme_store/zip_exporter_spec.rb
index e8c460709b..30f41806c9 100644
--- a/spec/components/theme_store/zip_exporter_spec.rb
+++ b/spec/components/theme_store/zip_exporter_spec.rb
@@ -100,6 +100,7 @@ describe ThemeStore::ZipExporter do
             "tertiary": "858585"
           }
         },
+        "modifiers": {},
         "learn_more": "https://meta.discourse.org/t/beginners-guide-to-using-discourse-themes/91966"
       )
 
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index a40865a481..fa81698019 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -165,6 +165,21 @@ describe ContentSecurityPolicy do
       expect(parse(theme_policy)['script-src']).to_not include('https://from-theme.net')
       expect(parse(theme_policy)['worker-src']).to_not include('from-theme.com')
     end
+
+    it 'can be extended by theme flags' do
+      policy # call this first to make sure further actions clear the cache
+
+      theme.theme_modifier_set.csp_extensions = ["script-src: https://from-theme-flag.script", "worker-src: from-theme-flag.worker"]
+      theme.save!
+
+      expect(parse(theme_policy)['script-src']).to include('https://from-theme-flag.script')
+      expect(parse(theme_policy)['worker-src']).to include('from-theme-flag.worker')
+
+      theme.destroy!
+
+      expect(parse(theme_policy)['script-src']).to_not include('https://from-theme-flag.script')
+      expect(parse(theme_policy)['worker-src']).to_not include('from-theme-flag.worker')
+    end
   end
 
   it 'can be extended by site setting' do
diff --git a/spec/lib/theme_flag_modifier_spec.rb b/spec/lib/theme_flag_modifier_spec.rb
new file mode 100644
index 0000000000..574c20db86
--- /dev/null
+++ b/spec/lib/theme_flag_modifier_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+describe ThemeModifierHelper do
+  fab!(:theme) { Fabricate(:theme).tap { |t| t.theme_modifier_set.update!(serialize_topic_excerpts: true) } }
+
+  it "defines a getter for modifiers" do
+    tmh = ThemeModifierHelper.new(theme_ids: [theme.id])
+    expect(tmh.serialize_topic_excerpts).to eq(true)
+  end
+
+  it "can extract theme ids from a request object" do
+    request = Rack::Request.new({ resolved_theme_ids: [theme.id] })
+    tmh = ThemeModifierHelper.new(request: request)
+    expect(tmh.serialize_topic_excerpts).to eq(true)
+  end
+end
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index 6f5bab1df1..29cc4b939d 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -37,6 +37,9 @@ describe RemoteTheme do
               "love": "#{love_color}",
               "tertiary-low": "#{tertiary_low_color}"
             }
+          },
+          "modifiers": {
+            "serialize_topic_excerpts": true
           }
         }
       JSON
@@ -85,6 +88,8 @@ describe RemoteTheme do
       expect(remote.theme_version).to eq("1.0")
       expect(remote.minimum_discourse_version).to eq("1.0.0")
 
+      expect(@theme.theme_modifier_set.serialize_topic_excerpts).to eq(true)
+
       expect(@theme.theme_fields.length).to eq(9)
 
       mapped = Hash[*@theme.theme_fields.map { |f| ["#{f.target_id}-#{f.name}", f.value] }.flatten]
diff --git a/spec/models/theme_modifier_set_spec.rb b/spec/models/theme_modifier_set_spec.rb
new file mode 100644
index 0000000000..ca770f339f
--- /dev/null
+++ b/spec/models/theme_modifier_set_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+describe ThemeModifierSet do
+  describe "#resolve_modifiers_for_themes" do
+    it "returns nil for unknown modifier" do
+      expect(ThemeModifierSet.resolve_modifier_for_themes([1, 2], :unknown_modifier)).to eq(nil)
+    end
+
+    it "resolves serialize_topic_excerpts correctly" do
+      t1 = Fabricate(:theme)
+      t1.theme_modifier_set.update!(serialize_topic_excerpts: true)
+      t2 = Fabricate(:theme)
+      t2.theme_modifier_set.update!(serialize_topic_excerpts: false)
+
+      expect(ThemeModifierSet.resolve_modifier_for_themes([t1.id, t2.id], :serialize_topic_excerpts)).to eq(true)
+
+      t1 = Fabricate(:theme)
+      t1.theme_modifier_set.update!(serialize_topic_excerpts: nil)
+
+      expect(ThemeModifierSet.resolve_modifier_for_themes([t1.id, t2.id], :serialize_topic_excerpts)).to eq(false)
+    end
+  end
+end

From fd4ce6ab8f0d252d06633119541d244163547398 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 14:42:14 +0100
Subject: [PATCH 071/633] DEV: hbs extensions are misleading in this case
 (#9170)

This would also prevent any linting tool to attempt to lint this incorrectly.
---
 ...ourse_topic_onebox.hbs => discourse_topic_onebox.mustache} | 0
 ...scourse_user_onebox.hbs => discourse_user_onebox.mustache} | 0
 lib/oneboxer.rb                                               | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/onebox/templates/{discourse_topic_onebox.hbs => discourse_topic_onebox.mustache} (100%)
 rename lib/onebox/templates/{discourse_user_onebox.hbs => discourse_user_onebox.mustache} (100%)

diff --git a/lib/onebox/templates/discourse_topic_onebox.hbs b/lib/onebox/templates/discourse_topic_onebox.mustache
similarity index 100%
rename from lib/onebox/templates/discourse_topic_onebox.hbs
rename to lib/onebox/templates/discourse_topic_onebox.mustache
diff --git a/lib/onebox/templates/discourse_user_onebox.hbs b/lib/onebox/templates/discourse_user_onebox.mustache
similarity index 100%
rename from lib/onebox/templates/discourse_user_onebox.hbs
rename to lib/onebox/templates/discourse_user_onebox.mustache
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index 3a18a9dda1..4e3ab68cf8 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -261,7 +261,7 @@ module Oneboxer
         quote: PrettyText.unescape_emoji(post.excerpt(SiteSetting.post_onebox_maxlength)),
       }
 
-      template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs")
+      template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.mustache")
       Mustache.render(template, args)
     end
   end
@@ -287,7 +287,7 @@ module Oneboxer
         original_url: url
       }
 
-      template = File.read("#{Rails.root}/lib/onebox/templates/discourse_user_onebox.hbs")
+      template = File.read("#{Rails.root}/lib/onebox/templates/discourse_user_onebox.mustache")
       Mustache.render(template, args)
     else
       nil

From a3f0543f99a9a49b9cc34d1444dd68ce2377051e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 11 Mar 2020 09:43:55 -0400
Subject: [PATCH 072/633] Support for transpiling `.js` files (#9160)

* Remove some `.es6` from comments where it does not matter

* Use a post processor for transpilation

This will allow us to eventually use the directory structure to
transpile rather than the extension.

* FIX: Some errors and clean up in confirm-new-email

It would throw an error if the webauthn element wasn't present.
Also I changed things so that no-module is not explicitly
referenced.

* Remove `no-module`

Instead we allow a magic comment: `// discourse-skip-module` to prevent
the asset pipeline from creating a module.

* DEV: Enable babel transpilation based on directory

If it's in `app/assets/javascripts/dicourse` it will be transpiled
even without the `.es6` extension.

* REFACTOR: Remove Tilt/ES6ModuleTranspiler
---
 .eslintignore                                 |   2 +-
 Gemfile                                       |   3 -
 Gemfile.lock                                  |   1 -
 ....no-module.es6 => activate-account.js.es6} |   1 +
 ....js.no-module.es6 => auto-redirect.js.es6} |   1 +
 .../confirm-new-email/bootstrap.js.es6        |   4 +
 .../confirm-new-email.js.es6                  |  43 +++---
 .../confirm-new-email.no-module.js.es6        |   1 -
 .../second-factor-add-security-key.js.es6     |   2 +-
 .../discourse/lib/{ajax.js.es6 => ajax.js}    |   0
 .../lib/{autosize.js.es6 => autosize.js}      |   0
 .../discourse/lib/plugin-api.js.es6           |   2 +-
 .../discourse/lib/plugin-connectors.js.es6    |   2 +-
 ...no-module.es6 => embed-application.js.es6} |   1 +
 ...o-module.es6 => google-tag-manager.js.es6} |   1 +
 ....es6 => google-universal-analytics.js.es6} |   1 +
 ...o-module.es6 => onpopstate-handler.js.es6} |   1 +
 ...le.es6 => preload-application-data.js.es6} |   2 +
 ...t.js.no-module.es6 => wizard-start.js.es6} |   1 +
 .../show_confirm_new_email.html.erb           |  12 +-
 config/application.rb                         |   8 +-
 config/initializers/010-discourse_iife.rb     |  12 --
 lib/discourse.rb                              |   2 +-
 lib/discourse_iife.rb                         |  45 ------
 ..._template.rb => discourse_js_processor.rb} | 133 +++++++-----------
 lib/discourse_plugin_registry.rb              |   2 +-
 lib/es6_module_transpiler/rails.rb            |  27 ----
 lib/es6_module_transpiler/rails/version.rb    |   7 -
 lib/es6_module_transpiler/sprockets.rb        |   6 -
 lib/es6_module_transpiler/tilt.rb             |   6 -
 lib/freedom_patches/raw_handlebars.rb         |   4 +-
 lib/freedom_patches/zeitwerk.rb               |   1 -
 lib/pretty_text.rb                            |   9 +-
 lib/source_url.rb                             |  24 ----
 lib/theme_javascript_compiler.rb              |   8 +-
 ...odule.es6 => discourse-local-dates.js.es6} |   1 +
 plugins/discourse-local-dates/plugin.rb       |   2 +-
 spec/lib/discourse_js_processor_spec.rb       |  39 +++++
 38 files changed, 152 insertions(+), 265 deletions(-)
 rename app/assets/javascripts/{activate-account.js.no-module.es6 => activate-account.js.es6} (96%)
 rename app/assets/javascripts/{auto-redirect.js.no-module.es6 => auto-redirect.js.es6} (86%)
 create mode 100644 app/assets/javascripts/confirm-new-email/bootstrap.js.es6
 delete mode 100644 app/assets/javascripts/confirm-new-email/confirm-new-email.no-module.js.es6
 rename app/assets/javascripts/discourse/lib/{ajax.js.es6 => ajax.js} (100%)
 rename app/assets/javascripts/discourse/lib/{autosize.js.es6 => autosize.js} (100%)
 rename app/assets/javascripts/{embed-application.js.no-module.es6 => embed-application.js.es6} (98%)
 rename app/assets/javascripts/{google-tag-manager.js.no-module.es6 => google-tag-manager.js.es6} (96%)
 rename app/assets/javascripts/{google-universal-analytics.js.no-module.es6 => google-universal-analytics.js.es6} (97%)
 rename app/assets/javascripts/{onpopstate-handler.js.no-module.es6 => onpopstate-handler.js.es6} (89%)
 rename app/assets/javascripts/{preload-application-data.js.no-module.es6 => preload-application-data.js.es6} (97%)
 rename app/assets/javascripts/{wizard-start.js.no-module.es6 => wizard-start.js.es6} (79%)
 delete mode 100644 config/initializers/010-discourse_iife.rb
 delete mode 100644 lib/discourse_iife.rb
 rename lib/{es6_module_transpiler/tilt/es6_module_transpiler_template.rb => discourse_js_processor.rb} (66%)
 delete mode 100644 lib/es6_module_transpiler/rails.rb
 delete mode 100644 lib/es6_module_transpiler/rails/version.rb
 delete mode 100644 lib/es6_module_transpiler/sprockets.rb
 delete mode 100644 lib/es6_module_transpiler/tilt.rb
 delete mode 100644 lib/source_url.rb
 rename plugins/discourse-local-dates/assets/javascripts/{discourse-local-dates.js.no-module.es6 => discourse-local-dates.js.es6} (99%)
 create mode 100644 spec/lib/discourse_js_processor_spec.rb

diff --git a/.eslintignore b/.eslintignore
index 1806ae7c09..6676467368 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,7 +3,7 @@ app/assets/javascripts/main_include_admin.js
 app/assets/javascripts/vendor.js
 app/assets/javascripts/locales/i18n.js
 app/assets/javascripts/ember-addons/
-app/assets/javascripts/discourse/lib/autosize.js.es6
+app/assets/javascripts/discourse/lib/autosize.js
 lib/javascripts/locale/
 lib/javascripts/messageformat.js
 lib/highlight_js/
diff --git a/Gemfile b/Gemfile
index ced7f0376e..278e0fb961 100644
--- a/Gemfile
+++ b/Gemfile
@@ -120,9 +120,6 @@ gem 'sanitize'
 gem 'sidekiq'
 gem 'mini_scheduler'
 
-# for sidekiq web
-gem 'tilt', require: false
-
 gem 'execjs', require: false
 gem 'mini_racer'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e00fc70b37..ed34096df2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -539,7 +539,6 @@ DEPENDENCIES
   stackprof
   test-prof
   thor
-  tilt
   uglifier
   unf
   unicorn
diff --git a/app/assets/javascripts/activate-account.js.no-module.es6 b/app/assets/javascripts/activate-account.js.es6
similarity index 96%
rename from app/assets/javascripts/activate-account.js.no-module.es6
rename to app/assets/javascripts/activate-account.js.es6
index 8d5691d0d8..b637b27763 100644
--- a/app/assets/javascripts/activate-account.js.no-module.es6
+++ b/app/assets/javascripts/activate-account.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   setTimeout(function() {
     const $activateButton = $("#activate-account-button");
diff --git a/app/assets/javascripts/auto-redirect.js.no-module.es6 b/app/assets/javascripts/auto-redirect.js.es6
similarity index 86%
rename from app/assets/javascripts/auto-redirect.js.no-module.es6
rename to app/assets/javascripts/auto-redirect.js.es6
index 1b54988740..0308edbb2e 100644
--- a/app/assets/javascripts/auto-redirect.js.no-module.es6
+++ b/app/assets/javascripts/auto-redirect.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   const path = document.getElementById("data-auto-redirect").dataset.path;
   setTimeout(function() {
diff --git a/app/assets/javascripts/confirm-new-email/bootstrap.js.es6 b/app/assets/javascripts/confirm-new-email/bootstrap.js.es6
new file mode 100644
index 0000000000..5754bc233c
--- /dev/null
+++ b/app/assets/javascripts/confirm-new-email/bootstrap.js.es6
@@ -0,0 +1,4 @@
+// discourse-skip-module
+(function() {
+  require("confirm-new-email/confirm-new-email");
+})();
diff --git a/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6 b/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6
index dbcfdd25c4..8a61d76df8 100644
--- a/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6
+++ b/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6
@@ -1,23 +1,26 @@
 import { getWebauthnCredential } from "discourse/lib/webauthn";
 
-document.getElementById("submit-security-key").onclick = function(e) {
-  e.preventDefault();
-  getWebauthnCredential(
-    document.getElementById("security-key-challenge").value,
-    document
-      .getElementById("security-key-allowed-credential-ids")
-      .value.split(","),
-    credentialData => {
-      document.getElementById("security-key-credential").value = JSON.stringify(
-        credentialData
-      );
+const security = document.getElementById("submit-security-key");
+if (security) {
+  security.onclick = function(e) {
+    e.preventDefault();
+    getWebauthnCredential(
+      document.getElementById("security-key-challenge").value,
+      document
+        .getElementById("security-key-allowed-credential-ids")
+        .value.split(","),
+      credentialData => {
+        document.getElementById(
+          "security-key-credential"
+        ).value = JSON.stringify(credentialData);
 
-      $(e.target)
-        .parents("form")
-        .submit();
-    },
-    errorMessage => {
-      document.getElementById("security-key-error").innerText = errorMessage;
-    }
-  );
-};
+        $(e.target)
+          .parents("form")
+          .submit();
+      },
+      errorMessage => {
+        document.getElementById("security-key-error").innerText = errorMessage;
+      }
+    );
+  };
+}
diff --git a/app/assets/javascripts/confirm-new-email/confirm-new-email.no-module.js.es6 b/app/assets/javascripts/confirm-new-email/confirm-new-email.no-module.js.es6
deleted file mode 100644
index 0dd05dd8ca..0000000000
--- a/app/assets/javascripts/confirm-new-email/confirm-new-email.no-module.js.es6
+++ /dev/null
@@ -1 +0,0 @@
-require("confirm-new-email/confirm-new-email").default();
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
index 14b0524b1c..935f71e263 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
@@ -6,7 +6,7 @@ import {
   isWebauthnSupported
 } from "discourse/lib/webauthn";
 
-// model for this controller is user.js.es6
+// model for this controller is user
 export default Controller.extend(ModalFunctionality, {
   loading: false,
   errorMessage: null,
diff --git a/app/assets/javascripts/discourse/lib/ajax.js.es6 b/app/assets/javascripts/discourse/lib/ajax.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/ajax.js.es6
rename to app/assets/javascripts/discourse/lib/ajax.js
diff --git a/app/assets/javascripts/discourse/lib/autosize.js.es6 b/app/assets/javascripts/discourse/lib/autosize.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/autosize.js.es6
rename to app/assets/javascripts/discourse/lib/autosize.js
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 2fcedd76b9..bd55faf05c 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -848,7 +848,7 @@ class PluginApi {
    *
    * Example:
    *
-   * // read /discourse/lib/sharing.js.es6 for options
+   * // read discourse/lib/sharing for options
    * api.addSharingSource(options)
    *
    */
diff --git a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6 b/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
index 8c6efa86a2..8bf830be89 100644
--- a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
@@ -12,7 +12,7 @@ export function resetExtraClasses() {
 }
 
 // Note: In plugins, define a class by path and it will be wired up automatically
-// eg: discourse/connectors/<OUTLET NAME>/<CONNECTOR NAME>.js.es6
+// eg: discourse/connectors/<OUTLET NAME>/<CONNECTOR NAME>
 export function extraConnectorClass(name, obj) {
   _extraConnectorClasses[name] = obj;
 }
diff --git a/app/assets/javascripts/embed-application.js.no-module.es6 b/app/assets/javascripts/embed-application.js.es6
similarity index 98%
rename from app/assets/javascripts/embed-application.js.no-module.es6
rename to app/assets/javascripts/embed-application.js.es6
index 9cdda8267e..0cd8352991 100644
--- a/app/assets/javascripts/embed-application.js.no-module.es6
+++ b/app/assets/javascripts/embed-application.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   const referer = document.getElementById("data-embedded").dataset.referer;
 
diff --git a/app/assets/javascripts/google-tag-manager.js.no-module.es6 b/app/assets/javascripts/google-tag-manager.js.es6
similarity index 96%
rename from app/assets/javascripts/google-tag-manager.js.no-module.es6
rename to app/assets/javascripts/google-tag-manager.js.es6
index ebc19ad1bf..09a939dee1 100644
--- a/app/assets/javascripts/google-tag-manager.js.no-module.es6
+++ b/app/assets/javascripts/google-tag-manager.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   const gtmDataElement = document.getElementById("data-google-tag-manager");
   const dataLayerJson = JSON.parse(gtmDataElement.dataset.dataLayer);
diff --git a/app/assets/javascripts/google-universal-analytics.js.no-module.es6 b/app/assets/javascripts/google-universal-analytics.js.es6
similarity index 97%
rename from app/assets/javascripts/google-universal-analytics.js.no-module.es6
rename to app/assets/javascripts/google-universal-analytics.js.es6
index 76d59a1d41..cc1a8e351d 100644
--- a/app/assets/javascripts/google-universal-analytics.js.no-module.es6
+++ b/app/assets/javascripts/google-universal-analytics.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 /* eslint-disable */
 // prettier-ignore
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
diff --git a/app/assets/javascripts/onpopstate-handler.js.no-module.es6 b/app/assets/javascripts/onpopstate-handler.js.es6
similarity index 89%
rename from app/assets/javascripts/onpopstate-handler.js.no-module.es6
rename to app/assets/javascripts/onpopstate-handler.js.es6
index 014ec61bf2..f722a97615 100644
--- a/app/assets/javascripts/onpopstate-handler.js.no-module.es6
+++ b/app/assets/javascripts/onpopstate-handler.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 window.onpopstate = function(event) {
   // check if Discourse object exists if not take care of back navigation
   if (event.state && !window.hasOwnProperty("Discourse")) {
diff --git a/app/assets/javascripts/preload-application-data.js.no-module.es6 b/app/assets/javascripts/preload-application-data.js.es6
similarity index 97%
rename from app/assets/javascripts/preload-application-data.js.no-module.es6
rename to app/assets/javascripts/preload-application-data.js.es6
index af38129b7d..6c3852f5ca 100644
--- a/app/assets/javascripts/preload-application-data.js.no-module.es6
+++ b/app/assets/javascripts/preload-application-data.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   var ps = require("preload-store").default;
   var preloadedDataElement = document.getElementById("data-preloaded");
@@ -55,6 +56,7 @@
     Discourse.S3BaseUrl = setupData.s3BaseUrl;
   }
 
+  // eslint-disable-next-line
   Ember.RSVP.configure("onerror", function(e) {
     // Ignore TransitionAborted exceptions that bubble up
     if (e && e.message === "TransitionAborted") {
diff --git a/app/assets/javascripts/wizard-start.js.no-module.es6 b/app/assets/javascripts/wizard-start.js.es6
similarity index 79%
rename from app/assets/javascripts/wizard-start.js.no-module.es6
rename to app/assets/javascripts/wizard-start.js.es6
index 403ef66749..79c022f6fc 100644
--- a/app/assets/javascripts/wizard-start.js.no-module.es6
+++ b/app/assets/javascripts/wizard-start.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   var wizard = require("wizard/wizard").default.create();
   wizard.start();
diff --git a/app/views/users_email/show_confirm_new_email.html.erb b/app/views/users_email/show_confirm_new_email.html.erb
index 31108a7ac1..a1e0eda56e 100644
--- a/app/views/users_email/show_confirm_new_email.html.erb
+++ b/app/views/users_email/show_confirm_new_email.html.erb
@@ -73,10 +73,10 @@
     <%end%>
   <% end%>
 
-  <%= preload_script "ember_jquery" %>	
-  <%= preload_script "locales/#{I18n.locale}" %>	
-  <%= preload_script "locales/i18n" %>	
-  <%= preload_script "discourse/lib/webauthn" %>	
-  <%= preload_script "confirm-new-email/confirm-new-email" %>	
-  <%= preload_script "confirm-new-email/confirm-new-email.no-module" %>
+  <%= preload_script "ember_jquery" %>
+  <%= preload_script "locales/#{I18n.locale}" %>
+  <%= preload_script "locales/i18n" %>
+  <%= preload_script "discourse/lib/webauthn" %>
+  <%= preload_script "confirm-new-email/confirm-new-email" %>
+  <%= preload_script "confirm-new-email/bootstrap" %>
 </div>
diff --git a/config/application.rb b/config/application.rb
index e2b271c947..cf820c39dc 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -76,7 +76,6 @@ module Discourse
     # confused here if we load the deps without `lib` it thinks
     # discourse.rb is under the discourse folder incorrectly
     require_dependency 'lib/discourse'
-    require_dependency 'lib/es6_module_transpiler/rails'
     require_dependency 'lib/js_locale_helper'
 
     # tiny file needed by site settings
@@ -155,7 +154,7 @@ module Discourse
       locales/i18n.js
       discourse/lib/webauthn.js
       confirm-new-email/confirm-new-email.js
-      confirm-new-email/confirm-new-email.no-module.js
+      confirm-new-email/bootstrap.js
       onpopstate-handler.js
       embed-application.js
     }
@@ -244,6 +243,11 @@ module Discourse
     Sprockets.register_mime_type 'text/x-handlebars', extensions: ['.hbr']
     Sprockets.register_transformer 'text/x-handlebars', 'application/javascript', Ember::Handlebars::Template
 
+    require 'discourse_js_processor'
+
+    Sprockets.register_mime_type 'application/javascript', extensions: ['.js', '.es6', '.js.es6'], charset: :unicode
+    Sprockets.register_postprocessor 'application/javascript', DiscourseJsProcessor
+
     require 'discourse_redis'
     require 'logster/redis_store'
     # Use redis for our cache
diff --git a/config/initializers/010-discourse_iife.rb b/config/initializers/010-discourse_iife.rb
deleted file mode 100644
index 3405a62c4b..0000000000
--- a/config/initializers/010-discourse_iife.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'discourse_iife'
-
-Rails.application.config.assets.configure do |env|
-  env.register_preprocessor('application/javascript', DiscourseIIFE)
-
-  unless Rails.env.production?
-    require 'source_url'
-    env.register_postprocessor('application/javascript', SourceURL)
-  end
-end
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 7241dc1c35..0cbc4d8e4c 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -655,7 +655,7 @@ module Discourse
     # in case v8 was initialized we want to make sure it is nil
     PrettyText.reset_context
 
-    Tilt::ES6ModuleTranspilerTemplate.reset_context if defined? Tilt::ES6ModuleTranspilerTemplate
+    DiscourseJsProcessor::Transpiler.reset_context if defined? DiscourseJsProcessor::Transpiler
     JsLocaleHelper.reset_context if defined? JsLocaleHelper
     nil
   end
diff --git a/lib/discourse_iife.rb b/lib/discourse_iife.rb
deleted file mode 100644
index 4b702d55ff..0000000000
--- a/lib/discourse_iife.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class DiscourseIIFE
-  def initialize(options = {}, &block)
-  end
-
-  def self.instance
-    @instance ||= new
-  end
-
-  def self.call(input)
-    instance.call(input)
-  end
-
-  # Add a IIFE around our javascript
-  def call(input)
-    path = input[:environment].context_class.new(input).pathname.to_s
-    data = input[:data]
-
-    # Only discourse or admin paths
-    return data unless (path =~ /\/javascripts\/discourse/ || path =~ /\/javascripts\/admin/ || path =~ /\/test\/javascripts/)
-
-    # Ignore the js helpers
-    return data if (path =~ /test\_helper\.js/)
-    return data if (path =~ /javascripts\/helpers\//)
-
-    # Ignore ES6 files
-    return data if (path =~ /\.es6/)
-
-    # Ignore translations
-    return data if (path =~ /\/translations/)
-
-    # We don't add IIFEs to handlebars
-    return data if path =~ /\.handlebars/
-    return data if path =~ /\.shbrs/
-    return data if path =~ /\.hbrs/
-    return data if path =~ /\.hbs/
-    return data if path =~ /\.hbr/
-
-    return data if path =~ /discourse-loader/
-
-    "(function () {\n\nvar $ = window.jQuery;\n// IIFE Wrapped Content Begins:\n\n#{data}\n\n// IIFE Wrapped Content Ends\n\n })(this);"
-  end
-
-end
diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/discourse_js_processor.rb
similarity index 66%
rename from lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
rename to lib/discourse_js_processor.rb
index f56f99d602..db276e2586 100644
--- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
+++ b/lib/discourse_js_processor.rb
@@ -1,28 +1,54 @@
 # frozen_string_literal: true
-
 require 'execjs'
 require 'mini_racer'
 
-module Tilt
+class DiscourseJsProcessor
 
-  class ES6ModuleTranspilerTemplate < Tilt::Template
-    self.default_mime_type = 'application/javascript'
+  def self.call(input)
+    root_path = input[:load_path] || ''
+    logical_path = (input[:filename] || '').sub(root_path, '').gsub(/\.(js|es6).*$/, '').sub(/^\//, '')
+    data = input[:data]
 
+    if should_transpile?(input[:filename])
+      data = transpile(data, root_path, logical_path)
+    end
+
+    # add sourceURL until we can do proper source maps
+    unless Rails.env.production?
+      data = "eval(#{data.inspect} + \"\\n//# sourceURL=#{logical_path}\");\n"
+    end
+
+    { data: data }
+  end
+
+  def self.transpile(data, root_path, logical_path)
+    transpiler = Transpiler.new(skip_module: skip_module?(data))
+    transpiler.perform(data, root_path, logical_path)
+  end
+
+  def self.should_transpile?(filename)
+    filename ||= ''
+
+    # es6 is always transpiled
+    return true if filename.end_with?(".es6") || filename.end_with?(".es6.erb")
+
+    # For .js check the path...
+    return false unless filename.end_with?(".js") || filename.end_with?(".js.erb")
+
+    relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
+    relative_path.start_with?("app/assets/javascripts/discourse/")
+  end
+
+  def self.skip_module?(data)
+    !!(data.present? && data =~ /^\/\/ discourse-skip-module$/)
+  end
+
+  class Transpiler
     @mutex = Mutex.new
     @ctx_init = Mutex.new
 
-    def self.call(input)
-      filename = input[:filename]
-      source = input[:data]
-      context = input[:environment].context_class.new(input)
-
-      result = new(filename) { source }.render(context)
-      context.metadata.merge(data: result)
-    end
-
-    def prepare
-      # intentionally left empty
-      # Tilt requires this method to be defined
+    def self.mutex
+      @mutex
     end
 
     def self.create_new_context
@@ -66,33 +92,13 @@ JS
       @ctx
     end
 
-    class JavaScriptError < StandardError
-      attr_accessor :message, :backtrace
-
-      def initialize(message, backtrace)
-        @message = message
-        @backtrace = backtrace
-      end
-
+    def initialize(skip_module: false)
+      @skip_module = skip_module
     end
 
-    def self.protect
-      @mutex.synchronize do
-        yield
-      end
-    end
-
-    def babel_transpile(source)
+    def perform(source, root_path = nil, logical_path = nil)
       klass = self.class
-      klass.protect do
-        klass.v8.eval("console.prefix = 'BABEL: babel-eval: ';")
-        @output = klass.v8.eval(babel_source(source))
-      end
-    end
-
-    def module_transpile(source, root_path, logical_path)
-      klass = self.class
-      klass.protect do
+      klass.mutex.synchronize do
         klass.v8.eval("console.prefix = 'BABEL: babel-eval: ';")
         transpiled = babel_source(
           source,
@@ -103,31 +109,12 @@ JS
       end
     end
 
-    def evaluate(scope, locals, &block)
-      return @output if @output
-
-      klass = self.class
-      klass.protect do
-        klass.v8.eval("console.prefix = 'BABEL: #{scope.logical_path}: ';")
-
-        source = babel_source(
-          data,
-          module_name: module_name(scope.root_path, scope.logical_path),
-          filename: scope.logical_path
-        )
-
-        @output = klass.v8.eval(source)
-      end
-
-      @output
-    end
-
     def babel_source(source, opts = nil)
       opts ||= {}
 
       js_source = ::JSON.generate(source, quirks_mode: true)
 
-      if opts[:module_name] && transpile_into_module?
+      if opts[:module_name] && !@skip_module
         filename = opts[:filename] || 'unknown'
         "Babel.transform(#{js_source}, { moduleId: '#{opts[:module_name]}', filename: '#{filename}', ast: false, presets: ['es2015'], plugins: [['transform-es2015-modules-amd', {noInterop: true}], 'transform-decorators-legacy', exports.WidgetHbsCompiler] }).code"
       else
@@ -135,12 +122,6 @@ JS
       end
     end
 
-    private
-
-    def transpile_into_module?
-      file.nil? || file.exclude?('.no-module')
-    end
-
     def module_name(root_path, logical_path)
       path = nil
 
@@ -153,26 +134,8 @@ JS
         path = "discourse/plugins/#{plugin.name}/#{logical_path.sub(/javascripts\//, '')}" if plugin
       end
 
-      path ||= logical_path
-      if ES6ModuleTranspiler.transform
-        path = ES6ModuleTranspiler.transform.call(path)
-      end
-
-      path
+      path || logical_path
     end
 
-    def compiler_method
-      type = {
-        amd: 'AMD',
-        cjs: 'CJS',
-        globals: 'Globals'
-      }[ES6ModuleTranspiler.compile_to.to_sym]
-
-      "to#{type}"
-    end
-
-    def compiler_options
-      ::JSON.generate(ES6ModuleTranspiler.compiler_options, quirks_mode: true)
-    end
   end
 end
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index 0a604ef2d1..8e9dde7d82 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -151,7 +151,7 @@ class DiscoursePluginRegistry
     end
   end
 
-  JS_REGEX = /\.js$|\.js\.erb$|\.js\.es6|\.js\.no-module\.es6$/
+  JS_REGEX = /\.js$|\.js\.erb$|\.js\.es6$/
   HANDLEBARS_REGEX = /\.(hb[rs]|js\.handlebars)$/
 
   def self.register_asset(asset, opts = nil, plugin_directory_name = nil)
diff --git a/lib/es6_module_transpiler/rails.rb b/lib/es6_module_transpiler/rails.rb
deleted file mode 100644
index 9f72ac0a74..0000000000
--- a/lib/es6_module_transpiler/rails.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'es6_module_transpiler/rails/version'
-require 'es6_module_transpiler/tilt'
-require 'es6_module_transpiler/sprockets'
-
-module ES6ModuleTranspiler
-  def self.compile_to
-    @compile_to || :amd
-  end
-
-  def self.compile_to=(target)
-    @compile_to = target
-  end
-
-  def self.transform=(transform)
-    @transform = transform
-  end
-
-  def self.transform
-    @transform
-  end
-
-  def self.compiler_options
-    @compiler_options ||= {}
-  end
-end
diff --git a/lib/es6_module_transpiler/rails/version.rb b/lib/es6_module_transpiler/rails/version.rb
deleted file mode 100644
index 0e1e981f8e..0000000000
--- a/lib/es6_module_transpiler/rails/version.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module ES6ModuleTranspiler
-  module Rails
-    VERSION = '0.4.0'
-  end
-end
diff --git a/lib/es6_module_transpiler/sprockets.rb b/lib/es6_module_transpiler/sprockets.rb
deleted file mode 100644
index f55e52b26b..0000000000
--- a/lib/es6_module_transpiler/sprockets.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require 'sprockets'
-
-Sprockets.register_mime_type 'application/ecmascript6', extensions: ['.es6', '.js.es6', '.js.no-module.es6'], charset: :unicode
-Sprockets.register_transformer 'application/ecmascript6', 'application/javascript', Tilt::ES6ModuleTranspilerTemplate
diff --git a/lib/es6_module_transpiler/tilt.rb b/lib/es6_module_transpiler/tilt.rb
deleted file mode 100644
index 5d399256c3..0000000000
--- a/lib/es6_module_transpiler/tilt.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require 'tilt'
-require 'es6_module_transpiler/tilt/es6_module_transpiler_template'
-
-Tilt.register Tilt::ES6ModuleTranspilerTemplate, 'es6'
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index 804d66f410..488061fb56 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -12,8 +12,8 @@ class Barber::Precompiler
     if !@precompiler
 
       source = File.read("#{Rails.root}/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6")
-      template = Tilt::ES6ModuleTranspilerTemplate.new {}
-      transpiled = template.babel_transpile(source)
+      transpiler = DiscourseJsProcessor::Transpiler.new(skip_module: true)
+      transpiled = transpiler.perform(source)
 
       # very hacky but lets us use ES6. I'm ashamed of this code -RW
       transpiled = transpiled[0...transpiled.index('export ')]
diff --git a/lib/freedom_patches/zeitwerk.rb b/lib/freedom_patches/zeitwerk.rb
index 9cd102aac0..cf1ddc186d 100644
--- a/lib/freedom_patches/zeitwerk.rb
+++ b/lib/freedom_patches/zeitwerk.rb
@@ -12,7 +12,6 @@ module ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
     'postgresql_fallback_adapter' => 'PostgreSQLFallbackHandler',
     'regular' => 'Jobs',
     'scheduled' => 'Jobs',
-    'source_url' => 'SourceURL',
     'topic_query_sql' => 'TopicQuerySQL',
     'version' => 'Discourse',
   }
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index a4b6312d55..d76e2ed827 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -29,13 +29,10 @@ module PrettyText
     filename = find_file(root_path, part_name)
     if filename
       source = File.read("#{root_path}#{filename}")
+      source = ERB.new(source).result(binding) if filename =~ /\.erb$/
 
-      if filename =~ /\.erb$/
-        source = ERB.new(source).result(binding)
-      end
-
-      template = Tilt::ES6ModuleTranspilerTemplate.new {}
-      transpiled = template.module_transpile(source, "#{Rails.root}/app/assets/javascripts/", part_name)
+      transpiler = DiscourseJsProcessor::Transpiler.new
+      transpiled = transpiler.perform(source, "#{Rails.root}/app/assets/javascripts/", part_name)
       ctx.eval(transpiled)
     else
       # Look for vendored stuff
diff --git a/lib/source_url.rb b/lib/source_url.rb
deleted file mode 100644
index 38078255f7..0000000000
--- a/lib/source_url.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class SourceURL < Tilt::Template
-  self.default_mime_type = 'application/javascript'
-
-  def self.call(input)
-    filename = input[:filename]
-    source = input[:data]
-    context = input[:environment].context_class.new(input)
-
-    result = new(filename) { source }.render(context)
-    context.metadata.merge(data: result)
-  end
-
-  def prepare
-  end
-
-  def evaluate(scope, locals, &block)
-    code = +"eval("
-    code << data.inspect
-    code << " + \"\\n//# sourceURL=#{scope.logical_path}\""
-    code << ");\n"
-  end
-end
diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index b0906eb356..988a96ad9e 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -214,8 +214,8 @@ class ThemeJavascriptCompiler
 
   def append_module(script, name, include_variables: true)
     script = "#{theme_variables}#{script}" if include_variables
-    template = Tilt::ES6ModuleTranspilerTemplate.new {}
-    @content << template.module_transpile(script, "", name)
+    transpiler = DiscourseJsProcessor::Transpiler.new
+    @content << transpiler.perform(script, "", name)
   rescue MiniRacer::RuntimeError => ex
     raise CompileError.new ex.message
   end
@@ -237,7 +237,7 @@ class ThemeJavascriptCompiler
   end
 
   def transpile(es6_source, version)
-    template = Tilt::ES6ModuleTranspilerTemplate.new {}
+    transpiler = DiscourseJsProcessor::Transpiler.new(skip_module: true)
     wrapped = <<~PLUGIN_API_JS
       (function() {
         if ('Discourse' in window && typeof Discourse._registerPluginCode === 'function') {
@@ -254,7 +254,7 @@ class ThemeJavascriptCompiler
       })();
     PLUGIN_API_JS
 
-    template.babel_transpile(wrapped)
+    transpiler.perform(wrapped)
   rescue MiniRacer::RuntimeError => ex
     raise CompileError.new ex.message
   end
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
similarity index 99%
rename from plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
rename to plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
index f2226a6dfd..aba41b68ce 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function($) {
   const DATE_TEMPLATE = `
     <span>
diff --git a/plugins/discourse-local-dates/plugin.rb b/plugins/discourse-local-dates/plugin.rb
index 616d337270..d4ac0160df 100644
--- a/plugins/discourse-local-dates/plugin.rb
+++ b/plugins/discourse-local-dates/plugin.rb
@@ -6,7 +6,7 @@
 # author: Joffrey Jaffeux
 hide_plugin if self.respond_to?(:hide_plugin)
 
-register_asset 'javascripts/discourse-local-dates.js.no-module.es6'
+register_asset 'javascripts/discourse-local-dates.js.es6'
 register_asset 'stylesheets/common/discourse-local-dates.scss'
 register_asset 'moment.js', :vendored_core_pretty_text
 register_asset 'moment-timezone.js', :vendored_core_pretty_text
diff --git a/spec/lib/discourse_js_processor_spec.rb b/spec/lib/discourse_js_processor_spec.rb
new file mode 100644
index 0000000000..47cd59601f
--- /dev/null
+++ b/spec/lib/discourse_js_processor_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'discourse_js_processor'
+
+describe DiscourseJsProcessor do
+
+  describe 'should_transpile?' do
+    it "returns false for empty strings" do
+      expect(DiscourseJsProcessor.should_transpile?(nil)).to eq(false)
+      expect(DiscourseJsProcessor.should_transpile?('')).to eq(false)
+    end
+
+    it "returns false for a regular js file" do
+      expect(DiscourseJsProcessor.should_transpile?("file.js")).to eq(false)
+    end
+
+    it "returns true for deprecated .es6 files" do
+      expect(DiscourseJsProcessor.should_transpile?("file.es6")).to eq(true)
+      expect(DiscourseJsProcessor.should_transpile?("file.js.es6")).to eq(true)
+      expect(DiscourseJsProcessor.should_transpile?("file.js.es6.erb")).to eq(true)
+    end
+  end
+
+  describe "skip_module?" do
+    it "returns false for empty strings" do
+      expect(DiscourseJsProcessor.skip_module?(nil)).to eq(false)
+      expect(DiscourseJsProcessor.skip_module?('')).to eq(false)
+    end
+
+    it "returns true if the header is present" do
+      expect(DiscourseJsProcessor.skip_module?("// cool comment\n// discourse-skip-module")).to eq(true)
+    end
+
+    it "returns false if the header is not present" do
+      expect(DiscourseJsProcessor.skip_module?("// just some JS\nconsole.log()")).to eq(false)
+    end
+  end
+end

From 40d768623413bfdf4cec1078646e62f385f60d23 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2020 10:09:19 -0400
Subject: [PATCH 073/633] Build(deps-dev): Bump webmock from 3.8.2 to 3.8.3
 (#9167)

Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.2 to 3.8.3.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.2...v3.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ed34096df2..ea4840a1ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -408,7 +408,7 @@ GEM
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.13.0)
-    webmock (3.8.2)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

From 4e0b2ae294e0867f1381f691f506e1e5799466e1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 15:28:16 +0100
Subject: [PATCH 074/633] DEV: defines a constant for INPUT_DELAY (#9169)

---
 .../admin/controllers/admin-dashboard-reports.js.es6     | 3 ++-
 .../admin/controllers/admin-email-bounced.js.es6         | 3 ++-
 .../admin/controllers/admin-email-received.js.es6        | 3 ++-
 .../admin/controllers/admin-email-rejected.js.es6        | 3 ++-
 .../admin/controllers/admin-email-sent.js.es6            | 3 ++-
 .../admin/controllers/admin-email-skipped.js.es6         | 3 ++-
 .../controllers/admin-logs-screened-ip-addresses.js.es6  | 3 ++-
 .../admin/controllers/admin-permalinks.js.es6            | 3 ++-
 .../admin/controllers/admin-site-settings.js.es6         | 3 ++-
 .../admin/controllers/admin-users-list-show.js.es6       | 3 ++-
 .../admin/controllers/admin-watched-words.js.es6         | 3 ++-
 .../discourse-common/config/environment.js.es6           | 2 ++
 .../javascripts/discourse/components/emoji-picker.js.es6 | 4 ++--
 .../javascripts/discourse/components/quote-button.js.es6 | 3 ++-
 .../discourse/components/search-advanced-options.js.es6  | 3 ++-
 .../discourse/controllers/user-invited-show.js.es6       | 3 ++-
 .../javascripts/discourse/lib/keyboard-shortcuts.js.es6  | 9 +++++----
 app/assets/javascripts/discourse/lib/safari-hacks.js.es6 | 3 ++-
 .../components/discourse-local-dates-create-form.js.es6  | 3 ++-
 19 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
index 9a57b9cf32..d6e15496f7 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
@@ -1,6 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { debounce } from "@ember/runloop";
 import Controller from "@ember/controller";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 const { get } = Ember;
 
@@ -23,7 +24,7 @@ export default Controller.extend({
 
   actions: {
     filterReports(filter) {
-      debounce(this, this._performFiltering, filter, 250);
+      debounce(this, this._performFiltering, filter, INPUT_DELAY);
     }
   },
 
diff --git a/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
index 508bc559c5..bc034db4f7 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
@@ -1,10 +1,11 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,user,address,type}")
   filterEmailLogs: discourseDebounce(function() {
     this.loadLogs();
-  }, 250)
+  }, INPUT_DELAY)
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-received.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-received.js.es6
index 4a3cc363df..0942a3dabf 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-received.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-received.js.es6
@@ -2,12 +2,13 @@ import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
 import IncomingEmail from "admin/models/incoming-email";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,from,to,subject}")
   filterIncomingEmails: discourseDebounce(function() {
     this.loadLogs(IncomingEmail);
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     loadMore() {
diff --git a/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
index 8c6f6767f4..01882482e7 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
@@ -2,12 +2,13 @@ import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
 import IncomingEmail from "admin/models/incoming-email";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,from,to,subject,error}")
   filterIncomingEmails: discourseDebounce(function() {
     this.loadLogs(IncomingEmail);
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     loadMore() {
diff --git a/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
index f727c9d6f4..b76fcf81dc 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
@@ -1,10 +1,11 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,user,address,type,reply_key}")
   filterEmailLogs: discourseDebounce(function() {
     this.loadLogs();
-  }, 250)
+  }, INPUT_DELAY)
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
index 508bc559c5..bc034db4f7 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
@@ -1,10 +1,11 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,user,address,type}")
   filterEmailLogs: discourseDebounce(function() {
     this.loadLogs();
-  }, 250)
+  }, INPUT_DELAY)
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
index baee177c02..789f070db1 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
@@ -4,6 +4,7 @@ import { outputExportResult } from "discourse/lib/export-result";
 import { exportEntity } from "discourse/lib/export-csv";
 import ScreenedIpAddress from "admin/models/screened-ip-address";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   loading: false,
@@ -16,7 +17,7 @@ export default Controller.extend({
     ScreenedIpAddress.findAll(this.filter).then(result => {
       this.setProperties({ model: result, loading: false });
     });
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     allow(record) {
diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
index a45f8cc89a..6f0842049c 100644
--- a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
@@ -2,6 +2,7 @@ import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import Permalink from "admin/models/permalink";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   loading: false,
@@ -13,7 +14,7 @@ export default Controller.extend({
       this.set("model", result);
       this.set("loading", false);
     });
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     recordAdded(arg) {
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
index 28721de995..ac84553a71 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -3,6 +3,7 @@ import { alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   filter: null,
@@ -84,7 +85,7 @@ export default Controller.extend({
     } else {
       this.filterContentNow();
     }
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     clearFilter() {
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
index 8776fee466..8b7adb194c 100644
--- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
@@ -4,6 +4,7 @@ import discourseDebounce from "discourse/lib/debounce";
 import { i18n } from "discourse/lib/computed";
 import AdminUser from "admin/models/admin-user";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend(CanCheckEmails, {
   model: null,
@@ -32,7 +33,7 @@ export default Controller.extend(CanCheckEmails, {
   @observes("listFilter")
   _filterUsers: discourseDebounce(function() {
     this.resetFilters();
-  }, 250),
+  }, INPUT_DELAY),
 
   resetFilters() {
     this._page = 1;
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
index dbc2afe1dc..636358c629 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
@@ -4,6 +4,7 @@ import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   filter: null,
@@ -48,7 +49,7 @@ export default Controller.extend({
   filterContent: discourseDebounce(function() {
     this.filterContentNow();
     this.set("filtered", !isEmpty(this.filter));
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     clearFilter() {
diff --git a/app/assets/javascripts/discourse-common/config/environment.js.es6 b/app/assets/javascripts/discourse-common/config/environment.js.es6
index 3bfa2c38c5..18ce3cc976 100644
--- a/app/assets/javascripts/discourse-common/config/environment.js.es6
+++ b/app/assets/javascripts/discourse-common/config/environment.js.es6
@@ -1 +1,3 @@
+export const INPUT_DELAY = 250;
+
 export default { environment: Ember.testing ? "test" : "development" };
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index fccf3c597f..2696ca1358 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -9,7 +9,7 @@ import {
   emojiSearch
 } from "pretty-text/emoji";
 import { safariHacksDisabled } from "discourse/lib/utilities";
-import ENV from "discourse-common/config/environment";
+import ENV, { INPUT_DELAY } from "discourse-common/config/environment";
 
 const { run } = Ember;
 
@@ -94,7 +94,7 @@ export default Component.extend({
   @observes("filter")
   filterChanged() {
     this.$filter.find(".clear-filter").toggle(!_.isEmpty(this.filter));
-    const filterDelay = this.site.isMobileDevice ? 400 : 250;
+    const filterDelay = this.site.isMobileDevice ? 400 : INPUT_DELAY;
     run.debounce(this, this._filterEmojisList, filterDelay);
   },
 
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
index 2d8df37706..141d9f32ac 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -2,6 +2,7 @@ import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseDebounce from "discourse/lib/debounce";
 import { selectedText, selectedElement } from "discourse/lib/utilities";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 function getQuoteTitle(element) {
   const titleEl = element.querySelector(".title");
@@ -146,7 +147,7 @@ export default Component.extend({
 
   didInsertElement() {
     const { isWinphone, isAndroid } = this.capabilities;
-    const wait = isWinphone || isAndroid ? 250 : 25;
+    const wait = isWinphone || isAndroid ? INPUT_DELAY : 25;
     const onSelectionChanged = discourseDebounce(
       () => this._selectionChanged(),
       wait
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
index 9b3bac5035..136c416588 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -5,6 +5,7 @@ import { escapeExpression } from "discourse/lib/utilities";
 import Group from "discourse/models/group";
 import Badge from "discourse/models/badge";
 import Category from "discourse/models/category";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 const REGEXP_BLOCKS = /(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/g;
 
@@ -82,7 +83,7 @@ export default Component.extend({
   @observes("searchTerm")
   _updateOptions() {
     this._update();
-    debounce(this, this._update, 250);
+    debounce(this, this._update, INPUT_DELAY);
   },
 
   _init() {
diff --git a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6 b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
index 9282265e78..0b8c07d0fb 100644
--- a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
@@ -4,6 +4,7 @@ import Invite from "discourse/models/invite";
 import discourseDebounce from "discourse/lib/debounce";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   user: null,
@@ -30,7 +31,7 @@ export default Controller.extend({
       this.filter,
       this.searchTerm
     ).then(invites => this.set("model", invites));
-  }, 250),
+  }, INPUT_DELAY),
 
   inviteRedeemed: equal("filter", "redeemed"),
 
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 69f42cfee1..59840f2b4d 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -4,6 +4,7 @@ import Composer from "discourse/models/composer";
 import { minimumOffset } from "discourse/lib/offset-calculator";
 import { ajax } from "discourse/lib/ajax";
 import { throttle } from "@ember/runloop";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 const bindings = {
   "!": { postAction: "showFlags" },
@@ -299,19 +300,19 @@ export default {
   },
 
   setTrackingToMuted(event) {
-    throttle(this, "_setTracking", { id: 0, event }, 250, true);
+    throttle(this, "_setTracking", { id: 0, event }, INPUT_DELAY, true);
   },
 
   setTrackingToRegular(event) {
-    throttle(this, "_setTracking", { id: 1, event }, 250, true);
+    throttle(this, "_setTracking", { id: 1, event }, INPUT_DELAY, true);
   },
 
   setTrackingToTracking(event) {
-    throttle(this, "_setTracking", { id: 2, event }, 250, true);
+    throttle(this, "_setTracking", { id: 2, event }, INPUT_DELAY, true);
   },
 
   setTrackingToWatching(event) {
-    throttle(this, "_setTracking", { id: 3, event }, 250, true);
+    throttle(this, "_setTracking", { id: 3, event }, INPUT_DELAY, true);
   },
 
   _setTracking(params) {
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 799d3c904c..40d8ee4637 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -4,6 +4,7 @@ import {
   safariHacksDisabled,
   iOSWithVisualViewport
 } from "discourse/lib/utilities";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 // TODO: remove calcHeight once iOS 13 adoption > 90%
 // In iOS 13 and up we use visualViewport API to calculate height
@@ -136,7 +137,7 @@ function positioningWorkaround($fixedElement) {
     positioningWorkaround.blur(evt);
   };
 
-  var blurred = discourseDebounce(blurredNow, 250);
+  var blurred = discourseDebounce(blurredNow, INPUT_DELAY);
 
   var positioningHack = function(evt) {
     // we need this, otherwise changing focus means we never clear
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
index 374aacad93..df092d9a89 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
@@ -10,6 +10,7 @@ import loadScript from "discourse/lib/load-script";
 import computed, { observes } from "discourse-common/utils/decorators";
 import { cookAsync } from "discourse/lib/text";
 import discourseDebounce from "discourse/lib/debounce";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Component.extend({
   timeFormat: "HH:mm:ss",
@@ -66,7 +67,7 @@ export default Component.extend({
         );
       });
     }
-  }, 250),
+  }, INPUT_DELAY),
 
   @computed("date", "toDate", "toTime")
   isRange(date, toDate, toTime) {

From 61a2c3650ddc265060b44c00c6ed79dd890299f1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 15:30:14 +0100
Subject: [PATCH 075/633] DEV: enforces ember-template-lint: no-partial (#9173)

selected-posts parial is kept and calling the new component to prevent errors with users who would have rewritten topic.hbs

dashboard-problems and version-checks seem less risky and have only been converted to components
---
 .template-lintrc.js                           |   3 +-
 .../{ => components}/dashboard-problems.hbs   |   2 +-
 .../templates/components/version-checks.hbs   | 135 ++++++++++++++++++
 .../javascripts/admin/templates/dashboard.hbs |  10 +-
 .../admin/templates/version-checks.hbs        |  88 ------------
 .../templates/components/selected-posts.hbs   |  61 ++++++++
 .../discourse/templates/selected-posts.hbs    |  41 ++----
 .../javascripts/discourse/templates/topic.hbs |  30 +++-
 8 files changed, 249 insertions(+), 121 deletions(-)
 rename app/assets/javascripts/admin/templates/{ => components}/dashboard-problems.hbs (84%)
 create mode 100644 app/assets/javascripts/admin/templates/components/version-checks.hbs
 delete mode 100644 app/assets/javascripts/admin/templates/version-checks.hbs
 create mode 100644 app/assets/javascripts/discourse/templates/components/selected-posts.hbs

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 29bf420298..801225fd33 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -12,6 +12,7 @@ module.exports = {
     "no-unused-block-params": true,
     "no-unbound": true,
     "simple-unless": true,
-    "no-triple-curlies": true
+    "no-triple-curlies": true,
+    "no-partial": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
similarity index 84%
rename from app/assets/javascripts/admin/templates/dashboard-problems.hbs
rename to app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
index 5f95987e73..cb8311a4e3 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
@@ -18,7 +18,7 @@
         </div>
 
         <p class="actions">
-          {{d-button action=(action "refreshProblems") class="btn-default" icon="sync" label="admin.dashboard.refresh_problems"}}
+          {{d-button action=refreshProblems class="btn-default" icon="sync" label="admin.dashboard.refresh_problems"}}
           {{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}
         </p>
       {{/conditional-loading-section}}
diff --git a/app/assets/javascripts/admin/templates/components/version-checks.hbs b/app/assets/javascripts/admin/templates/components/version-checks.hbs
new file mode 100644
index 0000000000..aa2fcc97c0
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/version-checks.hbs
@@ -0,0 +1,135 @@
+<div class="section-title">
+  <h2>
+    {{i18n "admin.dashboard.version"}}
+  </h2>
+</div>
+
+<div
+  class="dashboard-stats version-check
+    {{if versionCheck.critical_updates "critical" "normal"}}"
+>
+  <div class="version-number">
+    <h4>
+      {{i18n "admin.dashboard.installed_version"}}
+    </h4>
+    <h3>
+      {{dash-if-empty versionCheck.installed_version}}
+    </h3>
+    {{#if versionCheck.gitLink}}
+      <div class="sha-link">
+        (
+        <a href={{versionCheck.gitLink}} rel="noopener" target="_blank">
+          {{versionCheck.shortSha}}
+        </a>
+        )
+      </div>
+    {{/if}}
+  </div>
+  {{#if versionCheck.noCheckPerformed}}
+    <div class="version-number">
+      <h4>
+        {{i18n "admin.dashboard.latest_version"}}
+      </h4>
+      <h3>
+        —
+      </h3>
+    </div>
+    <div class="version-status">
+      <div class="face">
+        <span class="icon critical-updates-available">
+          {{d-icon "far-frown"}}
+        </span>
+      </div>
+      <div class="version-notes">
+        <span class="normal-note">
+          {{i18n "admin.dashboard.no_check_performed"}}
+        </span>
+      </div>
+    </div>
+  {{else if versionCheck.stale_data}}
+    <div class="version-number">
+      <h4>
+        {{i18n "admin.dashboard.latest_version"}}
+      </h4>
+      <h3>
+        {{#if versionCheck.version_check_pending}}
+          {{dash-if-empty versionCheck.installed_version}}
+        {{/if}}
+      </h3>
+    </div>
+    <div class="version-status">
+      <div class="face">
+        {{#if versionCheck.version_check_pending}}
+          <span class="icon up-to-date">
+            {{d-icon "far-smile"}}
+          </span>
+        {{else}}
+          <span class="icon critical-updates-available">
+            {{d-icon "far-frown"}}
+          </span>
+        {{/if}}
+      </div>
+      <div class="version-notes">
+        <span class="normal-note">
+          {{#if versionCheck.version_check_pending}}
+            {{i18n "admin.dashboard.version_check_pending"}}
+          {{else}}
+            {{i18n "admin.dashboard.stale_data"}}
+          {{/if}}
+        </span>
+      </div>
+    </div>
+  {{else}}
+    <div class="version-number">
+      <h4>
+        {{i18n "admin.dashboard.latest_version"}}
+      </h4>
+      <h3>
+        {{dash-if-empty versionCheck.latest_version}}
+      </h3>
+    </div>
+    <div class="version-status">
+      <div class="face">
+        {{#if versionCheck.upToDate}}
+          <span class="icon up-to-date">
+            {{d-icon "far-smile"}}
+          </span>
+        {{else}}
+          <span
+            class="icon
+              {{if
+                versionCheck.critical_updates
+                "critical-updates-available"
+                "updates-available"
+              }}"
+          >
+            {{#if versionCheck.behindByOneVersion}}
+              {{d-icon "meh-o"}}
+            {{else}}
+              {{d-icon "far-frown"}}
+            {{/if}}
+          </span>
+        {{/if}}
+      </div>
+      <div class="version-notes">
+        {{#if versionCheck.upToDate}}
+          {{i18n "admin.dashboard.up_to_date"}}
+        {{else}}
+          <span class="critical-note">
+            {{i18n "admin.dashboard.critical_available"}}
+          </span>
+          <span class="normal-note">
+            {{i18n "admin.dashboard.updates_available"}}
+          </span>
+          {{i18n "admin.dashboard.please_upgrade"}}
+        {{/if}}
+      </div>
+    </div>
+  {{/if}}
+  {{custom-html
+    name="upgrade-header"
+    versionCheck=versionCheck
+    tagName="div"
+    classNames="upgrade-header"
+  }}
+</div>
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index 8ca74d79b5..cbbd34b4b2 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -3,12 +3,18 @@
 {{#if showVersionChecks}}
   <div class="section-top">
     <div class="version-checks">
-      {{partial "admin/templates/version-checks"}}
+      {{version-checks versionCheck=versionCheck}}
     </div>
   </div>
 {{/if}}
 
-{{partial "admin/templates/dashboard-problems"}}
+{{dashboard-problems
+  loadingProblems=loadingProblems
+  foundProblems=foundProblems
+  problems=problems
+  problemsTimestamp=problemsTimestamp
+  refreshProblems=(action "refreshProblems")
+}}
 
 <ul class="navigation">
   <li class="navigation-item general">
diff --git a/app/assets/javascripts/admin/templates/version-checks.hbs b/app/assets/javascripts/admin/templates/version-checks.hbs
deleted file mode 100644
index bd0bc3b981..0000000000
--- a/app/assets/javascripts/admin/templates/version-checks.hbs
+++ /dev/null
@@ -1,88 +0,0 @@
-      <div class="section-title">
-        <h2>{{i18n 'admin.dashboard.version'}}</h2>
-      </div>
-      <div class="dashboard-stats version-check {{if versionCheck.critical_updates 'critical' 'normal'}}">
-
-      <div class="version-number">
-        <h4>{{i18n 'admin.dashboard.installed_version'}}</h4>
-        <h3>{{dash-if-empty versionCheck.installed_version}}</h3>
-        {{#if versionCheck.gitLink}}
-          <div class="sha-link">
-            (<a href={{versionCheck.gitLink}} rel="noopener" target="_blank">{{versionCheck.shortSha}}</a>)
-          </div>
-        {{/if}}
-      </div>
-
-      {{#if versionCheck.noCheckPerformed}}
-        <div class="version-number">
-          <h4>{{i18n 'admin.dashboard.latest_version'}}</h4>
-          <h3>&mdash;</h3>
-        </div>
-        <div class="version-status">
-          <div class="face">
-            <span class="icon critical-updates-available">{{d-icon "far-frown"}}</span>
-          </div>
-          <div class="version-notes">
-            <span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
-          </div>
-        </div>
-      {{else}}
-        {{#if versionCheck.stale_data}}
-          <div class="version-number">
-            <h4>{{i18n 'admin.dashboard.latest_version'}}</h4>
-            <h3>{{#if versionCheck.version_check_pending}}{{dash-if-empty versionCheck.installed_version}}{{/if}}</h3>
-            </div>
-          <div class="version-status">
-            <div class="face">
-              {{#if versionCheck.version_check_pending}}
-                <span class='icon up-to-date'>{{d-icon "far-smile"}}</span>
-              {{else}}
-                <span class="icon critical-updates-available">{{d-icon "far-frown"}}</span>
-              {{/if}}
-            </div>
-            <div class="version-notes">
-              <span class="normal-note">
-                {{#if versionCheck.version_check_pending}}
-                  {{i18n 'admin.dashboard.version_check_pending'}}
-                {{else}}
-                  {{i18n 'admin.dashboard.stale_data'}}
-                {{/if}}
-              </span>
-            </div>
-          </div>
-        {{else}}
-          <div class="version-number">
-            <h4>{{i18n 'admin.dashboard.latest_version'}}</h4>
-            <h3>{{dash-if-empty versionCheck.latest_version}}</h3>
-          </div>
-          <div class="version-status">
-            <div class="face">
-              {{#if versionCheck.upToDate }}
-              <span class='icon up-to-date'>{{d-icon "far-smile"}}</span>
-              {{else}}
-                <span class="icon {{if versionCheck.critical_updates 'critical-updates-available' 'updates-available'}}">
-                  {{#if versionCheck.behindByOneVersion}}
-                    {{d-icon "meh-o"}}
-                  {{else}}
-                    {{d-icon "far-frown"}}
-                  {{/if}}
-                </span>
-              {{/if}}
-            </div>
-            <div class="version-notes">
-              {{#if versionCheck.upToDate }}
-                {{i18n 'admin.dashboard.up_to_date'}}
-              {{else}}
-                <span class="critical-note">{{i18n 'admin.dashboard.critical_available'}}</span>
-                <span class="normal-note">{{i18n 'admin.dashboard.updates_available'}}</span>
-                {{i18n 'admin.dashboard.please_upgrade'}}
-              {{/if}}
-            </div>
-          </div>
-
-        {{/if}}
-      {{/if}}
-
-      {{custom-html name="upgrade-header" versionCheck=versionCheck tagName="div" classNames="upgrade-header"}}
-
-</div>
diff --git a/app/assets/javascripts/discourse/templates/components/selected-posts.hbs b/app/assets/javascripts/discourse/templates/components/selected-posts.hbs
new file mode 100644
index 0000000000..5221b77e1f
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/selected-posts.hbs
@@ -0,0 +1,61 @@
+<p>
+  {{count-i18n key="topic.multi_select.description" count=selectedPostsCount}}
+</p>
+
+{{#if canSelectAll}}
+  <p>
+    <a class="select-all" href {{action selectAll}}>
+      {{i18n "topic.multi_select.select_all"}}
+    </a>
+  </p>
+{{/if}}
+
+{{#if canDeselectAll}}
+  <p>
+    <a href {{action deselectAll}}>
+      {{i18n "topic.multi_select.deselect_all"}}
+    </a>
+  </p>
+{{/if}}
+
+{{#if canDeleteSelected}}
+  {{d-button
+    action=deleteSelected
+    icon="far-trash-alt"
+    label="topic.multi_select.delete"
+    class="btn-danger"
+  }}
+{{/if}}
+
+{{#if canMergeTopic}}
+  {{d-button
+    action=(route-action "moveToTopic")
+    icon="sign-out-alt"
+    label="topic.move_to.action"
+    class="btn-primary move-to-topic"
+  }}
+{{/if}}
+
+{{#if canChangeOwner}}
+  {{d-button
+    action=(route-action "changeOwner")
+    icon="user"
+    label="topic.change_owner.action"
+    class="btn-primary"
+  }}
+{{/if}}
+
+{{#if canMergePosts}}
+  {{d-button
+    action=mergePosts
+    icon="arrows-v"
+    label="topic.merge_posts.action"
+    class="btn-primary"
+  }}
+{{/if}}
+
+<p class="cancel">
+  <a href {{action toggleMultiSelect}}>
+    {{i18n "topic.multi_select.cancel"}}
+  </a>
+</p>
diff --git a/app/assets/javascripts/discourse/templates/selected-posts.hbs b/app/assets/javascripts/discourse/templates/selected-posts.hbs
index e2de58c845..a3d300f673 100644
--- a/app/assets/javascripts/discourse/templates/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/selected-posts.hbs
@@ -1,27 +1,14 @@
-<p>{{count-i18n key="topic.multi_select.description" count=selectedPostsCount}}</p>
-
-{{#if canSelectAll}}
-  <p><a class="select-all" href {{action "selectAll"}}>{{i18n 'topic.multi_select.select_all'}}</a></p>
-{{/if}}
-
-{{#if canDeselectAll}}
-  <p><a href {{action "deselectAll"}}>{{i18n 'topic.multi_select.deselect_all'}}</a></p>
-{{/if}}
-
-{{#if canDeleteSelected}}
-  {{d-button action=(action "deleteSelected") icon="far-trash-alt" label="topic.multi_select.delete" class="btn-danger"}}
-{{/if}}
-
-{{#if canMergeTopic}}
-  {{d-button action=(route-action "moveToTopic") icon="sign-out-alt" label="topic.move_to.action" class="btn-primary move-to-topic"}}
-{{/if}}
-
-{{#if canChangeOwner}}
-  {{d-button action=(route-action "changeOwner") icon="user" label="topic.change_owner.action"  class="btn-primary"}}
-{{/if}}
-
-{{#if canMergePosts}}
-  {{d-button action=(action "mergePosts") icon="arrows-v" label="topic.merge_posts.action" class="btn-primary"}}
-{{/if}}
-
-<p class='cancel'><a href {{action "toggleMultiSelect"}}>{{i18n 'topic.multi_select.cancel'}}</a></p>
+{{selected-posts
+  selectedPostsCount=selectedPostsCount
+  canSelectAll=canSelectAll
+  canDeselectAll=canDeselectAll
+  canDeleteSelected=canDeleteSelected
+  canMergeTopic=canMergeTopic
+  canChangeOwner=canChangeOwner
+  canMergePosts=canMergePosts
+  toggleMultiSelect=(action "toggleMultiSelect")
+  mergePosts=(action "mergePosts")
+  deleteSelected=(action "deleteSelected")
+  deselectAll=(action "deselectAll")
+  selectAll=(action "selectAll")
+}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 7950ca19ec..e5894c03ca 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -91,7 +91,20 @@
 
     <div class="container posts">
       <div class='selected-posts {{unless multiSelect 'hidden'}}'>
-        {{partial "selected-posts"}}
+        {{selected-posts
+          selectedPostsCount=selectedPostsCount
+          canSelectAll=canSelectAll
+          canDeselectAll=canDeselectAll
+          canDeleteSelected=canDeleteSelected
+          canMergeTopic=canMergeTopic
+          canChangeOwner=canChangeOwner
+          canMergePosts=canMergePosts
+          toggleMultiSelect=(action "toggleMultiSelect")
+          mergePosts=(action "mergePosts")
+          deleteSelected=(action "deleteSelected")
+          deselectAll=(action "deselectAll")
+          selectAll=(action "selectAll")
+        }}
       </div>
 
       {{#topic-navigation topic=model jumpToDate=(action "jumpToDate") jumpToIndex=(action "jumpToIndex") as |info|}}
@@ -327,7 +340,20 @@
 
               {{#if showSelectedPostsAtBottom}}
                 <div class='selected-posts {{unless multiSelect 'hidden'}}'>
-                  {{partial "selected-posts"}}
+                  {{selected-posts
+                    selectedPostsCount=selectedPostsCount
+                    canSelectAll=canSelectAll
+                    canDeselectAll=canDeselectAll
+                    canDeleteSelected=canDeleteSelected
+                    canMergeTopic=canMergeTopic
+                    canChangeOwner=canChangeOwner
+                    canMergePosts=canMergePosts
+                    toggleMultiSelect=(action "toggleMultiSelect")
+                    mergePosts=(action "mergePosts")
+                    deleteSelected=(action "deleteSelected")
+                    deselectAll=(action "deselectAll")
+                    selectAll=(action "selectAll")
+                  }}
                 </div>
               {{/if}}
 

From 4a0f36e46c7d664df1bce86f32f61d3a8e197898 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 15:30:47 +0100
Subject: [PATCH 076/633] FIX: featured_topic.fancy_title was rendered without
 emojis (#9176)

---
 .../discourse/templates/components/user-card-contents.hbs       | 2 +-
 .../javascripts/discourse/templates/preferences/profile.hbs     | 2 +-
 app/assets/javascripts/discourse/templates/user.hbs             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 3bfdf96268..4bc61d7a7c 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -144,7 +144,7 @@
         <div class="card-row">
           <div class="featured-topic">
             <span class="desc">{{i18n 'user.featured_topic'}}</span>
-            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe user.featured_topic.fancy_title}}{{/link-to}}
+            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe (replace-emoji user.featured_topic.fancy_title)}}{{/link-to}}
           </div>
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index e6fe5381ed..f07c8a9a38 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -66,7 +66,7 @@
     <label class="control-label">{{i18n 'user.featured_topic'}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
-      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
+      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe (replace-emoji model.featured_topic.fancy_title)}}{{/link-to}}
       </label>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 377177843e..290b791961 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -100,7 +100,7 @@
             {{#if showFeaturedTopic}}
               <h3 class="featured-topic">
                 <span>{{i18n 'user.featured_topic'}}</span>
-                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
+                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe (replace-emoji model.featured_topic.fancy_title)}}{{/link-to}}
               </h3>
             {{/if}}
 

From 1fca745beb29ec2392a87c65e6acf098b3d8ea68 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 15:31:08 +0100
Subject: [PATCH 077/633] DEV: applies default modal class to a modal when
 shown (#9175)

---
 app/assets/javascripts/discourse/lib/show-modal.js.es6 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6
index 968f1e399d..18e6e8698f 100644
--- a/app/assets/javascripts/discourse/lib/show-modal.js.es6
+++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6
@@ -9,7 +9,10 @@ export default function(name, opts) {
   const route = container.lookup("route:application");
   const modalController = route.controllerFor("modal");
 
-  modalController.set("modalClass", opts.modalClass);
+  modalController.set(
+    "modalClass",
+    opts.modalClass || `${dasherize(name).toLowerCase()}-modal`
+  );
 
   const controllerName = opts.admin ? `modals/${name}` : name;
   modalController.set("name", controllerName);

From d3b53fb551e0ac206b40e1ca044e6638b2cfa000 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 15:31:29 +0100
Subject: [PATCH 078/633] REFACTOR: removes legacy bootstrap css class (#9174)

---
 app/assets/javascripts/admin/templates/email-index.hbs        | 2 +-
 .../javascripts/admin/templates/email-preview-digest.hbs      | 2 +-
 app/assets/javascripts/discourse/widgets/post.js.es6          | 2 +-
 test/javascripts/lib/click-track-edit-history-test.js.es6     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/email-index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs
index 200e8aad27..d510b2f4fc 100644
--- a/app/assets/javascripts/admin/templates/email-index.hbs
+++ b/app/assets/javascripts/admin/templates/email-index.hbs
@@ -17,7 +17,7 @@
 <form>
   <div class='admin-controls'>
     {{#if sendingEmail}}
-      <div class='span15 controls'>{{i18n 'admin.email.sending_test'}}</div>
+      <div class='controls'>{{i18n 'admin.email.sending_test'}}</div>
     {{else}}
       <div class='controls'>
         {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 7a695659c5..58733c1eb3 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -1,7 +1,7 @@
 <p>{{i18n 'admin.email.preview_digest_desc'}}</p>
 
 <div class='admin-controls email-preview'>
-  <div class='span7 controls'>
+  <div class='controls'>
     <label for='last-seen'>{{i18n 'admin.email.last_seen_user'}}</label>
     {{date-picker-past value=lastSeen id="last-seen"}}
     <label>{{i18n 'admin.email.user'}}:</label>
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index 5107da42f0..bd84bfb428 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -548,7 +548,7 @@ createWidget("post-article", {
       rows.push(
         h(
           "div.row",
-          h("section.embedded-posts.top.topic-body.offset2", [
+          h("section.embedded-posts.top.topic-body", [
             this.attach("button", {
               title: "post.collapse",
               icon: "chevron-down",
diff --git a/test/javascripts/lib/click-track-edit-history-test.js.es6 b/test/javascripts/lib/click-track-edit-history-test.js.es6
index ae8f6d18c2..f38f4c9fe1 100644
--- a/test/javascripts/lib/click-track-edit-history-test.js.es6
+++ b/test/javascripts/lib/click-track-edit-history-test.js.es6
@@ -22,7 +22,7 @@ QUnit.module("lib:click-track-edit-history", {
        </div>
        <div id="revisions" data-post-id="42" class="">
          <div class="row">
-           <div class="span8">
+           <div>
              <a href="http://www.google.com">google.com</a>
              <a class="lightbox back" href="http://www.google.com">google.com</a>
              <div class="onebox-result">
@@ -34,7 +34,7 @@ QUnit.module("lib:click-track-edit-history", {
              <a class="attachment" href="http://discuss.domain.com/uploads/default/1234/1532357280.txt">log.txt</a>
              <a class="hashtag" href="http://discuss.domain.com">#hashtag</a>
            </div>
-           <div class="span8 offset1">
+           <div>
              <a href="http://www.google.com">google.com</a>
              <a class="lightbox back" href="http://www.google.com">google.com</a>
              <div class="onebox-result">

From 12af95d0dc1a4a40f7989cd6855e5c7729f36896 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 2 Mar 2020 18:26:28 -0300
Subject: [PATCH 079/633] FIX: ContactPicker was not setting invite input on
 topics

---
 .../javascripts/discourse/templates/components/invite-panel.hbs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
index cfdd1431bf..a7a7875219 100644
--- a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
@@ -30,6 +30,7 @@
             allowEmails=true
             class="invite-user-input"
             autocomplete="discourse"
+            value=emailOrUsername
           }}
         {{else}}
           {{text-field

From 3f9b310beb74b609308a0fd3f5b87cffb2d2d5d4 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Wed, 11 Mar 2020 12:12:28 -0300
Subject: [PATCH 080/633] FIX: Typo on draft save

---
 app/models/draft.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/draft.rb b/app/models/draft.rb
index aee066c0e2..4a3ab41f02 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -78,7 +78,7 @@ class Draft < ActiveRecord::Base
         # around 2 controller actions calling for draft creation at the exact same time
         # to avoid complex locking and a distributed mutex, since this is so rare, simply add a single retry
         if retry_not_unique
-          set(user, key, sequence, data, owenr, retry_not_unique: false)
+          set(user, key, sequence, data, owner, retry_not_unique: false)
         else
           raise e
         end

From 6c948f27ea607018265d1097e3f5a63f66d62c0c Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Wed, 11 Mar 2020 10:19:59 -0500
Subject: [PATCH 081/633] FIX: Missing constant in SMF2 importer (#9178)

---
 script/import_scripts/smf2.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb
index 3d1f69adbf..74b63189cd 100644
--- a/script/import_scripts/smf2.rb
+++ b/script/import_scripts/smf2.rb
@@ -369,6 +369,11 @@ class ImportScripts::Smf2 < ImportScripts::Base
     end
   end
 
+  IGNORED_BBCODE ||= %w{
+    black blue center color email flash font glow green iurl left list move red
+    right shadown size table time white
+  }
+
   def convert_bbcode(raw)
     return "" if raw.blank?
 

From 40f1201b3966053bab0112cdcfaf8ecde515265a Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 11 Mar 2020 11:13:31 -0500
Subject: [PATCH 082/633] DEV: Support adding keybindings via plugins (#9177)

---
 .../discourse/lib/keyboard-shortcuts.js.es6          | 10 ++++++----
 .../javascripts/discourse/lib/plugin-api.js.es6      | 12 +++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 59840f2b4d..2a401e4fcd 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -6,7 +6,7 @@ import { ajax } from "discourse/lib/ajax";
 import { throttle } from "@ember/runloop";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 
-const bindings = {
+export let bindings = {
   "!": { postAction: "showFlags" },
   "#": { handler: "goToPost", anonymous: true },
   "/": { handler: "toggleSearch", anonymous: true },
@@ -406,14 +406,16 @@ export default {
   },
 
   _globalBindToFunction(func, binding) {
-    if (typeof this[func] === "function") {
+    let funcToBind = typeof func === "function" ? func : this[func];
+    if (typeof funcToBind === "function") {
       this.keyTrapper.bindGlobal(binding, this[func].bind(this));
     }
   },
 
   _bindToFunction(func, binding) {
-    if (typeof this[func] === "function") {
-      this.keyTrapper.bind(binding, this[func].bind(this));
+    let funcToBind = typeof func === "function" ? func : this[func];
+    if (typeof funcToBind === "function") {
+      this.keyTrapper.bind(binding, funcToBind.bind(this));
     }
   },
 
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index bd55faf05c..cdaaad0263 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -1,3 +1,4 @@
+/*global Mousetrap:true*/
 import deprecated from "discourse-common/lib/deprecated";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { addDecorator } from "discourse/widgets/post-cooked";
@@ -50,9 +51,10 @@ import { addCategorySortCriteria } from "discourse/components/edit-category-sett
 import { queryRegistry } from "discourse/widgets/widget";
 import Composer from "discourse/models/composer";
 import { on } from "@ember/object/evented";
+import KeyboardShortcuts, { bindings } from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.38";
+const PLUGIN_API_VERSION = "0.8.39";
 
 class PluginApi {
   constructor(version, container) {
@@ -227,6 +229,14 @@ class PluginApi {
     }
   }
 
+  addKeyboardShortcut(shortcut, callback, opts = {}) {
+    shortcut = shortcut.trim().replace(/\s/g, ""); // Strip all whitespace
+    let newBinding = {};
+    newBinding[shortcut] = Object.assign({ handler: callback }, opts);
+    Object.assign(bindings, newBinding);
+    KeyboardShortcuts.bindEvents(Mousetrap, this.container);
+  }
+
   /**
    * addPosterIcon(callback)
    *

From c9d1577087bcc26e77edbccd1dd8647750db555f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 11 Mar 2020 12:47:37 -0400
Subject: [PATCH 083/633] Let's not log the username/password

This could easily be seen by someone who shouldn't.
---
 lib/tasks/emails.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/emails.rake b/lib/tasks/emails.rake
index 9eb9250199..4180658e64 100644
--- a/lib/tasks/emails.rake
+++ b/lib/tasks/emails.rake
@@ -78,7 +78,7 @@ task 'emails:test', [:email] => [:environment] do |_, args|
       STR
     end
 
-    puts "Testing sending to #{email} using #{smtp[:user_name]}:#{smtp[:password]}@#{smtp[:address]}:#{smtp[:port]}."
+    puts "Testing sending to #{email} using #{smtp[:address]}:#{smtp[:port]}."
 
     # We would like to do this, but Net::SMTP errors out using starttls
     #Net::SMTP.start(smtp[:address], smtp[:port]) do |s|

From a4929661af70875569c5c0cfcca952d5c4b5768c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2020 20:11:12 +0300
Subject: [PATCH 084/633] Build(deps): Bump rack-mini-profiler from 1.1.6 to
 2.0.0 (#9168)

* Build(deps): Bump rack-mini-profiler from 1.1.6 to 2.0.0

Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 1.1.6 to 2.0.0.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.6...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Enable rails patches

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: OsamaSayegh <asooomaasoooma90@gmail.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 278e0fb961..73f97c0533 100644
--- a/Gemfile
+++ b/Gemfile
@@ -205,7 +205,7 @@ gem 'htmlentities', require: false
 #  we are open to it. by deferring require to the initializer we can configure discourse installs without it
 
 gem 'flamegraph', require: false
-gem 'rack-mini-profiler', require: false
+gem 'rack-mini-profiler', require: ['enable_rails_patches']
 
 gem 'unicorn', require: false, platform: :mri
 gem 'puma', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index ea4840a1ae..6bd045d8c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -268,7 +268,7 @@ GEM
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.0.8)
-    rack-mini-profiler (1.1.6)
+    rack-mini-profiler (2.0.0)
       rack (>= 1.2.0)
     rack-protection (2.0.8.1)
       rack

From c928287e0cb2fe1510c321d8e2695f45095426e1 Mon Sep 17 00:00:00 2001
From: OsamaSayegh <asooomaasoooma90@gmail.com>
Date: Wed, 11 Mar 2020 21:31:57 +0300
Subject: [PATCH 085/633] DEV: Mini Profiler shouldn't be loaded in test
 environment

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 73f97c0533..0fad51edf9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -205,7 +205,7 @@ gem 'htmlentities', require: false
 #  we are open to it. by deferring require to the initializer we can configure discourse installs without it
 
 gem 'flamegraph', require: false
-gem 'rack-mini-profiler', require: ['enable_rails_patches']
+gem 'rack-mini-profiler', require: ['enable_rails_patches'], group: [:development, :production]
 
 gem 'unicorn', require: false, platform: :mri
 gem 'puma', require: false

From b23c2437aeb1244688388d2d9dfb4de242cf7528 Mon Sep 17 00:00:00 2001
From: OsamaSayegh <asooomaasoooma90@gmail.com>
Date: Wed, 11 Mar 2020 22:16:15 +0300
Subject: [PATCH 086/633] DEV: Revert rack-mini-profiler version bump

New version breaks site deploys. Will investigate and fix.
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0fad51edf9..278e0fb961 100644
--- a/Gemfile
+++ b/Gemfile
@@ -205,7 +205,7 @@ gem 'htmlentities', require: false
 #  we are open to it. by deferring require to the initializer we can configure discourse installs without it
 
 gem 'flamegraph', require: false
-gem 'rack-mini-profiler', require: ['enable_rails_patches'], group: [:development, :production]
+gem 'rack-mini-profiler', require: false
 
 gem 'unicorn', require: false, platform: :mri
 gem 'puma', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 6bd045d8c6..ea4840a1ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -268,7 +268,7 @@ GEM
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.0.8)
-    rack-mini-profiler (2.0.0)
+    rack-mini-profiler (1.1.6)
       rack (>= 1.2.0)
     rack-protection (2.0.8.1)
       rack

From b9aaa9718df45fc41aafccc3f7dc47ac7e3126a3 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 11 Mar 2020 17:05:44 -0300
Subject: [PATCH 087/633] FIX: When must_approve_users is enabled, we don't
 want to send suspect users to the review queue. Only non-approved users
 should be sent. Provide a migration to auto-approve every problematic review
 item (#9179)

---
 app/jobs/scheduled/enqueue_suspect_users.rb   |  2 ++
 ...ar_approved_users_from_the_review_queue.rb | 34 +++++++++++++++++++
 spec/jobs/enqueue_suspect_users_spec.rb       | 17 ++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 db/migrate/20200311135425_clear_approved_users_from_the_review_queue.rb

diff --git a/app/jobs/scheduled/enqueue_suspect_users.rb b/app/jobs/scheduled/enqueue_suspect_users.rb
index 9fc5196d82..1b94dcb309 100644
--- a/app/jobs/scheduled/enqueue_suspect_users.rb
+++ b/app/jobs/scheduled/enqueue_suspect_users.rb
@@ -6,10 +6,12 @@ module Jobs
 
     def execute(_args)
       return unless SiteSetting.approve_suspect_users
+      return if SiteSetting.must_approve_users
 
       users = User
         .activated
         .human_users
+        .where(approved: false)
         .joins(:user_profile, :user_stat)
         .where("users.created_at <= ?", 1.day.ago)
         .where("LENGTH(COALESCE(user_profiles.bio_raw, user_profiles.website, '')) > 0")
diff --git a/db/migrate/20200311135425_clear_approved_users_from_the_review_queue.rb b/db/migrate/20200311135425_clear_approved_users_from_the_review_queue.rb
new file mode 100644
index 0000000000..07cb662d74
--- /dev/null
+++ b/db/migrate/20200311135425_clear_approved_users_from_the_review_queue.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+class ClearApprovedUsersFromTheReviewQueue < ActiveRecord::Migration[6.0]
+  def up
+    reviewables = DB.query_single <<~SQL
+      UPDATE reviewables r
+      SET status = #{Reviewable.statuses[:approved]}
+      FROM users u
+      WHERE u.approved = true AND r.type = 'ReviewableUser' AND r.status = #{Reviewable.statuses[:pending]}
+      RETURNING r.id
+    SQL
+
+    system_user_id = Discourse::SYSTEM_USER_ID
+    scores = reviewables.map do |id|
+      "(#{id}, 1, #{Reviewable.statuses[:approved]}, #{system_user_id}, NOW(), NOW())"
+    end
+
+    if scores.present?
+      DB.exec <<~SQL
+        INSERT INTO reviewable_histories (
+          reviewable_id,
+          reviewable_history_type,
+          status,
+          created_by_id,
+          created_at,
+          updated_at
+        )
+        VALUES #{scores.join(',') << ';'}
+      SQL
+    end
+  end
+
+  def down
+  end
+end
diff --git a/spec/jobs/enqueue_suspect_users_spec.rb b/spec/jobs/enqueue_suspect_users_spec.rb
index 30514abed1..b614899823 100644
--- a/spec/jobs/enqueue_suspect_users_spec.rb
+++ b/spec/jobs/enqueue_suspect_users_spec.rb
@@ -39,5 +39,22 @@ describe Jobs::EnqueueSuspectUsers do
 
       expect(score.reason).to eq('suspect_user')
     end
+
+    it 'only enqueues non-approved users' do
+      suspect_user.update!(approved: true)
+
+      subject.execute({})
+
+      expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
+    end
+
+    it 'does nothing if must_approve_users is set to true' do
+      SiteSetting.must_approve_users = true
+      suspect_user.update!(approved: false)
+
+      subject.execute({})
+
+      expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
+    end
   end
 end

From 793f39139acee67e15bdcce0bc39acef5b351b54 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 12 Mar 2020 10:16:00 +1000
Subject: [PATCH 088/633] FEATURE: Send notifications for time-based and At
 Desktop bookmark reminders (#9071)

* This PR implements the scheduling and notification system for bookmark reminders. Every 5 minutes a schedule runs to check any reminders that need to be sent before now, limited to **300** reminders at a time. Any leftover reminders will be sent in the next run. This is to avoid having to deal with fickle sidekiq and reminders in the far-flung future, which would necessitate having a background job anyway to clean up any missing `enqueue_at` reminders.

* If a reminder is sent its `reminder_at` time is cleared and the `reminder_last_sent_at` time is filled in. Notifications are only user-level notifications for now.

* All JavaScript and frontend code related to displaying the bookmark reminder notification is contained here. The reminder functionality is now re-enabled in the bookmark modal as well.

* This PR also implements the "Remind me next time I am at my desktop" bookmark reminder functionality. When the user is on a mobile device they are able to select this option. When they choose this option we set a key in Redis saying they have a pending at desktop reminder. The next time they change devices we check if the new device is desktop, and if it is we send reminders using a DistributedMutex. There is also a job to ensure consistency of these reminders in Redis (in case Redis drops the ball) and the at desktop reminders expire after 20 days.

* Also in this PR is a fix to delete all Bookmarks for a user via `UserDestroyer`
---
 .../discourse-common/lib/icon-library.js.es6  |   1 +
 .../discourse/components/tap-tile.js.es6      |   2 +-
 .../discourse/controllers/bookmark.js.es6     |   4 +-
 .../discourse/lib/transform-post.js.es6       |   1 +
 .../javascripts/discourse/models/post.js.es6  |  10 +-
 .../discourse/templates/modal/bookmark.hbs    |   2 +-
 ...bookmark-reminder-notification-item.js.es6 |  19 ++
 .../discourse/widgets/post-menu.js.es6        |   5 +-
 app/controllers/bookmarks_controller.rb       |  27 +--
 app/controllers/topics_controller.rb          |  10 +-
 .../bookmark_reminder_notifications.rb        | 110 +++++++++
 app/models/bookmark.rb                        |  56 ++++-
 app/models/notification.rb                    |   3 +-
 app/serializers/post_serializer.rb            |  10 +
 app/services/user_destroyer.rb                |   1 +
 config/locales/client.en.yml                  |   2 +
 config/locales/server.en.yml                  |   2 +
 ..._add_reminder_last_sent_at_to_bookmarks.rb |   7 +
 ...060737_add_reminder_set_at_to_bookmarks.rb |   8 +
 lib/auth/default_current_user_provider.rb     |   4 +
 lib/bookmark_manager.rb                       |  73 ++++++
 lib/bookmark_reminder_notification_handler.rb |  74 ++++++
 .../default_current_user_provider_spec.rb     |   8 +
 spec/fabricators/bookmark_fabricator.rb       |  14 +-
 .../bookmark_reminder_notifications_spec.rb   | 139 +++++++++++
 spec/lib/bookmark_manager_spec.rb             | 215 ++++++++++++++++++
 ...mark_reminder_notification_handler_spec.rb |  75 ++++++
 spec/models/user_spec.rb                      |  10 -
 spec/requests/bookmarks_controller_spec.rb    |   6 +-
 spec/requests/topics_controller_spec.rb       |   2 +-
 spec/services/user_destroyer_spec.rb          |  20 ++
 31 files changed, 860 insertions(+), 60 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6
 create mode 100644 app/jobs/scheduled/bookmark_reminder_notifications.rb
 create mode 100644 db/migrate/20200227073837_add_reminder_last_sent_at_to_bookmarks.rb
 create mode 100644 db/migrate/20200306060737_add_reminder_set_at_to_bookmarks.rb
 create mode 100644 lib/bookmark_manager.rb
 create mode 100644 lib/bookmark_reminder_notification_handler.rb
 create mode 100644 spec/jobs/bookmark_reminder_notifications_spec.rb
 create mode 100644 spec/lib/bookmark_manager_spec.rb
 create mode 100644 spec/lib/bookmark_reminder_notification_handler_spec.rb

diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
index b1f1d48829..dab500bbdf 100644
--- a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
@@ -21,6 +21,7 @@ const REPLACEMENTS = {
   "notification.replied": "reply",
   "notification.posted": "reply",
   "notification.edited": "pencil-alt",
+  "notification.bookmark_reminder": "discourse-bookmark-clock",
   "notification.liked": "heart",
   "notification.liked_2": "heart",
   "notification.liked_many": "heart",
diff --git a/app/assets/javascripts/discourse/components/tap-tile.js.es6 b/app/assets/javascripts/discourse/components/tap-tile.js.es6
index a7dfbe267c..3a5203573d 100644
--- a/app/assets/javascripts/discourse/components/tap-tile.js.es6
+++ b/app/assets/javascripts/discourse/components/tap-tile.js.es6
@@ -5,7 +5,7 @@ export default Component.extend({
   classNames: ["tap-tile"],
   classNameBindings: ["active"],
   click() {
-    this.onSelect(this.tileId);
+    this.onChange(this.tileId);
   },
 
   active: propertyEqual("activeTile", "tileId")
diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js.es6 b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
index 3be0e107af..27e3e8418b 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
@@ -48,7 +48,7 @@ export default Controller.extend(ModalFunctionality, {
   },
 
   usingMobileDevice: reads("site.mobileView"),
-  showBookmarkReminderControls: false,
+  showBookmarkReminderControls: true,
 
   @discourseComputed()
   reminderTypes: () => {
@@ -122,7 +122,7 @@ export default Controller.extend(ModalFunctionality, {
 
     return ajax("/bookmarks", { type: "POST", data }).then(() => {
       if (this.afterSave) {
-        this.afterSave(reminderAtISO);
+        this.afterSave(reminderAtISO, this.selectedReminderType);
       }
     });
   },
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6
index f6d19c6b46..09cb6d967c 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js.es6
+++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6
@@ -37,6 +37,7 @@ export function transformBasicPost(post) {
     bookmarked: post.bookmarked,
     bookmarkedWithReminder: post.bookmarked_with_reminder,
     bookmarkReminderAt: post.bookmark_reminder_at,
+    bookmarkReminderType: post.bookmark_reminder_type,
     yours: post.yours,
     shareUrl: post.get("shareUrl"),
     staff: post.staff,
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 4ba35b31ac..2629afcb33 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -351,16 +351,20 @@ const Post = RestModel.extend({
           this.toggleProperty("bookmarked_with_reminder");
           this.appEvents.trigger("post-stream:refresh", { id: this.id });
         },
-        afterSave: reminderAtISO => {
+        afterSave: (reminderAtISO, reminderType) => {
           this.setProperties({
             "topic.bookmarked": true,
-            bookmark_reminder_at: reminderAtISO
+            bookmark_reminder_at: reminderAtISO,
+            bookmark_reminder_type: reminderType
           });
           this.appEvents.trigger("post-stream:refresh", { id: this.id });
         }
       });
     } else {
-      this.set("bookmark_reminder_at", null);
+      this.setProperties({
+        bookmark_reminder_at: null,
+        bookmark_reminder_type: null
+      });
       return Post.destroyBookmark(this.id)
         .then(result => {
           this.set("topic.bookmarked", result.topic_bookmarked);
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 0098c5b237..e32f2467eb 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -25,7 +25,7 @@
       {{#if userHasTimezoneSet}}
         {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
           {{#if usingMobileDevice}}
-            <!-- {{tap-tile icon="desktop" text=(i18n "bookmarks.reminders.at_desktop") tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}} -->
+            {{tap-tile icon="desktop" text=(i18n "bookmarks.reminders.at_desktop") tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{/if}}
 
           {{#if showLaterToday}}
diff --git a/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6
new file mode 100644
index 0000000000..f02bc7a223
--- /dev/null
+++ b/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6
@@ -0,0 +1,19 @@
+import { createWidgetFrom } from "discourse/widgets/widget";
+import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
+import { formatUsername } from "discourse/lib/utilities";
+
+createWidgetFrom(
+  DefaultNotificationItem,
+  "bookmark-reminder-notification-item",
+  {
+    text(notificationName, data) {
+      const username = formatUsername(data.display_username);
+      const description = this.description(data);
+
+      return I18n.t("notifications.bookmark_reminder", {
+        description,
+        username
+      });
+    }
+  }
+);
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index b5562aa2f1..6ae6460fac 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -332,7 +332,10 @@ registerButton("bookmarkWithReminder", (attrs, state, siteSettings) => {
     title,
     titleOptions,
     className: classNames.join(" "),
-    icon: attrs.bookmarkReminderAt ? "discourse-bookmark-clock" : "bookmark"
+    icon:
+      attrs.bookmarkReminderAt || attrs.bookmarkReminderType === "at_desktop"
+        ? "discourse-bookmark-clock"
+        : "bookmark"
   };
 });
 
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index 4cab4edf04..c47dfdc025 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -6,33 +6,24 @@ class BookmarksController < ApplicationController
   def create
     params.require(:post_id)
 
-    existing_bookmark = Bookmark.find_by(post_id: params[:post_id], user_id: current_user.id)
-    if existing_bookmark.present?
-      return render json: failed_json.merge(errors: [I18n.t("bookmarks.errors.already_bookmarked_post")]), status: 422
-    end
-
-    bookmark = Bookmark.create(
-      user_id: current_user.id,
-      topic_id: Post.select(:topic_id).find(params[:post_id]).topic_id,
+    bookmark_manager = BookmarkManager.new(current_user)
+    bookmark = bookmark_manager.create(
       post_id: params[:post_id],
       name: params[:name],
-      reminder_type: Bookmark.reminder_types[params[:reminder_type].to_sym],
+      reminder_type: params[:reminder_type],
       reminder_at: params[:reminder_at]
     )
 
-    return render json: success_json if bookmark.save
-    render json: failed_json.merge(errors: bookmark.errors.full_messages), status: 400
+    if bookmark_manager.errors.empty?
+      return render json: success_json
+    end
+
+    render json: failed_json.merge(errors: bookmark_manager.errors.full_messages), status: 400
   end
 
   def destroy
     params.require(:id)
-
-    bookmark = Bookmark.find_by(id: params[:id])
-    raise Discourse::NotFound if bookmark.blank?
-
-    raise Discourse::InvalidAccess.new if !guardian.can_delete?(bookmark)
-
-    bookmark.destroy
+    BookmarkManager.new(current_user).destroy(params[:id])
     render json: success_json
   end
 end
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index d26538b805..61b6d4bd68 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -487,7 +487,7 @@ class TopicsController < ApplicationController
     topic = Topic.find(params[:topic_id].to_i)
 
     if SiteSetting.enable_bookmarks_with_reminders?
-      Bookmark.where(user_id: current_user.id, topic_id: topic.id).destroy_all
+      BookmarkManager.new(current_user).destroy_for_topic(topic)
     else
       PostAction.joins(:post)
         .where(user_id: current_user.id)
@@ -548,10 +548,12 @@ class TopicsController < ApplicationController
     first_post = topic.ordered_posts.first
 
     if SiteSetting.enable_bookmarks_with_reminders?
-      if Bookmark.exists?(user: current_user, post: first_post)
-        return render_json_error(I18n.t("bookmark.topic_already_bookmarked"), status: 403)
+      bookmark_manager = BookmarkManager.new(current_user)
+      bookmark_manager.create(post_id: first_post.id)
+
+      if bookmark_manager.errors
+        return render_json_error(bookmark_manager, status: 400)
       end
-      Bookmark.create(user: current_user, post: first_post, topic: topic)
     else
       result = PostActionCreator.create(current_user, first_post, :bookmark)
       return render_json_error(result) if result.failed?
diff --git a/app/jobs/scheduled/bookmark_reminder_notifications.rb b/app/jobs/scheduled/bookmark_reminder_notifications.rb
new file mode 100644
index 0000000000..20ce9cb8a8
--- /dev/null
+++ b/app/jobs/scheduled/bookmark_reminder_notifications.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Jobs
+
+  # Runs periodically to send out bookmark reminders, capped at 300 at a time.
+  # Any leftovers will be caught in the next run, because the reminder_at column
+  # is set to NULL once a reminder has been sent.
+  class BookmarkReminderNotifications < ::Jobs::Scheduled
+    JOB_RUN_NUMBER_KEY ||= 'jobs_bookmark_reminder_notifications_job_run_num'.freeze
+    AT_DESKTOP_CONSISTENCY_RUN_NUMBER ||= 6
+
+    every 5.minutes
+
+    def self.max_reminder_notifications_per_run
+      @@max_reminder_notifications_per_run ||= 3
+      @@max_reminder_notifications_per_run
+    end
+
+    def self.max_reminder_notifications_per_run=(max)
+      @@max_reminder_notifications_per_run = max
+    end
+
+    def execute(args = nil)
+      return if !SiteSetting.enable_bookmarks_with_reminders?
+
+      bookmarks = Bookmark.pending_reminders
+        .where.not(reminder_type: Bookmark.reminder_types[:at_desktop])
+        .includes(:user).order('reminder_at ASC')
+
+      bookmarks.limit(BookmarkReminderNotifications.max_reminder_notifications_per_run).each do |bookmark|
+        BookmarkReminderNotificationHandler.send_notification(bookmark)
+      end
+
+      # we only want to ensure the desktop consistency every X runs of this job
+      # (every 30 mins in this case) so we don't bother redis too much, and the
+      # at desktop consistency problem should not really happen unless people
+      # are setting the "at desktop" reminder, going out for milk, and never coming
+      # back
+      current_job_run_number = Discourse.redis.get(JOB_RUN_NUMBER_KEY).to_i
+      if current_job_run_number == AT_DESKTOP_CONSISTENCY_RUN_NUMBER
+        ensure_at_desktop_consistency
+      end
+
+      increment_job_run_number(current_job_run_number)
+    end
+
+    def increment_job_run_number(current_job_run_number)
+      if current_job_run_number.zero? || current_job_run_number == AT_DESKTOP_CONSISTENCY_RUN_NUMBER
+        new_job_run_number = 1
+      else
+        new_job_run_number = current_job_run_number + 1
+      end
+      Discourse.redis.set(JOB_RUN_NUMBER_KEY, new_job_run_number)
+    end
+
+    def ensure_at_desktop_consistency
+      pending_at_desktop_bookmark_reminders = \
+        Bookmark.includes(:user)
+          .references(:user)
+          .pending_at_desktop_reminders
+          .where('users.last_seen_at >= :one_day_ago', one_day_ago: 1.day.ago.utc)
+
+      return if pending_at_desktop_bookmark_reminders.count.zero?
+
+      unique_users = pending_at_desktop_bookmark_reminders.map(&:user).uniq.map { |u| [u.id, u] }.flatten
+      unique_users = Hash[*unique_users]
+      pending_reminders_for_redis_check = unique_users.keys.map do |user_id|
+        "#{BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_KEY_PREFIX}#{user_id}"
+      end
+
+      Discourse.redis.mget(pending_reminders_for_redis_check).each.with_index do |value, idx|
+        next if value.present?
+        user_id = pending_reminders_for_redis_check[idx][/\d+/].to_i
+        user = unique_users[user_id]
+
+        user_pending_bookmark_reminders = pending_at_desktop_bookmark_reminders.select do |bookmark|
+          bookmark.user == user
+        end
+
+        user_expired_bookmark_reminders = user_pending_bookmark_reminders.select do |bookmark|
+          bookmark.reminder_set_at <= expiry_limit_datetime
+        end
+
+        next if user_pending_bookmark_reminders.length == user_expired_bookmark_reminders.length
+
+        # only tell the cache-gods that this user has pending "at desktop" reminders
+        # if they haven't let them all expire before coming back to their desktop
+        #
+        # the next time they visit the desktop the reminders will be cleared out once
+        # the notifications are sent
+        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
+      end
+
+      clear_expired_at_desktop_reminders
+    end
+
+    def clear_expired_at_desktop_reminders
+      Bookmark
+        .pending_at_desktop_reminders
+        .where('reminder_set_at <= :expiry_limit_datetime', expiry_limit_datetime: expiry_limit_datetime)
+        .update_all(
+          reminder_set_at: nil, reminder_type: nil
+        )
+    end
+
+    def expiry_limit_datetime
+      BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_EXPIRY_DAYS.days.ago.utc
+    end
+  end
+end
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 6958064324..d25a30b865 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -10,6 +10,41 @@ class Bookmark < ActiveRecord::Base
     if: -> { reminder_type.present? && reminder_type != Bookmark.reminder_types[:at_desktop] }
   }
 
+  validate :unique_per_post_for_user
+  validate :ensure_sane_reminder_at_time
+
+  def unique_per_post_for_user
+    existing_bookmark = Bookmark.find_by(user_id: user_id, post_id: post_id)
+    return if existing_bookmark.blank? || existing_bookmark.id == id
+    self.errors.add(:base, I18n.t("bookmarks.errors.already_bookmarked_post"))
+  end
+
+  def ensure_sane_reminder_at_time
+    return if reminder_at.blank?
+    if reminder_at < Time.zone.now
+      self.errors.add(:base, I18n.t("bookmarks.errors.cannot_set_past_reminder"))
+    end
+    if reminder_at > 10.years.from_now.utc
+      self.errors.add(:base, I18n.t("bookmarks.errors.cannot_set_reminder_in_distant_future"))
+    end
+  end
+
+  scope :pending_reminders, ->(before_time = Time.now.utc) do
+    where("reminder_at IS NOT NULL AND reminder_at <= :before_time", before_time: before_time)
+  end
+
+  scope :pending_at_desktop_reminders, ->(before_time = Time.now.utc) do
+    where("reminder_at IS NULL AND reminder_type = :at_desktop", at_desktop: reminder_types[:at_desktop])
+  end
+
+  scope :pending_reminders_for_user, ->(user) do
+    pending_reminders.where(user: user)
+  end
+
+  scope :at_desktop_reminders_for_user, ->(user) do
+    where("reminder_type = :at_desktop AND user_id = :user_id", at_desktop: reminder_types[:at_desktop], user_id: user.id)
+  end
+
   def self.reminder_types
     @reminder_type = Enum.new(
       at_desktop: 0,
@@ -27,20 +62,23 @@ end
 #
 # Table name: bookmarks
 #
-#  id            :bigint           not null, primary key
-#  user_id       :bigint           not null
-#  topic_id      :bigint           not null
-#  post_id       :bigint           not null
-#  name          :string
-#  reminder_type :integer
-#  reminder_at   :datetime
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
+#  id                    :bigint           not null, primary key
+#  user_id               :bigint           not null
+#  topic_id              :bigint           not null
+#  post_id               :bigint           not null
+#  name                  :string
+#  reminder_type         :integer
+#  reminder_at           :datetime
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  reminder_last_sent_at :datetime
+#  reminder_set_at       :datetime
 #
 # Indexes
 #
 #  index_bookmarks_on_post_id              (post_id)
 #  index_bookmarks_on_reminder_at          (reminder_at)
+#  index_bookmarks_on_reminder_set_at      (reminder_set_at)
 #  index_bookmarks_on_reminder_type        (reminder_type)
 #  index_bookmarks_on_topic_id             (topic_id)
 #  index_bookmarks_on_user_id              (user_id)
diff --git a/app/models/notification.rb b/app/models/notification.rb
index b9443d89fb..a44086f652 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -103,7 +103,8 @@ class Notification < ActiveRecord::Base
                         post_approved: 20,
                         code_review_commit_approved: 21,
                         membership_request_accepted: 22,
-                        membership_request_consolidated: 23
+                        membership_request_consolidated: 23,
+                        bookmark_reminder: 24
                        )
   end
 
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index ade1417dc6..b78c90f4fb 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -51,6 +51,7 @@ class PostSerializer < BasicPostSerializer
              :bookmarked,
              :bookmarked_with_reminder,
              :bookmark_reminder_at,
+             :bookmark_reminder_type,
              :raw,
              :actions_summary,
              :moderator?,
@@ -329,6 +330,10 @@ class PostSerializer < BasicPostSerializer
     include_bookmarked_with_reminder?
   end
 
+  def include_bookmark_reminder_type?
+    include_bookmarked_with_reminder?
+  end
+
   def post_bookmark
     return nil if !SiteSetting.enable_bookmarks_with_reminders? || @topic_view.blank?
     @post_bookmark ||= @topic_view.user_post_bookmarks.find { |bookmark| bookmark.post_id == object.id }
@@ -338,6 +343,11 @@ class PostSerializer < BasicPostSerializer
     post_bookmark&.reminder_at
   end
 
+  def bookmark_reminder_type
+    return if post_bookmark.blank?
+    Bookmark.reminder_types[post_bookmark.reminder_type].to_s
+  end
+
   def include_display_username?
     SiteSetting.enable_names?
   end
diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rb
index 7844496362..e0f7543ac6 100644
--- a/app/services/user_destroyer.rb
+++ b/app/services/user_destroyer.rb
@@ -28,6 +28,7 @@ class UserDestroyer
     optional_transaction(open_transaction: opts[:transaction]) do
 
       UserSecurityKey.where(user_id: user.id).delete_all
+      Bookmark.where(user_id: user.id).delete_all
       Draft.where(user_id: user.id).delete_all
       Reviewable.where(created_by_id: user.id).delete_all
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ea18a5b17a..c699eef32f 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1807,6 +1807,7 @@ en:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1860,6 +1861,7 @@ en:
         posted: "new post"
         moved_post: "post moved"
         linked: "linked"
+        bookmark_reminder: "bookmark reminder"
         granted_badge: "badge granted"
         invited_to_topic: "invited to topic"
         group_mentioned: "group mentioned"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 0b1011a46c..f260855087 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -385,6 +385,8 @@ en:
   bookmarks:
     errors:
       already_bookmarked_post: "You cannot bookmark the same post twice."
+      cannot_set_past_reminder: "You cannot set a bookmark reminder in the past."
+      cannot_set_reminder_in_distant_future: "You cannot set a bookmark reminder more than 10 years in the future."
       time_must_be_provided: "time must be provided for all reminders except '%{reminder_type}'"
 
     reminders:
diff --git a/db/migrate/20200227073837_add_reminder_last_sent_at_to_bookmarks.rb b/db/migrate/20200227073837_add_reminder_last_sent_at_to_bookmarks.rb
new file mode 100644
index 0000000000..3a1aa86bff
--- /dev/null
+++ b/db/migrate/20200227073837_add_reminder_last_sent_at_to_bookmarks.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddReminderLastSentAtToBookmarks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :bookmarks, :reminder_last_sent_at, :datetime, null: true
+  end
+end
diff --git a/db/migrate/20200306060737_add_reminder_set_at_to_bookmarks.rb b/db/migrate/20200306060737_add_reminder_set_at_to_bookmarks.rb
new file mode 100644
index 0000000000..93ddeff2f1
--- /dev/null
+++ b/db/migrate/20200306060737_add_reminder_set_at_to_bookmarks.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddReminderSetAtToBookmarks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :bookmarks, :reminder_set_at, :datetime, null: true
+    add_index :bookmarks, :reminder_set_at
+  end
+end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 5fe22b4adc..caee9ac1cf 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -124,6 +124,10 @@ class Auth::DefaultCurrentUserProvider
         u.update_last_seen!
         u.update_ip_address!(ip)
       end
+
+      BookmarkReminderNotificationHandler.defer_at_desktop_reminder(
+        user: u, request_user_agent: @request.user_agent
+      )
     end
 
     @env[CURRENT_USER_KEY] = current_user
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
new file mode 100644
index 0000000000..0dcfa2b79f
--- /dev/null
+++ b/lib/bookmark_manager.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+class BookmarkManager
+  include HasErrors
+
+  def initialize(user)
+    @user = user
+  end
+
+  def create(post_id:, name: nil, reminder_type: nil, reminder_at: nil)
+    reminder_type = Bookmark.reminder_types[reminder_type.to_sym] if reminder_type.present?
+
+    bookmark = Bookmark.create(
+      user_id: @user.id,
+      topic_id: topic_id_for_post(post_id),
+      post_id: post_id,
+      name: name,
+      reminder_type: reminder_type,
+      reminder_at: reminder_at,
+      reminder_set_at: Time.zone.now
+    )
+
+    if bookmark.errors.any?
+      return add_errors_from(bookmark)
+    end
+
+    BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(@user)
+    bookmark
+  end
+
+  def destroy(bookmark_id)
+    bookmark = Bookmark.find_by(id: bookmark_id)
+
+    raise Discourse::NotFound if bookmark.blank?
+    raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_delete?(bookmark)
+
+    bookmark.destroy
+    clear_at_desktop_cache_if_required
+  end
+
+  def destroy_for_topic(topic)
+    topic_bookmarks = Bookmark.where(user_id: @user.id, topic_id: topic.id)
+
+    Bookmark.transaction do
+      topic_bookmarks.each do |bookmark|
+        raise Discourse::InvalidAccess.new if !Guardian.new(user).can_delete?(bookmark)
+        bookmark.destroy
+      end
+    end
+
+    clear_at_desktop_cache_if_required
+  end
+
+  def self.send_reminder_notification(id)
+    bookmark = Bookmark.find_by(id: id)
+    BookmarkReminderNotificationHandler.send_notification(bookmark)
+  end
+
+  private
+
+  def topic_id_for_post(post_id)
+    Post.where(id: post_id).pluck_first(:topic_id)
+  end
+
+  def clear_at_desktop_cache_if_required
+    return if user_has_any_pending_at_desktop_reminders?
+    Discourse.redis.del(BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_KEY_PREFIX + @user.id.to_s)
+  end
+
+  def user_has_any_pending_at_desktop_reminders?
+    Bookmark.at_desktop_reminders_for_user(@user).any?
+  end
+end
diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
new file mode 100644
index 0000000000..166c46274e
--- /dev/null
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+class BookmarkReminderNotificationHandler
+  PENDING_AT_DESKTOP_KEY_PREFIX ||= 'pending_at_desktop_bookmark_reminder_user_'.freeze
+  PENDING_AT_DESKTOP_EXPIRY_DAYS ||= 20
+
+  def self.send_notification(bookmark)
+    return if bookmark.blank?
+    Bookmark.transaction do
+      if bookmark.post.blank?
+        return clear_reminder(bookmark)
+      end
+
+      create_notification(bookmark)
+      clear_reminder(bookmark)
+    end
+  end
+
+  def self.clear_reminder(bookmark)
+    Rails.logger.debug(
+      "Clearing bookmark reminder for bookmark_id #{bookmark.id}. reminder info: #{bookmark.reminder_at} | #{Bookmark.reminder_types[bookmark.reminder_type]}"
+    )
+
+    bookmark.update(
+      reminder_at: nil,
+      reminder_type: nil,
+      reminder_last_sent_at: Time.zone.now,
+      reminder_set_at: nil
+    )
+  end
+
+  def self.create_notification(bookmark)
+    user = bookmark.user
+    user.notifications.create!(
+      notification_type: Notification.types[:bookmark_reminder],
+      topic_id: bookmark.topic_id,
+      post_number: bookmark.post.post_number,
+      data: {
+        topic_title: bookmark.topic.title,
+        display_username: user.username,
+        bookmark_name: bookmark.name
+      }.to_json
+    )
+  end
+
+  def self.user_has_pending_at_desktop_reminders?(user)
+    Discourse.redis.exists("#{PENDING_AT_DESKTOP_KEY_PREFIX}#{user.id}")
+  end
+
+  def self.cache_pending_at_desktop_reminder(user)
+    Discourse.redis.setex("#{PENDING_AT_DESKTOP_KEY_PREFIX}#{user.id}", PENDING_AT_DESKTOP_EXPIRY_DAYS.days, true)
+  end
+
+  def self.send_at_desktop_reminder(user:, request_user_agent:)
+    return if !SiteSetting.enable_bookmarks_with_reminders
+
+    return if MobileDetection.mobile_device?(BrowserDetection.device(request_user_agent).to_s)
+
+    return if !user_has_pending_at_desktop_reminders?(user)
+
+    DistributedMutex.synchronize("sending_at_desktop_bookmark_reminders_user_#{user.id}") do
+      Bookmark.at_desktop_reminders_for_user(user).each do |bookmark|
+        BookmarkReminderNotificationHandler.send_notification(bookmark)
+      end
+      Discourse.redis.del("#{PENDING_AT_DESKTOP_KEY_PREFIX}#{user.id}")
+    end
+  end
+
+  def self.defer_at_desktop_reminder(user:, request_user_agent:)
+    Scheduler::Defer.later "Sending Desktop Bookmark Reminders" do
+      send_at_desktop_reminder(user: user, request_user_agent: request_user_agent)
+    end
+  end
+end
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 2e0650cf30..2fd165c848 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -443,6 +443,14 @@ describe Auth::DefaultCurrentUserProvider do
         expect(u.last_seen_at).to eq(nil)
       end
     end
+
+    it "defers any at_desktop bookmark reminders" do
+      BookmarkReminderNotificationHandler.expects(:defer_at_desktop_reminder).with(
+        user: user, request_user_agent: 'test'
+      )
+      provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}", "HTTP_USER_AGENT" => 'test')
+      provider2.current_user
+    end
   end
 
   it "should update last seen for non ajax" do
diff --git a/spec/fabricators/bookmark_fabricator.rb b/spec/fabricators/bookmark_fabricator.rb
index a92f272e52..ede44dfeca 100644
--- a/spec/fabricators/bookmark_fabricator.rb
+++ b/spec/fabricators/bookmark_fabricator.rb
@@ -6,19 +6,21 @@ Fabricator(:bookmark) do
   topic { |attrs| attrs[:post].topic }
   name "This looked interesting"
   reminder_type { Bookmark.reminder_types[:tomorrow] }
-  reminder_at { (Time.now.utc + 1.day).iso8601 }
+  reminder_at { 1.day.from_now.iso8601 }
+  reminder_set_at { Time.zone.now }
 end
 
 Fabricator(:bookmark_next_business_day_reminder, from: :bookmark) do
   reminder_type { Bookmark.reminder_types[:next_business_day] }
   reminder_at do
-    date = if Time.now.utc.friday?
-      Time.now.utc + 3.days
-    elsif Time.now.utc.saturday?
-      Time.now.utc + 2.days
+    date = if Time.zone.now.friday?
+      Time.zone.now + 3.days
+    elsif Time.zone.now.saturday?
+      Time.zone.now + 2.days
     else
-      Time.now.utc + 1.day
+      Time.zone.now + 1.day
     end
     date.iso8601
   end
+  reminder_set_at { Time.zone.now }
 end
diff --git a/spec/jobs/bookmark_reminder_notifications_spec.rb b/spec/jobs/bookmark_reminder_notifications_spec.rb
new file mode 100644
index 0000000000..92ae100020
--- /dev/null
+++ b/spec/jobs/bookmark_reminder_notifications_spec.rb
@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Jobs::BookmarkReminderNotifications do
+  subject { described_class.new }
+
+  let(:five_minutes_ago) { Time.zone.now - 5.minutes }
+  let(:bookmark1) { Fabricate(:bookmark) }
+  let(:bookmark2) { Fabricate(:bookmark) }
+  let(:bookmark3) { Fabricate(:bookmark) }
+  let!(:bookmarks) do
+    [
+      bookmark1,
+      bookmark2,
+      bookmark3
+    ]
+  end
+
+  before do
+    SiteSetting.enable_bookmarks_with_reminders = true
+    # this is done to avoid model validations on Bookmark
+    bookmark1.update_column(:reminder_at, five_minutes_ago - 10.minutes)
+    bookmark2.update_column(:reminder_at, five_minutes_ago - 5.minutes)
+    bookmark3.update_column(:reminder_at, five_minutes_ago)
+    Discourse.redis.flushall
+  end
+
+  it "sends every reminder and marks the reminder_at to nil for all bookmarks, as well as last sent date" do
+    subject.execute
+    bookmark1.reload
+    bookmark2.reload
+    bookmark3.reload
+    expect(bookmark1.reminder_at).to eq(nil)
+    expect(bookmark1.reminder_last_sent_at).not_to eq(nil)
+    expect(bookmark2.reminder_at).to eq(nil)
+    expect(bookmark2.reminder_last_sent_at).not_to eq(nil)
+    expect(bookmark3.reminder_at).to eq(nil)
+    expect(bookmark3.reminder_last_sent_at).not_to eq(nil)
+  end
+
+  it "will not send a reminder for a bookmark in the future" do
+    bookmark4 = Fabricate(:bookmark, reminder_at: Time.zone.now + 1.day)
+    BookmarkReminderNotificationHandler.expects(:send_notification).with(bookmark1)
+    BookmarkReminderNotificationHandler.expects(:send_notification).with(bookmark2)
+    BookmarkReminderNotificationHandler.expects(:send_notification).with(bookmark3)
+    BookmarkReminderNotificationHandler.expects(:send_notification).with(bookmark4).never
+    subject.execute
+    expect(bookmark4.reload.reminder_at).not_to eq(nil)
+  end
+
+  it "increments the job run number correctly and resets to 1 when it reaches 6" do
+    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq(nil)
+    subject.execute
+    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('1')
+    subject.execute
+    subject.execute
+    subject.execute
+    subject.execute
+    subject.execute
+    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('6')
+    subject.execute
+    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('1')
+  end
+
+  context "when the bookmark with reminder site setting is disabled" do
+    it "does nothing" do
+      Bookmark.expects(:where).never
+      SiteSetting.enable_bookmarks_with_reminders = false
+      subject.execute
+    end
+  end
+
+  context "when one of the bookmark reminder types is at_desktop" do
+    let(:bookmark1) { Fabricate(:bookmark, reminder_type: :at_desktop) }
+    it "is not included in the run, because it is not time-based" do
+      BookmarkManager.any_instance.expects(:send_reminder_notification).with(bookmark1.id).never
+      subject.execute
+    end
+  end
+
+  context "when the number of notifications exceed max_reminder_notifications_per_run" do
+    it "does not send them in the current run, but will send them in the next" do
+      begin
+        Jobs::BookmarkReminderNotifications.max_reminder_notifications_per_run = 2
+        subject.execute
+        expect(bookmark1.reload.reminder_at).to eq(nil)
+        expect(bookmark2.reload.reminder_at).to eq(nil)
+        expect(bookmark3.reload.reminder_at).not_to eq(nil)
+      end
+    end
+  end
+
+  context "when this is the 6th run (so every half hour) of this job we need to ensure consistency of at_desktop reminders" do
+    let(:set_at) { Time.zone.now }
+    let!(:bookmark) do
+      Fabricate(
+        :bookmark,
+        reminder_type: Bookmark.reminder_types[:at_desktop],
+        reminder_at: nil,
+        reminder_set_at: set_at
+      )
+    end
+    before do
+      Discourse.redis.set(Jobs::BookmarkReminderNotifications::JOB_RUN_NUMBER_KEY, 6)
+      bookmark.user.update(last_seen_at: Time.zone.now - 1.minute)
+    end
+    context "when an at_desktop reminder is not pending in redis for a user who should have one" do
+      it "puts the pending reminder into redis" do
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
+        subject.execute
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(true)
+      end
+
+      context "if the user has not been seen in the past 24 hours" do
+        before do
+          bookmark.user.update(last_seen_at: Time.zone.now - 25.hours)
+        end
+        it "does not put the pending reminder into redis" do
+          subject.execute
+          expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
+        end
+      end
+
+      context "if the at_desktop reminder is expired (set over PENDING_AT_DESKTOP_EXPIRY_DAYS days ago)" do
+        let(:set_at) { Time.zone.now - (BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_EXPIRY_DAYS + 1).days }
+        it "does not put the pending reminder into redis, and clears the reminder type/time" do
+          expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
+          subject.execute
+          expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
+          bookmark.reload
+          expect(bookmark.reminder_set_at).to eq(nil)
+          expect(bookmark.reminder_last_sent_at).to eq(nil)
+          expect(bookmark.reminder_type).to eq(nil)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
new file mode 100644
index 0000000000..92b7c2df21
--- /dev/null
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -0,0 +1,215 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe BookmarkManager do
+  let(:user) { Fabricate(:user) }
+
+  let(:reminder_type) { 'tomorrow' }
+  let(:reminder_at) { (Time.zone.now + 1.day).iso8601 }
+  fab!(:post) { Fabricate(:post) }
+  let(:name) { 'Check this out!' }
+
+  subject { described_class.new(user) }
+
+  describe ".create" do
+    it "creates the bookmark for the user" do
+      subject.create(post_id: post.id, name: name)
+      bookmark = Bookmark.find_by(user: user)
+
+      expect(bookmark.post_id).to eq(post.id)
+      expect(bookmark.topic_id).to eq(post.topic_id)
+    end
+
+    context "when a reminder time + type is provided" do
+      it "saves the values correctly" do
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+        bookmark = Bookmark.find_by(user: user)
+
+        expect(bookmark.reminder_at).to eq(reminder_at)
+        expect(bookmark.reminder_set_at).not_to eq(nil)
+        expect(bookmark.reminder_type).to eq(Bookmark.reminder_types[:tomorrow])
+      end
+    end
+
+    context "when the reminder type is at_desktop" do
+      let(:reminder_type) { 'at_desktop' }
+      let(:reminder_at) { nil }
+
+      def create_bookmark
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+      end
+
+      it "this is a special case which needs client-side logic and has no reminder_at datetime" do
+        create_bookmark
+        bookmark = Bookmark.find_by(user: user)
+
+        expect(bookmark.reminder_at).to eq(nil)
+        expect(bookmark.reminder_type).to eq(Bookmark.reminder_types[:at_desktop])
+      end
+
+      it "sets a redis key for the user so we know they have a pending at_desktop reminder" do
+        create_bookmark
+        expect(Discourse.redis.get("pending_at_desktop_bookmark_reminder_user_#{user.id}")).not_to eq(nil)
+      end
+    end
+
+    context "when the bookmark already exists for the user & post" do
+      before do
+        Bookmark.create(post: post, user: user, topic: post.topic)
+      end
+
+      it "adds an error to the manager" do
+        subject.create(post_id: post.id)
+        expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.already_bookmarked_post"))
+      end
+    end
+
+    context "when the reminder time is not provided when it needs to be" do
+      let(:reminder_at) { nil }
+      it "adds an error to the manager" do
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+        expect(subject.errors.full_messages).to include(
+          "Reminder at " + I18n.t("bookmarks.errors.time_must_be_provided", reminder_type: I18n.t("bookmarks.reminders.at_desktop"))
+        )
+      end
+    end
+
+    context "when the reminder time is in the past" do
+      let(:reminder_at) { (Time.zone.now - 10.days).iso8601 }
+      it "adds an error to the manager" do
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+        expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.cannot_set_past_reminder"))
+      end
+    end
+
+    context "when the reminder time is far-flung (> 10 years from now)" do
+      let(:reminder_at) { (Time.zone.now + 11.years).iso8601 }
+      it "adds an error to the manager" do
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+        expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.cannot_set_reminder_in_distant_future"))
+      end
+    end
+  end
+
+  describe ".destroy" do
+    let!(:bookmark) { Fabricate(:bookmark, user: user, post: post) }
+    it "deletes the existing bookmark" do
+      subject.destroy(bookmark.id)
+      expect(Bookmark.exists?(id: bookmark.id)).to eq(false)
+    end
+
+    context "if the bookmark is belonging to some other user" do
+      let!(:bookmark) { Fabricate(:bookmark, user: Fabricate(:admin), post: post) }
+      it "raises an invalid access error" do
+        expect { subject.destroy(bookmark.id) }.to raise_error(Discourse::InvalidAccess)
+      end
+    end
+
+    context "if the bookmark no longer exists" do
+      it "raises an invalid access error" do
+        expect { subject.destroy(9999) }.to raise_error(Discourse::NotFound)
+      end
+    end
+
+    context "if the user has pending at desktop reminders for another bookmark" do
+      before do
+        Fabricate(:bookmark, user: user, post: Fabricate(:post), reminder_type: Bookmark.reminder_types[:at_desktop])
+        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
+      end
+      it "does not clear the at bookmark redis key" do
+        subject.destroy(bookmark.id)
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(true)
+      end
+    end
+
+    context "if the user has pending at desktop reminders for another bookmark" do
+      it "does clear the at bookmark redis key" do
+        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
+        subject.destroy(bookmark.id)
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(false)
+      end
+    end
+  end
+
+  describe ".destroy_for_topic" do
+    let!(:topic) { Fabricate(:topic) }
+    let(:bookmark1) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
+    let(:bookmark2) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
+
+    it "destroys all bookmarks for the topic for the specified user" do
+      subject.destroy_for_topic(topic)
+      expect(Bookmark.where(user: user, topic: topic).length).to eq(0)
+    end
+
+    it "does not destroy any other user's topic bookmarks" do
+      user2 = Fabricate(:user)
+      Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user2)
+      subject.destroy_for_topic(topic)
+      expect(Bookmark.where(user: user2, topic: topic).length).to eq(1)
+    end
+
+    context "if the user has pending at desktop reminders for another bookmark" do
+      before do
+        Fabricate(:bookmark, user: user, post: Fabricate(:post), reminder_type: Bookmark.reminder_types[:at_desktop])
+        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
+      end
+      it "does not clear the at bookmark redis key" do
+        subject.destroy_for_topic(topic)
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(true)
+      end
+    end
+
+    context "if the user has pending at desktop reminders for another bookmark" do
+      it "does clear the at bookmark redis key" do
+        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
+        subject.destroy_for_topic(topic)
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(false)
+      end
+    end
+
+  end
+
+  describe ".send_reminder_notification" do
+    let(:bookmark) { Fabricate(:bookmark, user: user) }
+    it "clears the reminder_at and sets the reminder_last_sent_at" do
+      expect(bookmark.reminder_last_sent_at).to eq(nil)
+      described_class.send_reminder_notification(bookmark.id)
+      bookmark.reload
+      expect(bookmark.reminder_at).to eq(nil)
+      expect(bookmark.reminder_last_sent_at).not_to eq(nil)
+    end
+
+    it "creates a notification for the reminder" do
+      described_class.send_reminder_notification(bookmark.id)
+      notif = notifications_for_user.last
+      expect(notif.post_number).to eq(bookmark.post.post_number)
+    end
+
+    context "when the bookmark does no longer exist" do
+      before do
+        bookmark.destroy
+      end
+      it "does not error, and does not create a notification" do
+        described_class.send_reminder_notification(bookmark.id)
+        expect(notifications_for_user.any?).to eq(false)
+      end
+    end
+
+    context "if the post has been deleted" do
+      before do
+        bookmark.post.trash!
+      end
+      it "does not error, and does not create a notification, and clears the reminder" do
+        described_class.send_reminder_notification(bookmark.id)
+        bookmark.reload
+        expect(bookmark.reminder_at).to eq(nil)
+        expect(notifications_for_user.any?).to eq(false)
+      end
+    end
+
+    def notifications_for_user
+      Notification.where(notification_type: Notification.types[:bookmark_reminder], user_id: bookmark.user.id)
+    end
+  end
+end
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
new file mode 100644
index 0000000000..e64c9b1c70
--- /dev/null
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe BookmarkReminderNotificationHandler do
+  subject { described_class }
+
+  fab!(:user) { Fabricate(:user) }
+
+  before do
+    SiteSetting.enable_bookmarks_with_reminders = true
+  end
+
+  context "when the user agent is for mobile" do
+    let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" }
+    it "does not attempt to send any reminders" do
+      DistributedMutex.expects(:synchronize).never
+      send_reminder
+    end
+  end
+
+  context "when the user agent is for desktop" do
+    let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
+    fab!(:reminder) do
+      Fabricate(
+        :bookmark,
+        user: user,
+        reminder_type: Bookmark.reminder_types[:at_desktop],
+        reminder_at: nil,
+        reminder_set_at: Time.zone.now
+      )
+    end
+
+    context "when there are pending bookmark at desktop reminders" do
+      before do
+        described_class.cache_pending_at_desktop_reminder(user)
+      end
+
+      it "deletes the key in redis" do
+        send_reminder
+        expect(described_class.user_has_pending_at_desktop_reminders?(user)).to eq(false)
+      end
+
+      it "sends a notification to the user and clears the reminder_at" do
+        send_reminder
+        expect(Notification.where(user: user, notification_type: Notification.types[:bookmark_reminder]).count).to eq(1)
+        expect(reminder.reload.reminder_type).to eq(nil)
+        expect(reminder.reload.reminder_last_sent_at).not_to eq(nil)
+        expect(reminder.reload.reminder_set_at).to eq(nil)
+      end
+    end
+
+    context "when there are no pending bookmark at desktop reminders" do
+      it "does nothing" do
+        DistributedMutex.expects(:synchronize).never
+        send_reminder
+      end
+    end
+
+    context "when enable bookmarks with reminders is disabled" do
+      before do
+        SiteSetting.enable_bookmarks_with_reminders = false
+      end
+
+      it "does nothing" do
+        BrowserDetection.expects(:device).never
+        send_reminder
+      end
+    end
+  end
+
+  def send_reminder
+    subject.send_at_desktop_reminder(user: user, request_user_agent: user_agent)
+  end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index ef6b64d511..d94d8d47c5 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2212,16 +2212,6 @@ describe User do
     end
   end
 
-  describe "Destroying a user with security key" do
-    let!(:security_key) { Fabricate(:user_security_key_with_random_credential, user: user) }
-    fab!(:admin) { Fabricate(:admin) }
-
-    it "removes the security key" do
-      UserDestroyer.new(admin).destroy(user)
-      expect(UserSecurityKey.where(user_id: user.id).count).to eq(0)
-    end
-  end
-
   describe 'Secure identifier for a user which is a string other than the ID used to identify the user in some cases e.g. security keys' do
     describe '#create_or_fetch_secure_identifier' do
       context 'if the user already has a secure identifier' do
diff --git a/spec/requests/bookmarks_controller_spec.rb b/spec/requests/bookmarks_controller_spec.rb
index cfe7f6c983..8c29af8707 100644
--- a/spec/requests/bookmarks_controller_spec.rb
+++ b/spec/requests/bookmarks_controller_spec.rb
@@ -17,14 +17,14 @@ describe BookmarksController do
         Fabricate(:bookmark, post: bookmark_post, user: bookmark_user)
       end
 
-      it "returns failed JSON with a 422 error" do
+      it "returns failed JSON with a 400 error" do
         post "/bookmarks.json", params: {
           post_id: bookmark_post.id,
           reminder_type: "tomorrow",
-          reminder_at: (Time.now.utc + 1.day).iso8601
+          reminder_at: (Time.zone.now + 1.day).iso8601
         }
 
-        expect(response.status).to eq(422)
+        expect(response.status).to eq(400)
         expect(JSON.parse(response.body)['errors']).to include(
           I18n.t("bookmarks.errors.already_bookmarked_post")
         )
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 481de344e4..42f002f481 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2387,7 +2387,7 @@ RSpec.describe TopicsController do
         Bookmark.create(post: post, topic: post.topic, user: user)
 
         put "/t/#{post.topic_id}/bookmark.json"
-        expect(response).to be_forbidden
+        expect(response.status).to eq(400)
       end
     end
   end
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index 02f5e506f7..a26da77d4e 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -332,6 +332,26 @@ describe UserDestroyer do
       end
     end
 
+    describe "Destroying a user with security key" do
+      let!(:security_key) { Fabricate(:user_security_key_with_random_credential, user: user) }
+      fab!(:admin) { Fabricate(:admin) }
+
+      it "removes the security key" do
+        UserDestroyer.new(admin).destroy(user)
+        expect(UserSecurityKey.where(user_id: user.id).count).to eq(0)
+      end
+    end
+
+    describe "Destroying a user with a bookmark" do
+      let!(:bookmark) { Fabricate(:bookmark, user: user) }
+      fab!(:admin) { Fabricate(:admin) }
+
+      it "removes the bookmark" do
+        UserDestroyer.new(admin).destroy(user)
+        expect(Bookmark.where(user_id: user.id).count).to eq(0)
+      end
+    end
+
     context 'user got an email' do
       let!(:email_log) { Fabricate(:email_log, user: user) }
 

From 849631188fe343b77868fa55152968c8de937b1b Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 12 Mar 2020 10:52:15 +1000
Subject: [PATCH 089/633] FEATURE: Allow custom date + time for bookmark
 reminders (#9185)

A custom date and time can now be selected for a bookmark reminder

The reminder will not happen at the exact time but rather at the next 5 minute interval of the bookmark reminder schedule.

This PR also fixes issues with bulk deleting topic bookmarks.
---
 .../discourse/controllers/bookmark.js.es6     | 50 +++++++++++++++----
 .../discourse/templates/modal/bookmark.hbs    | 14 +++++-
 app/controllers/posts_controller.rb           |  8 ++-
 config/locales/client.en.yml                  |  1 +
 lib/bookmark_manager.rb                       |  2 +-
 spec/lib/bookmark_manager_spec.rb             |  4 +-
 spec/requests/posts_controller_spec.rb        | 25 ++++++++++
 7 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js.es6 b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
index 27e3e8418b..109678a7b2 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { Promise } from "rsvp";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -25,6 +26,8 @@ export default Controller.extend(ModalFunctionality, {
   closeWithoutSaving: false,
   isSavingBookmarkManually: false,
   onCloseWithoutSaving: null,
+  customReminderDate: null,
+  customReminderTime: null,
 
   onShow() {
     this.setProperties({
@@ -32,7 +35,9 @@ export default Controller.extend(ModalFunctionality, {
       name: null,
       selectedReminderType: null,
       closeWithoutSaving: false,
-      isSavingBookmarkManually: false
+      isSavingBookmarkManually: false,
+      customReminderDate: null,
+      customReminderTime: null
     });
   },
 
@@ -40,7 +45,7 @@ export default Controller.extend(ModalFunctionality, {
   // clicks the save or cancel button to mimic browser behaviour
   onClose() {
     if (!this.closeWithoutSaving && !this.isSavingBookmarkManually) {
-      this.saveBookmark();
+      this.saveBookmark().catch(e => this.handleSaveError(e));
     }
     if (this.onCloseWithoutSaving && this.closeWithoutSaving) {
       this.onCloseWithoutSaving();
@@ -50,6 +55,11 @@ export default Controller.extend(ModalFunctionality, {
   usingMobileDevice: reads("site.mobileView"),
   showBookmarkReminderControls: true,
 
+  @discourseComputed("selectedReminderType")
+  customDateTimeSelected(selectedReminderType) {
+    return selectedReminderType === REMINDER_TYPES.CUSTOM;
+  },
+
   @discourseComputed()
   reminderTypes: () => {
     return REMINDER_TYPES;
@@ -113,6 +123,11 @@ export default Controller.extend(ModalFunctionality, {
   saveBookmark() {
     const reminderAt = this.reminderAt();
     const reminderAtISO = reminderAt ? reminderAt.toISOString() : null;
+
+    if (!reminderAt) {
+      return Promise.reject(I18n.t("bookmarks.invalid_custom_datetime"));
+    }
+
     const data = {
       reminder_type: this.selectedReminderType,
       reminder_at: reminderAtISO,
@@ -134,8 +149,7 @@ export default Controller.extend(ModalFunctionality, {
 
     switch (this.selectedReminderType) {
       case REMINDER_TYPES.AT_DESKTOP:
-        // TODO: Implement at desktop bookmark reminder functionality
-        return "";
+        return null;
       case REMINDER_TYPES.LATER_TODAY:
         return this.laterToday();
       case REMINDER_TYPES.NEXT_BUSINESS_DAY:
@@ -147,8 +161,18 @@ export default Controller.extend(ModalFunctionality, {
       case REMINDER_TYPES.NEXT_MONTH:
         return this.nextMonth();
       case REMINDER_TYPES.CUSTOM:
-        // TODO: Implement custom bookmark reminder times
-        return "";
+        const customDateTime = moment.tz(
+          this.customReminderDate + " " + this.customReminderTime,
+          this.userTimezone()
+        );
+        if (!customDateTime.isValid()) {
+          this.setProperties({
+            customReminderTime: null,
+            customReminderDate: null
+          });
+          return;
+        }
+        return customDateTime;
     }
   },
 
@@ -200,15 +224,21 @@ export default Controller.extend(ModalFunctionality, {
       : later.add(30, "minutes").startOf("hour");
   },
 
+  handleSaveError(e) {
+    this.isSavingBookmarkManually = false;
+    if (typeof e === "string") {
+      bootbox.alert(e);
+    } else {
+      popupAjaxError(e);
+    }
+  },
+
   actions: {
     saveAndClose() {
       this.isSavingBookmarkManually = true;
       this.saveBookmark()
         .then(() => this.send("closeModal"))
-        .catch(e => {
-          this.isSavingBookmarkManually = false;
-          popupAjaxError(e);
-        });
+        .catch(e => this.handleSaveError(e));
     },
 
     closeWithoutSavingBookmark() {
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index e32f2467eb..4fb9e462f9 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -35,8 +35,20 @@
           {{tap-tile icon="far-sun" text=tomorrowFormatted tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{tap-tile icon="far-clock" text=nextWeekFormatted tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{tap-tile icon="far-calendar-plus" text=nextMonthFormatted tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-          <!-- {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}} -->
+          {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
         {{/tap-tile-grid}}
+        {{#if customDateTimeSelected}}
+          <div class="control-group">
+            {{d-icon "calendar-alt"}}
+            {{date-picker-future
+              value=customReminderDate
+              onSelect=(action (mut customReminderDate))
+            }}
+            {{d-icon "far-clock"}}
+            {{input placeholder="--:--" type="time" value=customReminderTime}}
+          </div>
+        {{/if}}
+
       {{else}}
         <div class="alert alert-info">{{i18n "bookmarks.no_timezone" basePath=basePath }}</div>
       {{/if}}
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 5da0ded422..5d62c6510f 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -512,9 +512,13 @@ class PostsController < ApplicationController
     params.require(:post_id)
 
     existing_bookmark = Bookmark.find_by(post_id: params[:post_id], user_id: current_user.id)
-    existing_bookmark.destroy if existing_bookmark.present?
+    topic_bookmarked = false
+
+    if existing_bookmark.present?
+      topic_bookmarked = Bookmark.exists?(topic_id: existing_bookmark.topic_id, user_id: current_user.id)
+      existing_bookmark.destroy
+    end
 
-    topic_bookmarked = Bookmark.exists?(topic_id: existing_bookmark.topic_id, user_id: current_user.id)
     render json: success_json.merge(topic_bookmarked: topic_bookmarked)
   end
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c699eef32f..d8ff29639d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -311,6 +311,7 @@ en:
       confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
       save: "Save"
       no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up <a href="%{basePath}/my/preferences/profile">in your profile</a>.'
+      invalid_custom_datetime: "The date and time you provided is invalid, please try again."
       reminders:
         at_desktop: "Next time I'm at my desktop"
         later_today: "Later today <br/>{{date}}"
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index 0dcfa2b79f..f4831e1350 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -43,7 +43,7 @@ class BookmarkManager
 
     Bookmark.transaction do
       topic_bookmarks.each do |bookmark|
-        raise Discourse::InvalidAccess.new if !Guardian.new(user).can_delete?(bookmark)
+        raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_delete?(bookmark)
         bookmark.destroy
       end
     end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 92b7c2df21..dbfecd565d 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -134,8 +134,8 @@ RSpec.describe BookmarkManager do
 
   describe ".destroy_for_topic" do
     let!(:topic) { Fabricate(:topic) }
-    let(:bookmark1) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
-    let(:bookmark2) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
+    let!(:bookmark1) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
+    let!(:bookmark2) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
 
     it "destroys all bookmarks for the topic for the specified user" do
       subject.destroy_for_topic(topic)
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index dd3afa7cf0..b90b7cd3e3 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -457,6 +457,31 @@ describe PostsController do
     end
   end
 
+  describe "#destroy_bookmark" do
+    fab!(:post) { Fabricate(:post) }
+    fab!(:bookmark) { Fabricate(:bookmark, user: user, post: post, topic: post.topic) }
+
+    before do
+      sign_in(user)
+    end
+
+    it "deletes the bookmark" do
+      bookmark_id = bookmark.id
+      delete "/posts/#{post.id}/bookmark.json"
+      expect(Bookmark.find_by(id: bookmark_id)).to eq(nil)
+    end
+
+    context "when the user still has bookmarks in the topic" do
+      before do
+        Fabricate(:bookmark, user: user, post: Fabricate(:post, topic: post.topic), topic: topic)
+      end
+      it "marks topic_bookmaked as true" do
+        delete "/posts/#{post.id}/bookmark.json"
+        expect(JSON.parse(response.body)['topic_bookmarked']).to eq(true)
+      end
+    end
+  end
+
   describe '#bookmark' do
     include_examples 'action requires login', :put, "/posts/2/bookmark.json"
     let!(:post) { post_by_user }

From e1eb5fb9b3d487c1b24e95eed38cb917a8887245 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 12 Mar 2020 15:20:56 +1000
Subject: [PATCH 090/633] FEATURE: MVP Bookmarks with reminders user list
 changes (#8999)

* This PR changes the user activity bookmarks stream to show a new list of bookmarks based on the Bookmark record.
* If a bookmark has a name or reminder it will be shown as metadata above the topic title in the list
* The categories, tags, topic status, and assigned show for each bookmarked post based on the post topic
* Bookmarks can be deleted from the [...] menu in the list
* As well as this, the list of bookmarks from the quick access panel is now drawn from the Bookmarks table for a user:
* All of this new functionality is gated behind the enable_bookmarks_with_reminders site setting
The /bookmarks/ route now redirects directly to /user/:username/activity/bookmarks-with-reminders
* The structure of the Ember for the list of bookmarks is not ideal, this is an MVP PR so we can start testing this functionality internally. There is a little repeated code from topic.js.es6. There is an ongoing effort to start standardizing these lists that will be addressed in future PRs.
* This PR also fixes issues with feature detection for at_desktop bookmark reminders
---
 .../bookmark-actions-dropdown.js.es6          |  33 ++++++
 .../discourse/controllers/bookmark.js.es6     |   2 +-
 ...r-activity-bookmarks-with-reminders.js.es6 |  54 +++++++++
 .../controllers/user-activity.js.es6          |   2 +
 .../discourse/models/bookmark.js.es6          | 109 ++++++++++++++++++
 .../javascripts/discourse/models/topic.js.es6 |   9 +-
 .../javascripts/discourse/models/user.js.es6  |   6 +
 .../discourse/routes/app-route-map.js.es6     |   3 +
 .../discourse/routes/discovery.js.es6         |  19 ++-
 ...r-activity-bookmarks-with-reminders.js.es6 |  29 +++++
 .../discourse/templates/user/activity.hbs     |  12 +-
 .../discourse/templates/user/bookmarks.hbs    |  51 ++++++++
 .../discourse/widgets/post-menu.js.es6        |   2 +
 .../widgets/quick-access-bookmarks.js.es6     |  59 ++++++++--
 .../stylesheets/common/base/_topic-list.scss  |   8 ++
 .../stylesheets/common/base/tagging.scss      |  10 +-
 .../common/components/bookmark-list-item.scss |  19 +++
 app/controllers/users_controller.rb           |  19 ++-
 app/serializers/topic_view_serializer.rb      |   6 +-
 app/serializers/user_bookmark_serializer.rb   |  91 +++++++++++++++
 config/locales/client.en.yml                  |   4 +
 config/routes.rb                              |   1 +
 lib/bookmark_query.rb                         |  32 +++++
 lib/bookmark_reminder_notification_handler.rb |   2 +-
 lib/topic_view.rb                             |   5 +
 ...mark_reminder_notification_handler_spec.rb |  71 ++++++------
 26 files changed, 597 insertions(+), 61 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6
 create mode 100644 app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6
 create mode 100644 app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6
 create mode 100644 app/assets/javascripts/discourse/templates/user/bookmarks.hbs
 create mode 100644 app/assets/stylesheets/common/components/bookmark-list-item.scss
 create mode 100644 app/serializers/user_bookmark_serializer.rb
 create mode 100644 lib/bookmark_query.rb

diff --git a/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6 b/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6
new file mode 100644
index 0000000000..6e72fafc44
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6
@@ -0,0 +1,33 @@
+import { computed } from "@ember/object";
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import { action } from "@ember/object";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: ["bookmark-actions-dropdown"],
+  pluginApiIdentifiers: ["bookmark-actions-dropdown"],
+  selectKitOptions: {
+    icon: null,
+    translatedNone: "...",
+    showFullTitle: true
+  },
+
+  content: computed(() => {
+    return [
+      {
+        id: "remove",
+        icon: "trash-alt",
+        name: I18n.t("post.bookmarks.actions.delete_bookmark.name"),
+        description: I18n.t(
+          "post.bookmarks.actions.delete_bookmark.description"
+        )
+      }
+    ];
+  }),
+
+  @action
+  onChange(selectedAction) {
+    if (selectedAction === "remove") {
+      this.removeBookmark(this.bookmark);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js.es6 b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
index 109678a7b2..b4b74ec57e 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
@@ -124,7 +124,7 @@ export default Controller.extend(ModalFunctionality, {
     const reminderAt = this.reminderAt();
     const reminderAtISO = reminderAt ? reminderAt.toISOString() : null;
 
-    if (!reminderAt) {
+    if (!reminderAt && this.selectedReminderType === REMINDER_TYPES.CUSTOM) {
       return Promise.reject(I18n.t("bookmarks.invalid_custom_datetime"));
     }
 
diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6
new file mode 100644
index 0000000000..49982b1244
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6
@@ -0,0 +1,54 @@
+import Controller from "@ember/controller";
+import { inject } from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
+import Bookmark from "discourse/models/bookmark";
+
+export default Controller.extend({
+  application: inject(),
+  user: inject(),
+
+  content: null,
+  loading: false,
+  noResultsHelp: null,
+
+  loadItems() {
+    this.setProperties({
+      content: [],
+      loading: true,
+      noResultsHelp: null
+    });
+
+    return this.model
+      .loadItems()
+      .then(response => {
+        if (response && response.no_results_help) {
+          this.set("noResultsHelp", response.no_results_help);
+        }
+
+        if (response && response.bookmarks) {
+          let bookmarks = [];
+          response.bookmarks.forEach(bookmark => {
+            bookmarks.push(Bookmark.create(bookmark));
+          });
+          this.content.pushObjects(bookmarks);
+        }
+      })
+      .finally(() =>
+        this.setProperties({
+          loaded: true,
+          loading: false
+        })
+      );
+  },
+
+  @discourseComputed("loaded", "content.length")
+  noContent(loaded, content) {
+    return loaded && content.length === 0;
+  },
+
+  actions: {
+    removeBookmark(bookmark) {
+      return bookmark.destroy().then(() => this.loadItems());
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 12333fcf07..03828c439b 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -3,6 +3,7 @@ import { inject as service } from "@ember/service";
 import Controller, { inject as controller } from "@ember/controller";
 import { exportUserArchive } from "discourse/lib/export-csv";
 import { observes } from "discourse-common/utils/decorators";
+import { setting } from "discourse/lib/computed";
 
 export default Controller.extend({
   application: controller(),
@@ -11,6 +12,7 @@ export default Controller.extend({
   userActionType: null,
 
   canDownloadPosts: alias("user.viewingSelf"),
+  bookmarksWithRemindersEnabled: setting("enable_bookmarks_with_reminders"),
 
   @observes("userActionType", "model.stream.itemsLoaded")
   _showFooter: function() {
diff --git a/app/assets/javascripts/discourse/models/bookmark.js.es6 b/app/assets/javascripts/discourse/models/bookmark.js.es6
index 2ae4e63e4c..0473c10811 100644
--- a/app/assets/javascripts/discourse/models/bookmark.js.es6
+++ b/app/assets/javascripts/discourse/models/bookmark.js.es6
@@ -1,8 +1,16 @@
+import Category from "discourse/models/category";
+import { isRTL } from "discourse/lib/text-direction";
+import { censor } from "pretty-text/censored-words";
+import { emojiUnescape } from "discourse/lib/text";
+import Site from "discourse/models/site";
+import { longDate } from "discourse/lib/formatter";
+import PreloadStore from "preload-store";
 import { none } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
+import discourseComputed from "discourse-common/utils/decorators";
 
 const Bookmark = RestModel.extend({
   newBookmark: none("id"),
@@ -18,6 +26,107 @@ const Bookmark = RestModel.extend({
     return ajax(this.url, {
       type: "DELETE"
     });
+  },
+
+  @discourseComputed("highest_post_number", "url")
+  lastPostUrl(highestPostNumber) {
+    return this.urlForPostNumber(highestPostNumber);
+  },
+
+  // Helper to build a Url with a post number
+  urlForPostNumber(postNumber) {
+    let url = Discourse.getURL(`/t/${this.topic_id}`);
+    if (postNumber > 0) {
+      url += `/${postNumber}`;
+    }
+    return url;
+  },
+
+  // returns createdAt if there's no bumped date
+  @discourseComputed("bumped_at", "createdAt")
+  bumpedAt(bumped_at, createdAt) {
+    if (bumped_at) {
+      return new Date(bumped_at);
+    } else {
+      return createdAt;
+    }
+  },
+
+  @discourseComputed("bumpedAt", "createdAt")
+  bumpedAtTitle(bumpedAt, createdAt) {
+    const firstPost = I18n.t("first_post");
+    const lastPost = I18n.t("last_post");
+    const createdAtDate = longDate(createdAt);
+    const bumpedAtDate = longDate(bumpedAt);
+
+    return I18n.messageFormat("topic.bumped_at_title_MF", {
+      FIRST_POST: firstPost,
+      CREATED_AT: createdAtDate,
+      LAST_POST: lastPost,
+      BUMPED_AT: bumpedAtDate
+    });
+  },
+
+  @discourseComputed("title")
+  fancyTitle(title) {
+    let fancyTitle = censor(
+      emojiUnescape(title) || "",
+      Site.currentProp("censored_regexp")
+    );
+
+    if (this.siteSettings.support_mixed_text_direction) {
+      const titleDir = isRTL(title) ? "rtl" : "ltr";
+      return `<span dir="${titleDir}">${fancyTitle}</span>`;
+    }
+    return fancyTitle;
+  },
+
+  @discourseComputed("created_at")
+  createdAt(created_at) {
+    return new Date(created_at);
+  },
+
+  @discourseComputed("tags")
+  visibleListTags(tags) {
+    if (!tags || !this.siteSettings.suppress_overlapping_tags_in_list) {
+      return tags;
+    }
+
+    const title = this.title;
+    const newTags = [];
+
+    tags.forEach(function(tag) {
+      if (title.toLowerCase().indexOf(tag) === -1) {
+        newTags.push(tag);
+      }
+    });
+
+    return newTags;
+  },
+
+  @discourseComputed("category_id")
+  category(categoryId) {
+    return Category.findById(categoryId);
+  },
+
+  @discourseComputed("reminder_at")
+  formattedReminder(bookmarkReminderAt) {
+    const currentUser = PreloadStore.get("currentUser");
+    return moment
+      .tz(bookmarkReminderAt, currentUser.timezone || moment.tz.guess())
+      .format(I18n.t("dates.long_with_year"));
+  },
+
+  loadItems() {
+    return ajax(`/u/${this.user.username}/bookmarks.json`, { cache: "false" });
+  }
+});
+
+Bookmark.reopenClass({
+  create(args) {
+    args = args || {};
+    args.siteSettings = args.siteSettings || Discourse.SiteSettings;
+    return this._super(args);
   }
 });
 
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index fa97e11ea7..a3c9ee26c6 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -136,7 +136,12 @@ const Topic = RestModel.extend({
     const createdAtDate = longDate(createdAt);
     const bumpedAtDate = longDate(bumpedAt);
 
-    return `${firstPost}: ${createdAtDate}\n${lastPost}: ${bumpedAtDate}`;
+    return I18n.messageFormat("topic.bumped_at_title_MF", {
+      FIRST_POST: firstPost,
+      CREATED_AT: createdAtDate,
+      LAST_POST: lastPost,
+      BUMPED_AT: bumpedAtDate
+    });
   },
 
   @discourseComputed("created_at")
@@ -259,7 +264,7 @@ const Topic = RestModel.extend({
   // Helper to build a Url with a post number
   urlForPostNumber(postNumber) {
     let url = this.url;
-    if (postNumber && postNumber > 0) {
+    if (postNumber > 0) {
       url += `/${postNumber}`;
     }
     return url;
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 7af461aa30..026b27926a 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -5,6 +5,7 @@ import EmberObject, { computed, getProperties } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
+import Bookmark from "discourse/models/bookmark";
 import UserStream from "discourse/models/user-stream";
 import UserPostsStream from "discourse/models/user-posts-stream";
 import Singleton from "discourse/mixins/singleton";
@@ -52,6 +53,11 @@ const User = RestModel.extend({
     return UserStream.create({ user: this });
   },
 
+  @discourseComputed()
+  bookmarks() {
+    return Bookmark.create({ user: this });
+  },
+
   @discourseComputed()
   postsStream() {
     return UserPostsStream.create({ user: this });
diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
index 16720a568e..fb13822bb2 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -122,6 +122,9 @@ export default function() {
           this.route("replies");
           this.route("likesGiven", { path: "likes-given" });
           this.route("bookmarks");
+          this.route("bookmarksWithReminders", {
+            path: "bookmarks-with-reminders"
+          });
           this.route("pending");
           this.route("drafts");
         }
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js.es6
index d812950666..1dd2985c46 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery.js.es6
@@ -13,16 +13,27 @@ export default DiscourseRoute.extend(OpenComposer, {
   },
 
   beforeModel(transition) {
-    const user = User;
+    // the new bookmark list is radically different to this topic-based one,
+    // including being able to show links to multiple posts to the same topic
+    // and being based on a different model. better to just redirect
     const url = transition.intent.url;
+    if (
+      this.siteSettings.enable_bookmarks_with_reminders &&
+      url === "/bookmarks"
+    ) {
+      this.transitionTo(
+        "userActivity.bookmarksWithReminders",
+        this.currentUser
+      );
+    }
 
     if (
       (url === "/" || url === "/latest" || url === "/categories") &&
       transition.targetName.indexOf("discovery.top") === -1 &&
-      user.currentProp("should_be_redirected_to_top")
+      User.currentProp("should_be_redirected_to_top")
     ) {
-      user.currentProp("should_be_redirected_to_top", false);
-      const period = user.currentProp("redirected_to_top.period") || "all";
+      User.currentProp("should_be_redirected_to_top", false);
+      const period = User.currentProp("redirected_to_top.period") || "all";
       this.replaceWith(`discovery.top${period.capitalize()}`);
     }
   },
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6
new file mode 100644
index 0000000000..fc8bd07826
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6
@@ -0,0 +1,29 @@
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
+  noContentHelpKey: "user_activity.no_bookmarks",
+
+  queryParams: {
+    acting_username: { refreshModel: true }
+  },
+
+  model() {
+    return this.modelFor("user").get("bookmarks");
+  },
+
+  renderTemplate() {
+    this.render("user_bookmarks");
+  },
+
+  setupController(controller, model) {
+    controller.set("model", model);
+    controller.loadItems();
+  },
+
+  actions: {
+    didTransition() {
+      this.controllerFor("user-activity")._showFooter();
+      return true;
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index 6c39cc4618..2623e57c05 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -18,9 +18,15 @@
       {{#link-to 'userActivity.likesGiven'}}{{i18n 'user_action_groups.1'}}{{/link-to}}
     </li>
     {{#if user.showBookmarks}}
-    <li>
-      {{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
-    </li>
+      {{#if bookmarksWithRemindersEnabled}}
+      <li>
+        {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+      </li>
+      {{else}}
+      <li>
+        {{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+      </li>
+      {{/if}}
     {{/if}}
     {{plugin-outlet name="user-activity-bottom"
                     connectorTagName='li'
diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
new file mode 100644
index 0000000000..228490bfa4
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
@@ -0,0 +1,51 @@
+{{#if noContent}}
+  <div class='alert alert-info'>{{noResultsHelp}}</div>
+{{else}}
+  {{#conditional-loading-spinner condition=loading}}
+  <table class="topic-list">
+    <thead>
+      <th>{{i18n "topic.title"}}</th>
+      <th>{{i18n "post.bookmarks.created"}}</th>
+      <th>{{i18n "activity"}}</th>
+      <th>&nbsp;</th>
+    </thead>
+    <tbody>
+    {{#each content as |bookmark|}}
+      <tr class="topic-list-item bookmark-list-item">
+        <td class="main-link">
+          <span class="link-top-line">
+            <div class="bookmark-metadata">
+              {{#if bookmark.name}}
+                <span class="bookmark-metadata-item">
+                  {{d-icon "info-circle"}}{{bookmark.name}}
+                </span>
+              {{/if}}
+              {{#if bookmark.reminder_at}}
+                <span class="bookmark-metadata-item">
+                  {{d-icon "far-clock"}}{{bookmark.formattedReminder}}
+                </span>
+              {{/if}}
+            </div>
+
+            {{topic-status topic=bookmark}}
+            {{topic-link bookmark}}
+          </span>
+          {{#if bookmark.excerpt}}
+          <p class="post-excerpt">{{html-safe bookmark.excerpt}}</p>
+          {{/if}}
+          <div class="link-bottom-line">
+            {{category-link bookmark.category}}
+            {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
+         </div>
+        </td>
+        <td>{{format-date bookmark.created_at format="tiny"}}</td>
+        {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
+        <td>
+          {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
+        </td>
+      </tr>
+    {{/each}}
+    </tbody>
+  </table>
+  {{/conditional-loading-spinner}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 6ae6460fac..95c3477ffd 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -321,6 +321,8 @@ registerButton("bookmarkWithReminder", (attrs, state, siteSettings) => {
       titleOptions = {
         date: reminderAtDate.format(I18n.t("dates.long_with_year"))
       };
+    } else if (attrs.bookmarkReminderType === "at_desktop") {
+      title = "bookmarks.created_with_at_desktop_reminder";
     } else {
       title = "bookmarks.created";
     }
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6
index ca1642b897..b63c2b527b 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6
+++ b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6
@@ -16,7 +16,11 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
   },
 
   showAllHref() {
-    return `${this.attrs.path}/activity/bookmarks`;
+    if (this.siteSettings.enable_bookmarks_with_reminders) {
+      return `${this.attrs.path}/activity/bookmarks-with-reminders`;
+    } else {
+      return `${this.attrs.path}/activity/bookmarks`;
+    }
   },
 
   emptyStatePlaceholderItem() {
@@ -24,6 +28,50 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
   },
 
   findNewItems() {
+    if (this.siteSettings.enable_bookmarks_with_reminders) {
+      return this.loadBookmarksWithReminders();
+    } else {
+      return this.loadUserActivityBookmarks();
+    }
+  },
+
+  itemHtml(bookmark) {
+    return this.attach("quick-access-item", {
+      icon: this.icon(bookmark),
+      href: postUrl(
+        bookmark.slug,
+        bookmark.topic_id,
+        bookmark.post_number || bookmark.linked_post_number
+      ),
+      content: bookmark.title,
+      username: bookmark.username
+    });
+  },
+
+  icon(bookmark) {
+    if (bookmark.reminder_at) {
+      return "discourse-bookmark-clock";
+    }
+    return ICON;
+  },
+
+  loadBookmarksWithReminders() {
+    return ajax(`/u/${this.currentUser.username}/bookmarks.json`, {
+      cache: "false",
+      data: {
+        limit: this.estimateItemLimit()
+      }
+    }).then(result => {
+      // The empty state help text for bookmarks page is localized on the
+      // server.
+      if (result.no_results_help) {
+        this.state.emptyStatePlaceholderItemText = result.no_results_help;
+      }
+      return result.bookmarks;
+    });
+  },
+
+  loadUserActivityBookmarks() {
     return ajax("/user_actions.json", {
       cache: "false",
       data: {
@@ -38,14 +86,5 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
       this.state.emptyStatePlaceholderItemText = no_results_help;
       return user_actions;
     });
-  },
-
-  itemHtml(bookmark) {
-    return this.attach("quick-access-item", {
-      icon: ICON,
-      href: postUrl(bookmark.slug, bookmark.topic_id, bookmark.post_number),
-      content: bookmark.title,
-      username: bookmark.username
-    });
   }
 });
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index bd4f95a01e..2ac61a4487 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -54,6 +54,14 @@
   }
 }
 
+.topic-list-item {
+  .post-excerpt {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    font-size: $font-down-2;
+  }
+}
+
 .topic-list-main-link {
   font-size: $font-up-1;
   a.title {
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index adb1631a9b..e2fd9158a8 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -153,10 +153,12 @@ $tag-color: $primary-medium;
   display: inline-block;
 }
 
-.topic-list-item .discourse-tags {
-  display: inline-flex;
-  font-weight: normal;
-  font-size: $font-down-1;
+.topic-list-item {
+  .discourse-tags {
+    display: inline-flex;
+    font-weight: normal;
+    font-size: $font-down-1;
+  }
 }
 
 .categories-list .topic-list-latest .discourse-tags {
diff --git a/app/assets/stylesheets/common/components/bookmark-list-item.scss b/app/assets/stylesheets/common/components/bookmark-list-item.scss
new file mode 100644
index 0000000000..7de562d1d3
--- /dev/null
+++ b/app/assets/stylesheets/common/components/bookmark-list-item.scss
@@ -0,0 +1,19 @@
+.bookmark-list-item {
+  .bookmark-metadata {
+    font-size: $font-down-2;
+    white-space: nowrap;
+    display: flex;
+    align-items: center;
+    margin-bottom: 0.2em;
+
+    &-item {
+      margin-right: 0.5em;
+      display: flex;
+      align-items: center;
+    }
+
+    .d-icon {
+      margin-right: 0.2em;
+    }
+  }
+}
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9405620286..837f19b828 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -10,14 +10,15 @@ class UsersController < ApplicationController
     :enable_second_factor_totp, :disable_second_factor, :list_second_factors,
     :update_second_factor, :create_second_factor_backup, :select_avatar,
     :notification_level, :revoke_auth_token, :register_second_factor_security_key,
-    :create_second_factor_security_key, :feature_topic, :clear_featured_topic
+    :create_second_factor_security_key, :feature_topic, :clear_featured_topic,
+    :bookmarks
   ]
 
   skip_before_action :check_xhr, only: [
     :show, :badges, :password_reset_show, :password_reset_update, :update, :account_created,
     :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar,
     :my_redirect, :toggle_anon, :admin_login, :confirm_admin, :email_login, :summary,
-    :feature_topic, :clear_featured_topic
+    :feature_topic, :clear_featured_topic, :bookmarks
   ]
 
   before_action :second_factor_check_confirmed_password, only: [
@@ -1378,6 +1379,20 @@ class UsersController < ApplicationController
     render json: success_json
   end
 
+  def bookmarks
+    user = fetch_user_from_params
+    bookmarks = BookmarkQuery.new(user, params).list_all
+
+    if bookmarks.empty?
+      render json: {
+        bookmarks: [],
+        no_results_help: I18n.t("user_activity.no_bookmarks.self")
+      }
+    else
+      render_serialized(bookmarks, UserBookmarkSerializer, root: 'bookmarks')
+    end
+  end
+
   HONEYPOT_KEY ||= 'HONEYPOT_KEY'
   CHALLENGE_KEY ||= 'CHALLENGE_KEY'
 
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 780a004d6d..a0f37d3d70 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -182,7 +182,11 @@ class TopicViewSerializer < ApplicationSerializer
   end
 
   def bookmarked
-    object.topic_user&.bookmarked
+    if SiteSetting.enable_bookmarks_with_reminders?
+      object.has_bookmarks?
+    else
+      object.topic_user&.bookmarked
+    end
   end
 
   def topic_timer
diff --git a/app/serializers/user_bookmark_serializer.rb b/app/serializers/user_bookmark_serializer.rb
new file mode 100644
index 0000000000..adef053d30
--- /dev/null
+++ b/app/serializers/user_bookmark_serializer.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require_relative 'post_item_excerpt'
+
+class UserBookmarkSerializer < ApplicationSerializer
+  include PostItemExcerpt
+  include TopicTagsMixin
+
+  attributes :id,
+             :created_at,
+             :topic_id,
+             :linked_post_number,
+             :post_id,
+             :name,
+             :reminder_at,
+             :title,
+             :deleted,
+             :hidden,
+             :category_id,
+             :closed,
+             :archived,
+             :archetype,
+             :highest_post_number,
+             :bumped_at,
+             :slug,
+             :username
+
+  def closed
+    object.topic_closed
+  end
+
+  def archived
+    object.topic_archived
+  end
+
+  def linked_post_number
+    object.post.post_number
+  end
+
+  def title
+    object.topic.title
+  end
+
+  def deleted
+    object.topic.deleted_at.present? || object.post.deleted_at.present?
+  end
+
+  def hidden
+    object.post.hidden
+  end
+
+  def category_id
+    object.topic.category_id
+  end
+
+  def archetype
+    object.topic.archetype
+  end
+
+  def archived
+    object.topic.archived
+  end
+
+  def closed
+    object.topic.closed
+  end
+
+  def highest_post_number
+    object.topic.highest_post_number
+  end
+
+  def bumped_at
+    object.topic.bumped_at
+  end
+
+  def raw
+    object.post.raw
+  end
+
+  def cooked
+    object.post.cooked
+  end
+
+  def slug
+    object.topic.slug
+  end
+
+  def username
+    object.post.user.username
+  end
+end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index d8ff29639d..4d61f5a28a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -307,6 +307,7 @@ en:
       created: "you've bookmarked this post"
       not_bookmarked: "bookmark this post"
       created_with_reminder: "you've bookmarked this post with a reminder at %{date}"
+      created_with_at_desktop_reminder: "you've bookmarked this post and will be reminded next time you are at your desktop"
       remove: "Remove Bookmark"
       confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
       save: "Save"
@@ -2116,6 +2117,8 @@ en:
         other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># new</a> topics}
         } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
 
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
+
       browse_all_categories: Browse all categories
 
       view_latest_topics: view latest topics
@@ -2667,6 +2670,7 @@ en:
 
       bookmarks:
         create: "Create bookmark"
+        created: "Created"
         name: "Name"
         name_placeholder: "Name the bookmark to help jog your memory"
         set_reminder: "Set a reminder"
diff --git a/config/routes.rb b/config/routes.rb
index 38047b91eb..7f7a457af3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -469,6 +469,7 @@ Discourse::Application.routes.draw do
     get "#{root_path}/:username/activity" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/activity/:filter" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/badges" => "users#badges", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/bookmarks" => "users#bookmarks", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/notifications" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/notifications/:filter" => "users#show", constraints: { username: RouteFormat.username }
     delete "#{root_path}/:username" => "users#destroy", constraints: { username: RouteFormat.username }
diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
new file mode 100644
index 0000000000..ab18ea9edb
--- /dev/null
+++ b/lib/bookmark_query.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+##
+# Allows us to query Bookmark records for lists. Used mainly
+# in the user/activity/bookmarks page.
+
+class BookmarkQuery
+  def initialize(user, params)
+    @user = user
+    @params = params
+  end
+
+  def list_all
+    results = user_bookmarks
+      .joins('INNER JOIN topics ON topics.id = bookmarks.topic_id')
+      .joins('INNER JOIN posts ON posts.id = bookmarks.post_id')
+      .joins('INNER JOIN users ON users.id = posts.user_id')
+      .order('created_at DESC')
+
+    if @params[:limit]
+      results = results.limit(@params[:limit])
+    end
+
+    results
+  end
+
+  private
+
+  def user_bookmarks
+    Bookmark.where(user: @user).includes(:topic).includes(post: :user)
+  end
+end
diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
index 166c46274e..83f0b9fb3d 100644
--- a/lib/bookmark_reminder_notification_handler.rb
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -54,7 +54,7 @@ class BookmarkReminderNotificationHandler
   def self.send_at_desktop_reminder(user:, request_user_agent:)
     return if !SiteSetting.enable_bookmarks_with_reminders
 
-    return if MobileDetection.mobile_device?(BrowserDetection.device(request_user_agent).to_s)
+    return if MobileDetection.mobile_device?(request_user_agent)
 
     return if !user_has_pending_at_desktop_reminders?(user)
 
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 62f953b6fd..3123e19b46 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -349,6 +349,11 @@ class TopicView
     end
   end
 
+  def has_bookmarks?
+    return false if @user.blank?
+    @topic.bookmarks.exists?(user_id: @user.id)
+  end
+
   MAX_PARTICIPANTS = 24
 
   def post_counts_by_user
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index e64c9b1c70..a2bf4a30af 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -10,31 +10,36 @@ RSpec.describe BookmarkReminderNotificationHandler do
   before do
     SiteSetting.enable_bookmarks_with_reminders = true
   end
+  fab!(:reminder) do
+    Fabricate(
+      :bookmark,
+      user: user,
+      reminder_type: Bookmark.reminder_types[:at_desktop],
+      reminder_at: nil,
+      reminder_set_at: Time.zone.now
+    )
+  end
+  let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
 
-  context "when the user agent is for mobile" do
-    let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" }
-    it "does not attempt to send any reminders" do
-      DistributedMutex.expects(:synchronize).never
-      send_reminder
-    end
+  before do
+    Discourse.redis.flushall
   end
 
-  context "when the user agent is for desktop" do
-    let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
-    fab!(:reminder) do
-      Fabricate(
-        :bookmark,
-        user: user,
-        reminder_type: Bookmark.reminder_types[:at_desktop],
-        reminder_at: nil,
-        reminder_set_at: Time.zone.now
-      )
+  context "when there are pending bookmark at desktop reminders" do
+    before do
+      described_class.cache_pending_at_desktop_reminder(user)
     end
 
-    context "when there are pending bookmark at desktop reminders" do
-      before do
-        described_class.cache_pending_at_desktop_reminder(user)
+    context "when the user agent is for mobile" do
+      let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" }
+      it "does not attempt to send any reminders" do
+        DistributedMutex.expects(:synchronize).never
+        send_reminder
       end
+    end
+
+    context "when the user agent is for desktop" do
+      let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
 
       it "deletes the key in redis" do
         send_reminder
@@ -49,23 +54,23 @@ RSpec.describe BookmarkReminderNotificationHandler do
         expect(reminder.reload.reminder_set_at).to eq(nil)
       end
     end
+  end
 
-    context "when there are no pending bookmark at desktop reminders" do
-      it "does nothing" do
-        DistributedMutex.expects(:synchronize).never
-        send_reminder
-      end
+  context "when there are no pending bookmark at desktop reminders" do
+    it "does nothing" do
+      DistributedMutex.expects(:synchronize).never
+      send_reminder
+    end
+  end
+
+  context "when enable bookmarks with reminders is disabled" do
+    before do
+      SiteSetting.enable_bookmarks_with_reminders = false
     end
 
-    context "when enable bookmarks with reminders is disabled" do
-      before do
-        SiteSetting.enable_bookmarks_with_reminders = false
-      end
-
-      it "does nothing" do
-        BrowserDetection.expects(:device).never
-        send_reminder
-      end
+    it "does nothing" do
+      BrowserDetection.expects(:device).never
+      send_reminder
     end
   end
 

From 03c012bd97275459f75f2f9df6c2d9d1bccf6bf5 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 12 Mar 2020 16:00:45 +1000
Subject: [PATCH 091/633] Unscope post + topic relation for bookmark

* we want to be able to get these records for the bookmark
  even if they are trashed, for serialization for the bookmark
  list
---
 app/models/bookmark.rb                        | 10 ++++++
 app/serializers/user_bookmark_serializer.rb   |  4 +--
 .../user_bookmark_serializer_spec.rb          | 35 +++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 spec/serializers/user_bookmark_serializer_spec.rb

diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index d25a30b865..d28e40d263 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -13,6 +13,16 @@ class Bookmark < ActiveRecord::Base
   validate :unique_per_post_for_user
   validate :ensure_sane_reminder_at_time
 
+  # we don't care whether the post or topic is deleted,
+  # they hold important information about the bookmark
+  def post
+    Post.unscoped { super }
+  end
+
+  def topic
+    Topic.unscoped { super }
+  end
+
   def unique_per_post_for_user
     existing_bookmark = Bookmark.find_by(user_id: user_id, post_id: post_id)
     return if existing_bookmark.blank? || existing_bookmark.id == id
diff --git a/app/serializers/user_bookmark_serializer.rb b/app/serializers/user_bookmark_serializer.rb
index adef053d30..39358c2262 100644
--- a/app/serializers/user_bookmark_serializer.rb
+++ b/app/serializers/user_bookmark_serializer.rb
@@ -26,11 +26,11 @@ class UserBookmarkSerializer < ApplicationSerializer
              :username
 
   def closed
-    object.topic_closed
+    object.topic.closed
   end
 
   def archived
-    object.topic_archived
+    object.topic.archived
   end
 
   def linked_post_number
diff --git a/spec/serializers/user_bookmark_serializer_spec.rb b/spec/serializers/user_bookmark_serializer_spec.rb
new file mode 100644
index 0000000000..0bca3a0228
--- /dev/null
+++ b/spec/serializers/user_bookmark_serializer_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UserBookmarkSerializer do
+  let(:bookmark) do
+    Fabricate(:bookmark)
+    Bookmark.all.includes(post: :user).includes(:topic).last
+  end
+
+  subject { described_class.new(bookmark) }
+
+  context "when the topic is deleted" do
+    before do
+      bookmark.topic.trash!
+      bookmark.reload
+    end
+    it "still returns the topic title because the relationship is unscoped" do
+      expect(subject.title).not_to eq(nil)
+    end
+  end
+
+  context "when the post is deleted" do
+    before do
+      bookmark.post.trash!
+      bookmark.reload
+    end
+    it "still returns the post number because the relationship is unscoped" do
+      expect(subject.linked_post_number).not_to eq(nil)
+    end
+    it "still returns the post username" do
+      expect(subject.username).not_to eq(nil)
+    end
+  end
+end

From 89a1b3a791275a0d2e14eaabf76c8ab5d2cbd22c Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 12 Mar 2020 16:10:56 +1000
Subject: [PATCH 092/633] Make sure reminder not sent for deleted post bookmark

---
 lib/bookmark_reminder_notification_handler.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
index 83f0b9fb3d..4591719fdc 100644
--- a/lib/bookmark_reminder_notification_handler.rb
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -7,7 +7,7 @@ class BookmarkReminderNotificationHandler
   def self.send_notification(bookmark)
     return if bookmark.blank?
     Bookmark.transaction do
-      if bookmark.post.blank?
+      if bookmark.post.blank? || bookmark.post.deleted_at.present?
         return clear_reminder(bookmark)
       end
 

From 11921c4868051db68b0aadae36926da99a2a95cd Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 12 Mar 2020 07:51:05 +0100
Subject: [PATCH 093/633] DEV: enforces ember-template-lint: no-html-comments
 (#9183)

https://github.com/ember-template-lint/ember-template-lint/blob/master/docs/rule/no-html-comments.md
---
 .template-lintrc.js                            |  3 ++-
 .../templates/modal/admin-badge-preview.hbs    | 18 +++++++++---------
 .../components/search-advanced-options.hbs     |  5 ++---
 .../discourse/templates/modal/bookmark.hbs     |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 801225fd33..17279244f3 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -13,6 +13,7 @@ module.exports = {
     "no-unbound": true,
     "simple-unless": true,
     "no-triple-curlies": true,
-    "no-partial": true
+    "no-partial": true,
+    "no-html-comments": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index 528ed5af24..eaab7e615f 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -4,15 +4,15 @@
 
     <pre class="badge-errors">{{errors}}</pre>
 
-    <!--
-    TODO we want some help pages for this, link to those instead
-    <p>
-      {{i18n "admin.badges.preview.error_help"}}
-    </p>
-    <ul>
-      <li><a href="https://meta.discourse.org/t/triggered-custom-badge-queries/19336">https://meta.discourse.org/t/triggered-custom-badge-queries/19336</a></li>
-    </ul>
-    -->
+    {{!--
+      TODO we want some help pages for this, link to those instead
+      <p>
+        {{i18n "admin.badges.preview.error_help"}}
+      </p>
+      <ul>
+        <li><a href="https://meta.discourse.org/t/triggered-custom-badge-queries/19336">https://meta.discourse.org/t/triggered-custom-badge-queries/19336</a></li>
+      </ul>
+    --}}
 
   {{else}}
     <p class="grant-count">
diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
index 36e1b5a4cb..89df8f94e3 100644
--- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -24,7 +24,7 @@
   </div>
 </div>
 
-<!-- disable these super-advanced searches for now
+{{!-- disable these super-advanced searches for now
 <div class="container">
   <div class="control-group pull-left">
     <label class="control-label" for="search-in-group">{{i18n "search.advanced.in_group.label"}}</label>
@@ -38,8 +38,7 @@
       {{badge-selector badgeFinder=badgeFinder badgeNames=searchedTerms.badge single="true" canReceiveUpdates="true"}}
     </div>
   </div>
-</div>
--->
+</div> --}}
 
 {{#if siteSettings.tagging_enabled}}
   <div class="container advanced-search-tag-group">
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 4fb9e462f9..782ebe9cab 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -57,7 +57,7 @@
 
     <div class="control-group">
       {{d-button label="bookmarks.save" class="btn-primary" action=(action "saveAndClose")}}
-      {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}      
+      {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}
     </div>
   {{/conditional-loading-spinner}}
 {{/d-modal-body}}

From 9c930c622e8f1c7d62e8650e3d40576e56c9e618 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 12 Mar 2020 18:10:03 +1100
Subject: [PATCH 094/633] FEATURE: allow for a larger maximum post length

In some documentation heavy sites larger posts may be desirable.

This is not a setting to change without thinking, however where it is
needed it can make sense. Allow for a 50% increase in max over our
previous maximum.

The old limit of 99000 is arbitrary. Stuff gets riskier the longer posts
get especially with complex markdown, however 99000 is not a threshold
where stuff automatically breaks.
---
 config/site_settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 07d0c5638d..9e9b80aaac 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -637,7 +637,7 @@ posting:
   max_post_length:
     client: true
     default: 32000
-    max: 99000
+    max: 150000
   topic_featured_link_enabled:
     client: true
     default: true

From 8e36816bde97eaa435a4c7c9cbdf6daab693ba89 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 12 Mar 2020 12:50:32 +0530
Subject: [PATCH 095/633] UX: respect `prioritize_username_in_ux` setting for
 user avatar title

---
 app/assets/javascripts/discourse/helpers/user-avatar.js.es6 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index b46a49d6ff..f306a0356f 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -1,6 +1,7 @@
 import { get } from "@ember/object";
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { avatarImg, formatUsername } from "discourse/lib/utilities";
+import { prioritizeNameInUx } from "discourse/lib/settings";
 
 let _customAvatarHelpers;
 
@@ -42,7 +43,9 @@ function renderAvatar(user, options) {
       return "";
     }
 
-    let displayName = name || formatUsername(username);
+    let displayName = prioritizeNameInUx(name, this.siteSettings)
+      ? name
+      : formatUsername(username);
 
     let title = options.title;
     if (!title && !options.ignoreTitle) {

From 00876a5bfc27124cd0e4b1b1998d43714e01983d Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 12 Mar 2020 12:57:23 +0530
Subject: [PATCH 096/633] Update required Redis version.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8f9d748d06..c3a200d108 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ To get your environment setup, follow the community setup guide for your operati
 
 If you're familiar with how Rails works and are comfortable setting up your own environment, you can also try out the [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md), which is aimed primarily at Ubuntu and macOS environments.
 
-Before you get started, ensure you have the following minimum versions: [Ruby 2.6+](https://www.ruby-lang.org/en/downloads/), [PostgreSQL 10+](https://www.postgresql.org/download/), [Redis 2.6+](https://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
+Before you get started, ensure you have the following minimum versions: [Ruby 2.6+](https://www.ruby-lang.org/en/downloads/), [PostgreSQL 10+](https://www.postgresql.org/download/), [Redis 4.0+](https://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
 
 ## Setting up Discourse
 

From 799613c859713ea0c2e31c78b04c71999a482d32 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 12 Mar 2020 13:15:32 +0530
Subject: [PATCH 097/633] fix the build.

---
 app/assets/javascripts/discourse/helpers/user-avatar.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index f306a0356f..9d5f0cdc05 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -43,7 +43,7 @@ function renderAvatar(user, options) {
       return "";
     }
 
-    let displayName = prioritizeNameInUx(name, this.siteSettings)
+    let displayName = prioritizeNameInUx(name)
       ? name
       : formatUsername(username);
 

From b7fb6d0d06ab7d023ee56d20dfd3a580996eaca9 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 12 Mar 2020 13:46:12 +0200
Subject: [PATCH 098/633] FIX: Show topic progress on iPad when
 portrait-oriented (#9181)

---
 .../javascripts/discourse/components/topic-navigation.js.es6  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
index bff5f73a2e..7c96ccf00c 100644
--- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
@@ -43,11 +43,11 @@ export default Component.extend(PanEvents, {
           headerContainer = document.querySelector(".d-header"),
           headerHeight = (headerContainer && headerContainer.offsetHeight) || 0;
 
-        if (timelineContainer && composer) {
+        if (composer) {
           renderTimeline =
             width > MIN_WIDTH_TIMELINE &&
             window.innerHeight - composer.offsetHeight - headerHeight >
-              timelineContainer.offsetHeight;
+              (timelineContainer ? timelineContainer.offsetHeight : 0);
         }
       }
 

From 8290856a4bdc62dac0366e3e42594c479e93882d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 12 Mar 2020 13:17:52 +0100
Subject: [PATCH 099/633] FIX: differentiates flag-modal and flag-modal-body
 (#9187)

This was causing body styles to be applied on the whole modal.
---
 app/assets/javascripts/discourse/templates/modal/flag.hbs | 2 +-
 app/assets/stylesheets/common/base/modal.scss             | 2 +-
 app/assets/stylesheets/mobile/modal.scss                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs
index b085e8211d..056f2bc9a3 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body class="flag-modal" title=title}}
+{{#d-modal-body class="flag-modal-body" title=title}}
   <form>
     {{#flag-selection nameKey=selected.name_key flags=flagsAvailable as |f|}}
       {{flag-action-type flag=f
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index a294453181..90a20854fd 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -594,7 +594,7 @@
   }
 }
 
-.flag-modal {
+.flag-modal-body {
   max-height: 450px;
   .flag-action-type-details {
     width: 100%;
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index b4328ae762..36777b0eee 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -79,7 +79,7 @@
 }
 
 @media only screen and (max-device-width: 568px) {
-  .modal .flag-modal .flag-message {
+  .modal .flag-modal-body .flag-message {
     height: 3em;
   }
 }

From d2bb127e2c8c4a4df30024883ee36472fc86b688 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 12 Mar 2020 13:59:43 +0100
Subject: [PATCH 100/633] FIX: prevents crash when to be unescaped emoji is not
 a string (#9189)

I couldn't get a repro so this is a shot in the dark and doesn't solve the root issue, but should prevent topic view from crashing.
---
 app/assets/javascripts/pretty-text/emoji.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/pretty-text/emoji.js.es6 b/app/assets/javascripts/pretty-text/emoji.js.es6
index 12077c0125..fa7754da59 100644
--- a/app/assets/javascripts/pretty-text/emoji.js.es6
+++ b/app/assets/javascripts/pretty-text/emoji.js.es6
@@ -92,7 +92,7 @@ function isReplacableInlineEmoji(string, index, inlineEmoji) {
 }
 
 export function performEmojiUnescape(string, opts) {
-  if (!string) {
+  if (!string || typeof string !== "string") {
     return;
   }
 

From 8d90134d0b4e3243568f1c4cc98151d365ccea77 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 12 Mar 2020 09:36:45 -0500
Subject: [PATCH 101/633] FIX: Enter submits form for hyperlink insert modal
 (#9190)

---
 .../templates/modal/insert-hyperlink.hbs      | 84 ++++++++++---------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
index 1be4aab6d5..4f3149b7b6 100644
--- a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
@@ -1,42 +1,44 @@
-{{#d-modal-body title="composer.link_dialog_title" class="insert-link"}}
-    <div class="inputs">
-      {{text-field
-        value=linkUrl
-        placeholderKey="composer.link_url_placeholder"
-        class="link-url"
-        key-up=(action "search")
-      }}
-      {{#if searchLoading}}
-        {{loading-spinner}}
-      {{/if}}
-      {{#if searchResults}}
-        <div class="internal-link-results">
-          {{#each searchResults as |result|}}
-            <a
-              class="search-link"
-              href={{result.url}}
-              onclick={{action "linkClick"}}
-              data-title={{result.title}}>
-              {{topic-status topic=result disableActions=true}}
-              {{replace-emoji result.fancy_title}}
-              <div class="search-category">
-                {{#if result.category.parentCategory}}
-                  {{category-link result.category.parentCategory}}
-                {{/if}}
-                {{category-link result.category hideParent=true}}
-                {{discourse-tags result}}
-              </div>
-            </a>
-          {{/each}}
-        </div>
-      {{/if}}
-    </div>
-    <div class="inputs">
-      {{text-field value=linkText placeholderKey="composer.link_optional_text" class="link-text"}}
-    </div>
-{{/d-modal-body}}
+<form {{action "ok" on="submit"}}>
+  {{#d-modal-body title="composer.link_dialog_title" class="insert-link"}}
+      <div class="inputs">
+        {{text-field
+          value=linkUrl
+          placeholderKey="composer.link_url_placeholder"
+          class="link-url"
+          key-up=(action "search")
+        }}
+        {{#if searchLoading}}
+          {{loading-spinner}}
+        {{/if}}
+        {{#if searchResults}}
+          <div class="internal-link-results">
+            {{#each searchResults as |result|}}
+              <a
+                class="search-link"
+                href={{result.url}}
+                onclick={{action "linkClick"}}
+                data-title={{result.title}}>
+                {{topic-status topic=result disableActions=true}}
+                {{replace-emoji result.fancy_title}}
+                <div class="search-category">
+                  {{#if result.category.parentCategory}}
+                    {{category-link result.category.parentCategory}}
+                  {{/if}}
+                  {{category-link result.category hideParent=true}}
+                  {{discourse-tags result}}
+                </div>
+              </a>
+            {{/each}}
+          </div>
+        {{/if}}
+      </div>
+      <div class="inputs">
+        {{text-field value=linkText placeholderKey="composer.link_optional_text" class="link-text"}}
+      </div>
+  {{/d-modal-body}}
 
-<div class="modal-footer">
-  {{d-button class="btn-primary" label="composer.modal_ok" action=(action "ok")}}
-  {{d-button class="btn-danger" label="composer.modal_cancel" action=(action "cancel")}}
-</div>
+  <div class="modal-footer">
+    {{d-button class="btn-primary" label="composer.modal_ok" action=(action "ok") type="submit"}}
+    {{d-button class="btn-danger" label="composer.modal_cancel" action=(action "cancel")}}
+  </div>
+</form>

From aa4e76b480c292a83607fc882e6f240acd412810 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2020 11:16:29 -0400
Subject: [PATCH 102/633] Build(deps-dev): Bump ruby-prof from 1.3.0 to 1.3.1
 (#9186)

Bumps [ruby-prof](https://github.com/ruby-prof/ruby-prof) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/ruby-prof/ruby-prof/releases)
- [Changelog](https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES)
- [Commits](https://github.com/ruby-prof/ruby-prof/compare/1.3.0...1.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ea4840a1ae..60d55158f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -349,7 +349,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 1.7)
     rubocop-discourse (1.0.2)
       rubocop (>= 0.69.0)
-    ruby-prof (1.3.0)
+    ruby-prof (1.3.1)
     ruby-progressbar (1.10.1)
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)

From 1b8793e7a41e8053e53c332da3c05bb40f9d73dc Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <stasiek@michalski.cc>
Date: Thu, 12 Mar 2020 16:23:55 +0100
Subject: [PATCH 103/633] FEATURE: Add support for custom gravatar-like
 services (#9137)

Adds 3 config values that allow to set a custom provider of Gravatar-like API accessible from gravatar_base_url. The gravatar_name is purely cosmetic, but helps with associating name with the service that actually provides the avatars. gravatar_login_url is a link relative to gravatar_base_url, which provides the user with the login to the Gravatar service
---
 .../discourse/controllers/avatar-selector.js.es6       |  5 +++++
 .../discourse/templates/modal/avatar-selector.hbs      |  6 +++---
 app/models/user.rb                                     |  2 +-
 app/models/user_avatar.rb                              |  2 +-
 config/locales/client.en.yml                           |  8 ++++----
 config/locales/server.en.yml                           |  4 ++++
 config/site_settings.yml                               |  9 +++++++++
 spec/models/user_spec.rb                               | 10 ++++++++++
 8 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
index 959b296cec..5fdbe79e3e 100644
--- a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
+++ b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
@@ -4,8 +4,13 @@ import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { allowsImages } from "discourse/lib/uploads";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { setting } from "discourse/lib/computed";
 
 export default Controller.extend(ModalFunctionality, {
+  gravatarName: setting("gravatar_name"),
+  gravatarBaseUrl: setting("gravatar_base_url"),
+  gravatarLoginUrl: setting("gravatar_login_url"),
+
   @discourseComputed(
     "selected",
     "user.system_avatar_upload_id",
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index 10e5c4bf26..98504b0981 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -14,16 +14,16 @@
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar'}} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar' gravatarName=gravatarName gravatarBaseUrl=gravatarBaseUrl gravatarLoginUrl=gravatarLoginUrl }} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
-                 title="user.change_avatar.refresh_gravatar_title"
+                 translatedTitle=(i18n "user.change_avatar.refresh_gravatar_title" gravatarName=gravatarName)
                  disabled=gravatarRefreshDisabled
                  icon="sync"
                  class="btn-default avatar-selector-refresh-gravatar"}}
 
       {{#if gravatarFailed}}
-        <p class="error">{{i18n 'user.change_avatar.gravatar_failed'}}</p>
+        <p class="error">{{I18n 'user.change_avatar.gravatar_failed' gravatarName=gravatarName}}</p>
       {{/if}}
     </div>
     {{#if allowAvatarUpload}}
diff --git a/app/models/user.rb b/app/models/user.rb
index fd81a979d0..4b0437261c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -741,7 +741,7 @@ class User < ActiveRecord::Base
   end
 
   def self.gravatar_template(email)
-    "//www.gravatar.com/avatar/#{self.email_hash(email)}.png?s={size}&r=pg&d=identicon"
+    "//#{SiteSetting.gravatar_base_url}/avatar/#{self.email_hash(email)}.png?s={size}&r=pg&d=identicon"
   end
 
   # Don't pass this up to the client - it's meant for server side use
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index 215524a743..c3df573c32 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -20,7 +20,7 @@ class UserAvatar < ActiveRecord::Base
         return if user.blank? || user.primary_email.blank?
 
         email_hash = user_id == Discourse::SYSTEM_USER_ID ? User.email_hash("info@discourse.org") : user.email_hash
-        gravatar_url = "https://www.gravatar.com/avatar/#{email_hash}.png?s=#{max}&d=404"
+        gravatar_url = "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404"
 
         # follow redirects in case gravatar change rules on us
         tempfile = FileHelper.download(
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4d61f5a28a..a276cc8614 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1057,10 +1057,10 @@ en:
 
       change_avatar:
         title: "Change your profile picture"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, based on"
-        gravatar_title: "Change your avatar on Gravatar's website"
-        gravatar_failed: "We could not find a Gravatar with that email address."
-        refresh_gravatar_title: "Refresh your Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, based on"
+        gravatar_title: "Change your avatar on {{gravatarName}}'s website"
+        gravatar_failed: "We could not find a {{gravatarName}} with that email address."
+        refresh_gravatar_title: "Refresh your {{gravatarName}}"
         letter_based: "System assigned profile picture"
         uploaded_avatar: "Custom picture"
         uploaded_avatar_empty: "Add a custom picture"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f260855087..4b7298af42 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2185,6 +2185,10 @@ en:
 
     dashboard_general_tab_activity_metrics: "Choose reports to be displayed as activity metrics on the general tab."
 
+    gravatar_name: "Name of the Gravatar provider"
+    gravatar_base_url: "Url of the Gravatar provider's API base"
+    gravatar_login_url: "Url relative to gravatar_base_url, which provides the user with the login to the Gravatar service"
+
     errors:
       invalid_email: "Invalid email address."
       invalid_username: "There's no user with that username."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 9e9b80aaac..56d742e565 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -598,6 +598,15 @@ users:
     client: true
   max_notifications_per_user:
     default: 10000
+  gravatar_name:
+    default: Gravatar
+    client: true
+  gravatar_base_url:
+    default: www.gravatar.com
+    client: true
+  gravatar_login_url:
+    default: /emails
+    client: true
 
 groups:
   enable_group_directory:
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d94d8d47c5..3e62fd0588 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1248,6 +1248,16 @@ describe User do
 
   end
 
+  describe "#custom_gravatar" do
+    before do
+      SiteSetting.gravatar_base_url = "seccdn.libravatar.org"
+    end
+
+    it "returns a gravatar url as set in the settings" do
+      expect(User.gravatar_template("em@il.com")).to eq("//seccdn.libravatar.org/avatar/6dc2fde946483a1d8a84b89345a1b638.png?s={size}&r=pg&d=identicon")
+    end
+  end
+
   describe "#letter_avatar_color" do
     before do
       SiteSetting.restrict_letter_avatar_colors = "2F70AC|ED207B|AAAAAA|77FF33"

From 59578dfc5b9c7c445170b55614419362ba08a44b Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Thu, 12 Mar 2020 10:31:16 +0000
Subject: [PATCH 104/633] FIX: Notification emails with attachments are
 incorrectly structured

Two behaviors in the mail gem collide:

 1. Attachments are added as extra parts at the top level,
 2. When there are both text and html parts, the content type is set to
    'multipart/alternative'.

Since attachments aren't alternative renderings, for emails that contain
attachments and both html and text parts, some coercing is necessary.
---
 lib/email/sender.rb                  | 44 ++++++++++++++++++++++++++++
 spec/components/email/sender_spec.rb | 10 +++++++
 2 files changed, 54 insertions(+)

diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index 9fab38906b..bce5fc90de 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -270,6 +270,50 @@ module Email
           )
         end
       end
+
+      fix_parts_after_attachments!
+    end
+
+    #
+    # Two behaviors in the mail gem collide:
+    #
+    #  1. Attachments are added as extra parts at the top level,
+    #  2. When there are both text and html parts, the content type is set
+    #     to 'multipart/alternative'.
+    #
+    # Since attachments aren't alternative renderings, for emails that contain
+    # attachments and both html and text parts, some coercing is necessary.
+    #
+    # When there are alternative rendering and attachments, this method causes
+    # the top level to be 'multipart/mixed' and puts the html and text parts
+    # into a nested 'multipart/alternative' part.
+    #
+    # Due to mail gem magic, @message.text_part and @message.html_part still
+    # refer to the same objects.
+    #
+    def fix_parts_after_attachments!
+      has_attachments = @message.attachments.present?
+      has_alternative_renderings =
+        @message.html_part.present? && @message.text_part.present?
+
+      if has_attachments && has_alternative_renderings
+        @message.content_type = "multipart/mixed"
+
+        html_part = @message.html_part
+        @message.html_part = nil
+
+        text_part = @message.text_part
+        @message.text_part = nil
+
+        content = Mail::Part.new do
+          content_type "multipart/alternative"
+
+          part html_part
+          part text_part
+        end
+
+        @message.parts.unshift(content)
+      end
     end
 
     def header_value(name)
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index 59730e9b48..a93e1cd410 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -412,6 +412,16 @@ describe Email::Sender do
       expect(message.attachments.map(&:filename))
         .to contain_exactly(*[small_pdf, csv_file].map(&:original_filename))
     end
+
+    it "structures the email as a multipart/mixed with a multipart/alternative first part" do
+      SiteSetting.email_total_attachment_size_limit_kb = 10_000
+      Email::Sender.new(message, :valid_type).send
+
+      expect(message.content_type).to start_with("multipart/mixed")
+      expect(message.parts.size).to eq(4)
+      expect(message.parts[0].content_type).to start_with("multipart/alternative")
+      expect(message.parts[0].parts.size).to eq(2)
+    end
   end
 
   context 'with a deleted post' do

From 6102c287f776682c63be1ffb6554622267fe2522 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 12 Mar 2020 16:50:20 +0100
Subject: [PATCH 105/633] FIX: prevents i18n helper to return a SafeString
 (#9191)

For convenience the i18n helper has been made returning a SafeString, but when used with other helpers, a String is expected and will cause unexpected behaviors.

This is the root cause of the initial bug fixed in https://github.com/discourse/discourse/commit/d2bb127e2c8c4a4df30024883ee36472fc86b688

This commit is kept as it's a better security in case of unexpected behavior.
---
 .../components/admin-report-storage-stats.hbs        |  2 +-
 .../templates/components/penalty-post-action.hbs     |  2 +-
 .../admin/templates/components/silence-details.hbs   |  2 +-
 .../templates/components/suspension-details.hbs      |  4 ++--
 .../admin/templates/dashboard_general.hbs            |  2 +-
 app/assets/javascripts/admin/templates/embedding.hbs |  2 +-
 .../admin/templates/modal/admin-badge-preview.hbs    |  4 ++--
 .../javascripts/admin/templates/user-index.hbs       |  2 +-
 .../javascripts/discourse-common/helpers/i18n.js.es6 |  3 +--
 .../discourse/helpers/replace-emoji.js.es6           |  8 ++++----
 .../discourse/templates/account-created/resent.hbs   |  2 +-
 .../templates/components/discourse-banner.hbs        |  2 +-
 .../templates/components/edit-category-general.hbs   |  2 +-
 .../templates/components/edit-category-security.hbs  |  2 +-
 .../discourse/templates/components/ip-lookup.hbs     |  2 +-
 .../templates/components/related-messages.hbs        |  2 +-
 .../templates/components/shared-draft-controls.hbs   |  2 +-
 .../discourse/templates/components/tag-info.hbs      |  2 +-
 .../discourse/templates/components/user-stat.hbs     |  2 +-
 .../discourse/templates/modal/activation-resent.hbs  |  2 +-
 .../discourse/templates/modal/auth-token.hbs         |  2 +-
 .../discourse/templates/modal/avatar-selector.hbs    |  4 ++--
 .../discourse/templates/modal/bookmark.hbs           |  2 +-
 .../discourse/templates/modal/change-owner.hbs       |  8 +++++---
 .../templates/modal/delete-topic-disallowed.hbs      |  2 +-
 .../discourse/templates/modal/feature-topic.hbs      | 12 ++++++------
 .../discourse/templates/modal/move-to-topic.hbs      | 10 +++++-----
 .../discourse/templates/modal/not-activated.hbs      |  2 +-
 .../discourse/templates/modal/post-enqueued.hbs      |  2 +-
 .../modal/second-factor-add-security-key.hbs         |  2 +-
 .../templates/modal/second-factor-add-totp.hbs       |  2 +-
 .../templates/modal/second-factor-backup-edit.hbs    |  2 +-
 .../discourse/templates/modal/topic-bulk-actions.hbs |  2 +-
 .../templates/preferences-second-factor.hbs          |  2 +-
 .../discourse/templates/preferences/account.hbs      |  2 +-
 .../discourse/templates/preferences/emails.hbs       |  2 +-
 app/assets/javascripts/discourse/templates/topic.hbs |  2 +-
 .../discourse/templates/user-invited-show.hbs        |  2 +-
 .../components/discourse-local-dates-create-form.hbs |  2 +-
 39 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index d6e42cd414..246d23be25 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -15,7 +15,7 @@
 
       {{#if backupStats.last_backup_taken_at}}
         <br>
-        {{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}
+        {{html-safe (i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true"))}}
       {{/if}}
     </p>
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
index a6c848541f..b566df7de6 100644
--- a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
+++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
@@ -1,7 +1,7 @@
 <div class='penalty-post-controls'>
   <label>
     <div class='penalty-post-label'>
-      {{i18n 'admin.user.penalty_post_actions'}}
+      {{html-safe (i18n 'admin.user.penalty_post_actions')}}
     </div>
   </label>
   {{combo-box
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index af1b4980d5..bdcb21cbc5 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -1,7 +1,7 @@
 <div class='reason-controls'>
   <label>
     <div class='silence-reason-label'>
-      {{i18n 'admin.user.silence_reason_label'}}
+      {{html-safe (i18n 'admin.user.silence_reason_label')}}
     </div>
     </label>
     {{text-field
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
index 4dcc606b2b..70968ae746 100644
--- a/app/assets/javascripts/admin/templates/components/suspension-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -2,9 +2,9 @@
   <label>
     <div class='suspend-reason-label'>
       {{#if siteSettings.hide_suspension_reasons}}
-        {{i18n 'admin.user.suspend_reason_hidden_label'}}
+        {{html-safe (i18n 'admin.user.suspend_reason_hidden_label')}}
       {{else}}
-        {{i18n 'admin.user.suspend_reason_label'}}
+        {{html-safe (i18n 'admin.user.suspend_reason_label')}}
       {{/if}}
     </div>
   </label>
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index d190b7664b..94150fef95 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -142,7 +142,7 @@
         filters=trendingSearchFilters
         isEnabled=logSearchQueriesEnabled
         disabledLabel=trendingSearchDisabledLabel}}
-      {{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}
+      {{html-safe (i18n "admin.dashboard.reports.trending_search.more" basePath=basePath)}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index 1777263674..2a5d39f12c 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -23,7 +23,7 @@
 
 {{#if showSecondary}}
   <div class='embedding-secondary'>
-    <p>{{i18n "admin.embedding.sample"}}</p>
+    <p>{{html-safe (i18n "admin.embedding.sample")}}</p>
     {{highlighted-code code=embeddingCode lang="html"}}
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index eaab7e615f..219dee18d4 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -17,9 +17,9 @@
   {{else}}
     <p class="grant-count">
       {{#if count}}
-        {{i18n "admin.badges.preview.grant_count" count=count}}
+        {{html-safe (i18n "admin.badges.preview.grant_count" count=count)}}
       {{else}}
-        {{i18n "admin.badges.preview.no_grant_count"}}
+        {{html-safe (i18n "admin.badges.preview.no_grant_count")}}
       {{/if}}
     </p>
 
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 23a1a6aae3..f5abf9f8dd 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -132,7 +132,7 @@
     <div class="field">{{i18n "user.avatar.title"}}</div>
     <div class="value">{{avatar model imageSize="large"}}</div>
     <div class="controls">
-      {{i18n "admin.user.visit_profile" url=preferencesPath}}
+      {{html-safe (i18n "admin.user.visit_profile" url=preferencesPath)}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
index c3d7f1e448..902ed699bf 100644
--- a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
@@ -1,7 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
-import { htmlSafe } from "@ember/template";
 
-registerUnbound("i18n", (key, params) => htmlSafe(I18n.t(key, params)));
+registerUnbound("i18n", (key, params) => I18n.t(key, params));
 registerUnbound("i18n-yes-no", (value, params) =>
   I18n.t(value ? "yes_value" : "no_value", params)
 );
diff --git a/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6 b/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
index 37365a5781..80a5dd4210 100644
--- a/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
+++ b/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
@@ -1,7 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { emojiUnescape } from "discourse/lib/text";
+import { htmlSafe } from "@ember/template";
 
-registerUnbound(
-  "replace-emoji",
-  text => new Handlebars.SafeString(emojiUnescape(text))
-);
+registerUnbound("replace-emoji", text => {
+  return htmlSafe(emojiUnescape(text));
+});
diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
index 5ad9168986..16c29c4b9b 100644
--- a/app/assets/javascripts/discourse/templates/account-created/resent.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
@@ -1,6 +1,6 @@
 <div class='ac-message'>
   {{#if email}}
-    {{i18n 'login.sent_activation_email_again' currentEmail=email}}
+    {{html-safe (i18n 'login.sent_activation_email_again' currentEmail=email)}}
   {{else}}
     {{i18n 'login.sent_activation_email_again_generic'}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index cda2c2069a..9b6b18c530 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -5,7 +5,7 @@
       <div id="banner-content">
         {{html-safe content}}
         {{#if currentUser.staff}}
-          <p><a href={{banner.url}}>{{i18n "banner.edit"}}</a></p>
+          <p><a href={{banner.url}}>{{html-safe (i18n "banner.edit")}}</a></p>
         {{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 7884f85e1f..9799c5ee42 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,7 +1,7 @@
 {{#if category.isUncategorizedCategory}}
   <p class="warning">
     {{d-icon "exclamation-triangle"}}
-    {{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}
+    {{html-safe (i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink)}}
   </p>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index 5b132092c4..68fb66239c 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -11,7 +11,7 @@
       {{#each category.permissions as |p|}}
         <li>
           <span class="name"><span class="badge-group">{{p.group_name}}</span></span>
-          {{i18n "category.can"}}
+          {{html-safe (i18n "category.can")}}
           <span class="permission">{{p.permission.description}}</span>
           {{#if editingPermissions}}
             <a class="remove-permission" href {{action "removePermission" p}}>{{d-icon "times-circle"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 9b7b7bebc4..35e074e661 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -14,7 +14,7 @@
       {{d-button action=(action "copy") class="pull-right no-text" icon="copy"}}
     {{/if}}
     <h4>{{i18n "ip_lookup.title"}}</h4>
-    <p class='powered-by'>{{i18n "ip_lookup.powered_by"}}</p>
+    <p class='powered-by'>{{html-safe (i18n "ip_lookup.powered_by")}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
index 09e1abb1a1..d4443bd2c3 100644
--- a/app/assets/javascripts/discourse/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
@@ -10,5 +10,5 @@
 </div>
 
 {{#if targetUser}}
-  <h3 class="see-all-pms-message">{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}</h3>
+  <h3 class="see-all-pms-message">{{html-safe (i18n "related_messages.see_all" path=searchLink username=targetUser.username)}}</h3>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
index d42eb1b177..f641a14a56 100644
--- a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
@@ -2,7 +2,7 @@
   {{#if publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
-    {{i18n "shared_drafts.notice" category=topic.category.name}}
+    {{html-safe (i18n "shared_drafts.notice" category=topic.category.name)}}
 
     <div class='publish-field'>
       <label>{{i18n "shared_drafts.destination_category"}}</label>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
index aa1f4889d1..b1031c4558 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
@@ -32,7 +32,7 @@
     {{#if tagInfo.synonyms}}
       <div class="synonyms-list">
         <h3>{{i18n "tagging.synonyms"}}</h3>
-        <div>{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}</div>
+        <div>{{html-safe (i18n "tagging.synonyms_description" base_tag_name=tagInfo.name)}}</div>
         <div class="tag-list">
           {{#each tagInfo.synonyms as |tag|}}
             <div class='tag-box'>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 69704bf892..20bbb3204a 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -9,5 +9,5 @@
 </span>
 <span class='label'>
   {{#if icon}}{{d-icon icon}}{{/if}}
-  {{i18n label count=value}}
+  {{html-safe (i18n label count=value)}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
index 7439589d5c..8780608607 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}
+  {{html-safe (i18n 'login.sent_activation_email_again' currentEmail=currentEmail)}}
 {{/d-modal-body}}
 
 {{modal-footer-close closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index 5390227a2e..add7e7ce5a 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="user.auth_tokens.was_this_you"}}
   <div>
     <p>{{i18n 'user.auth_tokens.was_this_you_description'}}</p>
-    <p>{{i18n 'user.second_factor.extended_description'}}</p>
+    <p>{{html-safe (i18n 'user.second_factor.extended_description')}}</p>
   </div>
 
   <div>
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index 98504b0981..edc2c4a4d8 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -10,11 +10,11 @@
   {{else}}
     <div class="avatar-choice">
       {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
-      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{i18n 'user.change_avatar.letter_based'}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{html-safe (i18n 'user.change_avatar.letter_based')}}</label>
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar' gravatarName=gravatarName gravatarBaseUrl=gravatarBaseUrl gravatarLoginUrl=gravatarLoginUrl }} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{html-safe (i18n 'user.change_avatar.gravatar' gravatarName=gravatarName gravatarBaseUrl=gravatarBaseUrl gravatarLoginUrl=gravatarLoginUrl)}} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
                  translatedTitle=(i18n "user.change_avatar.refresh_gravatar_title" gravatarName=gravatarName)
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 782ebe9cab..661ab90f27 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -50,7 +50,7 @@
         {{/if}}
 
       {{else}}
-        <div class="alert alert-info">{{i18n "bookmarks.no_timezone" basePath=basePath }}</div>
+        <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
       {{/if}}
     </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index a4e0a35c9b..13ee97c97b 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,8 +1,10 @@
 {{#d-modal-body class='change-ownership'}}
   <span>
-    {{i18n (if selectedPostsUsername 'topic.change_owner.instructions' 'topic.change_owner.instructions_without_old_user')
-           count=selectedPostsCount
-           old_user=selectedPostsUsername}}
+    {{html-safe (i18n (if selectedPostsUsername 'topic.change_owner.instructions' 'topic.change_owner.instructions_without_old_user')
+        count=selectedPostsCount
+        old_user=selectedPostsUsername
+      )
+    }}
   </span>
 
   <form>
diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
index 61e693a9af..b6ab282d38 100644
--- a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  <p>{{i18n "post.controls.delete_topic_disallowed_modal"}}</p>
+  <p>{{html-safe (i18n "post.controls.delete_topic_disallowed_modal")}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="close"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index be55ea8460..4dbbafd384 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -6,9 +6,9 @@
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
               {{#if pinnedGloballyCount}}
-                {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
+                {{html-safe (i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount)}}
               {{else}}
-                {{i18n "topic.feature_topic.not_pinned_globally"}}
+                {{html-safe (i18n "topic.feature_topic.not_pinned_globally")}}
               {{/if}}
             {{/conditional-loading-spinner}}
           </p>
@@ -74,9 +74,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if pinnedGloballyCount}}
-              {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
+              {{html-safe (i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount)}}
             {{else}}
-              {{i18n "topic.feature_topic.not_pinned_globally"}}
+              {{html-safe (i18n "topic.feature_topic.not_pinned_globally")}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
@@ -123,9 +123,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if bannerCount}}
-              {{i18n "topic.feature_topic.banner_exists"}}
+              {{html-safe (i18n "topic.feature_topic.banner_exists")}}
             {{else}}
-              {{i18n "topic.feature_topic.no_banner_exists"}}
+              {{html-safe (i18n "topic.feature_topic.no_banner_exists")}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index ae591397a7..d678ce760a 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -17,7 +17,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
+        <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -31,7 +31,7 @@
     {{/if}}
 
     {{#if existingMessage}}
-      <p>{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}</p>
+      <p>{{html-safe (i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount)}}</p>
       <form>
         {{choose-message currentTopicId=model.id selectedTopicId=selectedTopicId}}
 
@@ -64,7 +64,7 @@
     </div>
 
     {{#if existingTopic}}
-      <p>{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}</p>
+      <p>{{html-safe (i18n 'topic.merge_topic.instructions' count=selectedPostsCount)}}</p>
       <form>
         {{choose-topic currentTopicId=model.id selectedTopicId=selectedTopicId}}
       </form>
@@ -72,7 +72,7 @@
 
     {{#if canSplitTopic}}
       {{#if newTopic}}
-        <p>{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}</p>
+        <p>{{html-safe (i18n 'topic.split_topic.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.split_topic.topic_name'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -93,7 +93,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
+        <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index e9d93aa8f6..b1ba99bdc9 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{i18n 'login.not_activated' sentTo=sentTo}}
+  {{html-safe (i18n 'login.not_activated' sentTo=sentTo)}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
index 3687b9fb2b..d34557528e 100644
--- a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body}}
   <p>{{i18n "review.approval.description"}}</p>
 
-  <p>{{i18n "review.approval.pending_posts" count=model.pending_count}}</p>
+  <p>{{html-safe (i18n "review.approval.pending_posts" count=model.pending_count)}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="review.approval.ok"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index c6539a2e52..c97746956d 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{i18n 'user.second_factor.enable_security_key_description'}}
+        {{html-safe (i18n 'user.second_factor.enable_security_key_description')}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index 9caf24fc46..dd37835554 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{i18n 'user.second_factor.enable_description'}}
+        {{html-safe (i18n 'user.second_factor.enable_description')}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
index 713bdbfcc4..e9988b486f 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
@@ -14,7 +14,7 @@
     {{/if}}
 
     {{#if backupEnabled}}
-      {{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}
+      {{html-safe (i18n "user.second_factor_backup.remaining_codes" count=remainingCodes)}}
     {{/if}}
 
     <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index fe3ce8be48..b9eb57fe8c 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,4 +1,4 @@
 {{#d-modal-body}}
-  <p>{{i18n 'topics.bulk.selected' count=model.topics.length}}</p>
+  <p>{{html-safe (i18n 'topics.bulk.selected' count=model.topics.length)}}</p>
   {{outlet "bulkOutlet"}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index fc6c00a13b..e146d073ca 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -86,7 +86,7 @@
           <h2>{{i18n "user.second_factor_backup.title"}}</h2>
           {{#if model.second_factor_enabled}}
             {{#if model.second_factor_backup_enabled}}
-              {{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}
+              {{html-safe (i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes)}}
             {{else}}
               {{i18n 'user.second_factor_backup.enable_long'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 62743b5a5a..3f02b15238 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -9,7 +9,7 @@
   </div>
   {{#if siteSettings.enable_mentions}}
     <div class='instructions'>
-      {{i18n 'user.username.short_instructions' username=model.username}}
+      {{html-safe (i18n 'user.username.short_instructions' username=model.username)}}
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index bd9aa411ac..5e54c3af93 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -73,7 +73,7 @@
   <div class='control-group pref-mailing-list-mode'>
     <label class="control-label">{{i18n 'user.mailing_list_mode.label'}}</label>
     {{preference-checkbox labelKey="user.mailing_list_mode.enabled" checked=model.user_option.mailing_list_mode}}
-    <div class='instructions'>{{i18n 'user.mailing_list_mode.instructions'}}</div>
+    <div class='instructions'>{{html-safe (i18n 'user.mailing_list_mode.instructions')}}</div>
     {{#if model.user_option.mailing_list_mode}}
       <div class='controls controls-dropdown'>
         {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index e5894c03ca..7b8c2d1b81 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -277,7 +277,7 @@
               {{#if model.queued_posts_count}}
                 <div class="has-pending-posts">
                   <div>
-                    {{i18n "review.topic_has_pending" count=model.queued_posts_count}}
+                    {{html-safe (i18n "review.topic_has_pending" count=model.queued_posts_count)}}
                   </div>
 
                   {{#link-to 'review' (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index f8f5effb60..bd8e75f1e4 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -109,7 +109,7 @@
         {{else}}
           <div class="user-invite-none">
             {{#if canBulkInvite}}
-              {{i18n 'user.invited.bulk_invite.none'}}
+              {{html-safe (i18n 'user.invited.bulk_invite.none')}}
             {{else}}
               {{i18n 'user.invited.none'}}
             {{/if}}
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 6fb9ecf7c6..30bc69e34d 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -85,7 +85,7 @@
             <label class="control-label">
               {{i18n "discourse_local_dates.create.form.recurring_title"}}
             </label>
-            <p>{{i18n "discourse_local_dates.create.form.recurring_description"}}</p>
+            <p>{{html-safe (i18n "discourse_local_dates.create.form.recurring_description")}}</p>
             <div class="controls">
               {{combo-box
                 content=recurringOptions

From ec2d49d48a9576a9d07f2c99b49bf3f6b79cd32f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 12 Mar 2020 16:35:28 +0000
Subject: [PATCH 106/633] DEV: Allow plugins to add theme modifiers via db
 migrations (#9192)

---
 app/models/remote_theme.rb             |  2 +-
 app/models/theme.rb                    |  2 +-
 app/models/theme_modifier_set.rb       | 41 +++++++++++++++++++-------
 lib/theme_modifier_helper.rb           |  2 +-
 spec/models/theme_modifier_set_spec.rb |  6 ++++
 5 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index 6afa44c2a1..e95fe25c51 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -145,7 +145,7 @@ class RemoteTheme < ActiveRecord::Base
       raise ImportError, I18n.t("themes.import_error.about_json_values", errors: self.errors.full_messages.join(","))
     end
 
-    ThemeModifierSet::MODIFIERS.keys.each do |modifier_name|
+    ThemeModifierSet.modifiers.keys.each do |modifier_name|
       theme.theme_modifier_set.public_send(:"#{modifier_name}=", theme_info.dig("modifiers", modifier_name.to_s))
     end
     if !theme.theme_modifier_set.valid?
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 35fd663092..c20e04d905 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -538,7 +538,7 @@ class Theme < ActiveRecord::Base
       end
 
       meta[:modifiers] = {}.tap do |hash|
-        ThemeModifierSet::MODIFIERS.keys.each do |modifier|
+        ThemeModifierSet.modifiers.keys.each do |modifier|
           value = self.theme_modifier_set.public_send(modifier)
           hash[modifier] = value if !value.nil?
         end
diff --git a/app/models/theme_modifier_set.rb b/app/models/theme_modifier_set.rb
index 262b0638ae..99a8818f58 100644
--- a/app/models/theme_modifier_set.rb
+++ b/app/models/theme_modifier_set.rb
@@ -4,16 +4,14 @@ class ThemeModifierSet < ActiveRecord::Base
 
   belongs_to :theme
 
-  MODIFIERS ||= {
-    serialize_topic_excerpts: { combine_mode: :any, type: :boolean },
-    csp_extensions: { combine_mode: :flatten, type: :string_array },
-    svg_icons: { combine_mode: :flatten, type: :string_array },
-  }
+  def self.modifiers
+    @modifiers ||= self.load_modifiers
+  end
 
   validate :type_validator
 
   def type_validator
-    MODIFIERS.each do |k, config|
+    ThemeModifierSet.modifiers.each do |k, config|
       value = public_send(k)
       next if value.nil?
 
@@ -39,18 +37,41 @@ class ThemeModifierSet < ActiveRecord::Base
   # Given the ids of multiple active themes / theme components, this function
   # will combine them into a 'resolved' behavior
   def self.resolve_modifier_for_themes(theme_ids, modifier_name)
-    return nil if !(config = MODIFIERS[modifier_name])
+    return nil if !(config = self.modifiers[modifier_name])
 
     all_values = self.where(theme_id: theme_ids).where.not(modifier_name => nil).pluck(modifier_name)
-    case config[:combine_mode]
-    when :any
+    case config[:type]
+    when :boolean
       all_values.any?
-    when :flatten
+    when :string_array
       all_values.flatten(1)
     else
       raise ThemeModifierSetError "Invalid theme modifier combine_mode"
     end
   end
+
+  private
+
+  # Build the list of modifiers from the DB schema.
+  # This allows plugins to introduce new modifiers by adding columns to the table
+  def self.load_modifiers
+    hash = {}
+    columns_hash.each do |column_name, info|
+      next if ["id", "theme_id"].include?(column_name)
+
+      type = nil
+      if info.type == :string && info.array?
+        type = :string_array
+      elsif info.type == :boolean && !info.array?
+        type = :boolean
+      else
+        raise ThemeModifierSetError "Invalid theme modifier column type" if ![:boolean, :string].include?(info.type)
+      end
+
+      hash[column_name.to_sym] = { type: type }
+    end
+    hash
+  end
 end
 
 # == Schema Information
diff --git a/lib/theme_modifier_helper.rb b/lib/theme_modifier_helper.rb
index 3d72a6d35a..74f49b322a 100644
--- a/lib/theme_modifier_helper.rb
+++ b/lib/theme_modifier_helper.rb
@@ -4,7 +4,7 @@ class ThemeModifierHelper
     @theme_ids = theme_ids || request&.env&.[](:resolved_theme_ids)
   end
 
-  ThemeModifierSet::MODIFIERS.keys.each do |modifier|
+  ThemeModifierSet.modifiers.keys.each do |modifier|
     define_method(modifier) do
       Theme.lookup_modifier(@theme_ids, modifier)
     end
diff --git a/spec/models/theme_modifier_set_spec.rb b/spec/models/theme_modifier_set_spec.rb
index ca770f339f..9e7cbf0e02 100644
--- a/spec/models/theme_modifier_set_spec.rb
+++ b/spec/models/theme_modifier_set_spec.rb
@@ -20,5 +20,11 @@ describe ThemeModifierSet do
 
       expect(ThemeModifierSet.resolve_modifier_for_themes([t1.id, t2.id], :serialize_topic_excerpts)).to eq(false)
     end
+
+    it "builds modifiers list from database" do
+      expect(ThemeModifierSet.modifiers.keys).to include(:serialize_topic_excerpts, :csp_extensions)
+      expect(ThemeModifierSet.modifiers[:serialize_topic_excerpts][:type]).to eq(:boolean)
+      expect(ThemeModifierSet.modifiers[:csp_extensions][:type]).to eq(:string_array)
+    end
   end
 end

From 032205e2029cbf82dc8f05b459fb93adf2503c60 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 12 Mar 2020 13:29:55 -0400
Subject: [PATCH 107/633] Rename many `.js.es6` files to `.js`

---
 .github/workflows/ci.yml                             |  2 +-
 Dangerfile                                           |  6 +++---
 .../{email-template.js.es6 => email-template.js}     |  0
 .../discourse/adapters/{group.js.es6 => group.js}    |  0
 .../{notification.js.es6 => notification.js}         |  0
 ...st-reply-history.js.es6 => post-reply-history.js} |  0
 .../adapters/{post-reply.js.es6 => post-reply.js}    |  0
 .../discourse/adapters/{post.js.es6 => post.js}      |  0
 .../discourse/adapters/{rest.js.es6 => rest.js}      |  0
 ...-explanation.js.es6 => reviewable-explanation.js} |  0
 ...ewable-settings.js.es6 => reviewable-settings.js} |  0
 .../{reviewable-topic.js.es6 => reviewable-topic.js} |  0
 .../adapters/{reviewable.js.es6 => reviewable.js}    |  0
 .../adapters/{tag-info.js.es6 => tag-info.js}        |  0
 .../{tag-notification.js.es6 => tag-notification.js} |  0
 .../adapters/{topic-list.js.es6 => topic-list.js}    |  0
 .../discourse/adapters/{topic.js.es6 => topic.js}    |  0
 .../{about-page-users.js.es6 => about-page-users.js} |  0
 ...vation-controls.js.es6 => activation-controls.js} |  0
 ...ag-classes.js.es6 => add-category-tag-classes.js} |  0
 .../{avatar-flair.js.es6 => avatar-flair.js}         |  0
 .../{avatar-uploader.js.es6 => avatar-uploader.js}   |  0
 .../{backup-codes.js.es6 => backup-codes.js}         |  0
 .../{backup-uploader.js.es6 => backup-uploader.js}   |  0
 .../{badge-button.js.es6 => badge-button.js}         |  0
 .../components/{badge-card.js.es6 => badge-card.js}  |  0
 .../{badge-selector.js.es6 => badge-selector.js}     |  0
 .../{badge-title.js.es6 => badge-title.js}           |  0
 .../{basic-topic-list.js.es6 => basic-topic-list.js} |  0
 ...-dropdown.js.es6 => bookmark-actions-dropdown.js} |  0
 .../{bread-crumbs.js.es6 => bread-crumbs.js}         |  0
 ...lk-select-button.js.es6 => bulk-select-button.js} |  0
 ...topics.js.es6 => categories-and-latest-topics.js} |  0
 ...op-topics.js.es6 => categories-and-top-topics.js} |  0
 ...-boxes-topic.js.es6 => categories-boxes-topic.js} |  0
 ...topics.js.es6 => categories-boxes-with-topics.js} |  0
 .../{categories-boxes.js.es6 => categories-boxes.js} |  0
 .../{categories-only.js.es6 => categories-only.js}   |  0
 ...es-topic-list.js.es6 => categories-topic-list.js} |  0
 ...-title-before.js.es6 => category-title-before.js} |  0
 ...gory-title-link.js.es6 => category-title-link.js} |  0
 .../{category-unread.js.es6 => category-unread.js}   |  0
 .../components/{cdn-img.js.es6 => cdn-img.js}        |  0
 .../{choose-message.js.es6 => choose-message.js}     |  0
 .../{choose-topic.js.es6 => choose-topic.js}         |  0
 ...r-picker-choice.js.es6 => color-picker-choice.js} |  0
 .../{color-picker.js.es6 => color-picker.js}         |  0
 ...-action-title.js.es6 => composer-action-title.js} |  0
 .../{composer-body.js.es6 => composer-body.js}       |  0
 .../{composer-editor.js.es6 => composer-editor.js}   |  0
 .../{composer-message.js.es6 => composer-message.js} |  0
 ...composer-messages.js.es6 => composer-messages.js} |  0
 ...er-save-button.js.es6 => composer-save-button.js} |  0
 .../{composer-title.js.es6 => composer-title.js}     |  0
 .../{composer-toggles.js.es6 => composer-toggles.js} |  0
 ...ser-selector.js.es6 => composer-user-selector.js} |  0
 ...section.js.es6 => conditional-loading-section.js} |  0
 ...spinner.js.es6 => conditional-loading-spinner.js} |  0
 ...ector-container.js.es6 => connector-container.js} |  0
 .../components/{cook-text.js.es6 => cook-text.js}    |  0
 .../components/{count-i18n.js.es6 => count-i18n.js}  |  0
 .../{create-account.js.es6 => create-account.js}     |  0
 ...te-topic-button.js.es6 => create-topic-button.js} |  0
 ...-topics-notice.js.es6 => create-topics-notice.js} |  0
 .../{csv-uploader.js.es6 => csv-uploader.js}         |  0
 .../{custom-html.js.es6 => custom-html.js}           |  0
 .../components/{d-button.js.es6 => d-button.js}      |  0
 .../components/{d-editor.js.es6 => d-editor.js}      |  0
 .../{d-modal-body.js.es6 => d-modal-body.js}         |  0
 .../{d-modal-cancel.js.es6 => d-modal-cancel.js}     |  0
 .../components/{d-modal.js.es6 => d-modal.js}        |  0
 .../{d-navigation.js.es6 => d-navigation.js}         |  0
 .../components/{d-section.js.es6 => d-section.js}    |  0
 .../components/{date-input.js.es6 => date-input.js}  |  0
 ...te-picker-future.js.es6 => date-picker-future.js} |  0
 .../{date-picker-past.js.es6 => date-picker-past.js} |  0
 .../{date-picker.js.es6 => date-picker.js}           |  0
 ...e-input-range.js.es6 => date-time-input-range.js} |  0
 .../{date-time-input.js.es6 => date-time-input.js}   |  0
 ...-config.js.es6 => desktop-notification-config.js} |  0
 .../{directory-item.js.es6 => directory-item.js}     |  0
 .../{directory-toggle.js.es6 => directory-toggle.js} |  0
 .../{disabled-icon.js.es6 => disabled-icon.js}       |  0
 .../{discourse-banner.js.es6 => discourse-banner.js} |  0
 ...e-linked-text.js.es6 => discourse-linked-text.js} |  0
 ...ourse-tag-bound.js.es6 => discourse-tag-bound.js} |  0
 .../{discourse-topic.js.es6 => discourse-topic.js}   |  0
 ...ery-categories.js.es6 => discovery-categories.js} |  0
 ...y-topics-list.js.es6 => discovery-topics-list.js} |  0
 ...egory-general.js.es6 => edit-category-general.js} |  0
 ...ategory-images.js.es6 => edit-category-images.js} |  0
 ...-category-panel.js.es6 => edit-category-panel.js} |  0
 ...ory-security.js.es6 => edit-category-security.js} |  0
 ...ory-settings.js.es6 => edit-category-settings.js} |  0
 ...edit-category-tab.js.es6 => edit-category-tab.js} |  0
 ...it-category-tags.js.es6 => edit-category-tags.js} |  0
 ...mplate.js.es6 => edit-category-topic-template.js} |  0
 ...ic-timer-form.js.es6 => edit-topic-timer-form.js} |  0
 .../{emoji-picker.js.es6 => emoji-picker.js}         |  0
 .../{emoji-uploader.js.es6 => emoji-uploader.js}     |  0
 .../{expand-post.js.es6 => expand-post.js}           |  0
 ...nding-text-area.js.es6 => expanding-text-area.js} |  0
 .../{featured-topic.js.es6 => featured-topic.js}     |  0
 .../{flag-action-type.js.es6 => flag-action-type.js} |  0
 .../{flag-selection.js.es6 => flag-selection.js}     |  0
 .../{flat-button.js.es6 => flat-button.js}           |  0
 .../{footer-message.js.es6 => footer-message.js}     |  0
 .../components/{footer-nav.js.es6 => footer-nav.js}  |  0
 ...future-date-input.js.es6 => future-date-input.js} |  0
 ...d-invite-link.js.es6 => generated-invite-link.js} |  0
 .../{global-notice.js.es6 => global-notice.js}       |  0
 .../{google-search.js.es6 => google-search.js}       |  0
 ...tivity-filter.js.es6 => group-activity-filter.js} |  0
 ...p-card-contents.js.es6 => group-card-contents.js} |  0
 ...oup-flair-inputs.js.es6 => group-flair-inputs.js} |  0
 ...oup-index-toggle.js.es6 => group-index-toggle.js} |  0
 ...ogs-filter.js.es6 => group-manage-logs-filter.js} |  0
 ...nage-logs-row.js.es6 => group-manage-logs-row.js} |  0
 ...ave-button.js.es6 => group-manage-save-button.js} |  0
 ...mber-dropdown.js.es6 => group-member-dropdown.js} |  0
 .../{group-member.js.es6 => group-member.js}         |  0
 ...ship-button.js.es6 => group-membership-button.js} |  0
 .../{group-navigation.js.es6 => group-navigation.js} |  0
 .../components/{group-post.js.es6 => group-post.js}  |  0
 .../{group-selector.js.es6 => group-selector.js}     |  0
 ...elds.js.es6 => groups-form-interaction-fields.js} |  0
 ...ields.js.es6 => groups-form-membership-fields.js} |  0
 ...e-fields.js.es6 => groups-form-profile-fields.js} |  0
 .../{groups-info.js.es6 => groups-info.js}           |  0
 ...header-extra-info.js.es6 => header-extra-info.js} |  0
 ...de-modal-trigger.js.es6 => hide-modal-trigger.js} |  0
 .../{highlight-text.js.es6 => highlight-text.js}     |  0
 .../{honeypot-input.js.es6 => honeypot-input.js}     |  0
 .../{iframed-html.js.es6 => iframed-html.js}         |  0
 ...er-list-item.js.es6 => ignored-user-list-item.js} |  0
 ...ignored-user-list.js.es6 => ignored-user-list.js} |  0
 .../{image-uploader.js.es6 => image-uploader.js}     |  0
 .../{images-uploader.js.es6 => images-uploader.js}   |  0
 .../components/{input-tip.js.es6 => input-tip.js}    |  0
 .../{invite-panel.js.es6 => invite-panel.js}         |  0
 ...ic-list-item.js.es6 => latest-topic-list-item.js} |  0
 .../{link-to-input.js.es6 => link-to-input.js}       |  0
 .../{links-redirect.js.es6 => links-redirect.js}     |  0
 .../components/{load-more.js.es6 => load-more.js}    |  0
 .../{login-buttons.js.es6 => login-buttons.js}       |  0
 .../{login-modal.js.es6 => login-modal.js}           |  0
 ...gin-reply-button.js.es6 => login-reply-button.js} |  0
 ...ategory-topic.js.es6 => mobile-category-topic.js} |  0
 .../components/{mobile-nav.js.es6 => mobile-nav.js}  |  0
 .../{modal-panel.js.es6 => modal-panel.js}           |  0
 .../components/{modal-tab.js.es6 => modal-tab.js}    |  0
 .../{mount-widget.js.es6 => mount-widget.js}         |  0
 .../components/{nav-item.js.es6 => nav-item.js}      |  0
 .../{navigation-bar.js.es6 => navigation-bar.js}     |  0
 .../{navigation-item.js.es6 => navigation-item.js}   |  0
 ...-banner.js.es6 => notification-consent-banner.js} |  0
 .../{number-field.js.es6 => number-field.js}         |  0
 .../{password-field.js.es6 => password-field.js}     |  0
 .../{plugin-connector.js.es6 => plugin-connector.js} |  0
 .../{plugin-outlet.js.es6 => plugin-outlet.js}       |  0
 .../{popup-input-tip.js.es6 => popup-input-tip.js}   |  0
 ...erence-checkbox.js.es6 => preference-checkbox.js} |  0
 ...message-glyph.js.es6 => private-message-glyph.js} |  0
 ...a-install-banner.js.es6 => pwa-install-banner.js} |  0
 .../{quote-button.js.es6 => quote-button.js}         |  0
 .../{radio-button.js.es6 => radio-button.js}         |  0
 .../{related-messages.js.es6 => related-messages.js} |  0
 ...ed-action.js.es6 => reviewable-bundled-action.js} |  0
 ...imed-topic.js.es6 => reviewable-claimed-topic.js} |  0
 ...n-post.js.es6 => reviewable-conversation-post.js} |  0
 ...-category.js.es6 => reviewable-field-category.js} |  0
 ...le-field-tags.js.es6 => reviewable-field-tags.js} |  0
 ...lagged-post.js.es6 => reviewable-flagged-post.js} |  0
 ...able-histories.js.es6 => reviewable-histories.js} |  0
 .../{reviewable-item.js.es6 => reviewable-item.js}   |  0
 ...-queued-post.js.es6 => reviewable-queued-post.js} |  0
 .../{reviewable-user.js.es6 => reviewable-user.js}   |  0
 .../{save-controls.js.es6 => save-controls.js}       |  0
 .../{scroll-tracker.js.es6 => scroll-tracker.js}     |  0
 ...g-post-stream.js.es6 => scrolling-post-stream.js} |  0
 ...ced-options.js.es6 => search-advanced-options.js} |  0
 ...search-text-field.js.es6 => search-text-field.js} |  0
 ...cond-factor-form.js.es6 => second-factor-form.js} |  0
 ...nd-factor-input.js.es6 => second-factor-input.js} |  0
 ...security-key-form.js.es6 => security-key-form.js} |  0
 .../{share-panel.js.es6 => share-panel.js}           |  0
 .../{share-popup.js.es6 => share-popup.js}           |  0
 .../{share-source.js.es6 => share-source.js}         |  0
 ...raft-controls.js.es6 => shared-draft-controls.js} |  0
 .../components/{signup-cta.js.es6 => signup-cta.js}  |  0
 .../{site-header.js.es6 => site-header.js}           |  0
 .../{suggested-topics.js.es6 => suggested-topics.js} |  0
 .../{tag-drop-link.js.es6 => tag-drop-link.js}       |  0
 .../{tag-groups-form.js.es6 => tag-groups-form.js}   |  0
 .../components/{tag-info.js.es6 => tag-info.js}      |  0
 .../components/{tag-list.js.es6 => tag-list.js}      |  0
 ...-admin-dropdown.js.es6 => tags-admin-dropdown.js} |  0
 .../{tap-tile-grid.js.es6 => tap-tile-grid.js}       |  0
 .../components/{tap-tile.js.es6 => tap-tile.js}      |  0
 .../components/{text-field.js.es6 => text-field.js}  |  0
 .../{text-overflow.js.es6 => text-overflow.js}       |  0
 .../components/{time-input.js.es6 => time-input.js}  |  0
 ...p-period-buttons.js.es6 => top-period-buttons.js} |  0
 ...menu-button.js.es6 => topic-admin-menu-button.js} |  0
 .../{topic-category.js.es6 => topic-category.js}     |  0
 .../{topic-entrance.js.es6 => topic-entrance.js}     |  0
 ...footer-buttons.js.es6 => topic-footer-buttons.js} |  0
 ...roup-notice.js.es6 => topic-join-group-notice.js} |  0
 .../{topic-list-item.js.es6 => topic-list-item.js}   |  0
 .../components/{topic-list.js.es6 => topic-list.js}  |  0
 .../{topic-navigation.js.es6 => topic-navigation.js} |  0
 ...topic-post-badges.js.es6 => topic-post-badges.js} |  0
 .../{topic-progress.js.es6 => topic-progress.js}     |  0
 .../{topic-status.js.es6 => topic-status.js}         |  0
 .../{topic-timeline.js.es6 => topic-timeline.js}     |  0
 .../{topic-timer-info.js.es6 => topic-timer-info.js} |  0
 .../{topic-title.js.es6 => topic-title.js}           |  0
 .../{track-selected.js.es6 => track-selected.js}     |  0
 .../components/{user-badge.js.es6 => user-badge.js}  |  0
 ...er-card-contents.js.es6 => user-card-contents.js} |  0
 .../components/{user-field.js.es6 => user-field.js}  |  0
 ...lag-percentage.js.es6 => user-flag-percentage.js} |  0
 .../components/{user-info.js.es6 => user-info.js}    |  0
 .../components/{user-link.js.es6 => user-link.js}    |  0
 ...ions-large.js.es6 => user-notifications-large.js} |  0
 .../{user-selector.js.es6 => user-selector.js}       |  0
 .../components/{user-stat.js.es6 => user-stat.js}    |  0
 .../{user-stream-item.js.es6 => user-stream-item.js} |  0
 .../{user-stream.js.es6 => user-stream.js}           |  0
 ...search.js.es6 => user-summary-category-search.js} |  0
 ...ummary-section.js.es6 => user-summary-section.js} |  0
 ...er-summary-topic.js.es6 => user-summary-topic.js} |  0
 ...opics-list.js.es6 => user-summary-topics-list.js} |  0
 ...user-summary-user.js.es6 => user-summary-user.js} |  0
 .../components/{watch-read.js.es6 => watch-read.js}  |  0
 .../discourse/controllers/{about.js.es6 => about.js} |  0
 ...it-email.js.es6 => account-created-edit-email.js} |  0
 ...created-index.js.es6 => account-created-index.js} |  0
 .../{activation-edit.js.es6 => activation-edit.js}   |  0
 .../{add-post-notice.js.es6 => add-post-notice.js}   |  0
 .../{application.js.es6 => application.js}           |  0
 ...t-confirm.js.es6 => associate-account-confirm.js} |  0
 .../controllers/{auth-token.js.es6 => auth-token.js} |  0
 .../{avatar-selector.js.es6 => avatar-selector.js}   |  0
 .../controllers/badges/{index.js.es6 => index.js}    |  0
 .../controllers/badges/{show.js.es6 => show.js}      |  0
 .../{basic-modal-body.js.es6 => basic-modal-body.js} |  0
 .../controllers/{bookmark.js.es6 => bookmark.js}     |  0
 ...ation-level.js.es6 => bulk-notification-level.js} |  0
 .../{change-owner.js.es6 => change-owner.js}         |  0
 .../{change-timestamp.js.es6 => change-timestamp.js} |  0
 .../controllers/{composer.js.es6 => composer.js}     |  0
 ...ublic-topic.js.es6 => convert-to-public-topic.js} |  0
 .../{create-account.js.es6 => create-account.js}     |  0
 ...scovery-sortable.js.es6 => discovery-sortable.js} |  0
 .../controllers/{discovery.js.es6 => discovery.js}   |  0
 .../discovery/{categories.js.es6 => categories.js}   |  0
 .../discovery/{topics.js.es6 => topics.js}           |  0
 .../{edit-category.js.es6 => edit-category.js}       |  0
 .../{edit-topic-timer.js.es6 => edit-topic-timer.js} |  0
 .../{email-login.js.es6 => email-login.js}           |  0
 .../controllers/{exception.js.es6 => exception.js}   |  0
 ...plain-reviewable.js.es6 => explain-reviewable.js} |  0
 ...on-profile.js.es6 => feature-topic-on-profile.js} |  0
 .../{feature-topic.js.es6 => feature-topic.js}       |  0
 .../discourse/controllers/{flag.js.es6 => flag.js}   |  0
 .../{forgot-password.js.es6 => forgot-password.js}   |  0
 .../{full-page-search.js.es6 => full-page-search.js} |  0
 .../{grant-badge.js.es6 => grant-badge.js}           |  0
 ...activity-posts.js.es6 => group-activity-posts.js} |  0
 ...tivity-topics.js.es6 => group-activity-topics.js} |  0
 .../{group-activity.js.es6 => group-activity.js}     |  0
 ...group-add-members.js.es6 => group-add-members.js} |  0
 .../{group-bulk-add.js.es6 => group-bulk-add.js}     |  0
 .../{group-index.js.es6 => group-index.js}           |  0
 ...group-manage-logs.js.es6 => group-manage-logs.js} |  0
 ...manage-profile.js.es6 => group-manage-profile.js} |  0
 .../{group-manage.js.es6 => group-manage.js}         |  0
 .../{group-messages.js.es6 => group-messages.js}     |  0
 .../{group-requests.js.es6 => group-requests.js}     |  0
 .../discourse/controllers/{group.js.es6 => group.js} |  0
 .../{groups-index.js.es6 => groups-index.js}         |  0
 .../controllers/{groups-new.js.es6 => groups-new.js} |  0
 .../controllers/{history.js.es6 => history.js}       |  0
 ...rname.js.es6 => ignore-duration-with-username.js} |  0
 .../{ignore-duration.js.es6 => ignore-duration.js}   |  0
 .../{insert-hyperlink.js.es6 => insert-hyperlink.js} |  0
 .../{invites-show.js.es6 => invites-show.js}         |  0
 .../{jump-to-post.js.es6 => jump-to-post.js}         |  0
 ...rtcuts-help.js.es6 => keyboard-shortcuts-help.js} |  0
 .../discourse/controllers/{login.js.es6 => login.js} |  0
 .../discourse/controllers/{modal.js.es6 => modal.js} |  0
 .../{move-to-topic.js.es6 => move-to-topic.js}       |  0
 .../navigation/{categories.js.es6 => categories.js}  |  0
 .../navigation/{category.js.es6 => category.js}      |  0
 .../navigation/{default.js.es6 => default.js}        |  0
 .../{not-activated.js.es6 => not-activated.js}       |  0
 .../{password-reset.js.es6 => password-reset.js}     |  0
 .../{preferences.js.es6 => preferences.js}           |  0
 .../preferences/{account.js.es6 => account.js}       |  0
 .../preferences/{categories.js.es6 => categories.js} |  0
 .../preferences/{email.js.es6 => email.js}           |  0
 .../preferences/{emails.js.es6 => emails.js}         |  0
 .../preferences/{interface.js.es6 => interface.js}   |  0
 .../{notifications.js.es6 => notifications.js}       |  0
 .../preferences/{profile.js.es6 => profile.js}       |  0
 .../{second-factor.js.es6 => second-factor.js}       |  0
 .../controllers/preferences/{tags.js.es6 => tags.js} |  0
 .../preferences/{username.js.es6 => username.js}     |  0
 .../preferences/{users.js.es6 => users.js}           |  0
 .../controllers/{raw-email.js.es6 => raw-email.js}   |  0
 .../controllers/{rename-tag.js.es6 => rename-tag.js} |  0
 ...order-categories.js.es6 => reorder-categories.js} |  0
 ...-form.js.es6 => request-group-membership-form.js} |  0
 .../{review-index.js.es6 => review-index.js}         |  0
 .../{review-settings.js.es6 => review-settings.js}   |  0
 ...-key.js.es6 => second-factor-add-security-key.js} |  0
 ...tor-add-totp.js.es6 => second-factor-add-totp.js} |  0
 ...ckup-edit.js.es6 => second-factor-backup-edit.js} |  0
 ...key.js.es6 => second-factor-edit-security-key.js} |  0
 ...cond-factor-edit.js.es6 => second-factor-edit.js} |  0
 .../controllers/{static.js.es6 => static.js}         |  0
 .../{tag-groups-edit.js.es6 => tag-groups-edit.js}   |  0
 .../{tag-groups-new.js.es6 => tag-groups-new.js}     |  0
 .../controllers/{tag-groups.js.es6 => tag-groups.js} |  0
 .../controllers/{tags-index.js.es6 => tags-index.js} |  0
 .../controllers/{tags-show.js.es6 => tags-show.js}   |  0
 ...pic-bulk-actions.js.es6 => topic-bulk-actions.js} |  0
 .../discourse/controllers/{topic.js.es6 => topic.js} |  0
 .../{upload-selector.js.es6 => upload-selector.js}   |  0
 ...es6 => user-activity-bookmarks-with-reminders.js} |  0
 .../{user-activity.js.es6 => user-activity.js}       |  0
 .../{user-badges.js.es6 => user-badges.js}           |  0
 .../controllers/{user-card.js.es6 => user-card.js}   |  0
 ...user-invited-show.js.es6 => user-invited-show.js} |  0
 ...er-notifications.js.es6 => user-notifications.js} |  0
 .../controllers/{user-posts.js.es6 => user-posts.js} |  0
 ...ges-tags.js.es6 => user-private-messages-tags.js} |  0
 ...vate-messages.js.es6 => user-private-messages.js} |  0
 .../{user-summary.js.es6 => user-summary.js}         |  0
 .../{user-topics-list.js.es6 => user-topics-list.js} |  0
 .../discourse/controllers/{user.js.es6 => user.js}   |  0
 .../discourse/controllers/{users.js.es6 => users.js} |  0
 .../helpers/{application.js.es6 => application.js}   |  0
 .../helpers/{border-color.js.es6 => border-color.js} |  0
 ...atar-template.js.es6 => bound-avatar-template.js} |  0
 .../helpers/{bound-avatar.js.es6 => bound-avatar.js} |  0
 ...d-category-link.js.es6 => bound-category-link.js} |  0
 .../helpers/{bound-date.js.es6 => bound-date.js}     |  0
 ...capitalize-string.js.es6 => capitalize-string.js} |  0
 .../{category-badge.js.es6 => category-badge.js}     |  0
 .../{category-link.js.es6 => category-link.js}       |  0
 .../{cold-age-class.js.es6 => cold-age-class.js}     |  0
 .../helpers/{custom-html.js.es6 => custom-html.js}   |  0
 .../{dash-if-empty.js.es6 => dash-if-empty.js}       |  0
 .../helpers/{dasherize.js.es6 => dasherize.js}       |  0
 .../helpers/{dir-span.js.es6 => dir-span.js}         |  0
 .../{discourse-tag.js.es6 => discourse-tag.js}       |  0
 .../{discourse-tags.js.es6 => discourse-tags.js}     |  0
 .../{editable-value.js.es6 => editable-value.js}     |  0
 .../helpers/{fa-icon-node.js.es6 => fa-icon-node.js} |  0
 .../discourse/helpers/{float.js.es6 => float.js}     |  0
 .../helpers/{format-age.js.es6 => format-age.js}     |  0
 .../helpers/{format-date.js.es6 => format-date.js}   |  0
 .../{format-username.js.es6 => format-username.js}   |  0
 .../{icon-or-image.js.es6 => icon-or-image.js}       |  0
 .../helpers/{inline-date.js.es6 => inline-date.js}   |  0
 .../discourse/helpers/{node.js.es6 => node.js}       |  0
 .../helpers/{period-title.js.es6 => period-title.js} |  0
 ...raw-plugin-outlet.js.es6 => raw-plugin-outlet.js} |  0
 .../discourse/helpers/{raw.js.es6 => raw.js}         |  0
 .../{replace-emoji.js.es6 => replace-emoji.js}       |  0
 ...tion.js.es6 => reviewable-history-description.js} |  0
 ...reviewable-status.js.es6 => reviewable-status.js} |  0
 .../helpers/{route-action.js.es6 => route-action.js} |  0
 .../helpers/{shorten-url.js.es6 => shorten-url.js}   |  0
 .../{theme-helpers.js.es6 => theme-helpers.js}       |  0
 ...c-featured-link.js.es6 => topic-featured-link.js} |  0
 .../helpers/{topic-link.js.es6 => topic-link.js}     |  0
 ...pic-status-icons.js.es6 => topic-status-icons.js} |  0
 .../helpers/{user-avatar.js.es6 => user-avatar.js}   |  0
 .../helpers/{user-status.js.es6 => user-status.js}   |  0
 .../{asset-version.js.es6 => asset-version.js}       |  0
 .../{auth-complete.js.es6 => auth-complete.js}       |  0
 ...auto-load-modules.js.es6 => auto-load-modules.js} |  0
 .../{avatar-select.js.es6 => avatar-select.js}       |  0
 .../initializers/{badging.js.es6 => badging.js}      |  0
 .../initializers/{banner.js.es6 => banner.js}        |  0
 ...click-interceptor.js.es6 => click-interceptor.js} |  0
 .../{csrf-token.js.es6 => csrf-token.js}             |  0
 .../initializers/{d-popover.js.es6 => d-popover.js}  |  0
 .../{ember-events.js.es6 => ember-events.js}         |  0
 .../{enable-emoji.js.es6 => enable-emoji.js}         |  0
 ...ensions.js.es6 => ensure-max-image-dimensions.js} |  0
 .../{inject-objects.js.es6 => inject-objects.js}     |  0
 .../{jquery-plugins.js.es6 => jquery-plugins.js}     |  0
 ...yboard-shortcuts.js.es6 => keyboard-shortcuts.js} |  0
 .../{live-development.js.es6 => live-development.js} |  0
 .../{localization.js.es6 => localization.js}         |  0
 .../initializers/{logout.js.es6 => logout.js}        |  0
 .../{logs-notice.js.es6 => logs-notice.js}           |  0
 .../{message-bus.js.es6 => message-bus.js}           |  0
 .../initializers/{mobile.js.es6 => mobile.js}        |  0
 .../{page-tracking.js.es6 => page-tracking.js}       |  0
 .../{post-decorations.js.es6 => post-decorations.js} |  0
 .../initializers/{read-only.js.es6 => read-only.js}  |  0
 ...ocation.js.es6 => register-discourse-location.js} |  0
 ...vice-worker.js.es6 => register-service-worker.js} |  0
 .../{relative-ages.js.es6 => relative-ages.js}       |  0
 .../{sharing-sources.js.es6 => sharing-sources.js}   |  0
 .../{show-footer.js.es6 => show-footer.js}           |  0
 .../{signup-cta.js.es6 => signup-cta.js}             |  0
 ...-params.js.es6 => strip-mobile-app-url-params.js} |  0
 ...ations.js.es6 => subscribe-user-notifications.js} |  0
 ...e-notifications.js.es6 => title-notifications.js} |  0
 ...footer-buttons.js.es6 => topic-footer-buttons.js} |  0
 .../{url-redirects.js.es6 => url-redirects.js}       |  0
 .../{after-transition.js.es6 => after-transition.js} |  0
 .../lib/{ajax-error.js.es6 => ajax-error.js}         |  0
 .../lib/{autocomplete.js.es6 => autocomplete.js}     |  0
 ...cached-topic-list.js.es6 => cached-topic-list.js} |  0
 ...category-hashtags.js.es6 => category-hashtags.js} |  0
 ...gory-tag-search.js.es6 => category-tag-search.js} |  0
 .../discourse/lib/{clean-dom.js.es6 => clean-dom.js} |  0
 .../lib/{click-track.js.es6 => click-track.js}       |  0
 .../discourse/lib/{computed.js.es6 => computed.js}   |  0
 .../discourse/lib/{copy-text.js.es6 => copy-text.js} |  0
 .../discourse/lib/{d-popover.js.es6 => d-popover.js} |  0
 .../discourse/lib/{debounce.js.es6 => debounce.js}   |  0
 .../lib/{decimal-adjust.js.es6 => decimal-adjust.js} |  0
 ...notifications.js.es6 => desktop-notifications.js} |  0
 .../lib/{dirty-keys.js.es6 => dirty-keys.js}         |  0
 ...scourse-location.js.es6 => discourse-location.js} |  0
 .../lib/{export-csv.js.es6 => export-csv.js}         |  0
 .../lib/{export-result.js.es6 => export-result.js}   |  0
 .../discourse/lib/{eyeline.js.es6 => eyeline.js}     |  0
 .../discourse/lib/{formatter.js.es6 => formatter.js} |  0
 .../discourse/lib/{hash.js.es6 => hash.js}           |  0
 .../{highlight-syntax.js.es6 => highlight-syntax.js} |  0
 .../lib/{highlight-text.js.es6 => highlight-text.js} |  0
 .../{intercept-click.js.es6 => intercept-click.js}   |  0
 ...-in-viewport.js.es6 => is-element-in-viewport.js} |  0
 .../{key-value-store.js.es6 => key-value-store.js}   |  0
 ...yboard-shortcuts.js.es6 => keyboard-shortcuts.js} |  0
 .../{lazy-load-images.js.es6 => lazy-load-images.js} |  0
 .../discourse/lib/{lightbox.js.es6 => lightbox.js}   |  0
 ...ory-hashtags.js.es6 => link-category-hashtags.js} |  0
 .../lib/{link-lookup.js.es6 => link-lookup.js}       |  0
 .../lib/{link-mentions.js.es6 => link-mentions.js}   |  0
 .../{link-tag-hashtag.js.es6 => link-tag-hashtag.js} |  0
 .../lib/{load-script.js.es6 => load-script.js}       |  0
 .../discourse/lib/{lock-on.js.es6 => lock-on.js}     |  0
 .../discourse/lib/{logout.js.es6 => logout.js}       |  0
 .../discourse/lib/{mobile.js.es6 => mobile.js}       |  0
 ...fication-levels.js.es6 => notification-levels.js} |  0
 ...offset-calculator.js.es6 => offset-calculator.js} |  0
 .../{optional-service.js.es6 => optional-service.js} |  0
 .../lib/{page-tracker.js.es6 => page-tracker.js}     |  0
 .../lib/{page-visible.js.es6 => page-visible.js}     |  0
 .../lib/{plugin-api.js.es6 => plugin-api.js}         |  0
 ...plugin-connectors.js.es6 => plugin-connectors.js} |  0
 ...laceholders.js.es6 => posts-with-placeholders.js} |  0
 ...sh-notifications.js.es6 => push-notifications.js} |  0
 .../discourse/lib/{pwa-utils.js.es6 => pwa-utils.js} |  0
 .../lib/{quote-state.js.es6 => quote-state.js}       |  0
 .../discourse/lib/{quote.js.es6 => quote.js}         |  0
 .../lib/{raw-templates.js.es6 => raw-templates.js}   |  0
 ...button.js.es6 => register-topic-footer-button.js} |  0
 .../lib/{render-tag.js.es6 => render-tag.js}         |  0
 .../lib/{render-tags.js.es6 => render-tags.js}       |  0
 ...red-link.js.es6 => render-topic-featured-link.js} |  0
 .../lib/{reports-loader.js.es6 => reports-loader.js} |  0
 .../discourse/lib/{round.js.es6 => round.js}         |  0
 .../lib/{safari-hacks.js.es6 => safari-hacks.js}     |  0
 .../lib/{screen-track.js.es6 => screen-track.js}     |  0
 .../discourse/lib/{search.js.es6 => search.js}       |  0
 .../discourse/lib/{settings.js.es6 => settings.js}   |  0
 .../discourse/lib/{sharing.js.es6 => sharing.js}     |  0
 .../lib/{show-modal.js.es6 => show-modal.js}         |  0
 ...-route-builder.js.es6 => static-route-builder.js} |  0
 ...svg-sprite-loader.js.es6 => svg-sprite-loader.js} |  0
 .../lib/{tag-hashtags.js.es6 => tag-hashtags.js}     |  0
 .../lib/{text-direction.js.es6 => text-direction.js} |  0
 .../discourse/lib/{text.js.es6 => text.js}           |  0
 .../lib/{theme-selector.js.es6 => theme-selector.js} |  0
 .../lib/{to-markdown.js.es6 => to-markdown.js}       |  0
 .../discourse/lib/{tooltip.js.es6 => tooltip.js}     |  0
 .../lib/{transform-post.js.es6 => transform-post.js} |  0
 .../discourse/lib/{uploads.js.es6 => uploads.js}     |  0
 .../javascripts/discourse/lib/{url.js.es6 => url.js} |  0
 .../{user-activation.js.es6 => user-activation.js}   |  0
 .../lib/{user-search.js.es6 => user-search.js}       |  0
 .../discourse/lib/{utilities.js.es6 => utilities.js} |  0
 .../discourse/lib/{webauthn.js.es6 => webauthn.js}   |  0
 .../{mapping-router.js.es6 => mapping-router.js}     |  0
 ...archetype-class.js.es6 => add-archetype-class.js} |  0
 .../{buffered-content.js.es6 => buffered-content.js} |  0
 ...opic-selection.js.es6 => bulk-topic-selection.js} |  0
 .../{can-check-emails.js.es6 => can-check-emails.js} |  0
 ...rd-contents-base.js.es6 => card-contents-base.js} |  0
 .../mixins/{cleans-up.js.es6 => cleans-up.js}        |  0
 .../discourse/mixins/{docking.js.es6 => docking.js}  |  0
 .../mixins/{filter-mode.js.es6 => filter-mode.js}    |  0
 ...e-controller.js.es6 => grant-badge-controller.js} |  0
 .../{key-enter-escape.js.es6 => key-enter-escape.js} |  0
 .../mixins/{load-more.js.es6 => load-more.js}        |  0
 ...l-direction.js.es6 => mobile-scroll-direction.js} |  0
 ...l-functionality.js.es6 => modal-functionality.js} |  0
 .../{name-validation.js.es6 => name-validation.js}   |  0
 .../{open-composer.js.es6 => open-composer.js}       |  0
 .../mixins/{pan-events.js.es6 => pan-events.js}      |  0
 ...word-validation.js.es6 => password-validation.js} |  0
 .../mixins/{scroll-top.js.es6 => scroll-top.js}      |  0
 .../mixins/{scrolling.js.es6 => scrolling.js}        |  0
 .../mixins/{singleton.js.es6 => singleton.js}        |  0
 .../discourse/mixins/{upload.js.es6 => upload.js}    |  0
 .../mixins/{url-refresh.js.es6 => url-refresh.js}    |  0
 ...s-validation.js.es6 => user-fields-validation.js} |  0
 ...name-validation.js.es6 => username-validation.js} |  0
 ...ing-action-type.js.es6 => viewing-action-type.js} |  0
 .../{action-summary.js.es6 => action-summary.js}     |  0
 .../models/{archetype.js.es6 => archetype.js}        |  0
 .../{badge-grouping.js.es6 => badge-grouping.js}     |  0
 .../discourse/models/{badge.js.es6 => badge.js}      |  0
 .../models/{bookmark.js.es6 => bookmark.js}          |  0
 .../{category-list.js.es6 => category-list.js}       |  0
 .../models/{category.js.es6 => category.js}          |  0
 .../models/{composer.js.es6 => composer.js}          |  0
 .../discourse/models/{draft.js.es6 => draft.js}      |  0
 .../{group-history.js.es6 => group-history.js}       |  0
 .../discourse/models/{group.js.es6 => group.js}      |  0
 .../discourse/models/{invite.js.es6 => invite.js}    |  0
 .../models/{login-method.js.es6 => login-method.js}  |  0
 .../models/{nav-item.js.es6 => nav-item.js}          |  0
 .../{permission-type.js.es6 => permission-type.js}   |  0
 .../{post-action-type.js.es6 => post-action-type.js} |  0
 .../models/{post-stream.js.es6 => post-stream.js}    |  0
 .../discourse/models/{post.js.es6 => post.js}        |  0
 .../discourse/models/{rest.js.es6 => rest.js}        |  0
 .../models/{result-set.js.es6 => result-set.js}      |  0
 ...viewable-history.js.es6 => reviewable-history.js} |  0
 .../models/{reviewable.js.es6 => reviewable.js}      |  0
 .../discourse/models/{session.js.es6 => session.js}  |  0
 .../discourse/models/{site.js.es6 => site.js}        |  0
 .../models/{static-page.js.es6 => static-page.js}    |  0
 .../discourse/models/{store.js.es6 => store.js}      |  0
 .../models/{tag-group.js.es6 => tag-group.js}        |  0
 .../discourse/models/{tag.js.es6 => tag.js}          |  0
 .../{topic-details.js.es6 => topic-details.js}       |  0
 .../models/{topic-list.js.es6 => topic-list.js}      |  0
 .../models/{topic-timer.js.es6 => topic-timer.js}    |  0
 ...tracking-state.js.es6 => topic-tracking-state.js} |  0
 .../discourse/models/{topic.js.es6 => topic.js}      |  0
 .../models/{trust-level.js.es6 => trust-level.js}    |  0
 ...user-action-group.js.es6 => user-action-group.js} |  0
 .../{user-action-stat.js.es6 => user-action-stat.js} |  0
 .../models/{user-action.js.es6 => user-action.js}    |  0
 .../models/{user-badge.js.es6 => user-badge.js}      |  0
 .../models/{user-draft.js.es6 => user-draft.js}      |  0
 ...er-drafts-stream.js.es6 => user-drafts-stream.js} |  0
 ...user-posts-stream.js.es6 => user-posts-stream.js} |  0
 .../models/{user-stream.js.es6 => user-stream.js}    |  0
 .../discourse/models/{user.js.es6 => user.js}        |  0
 ...ute-builders.js.es6 => dynamic-route-builders.js} |  0
 ...se-objects.js.es6 => inject-discourse-objects.js} |  0
 .../{map-routes.js.es6 => map-routes.js}             |  0
 ...om-templates.js.es6 => register-dom-templates.js} |  0
 ...iff-capabilities.js.es6 => sniff-capabilities.js} |  0
 ...-fontawesome.js.es6 => svg-sprite-fontawesome.js} |  0
 ...ount-or-badges.js.es6 => post-count-or-badges.js} |  0
 ...sts-count-column.js.es6 => posts-count-column.js} |  0
 .../list/{visited-line.js.es6 => visited-line.js}    |  0
 ...der-column.js.es6 => topic-list-header-column.js} |  0
 .../{topic-status.js.es6 => topic-status.js}         |  0
 .../discourse/routes/{about.js.es6 => about.js}      |  0
 ...it-email.js.es6 => account-created-edit-email.js} |  0
 ...created-index.js.es6 => account-created-index.js} |  0
 ...eated-resent.js.es6 => account-created-resent.js} |  0
 .../{account-created.js.es6 => account-created.js}   |  0
 .../{app-route-map.js.es6 => app-route-map.js}       |  0
 .../routes/{application.js.es6 => application.js}    |  0
 ...associate-account.js.es6 => associate-account.js} |  0
 .../routes/{badges-index.js.es6 => badges-index.js}  |  0
 .../routes/{badges-show.js.es6 => badges-show.js}    |  0
 ...-route.js.es6 => build-admin-user-posts-route.js} |  0
 ...category-route.js.es6 => build-category-route.js} |  0
 ...es-route.js.es6 => build-group-messages-route.js} |  0
 ...-route.js.es6 => build-private-messages-route.js} |  0
 ...ild-static-route.js.es6 => build-static-route.js} |  0
 ...build-topic-route.js.es6 => build-topic-route.js} |  0
 .../discourse/routes/{conduct.js.es6 => conduct.js}  |  0
 .../routes/{discourse.js.es6 => discourse.js}        |  0
 ...ery-categories.js.es6 => discovery-categories.js} |  0
 .../routes/{discovery.js.es6 => discovery.js}        |  0
 .../routes/{email-login.js.es6 => email-login.js}    |  0
 ...exception-unknown.js.es6 => exception-unknown.js} |  0
 .../routes/{exception.js.es6 => exception.js}        |  0
 .../discourse/routes/{faq.js.es6 => faq.js}          |  0
 .../{forgot-password.js.es6 => forgot-password.js}   |  0
 .../{full-page-search.js.es6 => full-page-search.js} |  0
 ...activity-index.js.es6 => group-activity-index.js} |  0
 ...ty-mentions.js.es6 => group-activity-mentions.js} |  0
 ...activity-posts.js.es6 => group-activity-posts.js} |  0
 ...tivity-topics.js.es6 => group-activity-topics.js} |  0
 .../routes/{group-index.js.es6 => group-index.js}    |  0
 ...oup-manage-index.js.es6 => group-manage-index.js} |  0
 ...nteraction.js.es6 => group-manage-interaction.js} |  0
 ...group-manage-logs.js.es6 => group-manage-logs.js} |  0
 ...-membership.js.es6 => group-manage-membership.js} |  0
 ...manage-profile.js.es6 => group-manage-profile.js} |  0
 .../routes/{group-manage.js.es6 => group-manage.js}  |  0
 .../{group-members.js.es6 => group-members.js}       |  0
 ...ages-archive.js.es6 => group-messages-archive.js} |  0
 ...messages-inbox.js.es6 => group-messages-inbox.js} |  0
 ...messages-index.js.es6 => group-messages-index.js} |  0
 .../{group-messages.js.es6 => group-messages.js}     |  0
 .../{group-requests.js.es6 => group-requests.js}     |  0
 .../discourse/routes/{group.js.es6 => group.js}      |  0
 .../routes/{groups-index.js.es6 => groups-index.js}  |  0
 .../routes/{groups-new.js.es6 => groups-new.js}      |  0
 .../routes/{guidelines.js.es6 => guidelines.js}      |  0
 .../routes/{invites-show.js.es6 => invites-show.js}  |  0
 .../discourse/routes/{login.js.es6 => login.js}      |  0
 .../routes/{new-message.js.es6 => new-message.js}    |  0
 .../routes/{new-topic.js.es6 => new-topic.js}        |  0
 .../{password-reset.js.es6 => password-reset.js}     |  0
 .../discourse/routes/{post.js.es6 => post.js}        |  0
 ...erences-account.js.es6 => preferences-account.js} |  0
 .../{preferences-apps.js.es6 => preferences-apps.js} |  0
 ...s-categories.js.es6 => preferences-categories.js} |  0
 ...preferences-email.js.es6 => preferences-email.js} |  0
 ...eferences-emails.js.es6 => preferences-emails.js} |  0
 ...preferences-index.js.es6 => preferences-index.js} |  0
 ...ces-interface.js.es6 => preferences-interface.js} |  0
 ...fications.js.es6 => preferences-notifications.js} |  0
 ...erences-profile.js.es6 => preferences-profile.js} |  0
 ...nd-factor.js.es6 => preferences-second-factor.js} |  0
 .../{preferences-tags.js.es6 => preferences-tags.js} |  0
 ...ences-username.js.es6 => preferences-username.js} |  0
 ...preferences-users.js.es6 => preferences-users.js} |  0
 .../routes/{preferences.js.es6 => preferences.js}    |  0
 .../discourse/routes/{privacy.js.es6 => privacy.js}  |  0
 .../{restricted-user.js.es6 => restricted-user.js}   |  0
 .../routes/{review-index.js.es6 => review-index.js}  |  0
 .../{review-settings.js.es6 => review-settings.js}   |  0
 .../routes/{review-show.js.es6 => review-show.js}    |  0
 .../{review-topics.js.es6 => review-topics.js}       |  0
 .../discourse/routes/{review.js.es6 => review.js}    |  0
 .../discourse/routes/{rules.js.es6 => rules.js}      |  0
 .../discourse/routes/{signup.js.es6 => signup.js}    |  0
 .../{tag-groups-edit.js.es6 => tag-groups-edit.js}   |  0
 .../{tag-groups-new.js.es6 => tag-groups-new.js}     |  0
 .../routes/{tag-groups.js.es6 => tag-groups.js}      |  0
 .../routes/{tags-index.js.es6 => tags-index.js}      |  0
 ...tags-intersection.js.es6 => tags-intersection.js} |  0
 .../routes/{tags-show.js.es6 => tags-show.js}        |  0
 ...c-by-slug-or-id.js.es6 => topic-by-slug-or-id.js} |  0
 ...-params-near.js.es6 => topic-from-params-near.js} |  0
 ...topic-from-params.js.es6 => topic-from-params.js} |  0
 .../discourse/routes/{topic.js.es6 => topic.js}      |  0
 .../discourse/routes/{tos.js.es6 => tos.js}          |  0
 .../discourse/routes/{unknown.js.es6 => unknown.js}  |  0
 ...es6 => user-activity-bookmarks-with-reminders.js} |  0
 ...y-bookmarks.js.es6 => user-activity-bookmarks.js} |  0
 ...ctivity-drafts.js.es6 => user-activity-drafts.js} |  0
 ...-activity-index.js.es6 => user-activity-index.js} |  0
 ...kes-given.js.es6 => user-activity-likes-given.js} |  0
 ...ivity-pending.js.es6 => user-activity-pending.js} |  0
 ...ivity-replies.js.es6 => user-activity-replies.js} |  0
 ...ctivity-stream.js.es6 => user-activity-stream.js} |  0
 ...ctivity-topics.js.es6 => user-activity-topics.js} |  0
 .../{user-activity.js.es6 => user-activity.js}       |  0
 .../routes/{user-badges.js.es6 => user-badges.js}    |  0
 ...er-deleted-posts.js.es6 => user-deleted-posts.js} |  0
 .../routes/{user-index.js.es6 => user-index.js}      |  0
 ...er-invited-index.js.es6 => user-invited-index.js} |  0
 ...user-invited-show.js.es6 => user-invited-show.js} |  0
 ...ions-edits.js.es6 => user-notifications-edits.js} |  0
 ...ions-index.js.es6 => user-notifications-index.js} |  0
 ...d.js.es6 => user-notifications-likes-received.js} |  0
 ...entions.js.es6 => user-notifications-mentions.js} |  0
 ...ponses.js.es6 => user-notifications-responses.js} |  0
 ...er-notifications.js.es6 => user-notifications.js} |  0
 ...chive.js.es6 => user-private-messages-archive.js} |  0
 ...js.es6 => user-private-messages-group-archive.js} |  0
 ...s-group.js.es6 => user-private-messages-group.js} |  0
 ...s-index.js.es6 => user-private-messages-index.js} |  0
 ...ges-sent.js.es6 => user-private-messages-sent.js} |  0
 ...how.js.es6 => user-private-messages-tags-show.js} |  0
 ...ges-tags.js.es6 => user-private-messages-tags.js} |  0
 ...vate-messages.js.es6 => user-private-messages.js} |  0
 .../routes/{user-summary.js.es6 => user-summary.js}  |  0
 .../{user-topic-list.js.es6 => user-topic-list.js}   |  0
 .../discourse/routes/{user.js.es6 => user.js}        |  0
 .../discourse/routes/{users.js.es6 => users.js}      |  0
 .../services/{app-events.js.es6 => app-events.js}    |  0
 .../services/{emoji-store.js.es6 => emoji-store.js}  |  0
 .../services/{logs-notice.js.es6 => logs-notice.js}  |  0
 .../discourse/services/{search.js.es6 => search.js}  |  0
 .../{theme-settings.js.es6 => theme-settings.js}     |  0
 .../{reviewable-score.js.es6 => reviewable-score.js} |  0
 .../{actions-summary.js.es6 => actions-summary.js}   |  0
 .../widgets/{avatar-flair.js.es6 => avatar-flair.js} |  0
 ...js.es6 => bookmark-reminder-notification-item.js} |  0
 .../discourse/widgets/{button.js.es6 => button.js}   |  0
 .../{category-link.js.es6 => category-link.js}       |  0
 ...onent-connector.js.es6 => component-connector.js} |  0
 .../widgets/{connector.js.es6 => connector.js}       |  0
 ...ation-item.js.es6 => custom-notification-item.js} |  0
 .../{decorator-helper.js.es6 => decorator-helper.js} |  0
 ...tion-item.js.es6 => default-notification-item.js} |  0
 .../{discourse-tags.js.es6 => discourse-tags.js}     |  0
 .../{embedded-post.js.es6 => embedded-post.js}       |  0
 .../discourse/widgets/{emoji.js.es6 => emoji.js}     |  0
 .../widgets/{footer-nav.js.es6 => footer-nav.js}     |  0
 .../discourse/widgets/{glue.js.es6 => glue.js}       |  0
 ...s6 => group-message-summary-notification-item.js} |  0
 ...ger-categories.js.es6 => hamburger-categories.js} |  0
 .../{hamburger-menu.js.es6 => hamburger-menu.js}     |  0
 .../widgets/{hbs-compiler.js.es6 => hbs-compiler.js} |  0
 .../{header-contents.js.es6 => header-contents.js}   |  0
 ...header-topic-info.js.es6 => header-topic-info.js} |  0
 .../discourse/widgets/{header.js.es6 => header.js}   |  0
 .../widgets/{home-logo.js.es6 => home-logo.js}       |  0
 .../discourse/widgets/{hooks.js.es6 => hooks.js}     |  0
 ....js.es6 => invitee-accepted-notification-item.js} |  0
 ...s.es6 => liked-consolidated-notification-item.js} |  0
 ...cation-item.js.es6 => liked-notification-item.js} |  0
 .../discourse/widgets/{link.js.es6 => link.js}       |  0
 ...membership-request-accepted-notification-item.js} |  0
 ...ership-request-consolidated-notification-item.js} |  0
 .../widgets/{menu-panel.js.es6 => menu-panel.js}     |  0
 .../{post-admin-menu.js.es6 => post-admin-menu.js}   |  0
 .../widgets/{post-cooked.js.es6 => post-cooked.js}   |  0
 ...dits-indicator.js.es6 => post-edits-indicator.js} |  0
 .../widgets/{post-gap.js.es6 => post-gap.js}         |  0
 .../widgets/{post-links.js.es6 => post-links.js}     |  0
 .../widgets/{post-menu.js.es6 => post-menu.js}       |  0
 .../{post-placeholder.js.es6 => post-placeholder.js} |  0
 ...post-small-action.js.es6 => post-small-action.js} |  0
 .../widgets/{post-stream.js.es6 => post-stream.js}   |  0
 .../discourse/widgets/{post.js.es6 => post.js}       |  0
 .../widgets/{poster-name.js.es6 => poster-name.js}   |  0
 ...ate-message-map.js.es6 => private-message-map.js} |  0
 ...ss-bookmarks.js.es6 => quick-access-bookmarks.js} |  0
 ...quick-access-item.js.es6 => quick-access-item.js} |  0
 ...cess-messages.js.es6 => quick-access-messages.js} |  0
 ...ications.js.es6 => quick-access-notifications.js} |  0
 ...ick-access-panel.js.es6 => quick-access-panel.js} |  0
 ...access-profile.js.es6 => quick-access-profile.js} |  0
 .../widgets/{raw-html.js.es6 => raw-html.js}         |  0
 ...-menu-controls.js.es6 => search-menu-controls.js} |  0
 ...ch-menu-results.js.es6 => search-menu-results.js} |  0
 .../widgets/{search-menu.js.es6 => search-menu.js}   |  0
 .../widgets/{time-gap.js.es6 => time-gap.js}         |  0
 ...-topic-summary.js.es6 => toggle-topic-summary.js} |  0
 .../{topic-admin-menu.js.es6 => topic-admin-menu.js} |  0
 .../widgets/{topic-map.js.es6 => topic-map.js}       |  0
 .../widgets/{topic-status.js.es6 => topic-status.js} |  0
 .../{topic-timeline.js.es6 => topic-timeline.js}     |  0
 .../widgets/{user-menu.js.es6 => user-menu.js}       |  0
 ...ions-large.js.es6 => user-notifications-large.js} |  0
 .../discourse/widgets/{widget.js.es6 => widget.js}   |  0
 lefthook.yml                                         | 12 +++++++++---
 764 files changed, 13 insertions(+), 7 deletions(-)
 rename app/assets/javascripts/discourse/adapters/{email-template.js.es6 => email-template.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{group.js.es6 => group.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{notification.js.es6 => notification.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{post-reply-history.js.es6 => post-reply-history.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{post-reply.js.es6 => post-reply.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{post.js.es6 => post.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{rest.js.es6 => rest.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{reviewable-explanation.js.es6 => reviewable-explanation.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{reviewable-settings.js.es6 => reviewable-settings.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{reviewable-topic.js.es6 => reviewable-topic.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{reviewable.js.es6 => reviewable.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{tag-info.js.es6 => tag-info.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{tag-notification.js.es6 => tag-notification.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{topic-list.js.es6 => topic-list.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{topic.js.es6 => topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{about-page-users.js.es6 => about-page-users.js} (100%)
 rename app/assets/javascripts/discourse/components/{activation-controls.js.es6 => activation-controls.js} (100%)
 rename app/assets/javascripts/discourse/components/{add-category-tag-classes.js.es6 => add-category-tag-classes.js} (100%)
 rename app/assets/javascripts/discourse/components/{avatar-flair.js.es6 => avatar-flair.js} (100%)
 rename app/assets/javascripts/discourse/components/{avatar-uploader.js.es6 => avatar-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{backup-codes.js.es6 => backup-codes.js} (100%)
 rename app/assets/javascripts/discourse/components/{backup-uploader.js.es6 => backup-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{badge-button.js.es6 => badge-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{badge-card.js.es6 => badge-card.js} (100%)
 rename app/assets/javascripts/discourse/components/{badge-selector.js.es6 => badge-selector.js} (100%)
 rename app/assets/javascripts/discourse/components/{badge-title.js.es6 => badge-title.js} (100%)
 rename app/assets/javascripts/discourse/components/{basic-topic-list.js.es6 => basic-topic-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{bookmark-actions-dropdown.js.es6 => bookmark-actions-dropdown.js} (100%)
 rename app/assets/javascripts/discourse/components/{bread-crumbs.js.es6 => bread-crumbs.js} (100%)
 rename app/assets/javascripts/discourse/components/{bulk-select-button.js.es6 => bulk-select-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-and-latest-topics.js.es6 => categories-and-latest-topics.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-and-top-topics.js.es6 => categories-and-top-topics.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-boxes-topic.js.es6 => categories-boxes-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-boxes-with-topics.js.es6 => categories-boxes-with-topics.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-boxes.js.es6 => categories-boxes.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-only.js.es6 => categories-only.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-topic-list.js.es6 => categories-topic-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{category-title-before.js.es6 => category-title-before.js} (100%)
 rename app/assets/javascripts/discourse/components/{category-title-link.js.es6 => category-title-link.js} (100%)
 rename app/assets/javascripts/discourse/components/{category-unread.js.es6 => category-unread.js} (100%)
 rename app/assets/javascripts/discourse/components/{cdn-img.js.es6 => cdn-img.js} (100%)
 rename app/assets/javascripts/discourse/components/{choose-message.js.es6 => choose-message.js} (100%)
 rename app/assets/javascripts/discourse/components/{choose-topic.js.es6 => choose-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{color-picker-choice.js.es6 => color-picker-choice.js} (100%)
 rename app/assets/javascripts/discourse/components/{color-picker.js.es6 => color-picker.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-action-title.js.es6 => composer-action-title.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-body.js.es6 => composer-body.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-editor.js.es6 => composer-editor.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-message.js.es6 => composer-message.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-messages.js.es6 => composer-messages.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-save-button.js.es6 => composer-save-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-title.js.es6 => composer-title.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-toggles.js.es6 => composer-toggles.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-user-selector.js.es6 => composer-user-selector.js} (100%)
 rename app/assets/javascripts/discourse/components/{conditional-loading-section.js.es6 => conditional-loading-section.js} (100%)
 rename app/assets/javascripts/discourse/components/{conditional-loading-spinner.js.es6 => conditional-loading-spinner.js} (100%)
 rename app/assets/javascripts/discourse/components/{connector-container.js.es6 => connector-container.js} (100%)
 rename app/assets/javascripts/discourse/components/{cook-text.js.es6 => cook-text.js} (100%)
 rename app/assets/javascripts/discourse/components/{count-i18n.js.es6 => count-i18n.js} (100%)
 rename app/assets/javascripts/discourse/components/{create-account.js.es6 => create-account.js} (100%)
 rename app/assets/javascripts/discourse/components/{create-topic-button.js.es6 => create-topic-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{create-topics-notice.js.es6 => create-topics-notice.js} (100%)
 rename app/assets/javascripts/discourse/components/{csv-uploader.js.es6 => csv-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{custom-html.js.es6 => custom-html.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-button.js.es6 => d-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-editor.js.es6 => d-editor.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-modal-body.js.es6 => d-modal-body.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-modal-cancel.js.es6 => d-modal-cancel.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-modal.js.es6 => d-modal.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-navigation.js.es6 => d-navigation.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-section.js.es6 => d-section.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-input.js.es6 => date-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-picker-future.js.es6 => date-picker-future.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-picker-past.js.es6 => date-picker-past.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-picker.js.es6 => date-picker.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-time-input-range.js.es6 => date-time-input-range.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-time-input.js.es6 => date-time-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{desktop-notification-config.js.es6 => desktop-notification-config.js} (100%)
 rename app/assets/javascripts/discourse/components/{directory-item.js.es6 => directory-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{directory-toggle.js.es6 => directory-toggle.js} (100%)
 rename app/assets/javascripts/discourse/components/{disabled-icon.js.es6 => disabled-icon.js} (100%)
 rename app/assets/javascripts/discourse/components/{discourse-banner.js.es6 => discourse-banner.js} (100%)
 rename app/assets/javascripts/discourse/components/{discourse-linked-text.js.es6 => discourse-linked-text.js} (100%)
 rename app/assets/javascripts/discourse/components/{discourse-tag-bound.js.es6 => discourse-tag-bound.js} (100%)
 rename app/assets/javascripts/discourse/components/{discourse-topic.js.es6 => discourse-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{discovery-categories.js.es6 => discovery-categories.js} (100%)
 rename app/assets/javascripts/discourse/components/{discovery-topics-list.js.es6 => discovery-topics-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-general.js.es6 => edit-category-general.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-images.js.es6 => edit-category-images.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-panel.js.es6 => edit-category-panel.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-security.js.es6 => edit-category-security.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-settings.js.es6 => edit-category-settings.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-tab.js.es6 => edit-category-tab.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-tags.js.es6 => edit-category-tags.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-topic-template.js.es6 => edit-category-topic-template.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-topic-timer-form.js.es6 => edit-topic-timer-form.js} (100%)
 rename app/assets/javascripts/discourse/components/{emoji-picker.js.es6 => emoji-picker.js} (100%)
 rename app/assets/javascripts/discourse/components/{emoji-uploader.js.es6 => emoji-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{expand-post.js.es6 => expand-post.js} (100%)
 rename app/assets/javascripts/discourse/components/{expanding-text-area.js.es6 => expanding-text-area.js} (100%)
 rename app/assets/javascripts/discourse/components/{featured-topic.js.es6 => featured-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{flag-action-type.js.es6 => flag-action-type.js} (100%)
 rename app/assets/javascripts/discourse/components/{flag-selection.js.es6 => flag-selection.js} (100%)
 rename app/assets/javascripts/discourse/components/{flat-button.js.es6 => flat-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{footer-message.js.es6 => footer-message.js} (100%)
 rename app/assets/javascripts/discourse/components/{footer-nav.js.es6 => footer-nav.js} (100%)
 rename app/assets/javascripts/discourse/components/{future-date-input.js.es6 => future-date-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{generated-invite-link.js.es6 => generated-invite-link.js} (100%)
 rename app/assets/javascripts/discourse/components/{global-notice.js.es6 => global-notice.js} (100%)
 rename app/assets/javascripts/discourse/components/{google-search.js.es6 => google-search.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-activity-filter.js.es6 => group-activity-filter.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-card-contents.js.es6 => group-card-contents.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-flair-inputs.js.es6 => group-flair-inputs.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-index-toggle.js.es6 => group-index-toggle.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-manage-logs-filter.js.es6 => group-manage-logs-filter.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-manage-logs-row.js.es6 => group-manage-logs-row.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-manage-save-button.js.es6 => group-manage-save-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-member-dropdown.js.es6 => group-member-dropdown.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-member.js.es6 => group-member.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-membership-button.js.es6 => group-membership-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-navigation.js.es6 => group-navigation.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-post.js.es6 => group-post.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-selector.js.es6 => group-selector.js} (100%)
 rename app/assets/javascripts/discourse/components/{groups-form-interaction-fields.js.es6 => groups-form-interaction-fields.js} (100%)
 rename app/assets/javascripts/discourse/components/{groups-form-membership-fields.js.es6 => groups-form-membership-fields.js} (100%)
 rename app/assets/javascripts/discourse/components/{groups-form-profile-fields.js.es6 => groups-form-profile-fields.js} (100%)
 rename app/assets/javascripts/discourse/components/{groups-info.js.es6 => groups-info.js} (100%)
 rename app/assets/javascripts/discourse/components/{header-extra-info.js.es6 => header-extra-info.js} (100%)
 rename app/assets/javascripts/discourse/components/{hide-modal-trigger.js.es6 => hide-modal-trigger.js} (100%)
 rename app/assets/javascripts/discourse/components/{highlight-text.js.es6 => highlight-text.js} (100%)
 rename app/assets/javascripts/discourse/components/{honeypot-input.js.es6 => honeypot-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{iframed-html.js.es6 => iframed-html.js} (100%)
 rename app/assets/javascripts/discourse/components/{ignored-user-list-item.js.es6 => ignored-user-list-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{ignored-user-list.js.es6 => ignored-user-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{image-uploader.js.es6 => image-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{images-uploader.js.es6 => images-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{input-tip.js.es6 => input-tip.js} (100%)
 rename app/assets/javascripts/discourse/components/{invite-panel.js.es6 => invite-panel.js} (100%)
 rename app/assets/javascripts/discourse/components/{latest-topic-list-item.js.es6 => latest-topic-list-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{link-to-input.js.es6 => link-to-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{links-redirect.js.es6 => links-redirect.js} (100%)
 rename app/assets/javascripts/discourse/components/{load-more.js.es6 => load-more.js} (100%)
 rename app/assets/javascripts/discourse/components/{login-buttons.js.es6 => login-buttons.js} (100%)
 rename app/assets/javascripts/discourse/components/{login-modal.js.es6 => login-modal.js} (100%)
 rename app/assets/javascripts/discourse/components/{login-reply-button.js.es6 => login-reply-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{mobile-category-topic.js.es6 => mobile-category-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{mobile-nav.js.es6 => mobile-nav.js} (100%)
 rename app/assets/javascripts/discourse/components/{modal-panel.js.es6 => modal-panel.js} (100%)
 rename app/assets/javascripts/discourse/components/{modal-tab.js.es6 => modal-tab.js} (100%)
 rename app/assets/javascripts/discourse/components/{mount-widget.js.es6 => mount-widget.js} (100%)
 rename app/assets/javascripts/discourse/components/{nav-item.js.es6 => nav-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{navigation-bar.js.es6 => navigation-bar.js} (100%)
 rename app/assets/javascripts/discourse/components/{navigation-item.js.es6 => navigation-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{notification-consent-banner.js.es6 => notification-consent-banner.js} (100%)
 rename app/assets/javascripts/discourse/components/{number-field.js.es6 => number-field.js} (100%)
 rename app/assets/javascripts/discourse/components/{password-field.js.es6 => password-field.js} (100%)
 rename app/assets/javascripts/discourse/components/{plugin-connector.js.es6 => plugin-connector.js} (100%)
 rename app/assets/javascripts/discourse/components/{plugin-outlet.js.es6 => plugin-outlet.js} (100%)
 rename app/assets/javascripts/discourse/components/{popup-input-tip.js.es6 => popup-input-tip.js} (100%)
 rename app/assets/javascripts/discourse/components/{preference-checkbox.js.es6 => preference-checkbox.js} (100%)
 rename app/assets/javascripts/discourse/components/{private-message-glyph.js.es6 => private-message-glyph.js} (100%)
 rename app/assets/javascripts/discourse/components/{pwa-install-banner.js.es6 => pwa-install-banner.js} (100%)
 rename app/assets/javascripts/discourse/components/{quote-button.js.es6 => quote-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{radio-button.js.es6 => radio-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{related-messages.js.es6 => related-messages.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-bundled-action.js.es6 => reviewable-bundled-action.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-claimed-topic.js.es6 => reviewable-claimed-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-conversation-post.js.es6 => reviewable-conversation-post.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-field-category.js.es6 => reviewable-field-category.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-field-tags.js.es6 => reviewable-field-tags.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-flagged-post.js.es6 => reviewable-flagged-post.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-histories.js.es6 => reviewable-histories.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-item.js.es6 => reviewable-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-queued-post.js.es6 => reviewable-queued-post.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-user.js.es6 => reviewable-user.js} (100%)
 rename app/assets/javascripts/discourse/components/{save-controls.js.es6 => save-controls.js} (100%)
 rename app/assets/javascripts/discourse/components/{scroll-tracker.js.es6 => scroll-tracker.js} (100%)
 rename app/assets/javascripts/discourse/components/{scrolling-post-stream.js.es6 => scrolling-post-stream.js} (100%)
 rename app/assets/javascripts/discourse/components/{search-advanced-options.js.es6 => search-advanced-options.js} (100%)
 rename app/assets/javascripts/discourse/components/{search-text-field.js.es6 => search-text-field.js} (100%)
 rename app/assets/javascripts/discourse/components/{second-factor-form.js.es6 => second-factor-form.js} (100%)
 rename app/assets/javascripts/discourse/components/{second-factor-input.js.es6 => second-factor-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{security-key-form.js.es6 => security-key-form.js} (100%)
 rename app/assets/javascripts/discourse/components/{share-panel.js.es6 => share-panel.js} (100%)
 rename app/assets/javascripts/discourse/components/{share-popup.js.es6 => share-popup.js} (100%)
 rename app/assets/javascripts/discourse/components/{share-source.js.es6 => share-source.js} (100%)
 rename app/assets/javascripts/discourse/components/{shared-draft-controls.js.es6 => shared-draft-controls.js} (100%)
 rename app/assets/javascripts/discourse/components/{signup-cta.js.es6 => signup-cta.js} (100%)
 rename app/assets/javascripts/discourse/components/{site-header.js.es6 => site-header.js} (100%)
 rename app/assets/javascripts/discourse/components/{suggested-topics.js.es6 => suggested-topics.js} (100%)
 rename app/assets/javascripts/discourse/components/{tag-drop-link.js.es6 => tag-drop-link.js} (100%)
 rename app/assets/javascripts/discourse/components/{tag-groups-form.js.es6 => tag-groups-form.js} (100%)
 rename app/assets/javascripts/discourse/components/{tag-info.js.es6 => tag-info.js} (100%)
 rename app/assets/javascripts/discourse/components/{tag-list.js.es6 => tag-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{tags-admin-dropdown.js.es6 => tags-admin-dropdown.js} (100%)
 rename app/assets/javascripts/discourse/components/{tap-tile-grid.js.es6 => tap-tile-grid.js} (100%)
 rename app/assets/javascripts/discourse/components/{tap-tile.js.es6 => tap-tile.js} (100%)
 rename app/assets/javascripts/discourse/components/{text-field.js.es6 => text-field.js} (100%)
 rename app/assets/javascripts/discourse/components/{text-overflow.js.es6 => text-overflow.js} (100%)
 rename app/assets/javascripts/discourse/components/{time-input.js.es6 => time-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{top-period-buttons.js.es6 => top-period-buttons.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-admin-menu-button.js.es6 => topic-admin-menu-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-category.js.es6 => topic-category.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-entrance.js.es6 => topic-entrance.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-footer-buttons.js.es6 => topic-footer-buttons.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-join-group-notice.js.es6 => topic-join-group-notice.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-list-item.js.es6 => topic-list-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-list.js.es6 => topic-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-navigation.js.es6 => topic-navigation.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-post-badges.js.es6 => topic-post-badges.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-progress.js.es6 => topic-progress.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-status.js.es6 => topic-status.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-timeline.js.es6 => topic-timeline.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-timer-info.js.es6 => topic-timer-info.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-title.js.es6 => topic-title.js} (100%)
 rename app/assets/javascripts/discourse/components/{track-selected.js.es6 => track-selected.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-badge.js.es6 => user-badge.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-card-contents.js.es6 => user-card-contents.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-field.js.es6 => user-field.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-flag-percentage.js.es6 => user-flag-percentage.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-info.js.es6 => user-info.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-link.js.es6 => user-link.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-notifications-large.js.es6 => user-notifications-large.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-selector.js.es6 => user-selector.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-stat.js.es6 => user-stat.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-stream-item.js.es6 => user-stream-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-stream.js.es6 => user-stream.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-summary-category-search.js.es6 => user-summary-category-search.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-summary-section.js.es6 => user-summary-section.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-summary-topic.js.es6 => user-summary-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-summary-topics-list.js.es6 => user-summary-topics-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-summary-user.js.es6 => user-summary-user.js} (100%)
 rename app/assets/javascripts/discourse/components/{watch-read.js.es6 => watch-read.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{about.js.es6 => about.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{account-created-edit-email.js.es6 => account-created-edit-email.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{account-created-index.js.es6 => account-created-index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{activation-edit.js.es6 => activation-edit.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{add-post-notice.js.es6 => add-post-notice.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{application.js.es6 => application.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{associate-account-confirm.js.es6 => associate-account-confirm.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{auth-token.js.es6 => auth-token.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{avatar-selector.js.es6 => avatar-selector.js} (100%)
 rename app/assets/javascripts/discourse/controllers/badges/{index.js.es6 => index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/badges/{show.js.es6 => show.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{basic-modal-body.js.es6 => basic-modal-body.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{bookmark.js.es6 => bookmark.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{bulk-notification-level.js.es6 => bulk-notification-level.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{change-owner.js.es6 => change-owner.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{change-timestamp.js.es6 => change-timestamp.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{composer.js.es6 => composer.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{convert-to-public-topic.js.es6 => convert-to-public-topic.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{create-account.js.es6 => create-account.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{discovery-sortable.js.es6 => discovery-sortable.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{discovery.js.es6 => discovery.js} (100%)
 rename app/assets/javascripts/discourse/controllers/discovery/{categories.js.es6 => categories.js} (100%)
 rename app/assets/javascripts/discourse/controllers/discovery/{topics.js.es6 => topics.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{edit-category.js.es6 => edit-category.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{edit-topic-timer.js.es6 => edit-topic-timer.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{email-login.js.es6 => email-login.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{exception.js.es6 => exception.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{explain-reviewable.js.es6 => explain-reviewable.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{feature-topic-on-profile.js.es6 => feature-topic-on-profile.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{feature-topic.js.es6 => feature-topic.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{flag.js.es6 => flag.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{forgot-password.js.es6 => forgot-password.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{full-page-search.js.es6 => full-page-search.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{grant-badge.js.es6 => grant-badge.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-activity-posts.js.es6 => group-activity-posts.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-activity-topics.js.es6 => group-activity-topics.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-activity.js.es6 => group-activity.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-add-members.js.es6 => group-add-members.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-bulk-add.js.es6 => group-bulk-add.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-index.js.es6 => group-index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-manage-logs.js.es6 => group-manage-logs.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-manage-profile.js.es6 => group-manage-profile.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-manage.js.es6 => group-manage.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-messages.js.es6 => group-messages.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-requests.js.es6 => group-requests.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group.js.es6 => group.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{groups-index.js.es6 => groups-index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{groups-new.js.es6 => groups-new.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{history.js.es6 => history.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{ignore-duration-with-username.js.es6 => ignore-duration-with-username.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{ignore-duration.js.es6 => ignore-duration.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{insert-hyperlink.js.es6 => insert-hyperlink.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{invites-show.js.es6 => invites-show.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{jump-to-post.js.es6 => jump-to-post.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{keyboard-shortcuts-help.js.es6 => keyboard-shortcuts-help.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{login.js.es6 => login.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{modal.js.es6 => modal.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{move-to-topic.js.es6 => move-to-topic.js} (100%)
 rename app/assets/javascripts/discourse/controllers/navigation/{categories.js.es6 => categories.js} (100%)
 rename app/assets/javascripts/discourse/controllers/navigation/{category.js.es6 => category.js} (100%)
 rename app/assets/javascripts/discourse/controllers/navigation/{default.js.es6 => default.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{not-activated.js.es6 => not-activated.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{password-reset.js.es6 => password-reset.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{preferences.js.es6 => preferences.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{account.js.es6 => account.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{categories.js.es6 => categories.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{email.js.es6 => email.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{emails.js.es6 => emails.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{interface.js.es6 => interface.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{notifications.js.es6 => notifications.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{profile.js.es6 => profile.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{second-factor.js.es6 => second-factor.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{tags.js.es6 => tags.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{username.js.es6 => username.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{users.js.es6 => users.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{raw-email.js.es6 => raw-email.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{rename-tag.js.es6 => rename-tag.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{reorder-categories.js.es6 => reorder-categories.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{request-group-membership-form.js.es6 => request-group-membership-form.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{review-index.js.es6 => review-index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{review-settings.js.es6 => review-settings.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{second-factor-add-security-key.js.es6 => second-factor-add-security-key.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{second-factor-add-totp.js.es6 => second-factor-add-totp.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{second-factor-backup-edit.js.es6 => second-factor-backup-edit.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{second-factor-edit-security-key.js.es6 => second-factor-edit-security-key.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{second-factor-edit.js.es6 => second-factor-edit.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{static.js.es6 => static.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{tag-groups-edit.js.es6 => tag-groups-edit.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{tag-groups-new.js.es6 => tag-groups-new.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{tag-groups.js.es6 => tag-groups.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{tags-index.js.es6 => tags-index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{tags-show.js.es6 => tags-show.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{topic-bulk-actions.js.es6 => topic-bulk-actions.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{topic.js.es6 => topic.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{upload-selector.js.es6 => upload-selector.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-activity-bookmarks-with-reminders.js.es6 => user-activity-bookmarks-with-reminders.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-activity.js.es6 => user-activity.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-badges.js.es6 => user-badges.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-card.js.es6 => user-card.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-invited-show.js.es6 => user-invited-show.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-notifications.js.es6 => user-notifications.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-posts.js.es6 => user-posts.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-private-messages-tags.js.es6 => user-private-messages-tags.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-private-messages.js.es6 => user-private-messages.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-summary.js.es6 => user-summary.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-topics-list.js.es6 => user-topics-list.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user.js.es6 => user.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{users.js.es6 => users.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{application.js.es6 => application.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{border-color.js.es6 => border-color.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{bound-avatar-template.js.es6 => bound-avatar-template.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{bound-avatar.js.es6 => bound-avatar.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{bound-category-link.js.es6 => bound-category-link.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{bound-date.js.es6 => bound-date.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{capitalize-string.js.es6 => capitalize-string.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{category-badge.js.es6 => category-badge.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{category-link.js.es6 => category-link.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{cold-age-class.js.es6 => cold-age-class.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{custom-html.js.es6 => custom-html.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{dash-if-empty.js.es6 => dash-if-empty.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{dasherize.js.es6 => dasherize.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{dir-span.js.es6 => dir-span.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{discourse-tag.js.es6 => discourse-tag.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{discourse-tags.js.es6 => discourse-tags.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{editable-value.js.es6 => editable-value.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{fa-icon-node.js.es6 => fa-icon-node.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{float.js.es6 => float.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{format-age.js.es6 => format-age.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{format-date.js.es6 => format-date.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{format-username.js.es6 => format-username.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{icon-or-image.js.es6 => icon-or-image.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{inline-date.js.es6 => inline-date.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{node.js.es6 => node.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{period-title.js.es6 => period-title.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{raw-plugin-outlet.js.es6 => raw-plugin-outlet.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{raw.js.es6 => raw.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{replace-emoji.js.es6 => replace-emoji.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{reviewable-history-description.js.es6 => reviewable-history-description.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{reviewable-status.js.es6 => reviewable-status.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{route-action.js.es6 => route-action.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{shorten-url.js.es6 => shorten-url.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{theme-helpers.js.es6 => theme-helpers.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{topic-featured-link.js.es6 => topic-featured-link.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{topic-link.js.es6 => topic-link.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{topic-status-icons.js.es6 => topic-status-icons.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{user-avatar.js.es6 => user-avatar.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{user-status.js.es6 => user-status.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{asset-version.js.es6 => asset-version.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{auth-complete.js.es6 => auth-complete.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{auto-load-modules.js.es6 => auto-load-modules.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{avatar-select.js.es6 => avatar-select.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{badging.js.es6 => badging.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{banner.js.es6 => banner.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{click-interceptor.js.es6 => click-interceptor.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{csrf-token.js.es6 => csrf-token.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{d-popover.js.es6 => d-popover.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{ember-events.js.es6 => ember-events.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{enable-emoji.js.es6 => enable-emoji.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{ensure-max-image-dimensions.js.es6 => ensure-max-image-dimensions.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{inject-objects.js.es6 => inject-objects.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{jquery-plugins.js.es6 => jquery-plugins.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{keyboard-shortcuts.js.es6 => keyboard-shortcuts.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{live-development.js.es6 => live-development.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{localization.js.es6 => localization.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{logout.js.es6 => logout.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{logs-notice.js.es6 => logs-notice.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{message-bus.js.es6 => message-bus.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{mobile.js.es6 => mobile.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{page-tracking.js.es6 => page-tracking.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{post-decorations.js.es6 => post-decorations.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{read-only.js.es6 => read-only.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{register-discourse-location.js.es6 => register-discourse-location.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{register-service-worker.js.es6 => register-service-worker.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{relative-ages.js.es6 => relative-ages.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{sharing-sources.js.es6 => sharing-sources.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{show-footer.js.es6 => show-footer.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{signup-cta.js.es6 => signup-cta.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{strip-mobile-app-url-params.js.es6 => strip-mobile-app-url-params.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{subscribe-user-notifications.js.es6 => subscribe-user-notifications.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{title-notifications.js.es6 => title-notifications.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{topic-footer-buttons.js.es6 => topic-footer-buttons.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{url-redirects.js.es6 => url-redirects.js} (100%)
 rename app/assets/javascripts/discourse/lib/{after-transition.js.es6 => after-transition.js} (100%)
 rename app/assets/javascripts/discourse/lib/{ajax-error.js.es6 => ajax-error.js} (100%)
 rename app/assets/javascripts/discourse/lib/{autocomplete.js.es6 => autocomplete.js} (100%)
 rename app/assets/javascripts/discourse/lib/{cached-topic-list.js.es6 => cached-topic-list.js} (100%)
 rename app/assets/javascripts/discourse/lib/{category-hashtags.js.es6 => category-hashtags.js} (100%)
 rename app/assets/javascripts/discourse/lib/{category-tag-search.js.es6 => category-tag-search.js} (100%)
 rename app/assets/javascripts/discourse/lib/{clean-dom.js.es6 => clean-dom.js} (100%)
 rename app/assets/javascripts/discourse/lib/{click-track.js.es6 => click-track.js} (100%)
 rename app/assets/javascripts/discourse/lib/{computed.js.es6 => computed.js} (100%)
 rename app/assets/javascripts/discourse/lib/{copy-text.js.es6 => copy-text.js} (100%)
 rename app/assets/javascripts/discourse/lib/{d-popover.js.es6 => d-popover.js} (100%)
 rename app/assets/javascripts/discourse/lib/{debounce.js.es6 => debounce.js} (100%)
 rename app/assets/javascripts/discourse/lib/{decimal-adjust.js.es6 => decimal-adjust.js} (100%)
 rename app/assets/javascripts/discourse/lib/{desktop-notifications.js.es6 => desktop-notifications.js} (100%)
 rename app/assets/javascripts/discourse/lib/{dirty-keys.js.es6 => dirty-keys.js} (100%)
 rename app/assets/javascripts/discourse/lib/{discourse-location.js.es6 => discourse-location.js} (100%)
 rename app/assets/javascripts/discourse/lib/{export-csv.js.es6 => export-csv.js} (100%)
 rename app/assets/javascripts/discourse/lib/{export-result.js.es6 => export-result.js} (100%)
 rename app/assets/javascripts/discourse/lib/{eyeline.js.es6 => eyeline.js} (100%)
 rename app/assets/javascripts/discourse/lib/{formatter.js.es6 => formatter.js} (100%)
 rename app/assets/javascripts/discourse/lib/{hash.js.es6 => hash.js} (100%)
 rename app/assets/javascripts/discourse/lib/{highlight-syntax.js.es6 => highlight-syntax.js} (100%)
 rename app/assets/javascripts/discourse/lib/{highlight-text.js.es6 => highlight-text.js} (100%)
 rename app/assets/javascripts/discourse/lib/{intercept-click.js.es6 => intercept-click.js} (100%)
 rename app/assets/javascripts/discourse/lib/{is-element-in-viewport.js.es6 => is-element-in-viewport.js} (100%)
 rename app/assets/javascripts/discourse/lib/{key-value-store.js.es6 => key-value-store.js} (100%)
 rename app/assets/javascripts/discourse/lib/{keyboard-shortcuts.js.es6 => keyboard-shortcuts.js} (100%)
 rename app/assets/javascripts/discourse/lib/{lazy-load-images.js.es6 => lazy-load-images.js} (100%)
 rename app/assets/javascripts/discourse/lib/{lightbox.js.es6 => lightbox.js} (100%)
 rename app/assets/javascripts/discourse/lib/{link-category-hashtags.js.es6 => link-category-hashtags.js} (100%)
 rename app/assets/javascripts/discourse/lib/{link-lookup.js.es6 => link-lookup.js} (100%)
 rename app/assets/javascripts/discourse/lib/{link-mentions.js.es6 => link-mentions.js} (100%)
 rename app/assets/javascripts/discourse/lib/{link-tag-hashtag.js.es6 => link-tag-hashtag.js} (100%)
 rename app/assets/javascripts/discourse/lib/{load-script.js.es6 => load-script.js} (100%)
 rename app/assets/javascripts/discourse/lib/{lock-on.js.es6 => lock-on.js} (100%)
 rename app/assets/javascripts/discourse/lib/{logout.js.es6 => logout.js} (100%)
 rename app/assets/javascripts/discourse/lib/{mobile.js.es6 => mobile.js} (100%)
 rename app/assets/javascripts/discourse/lib/{notification-levels.js.es6 => notification-levels.js} (100%)
 rename app/assets/javascripts/discourse/lib/{offset-calculator.js.es6 => offset-calculator.js} (100%)
 rename app/assets/javascripts/discourse/lib/{optional-service.js.es6 => optional-service.js} (100%)
 rename app/assets/javascripts/discourse/lib/{page-tracker.js.es6 => page-tracker.js} (100%)
 rename app/assets/javascripts/discourse/lib/{page-visible.js.es6 => page-visible.js} (100%)
 rename app/assets/javascripts/discourse/lib/{plugin-api.js.es6 => plugin-api.js} (100%)
 rename app/assets/javascripts/discourse/lib/{plugin-connectors.js.es6 => plugin-connectors.js} (100%)
 rename app/assets/javascripts/discourse/lib/{posts-with-placeholders.js.es6 => posts-with-placeholders.js} (100%)
 rename app/assets/javascripts/discourse/lib/{push-notifications.js.es6 => push-notifications.js} (100%)
 rename app/assets/javascripts/discourse/lib/{pwa-utils.js.es6 => pwa-utils.js} (100%)
 rename app/assets/javascripts/discourse/lib/{quote-state.js.es6 => quote-state.js} (100%)
 rename app/assets/javascripts/discourse/lib/{quote.js.es6 => quote.js} (100%)
 rename app/assets/javascripts/discourse/lib/{raw-templates.js.es6 => raw-templates.js} (100%)
 rename app/assets/javascripts/discourse/lib/{register-topic-footer-button.js.es6 => register-topic-footer-button.js} (100%)
 rename app/assets/javascripts/discourse/lib/{render-tag.js.es6 => render-tag.js} (100%)
 rename app/assets/javascripts/discourse/lib/{render-tags.js.es6 => render-tags.js} (100%)
 rename app/assets/javascripts/discourse/lib/{render-topic-featured-link.js.es6 => render-topic-featured-link.js} (100%)
 rename app/assets/javascripts/discourse/lib/{reports-loader.js.es6 => reports-loader.js} (100%)
 rename app/assets/javascripts/discourse/lib/{round.js.es6 => round.js} (100%)
 rename app/assets/javascripts/discourse/lib/{safari-hacks.js.es6 => safari-hacks.js} (100%)
 rename app/assets/javascripts/discourse/lib/{screen-track.js.es6 => screen-track.js} (100%)
 rename app/assets/javascripts/discourse/lib/{search.js.es6 => search.js} (100%)
 rename app/assets/javascripts/discourse/lib/{settings.js.es6 => settings.js} (100%)
 rename app/assets/javascripts/discourse/lib/{sharing.js.es6 => sharing.js} (100%)
 rename app/assets/javascripts/discourse/lib/{show-modal.js.es6 => show-modal.js} (100%)
 rename app/assets/javascripts/discourse/lib/{static-route-builder.js.es6 => static-route-builder.js} (100%)
 rename app/assets/javascripts/discourse/lib/{svg-sprite-loader.js.es6 => svg-sprite-loader.js} (100%)
 rename app/assets/javascripts/discourse/lib/{tag-hashtags.js.es6 => tag-hashtags.js} (100%)
 rename app/assets/javascripts/discourse/lib/{text-direction.js.es6 => text-direction.js} (100%)
 rename app/assets/javascripts/discourse/lib/{text.js.es6 => text.js} (100%)
 rename app/assets/javascripts/discourse/lib/{theme-selector.js.es6 => theme-selector.js} (100%)
 rename app/assets/javascripts/discourse/lib/{to-markdown.js.es6 => to-markdown.js} (100%)
 rename app/assets/javascripts/discourse/lib/{tooltip.js.es6 => tooltip.js} (100%)
 rename app/assets/javascripts/discourse/lib/{transform-post.js.es6 => transform-post.js} (100%)
 rename app/assets/javascripts/discourse/lib/{uploads.js.es6 => uploads.js} (100%)
 rename app/assets/javascripts/discourse/lib/{url.js.es6 => url.js} (100%)
 rename app/assets/javascripts/discourse/lib/{user-activation.js.es6 => user-activation.js} (100%)
 rename app/assets/javascripts/discourse/lib/{user-search.js.es6 => user-search.js} (100%)
 rename app/assets/javascripts/discourse/lib/{utilities.js.es6 => utilities.js} (100%)
 rename app/assets/javascripts/discourse/lib/{webauthn.js.es6 => webauthn.js} (100%)
 rename app/assets/javascripts/discourse/{mapping-router.js.es6 => mapping-router.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{add-archetype-class.js.es6 => add-archetype-class.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{buffered-content.js.es6 => buffered-content.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{bulk-topic-selection.js.es6 => bulk-topic-selection.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{can-check-emails.js.es6 => can-check-emails.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{card-contents-base.js.es6 => card-contents-base.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{cleans-up.js.es6 => cleans-up.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{docking.js.es6 => docking.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{filter-mode.js.es6 => filter-mode.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{grant-badge-controller.js.es6 => grant-badge-controller.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{key-enter-escape.js.es6 => key-enter-escape.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{load-more.js.es6 => load-more.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{mobile-scroll-direction.js.es6 => mobile-scroll-direction.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{modal-functionality.js.es6 => modal-functionality.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{name-validation.js.es6 => name-validation.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{open-composer.js.es6 => open-composer.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{pan-events.js.es6 => pan-events.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{password-validation.js.es6 => password-validation.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{scroll-top.js.es6 => scroll-top.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{scrolling.js.es6 => scrolling.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{singleton.js.es6 => singleton.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{upload.js.es6 => upload.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{url-refresh.js.es6 => url-refresh.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{user-fields-validation.js.es6 => user-fields-validation.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{username-validation.js.es6 => username-validation.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{viewing-action-type.js.es6 => viewing-action-type.js} (100%)
 rename app/assets/javascripts/discourse/models/{action-summary.js.es6 => action-summary.js} (100%)
 rename app/assets/javascripts/discourse/models/{archetype.js.es6 => archetype.js} (100%)
 rename app/assets/javascripts/discourse/models/{badge-grouping.js.es6 => badge-grouping.js} (100%)
 rename app/assets/javascripts/discourse/models/{badge.js.es6 => badge.js} (100%)
 rename app/assets/javascripts/discourse/models/{bookmark.js.es6 => bookmark.js} (100%)
 rename app/assets/javascripts/discourse/models/{category-list.js.es6 => category-list.js} (100%)
 rename app/assets/javascripts/discourse/models/{category.js.es6 => category.js} (100%)
 rename app/assets/javascripts/discourse/models/{composer.js.es6 => composer.js} (100%)
 rename app/assets/javascripts/discourse/models/{draft.js.es6 => draft.js} (100%)
 rename app/assets/javascripts/discourse/models/{group-history.js.es6 => group-history.js} (100%)
 rename app/assets/javascripts/discourse/models/{group.js.es6 => group.js} (100%)
 rename app/assets/javascripts/discourse/models/{invite.js.es6 => invite.js} (100%)
 rename app/assets/javascripts/discourse/models/{login-method.js.es6 => login-method.js} (100%)
 rename app/assets/javascripts/discourse/models/{nav-item.js.es6 => nav-item.js} (100%)
 rename app/assets/javascripts/discourse/models/{permission-type.js.es6 => permission-type.js} (100%)
 rename app/assets/javascripts/discourse/models/{post-action-type.js.es6 => post-action-type.js} (100%)
 rename app/assets/javascripts/discourse/models/{post-stream.js.es6 => post-stream.js} (100%)
 rename app/assets/javascripts/discourse/models/{post.js.es6 => post.js} (100%)
 rename app/assets/javascripts/discourse/models/{rest.js.es6 => rest.js} (100%)
 rename app/assets/javascripts/discourse/models/{result-set.js.es6 => result-set.js} (100%)
 rename app/assets/javascripts/discourse/models/{reviewable-history.js.es6 => reviewable-history.js} (100%)
 rename app/assets/javascripts/discourse/models/{reviewable.js.es6 => reviewable.js} (100%)
 rename app/assets/javascripts/discourse/models/{session.js.es6 => session.js} (100%)
 rename app/assets/javascripts/discourse/models/{site.js.es6 => site.js} (100%)
 rename app/assets/javascripts/discourse/models/{static-page.js.es6 => static-page.js} (100%)
 rename app/assets/javascripts/discourse/models/{store.js.es6 => store.js} (100%)
 rename app/assets/javascripts/discourse/models/{tag-group.js.es6 => tag-group.js} (100%)
 rename app/assets/javascripts/discourse/models/{tag.js.es6 => tag.js} (100%)
 rename app/assets/javascripts/discourse/models/{topic-details.js.es6 => topic-details.js} (100%)
 rename app/assets/javascripts/discourse/models/{topic-list.js.es6 => topic-list.js} (100%)
 rename app/assets/javascripts/discourse/models/{topic-timer.js.es6 => topic-timer.js} (100%)
 rename app/assets/javascripts/discourse/models/{topic-tracking-state.js.es6 => topic-tracking-state.js} (100%)
 rename app/assets/javascripts/discourse/models/{topic.js.es6 => topic.js} (100%)
 rename app/assets/javascripts/discourse/models/{trust-level.js.es6 => trust-level.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-action-group.js.es6 => user-action-group.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-action-stat.js.es6 => user-action-stat.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-action.js.es6 => user-action.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-badge.js.es6 => user-badge.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-draft.js.es6 => user-draft.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-drafts-stream.js.es6 => user-drafts-stream.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-posts-stream.js.es6 => user-posts-stream.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-stream.js.es6 => user-stream.js} (100%)
 rename app/assets/javascripts/discourse/models/{user.js.es6 => user.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{dynamic-route-builders.js.es6 => dynamic-route-builders.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{inject-discourse-objects.js.es6 => inject-discourse-objects.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{map-routes.js.es6 => map-routes.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{register-dom-templates.js.es6 => register-dom-templates.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{sniff-capabilities.js.es6 => sniff-capabilities.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{svg-sprite-fontawesome.js.es6 => svg-sprite-fontawesome.js} (100%)
 rename app/assets/javascripts/discourse/raw-views/list/{post-count-or-badges.js.es6 => post-count-or-badges.js} (100%)
 rename app/assets/javascripts/discourse/raw-views/list/{posts-count-column.js.es6 => posts-count-column.js} (100%)
 rename app/assets/javascripts/discourse/raw-views/list/{visited-line.js.es6 => visited-line.js} (100%)
 rename app/assets/javascripts/discourse/raw-views/{topic-list-header-column.js.es6 => topic-list-header-column.js} (100%)
 rename app/assets/javascripts/discourse/raw-views/{topic-status.js.es6 => topic-status.js} (100%)
 rename app/assets/javascripts/discourse/routes/{about.js.es6 => about.js} (100%)
 rename app/assets/javascripts/discourse/routes/{account-created-edit-email.js.es6 => account-created-edit-email.js} (100%)
 rename app/assets/javascripts/discourse/routes/{account-created-index.js.es6 => account-created-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{account-created-resent.js.es6 => account-created-resent.js} (100%)
 rename app/assets/javascripts/discourse/routes/{account-created.js.es6 => account-created.js} (100%)
 rename app/assets/javascripts/discourse/routes/{app-route-map.js.es6 => app-route-map.js} (100%)
 rename app/assets/javascripts/discourse/routes/{application.js.es6 => application.js} (100%)
 rename app/assets/javascripts/discourse/routes/{associate-account.js.es6 => associate-account.js} (100%)
 rename app/assets/javascripts/discourse/routes/{badges-index.js.es6 => badges-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{badges-show.js.es6 => badges-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-admin-user-posts-route.js.es6 => build-admin-user-posts-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-category-route.js.es6 => build-category-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-group-messages-route.js.es6 => build-group-messages-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-private-messages-route.js.es6 => build-private-messages-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-static-route.js.es6 => build-static-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-topic-route.js.es6 => build-topic-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{conduct.js.es6 => conduct.js} (100%)
 rename app/assets/javascripts/discourse/routes/{discourse.js.es6 => discourse.js} (100%)
 rename app/assets/javascripts/discourse/routes/{discovery-categories.js.es6 => discovery-categories.js} (100%)
 rename app/assets/javascripts/discourse/routes/{discovery.js.es6 => discovery.js} (100%)
 rename app/assets/javascripts/discourse/routes/{email-login.js.es6 => email-login.js} (100%)
 rename app/assets/javascripts/discourse/routes/{exception-unknown.js.es6 => exception-unknown.js} (100%)
 rename app/assets/javascripts/discourse/routes/{exception.js.es6 => exception.js} (100%)
 rename app/assets/javascripts/discourse/routes/{faq.js.es6 => faq.js} (100%)
 rename app/assets/javascripts/discourse/routes/{forgot-password.js.es6 => forgot-password.js} (100%)
 rename app/assets/javascripts/discourse/routes/{full-page-search.js.es6 => full-page-search.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-activity-index.js.es6 => group-activity-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-activity-mentions.js.es6 => group-activity-mentions.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-activity-posts.js.es6 => group-activity-posts.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-activity-topics.js.es6 => group-activity-topics.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-index.js.es6 => group-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage-index.js.es6 => group-manage-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage-interaction.js.es6 => group-manage-interaction.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage-logs.js.es6 => group-manage-logs.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage-membership.js.es6 => group-manage-membership.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage-profile.js.es6 => group-manage-profile.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage.js.es6 => group-manage.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-members.js.es6 => group-members.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-messages-archive.js.es6 => group-messages-archive.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-messages-inbox.js.es6 => group-messages-inbox.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-messages-index.js.es6 => group-messages-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-messages.js.es6 => group-messages.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-requests.js.es6 => group-requests.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group.js.es6 => group.js} (100%)
 rename app/assets/javascripts/discourse/routes/{groups-index.js.es6 => groups-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{groups-new.js.es6 => groups-new.js} (100%)
 rename app/assets/javascripts/discourse/routes/{guidelines.js.es6 => guidelines.js} (100%)
 rename app/assets/javascripts/discourse/routes/{invites-show.js.es6 => invites-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{login.js.es6 => login.js} (100%)
 rename app/assets/javascripts/discourse/routes/{new-message.js.es6 => new-message.js} (100%)
 rename app/assets/javascripts/discourse/routes/{new-topic.js.es6 => new-topic.js} (100%)
 rename app/assets/javascripts/discourse/routes/{password-reset.js.es6 => password-reset.js} (100%)
 rename app/assets/javascripts/discourse/routes/{post.js.es6 => post.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-account.js.es6 => preferences-account.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-apps.js.es6 => preferences-apps.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-categories.js.es6 => preferences-categories.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-email.js.es6 => preferences-email.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-emails.js.es6 => preferences-emails.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-index.js.es6 => preferences-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-interface.js.es6 => preferences-interface.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-notifications.js.es6 => preferences-notifications.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-profile.js.es6 => preferences-profile.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-second-factor.js.es6 => preferences-second-factor.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-tags.js.es6 => preferences-tags.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-username.js.es6 => preferences-username.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-users.js.es6 => preferences-users.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences.js.es6 => preferences.js} (100%)
 rename app/assets/javascripts/discourse/routes/{privacy.js.es6 => privacy.js} (100%)
 rename app/assets/javascripts/discourse/routes/{restricted-user.js.es6 => restricted-user.js} (100%)
 rename app/assets/javascripts/discourse/routes/{review-index.js.es6 => review-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{review-settings.js.es6 => review-settings.js} (100%)
 rename app/assets/javascripts/discourse/routes/{review-show.js.es6 => review-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{review-topics.js.es6 => review-topics.js} (100%)
 rename app/assets/javascripts/discourse/routes/{review.js.es6 => review.js} (100%)
 rename app/assets/javascripts/discourse/routes/{rules.js.es6 => rules.js} (100%)
 rename app/assets/javascripts/discourse/routes/{signup.js.es6 => signup.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tag-groups-edit.js.es6 => tag-groups-edit.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tag-groups-new.js.es6 => tag-groups-new.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tag-groups.js.es6 => tag-groups.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tags-index.js.es6 => tags-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tags-intersection.js.es6 => tags-intersection.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tags-show.js.es6 => tags-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{topic-by-slug-or-id.js.es6 => topic-by-slug-or-id.js} (100%)
 rename app/assets/javascripts/discourse/routes/{topic-from-params-near.js.es6 => topic-from-params-near.js} (100%)
 rename app/assets/javascripts/discourse/routes/{topic-from-params.js.es6 => topic-from-params.js} (100%)
 rename app/assets/javascripts/discourse/routes/{topic.js.es6 => topic.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tos.js.es6 => tos.js} (100%)
 rename app/assets/javascripts/discourse/routes/{unknown.js.es6 => unknown.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-bookmarks-with-reminders.js.es6 => user-activity-bookmarks-with-reminders.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-bookmarks.js.es6 => user-activity-bookmarks.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-drafts.js.es6 => user-activity-drafts.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-index.js.es6 => user-activity-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-likes-given.js.es6 => user-activity-likes-given.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-pending.js.es6 => user-activity-pending.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-replies.js.es6 => user-activity-replies.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-stream.js.es6 => user-activity-stream.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-topics.js.es6 => user-activity-topics.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity.js.es6 => user-activity.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-badges.js.es6 => user-badges.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-deleted-posts.js.es6 => user-deleted-posts.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-index.js.es6 => user-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-invited-index.js.es6 => user-invited-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-invited-show.js.es6 => user-invited-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications-edits.js.es6 => user-notifications-edits.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications-index.js.es6 => user-notifications-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications-likes-received.js.es6 => user-notifications-likes-received.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications-mentions.js.es6 => user-notifications-mentions.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications-responses.js.es6 => user-notifications-responses.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications.js.es6 => user-notifications.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-archive.js.es6 => user-private-messages-archive.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-group-archive.js.es6 => user-private-messages-group-archive.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-group.js.es6 => user-private-messages-group.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-index.js.es6 => user-private-messages-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-sent.js.es6 => user-private-messages-sent.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-tags-show.js.es6 => user-private-messages-tags-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-tags.js.es6 => user-private-messages-tags.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages.js.es6 => user-private-messages.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-summary.js.es6 => user-summary.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-topic-list.js.es6 => user-topic-list.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user.js.es6 => user.js} (100%)
 rename app/assets/javascripts/discourse/routes/{users.js.es6 => users.js} (100%)
 rename app/assets/javascripts/discourse/services/{app-events.js.es6 => app-events.js} (100%)
 rename app/assets/javascripts/discourse/services/{emoji-store.js.es6 => emoji-store.js} (100%)
 rename app/assets/javascripts/discourse/services/{logs-notice.js.es6 => logs-notice.js} (100%)
 rename app/assets/javascripts/discourse/services/{search.js.es6 => search.js} (100%)
 rename app/assets/javascripts/discourse/services/{theme-settings.js.es6 => theme-settings.js} (100%)
 rename app/assets/javascripts/discourse/templates/components/{reviewable-score.js.es6 => reviewable-score.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{actions-summary.js.es6 => actions-summary.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{avatar-flair.js.es6 => avatar-flair.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{bookmark-reminder-notification-item.js.es6 => bookmark-reminder-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{button.js.es6 => button.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{category-link.js.es6 => category-link.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{component-connector.js.es6 => component-connector.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{connector.js.es6 => connector.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{custom-notification-item.js.es6 => custom-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{decorator-helper.js.es6 => decorator-helper.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{default-notification-item.js.es6 => default-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{discourse-tags.js.es6 => discourse-tags.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{embedded-post.js.es6 => embedded-post.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{emoji.js.es6 => emoji.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{footer-nav.js.es6 => footer-nav.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{glue.js.es6 => glue.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{group-message-summary-notification-item.js.es6 => group-message-summary-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{hamburger-categories.js.es6 => hamburger-categories.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{hamburger-menu.js.es6 => hamburger-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{hbs-compiler.js.es6 => hbs-compiler.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{header-contents.js.es6 => header-contents.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{header-topic-info.js.es6 => header-topic-info.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{header.js.es6 => header.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{home-logo.js.es6 => home-logo.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{hooks.js.es6 => hooks.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{invitee-accepted-notification-item.js.es6 => invitee-accepted-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{liked-consolidated-notification-item.js.es6 => liked-consolidated-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{liked-notification-item.js.es6 => liked-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{link.js.es6 => link.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{membership-request-accepted-notification-item.js.es6 => membership-request-accepted-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{membership-request-consolidated-notification-item.js.es6 => membership-request-consolidated-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{menu-panel.js.es6 => menu-panel.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-admin-menu.js.es6 => post-admin-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-cooked.js.es6 => post-cooked.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-edits-indicator.js.es6 => post-edits-indicator.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-gap.js.es6 => post-gap.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-links.js.es6 => post-links.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-menu.js.es6 => post-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-placeholder.js.es6 => post-placeholder.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-small-action.js.es6 => post-small-action.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-stream.js.es6 => post-stream.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post.js.es6 => post.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{poster-name.js.es6 => poster-name.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{private-message-map.js.es6 => private-message-map.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-bookmarks.js.es6 => quick-access-bookmarks.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-item.js.es6 => quick-access-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-messages.js.es6 => quick-access-messages.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-notifications.js.es6 => quick-access-notifications.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-panel.js.es6 => quick-access-panel.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-profile.js.es6 => quick-access-profile.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{raw-html.js.es6 => raw-html.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{search-menu-controls.js.es6 => search-menu-controls.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{search-menu-results.js.es6 => search-menu-results.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{search-menu.js.es6 => search-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{time-gap.js.es6 => time-gap.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{toggle-topic-summary.js.es6 => toggle-topic-summary.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{topic-admin-menu.js.es6 => topic-admin-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{topic-map.js.es6 => topic-map.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{topic-status.js.es6 => topic-status.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{topic-timeline.js.es6 => topic-timeline.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{user-menu.js.es6 => user-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{user-notifications-large.js.es6 => user-notifications-large.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{widget.js.es6 => widget.js} (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c02b8d1947..aa94465faf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -132,7 +132,7 @@ jobs:
         if: env.BUILD_TYPE == 'LINT'
         run: |
           yarn prettier -v
-          yarn prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6" "plugins/**/*.scss" "plugins/**/*.es6"
+          yarn prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.js" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6" "plugins/**/*.scss" "plugins/**/*.es6"
 
       - name: Core RSpec
         if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'CORE'
diff --git a/Dangerfile b/Dangerfile
index 667918b36a..cfa678978a 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -4,7 +4,7 @@ if github.pr_json && (github.pr_json["additions"] || 0) > 250 || (github.pr_json
   warn("This pull request is big! We prefer smaller PRs whenever possible, as they are easier to review. Can this be split into a few smaller PRs?")
 end
 
-prettier_offenses = `yarn --silent prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"`.split("\n")
+prettier_offenses = `yarn --silent prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.js" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"`.split("\n")
 
 unless prettier_offenses.empty?
   fail(%{
@@ -22,9 +22,9 @@ end
 
 files = (git.added_files + git.modified_files)
   .select { |path| !path.start_with?("plugins/") }
-  .select { |path| path.end_with?("es6") || path.end_with?("rb") }
+  .select { |path| path.end_with?("es6") || path.end_with?("js") || path.end_with?("rb") }
 
-js_files = files.select { |path| path.end_with?(".js.es6") }
+js_files = files.select { |path| path.end_with?(".js.es6") || path.end_with?(".js") }
 js_test_files = js_files.select { |path| path.end_with?("-test.js.es6") }
 
 super_offenses = []
diff --git a/app/assets/javascripts/discourse/adapters/email-template.js.es6 b/app/assets/javascripts/discourse/adapters/email-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/email-template.js.es6
rename to app/assets/javascripts/discourse/adapters/email-template.js
diff --git a/app/assets/javascripts/discourse/adapters/group.js.es6 b/app/assets/javascripts/discourse/adapters/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/group.js.es6
rename to app/assets/javascripts/discourse/adapters/group.js
diff --git a/app/assets/javascripts/discourse/adapters/notification.js.es6 b/app/assets/javascripts/discourse/adapters/notification.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/notification.js.es6
rename to app/assets/javascripts/discourse/adapters/notification.js
diff --git a/app/assets/javascripts/discourse/adapters/post-reply-history.js.es6 b/app/assets/javascripts/discourse/adapters/post-reply-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post-reply-history.js.es6
rename to app/assets/javascripts/discourse/adapters/post-reply-history.js
diff --git a/app/assets/javascripts/discourse/adapters/post-reply.js.es6 b/app/assets/javascripts/discourse/adapters/post-reply.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post-reply.js.es6
rename to app/assets/javascripts/discourse/adapters/post-reply.js
diff --git a/app/assets/javascripts/discourse/adapters/post.js.es6 b/app/assets/javascripts/discourse/adapters/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post.js.es6
rename to app/assets/javascripts/discourse/adapters/post.js
diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/rest.js.es6
rename to app/assets/javascripts/discourse/adapters/rest.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-explanation.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable-explanation.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-explanation.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable-explanation.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-settings.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-settings.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable-settings.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-topic.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-topic.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable-topic.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable.js
diff --git a/app/assets/javascripts/discourse/adapters/tag-info.js.es6 b/app/assets/javascripts/discourse/adapters/tag-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/tag-info.js.es6
rename to app/assets/javascripts/discourse/adapters/tag-info.js
diff --git a/app/assets/javascripts/discourse/adapters/tag-notification.js.es6 b/app/assets/javascripts/discourse/adapters/tag-notification.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/tag-notification.js.es6
rename to app/assets/javascripts/discourse/adapters/tag-notification.js
diff --git a/app/assets/javascripts/discourse/adapters/topic-list.js.es6 b/app/assets/javascripts/discourse/adapters/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/topic-list.js.es6
rename to app/assets/javascripts/discourse/adapters/topic-list.js
diff --git a/app/assets/javascripts/discourse/adapters/topic.js.es6 b/app/assets/javascripts/discourse/adapters/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/topic.js.es6
rename to app/assets/javascripts/discourse/adapters/topic.js
diff --git a/app/assets/javascripts/discourse/components/about-page-users.js.es6 b/app/assets/javascripts/discourse/components/about-page-users.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/about-page-users.js.es6
rename to app/assets/javascripts/discourse/components/about-page-users.js
diff --git a/app/assets/javascripts/discourse/components/activation-controls.js.es6 b/app/assets/javascripts/discourse/components/activation-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/activation-controls.js.es6
rename to app/assets/javascripts/discourse/components/activation-controls.js
diff --git a/app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6 b/app/assets/javascripts/discourse/components/add-category-tag-classes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6
rename to app/assets/javascripts/discourse/components/add-category-tag-classes.js
diff --git a/app/assets/javascripts/discourse/components/avatar-flair.js.es6 b/app/assets/javascripts/discourse/components/avatar-flair.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/avatar-flair.js.es6
rename to app/assets/javascripts/discourse/components/avatar-flair.js
diff --git a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 b/app/assets/javascripts/discourse/components/avatar-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/avatar-uploader.js.es6
rename to app/assets/javascripts/discourse/components/avatar-uploader.js
diff --git a/app/assets/javascripts/discourse/components/backup-codes.js.es6 b/app/assets/javascripts/discourse/components/backup-codes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/backup-codes.js.es6
rename to app/assets/javascripts/discourse/components/backup-codes.js
diff --git a/app/assets/javascripts/discourse/components/backup-uploader.js.es6 b/app/assets/javascripts/discourse/components/backup-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/backup-uploader.js.es6
rename to app/assets/javascripts/discourse/components/backup-uploader.js
diff --git a/app/assets/javascripts/discourse/components/badge-button.js.es6 b/app/assets/javascripts/discourse/components/badge-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-button.js.es6
rename to app/assets/javascripts/discourse/components/badge-button.js
diff --git a/app/assets/javascripts/discourse/components/badge-card.js.es6 b/app/assets/javascripts/discourse/components/badge-card.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-card.js.es6
rename to app/assets/javascripts/discourse/components/badge-card.js
diff --git a/app/assets/javascripts/discourse/components/badge-selector.js.es6 b/app/assets/javascripts/discourse/components/badge-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-selector.js.es6
rename to app/assets/javascripts/discourse/components/badge-selector.js
diff --git a/app/assets/javascripts/discourse/components/badge-title.js.es6 b/app/assets/javascripts/discourse/components/badge-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-title.js.es6
rename to app/assets/javascripts/discourse/components/badge-title.js
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/basic-topic-list.js.es6
rename to app/assets/javascripts/discourse/components/basic-topic-list.js
diff --git a/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6 b/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6
rename to app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bread-crumbs.js.es6
rename to app/assets/javascripts/discourse/components/bread-crumbs.js
diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 b/app/assets/javascripts/discourse/components/bulk-select-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bulk-select-button.js.es6
rename to app/assets/javascripts/discourse/components/bulk-select-button.js
diff --git a/app/assets/javascripts/discourse/components/categories-and-latest-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-and-latest-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-and-latest-topics.js.es6
rename to app/assets/javascripts/discourse/components/categories-and-latest-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-and-top-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-and-top-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-and-top-topics.js.es6
rename to app/assets/javascripts/discourse/components/categories-and-top-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6
rename to app/assets/javascripts/discourse/components/categories-boxes-topic.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6
rename to app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes.js.es6
rename to app/assets/javascripts/discourse/components/categories-boxes.js
diff --git a/app/assets/javascripts/discourse/components/categories-only.js.es6 b/app/assets/javascripts/discourse/components/categories-only.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-only.js.es6
rename to app/assets/javascripts/discourse/components/categories-only.js
diff --git a/app/assets/javascripts/discourse/components/categories-topic-list.js.es6 b/app/assets/javascripts/discourse/components/categories-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-topic-list.js.es6
rename to app/assets/javascripts/discourse/components/categories-topic-list.js
diff --git a/app/assets/javascripts/discourse/components/category-title-before.js.es6 b/app/assets/javascripts/discourse/components/category-title-before.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-title-before.js.es6
rename to app/assets/javascripts/discourse/components/category-title-before.js
diff --git a/app/assets/javascripts/discourse/components/category-title-link.js.es6 b/app/assets/javascripts/discourse/components/category-title-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-title-link.js.es6
rename to app/assets/javascripts/discourse/components/category-title-link.js
diff --git a/app/assets/javascripts/discourse/components/category-unread.js.es6 b/app/assets/javascripts/discourse/components/category-unread.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-unread.js.es6
rename to app/assets/javascripts/discourse/components/category-unread.js
diff --git a/app/assets/javascripts/discourse/components/cdn-img.js.es6 b/app/assets/javascripts/discourse/components/cdn-img.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/cdn-img.js.es6
rename to app/assets/javascripts/discourse/components/cdn-img.js
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/choose-message.js.es6
rename to app/assets/javascripts/discourse/components/choose-message.js
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js.es6 b/app/assets/javascripts/discourse/components/choose-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/choose-topic.js.es6
rename to app/assets/javascripts/discourse/components/choose-topic.js
diff --git a/app/assets/javascripts/discourse/components/color-picker-choice.js.es6 b/app/assets/javascripts/discourse/components/color-picker-choice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/color-picker-choice.js.es6
rename to app/assets/javascripts/discourse/components/color-picker-choice.js
diff --git a/app/assets/javascripts/discourse/components/color-picker.js.es6 b/app/assets/javascripts/discourse/components/color-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/color-picker.js.es6
rename to app/assets/javascripts/discourse/components/color-picker.js
diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-action-title.js.es6
rename to app/assets/javascripts/discourse/components/composer-action-title.js
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-body.js.es6
rename to app/assets/javascripts/discourse/components/composer-body.js
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-editor.js.es6
rename to app/assets/javascripts/discourse/components/composer-editor.js
diff --git a/app/assets/javascripts/discourse/components/composer-message.js.es6 b/app/assets/javascripts/discourse/components/composer-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-message.js.es6
rename to app/assets/javascripts/discourse/components/composer-message.js
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-messages.js.es6
rename to app/assets/javascripts/discourse/components/composer-messages.js
diff --git a/app/assets/javascripts/discourse/components/composer-save-button.js.es6 b/app/assets/javascripts/discourse/components/composer-save-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-save-button.js.es6
rename to app/assets/javascripts/discourse/components/composer-save-button.js
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-title.js.es6
rename to app/assets/javascripts/discourse/components/composer-title.js
diff --git a/app/assets/javascripts/discourse/components/composer-toggles.js.es6 b/app/assets/javascripts/discourse/components/composer-toggles.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-toggles.js.es6
rename to app/assets/javascripts/discourse/components/composer-toggles.js
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6 b/app/assets/javascripts/discourse/components/composer-user-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-user-selector.js.es6
rename to app/assets/javascripts/discourse/components/composer-user-selector.js
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-section.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/conditional-loading-section.js.es6
rename to app/assets/javascripts/discourse/components/conditional-loading-section.js
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
rename to app/assets/javascripts/discourse/components/conditional-loading-spinner.js
diff --git a/app/assets/javascripts/discourse/components/connector-container.js.es6 b/app/assets/javascripts/discourse/components/connector-container.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/connector-container.js.es6
rename to app/assets/javascripts/discourse/components/connector-container.js
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/cook-text.js.es6
rename to app/assets/javascripts/discourse/components/cook-text.js
diff --git a/app/assets/javascripts/discourse/components/count-i18n.js.es6 b/app/assets/javascripts/discourse/components/count-i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/count-i18n.js.es6
rename to app/assets/javascripts/discourse/components/count-i18n.js
diff --git a/app/assets/javascripts/discourse/components/create-account.js.es6 b/app/assets/javascripts/discourse/components/create-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-account.js.es6
rename to app/assets/javascripts/discourse/components/create-account.js
diff --git a/app/assets/javascripts/discourse/components/create-topic-button.js.es6 b/app/assets/javascripts/discourse/components/create-topic-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-topic-button.js.es6
rename to app/assets/javascripts/discourse/components/create-topic-button.js
diff --git a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6 b/app/assets/javascripts/discourse/components/create-topics-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-topics-notice.js.es6
rename to app/assets/javascripts/discourse/components/create-topics-notice.js
diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js.es6 b/app/assets/javascripts/discourse/components/csv-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/csv-uploader.js.es6
rename to app/assets/javascripts/discourse/components/csv-uploader.js
diff --git a/app/assets/javascripts/discourse/components/custom-html.js.es6 b/app/assets/javascripts/discourse/components/custom-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/custom-html.js.es6
rename to app/assets/javascripts/discourse/components/custom-html.js
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-button.js.es6
rename to app/assets/javascripts/discourse/components/d-button.js
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-editor.js.es6
rename to app/assets/javascripts/discourse/components/d-editor.js
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal-body.js.es6
rename to app/assets/javascripts/discourse/components/d-modal-body.js
diff --git a/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6 b/app/assets/javascripts/discourse/components/d-modal-cancel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal-cancel.js.es6
rename to app/assets/javascripts/discourse/components/d-modal-cancel.js
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal.js.es6
rename to app/assets/javascripts/discourse/components/d-modal.js
diff --git a/app/assets/javascripts/discourse/components/d-navigation.js.es6 b/app/assets/javascripts/discourse/components/d-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-navigation.js.es6
rename to app/assets/javascripts/discourse/components/d-navigation.js
diff --git a/app/assets/javascripts/discourse/components/d-section.js.es6 b/app/assets/javascripts/discourse/components/d-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-section.js.es6
rename to app/assets/javascripts/discourse/components/d-section.js
diff --git a/app/assets/javascripts/discourse/components/date-input.js.es6 b/app/assets/javascripts/discourse/components/date-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-input.js.es6
rename to app/assets/javascripts/discourse/components/date-input.js
diff --git a/app/assets/javascripts/discourse/components/date-picker-future.js.es6 b/app/assets/javascripts/discourse/components/date-picker-future.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker-future.js.es6
rename to app/assets/javascripts/discourse/components/date-picker-future.js
diff --git a/app/assets/javascripts/discourse/components/date-picker-past.js.es6 b/app/assets/javascripts/discourse/components/date-picker-past.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker-past.js.es6
rename to app/assets/javascripts/discourse/components/date-picker-past.js
diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker.js.es6
rename to app/assets/javascripts/discourse/components/date-picker.js
diff --git a/app/assets/javascripts/discourse/components/date-time-input-range.js.es6 b/app/assets/javascripts/discourse/components/date-time-input-range.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-time-input-range.js.es6
rename to app/assets/javascripts/discourse/components/date-time-input-range.js
diff --git a/app/assets/javascripts/discourse/components/date-time-input.js.es6 b/app/assets/javascripts/discourse/components/date-time-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-time-input.js.es6
rename to app/assets/javascripts/discourse/components/date-time-input.js
diff --git a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6 b/app/assets/javascripts/discourse/components/desktop-notification-config.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
rename to app/assets/javascripts/discourse/components/desktop-notification-config.js
diff --git a/app/assets/javascripts/discourse/components/directory-item.js.es6 b/app/assets/javascripts/discourse/components/directory-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/directory-item.js.es6
rename to app/assets/javascripts/discourse/components/directory-item.js
diff --git a/app/assets/javascripts/discourse/components/directory-toggle.js.es6 b/app/assets/javascripts/discourse/components/directory-toggle.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/directory-toggle.js.es6
rename to app/assets/javascripts/discourse/components/directory-toggle.js
diff --git a/app/assets/javascripts/discourse/components/disabled-icon.js.es6 b/app/assets/javascripts/discourse/components/disabled-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/disabled-icon.js.es6
rename to app/assets/javascripts/discourse/components/disabled-icon.js
diff --git a/app/assets/javascripts/discourse/components/discourse-banner.js.es6 b/app/assets/javascripts/discourse/components/discourse-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-banner.js.es6
rename to app/assets/javascripts/discourse/components/discourse-banner.js
diff --git a/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6 b/app/assets/javascripts/discourse/components/discourse-linked-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
rename to app/assets/javascripts/discourse/components/discourse-linked-text.js
diff --git a/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 b/app/assets/javascripts/discourse/components/discourse-tag-bound.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6
rename to app/assets/javascripts/discourse/components/discourse-tag-bound.js
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-topic.js.es6
rename to app/assets/javascripts/discourse/components/discourse-topic.js
diff --git a/app/assets/javascripts/discourse/components/discovery-categories.js.es6 b/app/assets/javascripts/discourse/components/discovery-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discovery-categories.js.es6
rename to app/assets/javascripts/discourse/components/discovery-categories.js
diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 b/app/assets/javascripts/discourse/components/discovery-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
rename to app/assets/javascripts/discourse/components/discovery-topics-list.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-general.js.es6 b/app/assets/javascripts/discourse/components/edit-category-general.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-general.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-general.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-images.js.es6 b/app/assets/javascripts/discourse/components/edit-category-images.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-images.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-images.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-panel.js.es6 b/app/assets/javascripts/discourse/components/edit-category-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-panel.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-panel.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-security.js.es6 b/app/assets/javascripts/discourse/components/edit-category-security.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-security.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-security.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6 b/app/assets/javascripts/discourse/components/edit-category-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-settings.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-settings.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-tab.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-tab.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-tags.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-tags.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-tags.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6 b/app/assets/javascripts/discourse/components/edit-category-topic-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-topic-template.js
diff --git a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6 b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
rename to app/assets/javascripts/discourse/components/edit-topic-timer-form.js
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/emoji-picker.js.es6
rename to app/assets/javascripts/discourse/components/emoji-picker.js
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6 b/app/assets/javascripts/discourse/components/emoji-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/emoji-uploader.js.es6
rename to app/assets/javascripts/discourse/components/emoji-uploader.js
diff --git a/app/assets/javascripts/discourse/components/expand-post.js.es6 b/app/assets/javascripts/discourse/components/expand-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/expand-post.js.es6
rename to app/assets/javascripts/discourse/components/expand-post.js
diff --git a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6 b/app/assets/javascripts/discourse/components/expanding-text-area.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/expanding-text-area.js.es6
rename to app/assets/javascripts/discourse/components/expanding-text-area.js
diff --git a/app/assets/javascripts/discourse/components/featured-topic.js.es6 b/app/assets/javascripts/discourse/components/featured-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/featured-topic.js.es6
rename to app/assets/javascripts/discourse/components/featured-topic.js
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flag-action-type.js.es6
rename to app/assets/javascripts/discourse/components/flag-action-type.js
diff --git a/app/assets/javascripts/discourse/components/flag-selection.js.es6 b/app/assets/javascripts/discourse/components/flag-selection.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flag-selection.js.es6
rename to app/assets/javascripts/discourse/components/flag-selection.js
diff --git a/app/assets/javascripts/discourse/components/flat-button.js.es6 b/app/assets/javascripts/discourse/components/flat-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flat-button.js.es6
rename to app/assets/javascripts/discourse/components/flat-button.js
diff --git a/app/assets/javascripts/discourse/components/footer-message.js.es6 b/app/assets/javascripts/discourse/components/footer-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/footer-message.js.es6
rename to app/assets/javascripts/discourse/components/footer-message.js
diff --git a/app/assets/javascripts/discourse/components/footer-nav.js.es6 b/app/assets/javascripts/discourse/components/footer-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/footer-nav.js.es6
rename to app/assets/javascripts/discourse/components/footer-nav.js
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/future-date-input.js.es6
rename to app/assets/javascripts/discourse/components/future-date-input.js
diff --git a/app/assets/javascripts/discourse/components/generated-invite-link.js.es6 b/app/assets/javascripts/discourse/components/generated-invite-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/generated-invite-link.js.es6
rename to app/assets/javascripts/discourse/components/generated-invite-link.js
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/global-notice.js.es6
rename to app/assets/javascripts/discourse/components/global-notice.js
diff --git a/app/assets/javascripts/discourse/components/google-search.js.es6 b/app/assets/javascripts/discourse/components/google-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/google-search.js.es6
rename to app/assets/javascripts/discourse/components/google-search.js
diff --git a/app/assets/javascripts/discourse/components/group-activity-filter.js.es6 b/app/assets/javascripts/discourse/components/group-activity-filter.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-activity-filter.js.es6
rename to app/assets/javascripts/discourse/components/group-activity-filter.js
diff --git a/app/assets/javascripts/discourse/components/group-card-contents.js.es6 b/app/assets/javascripts/discourse/components/group-card-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-card-contents.js.es6
rename to app/assets/javascripts/discourse/components/group-card-contents.js
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
rename to app/assets/javascripts/discourse/components/group-flair-inputs.js
diff --git a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6 b/app/assets/javascripts/discourse/components/group-index-toggle.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-index-toggle.js.es6
rename to app/assets/javascripts/discourse/components/group-index-toggle.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-logs-filter.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-row.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-logs-row.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6 b/app/assets/javascripts/discourse/components/group-manage-save-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-save-button.js
diff --git a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6 b/app/assets/javascripts/discourse/components/group-member-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
rename to app/assets/javascripts/discourse/components/group-member-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/group-member.js.es6 b/app/assets/javascripts/discourse/components/group-member.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-member.js.es6
rename to app/assets/javascripts/discourse/components/group-member.js
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-membership-button.js.es6
rename to app/assets/javascripts/discourse/components/group-membership-button.js
diff --git a/app/assets/javascripts/discourse/components/group-navigation.js.es6 b/app/assets/javascripts/discourse/components/group-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-navigation.js.es6
rename to app/assets/javascripts/discourse/components/group-navigation.js
diff --git a/app/assets/javascripts/discourse/components/group-post.js.es6 b/app/assets/javascripts/discourse/components/group-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-post.js.es6
rename to app/assets/javascripts/discourse/components/group-post.js
diff --git a/app/assets/javascripts/discourse/components/group-selector.js.es6 b/app/assets/javascripts/discourse/components/group-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-selector.js.es6
rename to app/assets/javascripts/discourse/components/group-selector.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
rename to app/assets/javascripts/discourse/components/groups-form-interaction-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
rename to app/assets/javascripts/discourse/components/groups-form-membership-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
rename to app/assets/javascripts/discourse/components/groups-form-profile-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-info.js.es6 b/app/assets/javascripts/discourse/components/groups-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-info.js.es6
rename to app/assets/javascripts/discourse/components/groups-info.js
diff --git a/app/assets/javascripts/discourse/components/header-extra-info.js.es6 b/app/assets/javascripts/discourse/components/header-extra-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/header-extra-info.js.es6
rename to app/assets/javascripts/discourse/components/header-extra-info.js
diff --git a/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6 b/app/assets/javascripts/discourse/components/hide-modal-trigger.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
rename to app/assets/javascripts/discourse/components/hide-modal-trigger.js
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js.es6 b/app/assets/javascripts/discourse/components/highlight-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/highlight-text.js.es6
rename to app/assets/javascripts/discourse/components/highlight-text.js
diff --git a/app/assets/javascripts/discourse/components/honeypot-input.js.es6 b/app/assets/javascripts/discourse/components/honeypot-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/honeypot-input.js.es6
rename to app/assets/javascripts/discourse/components/honeypot-input.js
diff --git a/app/assets/javascripts/discourse/components/iframed-html.js.es6 b/app/assets/javascripts/discourse/components/iframed-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/iframed-html.js.es6
rename to app/assets/javascripts/discourse/components/iframed-html.js
diff --git a/app/assets/javascripts/discourse/components/ignored-user-list-item.js.es6 b/app/assets/javascripts/discourse/components/ignored-user-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/ignored-user-list-item.js.es6
rename to app/assets/javascripts/discourse/components/ignored-user-list-item.js
diff --git a/app/assets/javascripts/discourse/components/ignored-user-list.js.es6 b/app/assets/javascripts/discourse/components/ignored-user-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/ignored-user-list.js.es6
rename to app/assets/javascripts/discourse/components/ignored-user-list.js
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/image-uploader.js.es6
rename to app/assets/javascripts/discourse/components/image-uploader.js
diff --git a/app/assets/javascripts/discourse/components/images-uploader.js.es6 b/app/assets/javascripts/discourse/components/images-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/images-uploader.js.es6
rename to app/assets/javascripts/discourse/components/images-uploader.js
diff --git a/app/assets/javascripts/discourse/components/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/input-tip.js.es6
rename to app/assets/javascripts/discourse/components/input-tip.js
diff --git a/app/assets/javascripts/discourse/components/invite-panel.js.es6 b/app/assets/javascripts/discourse/components/invite-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/invite-panel.js.es6
rename to app/assets/javascripts/discourse/components/invite-panel.js
diff --git a/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/latest-topic-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
rename to app/assets/javascripts/discourse/components/latest-topic-list-item.js
diff --git a/app/assets/javascripts/discourse/components/link-to-input.js.es6 b/app/assets/javascripts/discourse/components/link-to-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/link-to-input.js.es6
rename to app/assets/javascripts/discourse/components/link-to-input.js
diff --git a/app/assets/javascripts/discourse/components/links-redirect.js.es6 b/app/assets/javascripts/discourse/components/links-redirect.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/links-redirect.js.es6
rename to app/assets/javascripts/discourse/components/links-redirect.js
diff --git a/app/assets/javascripts/discourse/components/load-more.js.es6 b/app/assets/javascripts/discourse/components/load-more.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/load-more.js.es6
rename to app/assets/javascripts/discourse/components/load-more.js
diff --git a/app/assets/javascripts/discourse/components/login-buttons.js.es6 b/app/assets/javascripts/discourse/components/login-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-buttons.js.es6
rename to app/assets/javascripts/discourse/components/login-buttons.js
diff --git a/app/assets/javascripts/discourse/components/login-modal.js.es6 b/app/assets/javascripts/discourse/components/login-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-modal.js.es6
rename to app/assets/javascripts/discourse/components/login-modal.js
diff --git a/app/assets/javascripts/discourse/components/login-reply-button.js.es6 b/app/assets/javascripts/discourse/components/login-reply-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-reply-button.js.es6
rename to app/assets/javascripts/discourse/components/login-reply-button.js
diff --git a/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6 b/app/assets/javascripts/discourse/components/mobile-category-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mobile-category-topic.js.es6
rename to app/assets/javascripts/discourse/components/mobile-category-topic.js
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js.es6 b/app/assets/javascripts/discourse/components/mobile-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mobile-nav.js.es6
rename to app/assets/javascripts/discourse/components/mobile-nav.js
diff --git a/app/assets/javascripts/discourse/components/modal-panel.js.es6 b/app/assets/javascripts/discourse/components/modal-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/modal-panel.js.es6
rename to app/assets/javascripts/discourse/components/modal-panel.js
diff --git a/app/assets/javascripts/discourse/components/modal-tab.js.es6 b/app/assets/javascripts/discourse/components/modal-tab.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/modal-tab.js.es6
rename to app/assets/javascripts/discourse/components/modal-tab.js
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mount-widget.js.es6
rename to app/assets/javascripts/discourse/components/mount-widget.js
diff --git a/app/assets/javascripts/discourse/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/nav-item.js.es6
rename to app/assets/javascripts/discourse/components/nav-item.js
diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/navigation-bar.js.es6
rename to app/assets/javascripts/discourse/components/navigation-bar.js
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/navigation-item.js.es6
rename to app/assets/javascripts/discourse/components/navigation-item.js
diff --git a/app/assets/javascripts/discourse/components/notification-consent-banner.js.es6 b/app/assets/javascripts/discourse/components/notification-consent-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/notification-consent-banner.js.es6
rename to app/assets/javascripts/discourse/components/notification-consent-banner.js
diff --git a/app/assets/javascripts/discourse/components/number-field.js.es6 b/app/assets/javascripts/discourse/components/number-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/number-field.js.es6
rename to app/assets/javascripts/discourse/components/number-field.js
diff --git a/app/assets/javascripts/discourse/components/password-field.js.es6 b/app/assets/javascripts/discourse/components/password-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/password-field.js.es6
rename to app/assets/javascripts/discourse/components/password-field.js
diff --git a/app/assets/javascripts/discourse/components/plugin-connector.js.es6 b/app/assets/javascripts/discourse/components/plugin-connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/plugin-connector.js.es6
rename to app/assets/javascripts/discourse/components/plugin-connector.js
diff --git a/app/assets/javascripts/discourse/components/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/components/plugin-outlet.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/plugin-outlet.js.es6
rename to app/assets/javascripts/discourse/components/plugin-outlet.js
diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6 b/app/assets/javascripts/discourse/components/popup-input-tip.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/popup-input-tip.js.es6
rename to app/assets/javascripts/discourse/components/popup-input-tip.js
diff --git a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 b/app/assets/javascripts/discourse/components/preference-checkbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/preference-checkbox.js.es6
rename to app/assets/javascripts/discourse/components/preference-checkbox.js
diff --git a/app/assets/javascripts/discourse/components/private-message-glyph.js.es6 b/app/assets/javascripts/discourse/components/private-message-glyph.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/private-message-glyph.js.es6
rename to app/assets/javascripts/discourse/components/private-message-glyph.js
diff --git a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 b/app/assets/javascripts/discourse/components/pwa-install-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
rename to app/assets/javascripts/discourse/components/pwa-install-banner.js
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/quote-button.js.es6
rename to app/assets/javascripts/discourse/components/quote-button.js
diff --git a/app/assets/javascripts/discourse/components/radio-button.js.es6 b/app/assets/javascripts/discourse/components/radio-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/radio-button.js.es6
rename to app/assets/javascripts/discourse/components/radio-button.js
diff --git a/app/assets/javascripts/discourse/components/related-messages.js.es6 b/app/assets/javascripts/discourse/components/related-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/related-messages.js.es6
rename to app/assets/javascripts/discourse/components/related-messages.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6 b/app/assets/javascripts/discourse/components/reviewable-bundled-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-bundled-action.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js.es6 b/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-claimed-topic.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-conversation-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-conversation-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-field-category.js.es6 b/app/assets/javascripts/discourse/components/reviewable-field-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-field-category.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-field-category.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6 b/app/assets/javascripts/discourse/components/reviewable-field-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-field-tags.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-flagged-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-flagged-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-histories.js.es6 b/app/assets/javascripts/discourse/components/reviewable-histories.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-histories.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-histories.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js.es6 b/app/assets/javascripts/discourse/components/reviewable-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-item.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-item.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-queued-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-queued-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-queued-post.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-queued-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-user.js.es6 b/app/assets/javascripts/discourse/components/reviewable-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-user.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-user.js
diff --git a/app/assets/javascripts/discourse/components/save-controls.js.es6 b/app/assets/javascripts/discourse/components/save-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/save-controls.js.es6
rename to app/assets/javascripts/discourse/components/save-controls.js
diff --git a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6 b/app/assets/javascripts/discourse/components/scroll-tracker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/scroll-tracker.js.es6
rename to app/assets/javascripts/discourse/components/scroll-tracker.js
diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
rename to app/assets/javascripts/discourse/components/scrolling-post-stream.js
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/search-advanced-options.js.es6
rename to app/assets/javascripts/discourse/components/search-advanced-options.js
diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/search-text-field.js.es6
rename to app/assets/javascripts/discourse/components/search-text-field.js
diff --git a/app/assets/javascripts/discourse/components/second-factor-form.js.es6 b/app/assets/javascripts/discourse/components/second-factor-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/second-factor-form.js.es6
rename to app/assets/javascripts/discourse/components/second-factor-form.js
diff --git a/app/assets/javascripts/discourse/components/second-factor-input.js.es6 b/app/assets/javascripts/discourse/components/second-factor-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/second-factor-input.js.es6
rename to app/assets/javascripts/discourse/components/second-factor-input.js
diff --git a/app/assets/javascripts/discourse/components/security-key-form.js.es6 b/app/assets/javascripts/discourse/components/security-key-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/security-key-form.js.es6
rename to app/assets/javascripts/discourse/components/security-key-form.js
diff --git a/app/assets/javascripts/discourse/components/share-panel.js.es6 b/app/assets/javascripts/discourse/components/share-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-panel.js.es6
rename to app/assets/javascripts/discourse/components/share-panel.js
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-popup.js.es6
rename to app/assets/javascripts/discourse/components/share-popup.js
diff --git a/app/assets/javascripts/discourse/components/share-source.js.es6 b/app/assets/javascripts/discourse/components/share-source.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-source.js.es6
rename to app/assets/javascripts/discourse/components/share-source.js
diff --git a/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6 b/app/assets/javascripts/discourse/components/shared-draft-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
rename to app/assets/javascripts/discourse/components/shared-draft-controls.js
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/signup-cta.js.es6
rename to app/assets/javascripts/discourse/components/signup-cta.js
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/site-header.js.es6
rename to app/assets/javascripts/discourse/components/site-header.js
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/suggested-topics.js.es6
rename to app/assets/javascripts/discourse/components/suggested-topics.js
diff --git a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 b/app/assets/javascripts/discourse/components/tag-drop-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-drop-link.js.es6
rename to app/assets/javascripts/discourse/components/tag-drop-link.js
diff --git a/app/assets/javascripts/discourse/components/tag-groups-form.js.es6 b/app/assets/javascripts/discourse/components/tag-groups-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-groups-form.js.es6
rename to app/assets/javascripts/discourse/components/tag-groups-form.js
diff --git a/app/assets/javascripts/discourse/components/tag-info.js.es6 b/app/assets/javascripts/discourse/components/tag-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-info.js.es6
rename to app/assets/javascripts/discourse/components/tag-info.js
diff --git a/app/assets/javascripts/discourse/components/tag-list.js.es6 b/app/assets/javascripts/discourse/components/tag-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-list.js.es6
rename to app/assets/javascripts/discourse/components/tag-list.js
diff --git a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
rename to app/assets/javascripts/discourse/components/tags-admin-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/tap-tile-grid.js.es6 b/app/assets/javascripts/discourse/components/tap-tile-grid.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tap-tile-grid.js.es6
rename to app/assets/javascripts/discourse/components/tap-tile-grid.js
diff --git a/app/assets/javascripts/discourse/components/tap-tile.js.es6 b/app/assets/javascripts/discourse/components/tap-tile.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tap-tile.js.es6
rename to app/assets/javascripts/discourse/components/tap-tile.js
diff --git a/app/assets/javascripts/discourse/components/text-field.js.es6 b/app/assets/javascripts/discourse/components/text-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/text-field.js.es6
rename to app/assets/javascripts/discourse/components/text-field.js
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/text-overflow.js.es6
rename to app/assets/javascripts/discourse/components/text-overflow.js
diff --git a/app/assets/javascripts/discourse/components/time-input.js.es6 b/app/assets/javascripts/discourse/components/time-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/time-input.js.es6
rename to app/assets/javascripts/discourse/components/time-input.js
diff --git a/app/assets/javascripts/discourse/components/top-period-buttons.js.es6 b/app/assets/javascripts/discourse/components/top-period-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/top-period-buttons.js.es6
rename to app/assets/javascripts/discourse/components/top-period-buttons.js
diff --git a/app/assets/javascripts/discourse/components/topic-admin-menu-button.js.es6 b/app/assets/javascripts/discourse/components/topic-admin-menu-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-admin-menu-button.js.es6
rename to app/assets/javascripts/discourse/components/topic-admin-menu-button.js
diff --git a/app/assets/javascripts/discourse/components/topic-category.js.es6 b/app/assets/javascripts/discourse/components/topic-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-category.js.es6
rename to app/assets/javascripts/discourse/components/topic-category.js
diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 b/app/assets/javascripts/discourse/components/topic-entrance.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-entrance.js.es6
rename to app/assets/javascripts/discourse/components/topic-entrance.js
diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
rename to app/assets/javascripts/discourse/components/topic-footer-buttons.js
diff --git a/app/assets/javascripts/discourse/components/topic-join-group-notice.js.es6 b/app/assets/javascripts/discourse/components/topic-join-group-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-join-group-notice.js.es6
rename to app/assets/javascripts/discourse/components/topic-join-group-notice.js
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-list-item.js.es6
rename to app/assets/javascripts/discourse/components/topic-list-item.js
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-list.js.es6
rename to app/assets/javascripts/discourse/components/topic-list.js
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-navigation.js.es6
rename to app/assets/javascripts/discourse/components/topic-navigation.js
diff --git a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6 b/app/assets/javascripts/discourse/components/topic-post-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-post-badges.js.es6
rename to app/assets/javascripts/discourse/components/topic-post-badges.js
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-progress.js.es6
rename to app/assets/javascripts/discourse/components/topic-progress.js
diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-status.js.es6
rename to app/assets/javascripts/discourse/components/topic-status.js
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-timeline.js.es6
rename to app/assets/javascripts/discourse/components/topic-timeline.js
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-timer-info.js.es6
rename to app/assets/javascripts/discourse/components/topic-timer-info.js
diff --git a/app/assets/javascripts/discourse/components/topic-title.js.es6 b/app/assets/javascripts/discourse/components/topic-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-title.js.es6
rename to app/assets/javascripts/discourse/components/topic-title.js
diff --git a/app/assets/javascripts/discourse/components/track-selected.js.es6 b/app/assets/javascripts/discourse/components/track-selected.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/track-selected.js.es6
rename to app/assets/javascripts/discourse/components/track-selected.js
diff --git a/app/assets/javascripts/discourse/components/user-badge.js.es6 b/app/assets/javascripts/discourse/components/user-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-badge.js.es6
rename to app/assets/javascripts/discourse/components/user-badge.js
diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-card-contents.js.es6
rename to app/assets/javascripts/discourse/components/user-card-contents.js
diff --git a/app/assets/javascripts/discourse/components/user-field.js.es6 b/app/assets/javascripts/discourse/components/user-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-field.js.es6
rename to app/assets/javascripts/discourse/components/user-field.js
diff --git a/app/assets/javascripts/discourse/components/user-flag-percentage.js.es6 b/app/assets/javascripts/discourse/components/user-flag-percentage.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-flag-percentage.js.es6
rename to app/assets/javascripts/discourse/components/user-flag-percentage.js
diff --git a/app/assets/javascripts/discourse/components/user-info.js.es6 b/app/assets/javascripts/discourse/components/user-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-info.js.es6
rename to app/assets/javascripts/discourse/components/user-info.js
diff --git a/app/assets/javascripts/discourse/components/user-link.js.es6 b/app/assets/javascripts/discourse/components/user-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-link.js.es6
rename to app/assets/javascripts/discourse/components/user-link.js
diff --git a/app/assets/javascripts/discourse/components/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/components/user-notifications-large.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-notifications-large.js.es6
rename to app/assets/javascripts/discourse/components/user-notifications-large.js
diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-selector.js.es6
rename to app/assets/javascripts/discourse/components/user-selector.js
diff --git a/app/assets/javascripts/discourse/components/user-stat.js.es6 b/app/assets/javascripts/discourse/components/user-stat.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stat.js.es6
rename to app/assets/javascripts/discourse/components/user-stat.js
diff --git a/app/assets/javascripts/discourse/components/user-stream-item.js.es6 b/app/assets/javascripts/discourse/components/user-stream-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stream-item.js.es6
rename to app/assets/javascripts/discourse/components/user-stream-item.js
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stream.js.es6
rename to app/assets/javascripts/discourse/components/user-stream.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-category-search.js.es6 b/app/assets/javascripts/discourse/components/user-summary-category-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-category-search.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-category-search.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-section.js.es6 b/app/assets/javascripts/discourse/components/user-summary-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-section.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-section.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-topic.js.es6 b/app/assets/javascripts/discourse/components/user-summary-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-topic.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-topic.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6 b/app/assets/javascripts/discourse/components/user-summary-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-topics-list.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-user.js.es6 b/app/assets/javascripts/discourse/components/user-summary-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-user.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-user.js
diff --git a/app/assets/javascripts/discourse/components/watch-read.js.es6 b/app/assets/javascripts/discourse/components/watch-read.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/watch-read.js.es6
rename to app/assets/javascripts/discourse/components/watch-read.js
diff --git a/app/assets/javascripts/discourse/controllers/about.js.es6 b/app/assets/javascripts/discourse/controllers/about.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/about.js.es6
rename to app/assets/javascripts/discourse/controllers/about.js
diff --git a/app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6 b/app/assets/javascripts/discourse/controllers/account-created-edit-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6
rename to app/assets/javascripts/discourse/controllers/account-created-edit-email.js
diff --git a/app/assets/javascripts/discourse/controllers/account-created-index.js.es6 b/app/assets/javascripts/discourse/controllers/account-created-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/account-created-index.js.es6
rename to app/assets/javascripts/discourse/controllers/account-created-index.js
diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 b/app/assets/javascripts/discourse/controllers/activation-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/activation-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/activation-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/add-post-notice.js.es6 b/app/assets/javascripts/discourse/controllers/add-post-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/add-post-notice.js.es6
rename to app/assets/javascripts/discourse/controllers/add-post-notice.js
diff --git a/app/assets/javascripts/discourse/controllers/application.js.es6 b/app/assets/javascripts/discourse/controllers/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/application.js.es6
rename to app/assets/javascripts/discourse/controllers/application.js
diff --git a/app/assets/javascripts/discourse/controllers/associate-account-confirm.js.es6 b/app/assets/javascripts/discourse/controllers/associate-account-confirm.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/associate-account-confirm.js.es6
rename to app/assets/javascripts/discourse/controllers/associate-account-confirm.js
diff --git a/app/assets/javascripts/discourse/controllers/auth-token.js.es6 b/app/assets/javascripts/discourse/controllers/auth-token.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/auth-token.js.es6
rename to app/assets/javascripts/discourse/controllers/auth-token.js
diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 b/app/assets/javascripts/discourse/controllers/avatar-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
rename to app/assets/javascripts/discourse/controllers/avatar-selector.js
diff --git a/app/assets/javascripts/discourse/controllers/badges/index.js.es6 b/app/assets/javascripts/discourse/controllers/badges/index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/badges/index.js.es6
rename to app/assets/javascripts/discourse/controllers/badges/index.js
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/badges/show.js.es6
rename to app/assets/javascripts/discourse/controllers/badges/show.js
diff --git a/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6 b/app/assets/javascripts/discourse/controllers/basic-modal-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6
rename to app/assets/javascripts/discourse/controllers/basic-modal-body.js
diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js.es6 b/app/assets/javascripts/discourse/controllers/bookmark.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/bookmark.js.es6
rename to app/assets/javascripts/discourse/controllers/bookmark.js
diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6 b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
rename to app/assets/javascripts/discourse/controllers/bulk-notification-level.js
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/change-owner.js.es6
rename to app/assets/javascripts/discourse/controllers/change-owner.js
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
rename to app/assets/javascripts/discourse/controllers/change-timestamp.js
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/composer.js.es6
rename to app/assets/javascripts/discourse/controllers/composer.js
diff --git a/app/assets/javascripts/discourse/controllers/convert-to-public-topic.js.es6 b/app/assets/javascripts/discourse/controllers/convert-to-public-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/convert-to-public-topic.js.es6
rename to app/assets/javascripts/discourse/controllers/convert-to-public-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/create-account.js.es6
rename to app/assets/javascripts/discourse/controllers/create-account.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery-sortable.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery/topics.js
diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js.es6 b/app/assets/javascripts/discourse/controllers/edit-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/edit-category.js.es6
rename to app/assets/javascripts/discourse/controllers/edit-category.js
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
rename to app/assets/javascripts/discourse/controllers/edit-topic-timer.js
diff --git a/app/assets/javascripts/discourse/controllers/email-login.js.es6 b/app/assets/javascripts/discourse/controllers/email-login.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/email-login.js.es6
rename to app/assets/javascripts/discourse/controllers/email-login.js
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/exception.js.es6
rename to app/assets/javascripts/discourse/controllers/exception.js
diff --git a/app/assets/javascripts/discourse/controllers/explain-reviewable.js.es6 b/app/assets/javascripts/discourse/controllers/explain-reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/explain-reviewable.js.es6
rename to app/assets/javascripts/discourse/controllers/explain-reviewable.js
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js.es6
rename to app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/feature-topic.js.es6
rename to app/assets/javascripts/discourse/controllers/feature-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/flag.js.es6
rename to app/assets/javascripts/discourse/controllers/flag.js
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/forgot-password.js.es6
rename to app/assets/javascripts/discourse/controllers/forgot-password.js
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/full-page-search.js.es6
rename to app/assets/javascripts/discourse/controllers/full-page-search.js
diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6 b/app/assets/javascripts/discourse/controllers/grant-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/grant-badge.js.es6
rename to app/assets/javascripts/discourse/controllers/grant-badge.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
rename to app/assets/javascripts/discourse/controllers/group-activity-posts.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6
rename to app/assets/javascripts/discourse/controllers/group-activity-topics.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity.js.es6
rename to app/assets/javascripts/discourse/controllers/group-activity.js
diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6 b/app/assets/javascripts/discourse/controllers/group-add-members.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-add-members.js.es6
rename to app/assets/javascripts/discourse/controllers/group-add-members.js
diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6 b/app/assets/javascripts/discourse/controllers/group-bulk-add.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
rename to app/assets/javascripts/discourse/controllers/group-bulk-add.js
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-index.js.es6
rename to app/assets/javascripts/discourse/controllers/group-index.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-logs.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
rename to app/assets/javascripts/discourse/controllers/group-manage-logs.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
rename to app/assets/javascripts/discourse/controllers/group-manage-profile.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage.js.es6
rename to app/assets/javascripts/discourse/controllers/group-manage.js
diff --git a/app/assets/javascripts/discourse/controllers/group-messages.js.es6 b/app/assets/javascripts/discourse/controllers/group-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-messages.js.es6
rename to app/assets/javascripts/discourse/controllers/group-messages.js
diff --git a/app/assets/javascripts/discourse/controllers/group-requests.js.es6 b/app/assets/javascripts/discourse/controllers/group-requests.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-requests.js.es6
rename to app/assets/javascripts/discourse/controllers/group-requests.js
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group.js.es6
rename to app/assets/javascripts/discourse/controllers/group.js
diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js.es6 b/app/assets/javascripts/discourse/controllers/groups-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/groups-index.js.es6
rename to app/assets/javascripts/discourse/controllers/groups-index.js
diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/groups-new.js.es6
rename to app/assets/javascripts/discourse/controllers/groups-new.js
diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/history.js.es6
rename to app/assets/javascripts/discourse/controllers/history.js
diff --git a/app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js.es6 b/app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js.es6
rename to app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js
diff --git a/app/assets/javascripts/discourse/controllers/ignore-duration.js.es6 b/app/assets/javascripts/discourse/controllers/ignore-duration.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/ignore-duration.js.es6
rename to app/assets/javascripts/discourse/controllers/ignore-duration.js
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
rename to app/assets/javascripts/discourse/controllers/insert-hyperlink.js
diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js.es6 b/app/assets/javascripts/discourse/controllers/invites-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/invites-show.js.es6
rename to app/assets/javascripts/discourse/controllers/invites-show.js
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
rename to app/assets/javascripts/discourse/controllers/jump-to-post.js
diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6 b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
rename to app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/login.js.es6
rename to app/assets/javascripts/discourse/controllers/login.js
diff --git a/app/assets/javascripts/discourse/controllers/modal.js.es6 b/app/assets/javascripts/discourse/controllers/modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/modal.js.es6
rename to app/assets/javascripts/discourse/controllers/modal.js
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
rename to app/assets/javascripts/discourse/controllers/move-to-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
rename to app/assets/javascripts/discourse/controllers/navigation/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/category.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/category.js.es6
rename to app/assets/javascripts/discourse/controllers/navigation/category.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/default.js.es6
rename to app/assets/javascripts/discourse/controllers/navigation/default.js
diff --git a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 b/app/assets/javascripts/discourse/controllers/not-activated.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/not-activated.js.es6
rename to app/assets/javascripts/discourse/controllers/not-activated.js
diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js.es6 b/app/assets/javascripts/discourse/controllers/password-reset.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/password-reset.js.es6
rename to app/assets/javascripts/discourse/controllers/password-reset.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/account.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/account.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/email.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/email.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/emails.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/interface.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/notifications.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/profile.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/second-factor.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/tags.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/username.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/username.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/users.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/users.js
diff --git a/app/assets/javascripts/discourse/controllers/raw-email.js.es6 b/app/assets/javascripts/discourse/controllers/raw-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/raw-email.js.es6
rename to app/assets/javascripts/discourse/controllers/raw-email.js
diff --git a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 b/app/assets/javascripts/discourse/controllers/rename-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/rename-tag.js.es6
rename to app/assets/javascripts/discourse/controllers/rename-tag.js
diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
rename to app/assets/javascripts/discourse/controllers/reorder-categories.js
diff --git a/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6 b/app/assets/javascripts/discourse/controllers/request-group-membership-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
rename to app/assets/javascripts/discourse/controllers/request-group-membership-form.js
diff --git a/app/assets/javascripts/discourse/controllers/review-index.js.es6 b/app/assets/javascripts/discourse/controllers/review-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/review-index.js.es6
rename to app/assets/javascripts/discourse/controllers/review-index.js
diff --git a/app/assets/javascripts/discourse/controllers/review-settings.js.es6 b/app/assets/javascripts/discourse/controllers/review-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/review-settings.js.es6
rename to app/assets/javascripts/discourse/controllers/review-settings.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-add-totp.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-edit.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/static.js.es6
rename to app/assets/javascripts/discourse/controllers/static.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/tag-groups-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
rename to app/assets/javascripts/discourse/controllers/tag-groups-new.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups.js.es6
rename to app/assets/javascripts/discourse/controllers/tag-groups.js
diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js.es6 b/app/assets/javascripts/discourse/controllers/tags-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tags-index.js.es6
rename to app/assets/javascripts/discourse/controllers/tags-index.js
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tags-show.js.es6
rename to app/assets/javascripts/discourse/controllers/tags-show.js
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
rename to app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/topic.js.es6
rename to app/assets/javascripts/discourse/controllers/topic.js
diff --git a/app/assets/javascripts/discourse/controllers/upload-selector.js.es6 b/app/assets/javascripts/discourse/controllers/upload-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/upload-selector.js.es6
rename to app/assets/javascripts/discourse/controllers/upload-selector.js
diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6
rename to app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-activity.js.es6
rename to app/assets/javascripts/discourse/controllers/user-activity.js
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-badges.js.es6
rename to app/assets/javascripts/discourse/controllers/user-badges.js
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-card.js.es6
rename to app/assets/javascripts/discourse/controllers/user-card.js
diff --git a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6 b/app/assets/javascripts/discourse/controllers/user-invited-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
rename to app/assets/javascripts/discourse/controllers/user-invited-show.js
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-notifications.js.es6
rename to app/assets/javascripts/discourse/controllers/user-notifications.js
diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js.es6 b/app/assets/javascripts/discourse/controllers/user-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-posts.js.es6
rename to app/assets/javascripts/discourse/controllers/user-posts.js
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6
rename to app/assets/javascripts/discourse/controllers/user-private-messages-tags.js
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
rename to app/assets/javascripts/discourse/controllers/user-private-messages.js
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-summary.js.es6
rename to app/assets/javascripts/discourse/controllers/user-summary.js
diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 b/app/assets/javascripts/discourse/controllers/user-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
rename to app/assets/javascripts/discourse/controllers/user-topics-list.js
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user.js.es6
rename to app/assets/javascripts/discourse/controllers/user.js
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/users.js.es6
rename to app/assets/javascripts/discourse/controllers/users.js
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/application.js.es6
rename to app/assets/javascripts/discourse/helpers/application.js
diff --git a/app/assets/javascripts/discourse/helpers/border-color.js.es6 b/app/assets/javascripts/discourse/helpers/border-color.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/border-color.js.es6
rename to app/assets/javascripts/discourse/helpers/border-color.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-avatar-template.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-avatar.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-category-link.js.es6 b/app/assets/javascripts/discourse/helpers/bound-category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-category-link.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-category-link.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-date.js.es6 b/app/assets/javascripts/discourse/helpers/bound-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-date.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-date.js
diff --git a/app/assets/javascripts/discourse/helpers/capitalize-string.js.es6 b/app/assets/javascripts/discourse/helpers/capitalize-string.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/capitalize-string.js.es6
rename to app/assets/javascripts/discourse/helpers/capitalize-string.js
diff --git a/app/assets/javascripts/discourse/helpers/category-badge.js.es6 b/app/assets/javascripts/discourse/helpers/category-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/category-badge.js.es6
rename to app/assets/javascripts/discourse/helpers/category-badge.js
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/category-link.js.es6
rename to app/assets/javascripts/discourse/helpers/category-link.js
diff --git a/app/assets/javascripts/discourse/helpers/cold-age-class.js.es6 b/app/assets/javascripts/discourse/helpers/cold-age-class.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/cold-age-class.js.es6
rename to app/assets/javascripts/discourse/helpers/cold-age-class.js
diff --git a/app/assets/javascripts/discourse/helpers/custom-html.js.es6 b/app/assets/javascripts/discourse/helpers/custom-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/custom-html.js.es6
rename to app/assets/javascripts/discourse/helpers/custom-html.js
diff --git a/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6 b/app/assets/javascripts/discourse/helpers/dash-if-empty.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
rename to app/assets/javascripts/discourse/helpers/dash-if-empty.js
diff --git a/app/assets/javascripts/discourse/helpers/dasherize.js.es6 b/app/assets/javascripts/discourse/helpers/dasherize.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dasherize.js.es6
rename to app/assets/javascripts/discourse/helpers/dasherize.js
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dir-span.js.es6
rename to app/assets/javascripts/discourse/helpers/dir-span.js
diff --git a/app/assets/javascripts/discourse/helpers/discourse-tag.js.es6 b/app/assets/javascripts/discourse/helpers/discourse-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/discourse-tag.js.es6
rename to app/assets/javascripts/discourse/helpers/discourse-tag.js
diff --git a/app/assets/javascripts/discourse/helpers/discourse-tags.js.es6 b/app/assets/javascripts/discourse/helpers/discourse-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/discourse-tags.js.es6
rename to app/assets/javascripts/discourse/helpers/discourse-tags.js
diff --git a/app/assets/javascripts/discourse/helpers/editable-value.js.es6 b/app/assets/javascripts/discourse/helpers/editable-value.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/editable-value.js.es6
rename to app/assets/javascripts/discourse/helpers/editable-value.js
diff --git a/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6 b/app/assets/javascripts/discourse/helpers/fa-icon-node.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
rename to app/assets/javascripts/discourse/helpers/fa-icon-node.js
diff --git a/app/assets/javascripts/discourse/helpers/float.js.es6 b/app/assets/javascripts/discourse/helpers/float.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/float.js.es6
rename to app/assets/javascripts/discourse/helpers/float.js
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js.es6 b/app/assets/javascripts/discourse/helpers/format-age.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-age.js.es6
rename to app/assets/javascripts/discourse/helpers/format-age.js
diff --git a/app/assets/javascripts/discourse/helpers/format-date.js.es6 b/app/assets/javascripts/discourse/helpers/format-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-date.js.es6
rename to app/assets/javascripts/discourse/helpers/format-date.js
diff --git a/app/assets/javascripts/discourse/helpers/format-username.js.es6 b/app/assets/javascripts/discourse/helpers/format-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-username.js.es6
rename to app/assets/javascripts/discourse/helpers/format-username.js
diff --git a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 b/app/assets/javascripts/discourse/helpers/icon-or-image.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
rename to app/assets/javascripts/discourse/helpers/icon-or-image.js
diff --git a/app/assets/javascripts/discourse/helpers/inline-date.js.es6 b/app/assets/javascripts/discourse/helpers/inline-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/inline-date.js.es6
rename to app/assets/javascripts/discourse/helpers/inline-date.js
diff --git a/app/assets/javascripts/discourse/helpers/node.js.es6 b/app/assets/javascripts/discourse/helpers/node.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/node.js.es6
rename to app/assets/javascripts/discourse/helpers/node.js
diff --git a/app/assets/javascripts/discourse/helpers/period-title.js.es6 b/app/assets/javascripts/discourse/helpers/period-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/period-title.js.es6
rename to app/assets/javascripts/discourse/helpers/period-title.js
diff --git a/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6
rename to app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js
diff --git a/app/assets/javascripts/discourse/helpers/raw.js.es6 b/app/assets/javascripts/discourse/helpers/raw.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/raw.js.es6
rename to app/assets/javascripts/discourse/helpers/raw.js
diff --git a/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6 b/app/assets/javascripts/discourse/helpers/replace-emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
rename to app/assets/javascripts/discourse/helpers/replace-emoji.js
diff --git a/app/assets/javascripts/discourse/helpers/reviewable-history-description.js.es6 b/app/assets/javascripts/discourse/helpers/reviewable-history-description.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/reviewable-history-description.js.es6
rename to app/assets/javascripts/discourse/helpers/reviewable-history-description.js
diff --git a/app/assets/javascripts/discourse/helpers/reviewable-status.js.es6 b/app/assets/javascripts/discourse/helpers/reviewable-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/reviewable-status.js.es6
rename to app/assets/javascripts/discourse/helpers/reviewable-status.js
diff --git a/app/assets/javascripts/discourse/helpers/route-action.js.es6 b/app/assets/javascripts/discourse/helpers/route-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/route-action.js.es6
rename to app/assets/javascripts/discourse/helpers/route-action.js
diff --git a/app/assets/javascripts/discourse/helpers/shorten-url.js.es6 b/app/assets/javascripts/discourse/helpers/shorten-url.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/shorten-url.js.es6
rename to app/assets/javascripts/discourse/helpers/shorten-url.js
diff --git a/app/assets/javascripts/discourse/helpers/theme-helpers.js.es6 b/app/assets/javascripts/discourse/helpers/theme-helpers.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/theme-helpers.js.es6
rename to app/assets/javascripts/discourse/helpers/theme-helpers.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-featured-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6
rename to app/assets/javascripts/discourse/helpers/topic-featured-link.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-link.js.es6
rename to app/assets/javascripts/discourse/helpers/topic-link.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6 b/app/assets/javascripts/discourse/helpers/topic-status-icons.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6
rename to app/assets/javascripts/discourse/helpers/topic-status-icons.js
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/user-avatar.js.es6
rename to app/assets/javascripts/discourse/helpers/user-avatar.js
diff --git a/app/assets/javascripts/discourse/helpers/user-status.js.es6 b/app/assets/javascripts/discourse/helpers/user-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/user-status.js.es6
rename to app/assets/javascripts/discourse/helpers/user-status.js
diff --git a/app/assets/javascripts/discourse/initializers/asset-version.js.es6 b/app/assets/javascripts/discourse/initializers/asset-version.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/asset-version.js.es6
rename to app/assets/javascripts/discourse/initializers/asset-version.js
diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/auth-complete.js.es6
rename to app/assets/javascripts/discourse/initializers/auth-complete.js
diff --git a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6 b/app/assets/javascripts/discourse/initializers/auto-load-modules.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
rename to app/assets/javascripts/discourse/initializers/auto-load-modules.js
diff --git a/app/assets/javascripts/discourse/initializers/avatar-select.js.es6 b/app/assets/javascripts/discourse/initializers/avatar-select.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/avatar-select.js.es6
rename to app/assets/javascripts/discourse/initializers/avatar-select.js
diff --git a/app/assets/javascripts/discourse/initializers/badging.js.es6 b/app/assets/javascripts/discourse/initializers/badging.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/badging.js.es6
rename to app/assets/javascripts/discourse/initializers/badging.js
diff --git a/app/assets/javascripts/discourse/initializers/banner.js.es6 b/app/assets/javascripts/discourse/initializers/banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/banner.js.es6
rename to app/assets/javascripts/discourse/initializers/banner.js
diff --git a/app/assets/javascripts/discourse/initializers/click-interceptor.js.es6 b/app/assets/javascripts/discourse/initializers/click-interceptor.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/click-interceptor.js.es6
rename to app/assets/javascripts/discourse/initializers/click-interceptor.js
diff --git a/app/assets/javascripts/discourse/initializers/csrf-token.js.es6 b/app/assets/javascripts/discourse/initializers/csrf-token.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/csrf-token.js.es6
rename to app/assets/javascripts/discourse/initializers/csrf-token.js
diff --git a/app/assets/javascripts/discourse/initializers/d-popover.js.es6 b/app/assets/javascripts/discourse/initializers/d-popover.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/d-popover.js.es6
rename to app/assets/javascripts/discourse/initializers/d-popover.js
diff --git a/app/assets/javascripts/discourse/initializers/ember-events.js.es6 b/app/assets/javascripts/discourse/initializers/ember-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/ember-events.js.es6
rename to app/assets/javascripts/discourse/initializers/ember-events.js
diff --git a/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 b/app/assets/javascripts/discourse/initializers/enable-emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/enable-emoji.js.es6
rename to app/assets/javascripts/discourse/initializers/enable-emoji.js
diff --git a/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6 b/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6
rename to app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js
diff --git a/app/assets/javascripts/discourse/initializers/inject-objects.js.es6 b/app/assets/javascripts/discourse/initializers/inject-objects.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/inject-objects.js.es6
rename to app/assets/javascripts/discourse/initializers/inject-objects.js
diff --git a/app/assets/javascripts/discourse/initializers/jquery-plugins.js.es6 b/app/assets/javascripts/discourse/initializers/jquery-plugins.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/jquery-plugins.js.es6
rename to app/assets/javascripts/discourse/initializers/jquery-plugins.js
diff --git a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js.es6
rename to app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
diff --git a/app/assets/javascripts/discourse/initializers/live-development.js.es6 b/app/assets/javascripts/discourse/initializers/live-development.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/live-development.js.es6
rename to app/assets/javascripts/discourse/initializers/live-development.js
diff --git a/app/assets/javascripts/discourse/initializers/localization.js.es6 b/app/assets/javascripts/discourse/initializers/localization.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/localization.js.es6
rename to app/assets/javascripts/discourse/initializers/localization.js
diff --git a/app/assets/javascripts/discourse/initializers/logout.js.es6 b/app/assets/javascripts/discourse/initializers/logout.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/logout.js.es6
rename to app/assets/javascripts/discourse/initializers/logout.js
diff --git a/app/assets/javascripts/discourse/initializers/logs-notice.js.es6 b/app/assets/javascripts/discourse/initializers/logs-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/logs-notice.js.es6
rename to app/assets/javascripts/discourse/initializers/logs-notice.js
diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js.es6 b/app/assets/javascripts/discourse/initializers/message-bus.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/message-bus.js.es6
rename to app/assets/javascripts/discourse/initializers/message-bus.js
diff --git a/app/assets/javascripts/discourse/initializers/mobile.js.es6 b/app/assets/javascripts/discourse/initializers/mobile.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/mobile.js.es6
rename to app/assets/javascripts/discourse/initializers/mobile.js
diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 b/app/assets/javascripts/discourse/initializers/page-tracking.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/page-tracking.js.es6
rename to app/assets/javascripts/discourse/initializers/page-tracking.js
diff --git a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 b/app/assets/javascripts/discourse/initializers/post-decorations.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/post-decorations.js.es6
rename to app/assets/javascripts/discourse/initializers/post-decorations.js
diff --git a/app/assets/javascripts/discourse/initializers/read-only.js.es6 b/app/assets/javascripts/discourse/initializers/read-only.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/read-only.js.es6
rename to app/assets/javascripts/discourse/initializers/read-only.js
diff --git a/app/assets/javascripts/discourse/initializers/register-discourse-location.js.es6 b/app/assets/javascripts/discourse/initializers/register-discourse-location.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/register-discourse-location.js.es6
rename to app/assets/javascripts/discourse/initializers/register-discourse-location.js
diff --git a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 b/app/assets/javascripts/discourse/initializers/register-service-worker.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
rename to app/assets/javascripts/discourse/initializers/register-service-worker.js
diff --git a/app/assets/javascripts/discourse/initializers/relative-ages.js.es6 b/app/assets/javascripts/discourse/initializers/relative-ages.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/relative-ages.js.es6
rename to app/assets/javascripts/discourse/initializers/relative-ages.js
diff --git a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6 b/app/assets/javascripts/discourse/initializers/sharing-sources.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
rename to app/assets/javascripts/discourse/initializers/sharing-sources.js
diff --git a/app/assets/javascripts/discourse/initializers/show-footer.js.es6 b/app/assets/javascripts/discourse/initializers/show-footer.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/show-footer.js.es6
rename to app/assets/javascripts/discourse/initializers/show-footer.js
diff --git a/app/assets/javascripts/discourse/initializers/signup-cta.js.es6 b/app/assets/javascripts/discourse/initializers/signup-cta.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/signup-cta.js.es6
rename to app/assets/javascripts/discourse/initializers/signup-cta.js
diff --git a/app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js.es6 b/app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js.es6
rename to app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
rename to app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
diff --git a/app/assets/javascripts/discourse/initializers/title-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/title-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/title-notifications.js.es6
rename to app/assets/javascripts/discourse/initializers/title-notifications.js
diff --git a/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/topic-footer-buttons.js.es6
rename to app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
diff --git a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 b/app/assets/javascripts/discourse/initializers/url-redirects.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/url-redirects.js.es6
rename to app/assets/javascripts/discourse/initializers/url-redirects.js
diff --git a/app/assets/javascripts/discourse/lib/after-transition.js.es6 b/app/assets/javascripts/discourse/lib/after-transition.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/after-transition.js.es6
rename to app/assets/javascripts/discourse/lib/after-transition.js
diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/ajax-error.js.es6
rename to app/assets/javascripts/discourse/lib/ajax-error.js
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/autocomplete.js.es6
rename to app/assets/javascripts/discourse/lib/autocomplete.js
diff --git a/app/assets/javascripts/discourse/lib/cached-topic-list.js.es6 b/app/assets/javascripts/discourse/lib/cached-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/cached-topic-list.js.es6
rename to app/assets/javascripts/discourse/lib/cached-topic-list.js
diff --git a/app/assets/javascripts/discourse/lib/category-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/category-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/category-hashtags.js.es6
rename to app/assets/javascripts/discourse/lib/category-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/category-tag-search.js.es6 b/app/assets/javascripts/discourse/lib/category-tag-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/category-tag-search.js.es6
rename to app/assets/javascripts/discourse/lib/category-tag-search.js
diff --git a/app/assets/javascripts/discourse/lib/clean-dom.js.es6 b/app/assets/javascripts/discourse/lib/clean-dom.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/clean-dom.js.es6
rename to app/assets/javascripts/discourse/lib/clean-dom.js
diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/click-track.js.es6
rename to app/assets/javascripts/discourse/lib/click-track.js
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/computed.js.es6
rename to app/assets/javascripts/discourse/lib/computed.js
diff --git a/app/assets/javascripts/discourse/lib/copy-text.js.es6 b/app/assets/javascripts/discourse/lib/copy-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/copy-text.js.es6
rename to app/assets/javascripts/discourse/lib/copy-text.js
diff --git a/app/assets/javascripts/discourse/lib/d-popover.js.es6 b/app/assets/javascripts/discourse/lib/d-popover.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/d-popover.js.es6
rename to app/assets/javascripts/discourse/lib/d-popover.js
diff --git a/app/assets/javascripts/discourse/lib/debounce.js.es6 b/app/assets/javascripts/discourse/lib/debounce.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/debounce.js.es6
rename to app/assets/javascripts/discourse/lib/debounce.js
diff --git a/app/assets/javascripts/discourse/lib/decimal-adjust.js.es6 b/app/assets/javascripts/discourse/lib/decimal-adjust.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/decimal-adjust.js.es6
rename to app/assets/javascripts/discourse/lib/decimal-adjust.js
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
rename to app/assets/javascripts/discourse/lib/desktop-notifications.js
diff --git a/app/assets/javascripts/discourse/lib/dirty-keys.js.es6 b/app/assets/javascripts/discourse/lib/dirty-keys.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/dirty-keys.js.es6
rename to app/assets/javascripts/discourse/lib/dirty-keys.js
diff --git a/app/assets/javascripts/discourse/lib/discourse-location.js.es6 b/app/assets/javascripts/discourse/lib/discourse-location.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/discourse-location.js.es6
rename to app/assets/javascripts/discourse/lib/discourse-location.js
diff --git a/app/assets/javascripts/discourse/lib/export-csv.js.es6 b/app/assets/javascripts/discourse/lib/export-csv.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/export-csv.js.es6
rename to app/assets/javascripts/discourse/lib/export-csv.js
diff --git a/app/assets/javascripts/discourse/lib/export-result.js.es6 b/app/assets/javascripts/discourse/lib/export-result.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/export-result.js.es6
rename to app/assets/javascripts/discourse/lib/export-result.js
diff --git a/app/assets/javascripts/discourse/lib/eyeline.js.es6 b/app/assets/javascripts/discourse/lib/eyeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/eyeline.js.es6
rename to app/assets/javascripts/discourse/lib/eyeline.js
diff --git a/app/assets/javascripts/discourse/lib/formatter.js.es6 b/app/assets/javascripts/discourse/lib/formatter.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/formatter.js.es6
rename to app/assets/javascripts/discourse/lib/formatter.js
diff --git a/app/assets/javascripts/discourse/lib/hash.js.es6 b/app/assets/javascripts/discourse/lib/hash.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/hash.js.es6
rename to app/assets/javascripts/discourse/lib/hash.js
diff --git a/app/assets/javascripts/discourse/lib/highlight-syntax.js.es6 b/app/assets/javascripts/discourse/lib/highlight-syntax.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/highlight-syntax.js.es6
rename to app/assets/javascripts/discourse/lib/highlight-syntax.js
diff --git a/app/assets/javascripts/discourse/lib/highlight-text.js.es6 b/app/assets/javascripts/discourse/lib/highlight-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/highlight-text.js.es6
rename to app/assets/javascripts/discourse/lib/highlight-text.js
diff --git a/app/assets/javascripts/discourse/lib/intercept-click.js.es6 b/app/assets/javascripts/discourse/lib/intercept-click.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/intercept-click.js.es6
rename to app/assets/javascripts/discourse/lib/intercept-click.js
diff --git a/app/assets/javascripts/discourse/lib/is-element-in-viewport.js.es6 b/app/assets/javascripts/discourse/lib/is-element-in-viewport.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/is-element-in-viewport.js.es6
rename to app/assets/javascripts/discourse/lib/is-element-in-viewport.js
diff --git a/app/assets/javascripts/discourse/lib/key-value-store.js.es6 b/app/assets/javascripts/discourse/lib/key-value-store.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/key-value-store.js.es6
rename to app/assets/javascripts/discourse/lib/key-value-store.js
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
rename to app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
diff --git a/app/assets/javascripts/discourse/lib/lazy-load-images.js.es6 b/app/assets/javascripts/discourse/lib/lazy-load-images.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lazy-load-images.js.es6
rename to app/assets/javascripts/discourse/lib/lazy-load-images.js
diff --git a/app/assets/javascripts/discourse/lib/lightbox.js.es6 b/app/assets/javascripts/discourse/lib/lightbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lightbox.js.es6
rename to app/assets/javascripts/discourse/lib/lightbox.js
diff --git a/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/link-category-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
rename to app/assets/javascripts/discourse/lib/link-category-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/link-lookup.js.es6 b/app/assets/javascripts/discourse/lib/link-lookup.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-lookup.js.es6
rename to app/assets/javascripts/discourse/lib/link-lookup.js
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-mentions.js.es6
rename to app/assets/javascripts/discourse/lib/link-mentions.js
diff --git a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
rename to app/assets/javascripts/discourse/lib/link-tag-hashtag.js
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/load-script.js.es6
rename to app/assets/javascripts/discourse/lib/load-script.js
diff --git a/app/assets/javascripts/discourse/lib/lock-on.js.es6 b/app/assets/javascripts/discourse/lib/lock-on.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lock-on.js.es6
rename to app/assets/javascripts/discourse/lib/lock-on.js
diff --git a/app/assets/javascripts/discourse/lib/logout.js.es6 b/app/assets/javascripts/discourse/lib/logout.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/logout.js.es6
rename to app/assets/javascripts/discourse/lib/logout.js
diff --git a/app/assets/javascripts/discourse/lib/mobile.js.es6 b/app/assets/javascripts/discourse/lib/mobile.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/mobile.js.es6
rename to app/assets/javascripts/discourse/lib/mobile.js
diff --git a/app/assets/javascripts/discourse/lib/notification-levels.js.es6 b/app/assets/javascripts/discourse/lib/notification-levels.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/notification-levels.js.es6
rename to app/assets/javascripts/discourse/lib/notification-levels.js
diff --git a/app/assets/javascripts/discourse/lib/offset-calculator.js.es6 b/app/assets/javascripts/discourse/lib/offset-calculator.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/offset-calculator.js.es6
rename to app/assets/javascripts/discourse/lib/offset-calculator.js
diff --git a/app/assets/javascripts/discourse/lib/optional-service.js.es6 b/app/assets/javascripts/discourse/lib/optional-service.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/optional-service.js.es6
rename to app/assets/javascripts/discourse/lib/optional-service.js
diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/page-tracker.js.es6
rename to app/assets/javascripts/discourse/lib/page-tracker.js
diff --git a/app/assets/javascripts/discourse/lib/page-visible.js.es6 b/app/assets/javascripts/discourse/lib/page-visible.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/page-visible.js.es6
rename to app/assets/javascripts/discourse/lib/page-visible.js
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/plugin-api.js.es6
rename to app/assets/javascripts/discourse/lib/plugin-api.js
diff --git a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6 b/app/assets/javascripts/discourse/lib/plugin-connectors.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
rename to app/assets/javascripts/discourse/lib/plugin-connectors.js
diff --git a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
rename to app/assets/javascripts/discourse/lib/posts-with-placeholders.js
diff --git a/app/assets/javascripts/discourse/lib/push-notifications.js.es6 b/app/assets/javascripts/discourse/lib/push-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/push-notifications.js.es6
rename to app/assets/javascripts/discourse/lib/push-notifications.js
diff --git a/app/assets/javascripts/discourse/lib/pwa-utils.js.es6 b/app/assets/javascripts/discourse/lib/pwa-utils.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/pwa-utils.js.es6
rename to app/assets/javascripts/discourse/lib/pwa-utils.js
diff --git a/app/assets/javascripts/discourse/lib/quote-state.js.es6 b/app/assets/javascripts/discourse/lib/quote-state.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/quote-state.js.es6
rename to app/assets/javascripts/discourse/lib/quote-state.js
diff --git a/app/assets/javascripts/discourse/lib/quote.js.es6 b/app/assets/javascripts/discourse/lib/quote.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/quote.js.es6
rename to app/assets/javascripts/discourse/lib/quote.js
diff --git a/app/assets/javascripts/discourse/lib/raw-templates.js.es6 b/app/assets/javascripts/discourse/lib/raw-templates.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/raw-templates.js.es6
rename to app/assets/javascripts/discourse/lib/raw-templates.js
diff --git a/app/assets/javascripts/discourse/lib/register-topic-footer-button.js.es6 b/app/assets/javascripts/discourse/lib/register-topic-footer-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/register-topic-footer-button.js.es6
rename to app/assets/javascripts/discourse/lib/register-topic-footer-button.js
diff --git a/app/assets/javascripts/discourse/lib/render-tag.js.es6 b/app/assets/javascripts/discourse/lib/render-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-tag.js.es6
rename to app/assets/javascripts/discourse/lib/render-tag.js
diff --git a/app/assets/javascripts/discourse/lib/render-tags.js.es6 b/app/assets/javascripts/discourse/lib/render-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-tags.js.es6
rename to app/assets/javascripts/discourse/lib/render-tags.js
diff --git a/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6 b/app/assets/javascripts/discourse/lib/render-topic-featured-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6
rename to app/assets/javascripts/discourse/lib/render-topic-featured-link.js
diff --git a/app/assets/javascripts/discourse/lib/reports-loader.js.es6 b/app/assets/javascripts/discourse/lib/reports-loader.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/reports-loader.js.es6
rename to app/assets/javascripts/discourse/lib/reports-loader.js
diff --git a/app/assets/javascripts/discourse/lib/round.js.es6 b/app/assets/javascripts/discourse/lib/round.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/round.js.es6
rename to app/assets/javascripts/discourse/lib/round.js
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/safari-hacks.js.es6
rename to app/assets/javascripts/discourse/lib/safari-hacks.js
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/screen-track.js.es6
rename to app/assets/javascripts/discourse/lib/screen-track.js
diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/search.js.es6
rename to app/assets/javascripts/discourse/lib/search.js
diff --git a/app/assets/javascripts/discourse/lib/settings.js.es6 b/app/assets/javascripts/discourse/lib/settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/settings.js.es6
rename to app/assets/javascripts/discourse/lib/settings.js
diff --git a/app/assets/javascripts/discourse/lib/sharing.js.es6 b/app/assets/javascripts/discourse/lib/sharing.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/sharing.js.es6
rename to app/assets/javascripts/discourse/lib/sharing.js
diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/show-modal.js.es6
rename to app/assets/javascripts/discourse/lib/show-modal.js
diff --git a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6 b/app/assets/javascripts/discourse/lib/static-route-builder.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/static-route-builder.js.es6
rename to app/assets/javascripts/discourse/lib/static-route-builder.js
diff --git a/app/assets/javascripts/discourse/lib/svg-sprite-loader.js.es6 b/app/assets/javascripts/discourse/lib/svg-sprite-loader.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/svg-sprite-loader.js.es6
rename to app/assets/javascripts/discourse/lib/svg-sprite-loader.js
diff --git a/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/tag-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/tag-hashtags.js.es6
rename to app/assets/javascripts/discourse/lib/tag-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/text-direction.js.es6 b/app/assets/javascripts/discourse/lib/text-direction.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/text-direction.js.es6
rename to app/assets/javascripts/discourse/lib/text-direction.js
diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/text.js.es6
rename to app/assets/javascripts/discourse/lib/text.js
diff --git a/app/assets/javascripts/discourse/lib/theme-selector.js.es6 b/app/assets/javascripts/discourse/lib/theme-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/theme-selector.js.es6
rename to app/assets/javascripts/discourse/lib/theme-selector.js
diff --git a/app/assets/javascripts/discourse/lib/to-markdown.js.es6 b/app/assets/javascripts/discourse/lib/to-markdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/to-markdown.js.es6
rename to app/assets/javascripts/discourse/lib/to-markdown.js
diff --git a/app/assets/javascripts/discourse/lib/tooltip.js.es6 b/app/assets/javascripts/discourse/lib/tooltip.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/tooltip.js.es6
rename to app/assets/javascripts/discourse/lib/tooltip.js
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/transform-post.js.es6
rename to app/assets/javascripts/discourse/lib/transform-post.js
diff --git a/app/assets/javascripts/discourse/lib/uploads.js.es6 b/app/assets/javascripts/discourse/lib/uploads.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/uploads.js.es6
rename to app/assets/javascripts/discourse/lib/uploads.js
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/url.js.es6
rename to app/assets/javascripts/discourse/lib/url.js
diff --git a/app/assets/javascripts/discourse/lib/user-activation.js.es6 b/app/assets/javascripts/discourse/lib/user-activation.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/user-activation.js.es6
rename to app/assets/javascripts/discourse/lib/user-activation.js
diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/user-search.js.es6
rename to app/assets/javascripts/discourse/lib/user-search.js
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/utilities.js.es6
rename to app/assets/javascripts/discourse/lib/utilities.js
diff --git a/app/assets/javascripts/discourse/lib/webauthn.js.es6 b/app/assets/javascripts/discourse/lib/webauthn.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/webauthn.js.es6
rename to app/assets/javascripts/discourse/lib/webauthn.js
diff --git a/app/assets/javascripts/discourse/mapping-router.js.es6 b/app/assets/javascripts/discourse/mapping-router.js
similarity index 100%
rename from app/assets/javascripts/discourse/mapping-router.js.es6
rename to app/assets/javascripts/discourse/mapping-router.js
diff --git a/app/assets/javascripts/discourse/mixins/add-archetype-class.js.es6 b/app/assets/javascripts/discourse/mixins/add-archetype-class.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/add-archetype-class.js.es6
rename to app/assets/javascripts/discourse/mixins/add-archetype-class.js
diff --git a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6 b/app/assets/javascripts/discourse/mixins/buffered-content.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/buffered-content.js.es6
rename to app/assets/javascripts/discourse/mixins/buffered-content.js
diff --git a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6 b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
rename to app/assets/javascripts/discourse/mixins/bulk-topic-selection.js
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
rename to app/assets/javascripts/discourse/mixins/can-check-emails.js
diff --git a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 b/app/assets/javascripts/discourse/mixins/card-contents-base.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
rename to app/assets/javascripts/discourse/mixins/card-contents-base.js
diff --git a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6 b/app/assets/javascripts/discourse/mixins/cleans-up.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/cleans-up.js.es6
rename to app/assets/javascripts/discourse/mixins/cleans-up.js
diff --git a/app/assets/javascripts/discourse/mixins/docking.js.es6 b/app/assets/javascripts/discourse/mixins/docking.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/docking.js.es6
rename to app/assets/javascripts/discourse/mixins/docking.js
diff --git a/app/assets/javascripts/discourse/mixins/filter-mode.js.es6 b/app/assets/javascripts/discourse/mixins/filter-mode.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/filter-mode.js.es6
rename to app/assets/javascripts/discourse/mixins/filter-mode.js
diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6 b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
rename to app/assets/javascripts/discourse/mixins/grant-badge-controller.js
diff --git a/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6 b/app/assets/javascripts/discourse/mixins/key-enter-escape.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6
rename to app/assets/javascripts/discourse/mixins/key-enter-escape.js
diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/load-more.js.es6
rename to app/assets/javascripts/discourse/mixins/load-more.js
diff --git a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6 b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
rename to app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js
diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 b/app/assets/javascripts/discourse/mixins/modal-functionality.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
rename to app/assets/javascripts/discourse/mixins/modal-functionality.js
diff --git a/app/assets/javascripts/discourse/mixins/name-validation.js.es6 b/app/assets/javascripts/discourse/mixins/name-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/name-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/name-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 b/app/assets/javascripts/discourse/mixins/open-composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/open-composer.js.es6
rename to app/assets/javascripts/discourse/mixins/open-composer.js
diff --git a/app/assets/javascripts/discourse/mixins/pan-events.js.es6 b/app/assets/javascripts/discourse/mixins/pan-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/pan-events.js.es6
rename to app/assets/javascripts/discourse/mixins/pan-events.js
diff --git a/app/assets/javascripts/discourse/mixins/password-validation.js.es6 b/app/assets/javascripts/discourse/mixins/password-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/password-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/password-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 b/app/assets/javascripts/discourse/mixins/scroll-top.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/scroll-top.js.es6
rename to app/assets/javascripts/discourse/mixins/scroll-top.js
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/scrolling.js.es6
rename to app/assets/javascripts/discourse/mixins/scrolling.js
diff --git a/app/assets/javascripts/discourse/mixins/singleton.js.es6 b/app/assets/javascripts/discourse/mixins/singleton.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/singleton.js.es6
rename to app/assets/javascripts/discourse/mixins/singleton.js
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/upload.js.es6
rename to app/assets/javascripts/discourse/mixins/upload.js
diff --git a/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 b/app/assets/javascripts/discourse/mixins/url-refresh.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/url-refresh.js.es6
rename to app/assets/javascripts/discourse/mixins/url-refresh.js
diff --git a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6 b/app/assets/javascripts/discourse/mixins/user-fields-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/user-fields-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/username-validation.js.es6 b/app/assets/javascripts/discourse/mixins/username-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/username-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/username-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/viewing-action-type.js.es6 b/app/assets/javascripts/discourse/mixins/viewing-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/viewing-action-type.js.es6
rename to app/assets/javascripts/discourse/mixins/viewing-action-type.js
diff --git a/app/assets/javascripts/discourse/models/action-summary.js.es6 b/app/assets/javascripts/discourse/models/action-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/action-summary.js.es6
rename to app/assets/javascripts/discourse/models/action-summary.js
diff --git a/app/assets/javascripts/discourse/models/archetype.js.es6 b/app/assets/javascripts/discourse/models/archetype.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/archetype.js.es6
rename to app/assets/javascripts/discourse/models/archetype.js
diff --git a/app/assets/javascripts/discourse/models/badge-grouping.js.es6 b/app/assets/javascripts/discourse/models/badge-grouping.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/badge-grouping.js.es6
rename to app/assets/javascripts/discourse/models/badge-grouping.js
diff --git a/app/assets/javascripts/discourse/models/badge.js.es6 b/app/assets/javascripts/discourse/models/badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/badge.js.es6
rename to app/assets/javascripts/discourse/models/badge.js
diff --git a/app/assets/javascripts/discourse/models/bookmark.js.es6 b/app/assets/javascripts/discourse/models/bookmark.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/bookmark.js.es6
rename to app/assets/javascripts/discourse/models/bookmark.js
diff --git a/app/assets/javascripts/discourse/models/category-list.js.es6 b/app/assets/javascripts/discourse/models/category-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/category-list.js.es6
rename to app/assets/javascripts/discourse/models/category-list.js
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/category.js.es6
rename to app/assets/javascripts/discourse/models/category.js
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/composer.js.es6
rename to app/assets/javascripts/discourse/models/composer.js
diff --git a/app/assets/javascripts/discourse/models/draft.js.es6 b/app/assets/javascripts/discourse/models/draft.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/draft.js.es6
rename to app/assets/javascripts/discourse/models/draft.js
diff --git a/app/assets/javascripts/discourse/models/group-history.js.es6 b/app/assets/javascripts/discourse/models/group-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/group-history.js.es6
rename to app/assets/javascripts/discourse/models/group-history.js
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/group.js.es6
rename to app/assets/javascripts/discourse/models/group.js
diff --git a/app/assets/javascripts/discourse/models/invite.js.es6 b/app/assets/javascripts/discourse/models/invite.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/invite.js.es6
rename to app/assets/javascripts/discourse/models/invite.js
diff --git a/app/assets/javascripts/discourse/models/login-method.js.es6 b/app/assets/javascripts/discourse/models/login-method.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/login-method.js.es6
rename to app/assets/javascripts/discourse/models/login-method.js
diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/nav-item.js.es6
rename to app/assets/javascripts/discourse/models/nav-item.js
diff --git a/app/assets/javascripts/discourse/models/permission-type.js.es6 b/app/assets/javascripts/discourse/models/permission-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/permission-type.js.es6
rename to app/assets/javascripts/discourse/models/permission-type.js
diff --git a/app/assets/javascripts/discourse/models/post-action-type.js.es6 b/app/assets/javascripts/discourse/models/post-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post-action-type.js.es6
rename to app/assets/javascripts/discourse/models/post-action-type.js
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post-stream.js.es6
rename to app/assets/javascripts/discourse/models/post-stream.js
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post.js.es6
rename to app/assets/javascripts/discourse/models/post.js
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/rest.js.es6
rename to app/assets/javascripts/discourse/models/rest.js
diff --git a/app/assets/javascripts/discourse/models/result-set.js.es6 b/app/assets/javascripts/discourse/models/result-set.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/result-set.js.es6
rename to app/assets/javascripts/discourse/models/result-set.js
diff --git a/app/assets/javascripts/discourse/models/reviewable-history.js.es6 b/app/assets/javascripts/discourse/models/reviewable-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/reviewable-history.js.es6
rename to app/assets/javascripts/discourse/models/reviewable-history.js
diff --git a/app/assets/javascripts/discourse/models/reviewable.js.es6 b/app/assets/javascripts/discourse/models/reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/reviewable.js.es6
rename to app/assets/javascripts/discourse/models/reviewable.js
diff --git a/app/assets/javascripts/discourse/models/session.js.es6 b/app/assets/javascripts/discourse/models/session.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/session.js.es6
rename to app/assets/javascripts/discourse/models/session.js
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/site.js.es6
rename to app/assets/javascripts/discourse/models/site.js
diff --git a/app/assets/javascripts/discourse/models/static-page.js.es6 b/app/assets/javascripts/discourse/models/static-page.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/static-page.js.es6
rename to app/assets/javascripts/discourse/models/static-page.js
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/store.js.es6
rename to app/assets/javascripts/discourse/models/store.js
diff --git a/app/assets/javascripts/discourse/models/tag-group.js.es6 b/app/assets/javascripts/discourse/models/tag-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/tag-group.js.es6
rename to app/assets/javascripts/discourse/models/tag-group.js
diff --git a/app/assets/javascripts/discourse/models/tag.js.es6 b/app/assets/javascripts/discourse/models/tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/tag.js.es6
rename to app/assets/javascripts/discourse/models/tag.js
diff --git a/app/assets/javascripts/discourse/models/topic-details.js.es6 b/app/assets/javascripts/discourse/models/topic-details.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-details.js.es6
rename to app/assets/javascripts/discourse/models/topic-details.js
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-list.js.es6
rename to app/assets/javascripts/discourse/models/topic-list.js
diff --git a/app/assets/javascripts/discourse/models/topic-timer.js.es6 b/app/assets/javascripts/discourse/models/topic-timer.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-timer.js.es6
rename to app/assets/javascripts/discourse/models/topic-timer.js
diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
rename to app/assets/javascripts/discourse/models/topic-tracking-state.js
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic.js.es6
rename to app/assets/javascripts/discourse/models/topic.js
diff --git a/app/assets/javascripts/discourse/models/trust-level.js.es6 b/app/assets/javascripts/discourse/models/trust-level.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/trust-level.js.es6
rename to app/assets/javascripts/discourse/models/trust-level.js
diff --git a/app/assets/javascripts/discourse/models/user-action-group.js.es6 b/app/assets/javascripts/discourse/models/user-action-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action-group.js.es6
rename to app/assets/javascripts/discourse/models/user-action-group.js
diff --git a/app/assets/javascripts/discourse/models/user-action-stat.js.es6 b/app/assets/javascripts/discourse/models/user-action-stat.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action-stat.js.es6
rename to app/assets/javascripts/discourse/models/user-action-stat.js
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action.js.es6
rename to app/assets/javascripts/discourse/models/user-action.js
diff --git a/app/assets/javascripts/discourse/models/user-badge.js.es6 b/app/assets/javascripts/discourse/models/user-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-badge.js.es6
rename to app/assets/javascripts/discourse/models/user-badge.js
diff --git a/app/assets/javascripts/discourse/models/user-draft.js.es6 b/app/assets/javascripts/discourse/models/user-draft.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-draft.js.es6
rename to app/assets/javascripts/discourse/models/user-draft.js
diff --git a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-drafts-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
rename to app/assets/javascripts/discourse/models/user-drafts-stream.js
diff --git a/app/assets/javascripts/discourse/models/user-posts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-posts-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-posts-stream.js.es6
rename to app/assets/javascripts/discourse/models/user-posts-stream.js
diff --git a/app/assets/javascripts/discourse/models/user-stream.js.es6 b/app/assets/javascripts/discourse/models/user-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-stream.js.es6
rename to app/assets/javascripts/discourse/models/user-stream.js
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user.js.es6
rename to app/assets/javascripts/discourse/models/user.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6 b/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 b/app/assets/javascripts/discourse/pre-initializers/map-routes.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/map-routes.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6 b/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6 b/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js.es6 b/app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6 b/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
rename to app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6 b/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6
rename to app/assets/javascripts/discourse/raw-views/list/posts-count-column.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6 b/app/assets/javascripts/discourse/raw-views/list/visited-line.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6
rename to app/assets/javascripts/discourse/raw-views/list/visited-line.js
diff --git a/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
rename to app/assets/javascripts/discourse/raw-views/topic-list-header-column.js
diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/topic-status.js.es6
rename to app/assets/javascripts/discourse/raw-views/topic-status.js
diff --git a/app/assets/javascripts/discourse/routes/about.js.es6 b/app/assets/javascripts/discourse/routes/about.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/about.js.es6
rename to app/assets/javascripts/discourse/routes/about.js
diff --git a/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6 b/app/assets/javascripts/discourse/routes/account-created-edit-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6
rename to app/assets/javascripts/discourse/routes/account-created-edit-email.js
diff --git a/app/assets/javascripts/discourse/routes/account-created-index.js.es6 b/app/assets/javascripts/discourse/routes/account-created-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-index.js.es6
rename to app/assets/javascripts/discourse/routes/account-created-index.js
diff --git a/app/assets/javascripts/discourse/routes/account-created-resent.js.es6 b/app/assets/javascripts/discourse/routes/account-created-resent.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-resent.js.es6
rename to app/assets/javascripts/discourse/routes/account-created-resent.js
diff --git a/app/assets/javascripts/discourse/routes/account-created.js.es6 b/app/assets/javascripts/discourse/routes/account-created.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created.js.es6
rename to app/assets/javascripts/discourse/routes/account-created.js
diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/app-route-map.js.es6
rename to app/assets/javascripts/discourse/routes/app-route-map.js
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/application.js.es6
rename to app/assets/javascripts/discourse/routes/application.js
diff --git a/app/assets/javascripts/discourse/routes/associate-account.js.es6 b/app/assets/javascripts/discourse/routes/associate-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/associate-account.js.es6
rename to app/assets/javascripts/discourse/routes/associate-account.js
diff --git a/app/assets/javascripts/discourse/routes/badges-index.js.es6 b/app/assets/javascripts/discourse/routes/badges-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/badges-index.js.es6
rename to app/assets/javascripts/discourse/routes/badges-index.js
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/badges-show.js.es6
rename to app/assets/javascripts/discourse/routes/badges-show.js
diff --git a/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6 b/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-category-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-category-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6 b/app/assets/javascripts/discourse/routes/build-group-messages-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-group-messages-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6 b/app/assets/javascripts/discourse/routes/build-private-messages-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-private-messages-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-static-route.js.es6 b/app/assets/javascripts/discourse/routes/build-static-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-static-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-static-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-topic-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-topic-route.js
diff --git a/app/assets/javascripts/discourse/routes/conduct.js.es6 b/app/assets/javascripts/discourse/routes/conduct.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/conduct.js.es6
rename to app/assets/javascripts/discourse/routes/conduct.js
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discourse.js.es6
rename to app/assets/javascripts/discourse/routes/discourse.js
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discovery-categories.js.es6
rename to app/assets/javascripts/discourse/routes/discovery-categories.js
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discovery.js.es6
rename to app/assets/javascripts/discourse/routes/discovery.js
diff --git a/app/assets/javascripts/discourse/routes/email-login.js.es6 b/app/assets/javascripts/discourse/routes/email-login.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/email-login.js.es6
rename to app/assets/javascripts/discourse/routes/email-login.js
diff --git a/app/assets/javascripts/discourse/routes/exception-unknown.js.es6 b/app/assets/javascripts/discourse/routes/exception-unknown.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/exception-unknown.js.es6
rename to app/assets/javascripts/discourse/routes/exception-unknown.js
diff --git a/app/assets/javascripts/discourse/routes/exception.js.es6 b/app/assets/javascripts/discourse/routes/exception.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/exception.js.es6
rename to app/assets/javascripts/discourse/routes/exception.js
diff --git a/app/assets/javascripts/discourse/routes/faq.js.es6 b/app/assets/javascripts/discourse/routes/faq.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/faq.js.es6
rename to app/assets/javascripts/discourse/routes/faq.js
diff --git a/app/assets/javascripts/discourse/routes/forgot-password.js.es6 b/app/assets/javascripts/discourse/routes/forgot-password.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/forgot-password.js.es6
rename to app/assets/javascripts/discourse/routes/forgot-password.js
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/full-page-search.js.es6
rename to app/assets/javascripts/discourse/routes/full-page-search.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-index.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-mentions.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-posts.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-topics.js
diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-index.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-interaction.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-interaction.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-logs.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-logs.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-membership.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-membership.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-profile.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage.js.es6 b/app/assets/javascripts/discourse/routes/group-manage.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage.js
diff --git a/app/assets/javascripts/discourse/routes/group-members.js.es6 b/app/assets/javascripts/discourse/routes/group-members.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-members.js.es6
rename to app/assets/javascripts/discourse/routes/group-members.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-archive.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-archive.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages-archive.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-inbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages-inbox.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-index.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages.js
diff --git a/app/assets/javascripts/discourse/routes/group-requests.js.es6 b/app/assets/javascripts/discourse/routes/group-requests.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-requests.js.es6
rename to app/assets/javascripts/discourse/routes/group-requests.js
diff --git a/app/assets/javascripts/discourse/routes/group.js.es6 b/app/assets/javascripts/discourse/routes/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group.js.es6
rename to app/assets/javascripts/discourse/routes/group.js
diff --git a/app/assets/javascripts/discourse/routes/groups-index.js.es6 b/app/assets/javascripts/discourse/routes/groups-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/groups-index.js.es6
rename to app/assets/javascripts/discourse/routes/groups-index.js
diff --git a/app/assets/javascripts/discourse/routes/groups-new.js.es6 b/app/assets/javascripts/discourse/routes/groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/groups-new.js.es6
rename to app/assets/javascripts/discourse/routes/groups-new.js
diff --git a/app/assets/javascripts/discourse/routes/guidelines.js.es6 b/app/assets/javascripts/discourse/routes/guidelines.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/guidelines.js.es6
rename to app/assets/javascripts/discourse/routes/guidelines.js
diff --git a/app/assets/javascripts/discourse/routes/invites-show.js.es6 b/app/assets/javascripts/discourse/routes/invites-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/invites-show.js.es6
rename to app/assets/javascripts/discourse/routes/invites-show.js
diff --git a/app/assets/javascripts/discourse/routes/login.js.es6 b/app/assets/javascripts/discourse/routes/login.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/login.js.es6
rename to app/assets/javascripts/discourse/routes/login.js
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/new-message.js.es6
rename to app/assets/javascripts/discourse/routes/new-message.js
diff --git a/app/assets/javascripts/discourse/routes/new-topic.js.es6 b/app/assets/javascripts/discourse/routes/new-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/new-topic.js.es6
rename to app/assets/javascripts/discourse/routes/new-topic.js
diff --git a/app/assets/javascripts/discourse/routes/password-reset.js.es6 b/app/assets/javascripts/discourse/routes/password-reset.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/password-reset.js.es6
rename to app/assets/javascripts/discourse/routes/password-reset.js
diff --git a/app/assets/javascripts/discourse/routes/post.js.es6 b/app/assets/javascripts/discourse/routes/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/post.js.es6
rename to app/assets/javascripts/discourse/routes/post.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-account.js.es6 b/app/assets/javascripts/discourse/routes/preferences-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-account.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-account.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-apps.js.es6 b/app/assets/javascripts/discourse/routes/preferences-apps.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-apps.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-apps.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-categories.js.es6 b/app/assets/javascripts/discourse/routes/preferences-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-categories.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-categories.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-email.js.es6 b/app/assets/javascripts/discourse/routes/preferences-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-email.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-email.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-emails.js.es6 b/app/assets/javascripts/discourse/routes/preferences-emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-emails.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-emails.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-index.js.es6 b/app/assets/javascripts/discourse/routes/preferences-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-index.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-index.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-interface.js.es6 b/app/assets/javascripts/discourse/routes/preferences-interface.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-interface.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-interface.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-notifications.js.es6 b/app/assets/javascripts/discourse/routes/preferences-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-notifications.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-notifications.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-profile.js.es6 b/app/assets/javascripts/discourse/routes/preferences-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-profile.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-profile.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6 b/app/assets/javascripts/discourse/routes/preferences-second-factor.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-second-factor.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-tags.js.es6 b/app/assets/javascripts/discourse/routes/preferences-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-tags.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-tags.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-username.js.es6 b/app/assets/javascripts/discourse/routes/preferences-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-username.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-username.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-users.js.es6 b/app/assets/javascripts/discourse/routes/preferences-users.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-users.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-users.js
diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences.js.es6
rename to app/assets/javascripts/discourse/routes/preferences.js
diff --git a/app/assets/javascripts/discourse/routes/privacy.js.es6 b/app/assets/javascripts/discourse/routes/privacy.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/privacy.js.es6
rename to app/assets/javascripts/discourse/routes/privacy.js
diff --git a/app/assets/javascripts/discourse/routes/restricted-user.js.es6 b/app/assets/javascripts/discourse/routes/restricted-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/restricted-user.js.es6
rename to app/assets/javascripts/discourse/routes/restricted-user.js
diff --git a/app/assets/javascripts/discourse/routes/review-index.js.es6 b/app/assets/javascripts/discourse/routes/review-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-index.js.es6
rename to app/assets/javascripts/discourse/routes/review-index.js
diff --git a/app/assets/javascripts/discourse/routes/review-settings.js.es6 b/app/assets/javascripts/discourse/routes/review-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-settings.js.es6
rename to app/assets/javascripts/discourse/routes/review-settings.js
diff --git a/app/assets/javascripts/discourse/routes/review-show.js.es6 b/app/assets/javascripts/discourse/routes/review-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-show.js.es6
rename to app/assets/javascripts/discourse/routes/review-show.js
diff --git a/app/assets/javascripts/discourse/routes/review-topics.js.es6 b/app/assets/javascripts/discourse/routes/review-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-topics.js.es6
rename to app/assets/javascripts/discourse/routes/review-topics.js
diff --git a/app/assets/javascripts/discourse/routes/review.js.es6 b/app/assets/javascripts/discourse/routes/review.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review.js.es6
rename to app/assets/javascripts/discourse/routes/review.js
diff --git a/app/assets/javascripts/discourse/routes/rules.js.es6 b/app/assets/javascripts/discourse/routes/rules.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/rules.js.es6
rename to app/assets/javascripts/discourse/routes/rules.js
diff --git a/app/assets/javascripts/discourse/routes/signup.js.es6 b/app/assets/javascripts/discourse/routes/signup.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/signup.js.es6
rename to app/assets/javascripts/discourse/routes/signup.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-edit.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups-edit.js.es6
rename to app/assets/javascripts/discourse/routes/tag-groups-edit.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-new.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups-new.js.es6
rename to app/assets/javascripts/discourse/routes/tag-groups-new.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups.js.es6
rename to app/assets/javascripts/discourse/routes/tag-groups.js
diff --git a/app/assets/javascripts/discourse/routes/tags-index.js.es6 b/app/assets/javascripts/discourse/routes/tags-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-index.js.es6
rename to app/assets/javascripts/discourse/routes/tags-index.js
diff --git a/app/assets/javascripts/discourse/routes/tags-intersection.js.es6 b/app/assets/javascripts/discourse/routes/tags-intersection.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-intersection.js.es6
rename to app/assets/javascripts/discourse/routes/tags-intersection.js
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-show.js.es6
rename to app/assets/javascripts/discourse/routes/tags-show.js
diff --git a/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6 b/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6
rename to app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params-near.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params-near.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-from-params-near.js.es6
rename to app/assets/javascripts/discourse/routes/topic-from-params-near.js
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-from-params.js.es6
rename to app/assets/javascripts/discourse/routes/topic-from-params.js
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic.js.es6
rename to app/assets/javascripts/discourse/routes/topic.js
diff --git a/app/assets/javascripts/discourse/routes/tos.js.es6 b/app/assets/javascripts/discourse/routes/tos.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tos.js.es6
rename to app/assets/javascripts/discourse/routes/tos.js
diff --git a/app/assets/javascripts/discourse/routes/unknown.js.es6 b/app/assets/javascripts/discourse/routes/unknown.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/unknown.js.es6
rename to app/assets/javascripts/discourse/routes/unknown.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-bookmarks.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-drafts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-drafts.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-index.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-likes-given.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-likes-given.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-pending.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-pending.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-pending.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-pending.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-replies.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-replies.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-replies.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-stream.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-topics.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-topics.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity.js.es6 b/app/assets/javascripts/discourse/routes/user-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity.js
diff --git a/app/assets/javascripts/discourse/routes/user-badges.js.es6 b/app/assets/javascripts/discourse/routes/user-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-badges.js.es6
rename to app/assets/javascripts/discourse/routes/user-badges.js
diff --git a/app/assets/javascripts/discourse/routes/user-deleted-posts.js.es6 b/app/assets/javascripts/discourse/routes/user-deleted-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-deleted-posts.js.es6
rename to app/assets/javascripts/discourse/routes/user-deleted-posts.js
diff --git a/app/assets/javascripts/discourse/routes/user-index.js.es6 b/app/assets/javascripts/discourse/routes/user-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-invited-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-invited-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-invited-show.js.es6
rename to app/assets/javascripts/discourse/routes/user-invited-show.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-edits.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-edits.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-edits.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-edits.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-likes-received.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-likes-received.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-mentions.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-mentions.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-mentions.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-responses.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-responses.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-responses.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-responses.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-archive.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-group.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-sent.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-sent.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-tags.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages.js
diff --git a/app/assets/javascripts/discourse/routes/user-summary.js.es6 b/app/assets/javascripts/discourse/routes/user-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-summary.js.es6
rename to app/assets/javascripts/discourse/routes/user-summary.js
diff --git a/app/assets/javascripts/discourse/routes/user-topic-list.js.es6 b/app/assets/javascripts/discourse/routes/user-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-topic-list.js.es6
rename to app/assets/javascripts/discourse/routes/user-topic-list.js
diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user.js.es6
rename to app/assets/javascripts/discourse/routes/user.js
diff --git a/app/assets/javascripts/discourse/routes/users.js.es6 b/app/assets/javascripts/discourse/routes/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/users.js.es6
rename to app/assets/javascripts/discourse/routes/users.js
diff --git a/app/assets/javascripts/discourse/services/app-events.js.es6 b/app/assets/javascripts/discourse/services/app-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/app-events.js.es6
rename to app/assets/javascripts/discourse/services/app-events.js
diff --git a/app/assets/javascripts/discourse/services/emoji-store.js.es6 b/app/assets/javascripts/discourse/services/emoji-store.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/emoji-store.js.es6
rename to app/assets/javascripts/discourse/services/emoji-store.js
diff --git a/app/assets/javascripts/discourse/services/logs-notice.js.es6 b/app/assets/javascripts/discourse/services/logs-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/logs-notice.js.es6
rename to app/assets/javascripts/discourse/services/logs-notice.js
diff --git a/app/assets/javascripts/discourse/services/search.js.es6 b/app/assets/javascripts/discourse/services/search.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/search.js.es6
rename to app/assets/javascripts/discourse/services/search.js
diff --git a/app/assets/javascripts/discourse/services/theme-settings.js.es6 b/app/assets/javascripts/discourse/services/theme-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/theme-settings.js.es6
rename to app/assets/javascripts/discourse/services/theme-settings.js
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6 b/app/assets/javascripts/discourse/templates/components/reviewable-score.js
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6
rename to app/assets/javascripts/discourse/templates/components/reviewable-score.js
diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/actions-summary.js.es6
rename to app/assets/javascripts/discourse/widgets/actions-summary.js
diff --git a/app/assets/javascripts/discourse/widgets/avatar-flair.js.es6 b/app/assets/javascripts/discourse/widgets/avatar-flair.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/avatar-flair.js.es6
rename to app/assets/javascripts/discourse/widgets/avatar-flair.js
diff --git a/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/button.js.es6
rename to app/assets/javascripts/discourse/widgets/button.js
diff --git a/app/assets/javascripts/discourse/widgets/category-link.js.es6 b/app/assets/javascripts/discourse/widgets/category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/category-link.js.es6
rename to app/assets/javascripts/discourse/widgets/category-link.js
diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js.es6 b/app/assets/javascripts/discourse/widgets/component-connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/component-connector.js.es6
rename to app/assets/javascripts/discourse/widgets/component-connector.js
diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/connector.js.es6
rename to app/assets/javascripts/discourse/widgets/connector.js
diff --git a/app/assets/javascripts/discourse/widgets/custom-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/custom-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/custom-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/custom-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 b/app/assets/javascripts/discourse/widgets/decorator-helper.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/decorator-helper.js.es6
rename to app/assets/javascripts/discourse/widgets/decorator-helper.js
diff --git a/app/assets/javascripts/discourse/widgets/default-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/default-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/default-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/default-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/discourse-tags.js.es6 b/app/assets/javascripts/discourse/widgets/discourse-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/discourse-tags.js.es6
rename to app/assets/javascripts/discourse/widgets/discourse-tags.js
diff --git a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6 b/app/assets/javascripts/discourse/widgets/embedded-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/embedded-post.js.es6
rename to app/assets/javascripts/discourse/widgets/embedded-post.js
diff --git a/app/assets/javascripts/discourse/widgets/emoji.js.es6 b/app/assets/javascripts/discourse/widgets/emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/emoji.js.es6
rename to app/assets/javascripts/discourse/widgets/emoji.js
diff --git a/app/assets/javascripts/discourse/widgets/footer-nav.js.es6 b/app/assets/javascripts/discourse/widgets/footer-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/footer-nav.js.es6
rename to app/assets/javascripts/discourse/widgets/footer-nav.js
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/glue.js.es6
rename to app/assets/javascripts/discourse/widgets/glue.js
diff --git a/app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6
rename to app/assets/javascripts/discourse/widgets/hamburger-categories.js
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/hamburger-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6 b/app/assets/javascripts/discourse/widgets/hbs-compiler.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6
rename to app/assets/javascripts/discourse/widgets/hbs-compiler.js
diff --git a/app/assets/javascripts/discourse/widgets/header-contents.js.es6 b/app/assets/javascripts/discourse/widgets/header-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header-contents.js.es6
rename to app/assets/javascripts/discourse/widgets/header-contents.js
diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 b/app/assets/javascripts/discourse/widgets/header-topic-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header-topic-info.js.es6
rename to app/assets/javascripts/discourse/widgets/header-topic-info.js
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header.js.es6
rename to app/assets/javascripts/discourse/widgets/header.js
diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/home-logo.js.es6
rename to app/assets/javascripts/discourse/widgets/home-logo.js
diff --git a/app/assets/javascripts/discourse/widgets/hooks.js.es6 b/app/assets/javascripts/discourse/widgets/hooks.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hooks.js.es6
rename to app/assets/javascripts/discourse/widgets/hooks.js
diff --git a/app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/liked-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/liked-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/liked-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/liked-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/link.js.es6
rename to app/assets/javascripts/discourse/widgets/link.js
diff --git a/app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 b/app/assets/javascripts/discourse/widgets/menu-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/menu-panel.js.es6
rename to app/assets/javascripts/discourse/widgets/menu-panel.js
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/post-admin-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-cooked.js.es6
rename to app/assets/javascripts/discourse/widgets/post-cooked.js
diff --git a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6 b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
rename to app/assets/javascripts/discourse/widgets/post-edits-indicator.js
diff --git a/app/assets/javascripts/discourse/widgets/post-gap.js.es6 b/app/assets/javascripts/discourse/widgets/post-gap.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-gap.js.es6
rename to app/assets/javascripts/discourse/widgets/post-gap.js
diff --git a/app/assets/javascripts/discourse/widgets/post-links.js.es6 b/app/assets/javascripts/discourse/widgets/post-links.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-links.js.es6
rename to app/assets/javascripts/discourse/widgets/post-links.js
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/post-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6 b/app/assets/javascripts/discourse/widgets/post-placeholder.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-placeholder.js.es6
rename to app/assets/javascripts/discourse/widgets/post-placeholder.js
diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 b/app/assets/javascripts/discourse/widgets/post-small-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-small-action.js.es6
rename to app/assets/javascripts/discourse/widgets/post-small-action.js
diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 b/app/assets/javascripts/discourse/widgets/post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-stream.js.es6
rename to app/assets/javascripts/discourse/widgets/post-stream.js
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post.js.es6
rename to app/assets/javascripts/discourse/widgets/post.js
diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js.es6 b/app/assets/javascripts/discourse/widgets/poster-name.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/poster-name.js.es6
rename to app/assets/javascripts/discourse/widgets/poster-name.js
diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 b/app/assets/javascripts/discourse/widgets/private-message-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/private-message-map.js.es6
rename to app/assets/javascripts/discourse/widgets/private-message-map.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-item.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-item.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-item.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-messages.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-messages.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-messages.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-notifications.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-notifications.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-panel.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-profile.js
diff --git a/app/assets/javascripts/discourse/widgets/raw-html.js.es6 b/app/assets/javascripts/discourse/widgets/raw-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/raw-html.js.es6
rename to app/assets/javascripts/discourse/widgets/raw-html.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
rename to app/assets/javascripts/discourse/widgets/search-menu-controls.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-results.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
rename to app/assets/javascripts/discourse/widgets/search-menu-results.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/search-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/time-gap.js.es6 b/app/assets/javascripts/discourse/widgets/time-gap.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/time-gap.js.es6
rename to app/assets/javascripts/discourse/widgets/time-gap.js
diff --git a/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6 b/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6
rename to app/assets/javascripts/discourse/widgets/toggle-topic-summary.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-admin-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-map.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-map.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-status.js.es6 b/app/assets/javascripts/discourse/widgets/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-status.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-status.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-timeline.js
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/user-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/user-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications-large.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6
rename to app/assets/javascripts/discourse/widgets/user-notifications-large.js
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/widget.js.es6
rename to app/assets/javascripts/discourse/widgets/widget.js
diff --git a/lefthook.yml b/lefthook.yml
index 8dae834398..7060a976d4 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -8,10 +8,14 @@ pre-commit:
       glob: "*.{js,es6}"
       exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
       run: yarn prettier --list-different {staged_files}
-    eslint:
-      glob: "*.{js,es6}"
+    eslint-es6:
+      glob: "*.es6"
       exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
       run: yarn eslint --ext .es6 -f compact {staged_files}
+    eslint-js:
+      glob: "*.js"
+      exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
+      run: yarn eslint -f compact {staged_files}
     ember-template-lint:
       run: yarn run ember-template-lint app
     yaml-syntax:
@@ -47,8 +51,10 @@ lints:
     prettier:
       glob: "{app/assets/stylesheets/**/*.scss,app/assets/javascripts/**/*.es6,test/javascripts/**/*.es6}"
       run: yarn prettier --list-different {all_files}
-    eslint-assets:
+    eslint-assets-es6:
       run: yarn eslint --ext .es6 app/assets/javascripts
+    eslint-assets-js:
+      run: yarn eslint app/assets/javascripts
     eslint-test:
       run: yarn eslint --ext .es6 test/javascripts
     eslint-plugins-assets:

From c61ebc9ba67d6588c09c2b93205865e0fd388f51 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 12 Mar 2020 13:30:59 -0400
Subject: [PATCH 108/633] Don't blame the big rename commit

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index f1b56462f2..68f769b233 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -7,3 +7,6 @@
 
 # DEV: enforces no self-closing-void-elements
 dafd3c3b47f116c6c1dc56cb18df614c11747733
+
+# Rename many `.js.es6` files to `.js`
+032205e2029cbf82dc8f05b459fb93adf2503c60

From 3339b910795344f9835e02cfedf35b020563f775 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 12 Mar 2020 14:07:38 -0400
Subject: [PATCH 109/633] Run prettier on a couple of files

---
 app/assets/javascripts/deprecated.js   |   2 +-
 app/assets/javascripts/locales/i18n.js | 107 ++++++++++++++-----------
 2 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/app/assets/javascripts/deprecated.js b/app/assets/javascripts/deprecated.js
index e96105b581..b660024fec 100644
--- a/app/assets/javascripts/deprecated.js
+++ b/app/assets/javascripts/deprecated.js
@@ -1,4 +1,4 @@
 // ensure Discourse is added as a global
 (function() {
-  window.Discourse = requirejs('discourse').default;
+  window.Discourse = requirejs("discourse").default;
 })();
diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index ec33b0c523..42ac634359 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -32,9 +32,9 @@ I18n.lookup = function(scope, options) {
   options = options || {};
 
   var translations = this.prepareOptions(I18n.translations),
-      locale = options.locale || I18n.currentLocale(),
-      messages = translations[locale] || {},
-      currentScope;
+    locale = options.locale || I18n.currentLocale(),
+    messages = translations[locale] || {},
+    currentScope;
 
   options = this.prepareOptions(options);
 
@@ -83,8 +83,8 @@ I18n.lookup = function(scope, options) {
 //
 I18n.prepareOptions = function() {
   var options = {},
-      opts,
-      count = arguments.length;
+    opts,
+    count = arguments.length;
 
   for (var i = 0; i < count; i++) {
     opts = arguments[i];
@@ -107,13 +107,15 @@ I18n.interpolate = function(message, options) {
   options = this.prepareOptions(options);
 
   var matches = message.match(this.PLACEHOLDER),
-      placeholder,
-      value,
-      name;
+    placeholder,
+    value,
+    name;
 
-  if (!matches) { return message; }
+  if (!matches) {
+    return message;
+  }
 
-  for (var i = 0; placeholder = matches[i]; i++) {
+  for (var i = 0; (placeholder = matches[i]); i++) {
     name = placeholder.replace(this.PLACEHOLDER, "$1");
 
     if (typeof options[name] === "string") {
@@ -130,7 +132,9 @@ I18n.interpolate = function(message, options) {
       value = "[missing " + placeholder + " value]";
     }
 
-    var regex = new RegExp(placeholder.replace(/\{/gm, "\\{").replace(/\}/gm, "\\}"));
+    var regex = new RegExp(
+      placeholder.replace(/\{/gm, "\\{").replace(/\}/gm, "\\}")
+    );
     message = message.replace(regex, value);
   }
 
@@ -157,8 +161,8 @@ I18n.translate = function(scope, options) {
       translation = this.findTranslation(scope, options);
     }
 
-    if (!translation && this.currentLocale() !== 'en') {
-      options.locale = 'en';
+    if (!translation && this.currentLocale() !== "en") {
+      options.locale = "en";
       translation = this.findTranslation(scope, options);
     }
   }
@@ -181,25 +185,28 @@ I18n.findTranslation = function(scope, options) {
 };
 
 I18n.toNumber = function(number, options) {
-  options = this.prepareOptions(
-    options,
-    this.lookup("number.format"),
-    {precision: 3, separator: this.SEPARATOR, delimiter: ",", strip_insignificant_zeros: false}
-  );
+  options = this.prepareOptions(options, this.lookup("number.format"), {
+    precision: 3,
+    separator: this.SEPARATOR,
+    delimiter: ",",
+    strip_insignificant_zeros: false
+  });
 
   var negative = number < 0,
-      string = Math.abs(number).toFixed(options.precision).toString(),
-      parts = string.split(this.SEPARATOR),
-      precision,
-      buffer = [],
-      formattedNumber;
+    string = Math.abs(number)
+      .toFixed(options.precision)
+      .toString(),
+    parts = string.split(this.SEPARATOR),
+    precision,
+    buffer = [],
+    formattedNumber;
 
   number = parts[0];
   precision = parts[1];
 
   while (number.length > 0) {
     buffer.unshift(number.substr(Math.max(0, number.length - 3), 3));
-    number = number.substr(0, number.length -3);
+    number = number.substr(0, number.length - 3);
   }
 
   formattedNumber = buffer.join(options.delimiter);
@@ -214,14 +221,13 @@ I18n.toNumber = function(number, options) {
 
   if (options.strip_insignificant_zeros) {
     var regex = {
-        separator: new RegExp(options.separator.replace(/\./, "\\.") + "$"),
-        zeros: /0+$/
+      separator: new RegExp(options.separator.replace(/\./, "\\.") + "$"),
+      zeros: /0+$/
     };
 
     formattedNumber = formattedNumber
       .replace(regex.zeros, "")
-      .replace(regex.separator, "")
-    ;
+      .replace(regex.separator, "");
   }
 
   return formattedNumber;
@@ -229,10 +235,10 @@ I18n.toNumber = function(number, options) {
 
 I18n.toHumanSize = function(number, options) {
   var kb = 1024,
-      size = number,
-      iterations = 0,
-      unit,
-      precision;
+    size = number,
+    iterations = 0,
+    unit,
+    precision;
 
   while (size >= kb && iterations < 4) {
     size = size / kb;
@@ -240,23 +246,24 @@ I18n.toHumanSize = function(number, options) {
   }
 
   if (iterations === 0) {
-    unit = this.t("number.human.storage_units.units.byte", {count: size});
+    unit = this.t("number.human.storage_units.units.byte", { count: size });
     precision = 0;
   } else {
-    unit = this.t("number.human.storage_units.units." + [null, "kb", "mb", "gb", "tb"][iterations]);
-    precision = (size - Math.floor(size) === 0) ? 0 : 1;
+    unit = this.t(
+      "number.human.storage_units.units." +
+        [null, "kb", "mb", "gb", "tb"][iterations]
+    );
+    precision = size - Math.floor(size) === 0 ? 0 : 1;
   }
 
-  options = this.prepareOptions(
-    options,
-    {precision: precision, format: "%n%u", delimiter: ""}
-  );
+  options = this.prepareOptions(options, {
+    precision: precision,
+    format: "%n%u",
+    delimiter: ""
+  });
 
   number = this.toNumber(size, options);
-  number = options.format
-    .replace("%u", unit)
-    .replace("%n", number)
-  ;
+  number = options.format.replace("%u", unit).replace("%n", number);
 
   return number;
 };
@@ -283,7 +290,7 @@ I18n.pluralize = function(translation, scope, options) {
 
   var pluralizer = this.pluralizer(options.locale || this.currentLocale());
   var key = pluralizer(Math.abs(count));
-  var keys = ((typeof key === "object") && (key instanceof Array)) ? key : [key];
+  var keys = typeof key === "object" && key instanceof Array ? key : [key];
 
   var message = this.findAndTranslateValidNode(keys, translation);
 
@@ -295,9 +302,11 @@ I18n.pluralize = function(translation, scope, options) {
 };
 
 I18n.missingTranslation = function(scope, key) {
-  var message = '[' + this.currentLocale() + this.SEPARATOR + scope;
-  if (key) { message += this.SEPARATOR + key; }
-  return message + ']';
+  var message = "[" + this.currentLocale() + this.SEPARATOR + scope;
+  if (key) {
+    message += this.SEPARATOR + key;
+  }
+  return message + "]";
 };
 
 I18n.currentLocale = function() {
@@ -311,7 +320,7 @@ I18n.enableVerboseLocalization = function() {
 
   I18n.noFallbacks = true;
 
-  I18n.t = I18n.translate = function(scope, value){
+  I18n.t = I18n.translate = function(scope, value) {
     var current = keys[scope];
     if (!current) {
       current = keys[scope] = ++counter;
@@ -330,7 +339,7 @@ I18n.enableVerboseLocalizationSession = function() {
   sessionStorage.setItem("verbose_localization", "true");
   I18n.enableVerboseLocalization();
 
-  return 'Verbose localization is enabled. Close the browser tab to turn it off. Reload the page to see the translation keys.';
+  return "Verbose localization is enabled. Close the browser tab to turn it off. Reload the page to see the translation keys.";
 };
 
 // shortcuts

From 4d7f6749beee1e652329dd32cd348b9852d47af7 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Thu, 12 Mar 2020 15:54:30 -0700
Subject: [PATCH 110/633] it's 2020 now, though maybe we all wish it wasn't

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c3a200d108..ddf32ba126 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ The original Discourse code contributors can be found in [**AUTHORS.MD**](docs/A
 
 ## Copyright / License
 
-Copyright 2014 - 2019 Civilized Discourse Construction Kit, Inc.
+Copyright 2014 - 2020 Civilized Discourse Construction Kit, Inc.
 
 Licensed under the GNU General Public License Version 2.0 (or later);
 you may not use this work except in compliance with the License.

From 2237ba8c9d235a5e6b34c548253a34630fb042fc Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 13 Mar 2020 10:04:15 +1000
Subject: [PATCH 111/633] FIX: Add topic deleted check to email/sender (#9166)

It already had a deleted post check and log reason, add a topic one too to avoid errors
---
 app/models/skipped_email_log.rb      |  3 ++-
 config/locales/server.en.yml         |  1 +
 lib/email/sender.rb                  |  9 +++++----
 spec/components/email/sender_spec.rb | 19 +++++++++++++++++++
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/models/skipped_email_log.rb b/app/models/skipped_email_log.rb
index 374e8cff0d..9ffa2230e9 100644
--- a/app/models/skipped_email_log.rb
+++ b/app/models/skipped_email_log.rb
@@ -36,7 +36,8 @@ class SkippedEmailLog < ActiveRecord::Base
       sender_body_blank: 19,
       sender_post_deleted: 20,
       sender_message_to_invalid: 21,
-      user_email_access_denied: 22
+      user_email_access_denied: 22,
+      sender_topic_deleted: 23
       # you need to add the reason in server.en.yml below the "skipped_email_log" key
       # when you add a new enum value
     )
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 4b7298af42..ba7ead37b0 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3771,6 +3771,7 @@ en:
     sender_body_blank: "body is blank"
     sender_post_deleted: "post has been deleted"
     sender_message_to_invalid: "recipient has invalid email address"
+    sender_topic_deleted: "topic has been deleted"
 
   color_schemes:
     base_theme_name: "Base"
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index bce5fc90de..8cd3c613fd 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -96,12 +96,13 @@ module Email
       if topic_id.present? && post_id.present?
         post = Post.find_by(id: post_id, topic_id: topic_id)
 
-        # guards against deleted posts
-        return skip(SkippedEmailLog.reason_types[:sender_post_deleted]) unless post
-
-        add_attachments(post)
+        # guards against deleted posts and topics
+        return skip(SkippedEmailLog.reason_types[:sender_post_deleted]) if post.blank?
 
         topic = post.topic
+        return skip(SkippedEmailLog.reason_types[:sender_topic_deleted]) if topic.blank?
+
+        add_attachments(post)
         first_post = topic.ordered_posts.first
 
         topic_message_id = first_post.incoming_email&.message_id.present? ?
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index a93e1cd410..26d4dcffbe 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -443,6 +443,25 @@ describe Email::Sender do
 
   end
 
+  context 'with a deleted topic' do
+
+    it 'should skip sending the email' do
+      post = Fabricate(:post, topic: Fabricate(:topic, deleted_at: 1.day.ago))
+
+      message = Mail::Message.new to: 'disc@ourse.org', body: 'some content'
+      message.header['X-Discourse-Post-Id'] = post.id
+      message.header['X-Discourse-Topic-Id'] = post.topic_id
+      message.expects(:deliver_now).never
+
+      email_sender = Email::Sender.new(message, :valid_type)
+      expect { email_sender.send }.to change { SkippedEmailLog.count }
+
+      log = SkippedEmailLog.last
+      expect(log.reason_type).to eq(SkippedEmailLog.reason_types[:sender_topic_deleted])
+    end
+
+  end
+
   context 'with a user' do
     let(:message) do
       message = Mail::Message.new to: 'eviltrout@test.domain', body: 'test body'

From af92444948533aa726e53001f414e346c5321ddd Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 13 Mar 2020 10:44:39 +1000
Subject: [PATCH 112/633] FIX: Make sure bookmark serializer works with deleted
 topics + posts (#9195)

---
 app/models/bookmark.rb                        |   4 +
 app/serializers/user_bookmark_serializer.rb   |  40 +++---
 lib/bookmark_query.rb                         |   2 +-
 ...mark_reminder_notification_handler_spec.rb | 126 +++++++++++-------
 .../user_bookmark_serializer_spec.rb          |  42 ++++--
 5 files changed, 140 insertions(+), 74 deletions(-)

diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index d28e40d263..198895fa5c 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -39,6 +39,10 @@ class Bookmark < ActiveRecord::Base
     end
   end
 
+  def no_reminder?
+    self.reminder_at.blank? && self.reminder_type.blank?
+  end
+
   scope :pending_reminders, ->(before_time = Time.now.utc) do
     where("reminder_at IS NOT NULL AND reminder_at <= :before_time", before_time: before_time)
   end
diff --git a/app/serializers/user_bookmark_serializer.rb b/app/serializers/user_bookmark_serializer.rb
index 39358c2262..b87b3a9d00 100644
--- a/app/serializers/user_bookmark_serializer.rb
+++ b/app/serializers/user_bookmark_serializer.rb
@@ -25,67 +25,75 @@ class UserBookmarkSerializer < ApplicationSerializer
              :slug,
              :username
 
+  def topic
+    @topic ||= object.topic || Topic.unscoped.find(object.topic_id)
+  end
+
+  def post
+    @post ||= object.post || Post.unscoped.find(object.post_id)
+  end
+
   def closed
-    object.topic.closed
+    topic.closed
   end
 
   def archived
-    object.topic.archived
+    topic.archived
   end
 
   def linked_post_number
-    object.post.post_number
+    post.post_number
   end
 
   def title
-    object.topic.title
+    topic.title
   end
 
   def deleted
-    object.topic.deleted_at.present? || object.post.deleted_at.present?
+    topic.deleted_at.present? || post.deleted_at.present?
   end
 
   def hidden
-    object.post.hidden
+    post.hidden
   end
 
   def category_id
-    object.topic.category_id
+    topic.category_id
   end
 
   def archetype
-    object.topic.archetype
+    topic.archetype
   end
 
   def archived
-    object.topic.archived
+    topic.archived
   end
 
   def closed
-    object.topic.closed
+    topic.closed
   end
 
   def highest_post_number
-    object.topic.highest_post_number
+    topic.highest_post_number
   end
 
   def bumped_at
-    object.topic.bumped_at
+    topic.bumped_at
   end
 
   def raw
-    object.post.raw
+    post.raw
   end
 
   def cooked
-    object.post.cooked
+    post.cooked
   end
 
   def slug
-    object.topic.slug
+    topic.slug
   end
 
   def username
-    object.post.user.username
+    post.user.username
   end
 end
diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
index ab18ea9edb..44ab7b257f 100644
--- a/lib/bookmark_query.rb
+++ b/lib/bookmark_query.rb
@@ -5,7 +5,7 @@
 # in the user/activity/bookmarks page.
 
 class BookmarkQuery
-  def initialize(user, params)
+  def initialize(user, params = {})
     @user = user
     @params = params
   end
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index a2bf4a30af..8cc1c4b637 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -9,72 +9,100 @@ RSpec.describe BookmarkReminderNotificationHandler do
 
   before do
     SiteSetting.enable_bookmarks_with_reminders = true
-  end
-  fab!(:reminder) do
-    Fabricate(
-      :bookmark,
-      user: user,
-      reminder_type: Bookmark.reminder_types[:at_desktop],
-      reminder_at: nil,
-      reminder_set_at: Time.zone.now
-    )
-  end
-  let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
-
-  before do
     Discourse.redis.flushall
   end
 
-  context "when there are pending bookmark at desktop reminders" do
-    before do
-      described_class.cache_pending_at_desktop_reminder(user)
+  describe "#send_notification" do
+    fab!(:bookmark) do
+      Fabricate(:bookmark_next_business_day_reminder, user: user)
     end
 
-    context "when the user agent is for mobile" do
-      let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" }
-      it "does not attempt to send any reminders" do
+    it "creates a bookmark reminder notification with the correct details" do
+      subject.send_notification(bookmark)
+      notif = bookmark.user.notifications.last
+      expect(notif.notification_type).to eq(Notification.types[:bookmark_reminder])
+      expect(notif.topic_id).to eq(bookmark.topic_id)
+      expect(notif.post_number).to eq(bookmark.post.post_number)
+      data = JSON.parse(notif.data)
+      expect(data["topic_title"]).to eq(bookmark.topic.title)
+      expect(data["display_username"]).to eq(bookmark.user.username)
+      expect(data["bookmark_name"]).to eq(bookmark.name)
+    end
+
+    context "when the post has been deleted" do
+      it "clears the reminder and does not send a notification" do
+        bookmark.post.trash!
+        bookmark.reload
+        subject.send_notification(bookmark)
+        expect(bookmark.reload.no_reminder?).to eq(true)
+      end
+    end
+  end
+
+  describe "#send_at_desktop_reminder" do
+    fab!(:reminder) do
+      Fabricate(
+        :bookmark,
+        user: user,
+        reminder_type: Bookmark.reminder_types[:at_desktop],
+        reminder_at: nil,
+        reminder_set_at: Time.zone.now
+      )
+    end
+    let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
+
+    context "when there are pending bookmark at desktop reminders" do
+      before do
+        described_class.cache_pending_at_desktop_reminder(user)
+      end
+
+      context "when the user agent is for mobile" do
+        let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" }
+        it "does not attempt to send any reminders" do
+          DistributedMutex.expects(:synchronize).never
+          send_reminder
+        end
+      end
+
+      context "when the user agent is for desktop" do
+        let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
+
+        it "deletes the key in redis" do
+          send_reminder
+          expect(described_class.user_has_pending_at_desktop_reminders?(user)).to eq(false)
+        end
+
+        it "sends a notification to the user and clears the reminder_at" do
+          send_reminder
+          expect(Notification.where(user: user, notification_type: Notification.types[:bookmark_reminder]).count).to eq(1)
+          expect(reminder.reload.reminder_type).to eq(nil)
+          expect(reminder.reload.reminder_last_sent_at).not_to eq(nil)
+          expect(reminder.reload.reminder_set_at).to eq(nil)
+        end
+      end
+    end
+
+    context "when there are no pending bookmark at desktop reminders" do
+      it "does nothing" do
         DistributedMutex.expects(:synchronize).never
         send_reminder
       end
     end
 
-    context "when the user agent is for desktop" do
-      let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
-
-      it "deletes the key in redis" do
-        send_reminder
-        expect(described_class.user_has_pending_at_desktop_reminders?(user)).to eq(false)
+    context "when enable bookmarks with reminders is disabled" do
+      before do
+        SiteSetting.enable_bookmarks_with_reminders = false
       end
 
-      it "sends a notification to the user and clears the reminder_at" do
+      it "does nothing" do
+        BrowserDetection.expects(:device).never
         send_reminder
-        expect(Notification.where(user: user, notification_type: Notification.types[:bookmark_reminder]).count).to eq(1)
-        expect(reminder.reload.reminder_type).to eq(nil)
-        expect(reminder.reload.reminder_last_sent_at).not_to eq(nil)
-        expect(reminder.reload.reminder_set_at).to eq(nil)
       end
     end
-  end
 
-  context "when there are no pending bookmark at desktop reminders" do
-    it "does nothing" do
-      DistributedMutex.expects(:synchronize).never
-      send_reminder
+    def send_reminder
+      subject.send_at_desktop_reminder(user: user, request_user_agent: user_agent)
     end
   end
 
-  context "when enable bookmarks with reminders is disabled" do
-    before do
-      SiteSetting.enable_bookmarks_with_reminders = false
-    end
-
-    it "does nothing" do
-      BrowserDetection.expects(:device).never
-      send_reminder
-    end
-  end
-
-  def send_reminder
-    subject.send_at_desktop_reminder(user: user, request_user_agent: user_agent)
-  end
 end
diff --git a/spec/serializers/user_bookmark_serializer_spec.rb b/spec/serializers/user_bookmark_serializer_spec.rb
index 0bca3a0228..85acabf95c 100644
--- a/spec/serializers/user_bookmark_serializer_spec.rb
+++ b/spec/serializers/user_bookmark_serializer_spec.rb
@@ -3,12 +3,31 @@
 require 'rails_helper'
 
 RSpec.describe UserBookmarkSerializer do
-  let(:bookmark) do
-    Fabricate(:bookmark)
-    Bookmark.all.includes(post: :user).includes(:topic).last
-  end
+  let(:user) { Fabricate(:user) }
+  let(:post) { Fabricate(:post, user: user) }
+  let!(:bookmark) { Fabricate(:bookmark, name: 'Test', user: user, post: post, topic: post.topic) }
 
-  subject { described_class.new(bookmark) }
+  it "serializes all properties correctly" do
+    s = serialized
+    expect(s.id).to eq(bookmark.id)
+    expect(s.created_at).to eq(bookmark.created_at)
+    expect(s.topic_id).to eq(bookmark.topic_id)
+    expect(s.linked_post_number).to eq(bookmark.post.post_number)
+    expect(s.post_id).to eq(bookmark.post_id)
+    expect(s.name).to eq(bookmark.name)
+    expect(s.reminder_at).to eq(bookmark.reminder_at)
+    expect(s.title).to eq(bookmark.topic.title)
+    expect(s.deleted).to eq(false)
+    expect(s.hidden).to eq(false)
+    expect(s.closed).to eq(false)
+    expect(s.archived).to eq(false)
+    expect(s.category_id).to eq(bookmark.topic.category_id)
+    expect(s.archetype).to eq(bookmark.topic.archetype)
+    expect(s.highest_post_number).to eq(1)
+    expect(s.bumped_at.to_s).to eq(bookmark.topic.bumped_at.to_s)
+    expect(s.slug).to eq(bookmark.topic.slug)
+    expect(s.username).to eq(bookmark.post.user.username)
+  end
 
   context "when the topic is deleted" do
     before do
@@ -16,7 +35,8 @@ RSpec.describe UserBookmarkSerializer do
       bookmark.reload
     end
     it "still returns the topic title because the relationship is unscoped" do
-      expect(subject.title).not_to eq(nil)
+      serialized
+      expect(serialized.title).not_to eq(nil)
     end
   end
 
@@ -26,10 +46,16 @@ RSpec.describe UserBookmarkSerializer do
       bookmark.reload
     end
     it "still returns the post number because the relationship is unscoped" do
-      expect(subject.linked_post_number).not_to eq(nil)
+      serialized
+      expect(serialized.linked_post_number).not_to eq(nil)
     end
     it "still returns the post username" do
-      expect(subject.username).not_to eq(nil)
+      serialized
+      expect(serialized.username).not_to eq(nil)
     end
   end
+
+  def serialized
+    described_class.new(BookmarkQuery.new(bookmark.user, {}).list_all.to_ary.last)
+  end
 end

From dc02586d99bceac2e78a7690d9265e93310645d5 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 13 Mar 2020 13:33:57 +1000
Subject: [PATCH 113/633] Fix error on create bookmark for topic

---
 app/controllers/topics_controller.rb    | 2 +-
 spec/requests/topics_controller_spec.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 61b6d4bd68..ee7ba1af18 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -551,7 +551,7 @@ class TopicsController < ApplicationController
       bookmark_manager = BookmarkManager.new(current_user)
       bookmark_manager.create(post_id: first_post.id)
 
-      if bookmark_manager.errors
+      if bookmark_manager.errors.any?
         return render_json_error(bookmark_manager, status: 400)
       end
     else
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 42f002f481..845a7e1930 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2376,6 +2376,7 @@ RSpec.describe TopicsController do
         post = create_post
         post2 = create_post(topic_id: post.topic_id)
         put "/t/#{post.topic_id}/bookmark.json"
+        expect(response.status).to eq(200)
 
         bookmarks_for_topic = Bookmark.where(topic: post.topic, user: user)
         expect(bookmarks_for_topic.count).to eq(1)

From ac8d8e3b62c8868d5b34331daddf6ce09ac79009 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 13 Mar 2020 16:29:09 +1000
Subject: [PATCH 114/633] FEATURE: Add enable_bookmark_at_desktop_reminders
 site setting (#9198)

Add enable_bookmark_at_desktop_reminders site setting default to false a new hidden site setting to hide the "At Desktop" reminder option so we can restrict this further until it is polished.
---
 .../javascripts/discourse/controllers/bookmark.js      | 10 ++++++++--
 .../javascripts/discourse/templates/modal/bookmark.hbs |  2 +-
 config/site_settings.yml                               |  4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index b4b74ec57e..891dd2daf4 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -5,7 +5,6 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { htmlSafe } from "@ember/template";
 import { ajax } from "discourse/lib/ajax";
-import { reads } from "@ember/object/computed";
 
 const START_OF_DAY_HOUR = 8;
 const REMINDER_TYPES = {
@@ -52,9 +51,16 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  usingMobileDevice: reads("site.mobileView"),
   showBookmarkReminderControls: true,
 
+  @discourseComputed()
+  showAtDesktop() {
+    return (
+      this.siteSettings.enable_bookmark_at_desktop_reminders &&
+      this.site.mobileView
+    );
+  },
+
   @discourseComputed("selectedReminderType")
   customDateTimeSelected(selectedReminderType) {
     return selectedReminderType === REMINDER_TYPES.CUSTOM;
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 661ab90f27..7adab91b63 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -24,7 +24,7 @@
 
       {{#if userHasTimezoneSet}}
         {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
-          {{#if usingMobileDevice}}
+          {{#if showAtDesktop}}
             {{tap-tile icon="desktop" text=(i18n "bookmarks.reminders.at_desktop") tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{/if}}
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 56d742e565..044d7f1de1 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -293,6 +293,10 @@ basic:
     client: true
     default: false
     hidden: true
+  enable_bookmark_at_desktop_reminders:
+    client: true
+    default: false
+    hidden: true
   push_notifications_prompt:
     default: true
     client: true

From b727e39a42847f5c58417f5b39987e01bc8eec12 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 13 Mar 2020 12:41:08 +0100
Subject: [PATCH 115/633] DEV: gives sk components a way to trigger a search
 manually (#9199)

---
 .../select-kit/components/select-kit.js.es6   | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 39e167a24e..828ee6c765 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -231,10 +231,7 @@ export default Component.extend(
       });
 
       if (this.selectKit.isExpanded) {
-        if (this._searchPromise) {
-          cancel(this._searchPromise);
-        }
-        this._searchPromise = this._searchWrapper(this.selectKit.filter);
+        this.triggerSearch();
       }
 
       if (this.computeContent) {
@@ -388,7 +385,7 @@ export default Component.extend(
 
     _debouncedInput(filter) {
       this.selectKit.setProperties({ filter, isLoading: true });
-      this._searchPromise = this._searchWrapper(filter);
+      this.triggerSearch(filter);
     },
 
     _onChangeWrapper(value, items) {
@@ -567,6 +564,15 @@ export default Component.extend(
       return content;
     },
 
+    triggerSearch(filter) {
+      if (this._searchPromise) {
+        cancel(this._searchPromise);
+      }
+      this._searchPromise = this._searchWrapper(
+        filter || this.selectKit.filter
+      );
+    },
+
     _searchWrapper(filter) {
       this.clearErrors();
       this.setProperties({ mainCollection: [], "selectKit.isLoading": true });
@@ -869,10 +875,7 @@ export default Component.extend(
           this.selectKit.options.filterable || this.selectKit.options.allowAny
       });
 
-      if (this._searchPromise) {
-        cancel(this._searchPromise);
-      }
-      this._searchPromise = this._searchWrapper();
+      this.triggerSearch();
 
       this._safeAfterRender(() => {
         this._focusFilter();

From c14e3adac5349b0500fe7d51bd96704d7a813929 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 13 Mar 2020 09:36:04 -0400
Subject: [PATCH 116/633] UX: Better spacing for icon in select-kit label

---
 app/assets/stylesheets/common/select-kit/select-kit.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index cea7f6f871..d45978ba64 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -79,6 +79,10 @@
 
       .name {
         display: inline-block;
+        .d-icon {
+          margin-left: 0.5em;
+          margin-right: 0;
+        }
       }
 
       &.select-kit-selected-color {

From 8a4784d36fe7f0a44b4e44aba3fe5743093d3d07 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Mar 2020 13:53:39 +0000
Subject: [PATCH 117/633] Build(deps): Bump rails_multisite from 2.1.0 to 2.1.1
 (#9196)

Bumps [rails_multisite]() from 2.1.0 to 2.1.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 60d55158f3..60177e792d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -279,7 +279,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_multisite (2.1.0)
+    rails_multisite (2.1.1)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
     railties (6.0.1)
@@ -416,7 +416,7 @@ GEM
       hkdf (~> 0.2)
       jwt (~> 2.0)
     yaml-lint (0.0.10)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

From 3d71b68195375f1b584bfe57904444b9cca6df12 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 13 Mar 2020 15:30:31 +0000
Subject: [PATCH 118/633] DEV: Introduce plugin api for conditionally rendering
 assets (#9200)

---
 .../common/_discourse_stylesheet.html.erb     |  2 +-
 app/views/layouts/application.html.erb        |  2 +-
 lib/discourse.rb                              | 14 ++++++++++--
 lib/plugin/instance.rb                        |  9 ++++++++
 plugins/discourse-internet-explorer/plugin.rb | 19 +++-------------
 spec/components/discourse_spec.rb             | 22 +++++++++++++++++--
 6 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb
index b6f64114e7..2312fa4da7 100644
--- a/app/views/common/_discourse_stylesheet.html.erb
+++ b/app/views/common/_discourse_stylesheet.html.erb
@@ -12,6 +12,6 @@
   <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_theme : :desktop_theme) %>
 <%- end %>
 
-<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?).each do |file| %>
+<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %>
   <%= discourse_stylesheet_link_tag(file) %>
 <%- end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3340017d75..6c1f3b3074 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -28,7 +28,7 @@
     <%= preload_script "vendor" %>
     <%= preload_script "pretty-text-bundle" %>
     <%= preload_script "application" %>
-    <%- Discourse.find_plugin_js_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?).each do |file| %>
+    <%- Discourse.find_plugin_js_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, request: request).each do |file| %>
       <%= preload_script file %>
     <%- end %>
     <%- if staff? %>
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 0cbc4d8e4c..07810010b6 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -271,6 +271,10 @@ module Discourse
   def self.find_plugin_css_assets(args)
     plugins = self.find_plugins(args)
 
+    plugins = plugins.select do |plugin|
+      plugin.asset_filters.all? { |b| b.call(:css, args[:request]) }
+    end
+
     assets = []
 
     targets = [nil]
@@ -289,9 +293,15 @@ module Discourse
   end
 
   def self.find_plugin_js_assets(args)
-    self.find_plugins(args).find_all do |plugin|
+    plugins = self.find_plugins(args).select do |plugin|
       plugin.js_asset_exists?
-    end.map { |plugin| "plugins/#{plugin.directory_name}" }
+    end
+
+    plugins = plugins.select do |plugin|
+      plugin.asset_filters.all? { |b| b.call(:js, args[:request]) }
+    end
+
+    plugins.map { |plugin| "plugins/#{plugin.directory_name}" }
   end
 
   def self.assets_digest
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index eb7c2322fc..06070d5f02 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -49,6 +49,7 @@ class Plugin::Instance
    :styles,
    :themes,
    :csp_extensions,
+   :asset_filters
  ].each do |att|
     class_eval %Q{
       def #{att}
@@ -413,6 +414,14 @@ class Plugin::Instance
     csp_extensions << extension
   end
 
+  # Register a block to run when adding css and js assets
+  # Two arguments will be passed: (type, request)
+  # Type is :css or :js. `request` is an instance of Rack::Request
+  # When using this, make sure to consider the effect on AnonymousCache
+  def register_asset_filter(&blk)
+    asset_filters << blk
+  end
+
   # @option opts [String] :name
   # @option opts [String] :nativeName
   # @option opts [String] :fallbackLocale
diff --git a/plugins/discourse-internet-explorer/plugin.rb b/plugins/discourse-internet-explorer/plugin.rb
index eedd870fbd..646dfff08a 100644
--- a/plugins/discourse-internet-explorer/plugin.rb
+++ b/plugins/discourse-internet-explorer/plugin.rb
@@ -20,22 +20,9 @@ DiscourseEvent.on(:after_plugin_activation) do ||
 end
 
 after_initialize do
-
-  # Conditionally load the stylesheet. There is unfortunately no easy way to do this via
-  # Plugin API.
-  reloadable_patch do |plugin|
-    ApplicationHelper.module_eval do
-      alias_method :previous_discourse_stylesheet_link_tag, :discourse_stylesheet_link_tag
-      def discourse_stylesheet_link_tag(name, opts = {})
-
-        if name == 'discourse-internet-explorer'
-          return unless SiteSetting.discourse_internet_explorer_enabled?
-          return unless request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/
-        end
-
-        previous_discourse_stylesheet_link_tag(name, opts)
-      end
-    end
+  # Conditionally load the stylesheet
+  register_asset_filter do |type, request|
+    request.nil? || request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/
   end
 
   register_anonymous_cache_key(:ie) do
diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb
index 38625ee86d..3f1e62d446 100644
--- a/spec/components/discourse_spec.rb
+++ b/spec/components/discourse_spec.rb
@@ -75,12 +75,17 @@ describe Discourse do
       end
     end
 
-    let(:plugin1) { plugin_class.new.tap { |p| p.enabled = true } }
-    let(:plugin2) { plugin_class.new.tap { |p| p.enabled = false } }
+    let(:plugin1) { plugin_class.new.tap { |p| p.enabled = true; p.path = "my-plugin-1" } }
+    let(:plugin2) { plugin_class.new.tap { |p| p.enabled = false; p.path = "my-plugin-1" } }
 
     before { Discourse.plugins.append(plugin1, plugin2) }
     after { Discourse.plugins.clear }
 
+    before do
+      plugin_class.any_instance.stubs(:css_asset_exists?).returns(true)
+      plugin_class.any_instance.stubs(:js_asset_exists?).returns(true)
+    end
+
     it 'can find plugins correctly' do
       expect(Discourse.plugins).to contain_exactly(plugin1, plugin2)
 
@@ -90,6 +95,19 @@ describe Discourse do
       # Include disabled plugins when requested
       expect(Discourse.find_plugins(include_disabled: true)).to contain_exactly(plugin1, plugin2)
     end
+
+    it 'can find plugin assets' do
+      plugin2.enabled = true
+
+      expect(Discourse.find_plugin_css_assets({}).length).to eq(2)
+      expect(Discourse.find_plugin_js_assets({}).length).to eq(2)
+      plugin1.register_asset_filter do |type, request|
+        false
+      end
+      expect(Discourse.find_plugin_css_assets({}).length).to eq(1)
+      expect(Discourse.find_plugin_js_assets({}).length).to eq(1)
+    end
+
   end
 
   context 'authenticators' do

From ad2ec5b65e50cc41047b57005a40c836d8234fb3 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 13 Mar 2020 15:53:40 +0000
Subject: [PATCH 119/633] UX: Improve copy for suspect users feature (#9201)

Co-authored-by: Robin Ward <robin.ward@gmail.com>
---
 config/locales/server.en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index ba7ead37b0..65715d3f21 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1530,7 +1530,7 @@ en:
     markdown_typographer_quotation_marks: "List of double and single quotes replacement pairs"
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
     must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site."
-    approve_suspect_users: "Staff must approve all suspect accounts"
+    approve_suspect_users: "Add suspicious users to the review queue. Suspicious users have entered a bio/website but have no reading activity."
     pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications."
     maximum_session_age: "User will remain logged in for n hours since last visit"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code ID, eg: UA-12345678-9; see <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -4698,7 +4698,7 @@ en:
       invite_only: "All new users should be invited. See `invite_only`."
       email_auth_res_enqueue: "This email failed a DMARC check, it most likely isn't from whom it seems to be from. Check the raw email headers for more information."
       email_spam: "This email was flagged as spam by the header defined in `email_in_spam_header`."
-      suspect_user: "Users in the suspect list must be examined by staff. See `approve_suspect_users`."
+      suspect_user: "This user has a bio/website in their profile, without having read any posts. This can indicate a spam account. See `approve_suspect_users`."
 
     actions:
       agree:

From 7c27f9bba9f88ea8bd4947c1b608b1ca2c842391 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 13 Mar 2020 12:25:46 -0400
Subject: [PATCH 120/633] FIX: remove parent tag from tag group

Having a tag be a member of a tag group and the group's parent tag at
the same time causes some unexpected behavior. When a tag is assigned
as the parent, remove it from the group.
---
 app/models/tag_group.rb       |  5 +++++
 spec/models/tag_group_spec.rb | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/app/models/tag_group.rb b/app/models/tag_group.rb
index 1fd5711f82..cf83c9ff2d 100644
--- a/app/models/tag_group.rb
+++ b/app/models/tag_group.rb
@@ -13,6 +13,7 @@ class TagGroup < ActiveRecord::Base
 
   before_create :init_permissions
   before_save :apply_permissions
+  before_save :remove_parent_from_group
 
   after_commit { DiscourseTagging.clear_cache! }
 
@@ -73,6 +74,10 @@ class TagGroup < ActiveRecord::Base
     end
   end
 
+  def remove_parent_from_group
+    tags.delete(parent_tag) if tags.include?(parent_tag)
+  end
+
   def self.visible(guardian)
     if guardian.is_staff?
       TagGroup
diff --git a/spec/models/tag_group_spec.rb b/spec/models/tag_group_spec.rb
index f126194379..bfca9d3b35 100644
--- a/spec/models/tag_group_spec.rb
+++ b/spec/models/tag_group_spec.rb
@@ -101,6 +101,22 @@ describe TagGroup do
       expect_same_tag_names(tag_group.reload.tags, [tag, 'new-tag'])
     end
 
+    it "removes parent tag as group member" do
+      parent = Fabricate(:tag)
+      tag_group.tags = [tag, parent]
+      tag_group.update!(parent_tag: parent)
+      tag_group.reload
+      expect_same_tag_names(tag_group.tags, [tag])
+      expect_same_tag_names([tag_group.parent_tag], [parent])
+    end
+
+    it "removes parent tag as group member when creating the group" do
+      parent = Fabricate(:tag)
+      tg = Fabricate(:tag_group, tags: [tag, parent], parent_tag: parent)
+      expect_same_tag_names(tg.tags, [tag])
+      expect_same_tag_names([tg.parent_tag], [parent])
+    end
+
     context 'with synonyms' do
       fab!(:synonym) { Fabricate(:tag, name: 'synonym', target_tag: tag) }
 

From 3723c64257556adee0d58ce3f133aba2b6a73c26 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 13 Mar 2020 16:45:55 +0000
Subject: [PATCH 121/633] DEV: Correct references to theme flags

Followup to d1474e94
---
 config/locales/server.en.yml                  | 2 +-
 spec/components/svg_sprite/svg_sprite_spec.rb | 2 +-
 spec/lib/content_security_policy_spec.rb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 65715d3f21..fd440ec3b6 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -83,7 +83,7 @@ en:
       generic: An error occured while importing that theme
       about_json: "Import Error: about.json does not exist, or is invalid"
       about_json_values: "about.json contains invalid values: %{errors}"
-      flag_values: "about.json flags contain invalid values: %{errors}"
+      modifier_values: "about.json modifiers contain invalid values: %{errors}"
       git: "Error cloning git repository, access is denied or repository is not found"
       unpack_failed: "Failed to unpack file"
       file_too_big: "The uncompressed file is too big."
diff --git a/spec/components/svg_sprite/svg_sprite_spec.rb b/spec/components/svg_sprite/svg_sprite_spec.rb
index a9614c5548..34e4d59b13 100644
--- a/spec/components/svg_sprite/svg_sprite_spec.rb
+++ b/spec/components/svg_sprite/svg_sprite_spec.rb
@@ -142,7 +142,7 @@ describe SvgSprite do
     expect(SvgSprite.all_icons([parent_theme.id])).to include("dragon")
   end
 
-  it 'includes icons defined in theme flags' do
+  it 'includes icons defined in theme modifiers' do
     theme = Fabricate(:theme)
 
     expect(SvgSprite.all_icons([theme.id])).not_to include("dragon")
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index fa81698019..593ae9d1c0 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -166,7 +166,7 @@ describe ContentSecurityPolicy do
       expect(parse(theme_policy)['worker-src']).to_not include('from-theme.com')
     end
 
-    it 'can be extended by theme flags' do
+    it 'can be extended by theme modifiers' do
       policy # call this first to make sure further actions clear the cache
 
       theme.theme_modifier_set.csp_extensions = ["script-src: https://from-theme-flag.script", "worker-src: from-theme-flag.worker"]

From ac48c4e562a5bbb3a14f10865ba43c1cbbf0b1b8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 13 Mar 2020 20:58:34 +0100
Subject: [PATCH 122/633] UX: uses mod+p instead of ctrl+p and command+p for
 printTopic (#9202)

Mousetrap 1.4 introduced a generic mod helper which lets you set cross platform shortcuts.

Mousetrap.bind('mod+p',  _print);
On Mac this ends up mapping to command+p whereas on Windows and Linux it maps to ctrl+p.

This differs from defining ctrl+p and command+p because both ctrl+p and command+p will trigger print on Mac whereas with the mod helper only command+p will.
---
 app/assets/javascripts/discourse/lib/keyboard-shortcuts.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 2a401e4fcd..4b5465b986 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -19,8 +19,7 @@ export let bindings = {
   C: { handler: "focusComposer" },
   "ctrl+f": { handler: "showPageSearch", anonymous: true },
   "command+f": { handler: "showPageSearch", anonymous: true },
-  "ctrl+p": { handler: "printTopic", anonymous: true },
-  "command+p": { handler: "printTopic", anonymous: true },
+  "mod+p": { handler: "printTopic", anonymous: true },
   d: { postAction: "deletePost" },
   e: { postAction: "editPost" },
   end: { handler: "goToLastPost", anonymous: true },

From e40e06d78c2234e694f1920bcf7618fc0f2969cc Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 13 Mar 2020 16:59:59 -0400
Subject: [PATCH 123/633] Rename `.js.es6` to `.js` in the admin application

---
 .../javascripts/admin/adapters/{api-key.js.es6 => api-key.js}  | 0
 .../admin/adapters/{build-plugin.js.es6 => build-plugin.js}    | 0
 .../{customization-base.js.es6 => customization-base.js}       | 0
 .../admin/adapters/{email-style.js.es6 => email-style.js}      | 0
 .../admin/adapters/{embedding.js.es6 => embedding.js}          | 0
 .../admin/adapters/{site-text.js.es6 => site-text.js}          | 0
 .../adapters/{staff-action-log.js.es6 => staff-action-log.js}  | 0
 .../admin/adapters/{tag-group.js.es6 => tag-group.js}          | 0
 .../javascripts/admin/adapters/{theme.js.es6 => theme.js}      | 0
 .../admin/adapters/{user-field.js.es6 => user-field.js}        | 0
 .../adapters/{web-hook-event.js.es6 => web-hook-event.js}      | 0
 .../admin/adapters/{web-hook.js.es6 => web-hook.js}            | 0
 .../admin/components/{ace-editor.js.es6 => ace-editor.js}      | 0
 .../{admin-backups-logs.js.es6 => admin-backups-logs.js}       | 0
 ...admin-directory-toggle.js.es6 => admin-directory-toggle.js} | 0
 .../{admin-editable-field.js.es6 => admin-editable-field.js}   | 0
 .../components/{admin-form-row.js.es6 => admin-form-row.js}    | 0
 .../admin/components/{admin-graph.js.es6 => admin-graph.js}    | 0
 .../admin/components/{admin-nav.js.es6 => admin-nav.js}        | 0
 .../{admin-report-chart.js.es6 => admin-report-chart.js}       | 0
 .../{admin-report-counters.js.es6 => admin-report-counters.js} | 0
 .../{admin-report-counts.js.es6 => admin-report-counts.js}     | 0
 ...report-inline-table.js.es6 => admin-report-inline-table.js} | 0
 ...rt-per-day-counts.js.es6 => admin-report-per-day-counts.js} | 0
 ...port-stacked-chart.js.es6 => admin-report-stacked-chart.js} | 0
 ...port-storage-stats.js.es6 => admin-report-storage-stats.js} | 0
 ...min-report-table-cell.js.es6 => admin-report-table-cell.js} | 0
 ...report-table-header.js.es6 => admin-report-table-header.js} | 0
 ...admin-report-table-row.js.es6 => admin-report-table-row.js} | 0
 .../{admin-report-table.js.es6 => admin-report-table.js}       | 0
 ...-level-counts.js.es6 => admin-report-trust-level-counts.js} | 0
 .../admin/components/{admin-report.js.es6 => admin-report.js}  | 0
 .../{admin-theme-editor.js.es6 => admin-theme-editor.js}       | 0
 .../{admin-user-field-item.js.es6 => admin-user-field-item.js} | 0
 .../{admin-watched-word.js.es6 => admin-watched-word.js}       | 0
 ...ok-event-chooser.js.es6 => admin-web-hook-event-chooser.js} | 0
 .../{admin-web-hook-event.js.es6 => admin-web-hook-event.js}   | 0
 .../{admin-web-hook-status.js.es6 => admin-web-hook-status.js} | 0
 .../components/{admin-wrapper.js.es6 => admin-wrapper.js}      | 0
 .../admin/components/{cancel-link.js.es6 => cancel-link.js}    | 0
 .../admin/components/{color-input.js.es6 => color-input.js}    | 0
 .../{email-styles-editor.js.es6 => email-styles-editor.js}     | 0
 .../components/{embeddable-host.js.es6 => embeddable-host.js}  | 0
 .../{embedding-setting.js.es6 => embedding-setting.js}         | 0
 .../components/{flag-user-lists.js.es6 => flag-user-lists.js}  | 0
 .../{highlighted-code.js.es6 => highlighted-code.js}           | 0
 .../{inline-edit-checkbox.js.es6 => inline-edit-checkbox.js}   | 0
 .../{install-theme-item.js.es6 => install-theme-item.js}       | 0
 .../admin/components/{ip-lookup.js.es6 => ip-lookup.js}        | 0
 ...deration-history-item.js.es6 => moderation-history-item.js} | 0
 .../{penalty-post-action.js.es6 => penalty-post-action.js}     | 0
 .../components/{permalink-form.js.es6 => permalink-form.js}    | 0
 .../components/report-filters/{category.js.es6 => category.js} | 0
 .../{file-extension.js.es6 => file-extension.js}               | 0
 .../components/report-filters/{filter.js.es6 => filter.js}     | 0
 .../admin/components/report-filters/{group.js.es6 => group.js} | 0
 .../{resumable-upload.js.es6 => resumable-upload.js}           | 0
 ...ened-ip-address-form.js.es6 => screened-ip-address-form.js} | 0
 .../{secret-value-list.js.es6 => secret-value-list.js}         | 0
 .../components/{silence-details.js.es6 => silence-details.js}  | 0
 .../admin/components/{site-setting.js.es6 => site-setting.js}  | 0
 ...s-image-uploader.js.es6 => site-settings-image-uploader.js} | 0
 .../admin/components/site-settings/{bool.js.es6 => bool.js}    | 0
 .../site-settings/{category-list.js.es6 => category-list.js}   | 0
 .../admin/components/site-settings/{color.js.es6 => color.js}  | 0
 .../site-settings/{compact-list.js.es6 => compact-list.js}     | 0
 .../site-settings/{group-list.js.es6 => group-list.js}         | 0
 .../components/site-settings/{tag-list.js.es6 => tag-list.js}  | 0
 .../{uploaded-image-list.js.es6 => uploaded-image-list.js}     | 0
 .../{site-text-summary.js.es6 => site-text-summary.js}         | 0
 .../components/{staff-actions.js.es6 => staff-actions.js}      | 0
 .../{suspension-details.js.es6 => suspension-details.js}       | 0
 .../components/{tags-uploader.js.es6 => tags-uploader.js}      | 0
 .../{theme-setting-editor.js.es6 => theme-setting-editor.js}   | 0
 ...ves-selector.js.es6 => theme-setting-relatives-selector.js} | 0
 .../{theme-translation.js.es6 => theme-translation.js}         | 0
 .../{themes-list-item.js.es6 => themes-list-item.js}           | 0
 .../admin/components/{themes-list.js.es6 => themes-list.js}    | 0
 .../admin/components/{value-list.js.es6 => value-list.js}      | 0
 .../{watched-word-form.js.es6 => watched-word-form.js}         | 0
 .../{watched-word-uploader.js.es6 => watched-word-uploader.js} | 0
 .../{admin-api-keys-index.js.es6 => admin-api-keys-index.js}   | 0
 .../{admin-api-keys-new.js.es6 => admin-api-keys-new.js}       | 0
 .../{admin-api-keys-show.js.es6 => admin-api-keys-show.js}     | 0
 .../controllers/{admin-api-keys.js.es6 => admin-api-keys.js}   | 0
 .../{admin-backups-index.js.es6 => admin-backups-index.js}     | 0
 .../{admin-backups-logs.js.es6 => admin-backups-logs.js}       | 0
 .../controllers/{admin-backups.js.es6 => admin-backups.js}     | 0
 .../{admin-badges-award.js.es6 => admin-badges-award.js}       | 0
 .../{admin-badges-show.js.es6 => admin-badges-show.js}         | 0
 .../admin/controllers/{admin-badges.js.es6 => admin-badges.js} | 0
 ...omize-colors-show.js.es6 => admin-customize-colors-show.js} | 0
 ...admin-customize-colors.js.es6 => admin-customize-colors.js} | 0
 ...l-style-edit.js.es6 => admin-customize-email-style-edit.js} | 0
 ...tes-edit.js.es6 => admin-customize-email-templates-edit.js} | 0
 ...ail-templates.js.es6 => admin-customize-email-templates.js} | 0
 ...stomize-robots-txt.js.es6 => admin-customize-robots-txt.js} | 0
 ...omize-themes-edit.js.es6 => admin-customize-themes-edit.js} | 0
 ...omize-themes-show.js.es6 => admin-customize-themes-show.js} | 0
 ...admin-customize-themes.js.es6 => admin-customize-themes.js} | 0
 ...min-dashboard-general.js.es6 => admin-dashboard-general.js} | 0
 ...shboard-moderation.js.es6 => admin-dashboard-moderation.js} | 0
 ...min-dashboard-reports.js.es6 => admin-dashboard-reports.js} | 0
 .../controllers/{admin-dashboard.js.es6 => admin-dashboard.js} | 0
 ...email-advanced-test.js.es6 => admin-email-advanced-test.js} | 0
 .../{admin-email-bounced.js.es6 => admin-email-bounced.js}     | 0
 .../{admin-email-index.js.es6 => admin-email-index.js}         | 0
 .../{admin-email-logs.js.es6 => admin-email-logs.js}           | 0
 ...ail-preview-digest.js.es6 => admin-email-preview-digest.js} | 0
 .../{admin-email-received.js.es6 => admin-email-received.js}   | 0
 .../{admin-email-rejected.js.es6 => admin-email-rejected.js}   | 0
 .../{admin-email-sent.js.es6 => admin-email-sent.js}           | 0
 .../{admin-email-skipped.js.es6 => admin-email-skipped.js}     | 0
 .../controllers/{admin-embedding.js.es6 => admin-embedding.js} | 0
 .../admin/controllers/{admin-emojis.js.es6 => admin-emojis.js} | 0
 ...gs-screened-emails.js.es6 => admin-logs-screened-emails.js} | 0
 ...ip-addresses.js.es6 => admin-logs-screened-ip-addresses.js} | 0
 ...n-logs-screened-urls.js.es6 => admin-logs-screened-urls.js} | 0
 ...taff-action-logs.js.es6 => admin-logs-staff-action-logs.js} | 0
 .../{admin-permalinks.js.es6 => admin-permalinks.js}           | 0
 .../controllers/{admin-plugins.js.es6 => admin-plugins.js}     | 0
 .../{admin-reports-show.js.es6 => admin-reports-show.js}       | 0
 ...min-search-logs-index.js.es6 => admin-search-logs-index.js} | 0
 ...admin-search-logs-term.js.es6 => admin-search-logs-term.js} | 0
 ...ettings-category.js.es6 => admin-site-settings-category.js} | 0
 .../{admin-site-settings.js.es6 => admin-site-settings.js}     | 0
 .../{admin-site-text-edit.js.es6 => admin-site-text-edit.js}   | 0
 .../{admin-site-text-index.js.es6 => admin-site-text-index.js} | 0
 .../{admin-user-badges.js.es6 => admin-user-badges.js}         | 0
 .../{admin-user-fields.js.es6 => admin-user-fields.js}         | 0
 .../{admin-user-index.js.es6 => admin-user-index.js}           | 0
 .../admin/controllers/{admin-user.js.es6 => admin-user.js}     | 0
 .../{admin-users-list-show.js.es6 => admin-users-list-show.js} | 0
 ...tched-words-action.js.es6 => admin-watched-words-action.js} | 0
 .../{admin-watched-words.js.es6 => admin-watched-words.js}     | 0
 ...hooks-show-events.js.es6 => admin-web-hooks-show-events.js} | 0
 .../{admin-web-hooks-show.js.es6 => admin-web-hooks-show.js}   | 0
 .../controllers/{admin-web-hooks.js.es6 => admin-web-hooks.js} | 0
 .../javascripts/admin/controllers/{admin.js.es6 => admin.js}   | 0
 .../modals/{admin-add-upload.js.es6 => admin-add-upload.js}    | 0
 .../{admin-badge-preview.js.es6 => admin-badge-preview.js}     | 0
 ...me-select-base.js.es6 => admin-color-scheme-select-base.js} | 0
 ...it-badge-groupings.js.es6 => admin-edit-badge-groupings.js} | 0
 .../{admin-incoming-email.js.es6 => admin-incoming-email.js}   | 0
 .../{admin-install-theme.js.es6 => admin-install-theme.js}     | 0
 .../modals/{admin-reseed.js.es6 => admin-reseed.js}            | 0
 .../{admin-silence-user.js.es6 => admin-silence-user.js}       | 0
 ...on-log-details.js.es6 => admin-staff-action-log-details.js} | 0
 .../{admin-start-backup.js.es6 => admin-start-backup.js}       | 0
 .../{admin-suspend-user.js.es6 => admin-suspend-user.js}       | 0
 .../{admin-theme-change.js.es6 => admin-theme-change.js}       | 0
 ...uploaded-image-list.js.es6 => admin-uploaded-image-list.js} | 0
 ...min-watched-word-test.js.es6 => admin-watched-word-test.js} | 0
 ...lt-categories.js.es6 => site-setting-default-categories.js} | 0
 .../admin/helpers/{check-icon.js.es6 => check-icon.js}         | 0
 .../helpers/{disposition-icon.js.es6 => disposition-icon.js}   | 0
 .../admin/helpers/{human-size.js.es6 => human-size.js}         | 0
 .../helpers/{post-action-title.js.es6 => post-action-title.js} | 0
 .../helpers/{preserve-newlines.js.es6 => preserve-newlines.js} | 0
 .../admin/helpers/{value-at-tl.js.es6 => value-at-tl.js}       | 0
 .../{penalty-controller.js.es6 => penalty-controller.js}       | 0
 .../{period-computation.js.es6 => period-computation.js}       | 0
 .../mixins/{setting-component.js.es6 => setting-component.js}  | 0
 .../admin/mixins/{setting-object.js.es6 => setting-object.js}  | 0
 .../models/{admin-dashboard.js.es6 => admin-dashboard.js}      | 0
 .../admin/models/{admin-user.js.es6 => admin-user.js}          | 0
 .../javascripts/admin/models/{api-key.js.es6 => api-key.js}    | 0
 .../admin/models/{backup-status.js.es6 => backup-status.js}    | 0
 .../javascripts/admin/models/{backup.js.es6 => backup.js}      | 0
 .../{color-scheme-color.js.es6 => color-scheme-color.js}       | 0
 .../admin/models/{color-scheme.js.es6 => color-scheme.js}      | 0
 .../admin/models/{email-log.js.es6 => email-log.js}            | 0
 .../admin/models/{email-preview.js.es6 => email-preview.js}    | 0
 .../admin/models/{email-settings.js.es6 => email-settings.js}  | 0
 .../admin/models/{email-style.js.es6 => email-style.js}        | 0
 .../admin/models/{email-template.js.es6 => email-template.js}  | 0
 .../admin/models/{flag-type.js.es6 => flag-type.js}            | 0
 .../admin/models/{incoming-email.js.es6 => incoming-email.js}  | 0
 .../admin/models/{permalink.js.es6 => permalink.js}            | 0
 .../javascripts/admin/models/{report.js.es6 => report.js}      | 0
 .../admin/models/{screened-email.js.es6 => screened-email.js}  | 0
 .../{screened-ip-address.js.es6 => screened-ip-address.js}     | 0
 .../admin/models/{screened-url.js.es6 => screened-url.js}      | 0
 .../admin/models/{site-setting.js.es6 => site-setting.js}      | 0
 .../admin/models/{site-text.js.es6 => site-text.js}            | 0
 .../models/{staff-action-log.js.es6 => staff-action-log.js}    | 0
 .../admin/models/{theme-settings.js.es6 => theme-settings.js}  | 0
 app/assets/javascripts/admin/models/{theme.js.es6 => theme.js} | 0
 .../models/{tl3-requirements.js.es6 => tl3-requirements.js}    | 0
 .../admin/models/{user-field.js.es6 => user-field.js}          | 0
 .../admin/models/{version-check.js.es6 => version-check.js}    | 0
 .../admin/models/{watched-word.js.es6 => watched-word.js}      | 0
 .../javascripts/admin/models/{web-hook.js.es6 => web-hook.js}  | 0
 .../routes/{admin-api-index.js.es6 => admin-api-index.js}      | 0
 .../{admin-api-keys-index.js.es6 => admin-api-keys-index.js}   | 0
 .../{admin-api-keys-show.js.es6 => admin-api-keys-show.js}     | 0
 .../admin/routes/{admin-api-keys.js.es6 => admin-api-keys.js}  | 0
 .../{admin-backups-index.js.es6 => admin-backups-index.js}     | 0
 .../{admin-backups-logs.js.es6 => admin-backups-logs.js}       | 0
 .../admin/routes/{admin-backups.js.es6 => admin-backups.js}    | 0
 .../{admin-badges-award.js.es6 => admin-badges-award.js}       | 0
 .../{admin-badges-index.js.es6 => admin-badges-index.js}       | 0
 .../routes/{admin-badges-show.js.es6 => admin-badges-show.js}  | 0
 .../admin/routes/{admin-badges.js.es6 => admin-badges.js}      | 0
 ...omize-colors-show.js.es6 => admin-customize-colors-show.js} | 0
 ...admin-customize-colors.js.es6 => admin-customize-colors.js} | 0
 ...l-style-edit.js.es6 => admin-customize-email-style-edit.js} | 0
 ...style-index.js.es6 => admin-customize-email-style-index.js} | 0
 ...omize-email-style.js.es6 => admin-customize-email-style.js} | 0
 ...tes-edit.js.es6 => admin-customize-email-templates-edit.js} | 0
 ...ail-templates.js.es6 => admin-customize-email-templates.js} | 0
 .../{admin-customize-index.js.es6 => admin-customize-index.js} | 0
 ...stomize-robots-txt.js.es6 => admin-customize-robots-txt.js} | 0
 ...omize-themes-edit.js.es6 => admin-customize-themes-edit.js} | 0
 ...ize-themes-index.js.es6 => admin-customize-themes-index.js} | 0
 ...omize-themes-show.js.es6 => admin-customize-themes-show.js} | 0
 ...admin-customize-themes.js.es6 => admin-customize-themes.js} | 0
 ...min-dashboard-general.js.es6 => admin-dashboard-general.js} | 0
 ...min-dashboard-reports.js.es6 => admin-dashboard-reports.js} | 0
 .../routes/{admin-dashboard.js.es6 => admin-dashboard.js}      | 0
 .../{admin-email-bounced.js.es6 => admin-email-bounced.js}     | 0
 .../{admin-email-incomings.js.es6 => admin-email-incomings.js} | 0
 .../routes/{admin-email-index.js.es6 => admin-email-index.js}  | 0
 .../routes/{admin-email-logs.js.es6 => admin-email-logs.js}    | 0
 ...ail-preview-digest.js.es6 => admin-email-preview-digest.js} | 0
 .../{admin-email-received.js.es6 => admin-email-received.js}   | 0
 .../{admin-email-rejected.js.es6 => admin-email-rejected.js}   | 0
 .../routes/{admin-email-sent.js.es6 => admin-email-sent.js}    | 0
 .../{admin-email-skipped.js.es6 => admin-email-skipped.js}     | 0
 .../routes/{admin-embedding.js.es6 => admin-embedding.js}      | 0
 .../admin/routes/{admin-emojis.js.es6 => admin-emojis.js}      | 0
 ...n-flags-posts-active.js.es6 => admin-flags-posts-active.js} | 0
 .../{admin-flags-posts-old.js.es6 => admin-flags-posts-old.js} | 0
 ...n-flags-topics-index.js.es6 => admin-flags-topics-index.js} | 0
 .../routes/{admin-logs-index.js.es6 => admin-logs-index.js}    | 0
 ...gs-screened-emails.js.es6 => admin-logs-screened-emails.js} | 0
 ...ip-addresses.js.es6 => admin-logs-screened-ip-addresses.js} | 0
 ...n-logs-screened-urls.js.es6 => admin-logs-screened-urls.js} | 0
 ...taff-action-logs.js.es6 => admin-logs-staff-action-logs.js} | 0
 .../routes/{admin-permalinks.js.es6 => admin-permalinks.js}    | 0
 .../admin/routes/{admin-plugins.js.es6 => admin-plugins.js}    | 0
 .../{admin-reports-index.js.es6 => admin-reports-index.js}     | 0
 .../{admin-reports-show.js.es6 => admin-reports-show.js}       | 0
 .../routes/{admin-route-map.js.es6 => admin-route-map.js}      | 0
 ...min-search-logs-index.js.es6 => admin-search-logs-index.js} | 0
 ...admin-search-logs-term.js.es6 => admin-search-logs-term.js} | 0
 ...ettings-category.js.es6 => admin-site-settings-category.js} | 0
 ...site-settings-index.js.es6 => admin-site-settings-index.js} | 0
 .../{admin-site-settings.js.es6 => admin-site-settings.js}     | 0
 .../{admin-site-text-edit.js.es6 => admin-site-text-edit.js}   | 0
 .../{admin-site-text-index.js.es6 => admin-site-text-index.js} | 0
 .../routes/{admin-user-badges.js.es6 => admin-user-badges.js}  | 0
 .../routes/{admin-user-fields.js.es6 => admin-user-fields.js}  | 0
 .../routes/{admin-user-index.js.es6 => admin-user-index.js}    | 0
 ...-tl3-requirements.js.es6 => admin-user-tl3-requirements.js} | 0
 .../admin/routes/{admin-user.js.es6 => admin-user.js}          | 0
 .../routes/{admin-users-index.js.es6 => admin-users-index.js}  | 0
 ...admin-users-list-index.js.es6 => admin-users-list-index.js} | 0
 .../{admin-users-list-show.js.es6 => admin-users-list-show.js} | 0
 .../routes/{admin-users-list.js.es6 => admin-users-list.js}    | 0
 ...tched-words-action.js.es6 => admin-watched-words-action.js} | 0
 ...watched-words-index.js.es6 => admin-watched-words-index.js} | 0
 .../{admin-watched-words.js.es6 => admin-watched-words.js}     | 0
 ...hooks-show-events.js.es6 => admin-web-hooks-show-events.js} | 0
 .../{admin-web-hooks-show.js.es6 => admin-web-hooks-show.js}   | 0
 .../routes/{admin-web-hooks.js.es6 => admin-web-hooks.js}      | 0
 app/assets/javascripts/admin/routes/{admin.js.es6 => admin.js} | 0
 .../admin/services/{admin-tools.js.es6 => admin-tools.js}      | 0
 lib/discourse_js_processor.rb                                  | 3 ++-
 269 files changed, 2 insertions(+), 1 deletion(-)
 rename app/assets/javascripts/admin/adapters/{api-key.js.es6 => api-key.js} (100%)
 rename app/assets/javascripts/admin/adapters/{build-plugin.js.es6 => build-plugin.js} (100%)
 rename app/assets/javascripts/admin/adapters/{customization-base.js.es6 => customization-base.js} (100%)
 rename app/assets/javascripts/admin/adapters/{email-style.js.es6 => email-style.js} (100%)
 rename app/assets/javascripts/admin/adapters/{embedding.js.es6 => embedding.js} (100%)
 rename app/assets/javascripts/admin/adapters/{site-text.js.es6 => site-text.js} (100%)
 rename app/assets/javascripts/admin/adapters/{staff-action-log.js.es6 => staff-action-log.js} (100%)
 rename app/assets/javascripts/admin/adapters/{tag-group.js.es6 => tag-group.js} (100%)
 rename app/assets/javascripts/admin/adapters/{theme.js.es6 => theme.js} (100%)
 rename app/assets/javascripts/admin/adapters/{user-field.js.es6 => user-field.js} (100%)
 rename app/assets/javascripts/admin/adapters/{web-hook-event.js.es6 => web-hook-event.js} (100%)
 rename app/assets/javascripts/admin/adapters/{web-hook.js.es6 => web-hook.js} (100%)
 rename app/assets/javascripts/admin/components/{ace-editor.js.es6 => ace-editor.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-backups-logs.js.es6 => admin-backups-logs.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-directory-toggle.js.es6 => admin-directory-toggle.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-editable-field.js.es6 => admin-editable-field.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-form-row.js.es6 => admin-form-row.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-graph.js.es6 => admin-graph.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-nav.js.es6 => admin-nav.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-chart.js.es6 => admin-report-chart.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-counters.js.es6 => admin-report-counters.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-counts.js.es6 => admin-report-counts.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-inline-table.js.es6 => admin-report-inline-table.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-per-day-counts.js.es6 => admin-report-per-day-counts.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-stacked-chart.js.es6 => admin-report-stacked-chart.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-storage-stats.js.es6 => admin-report-storage-stats.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-table-cell.js.es6 => admin-report-table-cell.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-table-header.js.es6 => admin-report-table-header.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-table-row.js.es6 => admin-report-table-row.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-table.js.es6 => admin-report-table.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-trust-level-counts.js.es6 => admin-report-trust-level-counts.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report.js.es6 => admin-report.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-theme-editor.js.es6 => admin-theme-editor.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-user-field-item.js.es6 => admin-user-field-item.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-watched-word.js.es6 => admin-watched-word.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-web-hook-event-chooser.js.es6 => admin-web-hook-event-chooser.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-web-hook-event.js.es6 => admin-web-hook-event.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-web-hook-status.js.es6 => admin-web-hook-status.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-wrapper.js.es6 => admin-wrapper.js} (100%)
 rename app/assets/javascripts/admin/components/{cancel-link.js.es6 => cancel-link.js} (100%)
 rename app/assets/javascripts/admin/components/{color-input.js.es6 => color-input.js} (100%)
 rename app/assets/javascripts/admin/components/{email-styles-editor.js.es6 => email-styles-editor.js} (100%)
 rename app/assets/javascripts/admin/components/{embeddable-host.js.es6 => embeddable-host.js} (100%)
 rename app/assets/javascripts/admin/components/{embedding-setting.js.es6 => embedding-setting.js} (100%)
 rename app/assets/javascripts/admin/components/{flag-user-lists.js.es6 => flag-user-lists.js} (100%)
 rename app/assets/javascripts/admin/components/{highlighted-code.js.es6 => highlighted-code.js} (100%)
 rename app/assets/javascripts/admin/components/{inline-edit-checkbox.js.es6 => inline-edit-checkbox.js} (100%)
 rename app/assets/javascripts/admin/components/{install-theme-item.js.es6 => install-theme-item.js} (100%)
 rename app/assets/javascripts/admin/components/{ip-lookup.js.es6 => ip-lookup.js} (100%)
 rename app/assets/javascripts/admin/components/{moderation-history-item.js.es6 => moderation-history-item.js} (100%)
 rename app/assets/javascripts/admin/components/{penalty-post-action.js.es6 => penalty-post-action.js} (100%)
 rename app/assets/javascripts/admin/components/{permalink-form.js.es6 => permalink-form.js} (100%)
 rename app/assets/javascripts/admin/components/report-filters/{category.js.es6 => category.js} (100%)
 rename app/assets/javascripts/admin/components/report-filters/{file-extension.js.es6 => file-extension.js} (100%)
 rename app/assets/javascripts/admin/components/report-filters/{filter.js.es6 => filter.js} (100%)
 rename app/assets/javascripts/admin/components/report-filters/{group.js.es6 => group.js} (100%)
 rename app/assets/javascripts/admin/components/{resumable-upload.js.es6 => resumable-upload.js} (100%)
 rename app/assets/javascripts/admin/components/{screened-ip-address-form.js.es6 => screened-ip-address-form.js} (100%)
 rename app/assets/javascripts/admin/components/{secret-value-list.js.es6 => secret-value-list.js} (100%)
 rename app/assets/javascripts/admin/components/{silence-details.js.es6 => silence-details.js} (100%)
 rename app/assets/javascripts/admin/components/{site-setting.js.es6 => site-setting.js} (100%)
 rename app/assets/javascripts/admin/components/{site-settings-image-uploader.js.es6 => site-settings-image-uploader.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{bool.js.es6 => bool.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{category-list.js.es6 => category-list.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{color.js.es6 => color.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{compact-list.js.es6 => compact-list.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{group-list.js.es6 => group-list.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{tag-list.js.es6 => tag-list.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{uploaded-image-list.js.es6 => uploaded-image-list.js} (100%)
 rename app/assets/javascripts/admin/components/{site-text-summary.js.es6 => site-text-summary.js} (100%)
 rename app/assets/javascripts/admin/components/{staff-actions.js.es6 => staff-actions.js} (100%)
 rename app/assets/javascripts/admin/components/{suspension-details.js.es6 => suspension-details.js} (100%)
 rename app/assets/javascripts/admin/components/{tags-uploader.js.es6 => tags-uploader.js} (100%)
 rename app/assets/javascripts/admin/components/{theme-setting-editor.js.es6 => theme-setting-editor.js} (100%)
 rename app/assets/javascripts/admin/components/{theme-setting-relatives-selector.js.es6 => theme-setting-relatives-selector.js} (100%)
 rename app/assets/javascripts/admin/components/{theme-translation.js.es6 => theme-translation.js} (100%)
 rename app/assets/javascripts/admin/components/{themes-list-item.js.es6 => themes-list-item.js} (100%)
 rename app/assets/javascripts/admin/components/{themes-list.js.es6 => themes-list.js} (100%)
 rename app/assets/javascripts/admin/components/{value-list.js.es6 => value-list.js} (100%)
 rename app/assets/javascripts/admin/components/{watched-word-form.js.es6 => watched-word-form.js} (100%)
 rename app/assets/javascripts/admin/components/{watched-word-uploader.js.es6 => watched-word-uploader.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-api-keys-index.js.es6 => admin-api-keys-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-api-keys-new.js.es6 => admin-api-keys-new.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-api-keys-show.js.es6 => admin-api-keys-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-api-keys.js.es6 => admin-api-keys.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-backups-index.js.es6 => admin-backups-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-backups-logs.js.es6 => admin-backups-logs.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-backups.js.es6 => admin-backups.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-badges-award.js.es6 => admin-badges-award.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-badges-show.js.es6 => admin-badges-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-badges.js.es6 => admin-badges.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-colors-show.js.es6 => admin-customize-colors-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-colors.js.es6 => admin-customize-colors.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-email-style-edit.js.es6 => admin-customize-email-style-edit.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-email-templates-edit.js.es6 => admin-customize-email-templates-edit.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-email-templates.js.es6 => admin-customize-email-templates.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-robots-txt.js.es6 => admin-customize-robots-txt.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-themes-edit.js.es6 => admin-customize-themes-edit.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-themes-show.js.es6 => admin-customize-themes-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-themes.js.es6 => admin-customize-themes.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-dashboard-general.js.es6 => admin-dashboard-general.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-dashboard-moderation.js.es6 => admin-dashboard-moderation.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-dashboard-reports.js.es6 => admin-dashboard-reports.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-dashboard.js.es6 => admin-dashboard.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-advanced-test.js.es6 => admin-email-advanced-test.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-bounced.js.es6 => admin-email-bounced.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-index.js.es6 => admin-email-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-logs.js.es6 => admin-email-logs.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-preview-digest.js.es6 => admin-email-preview-digest.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-received.js.es6 => admin-email-received.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-rejected.js.es6 => admin-email-rejected.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-sent.js.es6 => admin-email-sent.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-skipped.js.es6 => admin-email-skipped.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-embedding.js.es6 => admin-embedding.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-emojis.js.es6 => admin-emojis.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-logs-screened-emails.js.es6 => admin-logs-screened-emails.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-logs-screened-ip-addresses.js.es6 => admin-logs-screened-ip-addresses.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-logs-screened-urls.js.es6 => admin-logs-screened-urls.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-logs-staff-action-logs.js.es6 => admin-logs-staff-action-logs.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-permalinks.js.es6 => admin-permalinks.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-plugins.js.es6 => admin-plugins.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-reports-show.js.es6 => admin-reports-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-search-logs-index.js.es6 => admin-search-logs-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-search-logs-term.js.es6 => admin-search-logs-term.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-site-settings-category.js.es6 => admin-site-settings-category.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-site-settings.js.es6 => admin-site-settings.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-site-text-edit.js.es6 => admin-site-text-edit.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-site-text-index.js.es6 => admin-site-text-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-user-badges.js.es6 => admin-user-badges.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-user-fields.js.es6 => admin-user-fields.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-user-index.js.es6 => admin-user-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-user.js.es6 => admin-user.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-users-list-show.js.es6 => admin-users-list-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-watched-words-action.js.es6 => admin-watched-words-action.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-watched-words.js.es6 => admin-watched-words.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-web-hooks-show-events.js.es6 => admin-web-hooks-show-events.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-web-hooks-show.js.es6 => admin-web-hooks-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-web-hooks.js.es6 => admin-web-hooks.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin.js.es6 => admin.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-add-upload.js.es6 => admin-add-upload.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-badge-preview.js.es6 => admin-badge-preview.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-color-scheme-select-base.js.es6 => admin-color-scheme-select-base.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-edit-badge-groupings.js.es6 => admin-edit-badge-groupings.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-incoming-email.js.es6 => admin-incoming-email.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-install-theme.js.es6 => admin-install-theme.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-reseed.js.es6 => admin-reseed.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-silence-user.js.es6 => admin-silence-user.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-staff-action-log-details.js.es6 => admin-staff-action-log-details.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-start-backup.js.es6 => admin-start-backup.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-suspend-user.js.es6 => admin-suspend-user.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-theme-change.js.es6 => admin-theme-change.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-uploaded-image-list.js.es6 => admin-uploaded-image-list.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-watched-word-test.js.es6 => admin-watched-word-test.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{site-setting-default-categories.js.es6 => site-setting-default-categories.js} (100%)
 rename app/assets/javascripts/admin/helpers/{check-icon.js.es6 => check-icon.js} (100%)
 rename app/assets/javascripts/admin/helpers/{disposition-icon.js.es6 => disposition-icon.js} (100%)
 rename app/assets/javascripts/admin/helpers/{human-size.js.es6 => human-size.js} (100%)
 rename app/assets/javascripts/admin/helpers/{post-action-title.js.es6 => post-action-title.js} (100%)
 rename app/assets/javascripts/admin/helpers/{preserve-newlines.js.es6 => preserve-newlines.js} (100%)
 rename app/assets/javascripts/admin/helpers/{value-at-tl.js.es6 => value-at-tl.js} (100%)
 rename app/assets/javascripts/admin/mixins/{penalty-controller.js.es6 => penalty-controller.js} (100%)
 rename app/assets/javascripts/admin/mixins/{period-computation.js.es6 => period-computation.js} (100%)
 rename app/assets/javascripts/admin/mixins/{setting-component.js.es6 => setting-component.js} (100%)
 rename app/assets/javascripts/admin/mixins/{setting-object.js.es6 => setting-object.js} (100%)
 rename app/assets/javascripts/admin/models/{admin-dashboard.js.es6 => admin-dashboard.js} (100%)
 rename app/assets/javascripts/admin/models/{admin-user.js.es6 => admin-user.js} (100%)
 rename app/assets/javascripts/admin/models/{api-key.js.es6 => api-key.js} (100%)
 rename app/assets/javascripts/admin/models/{backup-status.js.es6 => backup-status.js} (100%)
 rename app/assets/javascripts/admin/models/{backup.js.es6 => backup.js} (100%)
 rename app/assets/javascripts/admin/models/{color-scheme-color.js.es6 => color-scheme-color.js} (100%)
 rename app/assets/javascripts/admin/models/{color-scheme.js.es6 => color-scheme.js} (100%)
 rename app/assets/javascripts/admin/models/{email-log.js.es6 => email-log.js} (100%)
 rename app/assets/javascripts/admin/models/{email-preview.js.es6 => email-preview.js} (100%)
 rename app/assets/javascripts/admin/models/{email-settings.js.es6 => email-settings.js} (100%)
 rename app/assets/javascripts/admin/models/{email-style.js.es6 => email-style.js} (100%)
 rename app/assets/javascripts/admin/models/{email-template.js.es6 => email-template.js} (100%)
 rename app/assets/javascripts/admin/models/{flag-type.js.es6 => flag-type.js} (100%)
 rename app/assets/javascripts/admin/models/{incoming-email.js.es6 => incoming-email.js} (100%)
 rename app/assets/javascripts/admin/models/{permalink.js.es6 => permalink.js} (100%)
 rename app/assets/javascripts/admin/models/{report.js.es6 => report.js} (100%)
 rename app/assets/javascripts/admin/models/{screened-email.js.es6 => screened-email.js} (100%)
 rename app/assets/javascripts/admin/models/{screened-ip-address.js.es6 => screened-ip-address.js} (100%)
 rename app/assets/javascripts/admin/models/{screened-url.js.es6 => screened-url.js} (100%)
 rename app/assets/javascripts/admin/models/{site-setting.js.es6 => site-setting.js} (100%)
 rename app/assets/javascripts/admin/models/{site-text.js.es6 => site-text.js} (100%)
 rename app/assets/javascripts/admin/models/{staff-action-log.js.es6 => staff-action-log.js} (100%)
 rename app/assets/javascripts/admin/models/{theme-settings.js.es6 => theme-settings.js} (100%)
 rename app/assets/javascripts/admin/models/{theme.js.es6 => theme.js} (100%)
 rename app/assets/javascripts/admin/models/{tl3-requirements.js.es6 => tl3-requirements.js} (100%)
 rename app/assets/javascripts/admin/models/{user-field.js.es6 => user-field.js} (100%)
 rename app/assets/javascripts/admin/models/{version-check.js.es6 => version-check.js} (100%)
 rename app/assets/javascripts/admin/models/{watched-word.js.es6 => watched-word.js} (100%)
 rename app/assets/javascripts/admin/models/{web-hook.js.es6 => web-hook.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-api-index.js.es6 => admin-api-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-api-keys-index.js.es6 => admin-api-keys-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-api-keys-show.js.es6 => admin-api-keys-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-api-keys.js.es6 => admin-api-keys.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-backups-index.js.es6 => admin-backups-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-backups-logs.js.es6 => admin-backups-logs.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-backups.js.es6 => admin-backups.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-badges-award.js.es6 => admin-badges-award.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-badges-index.js.es6 => admin-badges-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-badges-show.js.es6 => admin-badges-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-badges.js.es6 => admin-badges.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-colors-show.js.es6 => admin-customize-colors-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-colors.js.es6 => admin-customize-colors.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-email-style-edit.js.es6 => admin-customize-email-style-edit.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-email-style-index.js.es6 => admin-customize-email-style-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-email-style.js.es6 => admin-customize-email-style.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-email-templates-edit.js.es6 => admin-customize-email-templates-edit.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-email-templates.js.es6 => admin-customize-email-templates.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-index.js.es6 => admin-customize-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-robots-txt.js.es6 => admin-customize-robots-txt.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-themes-edit.js.es6 => admin-customize-themes-edit.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-themes-index.js.es6 => admin-customize-themes-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-themes-show.js.es6 => admin-customize-themes-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-themes.js.es6 => admin-customize-themes.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-dashboard-general.js.es6 => admin-dashboard-general.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-dashboard-reports.js.es6 => admin-dashboard-reports.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-dashboard.js.es6 => admin-dashboard.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-bounced.js.es6 => admin-email-bounced.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-incomings.js.es6 => admin-email-incomings.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-index.js.es6 => admin-email-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-logs.js.es6 => admin-email-logs.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-preview-digest.js.es6 => admin-email-preview-digest.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-received.js.es6 => admin-email-received.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-rejected.js.es6 => admin-email-rejected.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-sent.js.es6 => admin-email-sent.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-skipped.js.es6 => admin-email-skipped.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-embedding.js.es6 => admin-embedding.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-emojis.js.es6 => admin-emojis.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-flags-posts-active.js.es6 => admin-flags-posts-active.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-flags-posts-old.js.es6 => admin-flags-posts-old.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-flags-topics-index.js.es6 => admin-flags-topics-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-logs-index.js.es6 => admin-logs-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-logs-screened-emails.js.es6 => admin-logs-screened-emails.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-logs-screened-ip-addresses.js.es6 => admin-logs-screened-ip-addresses.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-logs-screened-urls.js.es6 => admin-logs-screened-urls.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-logs-staff-action-logs.js.es6 => admin-logs-staff-action-logs.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-permalinks.js.es6 => admin-permalinks.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-plugins.js.es6 => admin-plugins.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-reports-index.js.es6 => admin-reports-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-reports-show.js.es6 => admin-reports-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-route-map.js.es6 => admin-route-map.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-search-logs-index.js.es6 => admin-search-logs-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-search-logs-term.js.es6 => admin-search-logs-term.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-site-settings-category.js.es6 => admin-site-settings-category.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-site-settings-index.js.es6 => admin-site-settings-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-site-settings.js.es6 => admin-site-settings.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-site-text-edit.js.es6 => admin-site-text-edit.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-site-text-index.js.es6 => admin-site-text-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-user-badges.js.es6 => admin-user-badges.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-user-fields.js.es6 => admin-user-fields.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-user-index.js.es6 => admin-user-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-user-tl3-requirements.js.es6 => admin-user-tl3-requirements.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-user.js.es6 => admin-user.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-users-index.js.es6 => admin-users-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-users-list-index.js.es6 => admin-users-list-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-users-list-show.js.es6 => admin-users-list-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-users-list.js.es6 => admin-users-list.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-watched-words-action.js.es6 => admin-watched-words-action.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-watched-words-index.js.es6 => admin-watched-words-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-watched-words.js.es6 => admin-watched-words.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-web-hooks-show-events.js.es6 => admin-web-hooks-show-events.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-web-hooks-show.js.es6 => admin-web-hooks-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-web-hooks.js.es6 => admin-web-hooks.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin.js.es6 => admin.js} (100%)
 rename app/assets/javascripts/admin/services/{admin-tools.js.es6 => admin-tools.js} (100%)

diff --git a/app/assets/javascripts/admin/adapters/api-key.js.es6 b/app/assets/javascripts/admin/adapters/api-key.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/api-key.js.es6
rename to app/assets/javascripts/admin/adapters/api-key.js
diff --git a/app/assets/javascripts/admin/adapters/build-plugin.js.es6 b/app/assets/javascripts/admin/adapters/build-plugin.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/build-plugin.js.es6
rename to app/assets/javascripts/admin/adapters/build-plugin.js
diff --git a/app/assets/javascripts/admin/adapters/customization-base.js.es6 b/app/assets/javascripts/admin/adapters/customization-base.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/customization-base.js.es6
rename to app/assets/javascripts/admin/adapters/customization-base.js
diff --git a/app/assets/javascripts/admin/adapters/email-style.js.es6 b/app/assets/javascripts/admin/adapters/email-style.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/email-style.js.es6
rename to app/assets/javascripts/admin/adapters/email-style.js
diff --git a/app/assets/javascripts/admin/adapters/embedding.js.es6 b/app/assets/javascripts/admin/adapters/embedding.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/embedding.js.es6
rename to app/assets/javascripts/admin/adapters/embedding.js
diff --git a/app/assets/javascripts/admin/adapters/site-text.js.es6 b/app/assets/javascripts/admin/adapters/site-text.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/site-text.js.es6
rename to app/assets/javascripts/admin/adapters/site-text.js
diff --git a/app/assets/javascripts/admin/adapters/staff-action-log.js.es6 b/app/assets/javascripts/admin/adapters/staff-action-log.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/staff-action-log.js.es6
rename to app/assets/javascripts/admin/adapters/staff-action-log.js
diff --git a/app/assets/javascripts/admin/adapters/tag-group.js.es6 b/app/assets/javascripts/admin/adapters/tag-group.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/tag-group.js.es6
rename to app/assets/javascripts/admin/adapters/tag-group.js
diff --git a/app/assets/javascripts/admin/adapters/theme.js.es6 b/app/assets/javascripts/admin/adapters/theme.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/theme.js.es6
rename to app/assets/javascripts/admin/adapters/theme.js
diff --git a/app/assets/javascripts/admin/adapters/user-field.js.es6 b/app/assets/javascripts/admin/adapters/user-field.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/user-field.js.es6
rename to app/assets/javascripts/admin/adapters/user-field.js
diff --git a/app/assets/javascripts/admin/adapters/web-hook-event.js.es6 b/app/assets/javascripts/admin/adapters/web-hook-event.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/web-hook-event.js.es6
rename to app/assets/javascripts/admin/adapters/web-hook-event.js
diff --git a/app/assets/javascripts/admin/adapters/web-hook.js.es6 b/app/assets/javascripts/admin/adapters/web-hook.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/web-hook.js.es6
rename to app/assets/javascripts/admin/adapters/web-hook.js
diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/ace-editor.js.es6
rename to app/assets/javascripts/admin/components/ace-editor.js
diff --git a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/components/admin-backups-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-backups-logs.js.es6
rename to app/assets/javascripts/admin/components/admin-backups-logs.js
diff --git a/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6 b/app/assets/javascripts/admin/components/admin-directory-toggle.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
rename to app/assets/javascripts/admin/components/admin-directory-toggle.js
diff --git a/app/assets/javascripts/admin/components/admin-editable-field.js.es6 b/app/assets/javascripts/admin/components/admin-editable-field.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-editable-field.js.es6
rename to app/assets/javascripts/admin/components/admin-editable-field.js
diff --git a/app/assets/javascripts/admin/components/admin-form-row.js.es6 b/app/assets/javascripts/admin/components/admin-form-row.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-form-row.js.es6
rename to app/assets/javascripts/admin/components/admin-form-row.js
diff --git a/app/assets/javascripts/admin/components/admin-graph.js.es6 b/app/assets/javascripts/admin/components/admin-graph.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-graph.js.es6
rename to app/assets/javascripts/admin/components/admin-graph.js
diff --git a/app/assets/javascripts/admin/components/admin-nav.js.es6 b/app/assets/javascripts/admin/components/admin-nav.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-nav.js.es6
rename to app/assets/javascripts/admin/components/admin-nav.js
diff --git a/app/assets/javascripts/admin/components/admin-report-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-chart.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-chart.js.es6
rename to app/assets/javascripts/admin/components/admin-report-chart.js
diff --git a/app/assets/javascripts/admin/components/admin-report-counters.js.es6 b/app/assets/javascripts/admin/components/admin-report-counters.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-counters.js.es6
rename to app/assets/javascripts/admin/components/admin-report-counters.js
diff --git a/app/assets/javascripts/admin/components/admin-report-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-counts.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-counts.js.es6
rename to app/assets/javascripts/admin/components/admin-report-counts.js
diff --git a/app/assets/javascripts/admin/components/admin-report-inline-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-inline-table.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-inline-table.js.es6
rename to app/assets/javascripts/admin/components/admin-report-inline-table.js
diff --git a/app/assets/javascripts/admin/components/admin-report-per-day-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-per-day-counts.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-per-day-counts.js.es6
rename to app/assets/javascripts/admin/components/admin-report-per-day-counts.js
diff --git a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
rename to app/assets/javascripts/admin/components/admin-report-stacked-chart.js
diff --git a/app/assets/javascripts/admin/components/admin-report-storage-stats.js.es6 b/app/assets/javascripts/admin/components/admin-report-storage-stats.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-storage-stats.js.es6
rename to app/assets/javascripts/admin/components/admin-report-storage-stats.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table-cell.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-cell.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table-cell.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table-cell.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table-header.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-header.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table-header.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table-header.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table-row.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-row.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table-row.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table-row.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-table.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table.js
diff --git a/app/assets/javascripts/admin/components/admin-report-trust-level-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-trust-level-counts.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-trust-level-counts.js.es6
rename to app/assets/javascripts/admin/components/admin-report-trust-level-counts.js
diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report.js.es6
rename to app/assets/javascripts/admin/components/admin-report.js
diff --git a/app/assets/javascripts/admin/components/admin-theme-editor.js.es6 b/app/assets/javascripts/admin/components/admin-theme-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-theme-editor.js.es6
rename to app/assets/javascripts/admin/components/admin-theme-editor.js
diff --git a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 b/app/assets/javascripts/admin/components/admin-user-field-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-user-field-item.js.es6
rename to app/assets/javascripts/admin/components/admin-user-field-item.js
diff --git a/app/assets/javascripts/admin/components/admin-watched-word.js.es6 b/app/assets/javascripts/admin/components/admin-watched-word.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-watched-word.js.es6
rename to app/assets/javascripts/admin/components/admin-watched-word.js
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6
rename to app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-event.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-web-hook-event.js.es6
rename to app/assets/javascripts/admin/components/admin-web-hook-event.js
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-status.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
rename to app/assets/javascripts/admin/components/admin-web-hook-status.js
diff --git a/app/assets/javascripts/admin/components/admin-wrapper.js.es6 b/app/assets/javascripts/admin/components/admin-wrapper.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-wrapper.js.es6
rename to app/assets/javascripts/admin/components/admin-wrapper.js
diff --git a/app/assets/javascripts/admin/components/cancel-link.js.es6 b/app/assets/javascripts/admin/components/cancel-link.js
similarity index 100%
rename from app/assets/javascripts/admin/components/cancel-link.js.es6
rename to app/assets/javascripts/admin/components/cancel-link.js
diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js
similarity index 100%
rename from app/assets/javascripts/admin/components/color-input.js.es6
rename to app/assets/javascripts/admin/components/color-input.js
diff --git a/app/assets/javascripts/admin/components/email-styles-editor.js.es6 b/app/assets/javascripts/admin/components/email-styles-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/email-styles-editor.js.es6
rename to app/assets/javascripts/admin/components/email-styles-editor.js
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js
similarity index 100%
rename from app/assets/javascripts/admin/components/embeddable-host.js.es6
rename to app/assets/javascripts/admin/components/embeddable-host.js
diff --git a/app/assets/javascripts/admin/components/embedding-setting.js.es6 b/app/assets/javascripts/admin/components/embedding-setting.js
similarity index 100%
rename from app/assets/javascripts/admin/components/embedding-setting.js.es6
rename to app/assets/javascripts/admin/components/embedding-setting.js
diff --git a/app/assets/javascripts/admin/components/flag-user-lists.js.es6 b/app/assets/javascripts/admin/components/flag-user-lists.js
similarity index 100%
rename from app/assets/javascripts/admin/components/flag-user-lists.js.es6
rename to app/assets/javascripts/admin/components/flag-user-lists.js
diff --git a/app/assets/javascripts/admin/components/highlighted-code.js.es6 b/app/assets/javascripts/admin/components/highlighted-code.js
similarity index 100%
rename from app/assets/javascripts/admin/components/highlighted-code.js.es6
rename to app/assets/javascripts/admin/components/highlighted-code.js
diff --git a/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6 b/app/assets/javascripts/admin/components/inline-edit-checkbox.js
similarity index 100%
rename from app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
rename to app/assets/javascripts/admin/components/inline-edit-checkbox.js
diff --git a/app/assets/javascripts/admin/components/install-theme-item.js.es6 b/app/assets/javascripts/admin/components/install-theme-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/install-theme-item.js.es6
rename to app/assets/javascripts/admin/components/install-theme-item.js
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js
similarity index 100%
rename from app/assets/javascripts/admin/components/ip-lookup.js.es6
rename to app/assets/javascripts/admin/components/ip-lookup.js
diff --git a/app/assets/javascripts/admin/components/moderation-history-item.js.es6 b/app/assets/javascripts/admin/components/moderation-history-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/moderation-history-item.js.es6
rename to app/assets/javascripts/admin/components/moderation-history-item.js
diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js
similarity index 100%
rename from app/assets/javascripts/admin/components/penalty-post-action.js.es6
rename to app/assets/javascripts/admin/components/penalty-post-action.js
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js
similarity index 100%
rename from app/assets/javascripts/admin/components/permalink-form.js.es6
rename to app/assets/javascripts/admin/components/permalink-form.js
diff --git a/app/assets/javascripts/admin/components/report-filters/category.js.es6 b/app/assets/javascripts/admin/components/report-filters/category.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/category.js.es6
rename to app/assets/javascripts/admin/components/report-filters/category.js
diff --git a/app/assets/javascripts/admin/components/report-filters/file-extension.js.es6 b/app/assets/javascripts/admin/components/report-filters/file-extension.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/file-extension.js.es6
rename to app/assets/javascripts/admin/components/report-filters/file-extension.js
diff --git a/app/assets/javascripts/admin/components/report-filters/filter.js.es6 b/app/assets/javascripts/admin/components/report-filters/filter.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/filter.js.es6
rename to app/assets/javascripts/admin/components/report-filters/filter.js
diff --git a/app/assets/javascripts/admin/components/report-filters/group.js.es6 b/app/assets/javascripts/admin/components/report-filters/group.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/group.js.es6
rename to app/assets/javascripts/admin/components/report-filters/group.js
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js
similarity index 100%
rename from app/assets/javascripts/admin/components/resumable-upload.js.es6
rename to app/assets/javascripts/admin/components/resumable-upload.js
diff --git a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6 b/app/assets/javascripts/admin/components/screened-ip-address-form.js
similarity index 100%
rename from app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
rename to app/assets/javascripts/admin/components/screened-ip-address-form.js
diff --git a/app/assets/javascripts/admin/components/secret-value-list.js.es6 b/app/assets/javascripts/admin/components/secret-value-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/secret-value-list.js.es6
rename to app/assets/javascripts/admin/components/secret-value-list.js
diff --git a/app/assets/javascripts/admin/components/silence-details.js.es6 b/app/assets/javascripts/admin/components/silence-details.js
similarity index 100%
rename from app/assets/javascripts/admin/components/silence-details.js.es6
rename to app/assets/javascripts/admin/components/silence-details.js
diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-setting.js.es6
rename to app/assets/javascripts/admin/components/site-setting.js
diff --git a/app/assets/javascripts/admin/components/site-settings-image-uploader.js.es6 b/app/assets/javascripts/admin/components/site-settings-image-uploader.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings-image-uploader.js.es6
rename to app/assets/javascripts/admin/components/site-settings-image-uploader.js
diff --git a/app/assets/javascripts/admin/components/site-settings/bool.js.es6 b/app/assets/javascripts/admin/components/site-settings/bool.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/bool.js.es6
rename to app/assets/javascripts/admin/components/site-settings/bool.js
diff --git a/app/assets/javascripts/admin/components/site-settings/category-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/category-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/category-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/category-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/color.js.es6 b/app/assets/javascripts/admin/components/site-settings/color.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/color.js.es6
rename to app/assets/javascripts/admin/components/site-settings/color.js
diff --git a/app/assets/javascripts/admin/components/site-settings/compact-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/compact-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/compact-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/compact-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/group-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/group-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/group-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/group-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/tag-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/tag-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/tag-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/tag-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js
diff --git a/app/assets/javascripts/admin/components/site-text-summary.js.es6 b/app/assets/javascripts/admin/components/site-text-summary.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-text-summary.js.es6
rename to app/assets/javascripts/admin/components/site-text-summary.js
diff --git a/app/assets/javascripts/admin/components/staff-actions.js.es6 b/app/assets/javascripts/admin/components/staff-actions.js
similarity index 100%
rename from app/assets/javascripts/admin/components/staff-actions.js.es6
rename to app/assets/javascripts/admin/components/staff-actions.js
diff --git a/app/assets/javascripts/admin/components/suspension-details.js.es6 b/app/assets/javascripts/admin/components/suspension-details.js
similarity index 100%
rename from app/assets/javascripts/admin/components/suspension-details.js.es6
rename to app/assets/javascripts/admin/components/suspension-details.js
diff --git a/app/assets/javascripts/admin/components/tags-uploader.js.es6 b/app/assets/javascripts/admin/components/tags-uploader.js
similarity index 100%
rename from app/assets/javascripts/admin/components/tags-uploader.js.es6
rename to app/assets/javascripts/admin/components/tags-uploader.js
diff --git a/app/assets/javascripts/admin/components/theme-setting-editor.js.es6 b/app/assets/javascripts/admin/components/theme-setting-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/theme-setting-editor.js.es6
rename to app/assets/javascripts/admin/components/theme-setting-editor.js
diff --git a/app/assets/javascripts/admin/components/theme-setting-relatives-selector.js.es6 b/app/assets/javascripts/admin/components/theme-setting-relatives-selector.js
similarity index 100%
rename from app/assets/javascripts/admin/components/theme-setting-relatives-selector.js.es6
rename to app/assets/javascripts/admin/components/theme-setting-relatives-selector.js
diff --git a/app/assets/javascripts/admin/components/theme-translation.js.es6 b/app/assets/javascripts/admin/components/theme-translation.js
similarity index 100%
rename from app/assets/javascripts/admin/components/theme-translation.js.es6
rename to app/assets/javascripts/admin/components/theme-translation.js
diff --git a/app/assets/javascripts/admin/components/themes-list-item.js.es6 b/app/assets/javascripts/admin/components/themes-list-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/themes-list-item.js.es6
rename to app/assets/javascripts/admin/components/themes-list-item.js
diff --git a/app/assets/javascripts/admin/components/themes-list.js.es6 b/app/assets/javascripts/admin/components/themes-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/themes-list.js.es6
rename to app/assets/javascripts/admin/components/themes-list.js
diff --git a/app/assets/javascripts/admin/components/value-list.js.es6 b/app/assets/javascripts/admin/components/value-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/value-list.js.es6
rename to app/assets/javascripts/admin/components/value-list.js
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js
similarity index 100%
rename from app/assets/javascripts/admin/components/watched-word-form.js.es6
rename to app/assets/javascripts/admin/components/watched-word-form.js
diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6 b/app/assets/javascripts/admin/components/watched-word-uploader.js
similarity index 100%
rename from app/assets/javascripts/admin/components/watched-word-uploader.js.es6
rename to app/assets/javascripts/admin/components/watched-word-uploader.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys-new.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys.js
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-backups-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
rename to app/assets/javascripts/admin/controllers/admin-backups-logs.js
diff --git a/app/assets/javascripts/admin/controllers/admin-backups.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-backups.js.es6
rename to app/assets/javascripts/admin/controllers/admin-backups.js
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-award.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-award.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-badges-award.js.es6
rename to app/assets/javascripts/admin/controllers/admin-badges-award.js
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-badges-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-badges.js.es6
rename to app/assets/javascripts/admin/controllers/admin-badges.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-colors-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-colors.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-email-templates.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-themes.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard-general.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard-reports.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-advanced-test.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-advanced-test.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-advanced-test.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-advanced-test.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-bounced.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-bounced.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-logs.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-preview-digest.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-received.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-received.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-received.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-received.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-rejected.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-rejected.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-sent.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-sent.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-skipped.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-skipped.js
diff --git a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6 b/app/assets/javascripts/admin/controllers/admin-embedding.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-embedding.js.es6
rename to app/assets/javascripts/admin/controllers/admin-embedding.js
diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 b/app/assets/javascripts/admin/controllers/admin-emojis.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-emojis.js.es6
rename to app/assets/javascripts/admin/controllers/admin-emojis.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 b/app/assets/javascripts/admin/controllers/admin-permalinks.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
rename to app/assets/javascripts/admin/controllers/admin-permalinks.js
diff --git a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6 b/app/assets/javascripts/admin/controllers/admin-plugins.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-plugins.js.es6
rename to app/assets/javascripts/admin/controllers/admin-plugins.js
diff --git a/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-reports-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-reports-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-search-logs-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
rename to app/assets/javascripts/admin/controllers/admin-search-logs-term.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-settings-category.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-settings.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-text-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-text-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user-badges.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-fields.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user-fields.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user.js.es6 b/app/assets/javascripts/admin/controllers/admin-user.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user.js
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-users-list-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
rename to app/assets/javascripts/admin/controllers/admin-watched-words-action.js
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
rename to app/assets/javascripts/admin/controllers/admin-watched-words.js
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6
rename to app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6
rename to app/assets/javascripts/admin/controllers/admin-web-hooks.js
diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin.js.es6
rename to app/assets/javascripts/admin/controllers/admin.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-add-upload.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-reseed.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-reseed.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-silence-user.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-start-backup.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-theme-change.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js
diff --git a/app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js.es6 b/app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js.es6
rename to app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js
diff --git a/app/assets/javascripts/admin/helpers/check-icon.js.es6 b/app/assets/javascripts/admin/helpers/check-icon.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/check-icon.js.es6
rename to app/assets/javascripts/admin/helpers/check-icon.js
diff --git a/app/assets/javascripts/admin/helpers/disposition-icon.js.es6 b/app/assets/javascripts/admin/helpers/disposition-icon.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/disposition-icon.js.es6
rename to app/assets/javascripts/admin/helpers/disposition-icon.js
diff --git a/app/assets/javascripts/admin/helpers/human-size.js.es6 b/app/assets/javascripts/admin/helpers/human-size.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/human-size.js.es6
rename to app/assets/javascripts/admin/helpers/human-size.js
diff --git a/app/assets/javascripts/admin/helpers/post-action-title.js.es6 b/app/assets/javascripts/admin/helpers/post-action-title.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/post-action-title.js.es6
rename to app/assets/javascripts/admin/helpers/post-action-title.js
diff --git a/app/assets/javascripts/admin/helpers/preserve-newlines.js.es6 b/app/assets/javascripts/admin/helpers/preserve-newlines.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/preserve-newlines.js.es6
rename to app/assets/javascripts/admin/helpers/preserve-newlines.js
diff --git a/app/assets/javascripts/admin/helpers/value-at-tl.js.es6 b/app/assets/javascripts/admin/helpers/value-at-tl.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/value-at-tl.js.es6
rename to app/assets/javascripts/admin/helpers/value-at-tl.js
diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/penalty-controller.js.es6
rename to app/assets/javascripts/admin/mixins/penalty-controller.js
diff --git a/app/assets/javascripts/admin/mixins/period-computation.js.es6 b/app/assets/javascripts/admin/mixins/period-computation.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/period-computation.js.es6
rename to app/assets/javascripts/admin/mixins/period-computation.js
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/setting-component.js.es6
rename to app/assets/javascripts/admin/mixins/setting-component.js
diff --git a/app/assets/javascripts/admin/mixins/setting-object.js.es6 b/app/assets/javascripts/admin/mixins/setting-object.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/setting-object.js.es6
rename to app/assets/javascripts/admin/mixins/setting-object.js
diff --git a/app/assets/javascripts/admin/models/admin-dashboard.js.es6 b/app/assets/javascripts/admin/models/admin-dashboard.js
similarity index 100%
rename from app/assets/javascripts/admin/models/admin-dashboard.js.es6
rename to app/assets/javascripts/admin/models/admin-dashboard.js
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js
similarity index 100%
rename from app/assets/javascripts/admin/models/admin-user.js.es6
rename to app/assets/javascripts/admin/models/admin-user.js
diff --git a/app/assets/javascripts/admin/models/api-key.js.es6 b/app/assets/javascripts/admin/models/api-key.js
similarity index 100%
rename from app/assets/javascripts/admin/models/api-key.js.es6
rename to app/assets/javascripts/admin/models/api-key.js
diff --git a/app/assets/javascripts/admin/models/backup-status.js.es6 b/app/assets/javascripts/admin/models/backup-status.js
similarity index 100%
rename from app/assets/javascripts/admin/models/backup-status.js.es6
rename to app/assets/javascripts/admin/models/backup-status.js
diff --git a/app/assets/javascripts/admin/models/backup.js.es6 b/app/assets/javascripts/admin/models/backup.js
similarity index 100%
rename from app/assets/javascripts/admin/models/backup.js.es6
rename to app/assets/javascripts/admin/models/backup.js
diff --git a/app/assets/javascripts/admin/models/color-scheme-color.js.es6 b/app/assets/javascripts/admin/models/color-scheme-color.js
similarity index 100%
rename from app/assets/javascripts/admin/models/color-scheme-color.js.es6
rename to app/assets/javascripts/admin/models/color-scheme-color.js
diff --git a/app/assets/javascripts/admin/models/color-scheme.js.es6 b/app/assets/javascripts/admin/models/color-scheme.js
similarity index 100%
rename from app/assets/javascripts/admin/models/color-scheme.js.es6
rename to app/assets/javascripts/admin/models/color-scheme.js
diff --git a/app/assets/javascripts/admin/models/email-log.js.es6 b/app/assets/javascripts/admin/models/email-log.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-log.js.es6
rename to app/assets/javascripts/admin/models/email-log.js
diff --git a/app/assets/javascripts/admin/models/email-preview.js.es6 b/app/assets/javascripts/admin/models/email-preview.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-preview.js.es6
rename to app/assets/javascripts/admin/models/email-preview.js
diff --git a/app/assets/javascripts/admin/models/email-settings.js.es6 b/app/assets/javascripts/admin/models/email-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-settings.js.es6
rename to app/assets/javascripts/admin/models/email-settings.js
diff --git a/app/assets/javascripts/admin/models/email-style.js.es6 b/app/assets/javascripts/admin/models/email-style.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-style.js.es6
rename to app/assets/javascripts/admin/models/email-style.js
diff --git a/app/assets/javascripts/admin/models/email-template.js.es6 b/app/assets/javascripts/admin/models/email-template.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-template.js.es6
rename to app/assets/javascripts/admin/models/email-template.js
diff --git a/app/assets/javascripts/admin/models/flag-type.js.es6 b/app/assets/javascripts/admin/models/flag-type.js
similarity index 100%
rename from app/assets/javascripts/admin/models/flag-type.js.es6
rename to app/assets/javascripts/admin/models/flag-type.js
diff --git a/app/assets/javascripts/admin/models/incoming-email.js.es6 b/app/assets/javascripts/admin/models/incoming-email.js
similarity index 100%
rename from app/assets/javascripts/admin/models/incoming-email.js.es6
rename to app/assets/javascripts/admin/models/incoming-email.js
diff --git a/app/assets/javascripts/admin/models/permalink.js.es6 b/app/assets/javascripts/admin/models/permalink.js
similarity index 100%
rename from app/assets/javascripts/admin/models/permalink.js.es6
rename to app/assets/javascripts/admin/models/permalink.js
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js
similarity index 100%
rename from app/assets/javascripts/admin/models/report.js.es6
rename to app/assets/javascripts/admin/models/report.js
diff --git a/app/assets/javascripts/admin/models/screened-email.js.es6 b/app/assets/javascripts/admin/models/screened-email.js
similarity index 100%
rename from app/assets/javascripts/admin/models/screened-email.js.es6
rename to app/assets/javascripts/admin/models/screened-email.js
diff --git a/app/assets/javascripts/admin/models/screened-ip-address.js.es6 b/app/assets/javascripts/admin/models/screened-ip-address.js
similarity index 100%
rename from app/assets/javascripts/admin/models/screened-ip-address.js.es6
rename to app/assets/javascripts/admin/models/screened-ip-address.js
diff --git a/app/assets/javascripts/admin/models/screened-url.js.es6 b/app/assets/javascripts/admin/models/screened-url.js
similarity index 100%
rename from app/assets/javascripts/admin/models/screened-url.js.es6
rename to app/assets/javascripts/admin/models/screened-url.js
diff --git a/app/assets/javascripts/admin/models/site-setting.js.es6 b/app/assets/javascripts/admin/models/site-setting.js
similarity index 100%
rename from app/assets/javascripts/admin/models/site-setting.js.es6
rename to app/assets/javascripts/admin/models/site-setting.js
diff --git a/app/assets/javascripts/admin/models/site-text.js.es6 b/app/assets/javascripts/admin/models/site-text.js
similarity index 100%
rename from app/assets/javascripts/admin/models/site-text.js.es6
rename to app/assets/javascripts/admin/models/site-text.js
diff --git a/app/assets/javascripts/admin/models/staff-action-log.js.es6 b/app/assets/javascripts/admin/models/staff-action-log.js
similarity index 100%
rename from app/assets/javascripts/admin/models/staff-action-log.js.es6
rename to app/assets/javascripts/admin/models/staff-action-log.js
diff --git a/app/assets/javascripts/admin/models/theme-settings.js.es6 b/app/assets/javascripts/admin/models/theme-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/models/theme-settings.js.es6
rename to app/assets/javascripts/admin/models/theme-settings.js
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js
similarity index 100%
rename from app/assets/javascripts/admin/models/theme.js.es6
rename to app/assets/javascripts/admin/models/theme.js
diff --git a/app/assets/javascripts/admin/models/tl3-requirements.js.es6 b/app/assets/javascripts/admin/models/tl3-requirements.js
similarity index 100%
rename from app/assets/javascripts/admin/models/tl3-requirements.js.es6
rename to app/assets/javascripts/admin/models/tl3-requirements.js
diff --git a/app/assets/javascripts/admin/models/user-field.js.es6 b/app/assets/javascripts/admin/models/user-field.js
similarity index 100%
rename from app/assets/javascripts/admin/models/user-field.js.es6
rename to app/assets/javascripts/admin/models/user-field.js
diff --git a/app/assets/javascripts/admin/models/version-check.js.es6 b/app/assets/javascripts/admin/models/version-check.js
similarity index 100%
rename from app/assets/javascripts/admin/models/version-check.js.es6
rename to app/assets/javascripts/admin/models/version-check.js
diff --git a/app/assets/javascripts/admin/models/watched-word.js.es6 b/app/assets/javascripts/admin/models/watched-word.js
similarity index 100%
rename from app/assets/javascripts/admin/models/watched-word.js.es6
rename to app/assets/javascripts/admin/models/watched-word.js
diff --git a/app/assets/javascripts/admin/models/web-hook.js.es6 b/app/assets/javascripts/admin/models/web-hook.js
similarity index 100%
rename from app/assets/javascripts/admin/models/web-hook.js.es6
rename to app/assets/javascripts/admin/models/web-hook.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-index.js.es6 b/app/assets/javascripts/admin/routes/admin-api-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-index.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-keys-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-keys-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-show.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-keys-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-keys-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-keys.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-keys.js
diff --git a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-backups-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-backups-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
rename to app/assets/javascripts/admin/routes/admin-backups-logs.js
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-backups.js.es6
rename to app/assets/javascripts/admin/routes/admin-backups.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges-award.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-award.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges-award.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges-award.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges-index.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-colors-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-colors.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-style-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-style-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-style-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-style.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-style.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-templates.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-robots-txt.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes.js
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-general.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6
rename to app/assets/javascripts/admin/routes/admin-dashboard-general.js
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-reports.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6
rename to app/assets/javascripts/admin/routes/admin-dashboard-reports.js
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-dashboard.js.es6
rename to app/assets/javascripts/admin/routes/admin-dashboard.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/routes/admin-email-bounced.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-bounced.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-bounced.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6 b/app/assets/javascripts/admin/routes/admin-email-incomings.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-incomings.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-index.js.es6 b/app/assets/javascripts/admin/routes/admin-email-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-email-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-logs.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-logs.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/routes/admin-email-preview-digest.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-preview-digest.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-received.js.es6 b/app/assets/javascripts/admin/routes/admin-email-received.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-received.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-received.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/routes/admin-email-rejected.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-rejected.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-rejected.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-sent.js.es6 b/app/assets/javascripts/admin/routes/admin-email-sent.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-sent.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-sent.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/routes/admin-email-skipped.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-skipped.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-skipped.js
diff --git a/app/assets/javascripts/admin/routes/admin-embedding.js.es6 b/app/assets/javascripts/admin/routes/admin-embedding.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-embedding.js.es6
rename to app/assets/javascripts/admin/routes/admin-embedding.js
diff --git a/app/assets/javascripts/admin/routes/admin-emojis.js.es6 b/app/assets/javascripts/admin/routes/admin-emojis.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-emojis.js.es6
rename to app/assets/javascripts/admin/routes/admin-emojis.js
diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-posts-active.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
rename to app/assets/javascripts/admin/routes/admin-flags-posts-active.js
diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-posts-old.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
rename to app/assets/javascripts/admin/routes/admin-flags-posts-old.js
diff --git a/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-topics-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-flags-topics-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-index.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-screened-emails.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-screened-urls.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
diff --git a/app/assets/javascripts/admin/routes/admin-permalinks.js.es6 b/app/assets/javascripts/admin/routes/admin-permalinks.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-permalinks.js.es6
rename to app/assets/javascripts/admin/routes/admin-permalinks.js
diff --git a/app/assets/javascripts/admin/routes/admin-plugins.js.es6 b/app/assets/javascripts/admin/routes/admin-plugins.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-plugins.js.es6
rename to app/assets/javascripts/admin/routes/admin-plugins.js
diff --git a/app/assets/javascripts/admin/routes/admin-reports-index.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-reports-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-reports-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-reports-show.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-reports-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-reports-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-route-map.js.es6
rename to app/assets/javascripts/admin/routes/admin-route-map.js
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-search-logs-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-term.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
rename to app/assets/javascripts/admin/routes/admin-search-logs-term.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings-category.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-settings-category.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-settings-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-settings.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-settings.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-text-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-text-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-user-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-badges.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-badges.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 b/app/assets/javascripts/admin/routes/admin-user-fields.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-fields.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-fields.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 b/app/assets/javascripts/admin/routes/admin-user-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6 b/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js
diff --git a/app/assets/javascripts/admin/routes/admin-user.js.es6 b/app/assets/javascripts/admin/routes/admin-user.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user.js.es6
rename to app/assets/javascripts/admin/routes/admin-user.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-list-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-list-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-list.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-list.js
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-action.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
rename to app/assets/javascripts/admin/routes/admin-watched-words-action.js
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-watched-words-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-watched-words.js.es6
rename to app/assets/javascripts/admin/routes/admin-watched-words.js
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
rename to app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-web-hooks-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
rename to app/assets/javascripts/admin/routes/admin-web-hooks.js
diff --git a/app/assets/javascripts/admin/routes/admin.js.es6 b/app/assets/javascripts/admin/routes/admin.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin.js.es6
rename to app/assets/javascripts/admin/routes/admin.js
diff --git a/app/assets/javascripts/admin/services/admin-tools.js.es6 b/app/assets/javascripts/admin/services/admin-tools.js
similarity index 100%
rename from app/assets/javascripts/admin/services/admin-tools.js.es6
rename to app/assets/javascripts/admin/services/admin-tools.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index db276e2586..4056dffc46 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -36,7 +36,8 @@ class DiscourseJsProcessor
     return false unless filename.end_with?(".js") || filename.end_with?(".js.erb")
 
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
-    relative_path.start_with?("app/assets/javascripts/discourse/")
+    relative_path.start_with?("app/assets/javascripts/discourse/") ||
+      relative_path.start_with?("app/assets/javascripts/admin/")
   end
 
   def self.skip_module?(data)

From 3e34964c73506159ceea8ac9515f4fd0a1f4a099 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 13 Mar 2020 17:00:55 -0400
Subject: [PATCH 124/633] Ignore filename change

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 68f769b233..bf208be1ca 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -10,3 +10,6 @@ dafd3c3b47f116c6c1dc56cb18df614c11747733
 
 # Rename many `.js.es6` files to `.js`
 032205e2029cbf82dc8f05b459fb93adf2503c60
+
+# Rename admin app es6 -> js
+181758e3248b14ad8b53abe063da8dc6a82d3089

From 8022e5117941d1b5e19a15a488ac57dda4111dae Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 12 Mar 2020 18:43:27 +0100
Subject: [PATCH 125/633] FIX: Failed to restore backups from versions without
 translation overrides

Rails calls I18n.translate during initialization and by default translation overrides are used. Database migrations would fail if the system tried to migrate from an old version that didn't have the `translation_overrides` table with all its columns yet.

This makes restoring really old backups work again. Running `DISABLE_TRANSLATION_OVERRIDES=1 rake db:migrate` will allow you to upgrade such an old database as well.
---
 config/initializers/100-i18n.rb                   | 2 +-
 lib/backup_restore/database_restorer.rb           | 6 +++++-
 lib/freedom_patches/translate_accelerator.rb      | 4 ++--
 spec/lib/backup_restore/database_restorer_spec.rb | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/config/initializers/100-i18n.rb b/config/initializers/100-i18n.rb
index 10749264a4..739fca222d 100644
--- a/config/initializers/100-i18n.rb
+++ b/config/initializers/100-i18n.rb
@@ -9,7 +9,7 @@ I18n.backend = I18n::Backend::DiscourseI18n.new
 I18n.fallbacks = I18n::Backend::FallbackLocaleList.new
 I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) }
 I18n.reload!
-I18n.init_accelerator!
+I18n.init_accelerator!(overrides_enabled: ENV['DISABLE_TRANSLATION_OVERRIDES'] != '1')
 
 unless Rails.env.test?
   MessageBus.subscribe("/i18n-flush") do
diff --git a/lib/backup_restore/database_restorer.rb b/lib/backup_restore/database_restorer.rb
index d0880c97ed..929e318a9f 100644
--- a/lib/backup_restore/database_restorer.rb
+++ b/lib/backup_restore/database_restorer.rb
@@ -134,7 +134,11 @@ module BackupRestore
       log "Migrating the database..."
 
       log Discourse::Utils.execute_command(
-        { "SKIP_POST_DEPLOYMENT_MIGRATIONS" => "0", "SKIP_OPTIMIZE_ICONS" => "1" },
+        {
+          "SKIP_POST_DEPLOYMENT_MIGRATIONS" => "0",
+          "SKIP_OPTIMIZE_ICONS" => "1",
+          "DISABLE_TRANSLATION_OVERRIDES" => "1"
+        },
         "rake db:migrate",
         failure_message: "Failed to migrate database.",
         chdir: Rails.root
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index 704da6ec4b..ee724d56d1 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -21,8 +21,8 @@ module I18n
 
     LRU_CACHE_SIZE = 400
 
-    def init_accelerator!
-      @overrides_enabled = true
+    def init_accelerator!(overrides_enabled: true)
+      @overrides_enabled = overrides_enabled
       execute_reload
     end
 
diff --git a/spec/lib/backup_restore/database_restorer_spec.rb b/spec/lib/backup_restore/database_restorer_spec.rb
index 02666093b0..9f1cc0c935 100644
--- a/spec/lib/backup_restore/database_restorer_spec.rb
+++ b/spec/lib/backup_restore/database_restorer_spec.rb
@@ -38,6 +38,7 @@ describe BackupRestore::DatabaseRestorer do
     Discourse::Utils.expects(:execute_command).with do |env, command, options|
       env["SKIP_POST_DEPLOYMENT_MIGRATIONS"] == "0" &&
         env["SKIP_OPTIMIZE_ICONS"] == "1" &&
+        env["DISABLE_TRANSLATION_OVERRIDES"] == "1" &&
         command == "rake db:migrate" &&
         options[:chdir] == Rails.root
     end.once

From ba1b840816e1c6ee831d58bd3f17e548e957bfd2 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Wed, 11 Mar 2020 18:27:37 +0100
Subject: [PATCH 126/633] DEV: Don't deactivate suspended users during import

Otherwise a cleanup job might delete those deactivated users.
---
 script/import_scripts/base.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index c827bc5e7e..2d52759822 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -367,8 +367,6 @@ class ImportScripts::Base
     if u.custom_fields['import_email']
       u.suspended_at = Time.zone.at(Time.now)
       u.suspended_till = 200.years.from_now
-      ban_reason = 'Invalid email address on import'
-      u.active = false
       u.save!
 
       user_option = u.user_option
@@ -377,7 +375,7 @@ class ImportScripts::Base
       user_option.email_messages_level = UserOption.email_level_types[:never]
       user_option.save!
       if u.save
-        StaffActionLogger.new(Discourse.system_user).log_user_suspend(u, ban_reason)
+        StaffActionLogger.new(Discourse.system_user).log_user_suspend(u, 'Invalid email address on import')
       else
         Rails.logger.error("Failed to suspend user #{u.username}. #{u.errors.try(:full_messages).try(:inspect)}")
       end

From 36062f43c87aeea62797335b2c4950965a76a67d Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 12 Mar 2020 01:39:16 +0100
Subject: [PATCH 127/633] DEV: Improve Telligent import script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adds ability to map forums to categories and tags as well as ignore forums.
* Fixes regular expression for detecting attachments in posts.
* Handles "remote attachments" 😮 by inserting a link.
* Imports view counts for topics.
* Handles incorrect references of parent posts.
* Better handling of quotes.
* Finds a lot more attachments by trying to replace various Unicode characters in filenames.
---
 script/import_scripts/telligent.rb | 286 +++++++++++++++++++++--------
 1 file changed, 210 insertions(+), 76 deletions(-)

diff --git a/script/import_scripts/telligent.rb b/script/import_scripts/telligent.rb
index db8d6d696d..177ccb8fba 100644
--- a/script/import_scripts/telligent.rb
+++ b/script/import_scripts/telligent.rb
@@ -6,12 +6,43 @@ require 'tiny_tds'
 # Import script for Telligent communities
 #
 # It's really hard to find all attachments, but the script tries to do it anyway.
+#
+# You can supply a JSON file if you need to map and ignore categories during the import
+# by providing the path to the file in the `CATEGORY_MAPPING` environment variable.
+# You can also add tags to remapped categories and remap multiple old forums into one
+# category. Here's an example of such a `mapping.json` file:
+#
+# {
+#   "ignored_forum_ids": [41, 360, 378],
+#
+#   "mapping": [
+#     {
+#       "category": ["New Category 1"],
+#       "forums": [
+#         { "id": 348, "tag": "some_tag" },
+#         { "id": 347, "tag": "another_tag" }
+#       ]
+#     },
+#     {
+#       "category": ["New Category 2"],
+#       "forums": [
+#         { "id": 9 }
+#       ]
+#     },
+#     {
+#       "category": ["Nested", "Category"],
+#       "forums": [
+#         { "id": 322 }
+#       ]
+#     }
+#   ]
+# }
 
 class ImportScripts::Telligent < ImportScripts::Base
   BATCH_SIZE ||= 1000
   LOCAL_AVATAR_REGEX ||= /\A~\/.*(?<directory>communityserver-components-(?:selectable)?avatars)\/(?<path>[^\/]+)\/(?<filename>.+)/i
   REMOTE_AVATAR_REGEX ||= /\Ahttps?:\/\//i
-  EMBEDDED_ATTACHMENT_REGEX ||= /<a href="\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename1>.+)">(?<filename2>.*?)<\/a>/i
+  EMBEDDED_ATTACHMENT_REGEX ||= /<a href="\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename1>.+?)".*?>(?<filename2>.*?)<\/a>/i
 
   CATEGORY_LINK_NORMALIZATION = '/.*?(f\/\d+)$/\1'
   TOPIC_LINK_NORMALIZATION = '/.*?(f\/\d+\/t\/\d+)$/\1'
@@ -26,12 +57,14 @@ class ImportScripts::Telligent < ImportScripts::Base
       database: ENV["DB_NAME"],
       timeout: 60 # the user query is very slow
     )
+
+    SiteSetting.tagging_enabled = true
   end
 
   def execute
     add_permalink_normalizations
-    import_users
     import_categories
+    import_users
     import_topics
     import_posts
     mark_topics_as_solved
@@ -64,34 +97,29 @@ class ImportScripts::Telligent < ImportScripts::Base
         SELECT *
         FROM (
             SELECT TOP #{BATCH_SIZE}
-                u.UserID,
-                u.Email,
-                u.UserName,
-                u.CreateDate,
-                p.PropertyName,
-                p.PropertyValue
+              u.UserID, u.Email, u.UserName,u.CreateDate, p.PropertyName, p.PropertyValue
             FROM cs_Users u
-                LEFT OUTER JOIN (
-                    SELECT NULL AS UserID, ap.UserId AS MembershipID, x.PropertyName, x.PropertyValue
-                    FROM aspnet_Profile ap
-                             CROSS APPLY dbo.GetProperties(ap.PropertyNames, ap.PropertyValuesString) x
-                    WHERE ap.PropertyNames NOT LIKE '%:-1%' AND
-                        x.PropertyName IN ('bio', 'commonName', 'location', 'webAddress')
-                    UNION
-                    SELECT up.UserID, NULL AS MembershipID, x.PropertyName, CAST(x.PropertyValue AS NVARCHAR) AS PropertyValue
-                    FROM cs_UserProfile up
-                             CROSS APPLY dbo.GetProperties(up.PropertyNames, up.PropertyValues) x
-                    WHERE up.PropertyNames NOT LIKE '%:-1%' AND
+              LEFT OUTER JOIN (
+                SELECT NULL AS UserID, ap.UserId AS MembershipID, x.PropertyName, x.PropertyValue
+                FROM aspnet_Profile ap
+                  CROSS APPLY dbo.GetProperties(ap.PropertyNames, ap.PropertyValuesString) x
+                WHERE ap.PropertyNames NOT LIKE '%:-1%' AND
+                      x.PropertyName IN ('bio', 'commonName', 'location', 'webAddress')
+                UNION
+                SELECT up.UserID, NULL AS MembershipID, x.PropertyName, CAST(x.PropertyValue AS NVARCHAR) AS PropertyValue
+                  FROM cs_UserProfile up
+                    CROSS APPLY dbo.GetProperties(up.PropertyNames, up.PropertyValues) x
+                  WHERE up.PropertyNames NOT LIKE '%:-1%' AND
                         x.PropertyName IN ('avatarUrl', 'BannedUntil', 'UserBanReason')
-                ) p ON p.UserID = u.UserID OR p.MembershipID = u.MembershipID
+              ) p ON p.UserID = u.UserID OR p.MembershipID = u.MembershipID
             WHERE u.UserID > #{last_user_id} AND #{user_conditions}
             ORDER BY u.UserID
         ) x
-            PIVOT (
-              MAX(PropertyValue)
-              FOR PropertyName
-              IN (bio, commonName, location, webAddress, avatarUrl, BannedUntil, UserBanReason)
-            ) Y
+          PIVOT (
+            MAX(PropertyValue)
+            FOR PropertyName
+            IN (bio, commonName, location, webAddress, avatarUrl, BannedUntil, UserBanReason)
+          ) Y
         ORDER BY UserID
       SQL
 
@@ -134,7 +162,7 @@ class ImportScripts::Telligent < ImportScripts::Base
                               match_data[:path].split("-"),
                               match_data[:filename])
 
-      if File.exists?(avatar_path)
+      if File.file?(avatar_path)
         @uploader.create_avatar(user, avatar_path)
       else
         STDERR.puts "Could not find avatar: #{avatar_path}"
@@ -157,12 +185,75 @@ class ImportScripts::Telligent < ImportScripts::Base
   end
 
   def import_categories
+    if ENV['CATEGORY_MAPPING']
+      import_mapped_forums_as_categories
+    else
+      import_groups_and_forums_as_categories
+    end
+  end
+
+  def import_mapped_forums_as_categories
+    puts "", "Importing categories..."
+
+    json = JSON.parse(File.read(ENV['CATEGORY_MAPPING']))
+
+    categories = []
+    @forum_ids_to_tags = {}
+    @ignored_forum_ids = json["ignored_forum_ids"]
+
+    json["mapping"].each do |m|
+      parent_id = nil
+      last_index = m["category"].size - 1
+      forum_ids = []
+
+      m["forums"].each do |f|
+        forum_ids << f["id"]
+        @forum_ids_to_tags[f["id"]] = f["tag"] if f["tag"].present?
+      end
+
+      m["category"].each_with_index do |name, index|
+        id = Digest::MD5.hexdigest(name)
+        categories << {
+          id: id,
+          name: name,
+          parent_id: parent_id,
+          forum_ids: index == last_index ? forum_ids : nil
+        }
+        parent_id = id
+      end
+    end
+
+    create_categories(categories) do |c|
+      if category_id = category_id_from_imported_category_id(c[:id])
+        map_forum_ids(category_id, c[:forum_ids])
+        nil
+      else
+        {
+          id: c[:id],
+          name: c[:name],
+          parent_category_id: category_id_from_imported_category_id(c[:parent_id]),
+          post_create_action: proc do |category|
+            map_forum_ids(category.id, c[:forum_ids])
+          end
+        }
+      end
+    end
+  end
+
+  def map_forum_ids(category_id, forum_ids)
+    return if forum_ids.blank?
+
+    forum_ids.each do |id|
+      url = "f/#{id}"
+      Permalink.create(url: url, category_id: category_id) unless Permalink.exists?(url: url)
+      add_category(id, Category.find_by_id(category_id))
+    end
+  end
+
+  def import_groups_and_forums_as_categories
     puts "", "Importing parent categories..."
     parent_categories = query(<<~SQL)
-      SELECT
-        GroupID,
-        Name, HtmlDescription,
-        DateCreated, SortOrder
+      SELECT GroupID, Name, HtmlDescription, DateCreated, SortOrder
       FROM cs_Groups g
       WHERE (SELECT COUNT(1)
              FROM te_Forum_Forums f
@@ -181,10 +272,7 @@ class ImportScripts::Telligent < ImportScripts::Base
 
     puts "", "Importing child categories..."
     child_categories = query(<<~SQL)
-      SELECT
-        ForumId, GroupId,
-        Name, Description,
-        DateCreated, SortOrder
+      SELECT ForumId, GroupId, Name, Description, DateCreated, SortOrder
       FROM te_Forum_Forums
       ORDER BY GroupId, SortOrder, Name
     SQL
@@ -203,7 +291,11 @@ class ImportScripts::Telligent < ImportScripts::Base
           parent_category_id: parent_category_id,
           name: clean_category_name(row["Name"]),
           description: html_to_markdown(row["Description"]),
-          position: row["SortOrder"]
+          position: row["SortOrder"],
+          post_create_action: proc do |category|
+            url = "f/#{row['ForumId']}"
+            Permalink.create(url: url, category_id: category.id) unless Permalink.exists?(url: url)
+          end
         }
       end
     end
@@ -236,19 +328,19 @@ class ImportScripts::Telligent < ImportScripts::Base
     puts "", "Importing topics..."
 
     last_topic_id = -1
-    total_count = count("SELECT COUNT(1) AS count FROM te_Forum_Threads")
+    total_count = count("SELECT COUNT(1) AS count FROM te_Forum_Threads t WHERE #{ignored_forum_sql_condition}")
 
     batches do |offset|
       rows = query(<<~SQL)
         SELECT TOP #{BATCH_SIZE}
-          t.ThreadId, t.ForumId, t.UserId,
+          t.ThreadId, t.ForumId, t.UserId, t.TotalViews,
           t.Subject, t.Body, t.DateCreated, t.IsLocked, t.StickyDate,
-          a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName
+          a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName, a.IsRemote
         FROM te_Forum_Threads t
           LEFT JOIN te_Attachments a
             ON (a.ApplicationId = t.ForumId AND a.ApplicationTypeId = 0 AND a.ContentId = t.ThreadId AND
                 a.ApplicationContentTypeId = 0)
-        WHERE t.ThreadId > #{last_topic_id}
+        WHERE t.ThreadId > #{last_topic_id} AND #{ignored_forum_sql_condition}
         ORDER BY t.ThreadId
       SQL
 
@@ -262,11 +354,12 @@ class ImportScripts::Telligent < ImportScripts::Base
         post = {
           id: import_topic_id(row["ThreadId"]),
           title: CGI.unescapeHTML(row["Subject"]),
-          raw: raw_with_attachment(row, user_id),
+          raw: raw_with_attachment(row, user_id, :topic),
           category: category_id_from_imported_category_id(row["ForumId"]),
           user_id: user_id,
           created_at: row["DateCreated"],
           closed: row["IsLocked"],
+          views: row["TotalViews"],
           post_create_action: proc do |action_post|
             topic = action_post.topic
             Jobs.enqueue_at(topic.pinned_until, :unpin_topic, topic_id: topic.id) if topic.pinned_until
@@ -289,16 +382,27 @@ class ImportScripts::Telligent < ImportScripts::Base
     "T#{topic_id}"
   end
 
+  def ignored_forum_sql_condition
+    @ignored_forum_sql_condition ||= @ignored_forum_ids.present? \
+      ? "t.ForumId NOT IN (#{@ignored_forum_ids.join(',')})" \
+      : "1 = 1"
+  end
+
   def import_posts
     puts "", "Importing posts..."
 
     last_post_id = -1
-    total_count = count("SELECT COUNT(1) AS count FROM te_Forum_ThreadReplies")
+    total_count = count(<<~SQL)
+      SELECT COUNT(1) AS count
+      FROM te_Forum_ThreadReplies tr
+        JOIN te_Forum_Threads t ON (tr.ThreadId = t.ThreadId)
+      WHERE #{ignored_forum_sql_condition}
+    SQL
 
     batches do |offset|
       rows = query(<<~SQL)
         SELECT TOP #{BATCH_SIZE}
-          tr.ThreadReplyId, tr.ThreadId, tr.UserId, tr.ParentReplyId,
+          tr.ThreadReplyId, tr.ThreadId, tr.UserId, pr.ThreadReplyId AS ParentReplyId,
           tr.Body, tr.ThreadReplyDate,
           CONVERT(BIT,
                   CASE WHEN tr.AnswerVerifiedUtcDate IS NOT NULL AND NOT EXISTS(
@@ -309,13 +413,14 @@ class ImportScripts::Telligent < ImportScripts::Base
                   )
                     THEN 1
                   ELSE 0 END) AS IsFirstVerifiedAnswer,
-          a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName
+          a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName, a.IsRemote
         FROM te_Forum_ThreadReplies tr
           JOIN te_Forum_Threads t ON (tr.ThreadId = t.ThreadId)
+          LEFT JOIN te_Forum_ThreadReplies pr ON (tr.ParentReplyId = pr.ThreadReplyId AND tr.ParentReplyId < tr.ThreadReplyId AND tr.ThreadId = pr.ThreadId)
           LEFT JOIN te_Attachments a
             ON (a.ApplicationId = t.ForumId AND a.ApplicationTypeId = 0 AND a.ContentId = tr.ThreadReplyId AND
                 a.ApplicationContentTypeId = 1)
-        WHERE tr.ThreadReplyId > #{last_post_id}
+        WHERE tr.ThreadReplyId > #{last_post_id} AND #{ignored_forum_sql_condition}
         ORDER BY tr.ThreadReplyId
       SQL
 
@@ -324,14 +429,14 @@ class ImportScripts::Telligent < ImportScripts::Base
       next if all_records_exist?(:post, rows.map { |row| row["ThreadReplyId"] })
 
       create_posts(rows, total: total_count, offset: offset) do |row|
-        imported_parent_id = row["ParentReplyId"] > 0 ? row["ParentReplyId"] : import_topic_id(row["ThreadId"])
+        imported_parent_id = row["ParentReplyId"]&.nonzero? ? row["ParentReplyId"] : import_topic_id(row["ThreadId"])
         parent_post = topic_lookup_from_imported_post_id(imported_parent_id)
         user_id = user_id_from_imported_user_id(row["UserId"]) || Discourse::SYSTEM_USER_ID
 
         if parent_post
           post = {
             id: row["ThreadReplyId"],
-            raw: raw_with_attachment(row, user_id),
+            raw: raw_with_attachment(row, user_id, :post),
             user_id: user_id,
             topic_id: parent_post[:topic_id],
             created_at: row["ThreadReplyDate"],
@@ -347,13 +452,17 @@ class ImportScripts::Telligent < ImportScripts::Base
     end
   end
 
-  def raw_with_attachment(row, user_id)
+  def raw_with_attachment(row, user_id, type)
     raw, embedded_paths, upload_ids = replace_embedded_attachments(row["Body"], user_id)
     raw = html_to_markdown(raw) || ""
 
     filename = row["FileName"]
     return raw if ENV["FILE_BASE_DIR"].blank? || filename.blank?
 
+    if row["IsRemote"]
+      return "#{raw}\n#{filename}"
+    end
+
     path = File.join(
       ENV["FILE_BASE_DIR"],
       "telligent.evolution.components.attachments",
@@ -365,14 +474,15 @@ class ImportScripts::Telligent < ImportScripts::Base
     )
 
     unless embedded_paths.include?(path)
-      if File.exists?(path)
+      if File.file?(path)
         upload = @uploader.create_upload(user_id, path, filename)
 
         if upload.present? && upload.persisted? && !upload_ids.include?(upload.id)
           raw = "#{raw}\n#{@uploader.html_for_upload(upload, filename)}"
         end
       else
-        STDERR.puts "Could not find file: #{path}"
+        id = type == :topic ? row['ThreadId'] : row['ThreadReplyId']
+        STDERR.puts "Could not find file for #{type} #{id}: #{path}"
       end
     end
 
@@ -383,10 +493,12 @@ class ImportScripts::Telligent < ImportScripts::Base
     paths = []
     upload_ids = []
 
+    return [raw, paths, upload_ids] if ENV["FILE_BASE_DIR"].blank?
+
     raw = raw.gsub(EMBEDDED_ATTACHMENT_REGEX) do
       filename, path = attachment_path(Regexp.last_match)
 
-      if File.exists?(path)
+      if File.file?(path)
         upload = @uploader.create_upload(user_id, path, filename)
 
         if upload.present? && upload.persisted?
@@ -403,14 +515,21 @@ class ImportScripts::Telligent < ImportScripts::Base
   end
 
   def clean_filename(filename)
-    CGI.unescapeHTML(filename)
-      .gsub(/[\x00\/\\:\*\?\"<>\|]/, '_')
-      .gsub(/_(?:2B00|2E00|2D00|5B00|5D00|5F00)/, '')
+    filename = CGI.unescapeHTML(filename)
+    filename.gsub!(/[\x00\/\\:\*\?\"<>\|]/, '_')
+
+    %w|( ) # % - _ [ ] = , ' ~ ! + { } & @ #|.each do |c|
+      number = "#{c.ord.to_s(16).upcase}00"
+      filename.gsub!("_#{number}_", c)
+      filename.gsub!("_#{number}#{number}_", c * 2)
+    end
+
+    filename
   end
 
   def attachment_path(match_data)
     filename, path = join_attachment_path(match_data, filename_index: 2)
-    filename, path = join_attachment_path(match_data, filename_index: 1) unless File.exists?(path)
+    filename, path = join_attachment_path(match_data, filename_index: 1) unless File.file?(path)
     [filename, path]
   end
 
@@ -420,40 +539,55 @@ class ImportScripts::Telligent < ImportScripts::Base
     filename = clean_filename(match_data[:"filename#{filename_index}"])
     base_path = File.join(
       ENV["FILE_BASE_DIR"],
-      match_data[:directory].gsub("-", "."),
-      match_data[:path].split("-")
+      match_data[:directory].gsub("-", ".").downcase,
+      match_data[:path].gsub("+", " ").gsub(/_\h{4}_/, "?").split(/[\.\-]/).map(&:strip)
     )
 
-    path = File.join(base_path, filename)
-    return [filename, path] if File.exists?(path)
-
     original_filename = filename.dup
 
-    filename = filename.gsub("-", " ")
+    filename.gsub!(/[_\- ]/, "?")
     path = File.join(base_path, filename)
-    return [filename, path] if File.exists?(path)
+    paths = Dir.glob(path, File::FNM_CASEFOLD)
+    if (path = paths.first) && paths.size == 1
+      filename = File.basename(path)
+      return [filename, path]
+    end
 
-    filename = filename.gsub("_", "-")
+    filename = original_filename.dup
+    filename.gsub!(/_\h{2}00_/, "?")
+    filename.gsub!(/_\h{2}00\h{2}00_/, "??")
+    filename.gsub!(/_\h{2}00\h{2}00\h{2}00_/, "???")
+    filename.gsub!(/[_\- ]/, "?")
     path = File.join(base_path, filename)
-    return [filename, path] if File.exists?(path)
+    paths = Dir.glob(path, File::FNM_CASEFOLD)
+    if (path = paths.first) && paths.size == 1
+      filename = File.basename(path)
+      return [filename, path]
+    end
+
+    filename = original_filename.dup
+    filename.gsub!(/_\h{4}_/, "?")
+    filename.gsub!(/_\h{4}\h{4}_/, "??")
+    filename.gsub!(/_\h{4}\h{4}\h{4}_/, "???")
+    filename.gsub!(/[_\- ]/, "?")
+    path = File.join(base_path, filename)
+    paths = Dir.glob(path, File::FNM_CASEFOLD)
+    if (path = paths.first) && paths.size == 1
+      filename = File.basename(path)
+      return [filename, path]
+    end
 
     [original_filename, File.join(base_path, original_filename)]
   end
 
-  def mark_topics_as_solved
-    puts "", "Marking topics as solved..."
-
-    DB.exec <<~SQL
-      INSERT INTO topic_custom_fields (name, value, topic_id, created_at, updated_at)
-      SELECT 'accepted_answer_post_id', pcf.post_id, p.topic_id, p.created_at, p.created_at
-        FROM post_custom_fields pcf
-        JOIN posts p ON p.id = pcf.post_id
-       WHERE pcf.name = 'is_accepted_answer' AND pcf.value = 'true'
-    SQL
-  end
-
   def html_to_markdown(html)
-    HtmlToMarkdown.new(html).to_markdown if html.present?
+    return html if html.blank?
+
+    md = HtmlToMarkdown.new(html).to_markdown
+    md.gsub!(/\[quote.*?\]/, "\n" + '\0' + "\n")
+    md.gsub!(/(?<!^)\[\/quote\]/, "\n[/quote]\n")
+    md.strip!
+    md
   end
 
   def add_permalink_normalizations

From 0a88232e872cb7ab3d1540a87589aa9ddbfe40bd Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 13 Mar 2020 23:59:14 +0100
Subject: [PATCH 128/633] DEV: Improve mbox import script

* Better documentation of settings
* Add option to exclude trimmed parts of emails (enabled by default) to not revail email addresses
---
 script/import_scripts/mbox.rb                 |  6 +----
 script/import_scripts/mbox/importer.rb        | 10 ++++---
 script/import_scripts/mbox/settings.yml       | 26 +++++++++++++++----
 .../import_scripts/mbox/support/settings.rb   | 20 ++++++++------
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/script/import_scripts/mbox.rb b/script/import_scripts/mbox.rb
index 59d3a3780f..cee093033f 100644
--- a/script/import_scripts/mbox.rb
+++ b/script/import_scripts/mbox.rb
@@ -8,11 +8,7 @@ end
 
 module ImportScripts
   module Mbox
-    require_relative 'mbox/support/settings'
-
-    @settings = Settings.load(ARGV[0])
-
     require_relative 'mbox/importer'
-    Importer.new(@settings).perform
+    Importer.new(ARGV[0]).perform
   end
 end
diff --git a/script/import_scripts/mbox/importer.rb b/script/import_scripts/mbox/importer.rb
index d4f8ec4794..71b405e701 100644
--- a/script/import_scripts/mbox/importer.rb
+++ b/script/import_scripts/mbox/importer.rb
@@ -7,9 +7,8 @@ require_relative 'support/settings'
 
 module ImportScripts::Mbox
   class Importer < ImportScripts::Base
-    # @param settings [ImportScripts::Mbox::Settings]
-    def initialize(settings)
-      @settings = settings
+    def initialize(settings_filename)
+      @settings = Settings.load(settings_filename)
       super()
 
       @database = Database.new(@settings.data_dir, @settings.batch_size)
@@ -139,7 +138,10 @@ module ImportScripts::Mbox
         body = receiver.add_attachments(body, user)
       end
 
-      body = "#{body}#{Email::Receiver.elided_html(elided)}" if elided.present?
+      if elided.present? && @settings.show_trimmed_content
+        body = "#{body}#{Email::Receiver.elided_html(elided)}"
+      end
+
       body
     end
 
diff --git a/script/import_scripts/mbox/settings.yml b/script/import_scripts/mbox/settings.yml
index f118800100..60322ec305 100644
--- a/script/import_scripts/mbox/settings.yml
+++ b/script/import_scripts/mbox/settings.yml
@@ -1,22 +1,38 @@
+# Directory where all emails and mbox files are stored.
 data_dir: /shared/import/data
 
-# mbox files
+# Regular expression for splitting emails in mbox files.
+# Choose one of the following examples that works for you or add your own regular expression.
 split_regex: "^From .+@.+"
 #split_regex: "^From .+@example.com.+"
 
-# individual emails
-#split_regex: ""
-
 # Listserv files
 #split_regex: "^========================================================================="
 
-default_trust_level: 1
+# When each file contains only one email
+#split_regex: ""
+
+# Prefer the HTML part of emails instead of the plain text part.
 prefer_html: true
+
+# The trust level of users created by the import script.
+default_trust_level: 1
+
+# Create staged users instead of regular users.
 staged: true
+
+# You can enable this option if the script should stop after indexing all emails
+# instead of executing the import right away. That's useful if you need to make some changes
+# to the indexed data in the `index.db` created during the indexing step.
 index_only: false
 
+# Only enable this option when the import script fails to group messages with
+# with the `In-Reply-To` and `References` headers.
 group_messages_by_subject: false
 
+# Always show trimmed part of emails. WARNING: This might reveal email addresses.
+show_trimmed_content: false
+
 # Remove prefixes like [FOO] or (BAR) from topic titles and replace them with tags.
 # You can map one or more case-insensitive prefixes to the same tag in Discourse.
 # "Tag name in Discourse": "foo"
diff --git a/script/import_scripts/mbox/support/settings.rb b/script/import_scripts/mbox/support/settings.rb
index f30c5d56d1..9311dff5e7 100644
--- a/script/import_scripts/mbox/support/settings.rb
+++ b/script/import_scripts/mbox/support/settings.rb
@@ -19,6 +19,7 @@ module ImportScripts::Mbox
     attr_reader :group_messages_by_subject
     attr_reader :subject_prefix_regex
     attr_reader :automatically_remove_list_name_prefix
+    attr_reader :show_trimmed_content
     attr_reader :tags
 
     def initialize(yaml)
@@ -31,20 +32,23 @@ module ImportScripts::Mbox
       @index_only = yaml['index_only']
       @group_messages_by_subject = yaml['group_messages_by_subject']
 
-      unless yaml['remove_subject_prefixes'].empty?
+      if yaml['remove_subject_prefixes'].present?
         prefix_regexes = yaml['remove_subject_prefixes'].map { |p| Regexp.new(p) }
         @subject_prefix_regex = /^#{Regexp.union(prefix_regexes).source}/i
       end
 
       @automatically_remove_list_name_prefix = yaml['automatically_remove_list_name_prefix']
+      @show_trimmed_content = yaml['show_trimmed_content']
 
-      @tags = []
-      yaml['tags'].each do |tag_name, value|
-        prefixes = Regexp.union(value).source
-        @tags << {
-          regex: /^(?:(?:\[(?:#{prefixes})\])|(?:\((?:#{prefixes})\)))\s*/i,
-          name: tag_name
-        }
+      if yaml['tags'].present?
+        @tags = []
+        yaml['tags'].each do |tag_name, value|
+          prefixes = Regexp.union(value).source
+          @tags << {
+            regex: /^(?:(?:\[(?:#{prefixes})\])|(?:\((?:#{prefixes})\)))\s*/i,
+            name: tag_name
+          }
+        end
       end
     end
   end

From e825f47daadc551c18e50077771673e2367214aa Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 13 Mar 2020 23:59:40 +0100
Subject: [PATCH 129/633] DEV: Better handling of incremental scrapes for
 Google Groups

---
 script/import_scripts/google_groups.rb | 49 ++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/script/import_scripts/google_groups.rb b/script/import_scripts/google_groups.rb
index d8f58cf323..bbcfb6442b 100755
--- a/script/import_scripts/google_groups.rb
+++ b/script/import_scripts/google_groups.rb
@@ -17,6 +17,7 @@ require "yaml"
 
 DEFAULT_OUTPUT_PATH = "/shared/import/data"
 DEFAULT_COOKIES_TXT = "/shared/import/cookies.txt"
+ABORT_AFTER_SKIPPED_TOPIC_COUNT = 10
 
 def driver
   @driver ||= begin
@@ -77,7 +78,7 @@ def base_url
   end
 end
 
-def crawl_categories
+def crawl_topics
   1.step(nil, 100).each do |start|
     url = "#{base_url}/#{@groupname}[#{start}-#{start + 99}]"
     get(url)
@@ -97,12 +98,24 @@ def crawl_categories
     topic_urls = extract(".subject a[href*='#{@groupname}']") { |a| a["href"].sub("/d/topic/", "/forum/?_escaped_fragment_=topic/") }
     break if topic_urls.size == 0
 
-    topic_urls.each { |topic_url| crawl_topic(topic_url) }
+    topic_urls.each do |topic_url|
+      crawl_topic(topic_url)
+
+      # abort if this in an incremental crawl and there were too many consecutive, skipped topics
+      if @finished && @skipped_topic_count > ABORT_AFTER_SKIPPED_TOPIC_COUNT
+        puts "Skipping all other topics, because this is an incremental crawl.".green
+        return
+      end
+    end
   end
 end
 
 def crawl_topic(url)
-  if @scraped_topic_urls.include?(url)
+  skippable = @scraped_topic_urls.include?(url)
+
+  # Skip this topic if there were already too many consecutive, skipped topics.
+  # Otherwise we have to look if there are new messages in the topic.
+  if skippable && @skipped_topic_count > ABORT_AFTER_SKIPPED_TOPIC_COUNT
     puts "Skipping".green << " #{url}"
     return
   end
@@ -110,13 +123,18 @@ def crawl_topic(url)
   puts "Scraping #{url}"
   get(url)
 
+  messsages_crawled = false
+
   extract(".subject a[href*='#{@groupname}']") do |a|
     [
       a["href"].sub("/d/msg/", "/forum/message/raw?msg="),
       a["title"].empty?
     ]
-  end.each { |msg_url, might_be_deleted| crawl_message(msg_url, might_be_deleted) }
+  end.each do |msg_url, might_be_deleted|
+    messsages_crawled |= crawl_message(msg_url, might_be_deleted)
+  end
 
+  @skipped_topic_count = skippable && messsages_crawled ? 0 : @skipped_topic_count + 1
   @scraped_topic_urls << url
 rescue
   puts "Failed to scrape topic at #{url}".red
@@ -140,7 +158,10 @@ def crawl_message(url, might_be_deleted)
     end
   end
 
+  old_md5 = Digest::MD5.file(filename) if File.exist?(filename)
   File.write(filename, content)
+
+  old_md5 ? old_md5 != Digest::MD5.file(filename) : true
 rescue Selenium::WebDriver::Error::NoSuchElementError
   if might_be_deleted
     puts "Message might be deleted. Skipping #{url}"
@@ -201,14 +222,28 @@ end
 def crawl
   start_time = Time.now
   status_filename = File.join(@path, "status.yml")
-  @scraped_topic_urls = File.exists?(status_filename) ? YAML.load_file(status_filename) : Set.new
+
+  if File.exists?(status_filename)
+    yaml = YAML.load_file(status_filename)
+    @finished = yaml[:finished]
+    @scraped_topic_urls = yaml[:urls]
+  else
+    @finished = false
+    @scraped_topic_urls = Set.new
+  end
+
+  @skipped_topic_count = 0
 
   login
 
   begin
-    crawl_categories
+    crawl_topics
+    @finished = true
   ensure
-    File.write(status_filename, @scraped_topic_urls.to_yaml)
+    File.write(status_filename, {
+      finished: @finished,
+      urls: @scraped_topic_urls
+    }.to_yaml)
   end
 
   elapsed = Time.now - start_time

From 27bc4f51c723ba4b55e22ac323e6675dd8f0e119 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Sat, 14 Mar 2020 08:47:53 -0300
Subject: [PATCH 130/633] FIX: Ignore suspect users that were migrated or users
 who were created more than six months ago (#9205)

---
 app/jobs/scheduled/enqueue_suspect_users.rb |  6 +++++-
 spec/jobs/enqueue_suspect_users_spec.rb     | 24 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/jobs/scheduled/enqueue_suspect_users.rb b/app/jobs/scheduled/enqueue_suspect_users.rb
index 1b94dcb309..b88118a3a3 100644
--- a/app/jobs/scheduled/enqueue_suspect_users.rb
+++ b/app/jobs/scheduled/enqueue_suspect_users.rb
@@ -9,15 +9,19 @@ module Jobs
       return if SiteSetting.must_approve_users
 
       users = User
+        .distinct
         .activated
         .human_users
         .where(approved: false)
         .joins(:user_profile, :user_stat)
-        .where("users.created_at <= ?", 1.day.ago)
+        .where("users.created_at <= ? AND users.created_at >= ?", 1.day.ago, 6.months.ago)
         .where("LENGTH(COALESCE(user_profiles.bio_raw, user_profiles.website, '')) > 0")
         .where("user_stats.posts_read_count <= 1 AND user_stats.topics_entered <= 1")
         .joins("LEFT OUTER JOIN reviewables r ON r.target_id = users.id AND r.target_type = 'User'")
         .where('r.id IS NULL')
+        .joins('LEFT OUTER JOIN user_custom_fields ucf ON users.id = ucf.user_id')
+        .group('users.id, ucf.id')
+        .having('ucf.id IS NULL OR NOT bool_or(ucf.name = ?)', 'import_id')
         .limit(10)
 
       users.each do |user|
diff --git a/spec/jobs/enqueue_suspect_users_spec.rb b/spec/jobs/enqueue_suspect_users_spec.rb
index b614899823..b1b30e7795 100644
--- a/spec/jobs/enqueue_suspect_users_spec.rb
+++ b/spec/jobs/enqueue_suspect_users_spec.rb
@@ -56,5 +56,29 @@ describe Jobs::EnqueueSuspectUsers do
 
       expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
     end
+
+    it 'ignores users created more than six months ago' do
+      suspect_user.update!(created_at: 1.year.ago)
+
+      subject.execute({})
+
+      expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
+    end
+
+    it 'ignores users that were imported from another site' do
+      suspect_user.upsert_custom_fields({ import_id: 'fake_id' })
+
+      subject.execute({})
+
+      expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
+    end
+
+    it 'enqueues a suspect users with custom fields' do
+      suspect_user.upsert_custom_fields({ field_a: 'value', field_b: 'value' })
+
+      subject.execute({})
+
+      expect(ReviewableUser.where(target: suspect_user).exists?).to eq(true)
+    end
   end
 end

From d27ece9ded9d6f3c20eff49606d528d71b637d5c Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sat, 14 Mar 2020 22:10:19 +0100
Subject: [PATCH 131/633] FIX: Method from Telligent import script was deleted
 by accident

---
 script/import_scripts/telligent.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/script/import_scripts/telligent.rb b/script/import_scripts/telligent.rb
index 177ccb8fba..6fb3c775f0 100644
--- a/script/import_scripts/telligent.rb
+++ b/script/import_scripts/telligent.rb
@@ -590,6 +590,18 @@ class ImportScripts::Telligent < ImportScripts::Base
     md
   end
 
+  def mark_topics_as_solved
+    puts "", "Marking topics as solved..."
+
+    DB.exec <<~SQL
+      INSERT INTO topic_custom_fields (name, value, topic_id, created_at, updated_at)
+      SELECT 'accepted_answer_post_id', pcf.post_id, p.topic_id, p.created_at, p.created_at
+        FROM post_custom_fields pcf
+        JOIN posts p ON p.id = pcf.post_id
+       WHERE pcf.name = 'is_accepted_answer' AND pcf.value = 'true'
+    SQL
+  end
+
   def add_permalink_normalizations
     normalizations = SiteSetting.permalink_normalizations
     normalizations = normalizations.blank? ? [] : normalizations.split('|')

From a14313e9d0102979423559c0c6b98f3620cd10ee Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Sun, 15 Mar 2020 17:24:11 +1100
Subject: [PATCH 132/633] FIX: RANDOM_PASSWORD not working rake admin:create

We regressed behavior of this env var which enable admin account
creation with a random password
---
 lib/tasks/admin.rake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/admin.rake b/lib/tasks/admin.rake
index f4d09dbcc4..c5b68e1a8a 100644
--- a/lib/tasks/admin.rake
+++ b/lib/tasks/admin.rake
@@ -65,9 +65,10 @@ task "admin:create" => :environment do
         else
           password = ask("Password:  ") { |q| q.echo = false }
           password_confirmation = ask("Repeat password:  ") { |q| q.echo = false }
-          passwords_match = password == password_confirmation
         end
 
+        passwords_match = password == password_confirmation
+
         say("Passwords don't match, try again...") unless passwords_match
       end while !passwords_match
       admin.password = password

From a1d660d9515fa446fea85bfea3b4c9b96ac75320 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Sun, 15 Mar 2020 21:17:28 +1100
Subject: [PATCH 133/633] FEATURE: optional global invite_code for account
 registration

On some sites when bootstrapping communities it is helpful to bootstrap
with a "light weight" invite code.

Use the site setting `invite_code` to set a global invite code.

In this case the administrator can share the code with
a community which is very easy to remember and then anyone who has
that code can easily register accounts.

People without the invite code are not allowed account registration.

Global invite codes are less secure than indevidual codes, in that they
tend to leak in the community however in some cases when starting a brand
new community the security guarantees of invites are not needed.
---
 .../discourse/controllers/create-account.js   |  9 ++++--
 .../javascripts/discourse/models/user.js      | 26 +++++++++------
 .../templates/modal/create-account.hbs        | 11 +++++++
 app/controllers/users_controller.rb           |  5 +++
 app/models/site_setting.rb                    |  5 +++
 config/locales/client.en.yml                  |  4 +++
 config/locales/server.en.yml                  |  2 ++
 config/site_settings.yml                      |  1 +
 spec/requests/users_controller_spec.rb        | 32 ++++++++++++-------
 9 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/create-account.js b/app/assets/javascripts/discourse/controllers/create-account.js
index 3d93a61393..b0567c07b4 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js
+++ b/app/assets/javascripts/discourse/controllers/create-account.js
@@ -40,6 +40,7 @@ export default Controller.extend(
     hasAuthOptions: notEmpty("authOptions"),
     canCreateLocal: setting("enable_local_logins"),
     showCreateForm: or("hasAuthOptions", "canCreateLocal"),
+    requireInviteCode: setting("require_invite_code"),
 
     resetForm() {
       // We wrap the fields in a structure so we can assign a value
@@ -66,7 +67,8 @@ export default Controller.extend(
       "usernameValidation.failed",
       "passwordValidation.failed",
       "userFieldsValidation.failed",
-      "formSubmitted"
+      "formSubmitted",
+      "inviteCode"
     )
     submitDisabled() {
       if (this.formSubmitted) return true;
@@ -78,6 +80,8 @@ export default Controller.extend(
         return true;
       if (this.get("userFieldsValidation.failed")) return true;
 
+      if (this.requireInviteCode && !this.inviteCode) return true;
+
       return false;
     },
 
@@ -225,7 +229,8 @@ export default Controller.extend(
         "accountEmail",
         "accountPassword",
         "accountUsername",
-        "accountChallenge"
+        "accountChallenge",
+        "inviteCode"
       );
 
       attrs["accountPasswordConfirm"] = this.accountHoneypot;
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index 026b27926a..a7d9ce8b29 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -909,17 +909,23 @@ User.reopenClass(Singleton, {
   },
 
   createAccount(attrs) {
+    let data = {
+      name: attrs.accountName,
+      email: attrs.accountEmail,
+      password: attrs.accountPassword,
+      username: attrs.accountUsername,
+      password_confirmation: attrs.accountPasswordConfirm,
+      challenge: attrs.accountChallenge,
+      user_fields: attrs.userFields,
+      timezone: moment.tz.guess()
+    };
+
+    if (attrs.inviteCode) {
+      data.invite_code = attrs.inviteCode;
+    }
+
     return ajax(userPath(), {
-      data: {
-        name: attrs.accountName,
-        email: attrs.accountEmail,
-        password: attrs.accountPassword,
-        username: attrs.accountUsername,
-        password_confirmation: attrs.accountPasswordConfirm,
-        challenge: attrs.accountChallenge,
-        user_fields: attrs.userFields,
-        timezone: moment.tz.guess()
-      },
+      data,
       type: "POST"
     });
   }
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 5c77b2a0a6..bd03f39f24 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -89,6 +89,17 @@
                 </td>
               </tr>
 
+              {{#if requireInviteCode }}
+                <tr class="invite-code">
+                  <td><label for='invite-code'>{{i18n 'user.invite_code.title'}}</label></td>
+                  <td>
+                    {{input value=inviteCode id="inviteCode"}}
+                  </td>
+
+                  <td><label>{{i18n 'user.invite_code.instructions'}}</label></td>
+                </tr>
+              {{/if}}
+
               {{plugin-outlet name="create-account-after-password"
                               noTags=true
                               args=(hash accountName=accountName
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 837f19b828..6acf7651eb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -410,6 +410,7 @@ class UsersController < ApplicationController
   def create
     params.require(:email)
     params.require(:username)
+    params.require(:invite_code) if SiteSetting.require_invite_code
     params.permit(:user_fields)
 
     unless SiteSetting.allow_new_registrations
@@ -424,6 +425,10 @@ class UsersController < ApplicationController
       return fail_with("login.email_too_long")
     end
 
+    if SiteSetting.require_invite_code && SiteSetting.invite_code != params[:invite_code]
+      return fail_with("login.wrong_invite_code")
+    end
+
     if clashing_with_existing_route?(params[:username]) || User.reserved_username?(params[:username])
       return fail_with("login.reserved_username")
     end
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index bf82dbe8fa..7925f91ef1 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -173,6 +173,11 @@ class SiteSetting < ActiveRecord::Base
     SiteSetting::Upload
   end
 
+  def self.require_invite_code
+    invite_code.present?
+  end
+  client_settings << :require_invite_code
+
   %i{
     site_logo_url
     site_logo_small_url
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a276cc8614..7c2a761c6a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1132,6 +1132,10 @@ en:
       password_confirmation:
         title: "Password Again"
 
+      invite_code:
+        title: "Invite Code"
+        instructions: "Account registration requires an invite code"
+
       auth_tokens:
         title: "Recently Used Devices"
         ip: "IP"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index fd440ec3b6..ab280dab92 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1530,6 +1530,7 @@ en:
     markdown_typographer_quotation_marks: "List of double and single quotes replacement pairs"
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
     must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site."
+    invite_code: "User must type this code to be allowed account registration, ignored when empty"
     approve_suspect_users: "Add suspicious users to the review queue. Suspicious users have entered a bio/website but have no reading activity."
     pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications."
     maximum_session_age: "User will remain logged in for n hours since last visit"
@@ -2382,6 +2383,7 @@ en:
     new_registrations_disabled: "New account registrations are not allowed at this time."
     password_too_long: "Passwords are limited to 200 characters."
     email_too_long: "The email you provided is too long. Mailbox names must be no more than 254 characters, and domain names must be no more than 253 characters."
+    wrong_invite_code: "The invite code you entered was incorrect."
     reserved_username: "That username is not allowed."
     missing_user_field: "You have not completed all the user fields"
     auth_complete: "Authentication is complete."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 044d7f1de1..52b7c6002d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -336,6 +336,7 @@ login:
   must_approve_users:
     client: true
     default: false
+  invite_code: ""
   enable_local_logins:
     client: true
     default: true
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 38dfe21e96..43e41e5522 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -593,8 +593,8 @@ describe UsersController do
         email: @user.email }
     end
 
-    def post_user
-      post "/u.json", params: post_user_params
+    def post_user(extra_params = {})
+      post "/u.json", params: post_user_params.merge(extra_params)
     end
 
     context 'when email params is missing' do
@@ -616,17 +616,27 @@ describe UsersController do
         expect(User.find_by(username: @user.username).locale).to eq('fr')
       end
 
+      it 'requires invite code when specified' do
+        expect(SiteSetting.require_invite_code).to eq(false)
+        SiteSetting.invite_code = "abc"
+        expect(SiteSetting.require_invite_code).to eq(true)
+
+        post_user(invite_code: "abcd")
+        expect(response.status).to eq(200)
+        json = JSON.parse(response.body)
+        expect(json["success"]).to eq(false)
+
+        post_user(invite_code: "abc")
+        expect(response.status).to eq(200)
+        json = JSON.parse(response.body)
+        expect(json["success"]).to eq(true)
+
+      end
+
       context "when timezone is provided as a guess on signup" do
-        let(:post_user_params) do
-          { name: @user.name,
-            username: @user.username,
-            password: "strongpassword",
-            email: @user.email,
-            timezone: "Australia/Brisbane" }
-        end
 
         it "sets the timezone" do
-          post_user
+          post_user(timezone: "Australia/Brisbane")
           expect(response.status).to eq(200)
           expect(User.find_by(username: @user.username).user_option.timezone).to eq("Australia/Brisbane")
         end
@@ -1440,7 +1450,7 @@ describe UsersController do
       inviter = Fabricate(:user, trust_level: 2)
       sign_in(inviter)
       invitee = Fabricate(:user)
-      invite = Fabricate(:invite, invited_by: inviter, user: invitee)
+      _invite = Fabricate(:invite, invited_by: inviter, user: invitee)
       get "/u/#{user.username}/invited_count.json"
       expect(response.status).to eq(200)
 

From 15ae3145ec1e077245b8f9ba46b16359c75482cc Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Sun, 15 Mar 2020 11:01:24 +0000
Subject: [PATCH 134/633] FIX: Plugins may have relative symlinks

---
 lib/stylesheet/watcher.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rb
index 4c9ab7f595..384f7515d1 100644
--- a/lib/stylesheet/watcher.rb
+++ b/lib/stylesheet/watcher.rb
@@ -57,7 +57,11 @@ module Stylesheet
         Thread.new do
           begin
             plugins_paths = Dir.glob("#{Rails.root}/plugins/*").map do |file|
-              File.symlink?(file) ? File.readlink(file) : file
+              if File.symlink?(file)
+                File.expand_path(File.readlink(file), "#{Rails.root}/plugins")
+              else
+                file
+              end
             end.compact
 
             listener = Listen.to("#{root}/#{watch}", listener_opts) do |modified, added, _|

From 39a7b93c4a9ff5c2798d2fe619bdc8668811064f Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Sun, 15 Mar 2020 11:09:57 -0400
Subject: [PATCH 135/633] UX: Remove "Live Notifications" user profile section
 on iOS

---
 .../controllers/preferences/notifications.js       |  3 +++
 .../templates/preferences/notifications.hbs        | 14 ++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js b/app/assets/javascripts/discourse/controllers/preferences/notifications.js
index 078d0b3fbb..5667a55fda 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/notifications.js
+++ b/app/assets/javascripts/discourse/controllers/preferences/notifications.js
@@ -85,6 +85,9 @@ export default Controller.extend({
       },
       { name: I18n.t("user.new_topic_duration.last_here"), value: -2 }
     ];
+
+    const caps = Discourse.__container__.lookup("capabilities:main");
+    this.isIOS = caps.isIOS;
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index 03ca349d67..f3c1b00f52 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -43,12 +43,14 @@
   </div>
 </div>
 
-<div class="control-group desktop-notifications">
-  <label class="control-label">{{i18n 'user.desktop_notifications.label'}}</label>
-  {{desktop-notification-config}}
-  <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
-  {{plugin-outlet name="user-preferences-desktop-notifications" args=(hash model=model save=(action "save"))}}
-</div>
+{{#unless isIOS}}
+  <div class="control-group desktop-notifications">
+    <label class="control-label">{{i18n 'user.desktop_notifications.label'}}</label>
+    {{desktop-notification-config}}
+    <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
+    {{plugin-outlet name="user-preferences-desktop-notifications" args=(hash model=model save=(action "save"))}}
+  </div>
+{{/unless}}
 
 {{#if siteSettings.enable_personal_messages}}
   <div class="control-group private-messages">

From d4595fbf292d2f42af9f3032b2eb28e16ddf8dc6 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Sun, 15 Mar 2020 20:56:54 +0000
Subject: [PATCH 136/633] FIX: Fix html response in development after
 ApplicationController reload

In development, if the ApplicationController is reloaded, then, previous
to this commit we were emitting an instance of the previous RenderEmpty
class, but rescuing from the reloaded instance.

Looking up RenderEmpty by its fully qualified name fixes this.
---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 23872ed560..3ae29ee400 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -650,7 +650,7 @@ class ApplicationController < ActionController::Base
   def check_xhr
     # bypass xhr check on PUT / POST / DELETE provided api key is there, otherwise calling api is annoying
     return if !request.get? && (is_api? || is_user_api?)
-    raise RenderEmpty.new unless ((request.format && request.format.json?) || request.xhr?)
+    raise ApplicationController::RenderEmpty.new unless ((request.format && request.format.json?) || request.xhr?)
   end
 
   def self.requires_login(arg = {})

From a6e9057609149cd882491722b7aa315be2d294f3 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 16 Mar 2020 11:54:14 +1000
Subject: [PATCH 137/633] FIX: Ensure show_short URLs handle secure uploads
 using multisite (#9212)

Meta report: https://meta.discourse.org/t/short-url-secure-uploads-s3/144224
* if the show_short route is hit for an upload that is
  secure, we redirect to the secure presigned URL. however
  this was not taking into account multisite so the db name
  was left off the path which broke the presigned URL
* we now use the correct url_for method if we know the
  upload (like in the show_short case) which takes into
  account multisite
---
 app/controllers/uploads_controller.rb    | 14 +++++++++++---
 spec/requests/uploads_controller_spec.rb | 12 +++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 04840a36a1..ad72f998c9 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -102,7 +102,9 @@ class UploadsController < ApplicationController
     sha1 = Upload.sha1_from_base62_encoded(params[:base62])
 
     if upload = Upload.find_by(sha1: sha1)
-      return handle_secure_upload_request(upload, Discourse.store.get_path_for_upload(upload)) if upload.secure? && SiteSetting.secure_media?
+      if upload.secure? && SiteSetting.secure_media?
+        return handle_secure_upload_request(upload)
+      end
 
       if Discourse.store.internal?
         send_file_local_upload(upload)
@@ -128,7 +130,6 @@ class UploadsController < ApplicationController
     upload = Upload.find_by(sha1: sha1)
     return render_404 if upload.blank?
 
-    signed_secure_url = Discourse.store.signed_url_for_path(path_with_ext)
     return handle_secure_upload_request(upload, path_with_ext) if SiteSetting.secure_media?
 
     # we don't want to 404 here if secure media gets disabled
@@ -138,14 +139,21 @@ class UploadsController < ApplicationController
     # if the upload is still secure, that means the ACL is probably still
     # private, so we don't want to go to the CDN url just yet otherwise we
     # will get a 403. if the upload is not secure we assume the ACL is public
+    signed_secure_url = Discourse.store.signed_url_for_path(path_with_ext)
     redirect_to upload.secure? ? signed_secure_url : Discourse.store.cdn_url(upload.url)
   end
 
-  def handle_secure_upload_request(upload, path_with_ext)
+  def handle_secure_upload_request(upload, path_with_ext = nil)
     if upload.access_control_post_id.present?
       raise Discourse::InvalidAccess if !guardian.can_see?(upload.access_control_post)
     end
 
+    # url_for figures out the full URL, handling multisite DBs,
+    # and will return a presigned URL for the upload
+    if path_with_ext.blank?
+      return redirect_to Discourse.store.url_for(upload)
+    end
+
     redirect_to Discourse.store.signed_url_for_path(path_with_ext)
   end
 
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index 55139f9d05..1577695f35 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -398,9 +398,19 @@ describe UploadsController do
           upload.update(access_control_post: post)
 
           get upload.short_path
-
           expect(response.code).to eq("403")
         end
+
+        context "when running on a multisite connection" do
+          before do
+            Rails.configuration.multisite = true
+          end
+          it "redirects to the signed_url_for_path with the multisite DB name in the url" do
+            freeze_time
+            get upload.short_path
+            expect(response.body).to include(RailsMultisite::ConnectionManagement.current_db)
+          end
+        end
       end
     end
   end

From 4cce564b35f36c2b7ba021e050e6019cfff289e9 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 16 Mar 2020 16:05:44 +1000
Subject: [PATCH 138/633] FIX: Bookmark reminders and improvements changes
 (#9213)

* Cosmetic fixes for the bookmark modal
* Do not show "later today" when the later time will be > 5pm
* When a custom reminder time is selected, store it in localStorage. The next time the modal is opened, if the last datetime is > now, then a new tile with "Last" will be shown that lets the user reselect that same time.
* Also add an explicit "No Reminder" option that is selected by default
---
 .../discourse/controllers/bookmark.js         | 88 ++++++++++++++++---
 .../discourse/templates/modal/bookmark.hbs    |  8 +-
 .../common/components/tap-tile.scss           |  1 +
 config/locales/client.en.yml                  |  6 +-
 .../controllers/bookmark-test.js.es6          | 61 ++++++++++---
 5 files changed, 134 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 891dd2daf4..0a8ba8a063 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -7,6 +7,7 @@ import { htmlSafe } from "@ember/template";
 import { ajax } from "discourse/lib/ajax";
 
 const START_OF_DAY_HOUR = 8;
+const LATER_TODAY_CUTOFF_HOUR = 17;
 const REMINDER_TYPES = {
   AT_DESKTOP: "at_desktop",
   LATER_TODAY: "later_today",
@@ -14,7 +15,9 @@ const REMINDER_TYPES = {
   TOMORROW: "tomorrow",
   NEXT_WEEK: "next_week",
   NEXT_MONTH: "next_month",
-  CUSTOM: "custom"
+  CUSTOM: "custom",
+  LAST_CUSTOM: "last_custom",
+  NONE: "none"
 };
 
 export default Controller.extend(ModalFunctionality, {
@@ -27,17 +30,42 @@ export default Controller.extend(ModalFunctionality, {
   onCloseWithoutSaving: null,
   customReminderDate: null,
   customReminderTime: null,
+  lastCustomReminderDate: null,
+  lastCustomReminderTime: null,
 
   onShow() {
     this.setProperties({
       errorMessage: null,
       name: null,
-      selectedReminderType: null,
+      selectedReminderType: REMINDER_TYPES.NONE,
       closeWithoutSaving: false,
       isSavingBookmarkManually: false,
       customReminderDate: null,
-      customReminderTime: null
+      customReminderTime: null,
+      lastCustomReminderDate: null,
+      lastCustomReminderTime: null
     });
+
+    this.loadLastUsedCustomReminderDatetime();
+  },
+
+  loadLastUsedCustomReminderDatetime() {
+    let lastTime = localStorage.lastCustomBookmarkReminderTime;
+    let lastDate = localStorage.lastCustomBookmarkReminderDate;
+
+    if (lastTime && lastDate) {
+      let parsed = this.parseCustomDateTime(lastDate, lastTime);
+
+      if (parsed < this.now()) {
+        return;
+      }
+
+      this.setProperties({
+        lastCustomReminderDate: lastDate,
+        lastCustomReminderTime: lastTime,
+        parsedLastCustomReminderDatetime: parsed
+      });
+    }
   },
 
   // we always want to save the bookmark unless the user specifically
@@ -71,9 +99,29 @@ export default Controller.extend(ModalFunctionality, {
     return REMINDER_TYPES;
   },
 
+  @discourseComputed()
+  showLastCustom() {
+    return this.lastCustomReminderTime && this.lastCustomReminderDate;
+  },
+
   @discourseComputed()
   showLaterToday() {
-    return !this.laterToday().isSame(this.tomorrow(), "date");
+    let later = this.laterToday();
+    return (
+      !later.isSame(this.tomorrow(), "date") &&
+      later.hour() <= LATER_TODAY_CUTOFF_HOUR
+    );
+  },
+
+  @discourseComputed("parsedLastCustomReminderDatetime")
+  lastCustomFormatted(parsedLastCustomReminderDatetime) {
+    return htmlSafe(
+      I18n.t("bookmarks.reminders.last_custom", {
+        date: parsedLastCustomReminderDatetime.format(
+          I18n.t("dates.long_no_year")
+        )
+      })
+    );
   },
 
   @discourseComputed()
@@ -130,12 +178,26 @@ export default Controller.extend(ModalFunctionality, {
     const reminderAt = this.reminderAt();
     const reminderAtISO = reminderAt ? reminderAt.toISOString() : null;
 
-    if (!reminderAt && this.selectedReminderType === REMINDER_TYPES.CUSTOM) {
-      return Promise.reject(I18n.t("bookmarks.invalid_custom_datetime"));
+    if (this.selectedReminderType === REMINDER_TYPES.CUSTOM) {
+      if (!reminderAt) {
+        return Promise.reject(I18n.t("bookmarks.invalid_custom_datetime"));
+      }
+
+      localStorage.lastCustomBookmarkReminderTime = this.customReminderTime;
+      localStorage.lastCustomBookmarkReminderDate = this.customReminderDate;
+    }
+
+    let reminderType;
+    if (this.selectedReminderType === REMINDER_TYPES.NONE) {
+      reminderType = null;
+    } else if (this.selectedReminderType === REMINDER_TYPES.LAST_CUSTOM) {
+      reminderType = REMINDER_TYPES.CUSTOM;
+    } else {
+      reminderType = this.selectedReminderType;
     }
 
     const data = {
-      reminder_type: this.selectedReminderType,
+      reminder_type: reminderType,
       reminder_at: reminderAtISO,
       name: this.name,
       post_id: this.model.postId
@@ -148,6 +210,10 @@ export default Controller.extend(ModalFunctionality, {
     });
   },
 
+  parseCustomDateTime(date, time) {
+    return moment.tz(date + " " + time, this.userTimezone());
+  },
+
   reminderAt() {
     if (!this.selectedReminderType) {
       return;
@@ -167,9 +233,9 @@ export default Controller.extend(ModalFunctionality, {
       case REMINDER_TYPES.NEXT_MONTH:
         return this.nextMonth();
       case REMINDER_TYPES.CUSTOM:
-        const customDateTime = moment.tz(
-          this.customReminderDate + " " + this.customReminderTime,
-          this.userTimezone()
+        const customDateTime = this.parseCustomDateTime(
+          this.customReminderDate,
+          this.customReminderTime
         );
         if (!customDateTime.isValid()) {
           this.setProperties({
@@ -179,6 +245,8 @@ export default Controller.extend(ModalFunctionality, {
           return;
         }
         return customDateTime;
+      case REMINDER_TYPES.LAST_CUSTOM:
+        return this.parsedLastCustomReminderDatetime;
     }
   },
 
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 7adab91b63..192e10fc2f 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -9,10 +9,6 @@
     {{/if}}
 
     <div class="control-group">
-      <label class="control-label" for="name">
-        {{i18n 'post.bookmarks.name'}}
-      </label>
-
       {{input value=name name="name" class="bookmark-name" enter=(action "saveAndClose") placeholder=(i18n "post.bookmarks.name_placeholder")}}
     </div>
 
@@ -36,6 +32,10 @@
           {{tap-tile icon="far-clock" text=nextWeekFormatted tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{tap-tile icon="far-calendar-plus" text=nextMonthFormatted tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+          {{#if showLastCustom}}
+            {{tap-tile icon="undo" text=lastCustomFormatted tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+          {{/if}}
+          {{tap-tile icon="ban" text=(I18n "bookmarks.reminders.none") tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
         {{/tap-tile-grid}}
         {{#if customDateTimeSelected}}
           <div class="control-group">
diff --git a/app/assets/stylesheets/common/components/tap-tile.scss b/app/assets/stylesheets/common/components/tap-tile.scss
index 7e8149650a..d7259710e1 100644
--- a/app/assets/stylesheets/common/components/tap-tile.scss
+++ b/app/assets/stylesheets/common/components/tap-tile.scss
@@ -7,6 +7,7 @@
   $horizontal-tile-padding: 5px;
 
   .tap-tile {
+    color: $primary-high;
     padding: 10px $horizontal-tile-padding;
     display: flex;
     flex-direction: column;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7c2a761c6a..2fa6a8879f 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -321,6 +321,8 @@ en:
         next_week: "Next week <br/>{{date}}"
         next_month: "Next month <br/>{{date}}"
         custom: "Custom date and time"
+        last_custom: "Last <br/>{{date}}"
+        none: "No reminder needed"
 
     drafts:
       resume: "Resume"
@@ -2676,8 +2678,8 @@ en:
         create: "Create bookmark"
         created: "Created"
         name: "Name"
-        name_placeholder: "Name the bookmark to help jog your memory"
-        set_reminder: "Set a reminder"
+        name_placeholder: "What is this bookmark for?"
+        set_reminder: "Remind me"
         actions:
           delete_bookmark:
             name: "Delete bookmark"
diff --git a/test/javascripts/controllers/bookmark-test.js.es6 b/test/javascripts/controllers/bookmark-test.js.es6
index d94d866125..f8fc372011 100644
--- a/test/javascripts/controllers/bookmark-test.js.es6
+++ b/test/javascripts/controllers/bookmark-test.js.es6
@@ -19,22 +19,27 @@ function mockMomentTz(dateString) {
 QUnit.test("showLaterToday when later today is tomorrow do not show", function(
   assert
 ) {
-  mockMomentTz("2019-12-11T13:00:00Z");
+  mockMomentTz("2019-12-11T22:00:00");
 
   assert.equal(BookmarkController.get("showLaterToday"), false);
 });
 
+QUnit.test("showLaterToday when later today is after 5pm", function(assert) {
+  mockMomentTz("2019-12-11T15:00:00");
+  assert.equal(BookmarkController.get("showLaterToday"), false);
+});
+
 QUnit.test(
   "showLaterToday when later today is before the end of the day, show",
   function(assert) {
-    mockMomentTz("2019-12-11T08:00:00Z");
+    mockMomentTz("2019-12-11T10:00:00");
 
     assert.equal(BookmarkController.get("showLaterToday"), true);
   }
 );
 
 QUnit.test("nextWeek gets next week correctly", function(assert) {
-  mockMomentTz("2019-12-11T08:00:00Z");
+  mockMomentTz("2019-12-11T08:00:00");
 
   assert.equal(
     BookmarkController.nextWeek().format("YYYY-MM-DD"),
@@ -43,7 +48,7 @@ QUnit.test("nextWeek gets next week correctly", function(assert) {
 });
 
 QUnit.test("nextMonth gets next month correctly", function(assert) {
-  mockMomentTz("2019-12-11T08:00:00Z");
+  mockMomentTz("2019-12-11T08:00:00");
 
   assert.equal(
     BookmarkController.nextMonth().format("YYYY-MM-DD"),
@@ -54,7 +59,7 @@ QUnit.test("nextMonth gets next month correctly", function(assert) {
 QUnit.test(
   "nextBusinessDay gets next business day of monday correctly if today is friday",
   function(assert) {
-    mockMomentTz("2019-12-13T08:00:00Z");
+    mockMomentTz("2019-12-13T08:00:00");
 
     assert.equal(
       BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
@@ -66,7 +71,7 @@ QUnit.test(
 QUnit.test(
   "nextBusinessDay gets next business day of monday correctly if today is saturday",
   function(assert) {
-    mockMomentTz("2019-12-14T08:00:00Z");
+    mockMomentTz("2019-12-14T08:00:00");
 
     assert.equal(
       BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
@@ -78,7 +83,7 @@ QUnit.test(
 QUnit.test(
   "nextBusinessDay gets next business day of monday correctly if today is sunday",
   function(assert) {
-    mockMomentTz("2019-12-15T08:00:00Z");
+    mockMomentTz("2019-12-15T08:00:00");
 
     assert.equal(
       BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
@@ -90,7 +95,7 @@ QUnit.test(
 QUnit.test(
   "nextBusinessDay gets next business day of thursday correctly if today is wednesday",
   function(assert) {
-    mockMomentTz("2019-12-11T08:00:00Z");
+    mockMomentTz("2019-12-11T08:00:00");
 
     assert.equal(
       BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
@@ -100,7 +105,7 @@ QUnit.test(
 );
 
 QUnit.test("tomorrow gets tomorrow correctly", function(assert) {
-  mockMomentTz("2019-12-11T08:00:00Z");
+  mockMomentTz("2019-12-11T08:00:00");
 
   assert.equal(
     BookmarkController.tomorrow().format("YYYY-MM-DD"),
@@ -112,7 +117,7 @@ QUnit.test(
   "startOfDay changes the time of the provided date to 8:00am correctly",
   function(assert) {
     let dt = moment.tz(
-      "2019-12-11T11:37:16Z",
+      "2019-12-11T11:37:16",
       BookmarkController.currentUser.timezone
     );
 
@@ -126,11 +131,11 @@ QUnit.test(
 QUnit.test(
   "laterToday gets 3 hours from now and if before half-past, it sets the time to half-past",
   function(assert) {
-    mockMomentTz("2019-12-11T08:13:00Z");
+    mockMomentTz("2019-12-11T08:13:00");
 
     assert.equal(
       BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
-      "2019-12-11 21:30:00"
+      "2019-12-11 11:30:00"
     );
   }
 );
@@ -138,11 +143,39 @@ QUnit.test(
 QUnit.test(
   "laterToday gets 3 hours from now and if after half-past, it rounds up to the next hour",
   function(assert) {
-    mockMomentTz("2019-12-11T08:43:00Z");
+    mockMomentTz("2019-12-11T08:43:00");
 
     assert.equal(
       BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
-      "2019-12-11 22:00:00"
+      "2019-12-11 12:00:00"
     );
   }
 );
+
+QUnit.test(
+  "loadLastUsedCustomReminderDatetime fills the custom reminder date + time if present in localStorage",
+  function(assert) {
+    mockMomentTz("2019-12-11T08:00:00");
+    localStorage.lastCustomBookmarkReminderDate = "2019-12-12";
+    localStorage.lastCustomBookmarkReminderTime = "08:00";
+
+    BookmarkController.loadLastUsedCustomReminderDatetime();
+
+    assert.equal(BookmarkController.lastCustomReminderDate, "2019-12-12");
+    assert.equal(BookmarkController.lastCustomReminderTime, "08:00");
+  }
+);
+
+QUnit.test(
+  "loadLastUsedCustomReminderDatetime does not fills the custom reminder date + time if the datetime in localStorage is < now",
+  function(assert) {
+    mockMomentTz("2019-12-11T08:00:00");
+    localStorage.lastCustomBookmarkReminderDate = "2019-12-11";
+    localStorage.lastCustomBookmarkReminderTime = "07:00";
+
+    BookmarkController.loadLastUsedCustomReminderDatetime();
+
+    assert.equal(BookmarkController.lastCustomReminderDate, null);
+    assert.equal(BookmarkController.lastCustomReminderTime, null);
+  }
+);

From f861345888ba2939114ac6c4369c3aa04f208043 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 16 Mar 2020 14:11:11 +0530
Subject: [PATCH 139/633] FIX: check for existence of post before creating
 notification

---
 app/services/post_alerter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index ea1b810590..ae560ec2fd 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -280,7 +280,7 @@ class PostAlerter
 
     DiscourseEvent.trigger(:before_create_notification, user, type, post, opts)
 
-    return if user.blank? || user.bot?
+    return if user.blank? || user.bot? || post.blank?
     return if (topic = post.topic).blank?
 
     is_liked = type == Notification.types[:liked]

From 0c71f7bbd1cd83aa841908ab7912ad3812c03529 Mon Sep 17 00:00:00 2001
From: Rishabh <rishabh.nambiar@discourse.org>
Date: Mon, 16 Mar 2020 16:08:58 +0530
Subject: [PATCH 140/633] UX: Improve suspect user copy on /review

---
 config/locales/server.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index ab280dab92..d034819d16 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -4700,7 +4700,7 @@ en:
       invite_only: "All new users should be invited. See `invite_only`."
       email_auth_res_enqueue: "This email failed a DMARC check, it most likely isn't from whom it seems to be from. Check the raw email headers for more information."
       email_spam: "This email was flagged as spam by the header defined in `email_in_spam_header`."
-      suspect_user: "This user has a bio/website in their profile, without having read any posts. This can indicate a spam account. See `approve_suspect_users`."
+      suspect_user: "This new user entered profile information without reading any topics or posts, which strongly suggests they may be a spammer. See `approve_suspect_users`."
 
     actions:
       agree:

From ef40b46611a01c4d5a4ae558530a2e0e8008e1e5 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Mon, 16 Mar 2020 17:42:04 +0530
Subject: [PATCH 141/633] DEV: fix "addNavigationBarItem" documentation (#9207)

* the filter should return the boolean result
* custom href should return the relative url value
---
 app/assets/javascripts/discourse/lib/plugin-api.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js b/app/assets/javascripts/discourse/lib/plugin-api.js
index cdaaad0263..9439b16319 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js
@@ -755,8 +755,8 @@ class PluginApi {
    *   displayName: "bugs"
    *   href: "/c/bugs",
    *   init: (navItem, category) => { if (category) { navItem.set("category", category)  } }
-   *   customFilter: (category, args, router) => { category && category.name !== 'bug' }
-   *   customHref: (category, args, router) => {  if (category && category.name) === 'not-a-bug') "/a-feature"; },
+   *   customFilter: (category, args, router) => { return category && category.name !== 'bug' }
+   *   customHref: (category, args, router) => {  if (category && category.name) === 'not-a-bug') return "/a-feature"; },
    *   before: "top",
    *   forceActive(category, args, router) => router.currentURL === "/a/b/c/d";
    * })

From 81ba516741c66a9cf815830ca4dc9a23ce345c9b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 13:17:41 +0100
Subject: [PATCH 142/633] Build(deps): Bump rubyzip from 2.2.0 to 2.3.0 (#9208)

Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v2.2.0...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 60177e792d..87730c3538 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -354,7 +354,7 @@ GEM
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)
       nokogiri (>= 1.6.0)
-    rubyzip (2.2.0)
+    rubyzip (2.3.0)
     safe_yaml (1.0.5)
     sanitize (5.1.0)
       crass (~> 1.0.2)

From aad43a6223d5e819cc95e651c0e68a88511ed191 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 13:18:07 +0100
Subject: [PATCH 143/633] Build(deps-dev): Bump parallel_tests from 2.31.0 to
 2.32.0 (#9210)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.31.0 to 2.32.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.31.0...v2.32.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 87730c3538..0022fe8319 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -250,7 +250,7 @@ GEM
     openssl-signature_algorithm (0.3.0)
     optimist (3.0.0)
     parallel (1.19.1)
-    parallel_tests (2.31.0)
+    parallel_tests (2.32.0)
       parallel
     parser (2.7.0.4)
       ast (~> 2.4.0)

From 5e4cf244a581eb8cda95af1d2b9e310e59119dd4 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 16 Mar 2020 14:25:45 +0200
Subject: [PATCH 145/633] FIX: Show time input in poll builder (#9128)

---
 .../discourse/templates/modal/poll-ui-builder.hbs           | 3 +++
 plugins/poll/assets/stylesheets/common/poll.scss            | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index e04aebbd8a..28e9f7c8e4 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -101,6 +101,9 @@
         <div class="input-group poll-date">
           {{date-picker-future value=date containerId="date-container"}}
           {{input type="time" value=time}}
+        </div>
+
+        <div class="input-group poll-date">
           <div id="date-container"></div>
         </div>
       {{/if}}
diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index 8306f7bfcf..c683684c9e 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -200,3 +200,9 @@ body.crawler {
     }
   }
 }
+
+.poll-ui-builder {
+  .poll-date input {
+    height: 30px;
+  }
+}

From fb8b0ca1973ea6de0ad5fd89adef806090da637b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 16 Mar 2020 12:37:43 +0000
Subject: [PATCH 146/633] DEV: Remove unused middleware (#9203)

This has not been used since January 2014, per 166a8d29
---
 config/initializers/050-force_https.rb | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 config/initializers/050-force_https.rb

diff --git a/config/initializers/050-force_https.rb b/config/initializers/050-force_https.rb
deleted file mode 100644
index a3bdb5d3b2..0000000000
--- a/config/initializers/050-force_https.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# tiny middleware to force https if needed
-class Discourse::ForceHttpsMiddleware
-
-  def initialize(app, config = {})
-    @app = app
-  end
-
-  def call(env)
-    env['rack.url_scheme'] = 'https' if SiteSetting.force_https
-    @app.call(env)
-  end
-
-end

From ce50695bff8d908e746ab0ec0bebbdf392ece530 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 16 Mar 2020 12:42:23 +0000
Subject: [PATCH 147/633] DEV: Bump OAuth2 from 1.4.2 to 1.4.4

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0022fe8319..98ed5e231e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -209,7 +209,7 @@ GEM
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
     oauth (0.5.4)
-    oauth2 (1.4.2)
+    oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
@@ -547,4 +547,4 @@ DEPENDENCIES
   yaml-lint
 
 BUNDLED WITH
-   2.1.1
+   2.1.4

From c02273eb8bd0ba94623f90309c442fe2a25bd5dc Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Mon, 16 Mar 2020 09:51:28 -0300
Subject: [PATCH 148/633] FIX: Use delete_all_posts_max to improve consistency
 when using the delete button from the admin view (#9194)

---
 app/assets/javascripts/admin/controllers/admin-user-index.js | 3 ++-
 app/assets/javascripts/discourse/models/user.js              | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js b/app/assets/javascripts/admin/controllers/admin-user-index.js
index 0460c314c7..7bd7abe341 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js
@@ -199,7 +199,8 @@ export default Controller.extend(CanCheckEmails, {
 
     destroy() {
       const postCount = this.get("model.post_count");
-      if (postCount <= 5) {
+      const maxPostCount = this.siteSettings.delete_all_posts_max;
+      if (postCount <= maxPostCount) {
         return this.model.destroy({ deletePosts: true });
       } else {
         return this.model.destroy();
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index a7d9ce8b29..421376609a 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -45,7 +45,8 @@ const User = RestModel.extend({
 
   @discourseComputed("can_be_deleted", "post_count")
   canBeDeleted(canBeDeleted, postCount) {
-    return canBeDeleted && postCount <= 5;
+    const maxPostCount = Discourse.SiteSettings.delete_all_posts_max;
+    return canBeDeleted && postCount <= maxPostCount;
   },
 
   @discourseComputed()

From 4663304775ff7f288935344b9265d21bdb2fc8cb Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Mon, 16 Mar 2020 09:52:08 -0300
Subject: [PATCH 149/633] FEATURE: Show rejected posts count in user summary
 (#9204)

---
 .../javascripts/discourse/templates/user.hbs  |  8 ++
 app/controllers/users_controller.rb           |  5 +-
 app/models/user.rb                            |  8 ++
 config/locales/client.en.yml                  |  1 +
 spec/models/user_spec.rb                      | 73 ++++++++++++-------
 5 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 290b791961..101e25d6c8 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -16,6 +16,14 @@
             {{/link-to}}
           </div>
         {{/if}}
+        {{#if model.number_of_rejected_posts}}
+          <div>
+            {{#link-to 'review' (query-params username=model.username status='rejected' type='ReviewableQueuedPost')}}
+              <span class="flagged-posts">{{model.number_of_rejected_posts}}</span>{{i18n 'user.staff_counters.rejected_posts'}}
+            {{/link-to}}
+          </div>
+        {{/if}}
+        
         {{#if model.number_of_deleted_posts}}
           <div>
             {{#link-to 'user.deletedPosts' model}}
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6acf7651eb..d3289b9d67 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1116,7 +1116,10 @@ class UsersController < ApplicationController
 
     result = {}
 
-    %W{number_of_deleted_posts number_of_flagged_posts number_of_flags_given number_of_suspensions warnings_received_count}.each do |info|
+    %W{
+      number_of_deleted_posts number_of_flagged_posts number_of_flags_given
+      number_of_suspensions warnings_received_count number_of_rejected_posts
+    }.each do |info|
       result[info] = @user.public_send(info)
     end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 4b0437261c..3ddc498bc3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1125,6 +1125,14 @@ class User < ActiveRecord::Base
       .count
   end
 
+  def number_of_rejected_posts
+    Post.with_deleted
+      .where(user_id: self.id)
+      .joins('INNER JOIN reviewables r ON posts.id = r.target_id')
+      .where(r: { status: Reviewable.statuses[:rejected], type: ReviewableQueuedPost.name })
+      .count
+  end
+
   def number_of_flags_given
     PostAction.where(user_id: self.id)
       .where(disagreed_at: nil)
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2fa6a8879f..9ab7d5c5d7 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -947,6 +947,7 @@ en:
         deleted_posts: "deleted posts"
         suspensions: "suspensions"
         warnings_received: "warnings"
+        rejected_posts: "rejected posts"
 
       messages:
         all: "All"
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 3e62fd0588..1e3998db7d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1522,48 +1522,65 @@ describe User do
     end
   end
 
-  describe "number_of_flags_given" do
-
+  describe 'staff info' do
     fab!(:user) { Fabricate(:user) }
-    fab!(:moderator) { Fabricate(:moderator) }
 
-    it "doesn't count disagreed flags" do
-      post_agreed = Fabricate(:post)
-      PostActionCreator.inappropriate(user, post_agreed).reviewable.perform(moderator, :agree_and_keep)
+    describe "#number_of_flags_given" do
+      fab!(:moderator) { Fabricate(:moderator) }
 
-      post_deferred = Fabricate(:post)
-      PostActionCreator.inappropriate(user, post_deferred).reviewable.perform(moderator, :ignore)
+      it "doesn't count disagreed flags" do
+        post_agreed = Fabricate(:post)
+        PostActionCreator.inappropriate(user, post_agreed).reviewable.perform(moderator, :agree_and_keep)
 
-      post_disagreed = Fabricate(:post)
-      PostActionCreator.inappropriate(user, post_disagreed).reviewable.perform(moderator, :disagree)
+        post_deferred = Fabricate(:post)
+        PostActionCreator.inappropriate(user, post_deferred).reviewable.perform(moderator, :ignore)
 
-      expect(user.number_of_flags_given).to eq(2)
+        post_disagreed = Fabricate(:post)
+        PostActionCreator.inappropriate(user, post_disagreed).reviewable.perform(moderator, :disagree)
+
+        expect(user.number_of_flags_given).to eq(2)
+      end
     end
 
-  end
+    describe "number_of_deleted_posts" do
+      fab!(:moderator) { Fabricate(:moderator) }
 
-  describe "number_of_deleted_posts" do
+      it "counts all the posts" do
+        # at least 1 "unchanged" post
+        Fabricate(:post, user: user)
 
-    fab!(:user) { Fabricate(:user, id: 2) }
-    fab!(:moderator) { Fabricate(:moderator) }
+        post_deleted_by_moderator = Fabricate(:post, user: user)
+        PostDestroyer.new(moderator, post_deleted_by_moderator).destroy
 
-    it "counts all the posts" do
-      # at least 1 "unchanged" post
-      Fabricate(:post, user: user)
+        post_deleted_by_user = Fabricate(:post, user: user, post_number: 2)
+        PostDestroyer.new(user, post_deleted_by_user).destroy
 
-      post_deleted_by_moderator = Fabricate(:post, user: user)
-      PostDestroyer.new(moderator, post_deleted_by_moderator).destroy
+        # fake stub deletion
+        post_deleted_by_user.update_columns(updated_at: 2.days.ago)
+        PostDestroyer.destroy_stubs
 
-      post_deleted_by_user = Fabricate(:post, user: user, post_number: 2)
-      PostDestroyer.new(user, post_deleted_by_user).destroy
-
-      # fake stub deletion
-      post_deleted_by_user.update_columns(updated_at: 2.days.ago)
-      PostDestroyer.destroy_stubs
-
-      expect(user.number_of_deleted_posts).to eq(2)
+        expect(user.number_of_deleted_posts).to eq(2)
+      end
     end
 
+    describe '#number_of_rejected_posts' do
+      it 'counts rejected posts' do
+        post = Fabricate(:post, user: user)
+
+        Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:rejected])
+
+        expect(user.number_of_rejected_posts).to eq(1)
+      end
+
+      it 'ignore non-rejected posts' do
+        post = Fabricate(:post, user: user)
+
+        Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:approved])
+
+        expect(user.number_of_rejected_posts).to eq(0)
+
+      end
+    end
   end
 
   describe "new_user?" do

From 610261f48e2cbe7c95bbfea47c804f5ed8bed8af Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 16 Mar 2020 13:12:10 +0000
Subject: [PATCH 150/633] DEV: Bump omniauth from 1.9.0 to 1.9.1

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 98ed5e231e..dc6acaa931 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -216,8 +216,8 @@ GEM
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     oj (3.10.5)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
     omniauth-facebook (6.0.0)
       omniauth-oauth2 (~> 1.2)

From 269ec70ba8d5997c7b6a49f97cafc774e4dcf9d2 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 16 Mar 2020 12:05:24 -0600
Subject: [PATCH 151/633] DEV: Only show deprecation message for
 non-whitelisted requests

As another step toward fully dreprecating query parameter authentication
in API requests this change prevents an admin dashboard message from
showing up if using a whitelisted route like rss feeds or the
mail-receiver route.
---
 lib/auth/default_current_user_provider.rb | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index caee9ac1cf..e56e4cfa23 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -295,10 +295,7 @@ class Auth::DefaultCurrentUserProvider
 
       # Check for deprecated api auth
       if !header_api_key?
-        if request.path == "/admin/email/handle_mail"
-          # Notify admins that the mail receiver is still using query auth and to update
-          AdminDashboardData.add_problem_message('dashboard.update_mail_receiver', 1.day)
-        else
+        unless is_whitelisted_query_param_auth_route?(request)
           # Notify admins of deprecated auth method
           AdminDashboardData.add_problem_message('dashboard.deprecated_api_usage', 1.day)
         end
@@ -330,6 +327,19 @@ class Auth::DefaultCurrentUserProvider
 
   private
 
+  def is_whitelisted_query_param_auth_route?(request)
+    (is_rss_feed?(request) || is_handle_mail?(request))
+  end
+
+  def is_rss_feed?(request)
+    return true if request.path.match?(/\/(c|t){1}\/\S*.(rss|json)/) && request.get? # topic or category route
+    return true if request.path.match?(/\/(latest|top|categories).(rss|json)/) && request.get? # specific routes with rss
+  end
+
+  def is_handle_mail?(request)
+    return true if request.path == "/admin/email/handle_mail" && request.post?
+  end
+
   def header_api_key?
     !!@env[HEADER_API_KEY]
   end

From e50abe1317e019fd99172167e7aff0df3a747455 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 16 Mar 2020 15:32:38 -0300
Subject: [PATCH 152/633] FIX: sync-alt is used on composer draft indicator

---
 lib/svg_sprite/svg_sprite.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 8751f114dc..a1f1c12822 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -173,6 +173,7 @@ module SvgSprite
     "step-backward",
     "step-forward",
     "stream",
+    "sync-alt",
     "sync",
     "table",
     "tag",

From 16799da580a925b334eb623d8f0e0b96e8175dc7 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 17 Mar 2020 15:15:22 +1000
Subject: [PATCH 153/633] FIX: Improve bookmark modal on mobile and bookmark
 sync rake task (#9221)

* Improve the bookmark mobile on modal so it doesn't go all the way to the edge and the custom datetime input is easier to use
* Improve the rake task for syncing so it does not error for topics that no longer exist and batches 2000 inserts at a time, clearing the array each time
---
 .../discourse/templates/modal/bookmark.hbs    |  4 +--
 .../common/components/bookmark-modal.scss     | 26 ++++++++++++++++++
 lib/tasks/bookmarks.rake                      | 27 ++++++++++---------
 spec/tasks/bookmarks_spec.rb                  | 11 ++++++++
 4 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 192e10fc2f..2fa0345732 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -38,14 +38,14 @@
           {{tap-tile icon="ban" text=(I18n "bookmarks.reminders.none") tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
         {{/tap-tile-grid}}
         {{#if customDateTimeSelected}}
-          <div class="control-group">
+          <div class="control-group custom-date-time-wrap">
             {{d-icon "calendar-alt"}}
             {{date-picker-future
               value=customReminderDate
               onSelect=(action (mut customReminderDate))
             }}
             {{d-icon "far-clock"}}
-            {{input placeholder="--:--" type="time" value=customReminderTime}}
+            {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
           </div>
         {{/if}}
 
diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index 8df4d57203..daad95285a 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -1,7 +1,11 @@
 .bookmark-with-reminder.modal {
+  .modal-inner-container {
+    max-width: 95%;
+  }
   .modal-body {
     max-width: 410px;
     min-width: 380px;
+    box-sizing: border-box;
 
     .control-label {
       font-weight: 700;
@@ -11,4 +15,26 @@
       width: 100%;
     }
   }
+
+  .custom-date-time-wrap {
+    display: flex;
+    flex-direction: row;
+    align-items: baseline;
+
+    .svg-icon {
+      padding: 0 5px;
+    }
+
+    .date-picker-wrapper {
+      flex: 1;
+
+      .date-picker {
+        width: 100%;
+      }
+    }
+
+    .time-input {
+      flex: 1;
+    }
+  }
 }
diff --git a/lib/tasks/bookmarks.rake b/lib/tasks/bookmarks.rake
index d8f99281cc..db48125b07 100644
--- a/lib/tasks/bookmarks.rake
+++ b/lib/tasks/bookmarks.rake
@@ -17,6 +17,7 @@ task "bookmarks:sync_to_table", [:sync_limit] => :environment do |_t, args|
     .joins(:post)
     .where(deleted_at: nil)
     .joins('LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id')
+    .joins('INNER JOIN topics ON topics.id = posts.topic_id')
     .where('bookmarks.id IS NULL')
 
   # if sync_limit is provided as an argument this will cap
@@ -27,11 +28,13 @@ task "bookmarks:sync_to_table", [:sync_limit] => :environment do |_t, args|
   end
 
   post_action_bookmark_count = post_action_bookmarks.count('post_actions.id')
-  bookmarks_to_create = []
   i = 0
 
-  Bookmark.transaction do
-    post_action_bookmarks.find_each(batch_size: 1000) do |pab|
+  post_action_bookmarks.find_each(batch_size: 2000) do |pab|
+    # clear at start of each batch to only insert X at a time
+    bookmarks_to_create = []
+
+    Bookmark.transaction do
       RakeHelpers.print_status_with_label("Creating post new bookmarks.......", i, post_action_bookmark_count)
       now = Time.zone.now
       bookmarks_to_create << {
@@ -43,16 +46,16 @@ task "bookmarks:sync_to_table", [:sync_limit] => :environment do |_t, args|
       }
 
       i += 1
-    end
 
-    # this will ignore conflicts in the bookmarks table so
-    # if the user already has a post bookmarked in the new way,
-    # then we don't error and keep on truckin'
-    #
-    # we shouldn't have duplicates here at any rate because of
-    # the above LEFT JOIN but best to be safe knowing this
-    # won't blow up
-    Bookmark.insert_all(bookmarks_to_create)
+      # this will ignore conflicts in the bookmarks table so
+      # if the user already has a post bookmarked in the new way,
+      # then we don't error and keep on truckin'
+      #
+      # we shouldn't have duplicates here at any rate because of
+      # the above LEFT JOIN but best to be safe knowing this
+      # won't blow up
+      Bookmark.insert_all(bookmarks_to_create)
+    end
   end
 
   RakeHelpers.print_status_with_label("Bookmark creation complete!            ", i, post_action_bookmark_count)
diff --git a/spec/tasks/bookmarks_spec.rb b/spec/tasks/bookmarks_spec.rb
index 68f8588e0b..91249c59f8 100644
--- a/spec/tasks/bookmarks_spec.rb
+++ b/spec/tasks/bookmarks_spec.rb
@@ -43,6 +43,17 @@ RSpec.describe "bookmarks tasks" do
     expect(Bookmark.all.count).to eq(1)
   end
 
+  it "skips post actions where the post topic no longer exists and does not error" do
+    post1.topic.delete
+    post1.reload
+    expect { invoke_task }.not_to raise_error
+  end
+
+  it "skips post actions where the post no longer exists and does not error" do
+    post1.delete
+    expect { invoke_task }.not_to raise_error
+  end
+
   def create_post_actions_and_existing_bookmarks
     Fabricate(:post_action, user: user1, post: post1, post_action_type_id: PostActionType.types[:bookmark])
     Fabricate(:post_action, user: user2, post: post2, post_action_type_id: PostActionType.types[:bookmark])

From 949bb74add770d988b766ebd68a5431eefb032ed Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 17 Mar 2020 16:53:12 +1000
Subject: [PATCH 154/633] FIX: Add basePath to link for "no timezone" in
 bookmark modal

---
 app/assets/javascripts/discourse/controllers/bookmark.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 0a8ba8a063..375a9a5341 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -169,6 +169,11 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
+  @discourseComputed()
+  basePath() {
+    return Discourse.BaseUri;
+  },
+
   @discourseComputed()
   userHasTimezoneSet() {
     return !_.isEmpty(this.userTimezone());

From 12c29ae955a0834851345cd0e8fd07439ec7dcb5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 09:53:44 +0000
Subject: [PATCH 155/633] Build(deps): Bump rbtrace from 0.4.11 to 0.4.12

Bumps [rbtrace](https://github.com/tmm1/rbtrace) from 0.4.11 to 0.4.12.
- [Release notes](https://github.com/tmm1/rbtrace/releases)
- [Commits](https://github.com/tmm1/rbtrace/compare/v0.4.11...v0.4.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index dc6acaa931..bc54d3f593 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -296,7 +296,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbtrace (0.4.11)
+    rbtrace (0.4.12)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)

From e72c0544b0f2e135dfa57367f983a02b127853ca Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 17 Mar 2020 11:06:17 +0000
Subject: [PATCH 156/633] UX: Refresh group membership list when removing users
 or changing owners

---
 app/assets/javascripts/discourse/models/group.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/group.js b/app/assets/javascripts/discourse/models/group.js
index c799f78314..43e1b525bc 100644
--- a/app/assets/javascripts/discourse/models/group.js
+++ b/app/assets/javascripts/discourse/models/group.js
@@ -103,14 +103,14 @@ const Group = RestModel.extend({
     return ajax(`/admin/groups/${this.id}/owners.json`, {
       type: "DELETE",
       data: { user_id: member.id }
-    }).then(() => this.findMembers());
+    }).then(() => this.findMembers({}, true));
   },
 
   removeMember(member, params) {
     return ajax(`/groups/${this.id}/members.json`, {
       type: "DELETE",
       data: { user_id: member.id }
-    }).then(() => this.findMembers(params));
+    }).then(() => this.findMembers(params, true));
   },
 
   addMembers(usernames, filter) {
@@ -134,7 +134,7 @@ const Group = RestModel.extend({
       if (filter) {
         this._filterMembers(response);
       } else {
-        this.findMembers();
+        this.findMembers({}, true);
       }
     });
   },

From 1b2019e7ebd4f54e6e36f17ea77b50d941c1345a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 14:09:45 +0300
Subject: [PATCH 157/633] Build(deps): Bump rack-mini-profiler from 1.1.6 to
 2.0.1 (#9222)

* Build(deps): Bump rack-mini-profiler from 1.1.6 to 2.0.1

Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 1.1.6 to 2.0.1.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.6...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Enable rails patches

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: OsamaSayegh <asooomaasoooma90@gmail.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 278e0fb961..73f97c0533 100644
--- a/Gemfile
+++ b/Gemfile
@@ -205,7 +205,7 @@ gem 'htmlentities', require: false
 #  we are open to it. by deferring require to the initializer we can configure discourse installs without it
 
 gem 'flamegraph', require: false
-gem 'rack-mini-profiler', require: false
+gem 'rack-mini-profiler', require: ['enable_rails_patches']
 
 gem 'unicorn', require: false, platform: :mri
 gem 'puma', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index bc54d3f593..4a682471dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -268,7 +268,7 @@ GEM
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.0.8)
-    rack-mini-profiler (1.1.6)
+    rack-mini-profiler (2.0.1)
       rack (>= 1.2.0)
     rack-protection (2.0.8.1)
       rack

From 43b38dbbc2eea1dcd21e1605bba431574421e92f Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 17 Mar 2020 17:48:12 +0200
Subject: [PATCH 158/633] FIX: Dismiss notifications on middle click (#9098)

---
 .../widgets/default-notification-item.js      | 12 +++++
 .../default-notification-item-test.js.es6     | 53 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 test/javascripts/widgets/default-notification-item-test.js.es6

diff --git a/app/assets/javascripts/discourse/widgets/default-notification-item.js b/app/assets/javascripts/discourse/widgets/default-notification-item.js
index 49d70e086e..da741f45aa 100644
--- a/app/assets/javascripts/discourse/widgets/default-notification-item.js
+++ b/app/assets/javascripts/discourse/widgets/default-notification-item.js
@@ -13,6 +13,7 @@ import {
 import { setTransientHeader } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 import { iconNode } from "discourse-common/lib/icon-library";
+import { ajax } from "discourse/lib/ajax";
 
 export const DefaultNotificationItem = createWidget(
   "default-notification-item",
@@ -154,6 +155,17 @@ export const DefaultNotificationItem = createWidget(
           );
         }
       });
+    },
+
+    mouseUp(event) {
+      // dismiss notification on middle click
+      if (event.which === 2 && !this.attrs.read) {
+        this.attrs.set("read", true);
+        ajax("/notifications/mark-read", {
+          method: "PUT",
+          data: this.attrs.id
+        });
+      }
     }
   }
 );
diff --git a/test/javascripts/widgets/default-notification-item-test.js.es6 b/test/javascripts/widgets/default-notification-item-test.js.es6
new file mode 100644
index 0000000000..b701407243
--- /dev/null
+++ b/test/javascripts/widgets/default-notification-item-test.js.es6
@@ -0,0 +1,53 @@
+import EmberObject from "@ember/object";
+import pretender from "helpers/create-pretender";
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
+
+moduleForWidget("default-notification-item");
+
+widgetTest("sets notification as read on middle click", {
+  template: '{{mount-widget widget="default-notification-item" args=args}}',
+  beforeEach() {
+    this.set(
+      "args",
+      EmberObject.create({
+        id: 3,
+        user_id: 1,
+        notification_type: 6,
+        read: false,
+        created_at: "2020-01-01T12:00:00.000Z",
+        post_number: 1,
+        topic_id: 10,
+        fancy_title: "Greetings!",
+        slug: "greetings",
+        data: {
+          topic_title: "Greetings!",
+          original_post_id: 14,
+          original_post_type: 1,
+          original_username: "discobot",
+          revision_number: null,
+          display_username: "discobot"
+        }
+      })
+    );
+  },
+  async test(assert) {
+    let requests = 0;
+    pretender.put("/notifications/mark-read", () => {
+      ++requests;
+      return [200, { "Content-Type": "application/json" }, { success: true }];
+    });
+
+    assert.equal(find("li.read").length, 0);
+
+    await $(document).trigger(
+      $.Event("mouseup", {
+        target: find("li")[0],
+        button: 1,
+        which: 2
+      })
+    );
+
+    assert.equal(find("li.read").length, 1);
+    assert.equal(requests, 1);
+  }
+});

From e950471c0f779ce86453b8a87d4925e0e8db996b Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 17 Mar 2020 16:48:24 +0100
Subject: [PATCH 159/633] DEV: Replace User.unstage and User#unstage API with
 User#unstage! (#8906)

* DEV: Replace User.unstage and User#unstage API with User#unstage!

Quoting @SamSaffron:

> User.unstage mixes concerns of both unstaging users and updating params which is fragile/surprising.
> u.unstage destroys notifications and raises a user_unstaged event prior to the user becoming unstaged and the user object being saved.

User#unstage! no longer updates user attributes and saves the object before triggering the `user_unstaged` event.

* Update one more spec

* Assign attributes after unstaging
---
 .../users/omniauth_callbacks_controller.rb    |  3 +-
 app/controllers/users_controller.rb           | 12 +++++--
 app/models/discourse_single_sign_on.rb        |  3 +-
 app/models/invite_redeemer.rb                 | 13 +++----
 app/models/user.rb                            | 21 +++++------
 lib/auth/default_current_user_provider.rb     |  9 +----
 spec/models/group_spec.rb                     |  3 +-
 spec/models/post_spec.rb                      |  4 +--
 spec/models/user_spec.rb                      | 35 ++++++-------------
 9 files changed, 41 insertions(+), 62 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 36548585f3..881fb3e9ec 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -113,8 +113,7 @@ class Users::OmniauthCallbacksController < ApplicationController
 
     # automatically activate/unstage any account if a provider marked the email valid
     if @auth_result.email_valid && @auth_result.email == user.email
-      user.unstage
-      user.save
+      user.unstage!
 
       if !user.active || !user.email_confirmed?
         user.update!(password: SecureRandom.hex)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d3289b9d67..fde828aee6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -436,8 +436,16 @@ class UsersController < ApplicationController
     params[:locale] ||= I18n.locale unless current_user
 
     new_user_params = user_params.except(:timezone)
-    user = User.unstage(new_user_params)
-    user = User.new(new_user_params) if user.nil?
+
+    user = User.where(staged: true).with_email(new_user_params[:email].strip.downcase).first
+
+    if user
+      user.active = false
+      user.unstage!
+    end
+
+    user ||= User.new
+    user.attributes = new_user_params
 
     # Handle API approval
     ReviewableUser.set_approved_fields!(user, current_user) if user.approved?
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 9d72a9cc98..bc0916078f 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -74,8 +74,7 @@ class DiscourseSingleSignOn < SingleSignOn
     end
 
     # ensure it's not staged anymore
-    user.unstage
-    user.save
+    user.unstage!
 
     change_external_attributes_and_override(sso_record, user)
 
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index f3eb839cdc..68a415d274 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -15,26 +15,27 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
 
   # extracted from User cause it is very specific to invites
   def self.create_user_from_invite(invite, username, name, password = nil, user_custom_fields = nil, ip_address = nil)
+    user = User.where(staged: true).with_email(invite.email.strip.downcase).first
+    user.unstage! if user
+
+    user ||= User.new
+
     if username && UsernameValidator.new(username).valid_format? && User.username_available?(username)
       available_username = username
     else
       available_username = UserNameSuggester.suggest(invite.email)
     end
-    available_name = name || available_username
 
-    user_params = {
+    user.attributes = {
       email: invite.email,
       username: available_username,
-      name: available_name,
+      name: name || available_username,
       active: false,
       trust_level: SiteSetting.default_invitee_trust_level,
       ip_address: ip_address,
       registration_ip_address: ip_address
     }
 
-    user = User.unstage(user_params)
-    user = User.new(user_params) if user.nil?
-
     if !SiteSetting.must_approve_users? || (SiteSetting.must_approve_users? && invite.invited_by.staff?)
       ReviewableUser.set_approved_fields!(user, invite.invited_by)
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index 3ddc498bc3..3993d4ea79 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -363,24 +363,19 @@ class User < ActiveRecord::Base
     user
   end
 
-  def unstage
+  def unstage!
     if self.staged
-      self.staged = false
-      self.custom_fields[FROM_STAGED] = true
-      self.notifications.destroy_all
+      ActiveRecord::Base.transaction do
+        self.staged = false
+        self.custom_fields[FROM_STAGED] = true
+        self.notifications.destroy_all
+        save!
+      end
+
       DiscourseEvent.trigger(:user_unstaged, self)
     end
   end
 
-  def self.unstage(params)
-    if user = User.where(staged: true).with_email(params[:email].strip.downcase).first
-      params.each { |k, v| user.public_send("#{k}=", v) }
-      user.active = false
-      user.unstage
-    end
-    user
-  end
-
   def self.suggest_name(string)
     return "" if string.blank?
     (string[/\A[^@]+/].presence || string[/[^@]+\z/]).tr(".", " ").titleize
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index e56e4cfa23..ca8ec4d197 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -167,7 +167,7 @@ class Auth::DefaultCurrentUserProvider
       impersonate: opts[:impersonate])
 
     cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token)
-    unstage_user(user)
+    user.unstage!
     make_developer_admin(user)
     enable_bootstrap_mode(user)
 
@@ -191,13 +191,6 @@ class Auth::DefaultCurrentUserProvider
     hash
   end
 
-  def unstage_user(user)
-    if user.staged
-      user.unstage
-      user.save
-    end
-  end
-
   def make_developer_admin(user)
     if  user.active? &&
         !user.admin &&
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index d215a89458..96e7f27757 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -232,8 +232,7 @@ describe Group do
 
       expect(GroupUser.where(user_id: staged.id).count).to eq(0)
 
-      staged.unstage
-      staged.save!
+      staged.unstage!
 
       expect(GroupUser.where(user_id: staged.id).count).to eq(2)
     end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index b09245460b..903f5c10b0 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1123,7 +1123,7 @@ describe Post do
       SiteSetting.newuser_max_links = 3
       user = Fabricate(:user, staged: true, trust_level: 0)
       user.created_at = 1.hour.ago
-      user.unstage
+      user.unstage!
       post = Fabricate(:post, raw: raw, user: user)
       expect(post.has_host_spam?).to eq(true)
     end
@@ -1133,7 +1133,7 @@ describe Post do
       SiteSetting.newuser_max_links = 3
       user = Fabricate(:user, staged: true, trust_level: 0)
       user.created_at = 2.days.ago
-      user.unstage
+      user.unstage!
       post = Fabricate(:post, raw: raw, user: user)
       expect(post.has_host_spam?).to eq(false)
     end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 1e3998db7d..995a532290 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1840,44 +1840,29 @@ describe User do
     end
   end
 
-  describe "#unstage" do
-    let!(:staged_user) { Fabricate(:staged, email: 'staged@account.com', active: true, username: 'staged1', name: 'Stage Name') }
-    let(:params) { { email: 'staged@account.com', active: true, username: 'unstaged1', name: 'Foo Bar' } }
+  describe "#unstage!" do
+    let!(:user) { Fabricate(:staged, email: 'staged@account.com', active: true, username: 'staged1', name: 'Stage Name') }
 
     it "correctly unstages a user" do
-      user = User.unstage(params)
-
-      expect(user.id).to eq(staged_user.id)
-      expect(user.username).to eq('unstaged1')
-      expect(user.name).to eq('Foo Bar')
-      expect(user.active).to eq(false)
-      expect(user.email).to eq('staged@account.com')
+      user.unstage!
       expect(user.staged).to eq(false)
     end
 
-    it "returns nil when the user cannot be unstaged" do
-      Fabricate(:coding_horror)
-      expect(User.unstage(email: 'jeff@somewhere.com')).to be_nil
-      expect(User.unstage(email: 'no@account.com')).to be_nil
-    end
-
     it "removes all previous notifications during unstaging" do
-      Fabricate(:notification, user: staged_user)
-      Fabricate(:private_message_notification, user: staged_user)
-      staged_user.reload
+      Fabricate(:notification, user: user)
+      Fabricate(:private_message_notification, user: user)
+      expect(user.total_unread_notifications).to eq(2)
 
-      expect(staged_user.total_unread_notifications).to eq(2)
-      user = User.unstage(params)
+      user.unstage!
+      user.reload
       expect(user.total_unread_notifications).to eq(0)
       expect(user.staged).to eq(false)
     end
 
     it "triggers an event" do
-      unstaged_user = nil
-      event = DiscourseEvent.track_events { unstaged_user = User.unstage(params) }.first
-
+      event = DiscourseEvent.track_events { user.unstage! }.first
       expect(event[:event_name]).to eq(:user_unstaged)
-      expect(event[:params].first).to eq(unstaged_user)
+      expect(event[:params].first).to eq(user)
     end
   end
 

From 919e405c4832c5901a616953e1df947717c37743 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Tue, 17 Mar 2020 10:39:24 -0600
Subject: [PATCH 160/633] FIX: Don't display webhooks for inactive plugins
 (#9206)

* FIX: Don't display webhooks for inactive plugins

This commit ensures that we don't show webhooks for plugins that are not
installed or that are disabled.

Bug report:

https://meta.discourse.org/t/webhookeventtype-and-the-solved-and-assign-plugins/144180

* rename to just 'active', it's cleaner
---
 app/controllers/admin/web_hooks_controller.rb |  2 +-
 app/models/web_hook_event_type.rb             |  9 +++++++++
 spec/models/web_hook_spec.rb                  | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/web_hooks_controller.rb b/app/controllers/admin/web_hooks_controller.rb
index f5aa0c979c..084af1d085 100644
--- a/app/controllers/admin/web_hooks_controller.rb
+++ b/app/controllers/admin/web_hooks_controller.rb
@@ -16,7 +16,7 @@ class Admin::WebHooksController < Admin::AdminController
     json = {
       web_hooks: serialize_data(web_hooks, AdminWebHookSerializer),
       extras: {
-        event_types: WebHookEventType.all,
+        event_types: WebHookEventType.active,
         default_event_types: WebHook.default_event_types,
         content_types: WebHook.content_types.map { |name, id| { id: id, name: name } },
         delivery_statuses: WebHook.last_delivery_statuses.map { |name, id| { id: id, name: name.to_s } },
diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index c40c7a21a9..d3822d1ede 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -19,6 +19,15 @@ class WebHookEventType < ActiveRecord::Base
   default_scope { order('id ASC') }
 
   validates :name, presence: true, uniqueness: true
+
+  def self.active
+    ids_to_exclude = []
+    ids_to_exclude << SOLVED unless defined?(SiteSetting.solved_enabled) && SiteSetting.solved_enabled
+    ids_to_exclude << ASSIGN unless defined?(SiteSetting.assign_enabled) && SiteSetting.assign_enabled
+
+    self.where.not(id: ids_to_exclude)
+  end
+
 end
 
 # == Schema Information
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 8b0fbb0e52..47b4c20bb7 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -44,6 +44,22 @@ describe WebHook do
       expect(post_hook.payload_url).to eq("https://example.com")
     end
 
+    it "excludes disabled plugin web_hooks" do
+      web_hook_event_types = WebHookEventType.active.find_by(name: 'solved')
+      expect(web_hook_event_types).to eq(nil)
+    end
+
+    it "includes non-plugin web_hooks" do
+      web_hook_event_types = WebHookEventType.active.where(name: 'topic')
+      expect(web_hook_event_types.count).to eq(1)
+    end
+
+    it "includes enabled plugin web_hooks" do
+      SiteSetting.stubs(:solved_enabled).returns(true)
+      web_hook_event_types = WebHookEventType.active.where(name: 'solved')
+      expect(web_hook_event_types.count).to eq(1)
+    end
+
     describe '#active_web_hooks' do
       it "returns unique hooks" do
         post_hook.web_hook_event_types << WebHookEventType.find_by(name: 'topic')

From 8e6be1c3534d6aa67f3864bbfe8690f9de033b40 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 17 Mar 2020 11:19:26 -0700
Subject: [PATCH 161/633] FIX: consistency to show mute/ignore menu in user
 profile

Show the mute/ignore menu for another user even when the current user
cannot message them.
---
 app/assets/javascripts/discourse/templates/user.hbs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 101e25d6c8..10881bb35b 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -58,15 +58,15 @@
                     icon="envelope"
                     label="user.private_message"}}
                 </li>
-                {{#if canMuteOrIgnoreUser}}
-                  <li>
-                    {{user-notifications-dropdown
+              {{/if}}
+              {{#if canMuteOrIgnoreUser}}
+                <li>
+                  {{user-notifications-dropdown
                       user=model
                       value=userNotificationLevel
                       updateNotificationLevel=(action "updateNotificationLevel")
-                    }}
-                  </li>
-                {{/if}}
+                  }}
+                </li>
               {{/if}}
               {{#if currentUser.staff}}
                 <li><a href={{model.adminPath}} class="btn btn-default">{{d-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>

From 92e9fa70c71eba9192b4530ca2bdaeeaa9094b5f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 17 Mar 2020 18:46:17 +0000
Subject: [PATCH 162/633] DEV: Add class to backup restore buttons, for easier
 targeting

---
 app/assets/javascripts/admin/templates/backups-index.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/templates/backups-index.hbs b/app/assets/javascripts/admin/templates/backups-index.hbs
index 7f0675e5a5..9bfbfc2181 100644
--- a/app/assets/javascripts/admin/templates/backups-index.hbs
+++ b/app/assets/javascripts/admin/templates/backups-index.hbs
@@ -79,7 +79,7 @@
               action=(route-action "startRestore")
               actionParam=backup
               disabled=status.restoreDisabled
-              class="btn-default"
+              class="btn-default btn-restore"
               title=restoreTitle
               label="admin.backups.operations.restore.label"}}
           {{/if}}

From 125c9966f1e6c491ed29b790ae412d1606b329ad Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 15:17:29 -0400
Subject: [PATCH 163/633] Build(deps): Bump rspec-expectations from 3.9.0 to
 3.9.1 (#9211)

Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.9.0...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4a682471dc..5f537b181d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -320,7 +320,7 @@ GEM
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-html-matchers (0.9.2)

From 9d8eabd32f3962e1f1c2f991d7dca77a122d9a12 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 15:30:12 -0400
Subject: [PATCH 164/633] Build(deps): Bump aws-partitions from 1.281.0 to
 1.283.0 (#9217)

Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.281.0 to 1.283.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5f537b181d..5a8136df2c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,7 +45,7 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.281.0)
+    aws-partitions (1.283.0)
     aws-sdk-core (3.91.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)

From 9101227266c0d5dc07a15f017e176e00e9da262c Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Tue, 17 Mar 2020 15:33:15 -0500
Subject: [PATCH 165/633] FEATURE: Demote muted categories on category list
 (#9226)

---
 .../components/categories-boxes-with-topics.hbs  |  6 +++++-
 .../templates/components/categories-boxes.hbs    |  6 +++++-
 .../templates/components/categories-only.hbs     |  6 +++++-
 .../mobile/components/categories-only.hbs        |  4 +++-
 .../stylesheets/common/base/category-list.scss   |  8 ++++++++
 app/models/category_list.rb                      |  7 +++++++
 spec/models/category_list_spec.rb                | 16 ++++++++++++++++
 7 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index 4ce13a1584..d4a40fc5a9 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -1,14 +1,16 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{c.slug}}' style={{border-color c.color}}>
+  <div data-notification-level={{c.notificationLevelString}} class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}}' style={{border-color c.color}}>
     <div class='category-box-inner'>
       <div class='category-box-heading'>
         <a href={{c.url}}>
+          {{#unless c.isMuted}}
           {{#if c.uploaded_logo.url}}
             {{cdn-img src=c.uploaded_logo.url
                 class="logo"
                 width=c.uploaded_logo.width
                 height=c.uploaded_logo.height}}
           {{/if}}
+          {{/unless}}
 
           <h3>
             {{category-title-before category=c}}
@@ -20,6 +22,7 @@
         </a>
       </div>
 
+      {{#unless c.isMuted}}
       <div class='featured-topics'>
         {{#if c.topics}}
           <ul>
@@ -29,6 +32,7 @@
           </ul>
         {{/if}}
       </div>
+      {{/unless}}
     </div>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 232edea06b..b629646a56 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -1,7 +1,8 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{c.slug}}' style={{border-color c.color}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
+  <div class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}}' style={{border-color c.color}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
    data-url={{c.url}}>
     <div class='category-box-inner'>
+      {{#unless c.isMuted}}
       <div class="category-logo">
         {{#if c.uploaded_logo.url}}
           {{cdn-img
@@ -11,6 +12,7 @@
               height=c.uploaded_logo.height}}
         {{/if}}
       </div>
+      {{/unless}}
       <div class="category-details">
         <div class='category-box-heading'>
           <a class="parent-box-link" href={{c.url}}>
@@ -23,6 +25,7 @@
           </a>
         </div>
 
+        {{#unless c.isMuted}}
         <div class='description'>
           {{text-overflow class="overflow" text=c.description_excerpt}}
         </div>
@@ -62,6 +65,7 @@
             {{/each}}
           </div>
         {{/if}}
+        {{/unless}}
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index ae71465bf0..24d02fea27 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -12,8 +12,9 @@
     <tbody aria-labelledby="categories-only-category">
       {{#each categories as |c|}}
         <tr data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
-          <td class="category" style={{border-color c.color}}>
+          <td class="category {{if c.isMuted 'muted'}}" style={{border-color c.color}}>
             {{category-title-link category=c}}
+            {{#unless c.isMuted}}
             {{#if c.description_excerpt}}
               <div class="category-description">
                 {{dir-span c.description_excerpt}}
@@ -67,11 +68,13 @@
                 {{/each}}
               </div>
             {{/if}}
+            {{/unless}}
           </td>
           <td class="topics">
             <div title={{c.statTitle}}>{{html-safe c.stat}}</div>
             {{category-unread category=c tagName="div" class="unread-new"}}
           </td>
+          {{#unless c.isMuted}}
           {{#if showTopics}}
             <td class="latest">
               {{#each c.featuredTopics as |t|}}
@@ -79,6 +82,7 @@
               {{/each}}
             </td>
           {{/if}}
+          {{/unless}}
         </tr>
       {{/each}}
     </tbody>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 0421edce8a..ac7691bd10 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -1,7 +1,7 @@
 {{#if categories}}
   <div class="category-list {{if showTopics 'with-topics'}}">
     {{#each categories as |c|}}
-      <div data-category-id={{c.id}} class='category-list-item category' style={{border-color c.color}}>
+      <div data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class='category-list-item category {{if c.isMuted "muted"}}' style={{border-color c.color}}>
         <table class='topic-list'>
           <tbody>
             <tr>
@@ -10,6 +10,7 @@
               </th>
             </tr>
 
+            {{#unless c.isMuted}}
             {{#if c.description_excerpt}}
               <tr class="category-description">
                 <td colspan="3">
@@ -57,6 +58,7 @@
                 </td>
               </tr>
             {{/if}}
+            {{/unless}}
           </tbody>
         </table>
         <footer class="clearfix">
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 7a2a95b8df..b7cc6432a7 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -316,3 +316,11 @@
     --max-height: 75px;
   }
 }
+
+.categories-list .category.muted {
+  font-size: $font-down-1;
+  h3,
+  .category-name {
+    color: $primary-medium;
+  }
+}
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index c50c81f62b..35dcaa7d3a 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -23,6 +23,7 @@ class CategoryList
     find_user_data
     sort_unpinned
     trim_results
+    demote_muted
 
     if preloaded_topic_custom_fields.present?
       displayable_topics = @categories.map(&:displayable_topics)
@@ -162,6 +163,12 @@ class CategoryList
     end
   end
 
+  def demote_muted
+    muted_categories = @categories.select { |category| category.notification_level == 0 }
+    @categories = @categories.reject { |category| category.notification_level == 0 }
+    @categories.concat muted_categories
+  end
+
   def trim_results
     @categories.each do |c|
       next if c.displayable_topics.blank?
diff --git a/spec/models/category_list_spec.rb b/spec/models/category_list_spec.rb
index a68433b96a..8f3784f84f 100644
--- a/spec/models/category_list_spec.rb
+++ b/spec/models/category_list_spec.rb
@@ -220,6 +220,22 @@ describe CategoryList do
         expect(category_ids_admin).to eq([public_cat2.id, public_cat.id])
       end
     end
+
+    context 'some categories are muted' do
+      let!(:cat1) { Fabricate(:category_with_definition) }
+      let!(:muted_cat) { Fabricate(:category_with_definition) }
+      let!(:cat3) { Fabricate(:category_with_definition) }
+
+      before do
+        CategoryUser.set_notification_level_for_category(user, NotificationLevels.all[:muted], muted_cat.id)
+      end
+
+      it "returns muted categories at the end of the list" do
+        category_list = CategoryList.new(Guardian.new user).categories.pluck(:id)
+
+        expect(category_list).to eq([SiteSetting.uncategorized_category_id, cat1.id, cat3.id, muted_cat.id])
+      end
+    end
   end
 
 end

From 0b2e6f43012b7b8031107682a89431055ee50241 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 17:22:50 -0400
Subject: [PATCH 166/633] Build(deps): Bump aws-partitions from 1.283.0 to
 1.284.0 (#9227)

Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.283.0 to 1.284.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5a8136df2c..1280352e63 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,7 +45,7 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.283.0)
+    aws-partitions (1.284.0)
     aws-sdk-core (3.91.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)

From 48d690ae01e6a65c2c5ac7995b7e0b8a741599c2 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 18 Mar 2020 03:57:54 +0530
Subject: [PATCH 167/633] FIX: Remote themes Github link should go to custom
 branch #9184

---
 .../admin-customize-themes-show.js            | 11 +++++
 .../admin/templates/customize-themes-show.hbs |  2 +-
 app/serializers/theme_serializer.rb           |  2 +-
 .../admin-customize-themes-show-test.js.es6   | 49 +++++++++++++++++++
 4 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6

diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
index a8e25fdec9..006f1728da 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
@@ -203,6 +203,17 @@ export default Controller.extend({
     );
   },
   sourceIsHttp: match("model.remote_theme.remote_url", /^http(s)?:\/\//),
+
+  @discourseComputed(
+    "model.remote_theme.remote_url",
+    "model.remote_theme.branch"
+  )
+  remoteThemeLink(remoteThemeUrl, remoteThemeBranch) {
+    return remoteThemeBranch
+      ? `${remoteThemeUrl.replace(/\.git$/, "")}/tree/${remoteThemeBranch}`
+      : remoteThemeUrl;
+  },
+
   actions: {
     updateToLatest() {
       this.set("updatingRemote", true);
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index b4c4e9a8f4..ed4dcf0eb1 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -63,7 +63,7 @@
 
     {{#if model.remote_theme.remote_url}}
       {{#if sourceIsHttp}}
-        <a class="remote-url" href={{model.remote_theme.remote_url}}>{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
+        <a class="remote-url" href={{remoteThemeLink}}>{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
       {{else}}
         <div class="remote-url"><code>{{model.remote_theme.remote_url}}</code></div>
       {{/if}}
diff --git a/app/serializers/theme_serializer.rb b/app/serializers/theme_serializer.rb
index 0682f69487..7d56890454 100644
--- a/app/serializers/theme_serializer.rb
+++ b/app/serializers/theme_serializer.rb
@@ -47,7 +47,7 @@ class BasicThemeSerializer < ApplicationSerializer
 end
 
 class RemoteThemeSerializer < ApplicationSerializer
-  attributes :id, :remote_url, :remote_version, :local_version, :commits_behind,
+  attributes :id, :remote_url, :remote_version, :local_version, :commits_behind, :branch,
              :remote_updated_at, :updated_at, :github_diff_link, :last_error_text, :is_git?,
              :license_url, :about_url, :authors, :theme_version, :minimum_discourse_version, :maximum_discourse_version
 
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
new file mode 100644
index 0000000000..10cc64279e
--- /dev/null
+++ b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
@@ -0,0 +1,49 @@
+import { mapRoutes } from "discourse/mapping-router";
+import Theme from "admin/models/theme";
+
+moduleFor("controller:admin-customize-themes-show", {
+  beforeEach() {
+    this.registry.register("router:main", mapRoutes());
+  },
+  needs: ["controller:adminUser"]
+});
+
+const repoUrl = "https://github.com/discourse/discourse-brand-header.git";
+const remoteTheme = Theme.create({
+  id: 2,
+  default: true,
+  name: "default",
+  remote_theme: {
+    remote_url: repoUrl
+  }
+});
+
+QUnit.test("can display source url for remote themes", function(assert) {
+  const controller = this.subject({
+    model: remoteTheme
+  });
+
+  assert.deepEqual(
+    controller.get("remoteThemeLink"),
+    repoUrl,
+    "returns theme's repo URL"
+  );
+});
+
+QUnit.test("can display source url for remote theme branches", function(
+  assert
+) {
+  const branchUrl =
+    "https://github.com/discourse/discourse-brand-header/tree/beta";
+  remoteTheme["remote_theme"]["branch"] = "beta";
+
+  const controller = this.subject({
+    model: remoteTheme
+  });
+
+  assert.deepEqual(
+    controller.get("remoteThemeLink"),
+    branchUrl,
+    "returns theme's repo URL to branch"
+  );
+});

From 45ce9876ccfeac0c51e5f32fb15bdcc9669204c5 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 18 Mar 2020 04:13:00 +0530
Subject: [PATCH 168/633] Fix the build. Remove the branch value if available.

48d690ae01e6a65c2c5ac7995b7e0b8a741599c2
---
 .../admin/controllers/admin-customize-themes-show-test.js.es6    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
index 10cc64279e..3e9c0f9006 100644
--- a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
@@ -19,6 +19,7 @@ const remoteTheme = Theme.create({
 });
 
 QUnit.test("can display source url for remote themes", function(assert) {
+  delete remoteTheme["remote_theme"]["branch"];
   const controller = this.subject({
     model: remoteTheme
   });

From e2ce12d414bcbdbab579b2261b67138057086e79 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 18 Mar 2020 11:12:23 +1000
Subject: [PATCH 169/633] FIX: Broken computing of userHasTimezone in bookmark
 modal and missing tap-tile templates for regular users (#9229)

Based on reports here https://meta.discourse.org/t/improved-bookmarks-with-reminders/144542

* Because the `userHasTimezone` property was computed and we were checking on an (essentially) global object, ember was not aware that the user timezone had changed because it changed in a different place. instead set the timezone as internal state for the modal on show and base the computed property off of that so it mutates correctly
* The tap-tile components were in the admin folder completely unnecessarily, move them out into the main discourse folder otherwise noone else can use the new bookmarks (icon + text is missing)
---
 .../discourse/controllers/bookmark.js          | 18 ++++++++----------
 .../templates/components/tap-tile-grid.hbs     |  0
 .../templates/components/tap-tile.hbs          |  0
 .../controllers/bookmark-test.js.es6           | 17 +++++++++++++++--
 4 files changed, 23 insertions(+), 12 deletions(-)
 rename app/assets/javascripts/{admin => discourse}/templates/components/tap-tile-grid.hbs (100%)
 rename app/assets/javascripts/{admin => discourse}/templates/components/tap-tile.hbs (100%)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 375a9a5341..ecafa0dd23 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -32,6 +32,7 @@ export default Controller.extend(ModalFunctionality, {
   customReminderTime: null,
   lastCustomReminderDate: null,
   lastCustomReminderTime: null,
+  userTimezone: null,
 
   onShow() {
     this.setProperties({
@@ -43,7 +44,8 @@ export default Controller.extend(ModalFunctionality, {
       customReminderDate: null,
       customReminderTime: null,
       lastCustomReminderDate: null,
-      lastCustomReminderTime: null
+      lastCustomReminderTime: null,
+      userTimezone: this.currentUser.timezone
     });
 
     this.loadLastUsedCustomReminderDatetime();
@@ -174,9 +176,9 @@ export default Controller.extend(ModalFunctionality, {
     return Discourse.BaseUri;
   },
 
-  @discourseComputed()
-  userHasTimezoneSet() {
-    return !_.isEmpty(this.userTimezone());
+  @discourseComputed("userTimezone")
+  userHasTimezoneSet(userTimezone) {
+    return !_.isEmpty(userTimezone);
   },
 
   saveBookmark() {
@@ -216,7 +218,7 @@ export default Controller.extend(ModalFunctionality, {
   },
 
   parseCustomDateTime(date, time) {
-    return moment.tz(date + " " + time, this.userTimezone());
+    return moment.tz(date + " " + time, this.userTimezone);
   },
 
   reminderAt() {
@@ -288,12 +290,8 @@ export default Controller.extend(ModalFunctionality, {
     return momentDate.hour(START_OF_DAY_HOUR).startOf("hour");
   },
 
-  userTimezone() {
-    return this.currentUser.timezone;
-  },
-
   now() {
-    return moment.tz(this.userTimezone());
+    return moment.tz(this.userTimezone);
   },
 
   laterToday() {
diff --git a/app/assets/javascripts/admin/templates/components/tap-tile-grid.hbs b/app/assets/javascripts/discourse/templates/components/tap-tile-grid.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/components/tap-tile-grid.hbs
rename to app/assets/javascripts/discourse/templates/components/tap-tile-grid.hbs
diff --git a/app/assets/javascripts/admin/templates/components/tap-tile.hbs b/app/assets/javascripts/discourse/templates/components/tap-tile.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/components/tap-tile.hbs
rename to app/assets/javascripts/discourse/templates/components/tap-tile.hbs
diff --git a/test/javascripts/controllers/bookmark-test.js.es6 b/test/javascripts/controllers/bookmark-test.js.es6
index f8fc372011..978b7cd19f 100644
--- a/test/javascripts/controllers/bookmark-test.js.es6
+++ b/test/javascripts/controllers/bookmark-test.js.es6
@@ -3,7 +3,8 @@ let BookmarkController;
 
 moduleFor("controller:bookmark", {
   beforeEach() {
-    BookmarkController = this.subject({ currentUser: currentUser() });
+    Discourse.currentUser = currentUser();
+    BookmarkController = this.subject({ currentUser: Discourse.currentUser });
   },
 
   afterEach() {
@@ -12,7 +13,7 @@ moduleFor("controller:bookmark", {
 });
 
 function mockMomentTz(dateString) {
-  let now = moment.tz(dateString, BookmarkController.currentUser.timezone);
+  let now = moment.tz(dateString, BookmarkController.userTimezone);
   sandbox.useFakeTimers(now.valueOf());
 }
 
@@ -179,3 +180,15 @@ QUnit.test(
     assert.equal(BookmarkController.lastCustomReminderTime, null);
   }
 );
+
+QUnit.test(
+  "userHasTimezoneSet updates true/false based on whether the current user timezone is set globally",
+  function(assert) {
+    Discourse.currentUser.timezone = null;
+    BookmarkController.onShow();
+    assert.equal(BookmarkController.userHasTimezoneSet, false);
+    Discourse.currentUser.timezone = "Australia/Brisbane";
+    BookmarkController.onShow();
+    assert.equal(BookmarkController.userHasTimezoneSet, true);
+  }
+);

From ccc9b64a998aef7b5f7da61a810ebe89a5c4673e Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 5 Mar 2020 12:34:11 -0800
Subject: [PATCH 170/633] FIX: theme-javascripts using incorrect subfolder
 setting

---
 app/models/javascript_cache.rb         | 2 +-
 lib/content_security_policy/default.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/javascript_cache.rb b/app/models/javascript_cache.rb
index 3f9f72dd20..832a60f7e6 100644
--- a/app/models/javascript_cache.rb
+++ b/app/models/javascript_cache.rb
@@ -8,7 +8,7 @@ class JavascriptCache < ActiveRecord::Base
   before_save :update_digest
 
   def url
-    "#{GlobalSetting.cdn_url}#{GlobalSetting.relative_url_root}/theme-javascripts/#{digest}.js?__ws=#{Discourse.current_hostname}"
+    "#{GlobalSetting.cdn_url}#{Discourse.base_uri}/theme-javascripts/#{digest}.js?__ws=#{Discourse.current_hostname}"
   end
 
   private
diff --git a/lib/content_security_policy/default.rb b/lib/content_security_policy/default.rb
index 2526fc3c8d..d1daff3573 100644
--- a/lib/content_security_policy/default.rb
+++ b/lib/content_security_policy/default.rb
@@ -36,7 +36,7 @@ class ContentSecurityPolicy
         if can_use_s3_cdn && s3_cdn
           s3_cdn + dir
         elsif can_use_cdn && cdn
-          cdn + dir
+          cdn + Discourse.base_uri + dir
         else
           base + dir
         end

From 8e98f39d9ff865be2f54ef77700eb2ae749d11d7 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 17 Mar 2020 15:23:46 -0700
Subject: [PATCH 171/633] Add spec for CSP subfolder

---
 spec/lib/content_security_policy_spec.rb | 29 ++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index 593ae9d1c0..85b8c31e3a 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -99,6 +99,35 @@ describe ContentSecurityPolicy do
         http://test.localhost/extra-locales/
       ])
     end
+
+    it 'adds subfolder to CDN assets' do
+      set_cdn_url('https://cdn.com')
+      set_subfolder('/forum')
+
+      script_srcs = parse(policy)['script-src']
+      expect(script_srcs).to include(*%w[
+        https://cdn.com/forum/assets/
+        https://cdn.com/forum/brotli_asset/
+        https://cdn.com/forum/highlight-js/
+        https://cdn.com/forum/javascripts/
+        https://cdn.com/forum/plugins/
+        https://cdn.com/forum/theme-javascripts/
+        http://test.localhost/forum/extra-locales/
+      ])
+
+      global_setting(:s3_cdn_url, 'https://s3-cdn.com')
+
+      script_srcs = parse(policy)['script-src']
+      expect(script_srcs).to include(*%w[
+        https://s3-cdn.com/assets/
+        https://s3-cdn.com/brotli_asset/
+        https://cdn.com/forum/highlight-js/
+        https://cdn.com/forum/javascripts/
+        https://cdn.com/forum/plugins/
+        https://cdn.com/forum/theme-javascripts/
+        http://test.localhost/forum/extra-locales/
+      ])
+    end
   end
 
   it 'can be extended by plugins' do

From 9b4b690bbab8948aa5209b95e7642abb454de4dd Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 18 Mar 2020 15:54:50 +1000
Subject: [PATCH 172/633] FIX: Prevent mobile bookmark modal cutoff

---
 app/assets/stylesheets/common/components/bookmark-modal.scss | 2 +-
 app/assets/stylesheets/common/components/tap-tile.scss       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index daad95285a..14f91f70c3 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -4,7 +4,7 @@
   }
   .modal-body {
     max-width: 410px;
-    min-width: 380px;
+    width: 100%;
     box-sizing: border-box;
 
     .control-label {
diff --git a/app/assets/stylesheets/common/components/tap-tile.scss b/app/assets/stylesheets/common/components/tap-tile.scss
index d7259710e1..6f71643cd1 100644
--- a/app/assets/stylesheets/common/components/tap-tile.scss
+++ b/app/assets/stylesheets/common/components/tap-tile.scss
@@ -19,6 +19,10 @@
     font-size: $font-down-2;
     cursor: pointer;
 
+    @media screen and (max-width: 360px) {
+      width: $tile-width - 10;
+    }
+
     &:hover {
       background-color: $tertiary-low;
     }

From 778454e26b5c38c94dad6ccbc9f11439a51f6b6d Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 18 Mar 2020 16:21:24 +0200
Subject: [PATCH 173/633] FIX: Condense line codes in emails (#9225)

---
 lib/email/styles.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 8ab675f0fd..0b6c3f8d77 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -195,7 +195,7 @@ module Email
       style('div.summary-footer', 'color:#666; font-size:95%; text-align:center; padding-top:15px;')
       style('span.post-count', 'margin: 0 5px; color: #777;')
       style('pre', 'word-wrap: break-word; max-width: 694px;')
-      style('code', 'background-color: #f1f1ff; padding: 2px 5px;')
+      style('code', 'background-color: #f1f1ff; line-height: 50%; padding: 2px 5px;')
       style('pre code', 'display: block; background-color: #f1f1ff; padding: 5px;')
       style('.featured-topic a', "text-decoration: none; font-weight: bold; color: #{SiteSetting.email_link_color}; line-height:1.5em;")
       style('.secure-image-notice', 'font-style: italic; background-color: #f1f1ff; padding: 5px;')

From 1393950dbc44e7ee0390560079852c38cb0e9c2a Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 18 Mar 2020 19:31:10 +0200
Subject: [PATCH 174/633] FIX: Improve HTML to Markdown conversion (#9231)

This commit ensures that whitespaces are preserved in <pre>, but removed
inside text paragraphs.
---
 lib/html_to_markdown.rb                  | 17 ++++++++++++++---
 spec/components/html_to_markdown_spec.rb |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/html_to_markdown.rb b/lib/html_to_markdown.rb
index a17a78eb2b..a3eb5e8aae 100644
--- a/lib/html_to_markdown.rb
+++ b/lib/html_to_markdown.rb
@@ -31,7 +31,7 @@ class HtmlToMarkdown
 
   def remove_whitespaces!
     @doc.traverse do |node|
-      if node.is_a? Nokogiri::XML::Text
+      if node.is_a?(Nokogiri::XML::Text) && node.parent.name != "pre"
         node.content = node.content.gsub(/\A[[:space:]]+/, "") if node.previous_element&.description&.block?
         node.content = node.content.gsub(/\A[[:space:]]+/, "") if node.previous_element.nil? && node.parent.description&.block?
         node.content = node.content.gsub(/[[:space:]]+\z/, "") if node.next_element&.description&.block?
@@ -220,10 +220,21 @@ class HtmlToMarkdown
   end
 
   def visit_text(node)
+    top_block = @stack[-1]
+
+    if top_block.name == "pre"
+      top_block.markdown << node.text
+      return
+    end
+
     node.content = node.content.gsub(/\A[[:space:]]+/, "") if node.previous_element.nil? && EMPHASIS.include?(node.parent.name)
-    indent = node.text[/^\s+/] || ""
+
+    if top_block.markdown.present? && indent = node.text[/^\s+/]
+      top_block.markdown << indent
+    end
+
     text = node.text.gsub(/^\s+/, "").gsub(/\s{2,}/, " ")
-    @stack[-1].markdown << [indent, text].join("")
+    top_block.markdown << text
   end
 
   def format_block
diff --git a/spec/components/html_to_markdown_spec.rb b/spec/components/html_to_markdown_spec.rb
index aa89ac351c..266e875aca 100644
--- a/spec/components/html_to_markdown_spec.rb
+++ b/spec/components/html_to_markdown_spec.rb
@@ -204,6 +204,7 @@ describe HtmlToMarkdown do
     expect(html_to_markdown("<pre>var foo = 'bar';</pre>")).to eq("```\nvar foo = 'bar';\n```")
     expect(html_to_markdown("<pre><code>var foo = 'bar';</code></pre>")).to eq("```\nvar foo = 'bar';\n```")
     expect(html_to_markdown(%Q{<pre><code class="lang-javascript">var foo = 'bar';</code></pre>})).to eq("```javascript\nvar foo = 'bar';\n```")
+    expect(html_to_markdown("<pre>    function f() {\n        console.log('Hello world!');\n    }</pre>")).to eq("```\n    function f() {\n        console.log('Hello world!');\n    }\n```")
   end
 
   it "supports <pre> inside <blockquote>" do
@@ -220,6 +221,7 @@ describe HtmlToMarkdown do
 
   it "handles <p>" do
     expect(html_to_markdown("<p>1st paragraph</p><p>2nd paragraph</p>")).to eq("1st paragraph\n\n2nd paragraph")
+    expect(html_to_markdown("<body><p>1st paragraph</p>\n    <p>    2nd paragraph\n    2nd paragraph</p>\n<p>3rd paragraph</p></body>")).to eq("1st paragraph\n\n2nd paragraph\n2nd paragraph\n\n3rd paragraph")
   end
 
   it "handles <div>" do

From 1c7680c5680c5152f8115d992d8bb2bda803f8b8 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Wed, 18 Mar 2020 13:38:21 -0600
Subject: [PATCH 175/633] FIX: Use id instead of elementId in hbs file

I think this issue is caused by a current regression in ember

https://github.com/emberjs/ember.js/issues/18147

but using `id` works just fine in templates. This also appears to be the
only template file we are using `elementId` directly in the template.
---
 .../javascripts/discourse/templates/modal/move-to-topic.hbs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index d678ce760a..6f1e802770 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -20,7 +20,7 @@
         <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
 
           {{#if canTagMessages}}
             <label>{{i18n 'tagging.tags'}}</label>
@@ -75,7 +75,7 @@
         <p>{{html-safe (i18n 'topic.split_topic.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.split_topic.topic_name'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
 
           <label>{{i18n 'categories.category'}}</label>
           {{category-chooser
@@ -96,7 +96,7 @@
         <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
 
           {{#if canTagMessages}}
             <label>{{i18n 'tagging.tags'}}</label>

From d6838608ff4889aae337d5007dbbec1a5f96d654 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 17 Mar 2020 19:22:41 -0300
Subject: [PATCH 176/633] FEATURE: iCalendar feed for Bookmark reminders

---
 app/controllers/users_controller.rb | 24 ++++++++++++++++--------
 app/views/users/bookmarks.ics.erb   | 14 ++++++++++++++
 config/routes.rb                    |  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 app/views/users/bookmarks.ics.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index fde828aee6..d7cc5f3de3 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1397,15 +1397,23 @@ class UsersController < ApplicationController
 
   def bookmarks
     user = fetch_user_from_params
-    bookmarks = BookmarkQuery.new(user, params).list_all
 
-    if bookmarks.empty?
-      render json: {
-        bookmarks: [],
-        no_results_help: I18n.t("user_activity.no_bookmarks.self")
-      }
-    else
-      render_serialized(bookmarks, UserBookmarkSerializer, root: 'bookmarks')
+    respond_to do |format|
+      format.json do
+        bookmarks = BookmarkQuery.new(user, params).list_all
+
+        if bookmarks.empty?
+          render json: {
+            bookmarks: [],
+            no_results_help: I18n.t("user_activity.no_bookmarks.self")
+          }
+        else
+          render_serialized(bookmarks, UserBookmarkSerializer, root: 'bookmarks')
+        end
+      end
+      format.ics do
+        @bookmark_reminders = Bookmark.where(user_id: user.id).where.not(reminder_at: nil).joins(:topic)
+      end
     end
   end
 
diff --git a/app/views/users/bookmarks.ics.erb b/app/views/users/bookmarks.ics.erb
new file mode 100644
index 0000000000..da77b9d792
--- /dev/null
+++ b/app/views/users/bookmarks.ics.erb
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Discourse//<%= Discourse.current_hostname %>//<%= Discourse.full_version %>//EN
+<% @bookmark_reminders.each do |bookmark| %>
+BEGIN:VEVENT
+UID:bookmark_reminder_#<%= bookmark.id %>@<%= Discourse.current_hostname %>
+DTSTAMP:<%= bookmark.updated_at.strftime("%Y%m%dT%H%M%SZ") %>
+DTSTART:<%= bookmark.reminder_at.strftime("%Y%m%dT%H%M%SZ") %>
+DTEND:<%= (bookmark.reminder_at + 1.hour).strftime("%Y%m%dT%H%M%SZ") %>
+SUMMARY:<%= bookmark.name.presence || bookmark.topic.title %>
+URL:<%= Discourse.base_url %>/t/-/<%= bookmark.topic_id %>
+END:VEVENT
+<% end %>
+END:VCALENDAR
diff --git a/config/routes.rb b/config/routes.rb
index 7f7a457af3..7cde4b038e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -469,7 +469,7 @@ Discourse::Application.routes.draw do
     get "#{root_path}/:username/activity" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/activity/:filter" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/badges" => "users#badges", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/bookmarks" => "users#bookmarks", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/bookmarks" => "users#bookmarks", constraints: { username: RouteFormat.username, format: /(json|ics)/ }
     get "#{root_path}/:username/notifications" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/notifications/:filter" => "users#show", constraints: { username: RouteFormat.username }
     delete "#{root_path}/:username" => "users#destroy", constraints: { username: RouteFormat.username }

From 8ae472bc41b6360d4a223935a524480b6ec093b6 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 17 Mar 2020 20:06:15 -0300
Subject: [PATCH 177/633] FEATURE: Google Calendar doesn't support URL in
 iCalendar, add fallback description

---
 app/views/users/bookmarks.ics.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/bookmarks.ics.erb b/app/views/users/bookmarks.ics.erb
index da77b9d792..cfb50701ae 100644
--- a/app/views/users/bookmarks.ics.erb
+++ b/app/views/users/bookmarks.ics.erb
@@ -8,6 +8,7 @@ DTSTAMP:<%= bookmark.updated_at.strftime("%Y%m%dT%H%M%SZ") %>
 DTSTART:<%= bookmark.reminder_at.strftime("%Y%m%dT%H%M%SZ") %>
 DTEND:<%= (bookmark.reminder_at + 1.hour).strftime("%Y%m%dT%H%M%SZ") %>
 SUMMARY:<%= bookmark.name.presence || bookmark.topic.title %>
+DESCRIPTION:<%= Discourse.base_url %>/t/-/<%= bookmark.topic_id %>
 URL:<%= Discourse.base_url %>/t/-/<%= bookmark.topic_id %>
 END:VEVENT
 <% end %>

From 8769ca08bbb31368f290f84aedb7d8a357f4a636 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 19 Mar 2020 10:59:32 +1000
Subject: [PATCH 178/633] SECURITY: Prevent access to other user's bookmark
 lists

---
 .../user-activity-bookmarks-with-reminders.js |  7 +++++--
 app/controllers/users_controller.rb           |  1 +
 config/locales/client.en.yml                  |  1 +
 spec/requests/users_controller_spec.rb        | 19 +++++++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
index 49982b1244..ad8ab35a6b 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
+++ b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
@@ -33,6 +33,9 @@ export default Controller.extend({
           this.content.pushObjects(bookmarks);
         }
       })
+      .catch(() => {
+        this.set("noResultsHelp", I18n.t("bookmarks.list_permission_denied"));
+      })
       .finally(() =>
         this.setProperties({
           loaded: true,
@@ -42,8 +45,8 @@ export default Controller.extend({
   },
 
   @discourseComputed("loaded", "content.length")
-  noContent(loaded, content) {
-    return loaded && content.length === 0;
+  noContent(loaded, contentLength) {
+    return loaded && contentLength === 0;
   },
 
   actions: {
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d7cc5f3de3..6125bf9836 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1397,6 +1397,7 @@ class UsersController < ApplicationController
 
   def bookmarks
     user = fetch_user_from_params
+    guardian.ensure_can_edit!(user)
 
     respond_to do |format|
       format.json do
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9ab7d5c5d7..ef241f4e16 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -313,6 +313,7 @@ en:
       save: "Save"
       no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up <a href="%{basePath}/my/preferences/profile">in your profile</a>.'
       invalid_custom_datetime: "The date and time you provided is invalid, please try again."
+      list_permission_denied: "You do not have permission to view this user's bookmarks."
       reminders:
         at_desktop: "Next time I'm at my desktop"
         later_today: "Later today <br/>{{date}}"
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 43e41e5522..b2cc43fede 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -4167,6 +4167,25 @@ describe UsersController do
     end
   end
 
+  describe "#bookmarks" do
+    let!(:bookmark1) { Fabricate(:bookmark, user: user) }
+    let!(:bookmark2) { Fabricate(:bookmark, user: user) }
+    let!(:bookmark3) { Fabricate(:bookmark) }
+
+    it "returns a list of serialized bookmarks for the user" do
+      sign_in(user)
+      get "/u/#{user.username}/bookmarks.json"
+      expect(response.status).to eq(200)
+      expect(JSON.parse(response.body)['bookmarks'].map { |b| b['id'] }).to match_array([bookmark1.id, bookmark2.id])
+    end
+
+    it "does not show another user's bookmarks" do
+      sign_in(user)
+      get "/u/#{bookmark3.user.username}/bookmarks.json"
+      expect(response.status).to eq(403)
+    end
+  end
+
   def create_second_factor_security_key
     sign_in(user)
     stub_secure_session_confirmed

From 0cd502a55838d5d27f96f13c0794f3669ac41fcc Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 19 Mar 2020 15:48:23 +1000
Subject: [PATCH 179/633] FIX: N1 issues for bookmark list (#9236)

* Preload custom fields for BookmarkQuery and add preload callback. Copy TopicQuery preload methodology to allow plugins to preload data for the BookmarkQuery. This fixes assigned plugin custom fields N1
* Include topic tags in initial query to avoid tags N1

Related: discourse/discourse-assign#63
---
 lib/bookmark_query.rb           | 27 +++++++++++++++--
 spec/lib/bookmark_query_spec.rb | 51 +++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 spec/lib/bookmark_query_spec.rb

diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
index 44ab7b257f..d38bdabf7c 100644
--- a/lib/bookmark_query.rb
+++ b/lib/bookmark_query.rb
@@ -5,6 +5,19 @@
 # in the user/activity/bookmarks page.
 
 class BookmarkQuery
+  cattr_accessor :preloaded_custom_fields
+  self.preloaded_custom_fields = Set.new
+
+  def self.on_preload(&blk)
+    (@preload ||= Set.new) << blk
+  end
+
+  def self.preload(bookmarks, object)
+    if @preload
+      @preload.each { |preload| preload.call(bookmarks, object) }
+    end
+  end
+
   def initialize(user, params = {})
     @user = user
     @params = params
@@ -15,18 +28,28 @@ class BookmarkQuery
       .joins('INNER JOIN topics ON topics.id = bookmarks.topic_id')
       .joins('INNER JOIN posts ON posts.id = bookmarks.post_id')
       .joins('INNER JOIN users ON users.id = posts.user_id')
-      .order('created_at DESC')
+      .order('bookmarks.created_at DESC')
 
     if @params[:limit]
       results = results.limit(@params[:limit])
     end
 
+    if BookmarkQuery.preloaded_custom_fields.any?
+      Topic.preload_custom_fields(
+        results.map(&:topic), BookmarkQuery.preloaded_custom_fields
+      )
+    end
+
+    BookmarkQuery.preload(results, self)
+
     results
   end
 
   private
 
   def user_bookmarks
-    Bookmark.where(user: @user).includes(:topic).includes(post: :user)
+    Bookmark.where(user: @user)
+      .includes(topic: :tags)
+      .includes(post: :user)
   end
 end
diff --git a/spec/lib/bookmark_query_spec.rb b/spec/lib/bookmark_query_spec.rb
new file mode 100644
index 0000000000..2fe99c3893
--- /dev/null
+++ b/spec/lib/bookmark_query_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe BookmarkQuery do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:bookmark1) { Fabricate(:bookmark, user: user) }
+  fab!(:bookmark2) { Fabricate(:bookmark, user: user) }
+  let(:params) { {} }
+
+  subject { described_class.new(user, params) }
+
+  describe "#list_all" do
+    it "returns all the bookmarks for a user" do
+      expect(subject.list_all.count).to eq(2)
+    end
+
+    it "runs the on_preload block provided passing in bookmarks" do
+      preloaded_bookmarks = []
+      BookmarkQuery.on_preload do |bookmarks, bq|
+        (preloaded_bookmarks << bookmarks).flatten
+      end
+      subject.list_all
+      expect(preloaded_bookmarks.any?).to eq(true)
+    end
+
+    context "when the limit param is provided" do
+      let(:params) { { limit: 1 } }
+      it "is respected" do
+        expect(subject.list_all.count).to eq(1)
+      end
+    end
+
+    context "when there are topic custom fields to preload" do
+      before do
+        TopicCustomField.create(
+          topic_id: bookmark1.topic.id, name: 'test_field', value: 'test'
+        )
+        BookmarkQuery.preloaded_custom_fields << "test_field"
+      end
+      it "preloads them" do
+        Topic.expects(:preload_custom_fields)
+        expect(
+          subject.list_all.find do |b|
+            b.topic_id = bookmark1.topic_id
+          end.topic.custom_fields['test_field']
+        ).not_to eq(nil)
+      end
+    end
+  end
+end

From aad12822b7d7c9c6ecd976e23d3a83626c052dce Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 19 Mar 2020 21:06:31 +0530
Subject: [PATCH 180/633] FEATURE: automatically delete replies on a topic
 after N days. (#9209)

---
 .../components/edit-topic-timer-form.js       | 51 ++++------------
 .../discourse/components/future-date-input.js | 61 +++++++++++++------
 .../discourse/components/topic-timer-info.js  | 23 +++++--
 .../discourse/controllers/edit-topic-timer.js | 52 +++++++++++++---
 .../discourse/models/topic-timer.js           | 10 ++-
 .../components/edit-topic-timer-form.hbs      | 52 ++++++----------
 .../components/future-date-input.hbs          |  8 ++-
 .../templates/modal/edit-topic-timer.hbs      |  3 +-
 .../future-date-input-selector.js.es6         |  2 +-
 app/controllers/topics_controller.rb          |  5 +-
 app/jobs/regular/delete_replies.rb            | 30 +++++++++
 app/models/topic.rb                           | 17 ++++--
 app/models/topic_timer.rb                     | 19 +++---
 config/locales/client.en.yml                  |  4 ++
 ...0312122846_add_duration_to_topic_timers.rb |  7 +++
 spec/requests/topics_controller_spec.rb       | 22 +++++++
 16 files changed, 241 insertions(+), 125 deletions(-)
 create mode 100644 app/jobs/regular/delete_replies.rb
 create mode 100644 db/migrate/20200312122846_add_duration_to_topic_timers.rb

diff --git a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js
index 4d2be762d3..361a2acbf2 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js
@@ -1,18 +1,15 @@
-import { isEmpty } from "@ember/utils";
 import { equal, or, readOnly } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
-import discourseComputed, {
-  observes,
-  on
-} from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import {
   PUBLISH_TO_CATEGORY_STATUS_TYPE,
   OPEN_STATUS_TYPE,
   DELETE_STATUS_TYPE,
   REMINDER_TYPE,
   CLOSE_STATUS_TYPE,
-  BUMP_TYPE
+  BUMP_TYPE,
+  DELETE_REPLIES_TYPE
 } from "discourse/controllers/edit-topic-timer";
 
 export default Component.extend({
@@ -23,15 +20,18 @@ export default Component.extend({
   autoBump: equal("selection", BUMP_TYPE),
   publishToCategory: equal("selection", PUBLISH_TO_CATEGORY_STATUS_TYPE),
   reminder: equal("selection", REMINDER_TYPE),
+  autoDeleteReplies: equal("selection", DELETE_REPLIES_TYPE),
   showTimeOnly: or("autoOpen", "autoDelete", "reminder", "autoBump"),
-
-  @discourseComputed(
-    "topicTimer.updateTime",
+  showFutureDateInput: or(
+    "showTimeOnly",
     "publishToCategory",
-    "topicTimer.category_id"
-  )
-  saveDisabled(updateTime, publishToCategory, topicTimerCategoryId) {
-    return isEmpty(updateTime) || (publishToCategory && !topicTimerCategoryId);
+    "autoClose",
+    "autoDeleteReplies"
+  ),
+
+  @discourseComputed("autoDeleteReplies")
+  durationType(autoDeleteReplies) {
+    return autoDeleteReplies ? "days" : "hours";
   },
 
   @discourseComputed("topic.visible")
@@ -39,25 +39,6 @@ export default Component.extend({
     if (visible) return this.get("topic.category_id");
   },
 
-  @on("init")
-  @observes("topicTimer", "topicTimer.execute_at", "topicTimer.duration")
-  _setUpdateTime() {
-    let time = null;
-    const executeAt = this.get("topicTimer.execute_at");
-
-    if (executeAt && this.get("topicTimer.based_on_last_post")) {
-      time = this.get("topicTimer.duration");
-    } else if (executeAt) {
-      const closeTime = moment(executeAt);
-
-      if (closeTime > moment()) {
-        time = closeTime.format("YYYY-MM-DD HH:mm");
-      }
-    }
-
-    this.set("topicTimer.updateTime", time);
-  },
-
   @observes("selection")
   _updateBasedOnLastPost() {
     if (!this.autoClose) {
@@ -79,11 +60,5 @@ export default Component.extend({
         );
       }
     });
-  },
-
-  actions: {
-    onChangeTimerType(value) {
-      this.set("topicTimer.status_type", value);
-    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js b/app/assets/javascripts/discourse/components/future-date-input.js
index d84ab3c334..d54e68e782 100644
--- a/app/assets/javascripts/discourse/components/future-date-input.js
+++ b/app/assets/javascripts/discourse/components/future-date-input.js
@@ -1,5 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { equal, and, empty } from "@ember/object/computed";
+import { equal, and, empty, or } from "@ember/object/computed";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { FORMAT } from "select-kit/components/future-date-input-selector";
@@ -10,10 +10,13 @@ export default Component.extend({
   date: null,
   time: null,
   includeDateTime: true,
+  duration: null,
+  durationType: "hours",
   isCustom: equal("selection", "pick_date_and_time"),
   isBasedOnLastPost: equal("selection", "set_based_on_last_post"),
   displayDateAndTimePicker: and("includeDateTime", "isCustom"),
   displayLabel: null,
+  displayNumberInput: or("isBasedOnLastPost", "isBasedOnDuration"),
 
   init() {
     this._super(...arguments);
@@ -21,6 +24,8 @@ export default Component.extend({
     if (this.input) {
       if (this.basedOnLastPost) {
         this.set("selection", "set_based_on_last_post");
+      } else if (this.isBasedOnDuration) {
+        this.set("selection", null);
       } else {
         const datetime = moment(this.input);
         this.setProperties({
@@ -57,28 +62,44 @@ export default Component.extend({
     this.set("basedOnLastPost", this.isBasedOnLastPost);
   },
 
-  @discourseComputed("input", "isBasedOnLastPost")
-  duration(input, isBasedOnLastPost) {
-    const now = moment();
-
-    if (isBasedOnLastPost) {
-      return parseFloat(input);
-    } else {
-      return moment(input) - now;
-    }
+  @observes("duration")
+  _updateDuration() {
+    this.attrs.onChangeDuration &&
+      this.attrs.onChangeDuration(parseInt(this.duration, 0));
   },
 
-  @discourseComputed("input", "isBasedOnLastPost")
-  executeAt(input, isBasedOnLastPost) {
-    if (isBasedOnLastPost) {
-      return moment()
-        .add(input, "hours")
+  @discourseComputed(
+    "input",
+    "duration",
+    "isBasedOnLastPost",
+    "isBasedOnDuration",
+    "durationType"
+  )
+  executeAt(
+    input,
+    duration,
+    isBasedOnLastPost,
+    isBasedOnDuration,
+    durationType
+  ) {
+    if (isBasedOnLastPost || isBasedOnDuration) {
+      return moment(input)
+        .add(parseInt(duration, 0), durationType)
         .format(FORMAT);
     } else {
       return input;
     }
   },
 
+  @discourseComputed("durationType")
+  durationLabel(durationType) {
+    return I18n.t(
+      `topic.topic_status_update.num_of_${
+        durationType === "hours" ? "hours" : "days"
+      }`
+    );
+  },
+
   didReceiveAttrs() {
     this._super(...arguments);
 
@@ -92,7 +113,9 @@ export default Component.extend({
     "date",
     "time",
     "willCloseImmediately",
-    "categoryId"
+    "categoryId",
+    "displayNumberInput",
+    "duration"
   )
   showTopicStatusInfo(
     statusType,
@@ -101,7 +124,9 @@ export default Component.extend({
     date,
     time,
     willCloseImmediately,
-    categoryId
+    categoryId,
+    displayNumberInput,
+    duration
   ) {
     if (!statusType || willCloseImmediately) return false;
 
@@ -114,6 +139,8 @@ export default Component.extend({
         return moment(`${date}${time ? " " + time : ""}`).isAfter(moment());
       }
       return time;
+    } else if (displayNumberInput) {
+      return duration;
     } else {
       return input;
     }
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js b/app/assets/javascripts/discourse/components/topic-timer-info.js
index 66663b062d..30eb177ca3 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js
@@ -3,7 +3,10 @@ import { cancel, later } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import Category from "discourse/models/category";
-import { REMINDER_TYPE } from "discourse/controllers/edit-topic-timer";
+import {
+  REMINDER_TYPE,
+  DELETE_REPLIES_TYPE
+} from "discourse/controllers/edit-topic-timer";
 import ENV from "discourse-common/config/environment";
 
 export default Component.extend({
@@ -28,7 +31,13 @@ export default Component.extend({
   },
 
   renderTopicTimer() {
-    if (!this.executeAt || this.executeAt < moment()) {
+    const isDeleteRepliesType = this.statusType === DELETE_REPLIES_TYPE;
+
+    if (
+      !isDeleteRepliesType &&
+      !this.basedOnLastPost &&
+      (!this.executeAt || this.executeAt < moment())
+    ) {
       this.set("showTopicTimer", null);
       return;
     }
@@ -40,7 +49,7 @@ export default Component.extend({
     const statusUpdateAt = moment(this.executeAt);
     const duration = moment.duration(statusUpdateAt - moment());
     const minutesLeft = duration.asMinutes();
-    if (minutesLeft > 0) {
+    if (minutesLeft > 0 || isDeleteRepliesType || this.basedOnLastPost) {
       let rerenderDelay = 1000;
       if (minutesLeft > 2160) {
         rerenderDelay = 12 * 60 * 60000;
@@ -51,11 +60,15 @@ export default Component.extend({
       } else if (minutesLeft > 2) {
         rerenderDelay = 60000;
       }
-      let autoCloseHours = this.duration || 0;
+      let durationHours = parseInt(this.duration, 0) || 0;
+
+      if (isDeleteRepliesType) {
+        durationHours *= 24;
+      }
 
       let options = {
         timeLeft: duration.humanize(true),
-        duration: moment.duration(autoCloseHours, "hours").humanize()
+        duration: moment.duration(durationHours, "hours").humanize()
       };
 
       const categoryId = this.categoryId;
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
index e9117532f0..461fa3c64d 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
@@ -4,6 +4,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import TopicTimer from "discourse/models/topic-timer";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { FORMAT } from "select-kit/components/future-date-input-selector";
 
 export const CLOSE_STATUS_TYPE = "close";
 export const OPEN_STATUS_TYPE = "open";
@@ -11,6 +12,7 @@ export const PUBLISH_TO_CATEGORY_STATUS_TYPE = "publish_to_category";
 export const DELETE_STATUS_TYPE = "delete";
 export const REMINDER_TYPE = "reminder";
 export const BUMP_TYPE = "bump";
+export const DELETE_REPLIES_TYPE = "delete_replies";
 
 export default Controller.extend(ModalFunctionality, {
   loading: false,
@@ -41,10 +43,16 @@ export default Controller.extend(ModalFunctionality, {
       }
     ];
     if (this.currentUser.get("staff")) {
-      types.push({
-        id: DELETE_STATUS_TYPE,
-        name: I18n.t("topic.auto_delete.title")
-      });
+      types.push(
+        {
+          id: DELETE_STATUS_TYPE,
+          name: I18n.t("topic.auto_delete.title")
+        },
+        {
+          id: DELETE_REPLIES_TYPE,
+          name: I18n.t("topic.auto_delete_replies.title")
+        }
+      );
     }
     return types;
   },
@@ -68,7 +76,7 @@ export default Controller.extend(ModalFunctionality, {
     return "true" === isPublic ? publicTopicTimer : privateTopicTimer;
   },
 
-  _setTimer(time, statusType) {
+  _setTimer(time, duration, statusType) {
     this.set("loading", true);
 
     TopicTimer.updateStatus(
@@ -76,10 +84,11 @@ export default Controller.extend(ModalFunctionality, {
       time,
       this.get("topicTimer.based_on_last_post"),
       statusType,
-      this.get("topicTimer.category_id")
+      this.get("topicTimer.category_id"),
+      duration
     )
       .then(result => {
-        if (time) {
+        if (time || duration) {
           this.send("closeModal");
 
           setProperties(this.topicTimer, {
@@ -103,17 +112,39 @@ export default Controller.extend(ModalFunctionality, {
       .finally(() => this.set("loading", false));
   },
 
+  onShow() {
+    let time = null;
+    const executeAt = this.get("topicTimer.execute_at");
+
+    if (executeAt) {
+      const closeTime = moment(executeAt);
+
+      if (closeTime > moment()) {
+        time = closeTime.format(FORMAT);
+      }
+    }
+
+    this.send("onChangeInput", time);
+  },
+
   actions: {
     onChangeStatusType(value) {
       this.set("topicTimer.status_type", value);
     },
 
-    onChangeUpdateTime(value) {
+    onChangeInput(value) {
       this.set("topicTimer.updateTime", value);
     },
 
+    onChangeDuration(value) {
+      this.set("topicTimer.duration", value);
+    },
+
     saveTimer() {
-      if (!this.get("topicTimer.updateTime")) {
+      if (
+        !this.get("topicTimer.updateTime") &&
+        !this.get("topicTimer.duration")
+      ) {
         this.flash(
           I18n.t("topic.topic_status_update.time_frame_required"),
           "alert-error"
@@ -123,12 +154,13 @@ export default Controller.extend(ModalFunctionality, {
 
       this._setTimer(
         this.get("topicTimer.updateTime"),
+        this.get("topicTimer.duration"),
         this.get("topicTimer.status_type")
       );
     },
 
     removeTimer() {
-      this._setTimer(null, this.get("topicTimer.status_type"));
+      this._setTimer(null, null, this.get("topicTimer.status_type"));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/models/topic-timer.js b/app/assets/javascripts/discourse/models/topic-timer.js
index 31b51ae900..1afe0e92dc 100644
--- a/app/assets/javascripts/discourse/models/topic-timer.js
+++ b/app/assets/javascripts/discourse/models/topic-timer.js
@@ -4,7 +4,14 @@ import RestModel from "discourse/models/rest";
 const TopicTimer = RestModel.extend({});
 
 TopicTimer.reopenClass({
-  updateStatus(topicId, time, basedOnLastPost, statusType, categoryId) {
+  updateStatus(
+    topicId,
+    time,
+    basedOnLastPost,
+    statusType,
+    categoryId,
+    duration
+  ) {
     let data = {
       time,
       status_type: statusType
@@ -12,6 +19,7 @@ TopicTimer.reopenClass({
 
     if (basedOnLastPost) data.based_on_last_post = basedOnLastPost;
     if (categoryId) data.category_id = categoryId;
+    if (duration) data.duration = duration;
 
     return ajax({
       url: `/t/${topicId}/timer`,
diff --git a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
index 1fbfa3f979..e5ad76f979 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
@@ -7,46 +7,32 @@
       value=selection
     }}
   </div>
-
-  <div>
-    {{#if showTimeOnly}}
+  {{#if publishToCategory}}
+    <div class="control-group">
+      <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
+      {{category-chooser
+        value=topicTimer.category_id
+        excludeCategoryId=excludeCategoryId
+        onChange=(action (mut topicTimer.category_id))
+      }}
+    </div>
+  {{/if}}
+  {{#if showFutureDateInput}}
+    <div class="control-group">
       {{future-date-input
         input=(readonly topicTimer.updateTime)
+        duration=(readonly topicTimer.duration)
         label="topic.topic_status_update.when"
         statusType=selection
         includeWeekend=true
         basedOnLastPost=topicTimer.based_on_last_post
-        onChangeInput=onChangeUpdateTime
-      }}
-    {{else if publishToCategory}}
-      <div class="control-group">
-        <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
-        {{category-chooser
-          value=topicTimer.category_id
-          excludeCategoryId=excludeCategoryId
-          onChange=(action (mut topicTimer.category_id))
-        }}
-      </div>
-
-      {{future-date-input
-        input=(readonly topicTimer.updateTime)
-        label="topic.topic_status_update.when"
-        statusType=selection
-        includeWeekend=true
+        onChangeInput=onChangeInput
+        onChangeDuration=onChangeDuration
         categoryId=topicTimer.category_id
-        basedOnLastPost=topicTimer.based_on_last_post
-        onChangeInput=onChangeUpdateTime
-      }}
-    {{else if autoClose}}
-      {{future-date-input
-        input=topicTimer.updateTime
-        label="topic.topic_status_update.when"
-        statusType=selection
-        includeWeekend=true
-        basedOnLastPost=topicTimer.based_on_last_post
         lastPostedAt=model.last_posted_at
-        onChangeInput=onChangeUpdateTime
+        isBasedOnDuration=autoDeleteReplies
+        durationType=durationType
       }}
-    {{/if}}
-  </div>
+    </div>
+  {{/if}}
 </form>
diff --git a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
index c1571ad9c5..38451bea90 100644
--- a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
@@ -1,4 +1,5 @@
 <div class="future-date-input">
+  {{#unless isBasedOnDuration}}
   <div class="control-group">
     <label>{{displayLabel}}</label>
     {{future-date-input-selector
@@ -16,6 +17,7 @@
       onChange=(action (mut selection))
     }}
   </div>
+  {{/unless}}
 
   {{#if displayDateAndTimePicker}}
     <div class="control-group">
@@ -33,11 +35,11 @@
     </div>
   {{/if}}
 
-  {{#if isBasedOnLastPost}}
+  {{#if displayNumberInput}}
     <div class="control-group">
       <label>
-        {{i18n 'topic.topic_status_update.num_of_hours'}}
-        {{text-field value=input type="number"}}
+        {{durationLabel}}
+        {{text-field value=duration type="number"}}
       </label>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
index 71d7432113..316e51b00f 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
@@ -17,7 +17,8 @@
     timerTypes=selections
     updateTime=updateTime
     onChangeStatusType=(action "onChangeStatusType")
-    onChangeUpdateTime=(action "onChangeUpdateTime")
+    onChangeInput=(action "onChangeInput")
+    onChangeDuration=(action "onChangeDuration")
   }}
 {{/d-modal-body}}
 
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
index 0c588dbdfe..34efa2551c 100644
--- a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
@@ -203,7 +203,7 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
     return "future-date-input-selector/future-date-input-selector-row";
   },
 
-  content: computed(function() {
+  content: computed("statusType", function() {
     const now = moment();
     const opts = {
       now,
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index ee7ba1af18..0deb6b2efd 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -435,16 +435,19 @@ class TopicsController < ApplicationController
       rescue
         invalid_param(:status_type)
       end
+    based_on_last_post = params[:based_on_last_post]
+    params.require(:duration) if based_on_last_post || TopicTimer.types[:delete_replies] == status_type
 
     topic = Topic.find_by(id: params[:topic_id])
     guardian.ensure_can_moderate!(topic)
 
     options = {
       by_user: current_user,
-      based_on_last_post: params[:based_on_last_post]
+      based_on_last_post: based_on_last_post
     }
 
     options.merge!(category_id: params[:category_id]) if !params[:category_id].blank?
+    options.merge!(duration: params[:duration].to_i) if params[:duration].present?
 
     topic_status_update = topic.set_or_create_timer(
       status_type,
diff --git a/app/jobs/regular/delete_replies.rb b/app/jobs/regular/delete_replies.rb
new file mode 100644
index 0000000000..b8228c7a04
--- /dev/null
+++ b/app/jobs/regular/delete_replies.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Jobs
+  class DeleteReplies < ::Jobs::Base
+
+    def execute(args)
+      topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id])
+
+      topic = topic_timer&.topic
+
+      if topic_timer.blank? || topic.blank? || topic_timer.execute_at > Time.zone.now
+        return
+      end
+
+      unless Guardian.new(topic_timer.user).is_staff?
+        topic_timer.trash!(Discourse.system_user)
+        return
+      end
+
+      replies = topic.posts.where("posts.post_number > 1")
+      replies.where('posts.created_at < ?', topic_timer.duration.days.ago).each do |post|
+        PostDestroyer.new(topic_timer.user, post, context: I18n.t("topic_statuses.auto_deleted_by_timer")).destroy
+      end
+
+      topic_timer.execute_at = (replies.minimum(:created_at) || Time.zone.now) + topic_timer.duration.days.ago
+      topic_timer.save
+    end
+
+  end
+end
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 7947900b13..13f3a8a798 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1132,8 +1132,8 @@ class Topic < ActiveRecord::Base
   #  * by_user: User who is setting the topic's status update.
   #  * based_on_last_post: True if time should be based on timestamp of the last post.
   #  * category_id: Category that the update will apply to.
-  def set_or_create_timer(status_type, time, by_user: nil, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id)
-    return delete_topic_timer(status_type, by_user: by_user) if time.blank?
+  def set_or_create_timer(status_type, time, by_user: nil, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id, duration: nil)
+    return delete_topic_timer(status_type, by_user: by_user) if time.blank? && duration.blank?
 
     public_topic_timer = !!TopicTimer.public_types[status_type]
     topic_timer_options = { topic: self, public_type: public_topic_timer }
@@ -1143,19 +1143,24 @@ class Topic < ActiveRecord::Base
 
     time_now = Time.zone.now
     topic_timer.based_on_last_post = !based_on_last_post.blank?
+    topic_timer.duration = duration
 
     if status_type == TopicTimer.types[:publish_to_category]
       topic_timer.category = Category.find_by(id: category_id)
     end
 
     if topic_timer.based_on_last_post
-      num_hours = time.to_f
-
-      if num_hours > 0
+      if duration > 0
         last_post_created_at = self.ordered_posts.last.present? ? self.ordered_posts.last.created_at : time_now
-        topic_timer.execute_at = last_post_created_at + num_hours.hours
+        topic_timer.execute_at = last_post_created_at + duration.hours
         topic_timer.created_at = last_post_created_at
       end
+    elsif topic_timer.status_type == TopicTimer.types[:delete_replies]
+      if duration > 0
+        first_reply_created_at = (self.ordered_posts.where("post_number > 1").minimum(:created_at) || time_now)
+        topic_timer.execute_at = first_reply_created_at + duration.days
+        topic_timer.created_at = first_reply_created_at
+      end
     else
       utc = Time.find_zone("UTC")
       is_float = (Float(time) rescue nil)
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index 1599f77ce5..c8274da9f5 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -49,7 +49,8 @@ class TopicTimer < ActiveRecord::Base
       publish_to_category: 3,
       delete: 4,
       reminder: 5,
-      bump: 6
+      bump: 6,
+      delete_replies: 7
     )
   end
 
@@ -73,14 +74,6 @@ class TopicTimer < ActiveRecord::Base
     end
   end
 
-  def duration
-    if (self.execute_at && self.created_at)
-      ((self.execute_at - self.created_at) / 1.hour).round(2)
-    else
-      0
-    end
-  end
-
   def public_type?
     !!self.class.public_types[self.status_type]
   end
@@ -120,6 +113,14 @@ class TopicTimer < ActiveRecord::Base
     Jobs.cancel_scheduled_job(:bump_topic, topic_timer_id: id)
   end
 
+  def cancel_auto_delete_replies_job
+    Jobs.cancel_scheduled_job(:delete_replies, topic_timer_id: id)
+  end
+
+  def schedule_auto_delete_replies_job(time)
+    Jobs.enqueue_at(time, :delete_replies, topic_timer_id: id)
+  end
+
   def schedule_auto_bump_job(time)
     Jobs.enqueue_at(time, :bump_topic, topic_timer_id: id)
   end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ef241f4e16..27d207efb7 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2139,6 +2139,7 @@ en:
         title: "Topic Timer"
         save: "Set Timer"
         num_of_hours: "Number of hours:"
+        num_of_days: "Number of days:"
         remove: "Remove Timer"
         publish_to: "Publish To:"
         when: "When:"
@@ -2181,6 +2182,8 @@ en:
         title: "Auto-Bump Topic"
       reminder:
         title: "Remind Me"
+      auto_delete_replies:
+        title: "Auto-Delete Replies"
 
       status_update_notice:
         auto_open: "This topic will automatically open %{timeLeft}."
@@ -2190,6 +2193,7 @@ en:
         auto_delete: "This topic will be automatically deleted %{timeLeft}."
         auto_bump: "This topic will be automatically bumped %{timeLeft}."
         auto_reminder: "You will be reminded about this topic %{timeLeft}."
+        auto_delete_replies: "Replies on this topic are automatically deleted after %{duration}."
       auto_close_title: "Auto-Close Settings"
       auto_close_immediate:
         one: "The last post in the topic is already %{count} hour old, so the topic will be closed immediately."
diff --git a/db/migrate/20200312122846_add_duration_to_topic_timers.rb b/db/migrate/20200312122846_add_duration_to_topic_timers.rb
new file mode 100644
index 0000000000..bc4ba1a35f
--- /dev/null
+++ b/db/migrate/20200312122846_add_duration_to_topic_timers.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDurationToTopicTimers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :topic_timers, :duration, :integer, null: true
+  end
+end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 845a7e1930..0f0a921e9e 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2644,6 +2644,28 @@ RSpec.describe TopicsController do
         expect(json['closed']).to eq(topic.closed)
       end
 
+      it 'should be able to create a topic status update with duration' do
+        post "/t/#{topic.id}/timer.json", params: {
+          duration: 5,
+          status_type: TopicTimer.types[7]
+        }
+
+        expect(response.status).to eq(200)
+
+        topic_status_update = TopicTimer.last
+
+        expect(topic_status_update.topic).to eq(topic)
+        expect(topic_status_update.execute_at).to eq_time(5.days.from_now)
+        expect(topic_status_update.duration).to eq(5)
+
+        json = JSON.parse(response.body)
+
+        expect(DateTime.parse(json['execute_at']))
+          .to eq_time(DateTime.parse(topic_status_update.execute_at.to_s))
+
+        expect(json['duration']).to eq(topic_status_update.duration)
+      end
+
       describe 'publishing topic to category in the future' do
         it 'should be able to create the topic status update' do
           post "/t/#{topic.id}/timer.json", params: {

From a1f9b1a7fc909b326eba73f6fb1bfcbc0d9240c0 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Thu, 19 Mar 2020 06:00:46 -1000
Subject: [PATCH 181/633] FIX: correctly remove authentication_data cookie on
 oauth login flow (#9238)

Additionally correctly handle cookie path for authentication_data

There were two bugs that exposed an interesting case where two discourse
instances hosted across two subfolder installs in the same domain
with oauth may clash and cause strange redirection on first login:

Log in to example.com/forum1. authentication_data cookie is set with path /
On the first redirection, the current authentication_data cookie is not unset.
Log in to example.com/forum2. In this case, the authentication_data cookie
is already set from forum1 - the initial page load will incorrectly redirect
the user to the redirect URL from the already-stored cookie, to /forum1.

This removes this issue by:
* Setting the cookie for the correct path, and not having it on root
* Correctly removing the cookie on first login
---
 .../users/omniauth_callbacks_controller.rb    |  5 +++-
 app/views/layouts/application.html.erb        |  4 ++--
 .../omniauth_callbacks_controller_spec.rb     | 24 +++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 881fb3e9ec..31c14c66ca 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -74,7 +74,10 @@ class Users::OmniauthCallbacksController < ApplicationController
       @auth_result.authenticator_name = authenticator.name
       complete_response_data
       cookies['_bypass_cache'] = true
-      cookies[:authentication_data] = @auth_result.to_client_hash.to_json
+      cookies[:authentication_data] = {
+        value: @auth_result.to_client_hash.to_json,
+        path: Discourse.base_uri
+      }
       redirect_to @origin
     end
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6c1f3b3074..9f3682b411 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -58,8 +58,8 @@
 
     <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
 
-    <%- if !current_user && cookies[:authentication_data] %>
-      <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
+    <%- if data = cookies.delete(:authentication_data, path: Discourse.base_uri) && !current_user  %>
+      <meta id="data-authentication" data-authentication-data="<%= data %>">
     <%- end %>
   </head>
 
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 204c3f1572..e604a89aba 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -269,6 +269,30 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email_confirmed?).to eq(true)
       end
 
+      it 'should return the authenticated response with the correct path for subfolders' do
+        set_subfolder "/forum"
+        events = DiscourseEvent.track_events do
+          get "/auth/google_oauth2/callback.json"
+        end
+
+        expect(response.headers["Set-Cookie"].match(/^authentication_data=.*; path=\/forum/)).not_to eq(nil)
+
+        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+
+        expect(response.status).to eq(302)
+
+        data = JSON.parse(response.cookies["authentication_data"])
+
+        expect(data["authenticated"]).to eq(true)
+        expect(data["awaiting_activation"]).to eq(false)
+        expect(data["awaiting_approval"]).to eq(false)
+        expect(data["not_allowed_from_ip_address"]).to eq(false)
+        expect(data["admin_not_allowed_from_ip_address"]).to eq(false)
+
+        user.reload
+        expect(user.email_confirmed?).to eq(true)
+      end
+
       it "should confirm email even when the tokens are expired" do
         user.email_tokens.update_all(confirmed: false, expired: true)
 

From 22d5ba0f77a7c19188ef5d16c4fee89a88ea0407 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 19 Mar 2020 16:02:12 +0000
Subject: [PATCH 182/633] DEV: Load plugin stylesheets before theme stylesheets
 (#9240)

This is a more logical order, since themes are more lightweight than plugins, and are often used to augment plugin styles
---
 app/views/common/_discourse_stylesheet.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb
index 2312fa4da7..2992572d0d 100644
--- a/app/views/common/_discourse_stylesheet.html.erb
+++ b/app/views/common/_discourse_stylesheet.html.erb
@@ -8,10 +8,11 @@
   <%= discourse_stylesheet_link_tag(:admin) %>
 <%- end %>
 
+<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %>
+  <%= discourse_stylesheet_link_tag(file) %>
+<%- end %>
+
 <%- if theme_ids.present? %>
   <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_theme : :desktop_theme) %>
 <%- end %>
 
-<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %>
-  <%= discourse_stylesheet_link_tag(file) %>
-<%- end %>

From f6d6f1701f18de3589c742592e17b3ed505172c0 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 19 Mar 2020 21:45:05 +0530
Subject: [PATCH 183/633] FIX: use the new duration attribute in
 `set_or_create_timer` method.

New `duration` attribute is introduced for the `set_or_create_timer` method in the commit aad12822b7d7c9c6ecd976e23d3a83626c052dce for "based on last post" and "auto delete replies" topic timers.
---
 app/models/topic.rb                        | 6 +++++-
 lib/post_creator.rb                        | 5 +++--
 spec/components/post_creator_spec.rb       | 3 ++-
 spec/models/topic_spec.rb                  | 4 ++--
 spec/services/topic_status_updater_spec.rb | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index 13f3a8a798..07b5c60c6e 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -257,10 +257,14 @@ class Topic < ActiveRecord::Base
        self.category.auto_close_hours &&
        !public_topic_timer&.execute_at
 
+      based_on_last_post = self.category.auto_close_based_on_last_post
+      duration = based_on_last_post ? self.category.auto_close_hours : nil
+
       self.set_or_create_timer(
         TopicTimer.types[:close],
         self.category.auto_close_hours,
-        based_on_last_post: self.category.auto_close_based_on_last_post
+        based_on_last_post: based_on_last_post,
+        duration: duration
       )
     end
   end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 25cd341eea..0e89a93ba1 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -473,8 +473,9 @@ class PostCreator
          topic_timer.duration > 0
 
         @topic.set_or_create_timer(TopicTimer.types[:close],
-          topic_timer.duration,
-          based_on_last_post: topic_timer.based_on_last_post
+          nil,
+          based_on_last_post: topic_timer.based_on_last_post,
+          duration: topic_timer.duration
         )
       end
     end
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 1fae772752..0b3999a322 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -367,7 +367,8 @@ describe PostCreator do
             Fabricate(:topic_timer,
               based_on_last_post: true,
               execute_at: Time.zone.now - 12.hours,
-              created_at: Time.zone.now - 24.hours
+              created_at: Time.zone.now - 24.hours,
+              duration: 12
             )
           end
 
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 17d49606ff..64ad9b005d 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -1638,7 +1638,7 @@ describe Topic do
 
     it 'can take a number of hours as a string and can handle based on last post' do
       freeze_time now
-      topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin, based_on_last_post: true)
+      topic.set_or_create_timer(TopicTimer.types[:close], nil, by_user: admin, based_on_last_post: true, duration: 18)
       expect(topic.topic_timers.first.execute_at).to eq_time(18.hours.from_now)
     end
 
@@ -1750,7 +1750,7 @@ describe Topic do
       it "should be able to override category's default auto close" do
         Jobs.run_immediately!
 
-        expect(topic.topic_timers.first.duration).to eq(4)
+        expect(topic.topic_timers.first.execute_at).to eq_time(topic.created_at + 4.hours)
 
         topic.set_or_create_timer(TopicTimer.types[:close], 2, by_user: admin)
 
diff --git a/spec/services/topic_status_updater_spec.rb b/spec/services/topic_status_updater_spec.rb
index 7bb6ab4abf..593203eb51 100644
--- a/spec/services/topic_status_updater_spec.rb
+++ b/spec/services/topic_status_updater_spec.rb
@@ -59,7 +59,7 @@ describe TopicStatusUpdater do
     Fabricate(:post, topic: topic)
 
     topic.set_or_create_timer(
-      TopicTimer.types[:close], '10', based_on_last_post: true
+      TopicTimer.types[:close], nil, based_on_last_post: true, duration: 10
     )
 
     TopicStatusUpdater.new(topic, admin).update!("autoclosed", true)

From 226d81fcc5a1a227bbc3a363b8f5e6958e0b74de Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 16 Mar 2020 19:17:20 -0300
Subject: [PATCH 184/633] FIX: Fix a PostgreSQL error when a draft was
 concurrently created

Moves the new draft creation concurrency handling to PostgreSQL
so the database doesn't error out when the draft is being created
by multiple backends.

Also removes `retry_not_unique` parameter from Draft#set` which is
not called anywhere.

Also fixes a draft update not bumping the `updated_at` column.
---
 app/models/draft.rb | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/models/draft.rb b/app/models/draft.rb
index 4a3ab41f02..8d1b5ca364 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -7,7 +7,7 @@ class Draft < ActiveRecord::Base
 
   class OutOfSequence < StandardError; end
 
-  def self.set(user, key, sequence, data, owner = nil, retry_not_unique: true)
+  def self.set(user, key, sequence, data, owner = nil)
     if SiteSetting.backup_drafts_to_pm_length > 0 && SiteSetting.backup_drafts_to_pm_length < data.length
       backup_draft(user, key, sequence, data)
     end
@@ -59,30 +59,33 @@ class Draft < ActiveRecord::Base
              , data = :data
              , revisions = revisions + 1
              , owner = :owner
+             , updated_at = CURRENT_TIMESTAMP
          WHERE id = :id
       SQL
 
     elsif sequence != current_sequence
       raise Draft::OutOfSequence
     else
-      begin
-        Draft.create!(
-          user_id: user.id,
-          draft_key: key,
-          data: data,
-          sequence: sequence,
-          owner: owner
-        )
-      rescue ActiveRecord::RecordNotUnique => e
-        # we need this to be fast and with minimal locking, in some cases we can have a race condition
-        # around 2 controller actions calling for draft creation at the exact same time
-        # to avoid complex locking and a distributed mutex, since this is so rare, simply add a single retry
-        if retry_not_unique
-          set(user, key, sequence, data, owner, retry_not_unique: false)
-        else
-          raise e
-        end
-      end
+      opts = {
+        user_id: user.id,
+        draft_key: key,
+        data: data,
+        sequence: sequence,
+        owner: owner
+      }
+
+      DB.exec(<<~SQL, opts)
+        INSERT INTO drafts (user_id, draft_key, data, sequence, owner, created_at, updated_at)
+        VALUES (:user_id, :draft_key, :data, :sequence, :owner, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
+        ON CONFLICT (user_id, draft_key) DO
+        UPDATE
+        SET
+          sequence = :sequence,
+          data = :data,
+          revisions = drafts.revisions + 1,
+          owner = :owner,
+          updated_at = CURRENT_TIMESTAMP
+      SQL
     end
 
     sequence

From 080960a15ed3eee0d35e4708342c9e1a1167e1c3 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Thu, 19 Mar 2020 15:12:42 -0300
Subject: [PATCH 185/633] FIX: Show the envelope icon when the flagged post is
 a PM. Flagged PM must be exclusively reviewed by admins (#9232)

---
 .../templates/components/reviewable-topic-link.hbs    |  2 +-
 app/models/reviewable.rb                              |  2 +-
 spec/models/reviewable_spec.rb                        | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
index 4b1704aec4..b43876ab48 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
@@ -1,6 +1,6 @@
 <div class='post-topic'>
   {{#if reviewable.topic}}
-    {{topic-status topic=reviewable.topic}}
+    {{topic-status topic=reviewable.topic showPrivateMessageIcon=true}}
     <a href={{reviewable.target_url}} class='title-text'>{{reviewable.topic.title}}</a>
     {{category-badge reviewable.category}}
     {{reviewable-tags tags=reviewable.topic_tags tagName=''}}
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 78d4b98e65..13468019e3 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -133,7 +133,7 @@ class Reviewable < ActiveRecord::Base
       target: target,
       topic: topic,
       created_by: created_by,
-      reviewable_by_moderator: reviewable_by_moderator,
+      reviewable_by_moderator: reviewable_by_moderator && !(topic&.private_message?),
       payload: payload,
       potential_spam: potential_spam
     )
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 9b46eb7c52..30bd5d6855 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -78,6 +78,17 @@ RSpec.describe Reviewable, type: :model do
       expect(r1.pending?).to eq(true)
       expect(r0.pending?).to eq(false)
     end
+
+    it 'sets the reviewable_by_moderator attribute to false when the topic is a PM' do
+      pm_topic = Fabricate(:private_message_topic)
+      post = Fabricate(:post, topic: pm_topic)
+      reviewable = ReviewableFlaggedPost.needs_review!(
+        target: post, topic: pm_topic,
+        created_by: Discourse.system_user, reviewable_by_moderator: true
+      )
+
+      expect(reviewable.reviewable_by_moderator).to eq(false)
+    end
   end
 
   context ".list_for" do

From 86eb03af85ac54da7001d9d405b84f7b538bb023 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 19 Mar 2020 19:30:08 +0100
Subject: [PATCH 186/633] DEV: allows to run up/down migrations of a plugin
 (#9241)

This is mostly useful while developing a plugin, to avoid manual actions of deleting tables and schema_migrations rows.

Usage:
bundle exec rake plugin:migrate:down[discourse-calendar]
---
 lib/tasks/plugin.rake | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 58b84ccfa0..9da1f43350 100644
--- a/lib/tasks/plugin.rake
+++ b/lib/tasks/plugin.rake
@@ -146,3 +146,32 @@ task 'plugin:qunit', [:plugin, :timeout] do |t, args|
 
   sh cmd
 end
+
+desc 'run all migrations of a plugin'
+namespace 'plugin:migrate' do
+  def list_migrations(plugin_name)
+    plugin_root = File.join(Rails.root, "plugins", plugin_name)
+    migrations_root = File.join(plugin_root, "db", "{post_migrate,migrate}", "*.rb")
+    Dir[migrations_root]
+      .map do |migration_filename|
+        File.basename(migration_filename)[/(^.*?)_/, 1].to_i
+      end
+      .sort
+  end
+
+  def cmd(operation, migration_number)
+    "rails db:migrate:#{operation} LOAD_PLUGINS=1 VERSION=#{migration_number}"
+  end
+
+  task :down, [:plugin] do |t, args|
+    list_migrations(args[:plugin]).reverse.each do |migration_number|
+      sh cmd(:down, migration_number)
+    end
+  end
+
+  task :up, [:plugin] do |t, args|
+    list_migrations(args[:plugin]).each do |migration_number|
+      sh cmd(:up, migration_number)
+    end
+  end
+end

From f3ddc36ac614ea59503b5b79d0aa13145bae5f18 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 20 Mar 2020 00:55:47 +0530
Subject: [PATCH 187/633] FIX: update `email_digests` user option when
 `default_email_digest_frequency` updated.

---
 app/controllers/admin/site_settings_controller.rb    |  8 +++-----
 spec/requests/admin/site_settings_controller_spec.rb | 11 ++++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index bc550ba103..4d662f7dd5 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -37,12 +37,10 @@ class Admin::SiteSettingsController < Admin::AdminController
           new_value = UserOption.title_count_modes[new_value.to_sym]
         end
 
-        UserOption.where(user_option => previous_value).update_all(user_option => new_value)
+        attrs = { user_option => new_value }
+        attrs[:email_digests] = (new_value.to_i != 0) if id == "default_email_digest_frequency"
 
-        if id == "default_email_digest_frequency"
-          disable_digests = new_value == 0
-          UserOption.where(user_option => 0, email_digests: !disable_digests).update_all(email_digests: disable_digests)
-        end
+        UserOption.where(user_option => previous_value).update_all(attrs)
       elsif id.start_with?("default_categories_")
         previous_category_ids = previous_value.split("|")
         new_category_ids = new_value.split("|")
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index 9e21a2d37e..5dc564e701 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -77,7 +77,16 @@ describe Admin::SiteSettingsController do
           }.to change { UserOption.where(email_in_reply_to: false).count }.by(0)
         end
 
-        it 'should disable email digests in existing user options' do
+        it 'should update `email_digests` column in existing user options' do
+          UserOption.last.update(email_digests: false)
+
+          expect {
+            put "/admin/site_settings/default_email_digest_frequency.json", params: {
+              default_email_digest_frequency: 30,
+              updateExistingUsers: true
+            }
+          }.to change { UserOption.where(email_digests: true).count }.by(1)
+
           expect {
             put "/admin/site_settings/default_email_digest_frequency.json", params: {
               default_email_digest_frequency: 0,

From e9a3639b107393cb581a484dc89a2b0151623aca Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 19 Mar 2020 19:52:31 +0000
Subject: [PATCH 188/633] DEV: Pin hashie and faraday versions for zendesk api
 compatibility (#9214)

---
 Gemfile      | 7 +++++++
 Gemfile.lock | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/Gemfile b/Gemfile
index 73f97c0533..a1f8015d13 100644
--- a/Gemfile
+++ b/Gemfile
@@ -255,3 +255,10 @@ end
 gem 'webpush', require: false
 gem 'colored2', require: false
 gem 'maxminddb'
+
+# These are not direct dependencies, but we need to restrict
+# versions for compatibility with https://github.com/discourse/discourse-zendesk-plugin
+# These restrictions can be removed once the zendesk_api gem is updated
+# for newer versions of hashie and faraday
+gem 'hashie', '< 4.0.0', require: false # https://github.com/zendesk/zendesk_api_client_rb/pull/422
+gem 'faraday', '< 1.0.0', require: false # https://github.com/zendesk/zendesk_api_client_rb/pull/421
diff --git a/Gemfile.lock b/Gemfile.lock
index 1280352e63..9c253f8308 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -456,12 +456,14 @@ DEPENDENCIES
   execjs
   fabrication
   fakeweb
+  faraday (< 1.0.0)
   fast_blank
   fast_xor
   fast_xs
   fastimage
   flamegraph
   gc_tracer
+  hashie (< 4.0.0)
   highline (~> 1.7.0)
   htmlentities
   http_accept_language

From 19814c5e8109dfb30b8a96e0762d062b200db392 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 19 Mar 2020 19:54:42 +0000
Subject: [PATCH 189/633] FIX: Allow CSP to work correctly for non-default
 hostnames/schemes (#9180)

- Define the CSP based on the requested domain / scheme (respecting force_https)
- Update EnforceHostname middleware to allow secondary domains, add specs
- Add URL scheme to anon cache key so that CSP headers are cached correctly
---
 lib/content_security_policy.rb                | 13 ++---
 lib/content_security_policy/builder.rb        |  4 +-
 lib/content_security_policy/default.rb        |  7 ++-
 lib/content_security_policy/middleware.rb     |  9 ++-
 lib/middleware/anonymous_cache.rb             |  2 +-
 lib/middleware/enforce_hostname.rb            |  7 ++-
 .../middleware/enforce_hostname_spec.rb       | 39 +++++++++++++
 .../content_security_policy_spec.rb           | 58 +++++++++++++++++++
 .../content_security_policy/builder_spec.rb   |  2 +-
 spec/lib/content_security_policy_spec.rb      |  2 -
 10 files changed, 122 insertions(+), 21 deletions(-)
 create mode 100644 spec/components/middleware/enforce_hostname_spec.rb
 create mode 100644 spec/integration/content_security_policy_spec.rb

diff --git a/lib/content_security_policy.rb b/lib/content_security_policy.rb
index 3a6227b5d3..76d2246e5f 100644
--- a/lib/content_security_policy.rb
+++ b/lib/content_security_policy.rb
@@ -4,18 +4,13 @@ require 'content_security_policy/extension'
 
 class ContentSecurityPolicy
   class << self
-    def policy(theme_ids = [], path_info: "/")
-      new.build(theme_ids, path_info: path_info)
+    def policy(theme_ids = [], base_url: Discourse.base_url, path_info: "/")
+      new.build(theme_ids, base_url: base_url, path_info: path_info)
     end
-
-    def base_url
-      @base_url || Discourse.base_url
-    end
-    attr_writer :base_url
   end
 
-  def build(theme_ids, path_info: "/")
-    builder = Builder.new
+  def build(theme_ids, base_url:, path_info: "/")
+    builder = Builder.new(base_url: base_url)
 
     Extension.theme_extensions(theme_ids).each { |extension| builder << extension }
     Extension.plugin_extensions.each { |extension| builder << extension }
diff --git a/lib/content_security_policy/builder.rb b/lib/content_security_policy/builder.rb
index f7cf1b690f..e59e8e2ecd 100644
--- a/lib/content_security_policy/builder.rb
+++ b/lib/content_security_policy/builder.rb
@@ -25,8 +25,8 @@ class ContentSecurityPolicy
       style_src
     ].freeze
 
-    def initialize
-      @directives = Default.new.directives
+    def initialize(base_url:)
+      @directives = Default.new(base_url: base_url).directives
     end
 
     def <<(extension)
diff --git a/lib/content_security_policy/default.rb b/lib/content_security_policy/default.rb
index d1daff3573..d2f92f20b5 100644
--- a/lib/content_security_policy/default.rb
+++ b/lib/content_security_policy/default.rb
@@ -5,7 +5,8 @@ class ContentSecurityPolicy
   class Default
     attr_reader :directives
 
-    def initialize
+    def initialize(base_url:)
+      @base_url = base_url
       @directives = {}.tap do |directives|
         directives[:base_uri] = [:none]
         directives[:object_src] = [:none]
@@ -17,7 +18,9 @@ class ContentSecurityPolicy
 
     private
 
-    delegate :base_url, to: :ContentSecurityPolicy
+    def base_url
+      @base_url
+    end
 
     SCRIPT_ASSET_DIRECTORIES = [
       # [dir, can_use_s3_cdn, can_use_cdn]
diff --git a/lib/content_security_policy/middleware.rb b/lib/content_security_policy/middleware.rb
index 3e10db2f26..d9b8ece251 100644
--- a/lib/content_security_policy/middleware.rb
+++ b/lib/content_security_policy/middleware.rb
@@ -12,12 +12,15 @@ class ContentSecurityPolicy
       _, headers, _ = response = @app.call(env)
 
       return response unless html_response?(headers)
-      ContentSecurityPolicy.base_url = request.host_with_port if !Rails.env.production?
+
+      # The EnforceHostname middleware ensures request.host_with_port can be trusted
+      protocol = (SiteSetting.force_https || request.ssl?) ? "https://" : "http://"
+      base_url = protocol + request.host_with_port + Discourse.base_uri
 
       theme_ids = env[:resolved_theme_ids]
 
-      headers['Content-Security-Policy'] = policy(theme_ids, path_info: env["PATH_INFO"]) if SiteSetting.content_security_policy
-      headers['Content-Security-Policy-Report-Only'] = policy(theme_ids, path_info: env["PATH_INFO"]) if SiteSetting.content_security_policy_report_only
+      headers['Content-Security-Policy'] = policy(theme_ids, base_url: base_url, path_info: env["PATH_INFO"]) if SiteSetting.content_security_policy
+      headers['Content-Security-Policy-Report-Only'] = policy(theme_ids, base_url: base_url, path_info: env["PATH_INFO"]) if SiteSetting.content_security_policy_report_only
 
       response
     end
diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb
index aa7dd7d1e8..8f1e75606a 100644
--- a/lib/middleware/anonymous_cache.rb
+++ b/lib/middleware/anonymous_cache.rb
@@ -107,7 +107,7 @@ module Middleware
       def cache_key
         return @cache_key if defined?(@cache_key)
 
-        @cache_key = +"ANON_CACHE_#{@env["HTTP_ACCEPT"]}_#{@env["HTTP_HOST"]}#{@env["REQUEST_URI"]}"
+        @cache_key = +"ANON_CACHE_#{@env["HTTP_ACCEPT"]}_#{@env[Rack::RACK_URL_SCHEME]}_#{@env["HTTP_HOST"]}#{@env["REQUEST_URI"]}"
         @cache_key << AnonymousCache.build_cache_key(self)
         @cache_key
       end
diff --git a/lib/middleware/enforce_hostname.rb b/lib/middleware/enforce_hostname.rb
index 130cabb87a..00e8870d57 100644
--- a/lib/middleware/enforce_hostname.rb
+++ b/lib/middleware/enforce_hostname.rb
@@ -13,7 +13,12 @@ module Middleware
       # all Rails helpers are guarenteed to use it unconditionally and
       # never generate incorrect links
       env[Rack::Request::HTTP_X_FORWARDED_HOST] = nil
-      env[Rack::HTTP_HOST] = Discourse.current_hostname
+
+      allowed_hostnames = RailsMultisite::ConnectionManagement.current_db_hostnames
+      requested_hostname = env[Rack::HTTP_HOST]
+
+      env[Rack::HTTP_HOST] = allowed_hostnames.find { |h| h == requested_hostname } || Discourse.current_hostname
+
       @app.call(env)
     end
   end
diff --git a/spec/components/middleware/enforce_hostname_spec.rb b/spec/components/middleware/enforce_hostname_spec.rb
new file mode 100644
index 0000000000..1a065ebdaa
--- /dev/null
+++ b/spec/components/middleware/enforce_hostname_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Middleware::EnforceHostname do
+
+  before do
+    RailsMultisite::ConnectionManagement.stubs(:current_db_hostnames).returns(['primary.example.com', 'secondary.example.com'])
+    RailsMultisite::ConnectionManagement.stubs(:current_hostname).returns('primary.example.com')
+  end
+
+  def check_returned_host(input_host)
+    resolved_host = nil
+
+    app = described_class.new(
+      lambda do |env|
+        resolved_host = env["HTTP_HOST"]
+        [200, {}, ["ok"]]
+      end
+    )
+
+    app.call({ "HTTP_HOST" => input_host })
+
+    resolved_host
+  end
+
+  it "works for the primary domain" do
+    expect(check_returned_host("primary.example.com")).to eq("primary.example.com")
+  end
+
+  it "works for the secondary domain" do
+    expect(check_returned_host("secondary.example.com")).to eq("secondary.example.com")
+  end
+
+  it "returns primary domain otherwise" do
+    expect(check_returned_host("other.example.com")).to eq("primary.example.com")
+    expect(check_returned_host(nil)).to eq("primary.example.com")
+  end
+end
diff --git a/spec/integration/content_security_policy_spec.rb b/spec/integration/content_security_policy_spec.rb
new file mode 100644
index 0000000000..095e3c2287
--- /dev/null
+++ b/spec/integration/content_security_policy_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'content security policy integration' do
+
+  it "adds the csp headers correctly" do
+    SiteSetting.content_security_policy = false
+    get "/"
+    expect(response.headers["Content-Security-Policy"]).to eq(nil)
+
+    SiteSetting.content_security_policy = true
+    get "/"
+    expect(response.headers["Content-Security-Policy"]).to be_present
+  end
+
+  context "with different hostnames" do
+    before do
+      SiteSetting.content_security_policy = true
+      RailsMultisite::ConnectionManagement.stubs(:current_db_hostnames).returns(['primary.example.com', 'secondary.example.com'])
+      RailsMultisite::ConnectionManagement.stubs(:current_hostname).returns('primary.example.com')
+    end
+
+    it "works with the primary domain" do
+      host! "primary.example.com"
+      get "/"
+      expect(response.headers["Content-Security-Policy"]).to include("http://primary.example.com")
+    end
+
+    it "works with the secondary domain" do
+      host! "secondary.example.com"
+      get "/"
+      expect(response.headers["Content-Security-Policy"]).to include("http://secondary.example.com")
+    end
+
+    it "uses the primary domain for unknown hosts" do
+      host! "unknown.example.com"
+      get "/"
+      expect(response.headers["Content-Security-Policy"]).to include("http://primary.example.com")
+    end
+  end
+
+  context "with different protocols" do
+    it "forces https when the site setting is enabled" do
+      SiteSetting.force_https = true
+      get "/"
+      expect(response.headers["Content-Security-Policy"]).to include("https://test.localhost")
+    end
+
+    it "uses https when the site setting is disabled, but request is ssl" do
+      SiteSetting.force_https = false
+      https!
+      get "/"
+      expect(response.headers["Content-Security-Policy"]).to include("https://test.localhost")
+    end
+  end
+
+end
diff --git a/spec/lib/content_security_policy/builder_spec.rb b/spec/lib/content_security_policy/builder_spec.rb
index f188dbcc4c..68d51facb9 100644
--- a/spec/lib/content_security_policy/builder_spec.rb
+++ b/spec/lib/content_security_policy/builder_spec.rb
@@ -2,7 +2,7 @@
 require 'rails_helper'
 
 describe ContentSecurityPolicy::Builder do
-  let(:builder) { described_class.new }
+  let(:builder) { described_class.new(base_url: Discourse.base_url) }
 
   describe '#<<' do
     it 'normalizes directive name' do
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index 85b8c31e3a..fcbf5ece2c 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -2,8 +2,6 @@
 require 'rails_helper'
 
 describe ContentSecurityPolicy do
-  before { ContentSecurityPolicy.base_url = nil }
-
   after do
     DiscoursePluginRegistry.reset!
   end

From 10b37e1e3660df9fd978d1a6a6a02891d5b4b337 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 20 Mar 2020 15:36:50 +1100
Subject: [PATCH 190/633] FIX: add support for sub-sub category slugs in search

Previous to this change slugs for leaves in 3 level nestings would not work

Our UX picks only the last two levels

This also makes the results consistent for slugs as it enforces order.
---
 lib/search.rb                  | 22 +++++++++-------------
 spec/components/search_spec.rb | 26 ++++++++++++++++++++------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/lib/search.rb b/lib/search.rb
index e7e97d8ede..6bfc2834cb 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -462,20 +462,16 @@ class Search
     next unless category_slug
 
     if subcategory_slug
-      # sub category
-      parent_category_id = Category
-        .where(
-          "lower(slug) = ? AND parent_category_id IS NULL", category_slug.downcase
-        )
-        .pluck(:id)
-        .first
 
-      category_id = Category
-        .where("lower(slug) = ? AND parent_category_id = ?",
-          subcategory_slug.downcase, parent_category_id
-        )
-        .pluck(:id)
-        .first
+      category_id, _ = DB.query_single(<<~SQL, category_slug.downcase, subcategory_slug.downcase)
+        SELECT sub.id
+        FROM categories sub
+        JOIN categories c ON sub.parent_category_id = c.id
+        WHERE LOWER(c.slug)  = ? AND LOWER(sub.slug) = ?
+        ORDER BY c.id
+        LIMIT 1
+      SQL
+
     else
       # main category
       if category_slug[0] == "="
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 3f89e63cf3..64e0efb726 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -264,7 +264,7 @@ describe Search do
 
       it 'can find all direct PMs of the current user' do
         pm = create_pm(users: [current, participant])
-        pm_2 = create_pm(users: [participant_2, participant])
+        _pm_2 = create_pm(users: [participant_2, participant])
         pm_3 = create_pm(users: [participant, current])
         pm_4 = create_pm(users: [participant_2, current])
         results = Search.execute("in:personal-direct", guardian: Guardian.new(current))
@@ -275,7 +275,7 @@ describe Search do
       it 'can filter direct PMs by @username' do
         pm = create_pm(users: [current, participant])
         pm_2 = create_pm(users: [participant, current])
-        pm_3 = create_pm(users: [participant_2, current])
+        _pm_3 = create_pm(users: [participant_2, current])
         results = Search.execute("@#{participant.username} in:personal-direct", guardian: Guardian.new(current))
         expect(results.posts.size).to eq(2)
         expect(results.posts.map(&:topic_id)).to contain_exactly(pm.id, pm_2.id)
@@ -283,13 +283,13 @@ describe Search do
       end
 
       it "doesn't include PMs that have more than 2 participants" do
-        pm = create_pm(users: [current, participant, participant_2])
+        _pm = create_pm(users: [current, participant, participant_2])
         results = Search.execute("@#{participant.username} in:personal-direct", guardian: Guardian.new(current))
         expect(results.posts.size).to eq(0)
       end
 
       it "doesn't include PMs that have groups" do
-        pm = create_pm(users: [current, participant], group: group)
+        _pm = create_pm(users: [current, participant], group: group)
         results = Search.execute("@#{participant.username} in:personal-direct", guardian: Guardian.new(current))
         expect(results.posts.size).to eq(0)
       end
@@ -1088,7 +1088,7 @@ describe Search do
       second_topic = post2.topic
       second_topic.update(category: private_category)
 
-      post3 = Fabricate(:post, raw: "another test!", user: topic.user, topic: second_topic)
+      _post3 = Fabricate(:post, raw: "another test!", user: topic.user, topic: second_topic)
 
       expect(Search.execute('test status:public').posts.length).to eq(1)
       expect(Search.execute('test status:closed').posts.length).to eq(0)
@@ -1242,6 +1242,20 @@ describe Search do
       expect(Search.execute('this is a test #beta').posts.size).to eq(0)
     end
 
+    it 'supports sub-sub category slugs' do
+
+      SiteSetting.max_category_nesting = 3
+
+      category = Fabricate(:category, name: 'top', slug: 'top')
+      sub = Fabricate(:category, name: 'middle', slug: 'middle', parent_category_id: category.id)
+      leaf = Fabricate(:category, name: 'leaf', slug: 'leaf', parent_category_id: sub.id)
+
+      topic = Fabricate(:topic, created_at: 3.months.ago, category: leaf)
+      _post = Fabricate(:post, raw: 'Sams first post', topic: topic)
+
+      expect(Search.execute('#Middle:leaf first post').posts.size).to eq(1)
+    end
+
     it 'correctly handles #symbol when no tag or category match' do
       Fabricate(:post, raw: 'testing #1 #9998')
       results = Search.new('testing #1').execute
@@ -1555,7 +1569,7 @@ describe Search do
       topic = Fabricate(:topic, title: 'I am testing a tagged search')
       _post = Fabricate(:post, topic: topic, raw: 'this is the first post')
       tag = Fabricate(:tag)
-      topic_tag = Fabricate(:topic_tag, topic: topic, tag: tag)
+      _topic_tag = Fabricate(:topic_tag, topic: topic, tag: tag)
 
       results = Search.execute('in:untagged')
       expect(results.posts.length).to eq(0)

From 145c90419d4fefd411453fadd2eb85fa9f334791 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 20 Mar 2020 15:48:25 +1100
Subject: [PATCH 191/633] DEV: increase timeout for initial context eval

Due to JS refactors our initial payload transpile is taking a bit longer
instead of failing the test suite attempt to give this a bit more time
---
 lib/pretty_text.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index d76e2ed827..55faf8d4c1 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -62,7 +62,7 @@ module PrettyText
   end
 
   def self.create_es6_context
-    ctx = MiniRacer::Context.new(timeout: 15000)
+    ctx = MiniRacer::Context.new(timeout: 25000)
 
     ctx.eval("window = {}; window.devicePixelRatio = 2;") # hack to make code think stuff is retina
 

From 1b24a7b993bf4fd203f0c62f32ed523b2e931cef Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Thu, 19 Mar 2020 14:56:28 +0000
Subject: [PATCH 192/633] FIX: Include entire slug path in permalinks

This is a temporary fix since these URLs should contain the id as well.
---
 app/models/category.rb       | 15 +++------
 spec/models/category_spec.rb | 62 +++++++++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 00f4e1803b..bb4a8d5219 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -682,10 +682,9 @@ class Category < ActiveRecord::Base
   def url
     url = @@url_cache[self.id]
     unless url
-      url = +"#{Discourse.base_uri}/c"
-      url << "/#{parent_category.slug_for_url}" if parent_category_id
-      url << "/#{slug_for_url}"
-      @@url_cache[self.id] = -url
+      url = "#{Discourse.base_uri}/c/#{slug_path.join('/')}"
+
+      @@url_cache[self.id] = url
     end
 
     url
@@ -708,7 +707,7 @@ class Category < ActiveRecord::Base
   def create_category_permalink
     old_slug = saved_changes.transform_values(&:first)["slug"]
     url = +"#{Discourse.base_uri}/c"
-    url << "/#{parent_category.slug}" if parent_category_id
+    url << "/#{parent_category.slug_path.join('/')}" if parent_category_id
     url << "/#{old_slug}"
     url = Permalink.normalize_url(url)
 
@@ -720,11 +719,7 @@ class Category < ActiveRecord::Base
   end
 
   def delete_category_permalink
-    if self.parent_category
-      permalink = Permalink.find_by_url("c/#{self.parent_category.slug}/#{slug}")
-    else
-      permalink = Permalink.find_by_url("c/#{slug}")
-    end
+    permalink = Permalink.find_by_url("c/#{slug_path.join('/')}")
     permalink.destroy if permalink
   end
 
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 68f037bf57..b2da411504 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -661,36 +661,68 @@ describe Category do
   end
 
   describe "#url" do
-    it "builds a url for normal categories" do
-      category = Fabricate(:category_with_definition, name: "cats")
-      expect(category.url).to eq "/c/cats"
+    before_all do
+      SiteSetting.max_category_nesting = 3
+    end
+
+    fab!(:category) { Fabricate(:category, name: "root") }
+
+    fab!(:sub_category) do
+      Fabricate(
+        :category,
+        name: "child",
+        parent_category_id: category.id,
+      )
+    end
+
+    fab!(:sub_sub_category) do
+      Fabricate(
+        :category,
+        name: "child_of_child",
+        parent_category_id: sub_category.id,
+      )
+    end
+
+    describe "for normal categories" do
+      it "builds a url" do
+        expect(category.url).to eq("/c/root")
+      end
     end
 
     describe "for subcategories" do
-      it "includes the parent category" do
-        parent_category = Fabricate(:category_with_definition, name: "parent")
+      it "builds a url" do
+        expect(sub_category.url).to eq("/c/root/child")
+      end
+    end
 
-        subcategory =
-          Fabricate(
-            :category_with_definition,
-            name: "child",
-            parent_category_id: parent_category.id
-          )
-
-        expect(subcategory.url).to eq "/c/parent/child"
+    describe "for sub-sub-categories" do
+      it "builds a url" do
+        expect(sub_sub_category.url)
+          .to eq("/c/root/child/child-of-child")
       end
     end
   end
 
   describe "#url_with_id" do
-    fab!(:category) { Fabricate(:category_with_definition, name: 'cats') }
+    fab!(:category) do
+      Fabricate(
+        :category_with_definition,
+        name: 'cats',
+      )
+    end
 
     it "includes the id in the URL" do
       expect(category.url_with_id).to eq("/c/cats/#{category.id}")
     end
 
     context "child category" do
-      fab!(:child_category) { Fabricate(:category_with_definition, parent_category_id: category.id, name: 'dogs') }
+      fab!(:child_category) do
+        Fabricate(
+          :category,
+          parent_category_id: category.id,
+          name: 'dogs',
+        )
+      end
 
       it "includes the id in the URL" do
         expect(child_category.url_with_id).to eq("/c/cats/dogs/#{child_category.id}")

From 8174f1551cec8cd5e7cc9b7181ec819b1208be40 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2020 09:43:58 -0400
Subject: [PATCH 193/633] Build(deps): Bump aws-sdk-s3 from 1.61.0 to 1.61.1
 (#9216)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.0 to 1.61.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9c253f8308..8485b761d9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ GEM
     aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.61.0)
+    aws-sdk-s3 (1.61.1)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)

From c15056650647e8650288f973d9038500dc9cf7bb Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 20 Mar 2020 09:55:42 -0400
Subject: [PATCH 194/633] Migrate pretty-text to `.js` extensions (#9243)

---
 .../{censored-words.js.es6 => censored-words.js}           | 0
 ...classes.js.es6.erb => inline-onebox-css-classes.js.erb} | 0
 .../javascripts/pretty-text/{emoji.js.es6 => emoji.js}     | 0
 .../pretty-text/emoji/{data.js.es6.erb => data.js.erb}     | 0
 .../emoji/{version.js.es6.erb => version.js.erb}           | 0
 ...scourse-markdown-it.js.es6 => discourse-markdown-it.js} | 0
 .../{bbcode-block.js.es6 => bbcode-block.js}               | 0
 .../{bbcode-inline.js.es6 => bbcode-inline.js}             | 0
 .../{category-hashtag.js.es6 => category-hashtag.js}       | 0
 .../discourse-markdown/{censored.js.es6 => censored.js}    | 0
 .../engines/discourse-markdown/{code.js.es6 => code.js}    | 0
 .../discourse-markdown/{d-wrap.js.es6 => d-wrap.js}        | 0
 .../engines/discourse-markdown/{emoji.js.es6 => emoji.js}  | 0
 .../discourse-markdown/{helpers.js.es6 => helpers.js}      | 0
 .../discourse-markdown/{html-img.js.es6 => html-img.js}    | 0
 .../{inject-line-number.js.es6 => inject-line-number.js}   | 0
 .../discourse-markdown/{mentions.js.es6 => mentions.js}    | 0
 .../discourse-markdown/{newline.js.es6 => newline.js}      | 0
 .../discourse-markdown/{onebox.js.es6 => onebox.js}        | 0
 .../discourse-markdown/{paragraph.js.es6 => paragraph.js}  | 0
 .../discourse-markdown/{quotes.js.es6 => quotes.js}        | 0
 .../{resize-controls.js.es6 => resize-controls.js}         | 0
 .../engines/discourse-markdown/{table.js.es6 => table.js}  | 0
 .../{text-post-process.js.es6 => text-post-process.js}     | 0
 .../{upload-protocol.js.es6 => upload-protocol.js}         | 0
 .../javascripts/pretty-text/{guid.js.es6 => guid.js}       | 0
 .../{inline-oneboxer.js.es6 => inline-oneboxer.js}         | 0
 .../{oneboxer-cache.js.es6 => oneboxer-cache.js}           | 0
 .../pretty-text/{oneboxer.js.es6 => oneboxer.js}           | 0
 .../pretty-text/{pretty-text.js.es6 => pretty-text.js}     | 0
 .../pretty-text/{sanitizer.js.es6 => sanitizer.js}         | 0
 .../{upload-short-url.js.es6 => upload-short-url.js}       | 0
 .../pretty-text/{white-lister.js.es6 => white-lister.js}   | 0
 app/assets/javascripts/pretty-text/{xss.js.es6 => xss.js}  | 0
 lib/discourse_js_processor.rb                              | 3 ++-
 lib/pretty_text.rb                                         | 7 +++++--
 36 files changed, 7 insertions(+), 3 deletions(-)
 rename app/assets/javascripts/pretty-text/{censored-words.js.es6 => censored-words.js} (100%)
 rename app/assets/javascripts/pretty-text/context/{inline-onebox-css-classes.js.es6.erb => inline-onebox-css-classes.js.erb} (100%)
 rename app/assets/javascripts/pretty-text/{emoji.js.es6 => emoji.js} (100%)
 rename app/assets/javascripts/pretty-text/emoji/{data.js.es6.erb => data.js.erb} (100%)
 rename app/assets/javascripts/pretty-text/emoji/{version.js.es6.erb => version.js.erb} (100%)
 rename app/assets/javascripts/pretty-text/engines/{discourse-markdown-it.js.es6 => discourse-markdown-it.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{bbcode-block.js.es6 => bbcode-block.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{bbcode-inline.js.es6 => bbcode-inline.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{category-hashtag.js.es6 => category-hashtag.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{censored.js.es6 => censored.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{code.js.es6 => code.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{d-wrap.js.es6 => d-wrap.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{emoji.js.es6 => emoji.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{helpers.js.es6 => helpers.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{html-img.js.es6 => html-img.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{inject-line-number.js.es6 => inject-line-number.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{mentions.js.es6 => mentions.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{newline.js.es6 => newline.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{onebox.js.es6 => onebox.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{paragraph.js.es6 => paragraph.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{quotes.js.es6 => quotes.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{resize-controls.js.es6 => resize-controls.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{table.js.es6 => table.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{text-post-process.js.es6 => text-post-process.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{upload-protocol.js.es6 => upload-protocol.js} (100%)
 rename app/assets/javascripts/pretty-text/{guid.js.es6 => guid.js} (100%)
 rename app/assets/javascripts/pretty-text/{inline-oneboxer.js.es6 => inline-oneboxer.js} (100%)
 rename app/assets/javascripts/pretty-text/{oneboxer-cache.js.es6 => oneboxer-cache.js} (100%)
 rename app/assets/javascripts/pretty-text/{oneboxer.js.es6 => oneboxer.js} (100%)
 rename app/assets/javascripts/pretty-text/{pretty-text.js.es6 => pretty-text.js} (100%)
 rename app/assets/javascripts/pretty-text/{sanitizer.js.es6 => sanitizer.js} (100%)
 rename app/assets/javascripts/pretty-text/{upload-short-url.js.es6 => upload-short-url.js} (100%)
 rename app/assets/javascripts/pretty-text/{white-lister.js.es6 => white-lister.js} (100%)
 rename app/assets/javascripts/pretty-text/{xss.js.es6 => xss.js} (100%)

diff --git a/app/assets/javascripts/pretty-text/censored-words.js.es6 b/app/assets/javascripts/pretty-text/censored-words.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/censored-words.js.es6
rename to app/assets/javascripts/pretty-text/censored-words.js
diff --git a/app/assets/javascripts/pretty-text/context/inline-onebox-css-classes.js.es6.erb b/app/assets/javascripts/pretty-text/context/inline-onebox-css-classes.js.erb
similarity index 100%
rename from app/assets/javascripts/pretty-text/context/inline-onebox-css-classes.js.es6.erb
rename to app/assets/javascripts/pretty-text/context/inline-onebox-css-classes.js.erb
diff --git a/app/assets/javascripts/pretty-text/emoji.js.es6 b/app/assets/javascripts/pretty-text/emoji.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/emoji.js.es6
rename to app/assets/javascripts/pretty-text/emoji.js
diff --git a/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb b/app/assets/javascripts/pretty-text/emoji/data.js.erb
similarity index 100%
rename from app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
rename to app/assets/javascripts/pretty-text/emoji/data.js.erb
diff --git a/app/assets/javascripts/pretty-text/emoji/version.js.es6.erb b/app/assets/javascripts/pretty-text/emoji/version.js.erb
similarity index 100%
rename from app/assets/javascripts/pretty-text/emoji/version.js.es6.erb
rename to app/assets/javascripts/pretty-text/emoji/version.js.erb
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js
diff --git a/app/assets/javascripts/pretty-text/guid.js.es6 b/app/assets/javascripts/pretty-text/guid.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/guid.js.es6
rename to app/assets/javascripts/pretty-text/guid.js
diff --git a/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6 b/app/assets/javascripts/pretty-text/inline-oneboxer.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
rename to app/assets/javascripts/pretty-text/inline-oneboxer.js
diff --git a/app/assets/javascripts/pretty-text/oneboxer-cache.js.es6 b/app/assets/javascripts/pretty-text/oneboxer-cache.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/oneboxer-cache.js.es6
rename to app/assets/javascripts/pretty-text/oneboxer-cache.js
diff --git a/app/assets/javascripts/pretty-text/oneboxer.js.es6 b/app/assets/javascripts/pretty-text/oneboxer.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/oneboxer.js.es6
rename to app/assets/javascripts/pretty-text/oneboxer.js
diff --git a/app/assets/javascripts/pretty-text/pretty-text.js.es6 b/app/assets/javascripts/pretty-text/pretty-text.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/pretty-text.js.es6
rename to app/assets/javascripts/pretty-text/pretty-text.js
diff --git a/app/assets/javascripts/pretty-text/sanitizer.js.es6 b/app/assets/javascripts/pretty-text/sanitizer.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/sanitizer.js.es6
rename to app/assets/javascripts/pretty-text/sanitizer.js
diff --git a/app/assets/javascripts/pretty-text/upload-short-url.js.es6 b/app/assets/javascripts/pretty-text/upload-short-url.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/upload-short-url.js.es6
rename to app/assets/javascripts/pretty-text/upload-short-url.js
diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/white-lister.js.es6
rename to app/assets/javascripts/pretty-text/white-lister.js
diff --git a/app/assets/javascripts/pretty-text/xss.js.es6 b/app/assets/javascripts/pretty-text/xss.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/xss.js.es6
rename to app/assets/javascripts/pretty-text/xss.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 4056dffc46..68bc75ae9a 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -37,7 +37,8 @@ class DiscourseJsProcessor
 
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
     relative_path.start_with?("app/assets/javascripts/discourse/") ||
-      relative_path.start_with?("app/assets/javascripts/admin/")
+      relative_path.start_with?("app/assets/javascripts/admin/") ||
+      relative_path.start_with?("app/assets/javascripts/pretty-text/")
   end
 
   def self.skip_module?(data)
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 55faf8d4c1..d29f4e84ee 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -23,6 +23,9 @@ module PrettyText
 
     erb_name = "#{filename}.js.es6.erb"
     return erb_name if File.file?("#{root}#{erb_name}")
+
+    erb_name = "#{filename}.js.erb"
+    return erb_name if File.file?("#{root}#{erb_name}")
   end
 
   def self.apply_es6_file(ctx, root_path, part_name)
@@ -55,7 +58,7 @@ module PrettyText
       elsif l =~ /\/\/= require_tree (\.\/)?(.*)$/
         path = Regexp.last_match[2]
         Dir["#{root_path}/#{path}/**"].sort.each do |f|
-          apply_es6_file(ctx, root_path, f.sub(root_path, '')[1..-1].sub(/\.js.es6$/, ''))
+          apply_es6_file(ctx, root_path, f.sub(root_path, '')[1..-1].sub(/\.js(.es6)?$/, ''))
         end
       end
     end
@@ -94,7 +97,7 @@ module PrettyText
     to_load.uniq.each do |f|
       if f =~ /^.+assets\/javascripts\//
         root = Regexp.last_match[0]
-        apply_es6_file(ctx, root, f.sub(root, '').sub(/\.js\.es6$/, ''))
+        apply_es6_file(ctx, root, f.sub(root, '').sub(/\.js(\.es6)?$/, ''))
       end
     end
 

From 1859e6b7ca1fabd7b11451eff40003db088b4ca3 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 20 Mar 2020 10:43:31 -0400
Subject: [PATCH 195/633] FIX: Don't fail if the test environment doesn't
 support Webauthn

---
 .../acceptance/preferences-test.js.es6        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index 66af8348ab..4e2f2d5979 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -256,14 +256,19 @@ QUnit.test("second factor security keys", async assert => {
   assert.ok(exists("#security-key-name"), "shows security key name input");
 
   fillIn("#security-key-name", "");
-  await click(".add-security-key");
 
-  assert.ok(
-    find(".alert-error")
-      .html()
-      .indexOf("provide a name") > -1,
-    "shows name missing error message"
-  );
+  // The following tests can only run when Webauthn is enabled. This is not
+  // always the case, for example on a browser running on a non-standard port
+  if (typeof PublicKeyCredential !== "undefined") {
+    await click(".add-security-key");
+
+    assert.ok(
+      find(".alert-error")
+        .html()
+        .indexOf("provide a name") > -1,
+      "shows name missing error message"
+    );
+  }
 });
 
 QUnit.test("default avatar selector", async assert => {

From 20f3be1e9c19a5cec233e16a9579dd503d749e69 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 20 Mar 2020 16:18:34 +0100
Subject: [PATCH 196/633] DEV: Use the `type: :multisite` spec setting (#9245)

Fixes recent spec flakiness.

Also includes:
DEV: Prevent accidental exit from specs
---
 spec/requests/uploads_controller_spec.rb |  5 +---
 spec/services/inline_uploads_spec.rb     | 36 ++++++++++--------------
 spec/tasks/redis_spec.rb                 |  8 +-----
 spec/tasks/uploads_spec.rb               |  2 +-
 4 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index 1577695f35..e7d66b1ee7 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -401,10 +401,7 @@ describe UploadsController do
           expect(response.code).to eq("403")
         end
 
-        context "when running on a multisite connection" do
-          before do
-            Rails.configuration.multisite = true
-          end
+        context "when running on a multisite connection", type: :multisite do
           it "redirects to the signed_url_for_path with the multisite DB name in the url" do
             freeze_time
             get upload.short_path
diff --git a/spec/services/inline_uploads_spec.rb b/spec/services/inline_uploads_spec.rb
index a087024369..b5bf7ded43 100644
--- a/spec/services/inline_uploads_spec.rb
+++ b/spec/services/inline_uploads_spec.rb
@@ -691,30 +691,24 @@ RSpec.describe InlineUploads do
         MD
       end
 
-      it "should correct image URLs in multisite" do
-        begin
-          Rails.configuration.multisite = true
+      it "should correct image URLs in multisite", type: :multisite do
+        md = <<~MD
+        https:#{upload2.url} https:#{upload2.url}
+        #{URI.join(SiteSetting.s3_cdn_url, URI.parse(upload2.url).path).to_s}
 
-          md = <<~MD
-          https:#{upload2.url} https:#{upload2.url}
-          #{URI.join(SiteSetting.s3_cdn_url, URI.parse(upload2.url).path).to_s}
+        <img src="#{upload.url}" alt="some image">
+        <img src="#{URI.join(SiteSetting.s3_cdn_url, URI.parse(upload2.url).path).to_s}" alt="some image">
+        <img src="#{upload3.url}">
+        MD
 
-          <img src="#{upload.url}" alt="some image">
-          <img src="#{URI.join(SiteSetting.s3_cdn_url, URI.parse(upload2.url).path).to_s}" alt="some image">
-          <img src="#{upload3.url}">
-          MD
+        expect(InlineUploads.process(md)).to eq(<<~MD)
+        #{Discourse.base_url}#{upload2.short_path} #{Discourse.base_url}#{upload2.short_path}
+        #{Discourse.base_url}#{upload2.short_path}
 
-          expect(InlineUploads.process(md)).to eq(<<~MD)
-          #{Discourse.base_url}#{upload2.short_path} #{Discourse.base_url}#{upload2.short_path}
-          #{Discourse.base_url}#{upload2.short_path}
-
-          ![some image](#{upload.short_url})
-          ![some image](#{upload2.short_url})
-          ![](#{upload3.short_url})
-          MD
-        ensure
-          Rails.configuration.multisite = false
-        end
+        ![some image](#{upload.short_url})
+        ![some image](#{upload2.short_url})
+        ![](#{upload3.short_url})
+        MD
       end
     end
   end
diff --git a/spec/tasks/redis_spec.rb b/spec/tasks/redis_spec.rb
index dd9a20f65c..4e22801ab2 100644
--- a/spec/tasks/redis_spec.rb
+++ b/spec/tasks/redis_spec.rb
@@ -2,19 +2,13 @@
 
 require 'rails_helper'
 
-RSpec.describe "Redis rake tasks" do
+RSpec.describe "Redis rake tasks", type: :multisite do
   let(:redis) { Discourse.redis.without_namespace }
 
   before do
-    @multisite = Rails.configuration.multisite
-    Rails.configuration.multisite = true
     Discourse::Application.load_tasks
   end
 
-  after do
-    Rails.configuration.multisite = @multisite
-  end
-
   describe 'clean up' do
     it 'should clean up orphan Redis keys' do
       active_keys = [
diff --git a/spec/tasks/uploads_spec.rb b/spec/tasks/uploads_spec.rb
index 21c769a092..15afad903c 100644
--- a/spec/tasks/uploads_spec.rb
+++ b/spec/tasks/uploads_spec.rb
@@ -43,7 +43,7 @@ RSpec.describe "tasks/uploads" do
     context "when the store is internal" do
       it "does nothing; this is for external store only" do
         Upload.expects(:transaction).never
-        invoke_task
+        expect { invoke_task }.to raise_error(SystemExit)
       end
     end
 

From cfec10a568debe45216137806bfad87e6128bdea Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Fri, 20 Mar 2020 12:28:09 -0300
Subject: [PATCH 197/633] FIX: Moderators should be able to review flagged PMs
 since this has always been like this

---
 app/models/reviewable.rb       |  2 +-
 spec/models/reviewable_spec.rb | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 13468019e3..78d4b98e65 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -133,7 +133,7 @@ class Reviewable < ActiveRecord::Base
       target: target,
       topic: topic,
       created_by: created_by,
-      reviewable_by_moderator: reviewable_by_moderator && !(topic&.private_message?),
+      reviewable_by_moderator: reviewable_by_moderator,
       payload: payload,
       potential_spam: potential_spam
     )
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 30bd5d6855..9b46eb7c52 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -78,17 +78,6 @@ RSpec.describe Reviewable, type: :model do
       expect(r1.pending?).to eq(true)
       expect(r0.pending?).to eq(false)
     end
-
-    it 'sets the reviewable_by_moderator attribute to false when the topic is a PM' do
-      pm_topic = Fabricate(:private_message_topic)
-      post = Fabricate(:post, topic: pm_topic)
-      reviewable = ReviewableFlaggedPost.needs_review!(
-        target: post, topic: pm_topic,
-        created_by: Discourse.system_user, reviewable_by_moderator: true
-      )
-
-      expect(reviewable.reviewable_by_moderator).to eq(false)
-    end
   end
 
   context ".list_for" do

From 69df19a6635ca7a1276312df0599d805cee9769d Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 20 Mar 2020 12:15:58 -0400
Subject: [PATCH 198/633] UX: Disable highlight animation on deleted posts

---
 app/assets/stylesheets/common/base/topic-post.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 36ca696ab2..b458f04e37 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -555,6 +555,12 @@ blockquote {
   &.highlighted {
     animation: background-fade-highlight 2.5s ease-out;
   }
+  .deleted & {
+    // Disable so the deleted background is visible immediately
+    &.highlighted {
+      animation: none;
+    }
+  }
 }
 
 .post-info {

From 07813c4a9101fe4c3da6eecdb15793570bb1f471 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 20 Mar 2020 12:40:32 -0400
Subject: [PATCH 199/633] Convert select-kit from es6 to js (#9246)

* Convert select-kit from es6 to js

* Hide more git blames
---
 .git-blame-ignore-revs                                      | 6 ++++++
 ...{admin-group-selector.js.es6 => admin-group-selector.js} | 0
 ...s-admin-dropdown.js.es6 => categories-admin-dropdown.js} | 0
 .../{category-chooser.js.es6 => category-chooser.js}        | 0
 .../components/{category-drop.js.es6 => category-drop.js}   | 0
 ...{category-drop-header.js.es6 => category-drop-header.js} | 0
 ...tions-button.js.es6 => category-notifications-button.js} | 0
 .../components/{category-row.js.es6 => category-row.js}     | 0
 .../{category-selector.js.es6 => category-selector.js}      | 0
 .../components/{color-palettes.js.es6 => color-palettes.js} | 0
 .../{color-palettes-row.js.es6 => color-palettes-row.js}    | 0
 .../components/{combo-box.js.es6 => combo-box.js}           | 0
 .../{combo-box-header.js.es6 => combo-box-header.js}        | 0
 .../{composer-actions.js.es6 => composer-actions.js}        | 0
 .../{create-color-row.js.es6 => create-color-row.js}        | 0
 .../{dropdown-select-box.js.es6 => dropdown-select-box.js}  | 0
 ...lect-box-header.js.es6 => dropdown-select-box-header.js} | 0
 ...own-select-box-row.js.es6 => dropdown-select-box-row.js} | 0
 ...-input-selector.js.es6 => future-date-input-selector.js} | 0
 ...r-header.js.es6 => future-date-input-selector-header.js} | 0
 ...elector-row.js.es6 => future-date-input-selector-row.js} | 0
 .../future-date-input-selector/{mixin.js.es6 => mixin.js}   | 0
 .../components/{group-dropdown.js.es6 => group-dropdown.js} | 0
 ...up-members-dropdown.js.es6 => group-members-dropdown.js} | 0
 ...ications-button.js.es6 => group-notifications-button.js} | 0
 .../components/{icon-picker.js.es6 => icon-picker.js}       | 0
 .../components/{list-setting.js.es6 => list-setting.js}     | 0
 .../{mini-tag-chooser.js.es6 => mini-tag-chooser.js}        | 0
 ...tag-chooser-header.js.es6 => mini-tag-chooser-header.js} | 0
 .../{selected-collection.js.es6 => selected-collection.js}  | 0
 .../components/{multi-select.js.es6 => multi-select.js}     | 0
 .../{multi-select-filter.js.es6 => multi-select-filter.js}  | 0
 .../{multi-select-header.js.es6 => multi-select-header.js}  | 0
 .../{selected-category.js.es6 => selected-category.js}      | 0
 .../{selected-color.js.es6 => selected-color.js}            | 0
 .../{none-category-row.js.es6 => none-category-row.js}      | 0
 ...{notifications-button.js.es6 => notifications-button.js} | 0
 ...ations-button-row.js.es6 => notifications-button-row.js} | 0
 .../components/{period-chooser.js.es6 => period-chooser.js} | 0
 ...eriod-chooser-header.js.es6 => period-chooser-header.js} | 0
 .../{period-chooser-row.js.es6 => period-chooser-row.js}    | 0
 .../components/{pinned-button.js.es6 => pinned-button.js}   | 0
 .../components/{pinned-options.js.es6 => pinned-options.js} | 0
 ...y-chooser.js.es6 => search-advanced-category-chooser.js} | 0
 .../components/{select-kit.js.es6 => select-kit.js}         | 0
 .../{errors-collection.js.es6 => errors-collection.js}      | 0
 .../{select-kit-body.js.es6 => select-kit-body.js}          | 0
 ...elect-kit-collection.js.es6 => select-kit-collection.js} | 0
 ...elect-kit-create-row.js.es6 => select-kit-create-row.js} | 0
 .../{select-kit-filter.js.es6 => select-kit-filter.js}      | 0
 .../{select-kit-header.js.es6 => select-kit-header.js}      | 0
 .../{select-kit-none-row.js.es6 => select-kit-none-row.js}  | 0
 .../select-kit/{select-kit-row.js.es6 => select-kit-row.js} | 0
 ...{single-select-header.js.es6 => single-select-header.js} | 0
 .../components/{selected-color.js.es6 => selected-color.js} | 0
 .../components/{selected-name.js.es6 => selected-name.js}   | 0
 .../components/{single-select.js.es6 => single-select.js}   | 0
 .../{tag-chooser-row.js.es6 => tag-chooser-row.js}          | 0
 .../components/{tag-chooser.js.es6 => tag-chooser.js}       | 0
 .../select-kit/components/{tag-drop.js.es6 => tag-drop.js}  | 0
 .../tag-drop/{tag-drop-header.js.es6 => tag-drop-header.js} | 0
 .../{tag-group-chooser.js.es6 => tag-group-chooser.js}      | 0
 ...ifications-button.js.es6 => tag-notifications-button.js} | 0
 .../select-kit/components/{tag-row.js.es6 => tag-row.js}    | 0
 .../components/{timezone-input.js.es6 => timezone-input.js} | 0
 ...up-menu-options.js.es6 => toolbar-popup-menu-options.js} | 0
 ...heading.js.es6 => toolbar-popup-menu-options-heading.js} | 0
 ...bile-dropdown.js.es6 => topic-footer-mobile-dropdown.js} | 0
 ...ications-button.js.es6 => topic-notifications-button.js} | 0
 ...ations-options.js.es6 => topic-notifications-options.js} | 0
 .../components/{user-chooser.js.es6 => user-chooser.js}     | 0
 .../user-chooser/{user-row.js.es6 => user-row.js}           | 0
 ...tions-dropdown.js.es6 => user-notifications-dropdown.js} | 0
 .../select-kit/mixins/{plugin-api.js.es6 => plugin-api.js}  | 0
 .../javascripts/select-kit/mixins/{tags.js.es6 => tags.js}  | 0
 .../select-kit/mixins/{utils.js.es6 => utils.js}            | 0
 lib/discourse_js_processor.rb                               | 3 ++-
 77 files changed, 8 insertions(+), 1 deletion(-)
 rename app/assets/javascripts/select-kit/components/{admin-group-selector.js.es6 => admin-group-selector.js} (100%)
 rename app/assets/javascripts/select-kit/components/{categories-admin-dropdown.js.es6 => categories-admin-dropdown.js} (100%)
 rename app/assets/javascripts/select-kit/components/{category-chooser.js.es6 => category-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/{category-drop.js.es6 => category-drop.js} (100%)
 rename app/assets/javascripts/select-kit/components/category-drop/{category-drop-header.js.es6 => category-drop-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/{category-notifications-button.js.es6 => category-notifications-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/{category-row.js.es6 => category-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{category-selector.js.es6 => category-selector.js} (100%)
 rename app/assets/javascripts/select-kit/components/{color-palettes.js.es6 => color-palettes.js} (100%)
 rename app/assets/javascripts/select-kit/components/color-palettes/{color-palettes-row.js.es6 => color-palettes-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{combo-box.js.es6 => combo-box.js} (100%)
 rename app/assets/javascripts/select-kit/components/combo-box/{combo-box-header.js.es6 => combo-box-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/{composer-actions.js.es6 => composer-actions.js} (100%)
 rename app/assets/javascripts/select-kit/components/{create-color-row.js.es6 => create-color-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{dropdown-select-box.js.es6 => dropdown-select-box.js} (100%)
 rename app/assets/javascripts/select-kit/components/dropdown-select-box/{dropdown-select-box-header.js.es6 => dropdown-select-box-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/dropdown-select-box/{dropdown-select-box-row.js.es6 => dropdown-select-box-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{future-date-input-selector.js.es6 => future-date-input-selector.js} (100%)
 rename app/assets/javascripts/select-kit/components/future-date-input-selector/{future-date-input-selector-header.js.es6 => future-date-input-selector-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/future-date-input-selector/{future-date-input-selector-row.js.es6 => future-date-input-selector-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/future-date-input-selector/{mixin.js.es6 => mixin.js} (100%)
 rename app/assets/javascripts/select-kit/components/{group-dropdown.js.es6 => group-dropdown.js} (100%)
 rename app/assets/javascripts/select-kit/components/{group-members-dropdown.js.es6 => group-members-dropdown.js} (100%)
 rename app/assets/javascripts/select-kit/components/{group-notifications-button.js.es6 => group-notifications-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/{icon-picker.js.es6 => icon-picker.js} (100%)
 rename app/assets/javascripts/select-kit/components/{list-setting.js.es6 => list-setting.js} (100%)
 rename app/assets/javascripts/select-kit/components/{mini-tag-chooser.js.es6 => mini-tag-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/mini-tag-chooser/{mini-tag-chooser-header.js.es6 => mini-tag-chooser-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/mini-tag-chooser/{selected-collection.js.es6 => selected-collection.js} (100%)
 rename app/assets/javascripts/select-kit/components/{multi-select.js.es6 => multi-select.js} (100%)
 rename app/assets/javascripts/select-kit/components/multi-select/{multi-select-filter.js.es6 => multi-select-filter.js} (100%)
 rename app/assets/javascripts/select-kit/components/multi-select/{multi-select-header.js.es6 => multi-select-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/multi-select/{selected-category.js.es6 => selected-category.js} (100%)
 rename app/assets/javascripts/select-kit/components/multi-select/{selected-color.js.es6 => selected-color.js} (100%)
 rename app/assets/javascripts/select-kit/components/{none-category-row.js.es6 => none-category-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{notifications-button.js.es6 => notifications-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/notifications-button/{notifications-button-row.js.es6 => notifications-button-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{period-chooser.js.es6 => period-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/period-chooser/{period-chooser-header.js.es6 => period-chooser-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/period-chooser/{period-chooser-row.js.es6 => period-chooser-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{pinned-button.js.es6 => pinned-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/{pinned-options.js.es6 => pinned-options.js} (100%)
 rename app/assets/javascripts/select-kit/components/{search-advanced-category-chooser.js.es6 => search-advanced-category-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/{select-kit.js.es6 => select-kit.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{errors-collection.js.es6 => errors-collection.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-body.js.es6 => select-kit-body.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-collection.js.es6 => select-kit-collection.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-create-row.js.es6 => select-kit-create-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-filter.js.es6 => select-kit-filter.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-header.js.es6 => select-kit-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-none-row.js.es6 => select-kit-none-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-row.js.es6 => select-kit-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{single-select-header.js.es6 => single-select-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/{selected-color.js.es6 => selected-color.js} (100%)
 rename app/assets/javascripts/select-kit/components/{selected-name.js.es6 => selected-name.js} (100%)
 rename app/assets/javascripts/select-kit/components/{single-select.js.es6 => single-select.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-chooser-row.js.es6 => tag-chooser-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-chooser.js.es6 => tag-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-drop.js.es6 => tag-drop.js} (100%)
 rename app/assets/javascripts/select-kit/components/tag-drop/{tag-drop-header.js.es6 => tag-drop-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-group-chooser.js.es6 => tag-group-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-notifications-button.js.es6 => tag-notifications-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-row.js.es6 => tag-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{timezone-input.js.es6 => timezone-input.js} (100%)
 rename app/assets/javascripts/select-kit/components/{toolbar-popup-menu-options.js.es6 => toolbar-popup-menu-options.js} (100%)
 rename app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/{toolbar-popup-menu-options-heading.js.es6 => toolbar-popup-menu-options-heading.js} (100%)
 rename app/assets/javascripts/select-kit/components/{topic-footer-mobile-dropdown.js.es6 => topic-footer-mobile-dropdown.js} (100%)
 rename app/assets/javascripts/select-kit/components/{topic-notifications-button.js.es6 => topic-notifications-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/{topic-notifications-options.js.es6 => topic-notifications-options.js} (100%)
 rename app/assets/javascripts/select-kit/components/{user-chooser.js.es6 => user-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/user-chooser/{user-row.js.es6 => user-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{user-notifications-dropdown.js.es6 => user-notifications-dropdown.js} (100%)
 rename app/assets/javascripts/select-kit/mixins/{plugin-api.js.es6 => plugin-api.js} (100%)
 rename app/assets/javascripts/select-kit/mixins/{tags.js.es6 => tags.js} (100%)
 rename app/assets/javascripts/select-kit/mixins/{utils.js.es6 => utils.js} (100%)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index bf208be1ca..cc4b81d793 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -13,3 +13,9 @@ dafd3c3b47f116c6c1dc56cb18df614c11747733
 
 # Rename admin app es6 -> js
 181758e3248b14ad8b53abe063da8dc6a82d3089
+
+# Rename pretty-text from es6 -> js
+c15056650647e8650288f973d9038500dc9cf7bb
+
+# Rename select kit from es6 -> js
+acc5cbdf8ecb9293a0fa9474ee73baf499c02428
diff --git a/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6 b/app/assets/javascripts/select-kit/components/admin-group-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
rename to app/assets/javascripts/select-kit/components/admin-group-selector.js
diff --git a/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/categories-admin-dropdown.js.es6
rename to app/assets/javascripts/select-kit/components/categories-admin-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/category-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/category-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-drop.js.es6
rename to app/assets/javascripts/select-kit/components/category-drop.js
diff --git a/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6 b/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
rename to app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js
diff --git a/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/category-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
rename to app/assets/javascripts/select-kit/components/category-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/category-row.js.es6 b/app/assets/javascripts/select-kit/components/category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-row.js.es6
rename to app/assets/javascripts/select-kit/components/category-row.js
diff --git a/app/assets/javascripts/select-kit/components/category-selector.js.es6 b/app/assets/javascripts/select-kit/components/category-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-selector.js.es6
rename to app/assets/javascripts/select-kit/components/category-selector.js
diff --git a/app/assets/javascripts/select-kit/components/color-palettes.js.es6 b/app/assets/javascripts/select-kit/components/color-palettes.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/color-palettes.js.es6
rename to app/assets/javascripts/select-kit/components/color-palettes.js
diff --git a/app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js.es6 b/app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js.es6
rename to app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js
diff --git a/app/assets/javascripts/select-kit/components/combo-box.js.es6 b/app/assets/javascripts/select-kit/components/combo-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/combo-box.js.es6
rename to app/assets/javascripts/select-kit/components/combo-box.js
diff --git a/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6 b/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6
rename to app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/composer-actions.js.es6
rename to app/assets/javascripts/select-kit/components/composer-actions.js
diff --git a/app/assets/javascripts/select-kit/components/create-color-row.js.es6 b/app/assets/javascripts/select-kit/components/create-color-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/create-color-row.js.es6
rename to app/assets/javascripts/select-kit/components/create-color-row.js
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6
rename to app/assets/javascripts/select-kit/components/dropdown-select-box.js
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
rename to app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6
rename to app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
rename to app/assets/javascripts/select-kit/components/future-date-input-selector.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js.es6
rename to app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js.es6
rename to app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js.es6
rename to app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js
diff --git a/app/assets/javascripts/select-kit/components/group-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/group-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/group-dropdown.js.es6
rename to app/assets/javascripts/select-kit/components/group-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/group-members-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/group-members-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/group-members-dropdown.js.es6
rename to app/assets/javascripts/select-kit/components/group-members-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/group-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/group-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/group-notifications-button.js.es6
rename to app/assets/javascripts/select-kit/components/group-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/icon-picker.js.es6 b/app/assets/javascripts/select-kit/components/icon-picker.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/icon-picker.js.es6
rename to app/assets/javascripts/select-kit/components/icon-picker.js
diff --git a/app/assets/javascripts/select-kit/components/list-setting.js.es6 b/app/assets/javascripts/select-kit/components/list-setting.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/list-setting.js.es6
rename to app/assets/javascripts/select-kit/components/list-setting.js
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/mini-tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js.es6
rename to app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser/selected-collection.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser/selected-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/mini-tag-chooser/selected-collection.js.es6
rename to app/assets/javascripts/select-kit/components/mini-tag-chooser/selected-collection.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select.js.es6 b/app/assets/javascripts/select-kit/components/multi-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select.js.es6
rename to app/assets/javascripts/select-kit/components/multi-select.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js.es6
rename to app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6
rename to app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-category.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-category.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/selected-category.js.es6
rename to app/assets/javascripts/select-kit/components/multi-select/selected-category.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
rename to app/assets/javascripts/select-kit/components/multi-select/selected-color.js
diff --git a/app/assets/javascripts/select-kit/components/none-category-row.js.es6 b/app/assets/javascripts/select-kit/components/none-category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/none-category-row.js.es6
rename to app/assets/javascripts/select-kit/components/none-category-row.js
diff --git a/app/assets/javascripts/select-kit/components/notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/notifications-button.js.es6
rename to app/assets/javascripts/select-kit/components/notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js.es6
rename to app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js
diff --git a/app/assets/javascripts/select-kit/components/period-chooser.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/period-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/period-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6
rename to app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
rename to app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/components/pinned-button.js.es6 b/app/assets/javascripts/select-kit/components/pinned-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/pinned-button.js.es6
rename to app/assets/javascripts/select-kit/components/pinned-button.js
diff --git a/app/assets/javascripts/select-kit/components/pinned-options.js.es6 b/app/assets/javascripts/select-kit/components/pinned-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/pinned-options.js.es6
rename to app/assets/javascripts/select-kit/components/pinned-options.js
diff --git a/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/errors-collection.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/errors-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/errors-collection.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/errors-collection.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-body.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-body.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-body.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-body.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/single-select-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/single-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/single-select-header.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/single-select-header.js
diff --git a/app/assets/javascripts/select-kit/components/selected-color.js.es6 b/app/assets/javascripts/select-kit/components/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/selected-color.js.es6
rename to app/assets/javascripts/select-kit/components/selected-color.js
diff --git a/app/assets/javascripts/select-kit/components/selected-name.js.es6 b/app/assets/javascripts/select-kit/components/selected-name.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/selected-name.js.es6
rename to app/assets/javascripts/select-kit/components/selected-name.js
diff --git a/app/assets/javascripts/select-kit/components/single-select.js.es6 b/app/assets/javascripts/select-kit/components/single-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/single-select.js.es6
rename to app/assets/javascripts/select-kit/components/single-select.js
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser-row.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-chooser-row.js.es6
rename to app/assets/javascripts/select-kit/components/tag-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-drop.js.es6
rename to app/assets/javascripts/select-kit/components/tag-drop.js
diff --git a/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6
rename to app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js
diff --git a/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-group-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/tag-group-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/tag-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
rename to app/assets/javascripts/select-kit/components/tag-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/tag-row.js.es6 b/app/assets/javascripts/select-kit/components/tag-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-row.js.es6
rename to app/assets/javascripts/select-kit/components/tag-row.js
diff --git a/app/assets/javascripts/select-kit/components/timezone-input.js.es6 b/app/assets/javascripts/select-kit/components/timezone-input.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/timezone-input.js.es6
rename to app/assets/javascripts/select-kit/components/timezone-input.js
diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6 b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
rename to app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js
diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js.es6 b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js.es6
rename to app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
diff --git a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
rename to app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/topic-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6
rename to app/assets/javascripts/select-kit/components/topic-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6 b/app/assets/javascripts/select-kit/components/topic-notifications-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6
rename to app/assets/javascripts/select-kit/components/topic-notifications-options.js
diff --git a/app/assets/javascripts/select-kit/components/user-chooser.js.es6 b/app/assets/javascripts/select-kit/components/user-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/user-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/user-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/user-chooser/user-row.js.es6 b/app/assets/javascripts/select-kit/components/user-chooser/user-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/user-chooser/user-row.js.es6
rename to app/assets/javascripts/select-kit/components/user-chooser/user-row.js
diff --git a/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/user-notifications-dropdown.js.es6
rename to app/assets/javascripts/select-kit/components/user-notifications-dropdown.js
diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6 b/app/assets/javascripts/select-kit/mixins/plugin-api.js
similarity index 100%
rename from app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
rename to app/assets/javascripts/select-kit/mixins/plugin-api.js
diff --git a/app/assets/javascripts/select-kit/mixins/tags.js.es6 b/app/assets/javascripts/select-kit/mixins/tags.js
similarity index 100%
rename from app/assets/javascripts/select-kit/mixins/tags.js.es6
rename to app/assets/javascripts/select-kit/mixins/tags.js
diff --git a/app/assets/javascripts/select-kit/mixins/utils.js.es6 b/app/assets/javascripts/select-kit/mixins/utils.js
similarity index 100%
rename from app/assets/javascripts/select-kit/mixins/utils.js.es6
rename to app/assets/javascripts/select-kit/mixins/utils.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 68bc75ae9a..5ba3673b2f 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -38,7 +38,8 @@ class DiscourseJsProcessor
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
     relative_path.start_with?("app/assets/javascripts/discourse/") ||
       relative_path.start_with?("app/assets/javascripts/admin/") ||
-      relative_path.start_with?("app/assets/javascripts/pretty-text/")
+      relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
+      relative_path.start_with?("app/assets/javascripts/select-kit/")
   end
 
   def self.skip_module?(data)

From 0d3386d25597edba4809fdad9e0489e2ad04917e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 20 Mar 2020 15:24:45 -0400
Subject: [PATCH 200/633] Revert "FIX: correctly remove authentication_data
 cookie on oauth login flow (#9238)"

This reverts commit a1f9b1a7fc909b326eba73f6fb1bfcbc0d9240c0.

This might have caused a problem with social logins. We are confirming
via this revert and will follow up.
---
 .../users/omniauth_callbacks_controller.rb    |  5 +---
 app/views/layouts/application.html.erb        |  4 ++--
 .../omniauth_callbacks_controller_spec.rb     | 24 -------------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 31c14c66ca..881fb3e9ec 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -74,10 +74,7 @@ class Users::OmniauthCallbacksController < ApplicationController
       @auth_result.authenticator_name = authenticator.name
       complete_response_data
       cookies['_bypass_cache'] = true
-      cookies[:authentication_data] = {
-        value: @auth_result.to_client_hash.to_json,
-        path: Discourse.base_uri
-      }
+      cookies[:authentication_data] = @auth_result.to_client_hash.to_json
       redirect_to @origin
     end
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9f3682b411..6c1f3b3074 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -58,8 +58,8 @@
 
     <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
 
-    <%- if data = cookies.delete(:authentication_data, path: Discourse.base_uri) && !current_user  %>
-      <meta id="data-authentication" data-authentication-data="<%= data %>">
+    <%- if !current_user && cookies[:authentication_data] %>
+      <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
     <%- end %>
   </head>
 
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index e604a89aba..204c3f1572 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -269,30 +269,6 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email_confirmed?).to eq(true)
       end
 
-      it 'should return the authenticated response with the correct path for subfolders' do
-        set_subfolder "/forum"
-        events = DiscourseEvent.track_events do
-          get "/auth/google_oauth2/callback.json"
-        end
-
-        expect(response.headers["Set-Cookie"].match(/^authentication_data=.*; path=\/forum/)).not_to eq(nil)
-
-        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
-
-        expect(response.status).to eq(302)
-
-        data = JSON.parse(response.cookies["authentication_data"])
-
-        expect(data["authenticated"]).to eq(true)
-        expect(data["awaiting_activation"]).to eq(false)
-        expect(data["awaiting_approval"]).to eq(false)
-        expect(data["not_allowed_from_ip_address"]).to eq(false)
-        expect(data["admin_not_allowed_from_ip_address"]).to eq(false)
-
-        user.reload
-        expect(user.email_confirmed?).to eq(true)
-      end
-
       it "should confirm email even when the tokens are expired" do
         user.email_tokens.update_all(confirmed: false, expired: true)
 

From 330102fd20d6a3ecf144cce4928379226a58dc5c Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Fri, 20 Mar 2020 11:29:00 -0700
Subject: [PATCH 201/633] FEATURE: Show votes in an "on voted" poll to the
 creator

This required properly plumbing the guardian into the serializer.

Notably, the default state in the client was not changed - if you haven't voted in
the poll, you need to click the button to view the results instead of the results
being immediately visible on page load.

Implements https://meta.discourse.org/t/-/138108
---
 plugins/poll/app/models/poll.rb                   |  6 +++++-
 plugins/poll/app/serializers/poll_serializer.rb   |  2 +-
 .../javascripts/widgets/discourse-poll.js.es6     |  3 ++-
 plugins/poll/lib/polls_updater.rb                 |  2 +-
 plugins/poll/plugin.rb                            | 15 +++++++++------
 plugins/poll/spec/models/poll_spec.rb             | 13 ++++++++++++-
 6 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/plugins/poll/app/models/poll.rb b/plugins/poll/app/models/poll.rb
index fcf71f9158..4f7e0bd584 100644
--- a/plugins/poll/app/models/poll.rb
+++ b/plugins/poll/app/models/poll.rb
@@ -47,7 +47,11 @@ class Poll < ActiveRecord::Base
 
   def can_see_results?(user)
     return !!user&.staff? if staff_only?
-    !!(always? || (on_vote? && has_voted?(user)) || is_closed?)
+    !!(always? || (on_vote? && (is_me?(user) || has_voted?(user))) || is_closed?)
+  end
+
+  def is_me?(user)
+    user && post.user&.id == user&.id
   end
 
   def has_voted?(user)
diff --git a/plugins/poll/app/serializers/poll_serializer.rb b/plugins/poll/app/serializers/poll_serializer.rb
index 53b7c1d5e2..c540d7b34b 100644
--- a/plugins/poll/app/serializers/poll_serializer.rb
+++ b/plugins/poll/app/serializers/poll_serializer.rb
@@ -61,7 +61,7 @@ class PollSerializer < ApplicationSerializer
   end
 
   def include_preloaded_voters?
-    object.can_see_voters?(scope)
+    object.can_see_voters?(scope.user)
   end
 
 end
diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index 1f71dea021..9564ec89e0 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -678,6 +678,7 @@ createWidget("discourse-poll-buttons", {
     const staffOnly = poll.results === "staff_only";
     const isStaff = this.currentUser && this.currentUser.staff;
     const isAdmin = this.currentUser && this.currentUser.admin;
+    const isMe = this.currentUser && post.user_id === this.currentUser.id;
     const dataExplorerEnabled = this.siteSettings.data_explorer_enabled;
     const hideResultsDisabled = !staffOnly && (closed || topicArchived);
     const exportQueryID = this.siteSettings.poll_export_data_explorer_query_id;
@@ -710,7 +711,7 @@ createWidget("discourse-poll-buttons", {
         })
       );
     } else {
-      if (poll.get("results") === "on_vote" && !attrs.hasVoted) {
+      if (poll.get("results") === "on_vote" && !attrs.hasVoted && !isMe) {
         contents.push(infoTextHtml(I18n.t("poll.results.vote.title")));
       } else if (poll.get("results") === "on_close" && !closed) {
         contents.push(infoTextHtml(I18n.t("poll.results.closed.title")));
diff --git a/plugins/poll/lib/polls_updater.rb b/plugins/poll/lib/polls_updater.rb
index 1b2e62f8a1..f50edc0f4e 100644
--- a/plugins/poll/lib/polls_updater.rb
+++ b/plugins/poll/lib/polls_updater.rb
@@ -93,7 +93,7 @@ module DiscoursePoll
 
         if has_changed
           polls = ::Poll.includes(poll_options: :poll_votes).where(post: post)
-          polls = ActiveModel::ArraySerializer.new(polls, each_serializer: PollSerializer, root: false).as_json
+          polls = ActiveModel::ArraySerializer.new(polls, each_serializer: PollSerializer, root: false, scope: Guardian.new(nil)).as_json
           post.publish_message!("/polls/#{post.topic_id}", post_id: post.id, polls: polls)
         end
       end
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index bf5163295b..e0c1057e36 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -62,7 +62,8 @@ after_initialize do
           end
 
           # user must be allowed to post in topic
-          if !Guardian.new(user).can_create_post?(post.topic)
+          guardian = Guardian.new(user)
+          if !guardian.can_create_post?(post.topic)
             raise StandardError.new I18n.t("poll.user_cant_post_in_topic")
           end
 
@@ -108,7 +109,7 @@ after_initialize do
 
           poll.reload
 
-          serialized_poll = PollSerializer.new(poll, root: false).as_json
+          serialized_poll = PollSerializer.new(poll, root: false, scope: guardian).as_json
           payload = { post_id: post_id, polls: [serialized_poll] }
 
           post.publish_message!("/polls/#{post.topic_id}", payload)
@@ -120,6 +121,7 @@ after_initialize do
       def toggle_status(post_id, poll_name, status, user, raise_errors = true)
         Poll.transaction do
           post = Post.find_by(id: post_id)
+          guardian = Guardian.new(user)
 
           # post must not be deleted
           if post.nil? || post.trashed?
@@ -149,7 +151,7 @@ after_initialize do
           poll.status = status
           poll.save!
 
-          serialized_poll = PollSerializer.new(poll, root: false).as_json
+          serialized_poll = PollSerializer.new(poll, root: false, scope: guardian).as_json
           payload = { post_id: post_id, polls: [serialized_poll] }
 
           post.publish_message!("/polls/#{post.topic_id}", payload)
@@ -542,11 +544,12 @@ after_initialize do
     end
   end
 
-  on(:post_created) do |post|
+  on(:post_created) do |post, _opts, user|
+    guardian = Guardian.new(user)
     DiscoursePoll::Poll.schedule_jobs(post)
 
     unless post.is_first_post?
-      polls = ActiveModel::ArraySerializer.new(post.polls, each_serializer: PollSerializer, root: false).as_json
+      polls = ActiveModel::ArraySerializer.new(post.polls, each_serializer: PollSerializer, root: false, scope: guardian).as_json
       post.publish_message!("/polls/#{post.topic_id}", post_id: post.id, polls: polls)
     end
   end
@@ -594,7 +597,7 @@ after_initialize do
   end
 
   add_to_serializer(:post, :polls, false) do
-    preloaded_polls.map { |p| PollSerializer.new(p, root: false) }
+    preloaded_polls.map { |p| PollSerializer.new(p, root: false, scope: self.scope) }
   end
 
   add_to_serializer(:post, :include_polls?) do
diff --git a/plugins/poll/spec/models/poll_spec.rb b/plugins/poll/spec/models/poll_spec.rb
index a8df54a2f7..55e6567d47 100644
--- a/plugins/poll/spec/models/poll_spec.rb
+++ b/plugins/poll/spec/models/poll_spec.rb
@@ -31,10 +31,21 @@ describe ::DiscoursePoll::Poll do
       option = poll.poll_options.first
 
       expect(poll.can_see_results?(user)).to eq(false)
-      poll.poll_votes.create!(poll_option_id: option.id , user_id: user.id)
+      poll.poll_votes.create!(poll_option_id: option.id, user_id: user.id)
       expect(poll.can_see_results?(user)).to eq(true)
     end
 
+    it "author can see results when results setting is on_vote" do
+      author = Fabricate(:user)
+      post = Fabricate(:post, user: author, raw: "[poll results=on_vote]\n- A\n- B\n[/poll]")
+      poll = post.polls.first
+      option = poll.poll_options.first
+
+      expect(poll.can_see_results?(author)).to eq(true)
+      poll.poll_votes.create!(poll_option_id: option.id, user_id: author.id)
+      expect(poll.can_see_results?(author)).to eq(true)
+    end
+
     it "everyone can see results when results setting is on_vote and poll is closed" do
       post = Fabricate(:post, raw: "[poll results=on_vote]\n- A\n- B\n[/poll]")
       user = Fabricate(:user)

From beaeb0c4b2ba0d273d7707d2fbc79feb63083a81 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Fri, 20 Mar 2020 11:03:38 -1000
Subject: [PATCH 202/633] FIX: correctly remove authentication_data cookie on
 oauth login flow (#9238) (#9251)

Attempt 2, with more test.

Additionally correctly handle cookie path for authentication_data

There were two bugs that exposed an interesting case where two discourse
instances hosted across two subfolder installs in the same domain
with oauth may clash and cause strange redirection on first login:

Log in to example.com/forum1. authentication_data cookie is set with path /
On the first redirection, the current authentication_data cookie is not unset.
Log in to example.com/forum2. In this case, the authentication_data cookie
is already set from forum1 - the initial page load will incorrectly redirect
the user to the redirect URL from the already-stored cookie, to /forum1.

This removes this issue by:

Setting the cookie for the correct path, and not having it on root
Correctly removing the cookie on first login
---
 .../users/omniauth_callbacks_controller.rb    |  5 +++-
 app/views/layouts/application.html.erb        |  4 ++--
 spec/requests/application_controller_spec.rb  |  8 +++++++
 .../omniauth_callbacks_controller_spec.rb     | 24 +++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 881fb3e9ec..31c14c66ca 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -74,7 +74,10 @@ class Users::OmniauthCallbacksController < ApplicationController
       @auth_result.authenticator_name = authenticator.name
       complete_response_data
       cookies['_bypass_cache'] = true
-      cookies[:authentication_data] = @auth_result.to_client_hash.to_json
+      cookies[:authentication_data] = {
+        value: @auth_result.to_client_hash.to_json,
+        path: Discourse.base_uri
+      }
       redirect_to @origin
     end
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6c1f3b3074..7fa77c809a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -58,8 +58,8 @@
 
     <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
 
-    <%- if !current_user && cookies[:authentication_data] %>
-      <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
+    <%- if (data = cookies.delete(:authentication_data, path: Discourse.base_uri)) && !current_user  %>
+      <meta id="data-authentication" data-authentication-data="<%= data %>">
     <%- end %>
   </head>
 
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 4aaf547e33..2c65450ae6 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -84,6 +84,14 @@ RSpec.describe ApplicationController do
         expect(response).to redirect_to("/login")
       end
     end
+
+    it 'contains authentication data when cookies exist' do
+      COOKIE_DATA = "someauthenticationdata"
+      cookies['authentication_data'] = COOKIE_DATA
+      get '/login'
+      expect(response.status).to eq(200)
+      expect(response.body).to include("data-authentication-data=\"#{COOKIE_DATA }\"")
+    end
   end
 
   describe '#redirect_to_second_factor_if_required' do
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 204c3f1572..e604a89aba 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -269,6 +269,30 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email_confirmed?).to eq(true)
       end
 
+      it 'should return the authenticated response with the correct path for subfolders' do
+        set_subfolder "/forum"
+        events = DiscourseEvent.track_events do
+          get "/auth/google_oauth2/callback.json"
+        end
+
+        expect(response.headers["Set-Cookie"].match(/^authentication_data=.*; path=\/forum/)).not_to eq(nil)
+
+        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+
+        expect(response.status).to eq(302)
+
+        data = JSON.parse(response.cookies["authentication_data"])
+
+        expect(data["authenticated"]).to eq(true)
+        expect(data["awaiting_activation"]).to eq(false)
+        expect(data["awaiting_approval"]).to eq(false)
+        expect(data["not_allowed_from_ip_address"]).to eq(false)
+        expect(data["admin_not_allowed_from_ip_address"]).to eq(false)
+
+        user.reload
+        expect(user.email_confirmed?).to eq(true)
+      end
+
       it "should confirm email even when the tokens are expired" do
         user.email_tokens.update_all(confirmed: false, expired: true)
 

From 4ecc0a25aeb0114dcb1c0c02253c089547e7af92 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Fri, 20 Mar 2020 14:37:55 -0700
Subject: [PATCH 203/633] Revert "FIX: correctly remove authentication_data
 cookie on oauth login flow (#9238) (#9251)"

This reverts commit beaeb0c4b2ba0d273d7707d2fbc79feb63083a81.
---
 .../users/omniauth_callbacks_controller.rb    |  5 +---
 app/views/layouts/application.html.erb        |  4 ++--
 spec/requests/application_controller_spec.rb  |  8 -------
 .../omniauth_callbacks_controller_spec.rb     | 24 -------------------
 4 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 31c14c66ca..881fb3e9ec 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -74,10 +74,7 @@ class Users::OmniauthCallbacksController < ApplicationController
       @auth_result.authenticator_name = authenticator.name
       complete_response_data
       cookies['_bypass_cache'] = true
-      cookies[:authentication_data] = {
-        value: @auth_result.to_client_hash.to_json,
-        path: Discourse.base_uri
-      }
+      cookies[:authentication_data] = @auth_result.to_client_hash.to_json
       redirect_to @origin
     end
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7fa77c809a..6c1f3b3074 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -58,8 +58,8 @@
 
     <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
 
-    <%- if (data = cookies.delete(:authentication_data, path: Discourse.base_uri)) && !current_user  %>
-      <meta id="data-authentication" data-authentication-data="<%= data %>">
+    <%- if !current_user && cookies[:authentication_data] %>
+      <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
     <%- end %>
   </head>
 
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 2c65450ae6..4aaf547e33 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -84,14 +84,6 @@ RSpec.describe ApplicationController do
         expect(response).to redirect_to("/login")
       end
     end
-
-    it 'contains authentication data when cookies exist' do
-      COOKIE_DATA = "someauthenticationdata"
-      cookies['authentication_data'] = COOKIE_DATA
-      get '/login'
-      expect(response.status).to eq(200)
-      expect(response.body).to include("data-authentication-data=\"#{COOKIE_DATA }\"")
-    end
   end
 
   describe '#redirect_to_second_factor_if_required' do
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index e604a89aba..204c3f1572 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -269,30 +269,6 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email_confirmed?).to eq(true)
       end
 
-      it 'should return the authenticated response with the correct path for subfolders' do
-        set_subfolder "/forum"
-        events = DiscourseEvent.track_events do
-          get "/auth/google_oauth2/callback.json"
-        end
-
-        expect(response.headers["Set-Cookie"].match(/^authentication_data=.*; path=\/forum/)).not_to eq(nil)
-
-        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
-
-        expect(response.status).to eq(302)
-
-        data = JSON.parse(response.cookies["authentication_data"])
-
-        expect(data["authenticated"]).to eq(true)
-        expect(data["awaiting_activation"]).to eq(false)
-        expect(data["awaiting_approval"]).to eq(false)
-        expect(data["not_allowed_from_ip_address"]).to eq(false)
-        expect(data["admin_not_allowed_from_ip_address"]).to eq(false)
-
-        user.reload
-        expect(user.email_confirmed?).to eq(true)
-      end
-
       it "should confirm email even when the tokens are expired" do
         user.email_tokens.update_all(confirmed: false, expired: true)
 

From 3215f2b6ee683b4a1290f8fd61c08ab7ac27090d Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 20 Mar 2020 22:06:20 +0000
Subject: [PATCH 204/633] FIX: Permalinks should redirect to category URL
 including the ID

This is a temporary fix. Urls for third-level categories should function without the id. Once that is fixed, this change can be reverted
---
 app/models/permalink.rb       | 2 +-
 spec/models/permalink_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/permalink.rb b/app/models/permalink.rb
index c6c28026ee..925f640f7e 100644
--- a/app/models/permalink.rb
+++ b/app/models/permalink.rb
@@ -79,7 +79,7 @@ class Permalink < ActiveRecord::Base
     return external_url if external_url
     return "#{Discourse::base_uri}#{post.url}" if post
     return topic.relative_url if topic
-    return category.url if category
+    return "#{category.url}/#{category.id}" if category
     nil
   end
 
diff --git a/spec/models/permalink_spec.rb b/spec/models/permalink_spec.rb
index 15c47b0032..8cd9d30a46 100644
--- a/spec/models/permalink_spec.rb
+++ b/spec/models/permalink_spec.rb
@@ -62,7 +62,7 @@ describe Permalink do
 
     it "returns a category url when category_id is set" do
       permalink.category_id = category.id
-      expect(target_url).to eq(category.url)
+      expect(target_url).to eq("#{category.url}/#{category.id}")
     end
 
     it "returns nil when category_id is set but category is not found" do

From dbfec4b268c5e70cea75254eb4c624df91739acd Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 20 Mar 2020 22:26:45 +0000
Subject: [PATCH 205/633] DEV: Update spec for category permalink

Followup to 3215f2b6ee683b4a1290f8fd61c08ab7ac27090d
---
 spec/requests/application_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 4aaf547e33..f933429114 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -297,7 +297,7 @@ RSpec.describe ApplicationController do
         permalink = Permalink.create!(url: trashed_topic.relative_url, category_id: category.id)
         get "/t/#{trashed_topic.slug}/#{trashed_topic.id}"
         expect(response.status).to eq(301)
-        expect(response).to redirect_to("/forum/c/#{category.slug}")
+        expect(response).to redirect_to("/forum/c/#{category.slug}/#{category.id}")
 
         permalink.destroy
         permalink = Permalink.create!(url: trashed_topic.relative_url, post_id: new_topic.posts.last.id)

From c97244ca115c6e8d287d9c4e6033bf3e1d084f70 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Sat, 21 Mar 2020 07:33:10 -0600
Subject: [PATCH 206/633] FIX: post edited webhook does not reflect updated
 topic title

This fix ensures that when a topic title is edited the new title shows
up in the post webhook instead of the old title.

Rather than passing in the old topic object to the PostRevisor the
PostRevisor initializer will load the updated topic object inside of the
initializer if you don't pass it in. This will allow the post_edited
webhook to have the correct topic values.

Original bug reported at:

https://meta.discourse.org/t/post-edited-webhook-does-not-reflect-updated-topic-title/144722
---
 app/controllers/topics_controller.rb    |  2 +-
 spec/requests/topics_controller_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 0deb6b2efd..99ff5fb625 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -366,7 +366,7 @@ class TopicsController < ApplicationController
 
     if changes.length > 0
       first_post = topic.ordered_posts.first
-      success = PostRevisor.new(first_post, topic).revise!(current_user, changes, validate_post: false)
+      success = PostRevisor.new(first_post).revise!(current_user, changes, validate_post: false)
     end
 
     # this is used to return the title to the client as it may have been changed by "TextCleaner"
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 0f0a921e9e..947d244971 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -946,6 +946,9 @@ RSpec.describe TopicsController do
       end
 
       describe 'with permission' do
+        fab!(:post_hook) { Fabricate(:post_web_hook) }
+        fab!(:topic_hook) { Fabricate(:topic_web_hook) }
+
         it 'succeeds' do
           put "/t/#{topic.slug}/#{topic.id}.json"
 
@@ -971,6 +974,13 @@ RSpec.describe TopicsController do
 
           topic.reload
           expect(topic.title).to eq('This is a new title for the topic')
+
+          expect(Jobs::EmitWebHookEvent.jobs.length).to eq(2)
+          job_args = Jobs::EmitWebHookEvent.jobs[0]["args"].first
+
+          expect(job_args["event_name"]).to eq("post_edited")
+          payload = JSON.parse(job_args["payload"])
+          expect(payload["topic_title"]).to eq('This is a new title for the topic')
         end
 
         it "returns errors with invalid titles" do

From 3189dab622dead97d73651af99f2cf23ed6e188f Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Sat, 21 Mar 2020 13:24:49 -0700
Subject: [PATCH 207/633] FIX: correctly remove authentication_data cookie on
 oauth login flow

Additionally correctly handle cookie path for authentication_data

There were two bugs that exposed an interesting case where two discourse
instances hosted across two subfolder installs in the same domain
with oauth may clash and cause strange redirection on first login:

Log in to example.com/forum1. authentication_data cookie is set with path /
On the first redirection, the current authentication_data cookie is not unset.
Log in to example.com/forum2. In this case, the authentication_data cookie
is already set from forum1 - the initial page load will incorrectly redirect
the user to the redirect URL from the already-stored cookie, to /forum1.

This removes this issue by:

* Setting the cookie for the correct path, and not having it on root
* Correctly removing the cookie on first login
---
 .../users/omniauth_callbacks_controller.rb    |  5 +++-
 app/views/layouts/application.html.erb        |  4 ++--
 spec/requests/application_controller_spec.rb  |  8 +++++++
 .../omniauth_callbacks_controller_spec.rb     | 24 +++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 881fb3e9ec..4bcd8c8f5f 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -74,7 +74,10 @@ class Users::OmniauthCallbacksController < ApplicationController
       @auth_result.authenticator_name = authenticator.name
       complete_response_data
       cookies['_bypass_cache'] = true
-      cookies[:authentication_data] = @auth_result.to_client_hash.to_json
+      cookies[:authentication_data] = {
+        value: @auth_result.to_client_hash.to_json,
+        path: Discourse.base_uri("/")
+      }
       redirect_to @origin
     end
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6c1f3b3074..0b037d521f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -58,8 +58,8 @@
 
     <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
 
-    <%- if !current_user && cookies[:authentication_data] %>
-      <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
+    <%- if !current_user && (data = cookies.delete(:authentication_data, path: Discourse.base_uri("/"))) %>
+      <meta id="data-authentication" data-authentication-data="<%= data %>">
     <%- end %>
   </head>
 
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index f933429114..4d551942f6 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -84,6 +84,14 @@ RSpec.describe ApplicationController do
         expect(response).to redirect_to("/login")
       end
     end
+
+    it 'contains authentication data when cookies exist' do
+      COOKIE_DATA = "someauthenticationdata"
+      cookies['authentication_data'] = COOKIE_DATA
+      get '/login'
+      expect(response.status).to eq(200)
+      expect(response.body).to include("data-authentication-data=\"#{COOKIE_DATA }\"")
+    end
   end
 
   describe '#redirect_to_second_factor_if_required' do
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 204c3f1572..e604a89aba 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -269,6 +269,30 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email_confirmed?).to eq(true)
       end
 
+      it 'should return the authenticated response with the correct path for subfolders' do
+        set_subfolder "/forum"
+        events = DiscourseEvent.track_events do
+          get "/auth/google_oauth2/callback.json"
+        end
+
+        expect(response.headers["Set-Cookie"].match(/^authentication_data=.*; path=\/forum/)).not_to eq(nil)
+
+        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+
+        expect(response.status).to eq(302)
+
+        data = JSON.parse(response.cookies["authentication_data"])
+
+        expect(data["authenticated"]).to eq(true)
+        expect(data["awaiting_activation"]).to eq(false)
+        expect(data["awaiting_approval"]).to eq(false)
+        expect(data["not_allowed_from_ip_address"]).to eq(false)
+        expect(data["admin_not_allowed_from_ip_address"]).to eq(false)
+
+        user.reload
+        expect(user.email_confirmed?).to eq(true)
+      end
+
       it "should confirm email even when the tokens are expired" do
         user.email_tokens.update_all(confirmed: false, expired: true)
 

From c4bc734b11ba310086b1a7ab28f0d57e6a6030d8 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Mon, 23 Mar 2020 01:08:18 -0300
Subject: [PATCH 208/633] FIX: Backfill topic timer duration (#9249)

---
 app/services/topic_status_updater.rb          |  2 +-
 ...0193612_back_fill_topic_timer_durations.rb | 20 +++++++++++++++++++
 lib/post_creator.rb                           |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20200320193612_back_fill_topic_timer_durations.rb

diff --git a/app/services/topic_status_updater.rb b/app/services/topic_status_updater.rb
index f3aa541199..795538cbd0 100644
--- a/app/services/topic_status_updater.rb
+++ b/app/services/topic_status_updater.rb
@@ -89,7 +89,7 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
   def message_for_autoclosed(locale_key)
     num_minutes =
       if @topic_status_update&.based_on_last_post
-        @topic_status_update.duration.hours
+        (@topic_status_update.duration || 0).hours
       elsif @topic_status_update&.created_at
         Time.zone.now - @topic_status_update.created_at
       else
diff --git a/db/migrate/20200320193612_back_fill_topic_timer_durations.rb b/db/migrate/20200320193612_back_fill_topic_timer_durations.rb
new file mode 100644
index 0000000000..a4174413e2
--- /dev/null
+++ b/db/migrate/20200320193612_back_fill_topic_timer_durations.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class BackFillTopicTimerDurations < ActiveRecord::Migration[6.0]
+  def up
+    DB.exec <<~SQL
+      UPDATE topic_timers
+      SET duration = 0
+      WHERE duration IS NULL AND (execute_at IS NULL OR created_at IS NULL)
+    SQL
+
+    DB.exec <<~SQL
+      UPDATE topic_timers
+      SET duration = EXTRACT(EPOCH FROM execute_at - created_at) / 3600
+      WHERE duration IS NULL AND execute_at IS NOT NULL AND created_at IS NOT NULL
+    SQL
+  end
+
+  def down
+  end
+end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 0e89a93ba1..39fe22c283 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -470,7 +470,7 @@ class PostCreator
 
       if topic_timer &&
          topic_timer.based_on_last_post &&
-         topic_timer.duration > 0
+         topic_timer.duration.to_i > 0
 
         @topic.set_or_create_timer(TopicTimer.types[:close],
           nil,

From 445b35381d82a9ab34a02e66484aa9e700da9872 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 23 Mar 2020 09:13:36 +0100
Subject: [PATCH 209/633] Improve Telligent import script

* Detects mostly all attachments and it's a lot faster
* Parses user properties in Ruby instead of the DB, because that's less errorprone
* Imports user avatars
* Imports topic views by users
* Better handling of quotes and YouTube links
---
 script/import_scripts/telligent.rb | 313 +++++++++++++++++++----------
 1 file changed, 207 insertions(+), 106 deletions(-)

diff --git a/script/import_scripts/telligent.rb b/script/import_scripts/telligent.rb
index 6fb3c775f0..0e166523cd 100644
--- a/script/import_scripts/telligent.rb
+++ b/script/import_scripts/telligent.rb
@@ -42,11 +42,43 @@ class ImportScripts::Telligent < ImportScripts::Base
   BATCH_SIZE ||= 1000
   LOCAL_AVATAR_REGEX ||= /\A~\/.*(?<directory>communityserver-components-(?:selectable)?avatars)\/(?<path>[^\/]+)\/(?<filename>.+)/i
   REMOTE_AVATAR_REGEX ||= /\Ahttps?:\/\//i
-  EMBEDDED_ATTACHMENT_REGEX ||= /<a href="\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename1>.+?)".*?>(?<filename2>.*?)<\/a>/i
+  EMBEDDED_ATTACHMENT_REGEX ||= /<a href="\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)".*?>.*?<\/a>/i
+  EMBEDDED_VIEW_ATTACHMENT_REGEX ||= /\[View:~\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)(?:\:[:\d\s]*?)\]/i
+  PROPERTY_NAMES_REGEX ||= /(?<name>\w+):S:(?<start>\d+):(?<length>\d+):/
 
   CATEGORY_LINK_NORMALIZATION = '/.*?(f\/\d+)$/\1'
   TOPIC_LINK_NORMALIZATION = '/.*?(f\/\d+\/t\/\d+)$/\1'
 
+  UNICODE_REPLACEMENTS = {
+    "5F00" => "_",
+    "2800" => "(",
+    "2900" => ")",
+    "2D00" => "-",
+    "2C00" => ",",
+    "2700" => "'",
+    "5B00" => "[",
+    "5D00" => "]",
+    "3D00" => "=",
+    "2600" => "&",
+    "2100" => "!",
+    "2300" => "#",
+    "7E00" => "~",
+    "2500" => "%",
+    "2E00" => ".",
+    "4000" => "@",
+    "2B00" => "+",
+    "2400" => "$",
+    "1920" => "’",
+    "E900" => "é",
+    "E000" => "à",
+    "F300" => "ó",
+    "1C20" => "“",
+    "1D20" => "”",
+    "B000" => "°",
+    "0003" => ["0300".to_i(16)].pack("U"),
+    "0103" => ["0301".to_i(16)].pack("U")
+  }
+
   def initialize
     super()
 
@@ -58,11 +90,16 @@ class ImportScripts::Telligent < ImportScripts::Base
       timeout: 60 # the user query is very slow
     )
 
+    @filestore_root_directory = ENV["FILE_BASE_DIR"]
+    @files = {}
+
     SiteSetting.tagging_enabled = true
   end
 
   def execute
     add_permalink_normalizations
+    index_filestore
+
     import_categories
     import_users
     import_topics
@@ -70,6 +107,11 @@ class ImportScripts::Telligent < ImportScripts::Base
     mark_topics_as_solved
   end
 
+  def index_filestore
+    puts "", "Indexing filestore..."
+    index_directory(@filestore_root_directory)
+  end
+
   def import_users
     puts "", "Importing users..."
 
@@ -94,32 +136,14 @@ class ImportScripts::Telligent < ImportScripts::Base
 
     loop do
       rows = query(<<~SQL)
-        SELECT *
-        FROM (
-            SELECT TOP #{BATCH_SIZE}
-              u.UserID, u.Email, u.UserName,u.CreateDate, p.PropertyName, p.PropertyValue
-            FROM cs_Users u
-              LEFT OUTER JOIN (
-                SELECT NULL AS UserID, ap.UserId AS MembershipID, x.PropertyName, x.PropertyValue
-                FROM aspnet_Profile ap
-                  CROSS APPLY dbo.GetProperties(ap.PropertyNames, ap.PropertyValuesString) x
-                WHERE ap.PropertyNames NOT LIKE '%:-1%' AND
-                      x.PropertyName IN ('bio', 'commonName', 'location', 'webAddress')
-                UNION
-                SELECT up.UserID, NULL AS MembershipID, x.PropertyName, CAST(x.PropertyValue AS NVARCHAR) AS PropertyValue
-                  FROM cs_UserProfile up
-                    CROSS APPLY dbo.GetProperties(up.PropertyNames, up.PropertyValues) x
-                  WHERE up.PropertyNames NOT LIKE '%:-1%' AND
-                        x.PropertyName IN ('avatarUrl', 'BannedUntil', 'UserBanReason')
-              ) p ON p.UserID = u.UserID OR p.MembershipID = u.MembershipID
-            WHERE u.UserID > #{last_user_id} AND #{user_conditions}
-            ORDER BY u.UserID
-        ) x
-          PIVOT (
-            MAX(PropertyValue)
-            FOR PropertyName
-            IN (bio, commonName, location, webAddress, avatarUrl, BannedUntil, UserBanReason)
-          ) Y
+        SELECT TOP #{BATCH_SIZE}
+            u.UserID, u.Email, u.UserName, u.CreateDate,
+            ap.PropertyNames AP_PropertyNames, ap.PropertyValuesString AS AP_PropertyValues,
+            up.PropertyNames UP_PropertyNames, up.PropertyValues AS UP_PropertyValues
+        FROM cs_Users u
+            LEFT OUTER JOIN aspnet_Profile ap ON ap.UserId = u.MembershipID
+            LEFT OUTER JOIN cs_UserProfile up ON up.UserID = u.UserID
+        WHERE u.UserID > #{last_user_id} AND #{user_conditions}
         ORDER BY UserID
       SQL
 
@@ -132,18 +156,21 @@ class ImportScripts::Telligent < ImportScripts::Base
       end
 
       create_users(rows, total: total_count, offset: import_count) do |row|
+        ap_properties = parse_properties(row["AP_PropertyNames"], row["AP_PropertyValues"])
+        up_properties = parse_properties(row["UP_PropertyNames"], row["UP_PropertyValues"])
+
         {
           id: row["UserID"],
           email: row["Email"],
           username: row["UserName"],
-          name: row["commonName"],
+          name: ap_properties["commonName"],
           created_at: row["CreateDate"],
-          bio_raw: html_to_markdown(row["bio"]),
-          location: row["location"],
-          website: row["webAddress"],
+          bio_raw: html_to_markdown(ap_properties["bio"]),
+          location: ap_properties["location"],
+          website: ap_properties["webAddress"],
           post_create_action: proc do |user|
-            import_avatar(user, row["avatarUrl"])
-            suspend_user(user, row["BannedUntil"], row["UserBanReason"])
+            import_avatar(user, up_properties["avatarUrl"])
+            suspend_user(user, up_properties["BannedUntil"], up_properties["UserBanReason"])
           end
         }
       end
@@ -154,10 +181,10 @@ class ImportScripts::Telligent < ImportScripts::Base
 
   # TODO move into base importer (create_user) and use consistent error handling
   def import_avatar(user, avatar_url)
-    return if ENV["FILE_BASE_DIR"].blank? || avatar_url.blank? || avatar_url.include?("anonymous")
+    return if @filestore_root_directory.blank? || avatar_url.blank? || avatar_url.include?("anonymous")
 
     if match_data = avatar_url.match(LOCAL_AVATAR_REGEX)
-      avatar_path = File.join(ENV["FILE_BASE_DIR"],
+      avatar_path = File.join(@filestore_root_directory,
                               match_data[:directory].gsub("-", "."),
                               match_data[:path].split("-"),
                               match_data[:filename])
@@ -333,7 +360,7 @@ class ImportScripts::Telligent < ImportScripts::Base
     batches do |offset|
       rows = query(<<~SQL)
         SELECT TOP #{BATCH_SIZE}
-          t.ThreadId, t.ForumId, t.UserId, t.TotalViews,
+          t.ThreadId, t.ForumId, t.UserId, t.TotalViews, t.ContentID AS TopicContentId,
           t.Subject, t.Body, t.DateCreated, t.IsLocked, t.StickyDate,
           a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName, a.IsRemote
         FROM te_Forum_Threads t
@@ -365,6 +392,7 @@ class ImportScripts::Telligent < ImportScripts::Base
             Jobs.enqueue_at(topic.pinned_until, :unpin_topic, topic_id: topic.id) if topic.pinned_until
             url = "f/#{row['ForumId']}/t/#{row['ThreadId']}"
             Permalink.create(url: url, topic_id: topic.id) unless Permalink.exists?(url: url)
+            import_topic_views(topic, row["TopicContentId"])
           end
         }
 
@@ -382,6 +410,29 @@ class ImportScripts::Telligent < ImportScripts::Base
     "T#{topic_id}"
   end
 
+  def import_topic_views(topic, content_id)
+    last_user_id = -1
+
+    batches do |_|
+      rows = query(<<~SQL)
+        SELECT TOP #{BATCH_SIZE}
+          UserId, MAX(CreatedUtcDate) AS ViewDate
+        FROM te_Content_Views
+        WHERE ContentId = '#{content_id}' AND UserId > #{last_user_id}
+        GROUP BY UserId
+        ORDER BY UserId
+      SQL
+
+      break if rows.blank?
+      last_user_id = rows[-1]["UserId"]
+
+      rows.each do |row|
+        user_id = user_id_from_imported_user_id(row["UserId"])
+        TopicViewItem.add(topic.id, "127.0.0.1", user_id, row["ViewDate"], true) if user_id
+      end
+    end
+  end
+
   def ignored_forum_sql_condition
     @ignored_forum_sql_condition ||= @ignored_forum_ids.present? \
       ? "t.ForumId NOT IN (#{@ignored_forum_ids.join(',')})" \
@@ -452,28 +503,42 @@ class ImportScripts::Telligent < ImportScripts::Base
     end
   end
 
+  def index_directory(root_directory)
+    Dir.foreach(root_directory) do |directory_name|
+      next if directory_name == "." || directory_name == ".."
+
+      path = File.join(root_directory, directory_name)
+      if File.directory?(path)
+        index_directory(path)
+      else
+        path.delete_prefix!(@filestore_root_directory)
+        path.delete_prefix!("/")
+        @files[path.downcase] = path
+      end
+    end
+  end
+
   def raw_with_attachment(row, user_id, type)
     raw, embedded_paths, upload_ids = replace_embedded_attachments(row["Body"], user_id)
     raw = html_to_markdown(raw) || ""
 
     filename = row["FileName"]
-    return raw if ENV["FILE_BASE_DIR"].blank? || filename.blank?
+    return raw if @filestore_root_directory.blank? || filename.blank?
 
     if row["IsRemote"]
       return "#{raw}\n#{filename}"
     end
 
     path = File.join(
-      ENV["FILE_BASE_DIR"],
       "telligent.evolution.components.attachments",
       "%02d" % row["ApplicationTypeId"],
       "%02d" % row["ApplicationId"],
       "%02d" % row["ApplicationContentTypeId"],
-      ("%010d" % row["ContentId"]).scan(/.{2}/),
-      clean_filename(filename)
+      ("%010d" % row["ContentId"]).scan(/.{2}/)
     )
+    path = fix_attachment_path(path, filename)
 
-    unless embedded_paths.include?(path)
+    if path && !embedded_paths.include?(path)
       if File.file?(path)
         upload = @uploader.create_upload(user_id, path, filename)
 
@@ -493,91 +558,110 @@ class ImportScripts::Telligent < ImportScripts::Base
     paths = []
     upload_ids = []
 
-    return [raw, paths, upload_ids] if ENV["FILE_BASE_DIR"].blank?
+    return [raw, paths, upload_ids] if @filestore_root_directory.blank?
 
-    raw = raw.gsub(EMBEDDED_ATTACHMENT_REGEX) do
-      filename, path = attachment_path(Regexp.last_match)
+    [EMBEDDED_ATTACHMENT_REGEX, EMBEDDED_VIEW_ATTACHMENT_REGEX].each do |regex|
+      raw = raw.gsub(regex) do
+        match_data = Regexp.last_match
 
-      if File.file?(path)
-        upload = @uploader.create_upload(user_id, path, filename)
+        path = File.join(match_data[:directory], match_data[:path])
+        fixed_path = fix_attachment_path(path, match_data[:filename])
 
-        if upload.present? && upload.persisted?
-          paths << path
-          upload_ids << upload.id
-          @uploader.html_for_upload(upload, filename)
+        if fixed_path && File.file?(fixed_path)
+          filename = File.basename(fixed_path)
+          upload = @uploader.create_upload(user_id, fixed_path, filename)
+
+          if upload.present? && upload.persisted?
+            paths << fixed_path
+            upload_ids << upload.id
+            @uploader.html_for_upload(upload, filename)
+          end
+        else
+          path = File.join(path, match_data[:filename])
+          STDERR.puts "Could not find file: #{path}"
         end
-      else
-        STDERR.puts "Could not find file: #{path}"
       end
     end
 
     [raw, paths, upload_ids]
   end
 
-  def clean_filename(filename)
+  def fix_attachment_path(base_path, filename)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    base_path.downcase!
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
     filename = CGI.unescapeHTML(filename)
-    filename.gsub!(/[\x00\/\\:\*\?\"<>\|]/, '_')
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
 
-    %w|( ) # % - _ [ ] = , ' ~ ! + { } & @ #|.each do |c|
-      number = "#{c.ord.to_s(16).upcase}00"
-      filename.gsub!("_#{number}_", c)
-      filename.gsub!("_#{number}#{number}_", c * 2)
-    end
+    filename.gsub!("-", " ")
+    filename.strip!
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
 
-    filename
+    directories = base_path.split(File::SEPARATOR)
+    first_directory = directories.shift
+    first_directory.gsub!("-", ".")
+    base_path = File.join(first_directory, directories)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    directories.map! { |d| File.join(d.split(/[\.\-]/).map(&:strip)) }
+    base_path = File.join(first_directory, directories)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    directories = base_path.split(File::SEPARATOR)
+    directories.map! { |d| d.gsub("+", " ").strip }
+    base_path = File.join(directories)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    replace_codes!(filename)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    replace_codes!(base_path)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    filename.gsub!(/(?:\:\d+)+$/, "")
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    path = File.join(base_path, filename)
+    path_regex = Regexp.new("^#{Regexp.escape(path)}-\\d+x\\d+\\.\\w+$", Regexp::IGNORECASE)
+    path = find_correct_path_with_regex(path_regex)
+    return path if attachment_exists?(path)
+
+    nil
   end
 
-  def attachment_path(match_data)
-    filename, path = join_attachment_path(match_data, filename_index: 2)
-    filename, path = join_attachment_path(match_data, filename_index: 1) unless File.file?(path)
-    [filename, path]
+  def find_correct_path(base_path, filename)
+    path = File.join(base_path, filename)
+    path = @files[path.downcase]
+    path ? File.join(@filestore_root_directory, path) : nil
   end
 
-  # filenames are a total mess - try to guess the correct filename
-  # works for 70% of all files
-  def join_attachment_path(match_data, filename_index:)
-    filename = clean_filename(match_data[:"filename#{filename_index}"])
-    base_path = File.join(
-      ENV["FILE_BASE_DIR"],
-      match_data[:directory].gsub("-", ".").downcase,
-      match_data[:path].gsub("+", " ").gsub(/_\h{4}_/, "?").split(/[\.\-]/).map(&:strip)
-    )
+  def find_correct_path_with_regex(regex)
+    keys = @files.keys.filter { |key| regex =~ key }
+    keys.size == 1 ? File.join(@filestore_root_directory, @files[keys.first]) : nil
+  end
 
-    original_filename = filename.dup
+  def attachment_exists?(path)
+    path.present? && File.file?(path)
+  end
 
-    filename.gsub!(/[_\- ]/, "?")
-    path = File.join(base_path, filename)
-    paths = Dir.glob(path, File::FNM_CASEFOLD)
-    if (path = paths.first) && paths.size == 1
-      filename = File.basename(path)
-      return [filename, path]
+  def replace_codes!(text)
+    text.gsub!(/_(\h{4}+)_/i) do
+      codes = Regexp.last_match[1].upcase.scan(/.{4}/)
+      mapped_codes = codes.map { |c| UNICODE_REPLACEMENTS[c] }
+      mapped_codes.any? { |c| c.nil? } ? Regexp.last_match[0] : mapped_codes.join("")
     end
-
-    filename = original_filename.dup
-    filename.gsub!(/_\h{2}00_/, "?")
-    filename.gsub!(/_\h{2}00\h{2}00_/, "??")
-    filename.gsub!(/_\h{2}00\h{2}00\h{2}00_/, "???")
-    filename.gsub!(/[_\- ]/, "?")
-    path = File.join(base_path, filename)
-    paths = Dir.glob(path, File::FNM_CASEFOLD)
-    if (path = paths.first) && paths.size == 1
-      filename = File.basename(path)
-      return [filename, path]
-    end
-
-    filename = original_filename.dup
-    filename.gsub!(/_\h{4}_/, "?")
-    filename.gsub!(/_\h{4}\h{4}_/, "??")
-    filename.gsub!(/_\h{4}\h{4}\h{4}_/, "???")
-    filename.gsub!(/[_\- ]/, "?")
-    path = File.join(base_path, filename)
-    paths = Dir.glob(path, File::FNM_CASEFOLD)
-    if (path = paths.first) && paths.size == 1
-      filename = File.basename(path)
-      return [filename, path]
-    end
-
-    [original_filename, File.join(base_path, original_filename)]
   end
 
   def html_to_markdown(html)
@@ -586,10 +670,27 @@ class ImportScripts::Telligent < ImportScripts::Base
     md = HtmlToMarkdown.new(html).to_markdown
     md.gsub!(/\[quote.*?\]/, "\n" + '\0' + "\n")
     md.gsub!(/(?<!^)\[\/quote\]/, "\n[/quote]\n")
+    md.gsub!(/\[\/quote\](?!$)/, "\n[/quote]\n")
+    md.gsub!(/\[View:(http.*?)[:\d\s]*?(?:\]|\z)/i, '\1')
     md.strip!
     md
   end
 
+  def parse_properties(names, values)
+    properties = {}
+    return properties if names.blank? || values.blank?
+
+    names.scan(PROPERTY_NAMES_REGEX).each do |property|
+      name = property[0]
+      start_index = property[1].to_i
+      end_index = start_index + property[2].to_i - 1
+
+      properties[name] = values[start_index..end_index]
+    end
+
+    properties
+  end
+
   def mark_topics_as_solved
     puts "", "Marking topics as solved..."
 

From 3f9b922d20d12aaaded47ddc88b791fc92e94ffe Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 23 Mar 2020 12:28:16 +0100
Subject: [PATCH 210/633] FIX: middle click was reading every notifications
 (#9252)

---
 .../discourse/widgets/default-notification-item.js       | 2 +-
 .../widgets/default-notification-item-test.js.es6        | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/default-notification-item.js b/app/assets/javascripts/discourse/widgets/default-notification-item.js
index da741f45aa..60e4c94ed1 100644
--- a/app/assets/javascripts/discourse/widgets/default-notification-item.js
+++ b/app/assets/javascripts/discourse/widgets/default-notification-item.js
@@ -163,7 +163,7 @@ export const DefaultNotificationItem = createWidget(
         this.attrs.set("read", true);
         ajax("/notifications/mark-read", {
           method: "PUT",
-          data: this.attrs.id
+          data: { id: this.attrs.id }
         });
       }
     }
diff --git a/test/javascripts/widgets/default-notification-item-test.js.es6 b/test/javascripts/widgets/default-notification-item-test.js.es6
index b701407243..4c9795c1b5 100644
--- a/test/javascripts/widgets/default-notification-item-test.js.es6
+++ b/test/javascripts/widgets/default-notification-item-test.js.es6
@@ -32,8 +32,15 @@ widgetTest("sets notification as read on middle click", {
   },
   async test(assert) {
     let requests = 0;
-    pretender.put("/notifications/mark-read", () => {
+    pretender.put("/notifications/mark-read", request => {
       ++requests;
+
+      assert.equal(
+        request.requestBody,
+        `id=${this.args.id}`,
+        "it sets correct request parameters"
+      );
+
       return [200, { "Content-Type": "application/json" }, { success: true }];
     });
 

From 5ff505cea6f224d10ca0559cc0ccba5ed8b196d7 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 23 Mar 2020 11:02:24 +0000
Subject: [PATCH 211/633] SECURITY: Respect topic permissions when loading
 draft metadata

Co-authored-by: Sam Saffron <sam.saffron@gmail.com>
---
 app/controllers/drafts_controller.rb    |  11 ---
 app/models/draft.rb                     | 103 +++++++++++++++++-------
 app/models/post.rb                      |  10 +--
 app/models/topic.rb                     |  14 ++++
 app/serializers/draft_serializer.rb     |  50 +++++++++---
 spec/models/draft_spec.rb               |  63 +++++++++------
 spec/requests/drafts_controller_spec.rb |  20 +++++
 7 files changed, 188 insertions(+), 83 deletions(-)

diff --git a/app/controllers/drafts_controller.rb b/app/controllers/drafts_controller.rb
index 6f70e769b9..db6f87782a 100644
--- a/app/controllers/drafts_controller.rb
+++ b/app/controllers/drafts_controller.rb
@@ -23,17 +23,6 @@ class DraftsController < ApplicationController
     }
 
     stream = Draft.stream(opts)
-    stream.each do |d|
-      parsed_data = JSON.parse(d.data)
-      if parsed_data
-        if parsed_data['reply']
-          d.raw = parsed_data['reply']
-        end
-        if parsed_data['categoryId'].present? && !d.category_id.present?
-          d.category_id = parsed_data['categoryId']
-        end
-      end
-    end
 
     render json: {
       drafts: stream ? serialize_data(stream, DraftSerializer) : [],
diff --git a/app/models/draft.rb b/app/models/draft.rb
index 8d1b5ca364..9d4c08e56f 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -5,6 +5,8 @@ class Draft < ActiveRecord::Base
   NEW_PRIVATE_MESSAGE ||= 'new_private_message'
   EXISTING_TOPIC ||= 'topic_'
 
+  belongs_to :user
+
   class OutOfSequence < StandardError; end
 
   def self.set(user, key, sequence, data, owner = nil)
@@ -137,6 +139,72 @@ class Draft < ActiveRecord::Base
     Draft.where(user_id: user.id, draft_key: key).destroy_all
   end
 
+  def display_user
+    post&.user || topic&.user || user
+  end
+
+  def parsed_data
+    JSON.parse(data)
+  end
+
+  def topic_id
+    if draft_key.starts_with?(EXISTING_TOPIC)
+      draft_key.gsub(EXISTING_TOPIC, "").to_i
+    end
+  end
+
+  def topic_preloaded?
+    !!defined?(@topic)
+  end
+
+  def topic
+    topic_preloaded? ? @topic : @topic = Draft.allowed_draft_topics_for_user(user).find_by(id: topic_id)
+  end
+
+  def preload_topic(topic)
+    @topic = topic
+  end
+
+  def post_id
+    parsed_data["postId"]
+  end
+
+  def post_preloaded?
+    !!defined?(@post)
+  end
+
+  def post
+    post_preloaded? ? @post : @post = Draft.allowed_draft_posts_for_user(user).find_by(id: post_id)
+  end
+
+  def preload_post(post)
+    @post = post
+  end
+
+  def self.preload_data(drafts, user)
+    topic_ids = drafts.map(&:topic_id)
+    post_ids = drafts.map(&:post_id)
+
+    topics = self.allowed_draft_topics_for_user(user).where(id: topic_ids)
+    posts = self.allowed_draft_posts_for_user(user).where(id: post_ids)
+
+    drafts.each do |draft|
+      draft.preload_topic(topics.detect { |t| t.id == draft.topic_id })
+      draft.preload_post(posts.detect { |p| p.id == draft.post_id })
+    end
+  end
+
+  def self.allowed_draft_topics_for_user(user)
+    topics = Topic.listable_topics.secured(Guardian.new(user))
+    pms = Topic.private_messages_for_user(user)
+    topics.or(pms)
+  end
+
+  def self.allowed_draft_posts_for_user(user)
+    # .secured handles whispers, merge handles topic/pm visibility
+    Post.secured(Guardian.new(user)).joins(:topic).merge(self.allowed_draft_topics_for_user(user))
+  end
+
   def self.stream(opts = nil)
     opts ||= {}
 
@@ -144,36 +212,15 @@ class Draft < ActiveRecord::Base
     offset = (opts[:offset] || 0).to_i
     limit = (opts[:limit] || 30).to_i
 
-    # JOIN of topics table based on manipulating draft_key seems imperfect
-    builder = DB.build <<~SQL
-      SELECT
-        d.*, t.title, t.id topic_id, t.archetype,
-        t.category_id, t.closed topic_closed, t.archived topic_archived,
-        pu.username, pu.name, pu.id user_id, pu.uploaded_avatar_id, pu.username_lower,
-        du.username draft_username, NULL as raw, NULL as cooked, NULL as post_number
-      FROM drafts d
-      LEFT JOIN LATERAL json_extract_path_text (d.data::json, 'postId') postId ON TRUE
-      LEFT JOIN posts p ON postId :: BIGINT = p.id
-      LEFT JOIN topics t ON
-        CASE
-            WHEN d.draft_key LIKE '%' || '#{EXISTING_TOPIC}' || '%'
-              THEN CAST(replace(d.draft_key, '#{EXISTING_TOPIC}', '') AS INT)
-            ELSE 0
-        END = t.id
-      JOIN users pu on pu.id = COALESCE(p.user_id, t.user_id, d.user_id)
-      JOIN users du on du.id = #{user_id}
-      /*where*/
-      /*order_by*/
-      /*offset*/
-      /*limit*/
-    SQL
-
-    builder
-      .where('d.user_id = :user_id', user_id: user_id.to_i)
-      .order_by('d.updated_at desc')
+    stream = Draft.where(user_id: user_id)
+      .order(updated_at: :desc)
       .offset(offset)
       .limit(limit)
-      .query
+
+    # Preload posts and topics to avoid N+1 queries
+    Draft.preload_data(stream, opts[:user])
+
+    stream
   end
 
   def self.cleanup!
diff --git a/app/models/post.rb b/app/models/post.rb
index 85432556e7..b57a9502c6 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -69,15 +69,7 @@ class Post < ActiveRecord::Base
   register_custom_field_type(MISSING_UPLOADS_IGNORED, :boolean)
 
   scope :private_posts_for_user, ->(user) {
-    where("posts.topic_id IN (SELECT topic_id
-             FROM topic_allowed_users
-             WHERE user_id = :user_id
-             UNION ALL
-             SELECT tg.topic_id
-             FROM topic_allowed_groups tg
-             JOIN group_users gu ON gu.user_id = :user_id AND
-                                      gu.group_id = tg.group_id)",
-                                              user_id: user.id)
+    where("posts.topic_id IN (#{Topic::PRIVATE_MESSAGES_SQL})", user_id: user.id)
   }
 
   scope :by_newest, -> { order('created_at DESC, id DESC') }
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 07b5c60c6e..a50c35dcb8 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -152,6 +152,20 @@ class Topic < ActiveRecord::Base
   # Return private message topics
   scope :private_messages, -> { where(archetype: Archetype.private_message) }
 
+  PRIVATE_MESSAGES_SQL = <<~SQL
+    SELECT topic_id
+    FROM topic_allowed_users
+    WHERE user_id = :user_id
+    UNION ALL
+    SELECT tg.topic_id
+    FROM topic_allowed_groups tg
+    JOIN group_users gu ON gu.user_id = :user_id AND gu.group_id = tg.group_id
+  SQL
+
+  scope :private_messages_for_user, ->(user) {
+    private_messages.where("topics.id IN (#{PRIVATE_MESSAGES_SQL})", user_id: user.id)
+  }
+
   scope :listable_topics, -> { where('topics.archetype <> ?', Archetype.private_message) }
 
   scope :by_newest, -> { order('topics.created_at desc, topics.id desc') }
diff --git a/app/serializers/draft_serializer.rb b/app/serializers/draft_serializer.rb
index 1d19f0d18b..bcdfa257fc 100644
--- a/app/serializers/draft_serializer.rb
+++ b/app/serializers/draft_serializer.rb
@@ -23,36 +23,68 @@ class DraftSerializer < ApplicationSerializer
              :archetype,
              :archived
 
+  def cooked
+    object.parsed_data['reply'] || ""
+  end
+
+  def draft_username
+    object.user.username
+  end
+
   def avatar_template
-    User.avatar_template(object.username, object.uploaded_avatar_id)
+    object.user.avatar_template
+  end
+
+  def username
+    object.display_user&.username
+  end
+
+  def username_lower
+    object.display_user&.username_lower
+  end
+
+  def name
+    object.display_user&.name
+  end
+
+  def title
+    object.topic&.title
   end
 
   def slug
-    Slug.for(object.title)
+    object.topic&.slug
   end
 
-  def include_slug?
-    object.title.present?
+  def category_id
+    object.topic&.category_id
   end
 
   def closed
-    object.topic_closed
+    object.topic&.closed
   end
 
   def archived
-    object.topic_archived
+    object.topic&.archived
+  end
+
+  def archetype
+    object&.topic&.archetype
+  end
+
+  def include_slug?
+    object.topic&.title&.present?
   end
 
   def include_closed?
-    object.topic_closed.present?
+    object.topic&.closed&.present?
   end
 
   def include_archived?
-    object.topic_archived.present?
+    object.topic&.archived&.present?
   end
 
   def include_category_id?
-    object.category_id.present?
+    object.topic&.category_id&.present?
   end
 
 end
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index 1d6050fdaa..823ab5fab9 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -8,6 +8,10 @@ describe Draft do
     Fabricate(:user)
   end
 
+  fab!(:post) do
+    Fabricate(:post)
+  end
+
   context 'backup_drafts_to_pm_length' do
     it "correctly backs up drafts to a personal message" do
       SiteSetting.backup_drafts_to_pm_length = 1
@@ -111,7 +115,6 @@ describe Draft do
   end
 
   it 'can cleanup old drafts' do
-    user = Fabricate(:user)
     key = Draft::NEW_TOPIC
 
     Draft.set(user, key, 0, 'draft')
@@ -164,39 +167,35 @@ describe Draft do
     it "should include the right draft username in the stream" do
       Draft.set(user, "topic_#{public_topic.id}", 0, '{"reply":"hey"}')
       draft_row = stream.first
-      expect(draft_row.draft_username).to eq(user.username)
+      expect(draft_row.user.username).to eq(user.username)
     end
 
   end
 
   context 'key expiry' do
     it 'nukes new topic draft after a topic is created' do
-      u = Fabricate(:user)
-      Draft.set(u, Draft::NEW_TOPIC, 0, 'my draft')
-      _t = Fabricate(:topic, user: u)
-      s = DraftSequence.current(u, Draft::NEW_TOPIC)
-      expect(Draft.get(u, Draft::NEW_TOPIC, s)).to eq nil
+      Draft.set(user, Draft::NEW_TOPIC, 0, 'my draft')
+      _t = Fabricate(:topic, user: user)
+      s = DraftSequence.current(user, Draft::NEW_TOPIC)
+      expect(Draft.get(user, Draft::NEW_TOPIC, s)).to eq nil
       expect(Draft.count).to eq 0
     end
 
     it 'nukes new pm draft after a pm is created' do
-      u = Fabricate(:user)
-      Draft.set(u, Draft::NEW_PRIVATE_MESSAGE, 0, 'my draft')
-      t = Fabricate(:topic, user: u, archetype: Archetype.private_message, category_id: nil)
+      Draft.set(user, Draft::NEW_PRIVATE_MESSAGE, 0, 'my draft')
+      t = Fabricate(:topic, user: user, archetype: Archetype.private_message, category_id: nil)
       s = DraftSequence.current(t.user, Draft::NEW_PRIVATE_MESSAGE)
-      expect(Draft.get(u, Draft::NEW_PRIVATE_MESSAGE, s)).to eq nil
+      expect(Draft.get(user, Draft::NEW_PRIVATE_MESSAGE, s)).to eq nil
     end
 
     it 'does not nuke new topic draft after a pm is created' do
-      u = Fabricate(:user)
-      Draft.set(u, Draft::NEW_TOPIC, 0, 'my draft')
-      t = Fabricate(:topic, user: u, archetype: Archetype.private_message, category_id: nil)
+      Draft.set(user, Draft::NEW_TOPIC, 0, 'my draft')
+      t = Fabricate(:topic, user: user, archetype: Archetype.private_message, category_id: nil)
       s = DraftSequence.current(t.user, Draft::NEW_TOPIC)
-      expect(Draft.get(u, Draft::NEW_TOPIC, s)).to eq 'my draft'
+      expect(Draft.get(user, Draft::NEW_TOPIC, s)).to eq 'my draft'
     end
 
     it 'nukes the post draft when a post is created' do
-      user = Fabricate(:user)
       topic = Fabricate(:topic)
 
       Draft.set(user, topic.draft_key, 0, 'hello')
@@ -207,23 +206,20 @@ describe Draft do
     end
 
     it 'nukes the post draft when a post is revised' do
-      p = Fabricate(:post)
-      Draft.set(p.user, p.topic.draft_key, 0, 'hello')
-      p.revise(p.user, raw: 'another test')
-      s = DraftSequence.current(p.user, p.topic.draft_key)
-      expect(Draft.get(p.user, p.topic.draft_key, s)).to eq nil
+      Draft.set(post.user, post.topic.draft_key, 0, 'hello')
+      post.revise(post.user, raw: 'another test')
+      s = DraftSequence.current(post.user, post.topic.draft_key)
+      expect(Draft.get(post.user, post.topic.draft_key, s)).to eq nil
     end
 
     it 'increases revision each time you set' do
-      u = User.first
-      Draft.set(u, 'new_topic', 0, 'hello')
-      Draft.set(u, 'new_topic', 0, 'goodbye')
+      Draft.set(user, 'new_topic', 0, 'hello')
+      Draft.set(user, 'new_topic', 0, 'goodbye')
 
-      expect(Draft.find_by(user_id: u.id, draft_key: 'new_topic').revisions).to eq(2)
+      expect(Draft.find_by(user_id: user.id, draft_key: 'new_topic').revisions).to eq(2)
     end
 
     it 'handles owner switching gracefully' do
-      user = Fabricate(:user)
       draft_seq = Draft.set(user, 'new_topic', 0, 'hello', _owner = 'ABCDEF')
       expect(draft_seq).to eq(0)
 
@@ -233,5 +229,20 @@ describe Draft do
       draft_seq = Draft.set(user, 'new_topic', 1, 'hello world', _owner = 'HIJKL')
       expect(draft_seq).to eq(1)
     end
+
+    it 'can correctly preload drafts' do
+      Draft.set(user, "#{Draft::EXISTING_TOPIC}#{post.topic_id}", 0, { raw: 'hello', postId: post.id }.to_json)
+
+      drafts = Draft.where(user_id: user.id).to_a
+
+      Draft.preload_data(drafts, user)
+
+      expect(drafts[0].topic_preloaded?).to eq(true)
+      expect(drafts[0].topic.id).to eq(post.topic_id)
+
+      expect(drafts[0].post_preloaded?).to eq(true)
+      expect(drafts[0].post.id).to eq(post.id)
+    end
+
   end
 end
diff --git a/spec/requests/drafts_controller_spec.rb b/spec/requests/drafts_controller_spec.rb
index 242846d72c..d67d32828c 100644
--- a/spec/requests/drafts_controller_spec.rb
+++ b/spec/requests/drafts_controller_spec.rb
@@ -34,4 +34,24 @@ describe DraftsController do
     get "/drafts.json", params: { username: user_b.username }
     expect(response.status).to eq(403)
   end
+
+  it 'does not include topic details when user cannot see topic' do
+    topic = Fabricate(:private_message_topic)
+    topic_user = topic.user
+    other_user = Fabricate(:user)
+    Draft.set(topic_user, "topic_#{topic.id}", 0, '{}')
+    Draft.set(other_user, "topic_#{topic.id}", 0, '{}')
+
+    sign_in(topic_user)
+    get "/drafts.json", params: { username: topic_user.username }
+    expect(response.status).to eq(200)
+    parsed = JSON.parse(response.body)
+    expect(parsed["drafts"].first["title"]).to eq(topic.title)
+
+    sign_in(other_user)
+    get "/drafts.json", params: { username: other_user.username }
+    expect(response.status).to eq(200)
+    parsed = JSON.parse(response.body)
+    expect(parsed["drafts"].first["title"]).to eq(nil)
+  end
 end

From 5db41cd578dba75129c9bad24f2280845ef4db70 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 23 Mar 2020 11:04:39 +0000
Subject: [PATCH 212/633] SECURITY: Respect topic permissions when loading
 bookmark metadata

Co-authored-by: Martin Brennan <martin@discourse.org>
Co-authored-by: Sam Saffron <sam.saffron@gmail.com>
---
 app/controllers/users_controller.rb           |   2 +-
 lib/bookmark_manager.rb                       |  11 +-
 lib/bookmark_query.rb                         |  16 ++-
 lib/guardian/bookmark_guardian.rb             |   4 +
 spec/lib/bookmark_manager_spec.rb             |  18 +++
 spec/lib/bookmark_query_spec.rb               | 105 +++++++++++++++++-
 spec/requests/users_controller_spec.rb        |   5 +
 .../user_bookmark_serializer_spec.rb          |  21 ++--
 8 files changed, 151 insertions(+), 31 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6125bf9836..da9ba484ee 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1401,7 +1401,7 @@ class UsersController < ApplicationController
 
     respond_to do |format|
       format.json do
-        bookmarks = BookmarkQuery.new(user, params).list_all
+        bookmarks = BookmarkQuery.new(user: user, guardian: guardian, params: params).list_all
 
         if bookmarks.empty?
           render json: {
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index f4831e1350..c2184b394c 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -8,12 +8,15 @@ class BookmarkManager
   end
 
   def create(post_id:, name: nil, reminder_type: nil, reminder_at: nil)
+    post = Post.unscoped.includes(:topic).find(post_id)
     reminder_type = Bookmark.reminder_types[reminder_type.to_sym] if reminder_type.present?
 
+    raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_see_post?(post)
+
     bookmark = Bookmark.create(
       user_id: @user.id,
-      topic_id: topic_id_for_post(post_id),
-      post_id: post_id,
+      topic: post.topic,
+      post: post,
       name: name,
       reminder_type: reminder_type,
       reminder_at: reminder_at,
@@ -58,10 +61,6 @@ class BookmarkManager
 
   private
 
-  def topic_id_for_post(post_id)
-    Post.where(id: post_id).pluck_first(:topic_id)
-  end
-
   def clear_at_desktop_cache_if_required
     return if user_has_any_pending_at_desktop_reminders?
     Discourse.redis.del(BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_KEY_PREFIX + @user.id.to_s)
diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
index d38bdabf7c..b55e8eb8b6 100644
--- a/lib/bookmark_query.rb
+++ b/lib/bookmark_query.rb
@@ -18,18 +18,22 @@ class BookmarkQuery
     end
   end
 
-  def initialize(user, params = {})
+  def initialize(user:, guardian: nil, params: {})
     @user = user
     @params = params
+    @guardian = guardian || Guardian.new(@user)
   end
 
   def list_all
     results = user_bookmarks
-      .joins('INNER JOIN topics ON topics.id = bookmarks.topic_id')
-      .joins('INNER JOIN posts ON posts.id = bookmarks.post_id')
-      .joins('INNER JOIN users ON users.id = posts.user_id')
       .order('bookmarks.created_at DESC')
 
+    topics = Topic.listable_topics.secured(@guardian)
+    pms = Topic.private_messages_for_user(@user)
+    results = results.merge(topics.or(pms))
+
+    results = results.merge(Post.secured(@guardian))
+
     if @params[:limit]
       results = results.limit(@params[:limit])
     end
@@ -42,7 +46,7 @@ class BookmarkQuery
 
     BookmarkQuery.preload(results, self)
 
-    results
+    @guardian.filter_allowed_categories(results)
   end
 
   private
@@ -51,5 +55,7 @@ class BookmarkQuery
     Bookmark.where(user: @user)
       .includes(topic: :tags)
       .includes(post: :user)
+      .references(:topic)
+      .references(:post)
   end
 end
diff --git a/lib/guardian/bookmark_guardian.rb b/lib/guardian/bookmark_guardian.rb
index 9f44975777..1754c280e2 100644
--- a/lib/guardian/bookmark_guardian.rb
+++ b/lib/guardian/bookmark_guardian.rb
@@ -4,4 +4,8 @@ module BookmarkGuardian
   def can_delete_bookmark?(bookmark)
     @user == bookmark.user
   end
+
+  def can_create_bookmark?(bookmark)
+    can_see_topic?(bookmark.topic)
+  end
 end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index dbfecd565d..11a0b7d859 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -90,6 +90,24 @@ RSpec.describe BookmarkManager do
         expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.cannot_set_reminder_in_distant_future"))
       end
     end
+
+    context "when the post is inaccessable for the user" do
+      before do
+        post.trash!
+      end
+      it "raises an invalid access error" do
+        expect { subject.create(post_id: post.id, name: name) }.to raise_error(Discourse::InvalidAccess)
+      end
+    end
+
+    context "when the topic is inaccessable for the user" do
+      before do
+        post.topic.update(category: Fabricate(:private_category, group: Fabricate(:group)))
+      end
+      it "raises an invalid access error" do
+        expect { subject.create(post_id: post.id, name: name) }.to raise_error(Discourse::InvalidAccess)
+      end
+    end
   end
 
   describe ".destroy" do
diff --git a/spec/lib/bookmark_query_spec.rb b/spec/lib/bookmark_query_spec.rb
index 2fe99c3893..c627abfc85 100644
--- a/spec/lib/bookmark_query_spec.rb
+++ b/spec/lib/bookmark_query_spec.rb
@@ -8,11 +8,28 @@ RSpec.describe BookmarkQuery do
   fab!(:bookmark2) { Fabricate(:bookmark, user: user) }
   let(:params) { {} }
 
-  subject { described_class.new(user, params) }
+  def bookmark_query(user: nil, params: nil)
+    BookmarkQuery.new(user: user || self.user, params: params || self.params)
+  end
+
+  before do
+    TopicUser.change(user.id, bookmark1.topic_id, total_msecs_viewed: 1)
+    TopicUser.change(user.id, bookmark2.topic_id, total_msecs_viewed: 1)
+  end
 
   describe "#list_all" do
     it "returns all the bookmarks for a user" do
-      expect(subject.list_all.count).to eq(2)
+      expect(bookmark_query.list_all.count).to eq(2)
+    end
+
+    it "does not return deleted posts" do
+      bookmark1.post.trash!
+      expect(bookmark_query.list_all.count).to eq(1)
+    end
+
+    it "does not return deleted topics" do
+      bookmark1.topic.trash!
+      expect(bookmark_query.list_all.count).to eq(1)
     end
 
     it "runs the on_preload block provided passing in bookmarks" do
@@ -20,14 +37,92 @@ RSpec.describe BookmarkQuery do
       BookmarkQuery.on_preload do |bookmarks, bq|
         (preloaded_bookmarks << bookmarks).flatten
       end
-      subject.list_all
+      bookmark_query.list_all
       expect(preloaded_bookmarks.any?).to eq(true)
     end
 
+    context "for a whispered post" do
+      before do
+        bookmark1.post.update(post_type: Post.types[:whisper])
+      end
+      context "when the user is moderator" do
+        it "does return the whispered post" do
+          user.update!(moderator: true)
+          expect(bookmark_query.list_all.count).to eq(2)
+        end
+      end
+      context "when the user is admin" do
+        it "does return the whispered post" do
+          user.update!(admin: true)
+          expect(bookmark_query.list_all.count).to eq(2)
+        end
+      end
+      context "when the user is not staff" do
+        it "does not return the whispered post" do
+          expect(bookmark_query.list_all.count).to eq(1)
+        end
+      end
+    end
+
+    context "for a private message topic bookmark" do
+      let(:pm_topic) { Fabricate(:private_message_topic) }
+      before do
+        bookmark1.update(topic: pm_topic, post: Fabricate(:post, topic: pm_topic))
+        TopicUser.change(user.id, pm_topic.id, total_msecs_viewed: 1)
+      end
+
+      context "when the user is a topic_allowed_user" do
+        before do
+          TopicAllowedUser.create(topic: pm_topic, user: user)
+        end
+        it "shows the user the bookmark in the PM" do
+          expect(bookmark_query.list_all.map(&:id).count).to eq(2)
+        end
+      end
+
+      context "when the user is in a topic_allowed_group" do
+        before do
+          group = Fabricate(:group)
+          GroupUser.create(group: group, user: user)
+          TopicAllowedGroup.create(topic: pm_topic, group: group)
+        end
+        it "shows the user the bookmark in the PM" do
+          expect(bookmark_query.list_all.map(&:id).count).to eq(2)
+        end
+      end
+
+      context "when the user is not a topic_allowed_user" do
+        it "does not show the user a bookmarked post in a PM where they are not an allowed user" do
+          expect(bookmark_query.list_all.map(&:id).count).to eq(1)
+        end
+      end
+
+      context "when the user is not in a topic_allowed_group" do
+        it "does not show the user a bookmarked post in a PM where they are not in an allowed group" do
+          expect(bookmark_query.list_all.map(&:id).count).to eq(1)
+        end
+      end
+    end
+
+    context "when the topic category is private" do
+      let(:group) { Fabricate(:group) }
+      before do
+        bookmark1.topic.update(category: Fabricate(:private_category, group: group))
+        bookmark1.reload
+      end
+      it "does not show the user a post/topic in a private category they cannot see" do
+        expect(bookmark_query.list_all.map(&:id)).not_to include(bookmark1.id)
+      end
+      it "does show the user a post/topic in a private category they can see" do
+        GroupUser.create(user: user, group: group)
+        expect(bookmark_query.list_all.map(&:id)).to include(bookmark1.id)
+      end
+    end
+
     context "when the limit param is provided" do
       let(:params) { { limit: 1 } }
       it "is respected" do
-        expect(subject.list_all.count).to eq(1)
+        expect(bookmark_query.list_all.count).to eq(1)
       end
     end
 
@@ -41,7 +136,7 @@ RSpec.describe BookmarkQuery do
       it "preloads them" do
         Topic.expects(:preload_custom_fields)
         expect(
-          subject.list_all.find do |b|
+          bookmark_query.list_all.find do |b|
             b.topic_id = bookmark1.topic_id
           end.topic.custom_fields['test_field']
         ).not_to eq(nil)
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index b2cc43fede..57a936aa33 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -4172,6 +4172,11 @@ describe UsersController do
     let!(:bookmark2) { Fabricate(:bookmark, user: user) }
     let!(:bookmark3) { Fabricate(:bookmark) }
 
+    before do
+      TopicUser.change(user.id, bookmark1.topic_id, total_msecs_viewed: 1)
+      TopicUser.change(user.id, bookmark2.topic_id, total_msecs_viewed: 1)
+    end
+
     it "returns a list of serialized bookmarks for the user" do
       sign_in(user)
       get "/u/#{user.username}/bookmarks.json"
diff --git a/spec/serializers/user_bookmark_serializer_spec.rb b/spec/serializers/user_bookmark_serializer_spec.rb
index 85acabf95c..36b05abf7b 100644
--- a/spec/serializers/user_bookmark_serializer_spec.rb
+++ b/spec/serializers/user_bookmark_serializer_spec.rb
@@ -6,9 +6,11 @@ RSpec.describe UserBookmarkSerializer do
   let(:user) { Fabricate(:user) }
   let(:post) { Fabricate(:post, user: user) }
   let!(:bookmark) { Fabricate(:bookmark, name: 'Test', user: user, post: post, topic: post.topic) }
+  let(:bookmark_list) { BookmarkQuery.new(user: bookmark.user).list_all.to_ary }
 
   it "serializes all properties correctly" do
-    s = serialized
+    s = UserBookmarkSerializer.new(bookmark_list.last)
+
     expect(s.id).to eq(bookmark.id)
     expect(s.created_at).to eq(bookmark.created_at)
     expect(s.topic_id).to eq(bookmark.topic_id)
@@ -34,9 +36,8 @@ RSpec.describe UserBookmarkSerializer do
       bookmark.topic.trash!
       bookmark.reload
     end
-    it "still returns the topic title because the relationship is unscoped" do
-      serialized
-      expect(serialized.title).not_to eq(nil)
+    it "it has nothing to serialize" do
+      expect(bookmark_list).to eq([])
     end
   end
 
@@ -45,17 +46,9 @@ RSpec.describe UserBookmarkSerializer do
       bookmark.post.trash!
       bookmark.reload
     end
-    it "still returns the post number because the relationship is unscoped" do
-      serialized
-      expect(serialized.linked_post_number).not_to eq(nil)
-    end
-    it "still returns the post username" do
-      serialized
-      expect(serialized.username).not_to eq(nil)
+    it "it has nothing to serialize" do
+      expect(bookmark_list).to eq([])
     end
   end
 
-  def serialized
-    described_class.new(BookmarkQuery.new(bookmark.user, {}).list_all.to_ary.last)
-  end
 end

From 5715f0ad01b621cafe16785e71f2b93f2a48d669 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 23 Mar 2020 14:00:51 +0200
Subject: [PATCH 213/633] UX: Hotkey K can select partial posts

When no post is selected, K selects first partial post and J selects
first full post.
---
 app/assets/javascripts/discourse/lib/keyboard-shortcuts.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 4b5465b986..5da8be5bc9 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -455,7 +455,11 @@ export default {
       const offset = minimumOffset();
       $selected = $articles
         .toArray()
-        .find(article => article.getBoundingClientRect().top > offset);
+        .find(article =>
+          direction > 0
+            ? article.getBoundingClientRect().top > offset
+            : article.getBoundingClientRect().bottom > offset
+        );
       if (!$selected) {
         $selected = $articles[$articles.length - 1];
       }

From f413ea6b38791defbdde0c1b5b3721b3f419fb4d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2020 10:18:30 -0400
Subject: [PATCH 214/633] Build(deps): Bump onebox from 1.9.26 to 1.9.27.1
 (#9255)

Bumps [onebox](https://github.com/discourse/onebox) from 1.9.26 to 1.9.27.1.
- [Release notes](https://github.com/discourse/onebox/releases)
- [Changelog](https://github.com/discourse/onebox/blob/master/CHANGELOG.md)
- [Commits](https://github.com/discourse/onebox/compare/v1.9.26...v1.9.27.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8485b761d9..0bdf3adf50 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -240,7 +240,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.26)
+    onebox (1.9.27.1)
       addressable (~> 2.7.0)
       htmlentities (~> 4.3)
       multi_json (~> 1.11)

From e58f0adfcc963305fb16d6c796f51ccfcbe58e00 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 23 Mar 2020 20:27:23 +0530
Subject: [PATCH 215/633] FIX: respect `prioritize_username_in_ux` setting on
 /about page

---
 .../discourse/components/about-page-users.js   | 18 ++++++++++++------
 .../templates/components/about-page-users.hbs  |  8 ++++++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/about-page-users.js b/app/assets/javascripts/discourse/components/about-page-users.js
index fb9076cb30..92936610d2 100644
--- a/app/assets/javascripts/discourse/components/about-page-users.js
+++ b/app/assets/javascripts/discourse/components/about-page-users.js
@@ -4,22 +4,28 @@ import { formatUsername } from "discourse/lib/utilities";
 import { normalize } from "discourse/components/user-info";
 import { renderAvatar } from "discourse/helpers/user-avatar";
 import { computed } from "@ember/object";
+import { prioritizeNameInUx } from "discourse/lib/settings";
 
 export default Component.extend({
   usersTemplates: computed("users.[]", function() {
     return (this.users || []).map(user => {
-      let name = "";
-      if (user.name && normalize(user.username) !== normalize(user.name)) {
-        name = user.name;
+      let name = user.name;
+      let username = user.username;
+      let prioritizeName = prioritizeNameInUx(name, this.siteSettings);
+      let hideName = false;
+      if (normalize(username) === normalize(name)) {
+        hideName = true;
       }
 
       return {
-        username: user.username,
         name,
-        userPath: userPath(user.username),
+        username,
+        userPath: userPath(username),
         avatar: renderAvatar(user, { imageSize: "large" }),
         title: user.title || "",
-        formatedUsername: formatUsername(user.username)
+        formatedUsername: formatUsername(username),
+        prioritizeName,
+        hideName
       };
     });
   })
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
index 4b7161ba18..f27899f0e7 100644
--- a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
@@ -11,10 +11,14 @@
       <div class="name-line">
         <span class="username">
           <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
-            {{userTemplate.username}}
+            {{#if userTemplate.prioritizeName}}{{userTemplate.name}}{{else}}{{userTemplate.username}}{{/if}}
           </a>
         </span>
-        <span class="name">{{userTemplate.name}}</span>
+        <span class="name">
+          {{#unless userTemplate.hideName}}
+            {{#if userTemplate.prioritizeName}}{{userTemplate.username}}{{else}}{{userTemplate.name}}{{/if}}
+          {{/unless}}
+        </span>
       </div>
       <div class="title">{{userTemplate.title}}</div>
     </div>

From 48c1de4836ed6240a6ce57761c95f2b3d69f0c91 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 23 Mar 2020 16:58:40 +0100
Subject: [PATCH 216/633] DEV: adds afterCreate/beforeUpdate hooks to rest
 models (#9253)

We already have beforeCreate and afterUpdate and it seems these hooks can be useful and it's also unexpected to not have parity on this.
---
 app/assets/javascripts/discourse/models/rest.js | 6 ++++++
 test/javascripts/models/rest-model-test.js.es6  | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/assets/javascripts/discourse/models/rest.js b/app/assets/javascripts/discourse/models/rest.js
index 40b38e5107..e0a697e827 100644
--- a/app/assets/javascripts/discourse/models/rest.js
+++ b/app/assets/javascripts/discourse/models/rest.js
@@ -9,6 +9,9 @@ const RestModel = EmberObject.extend({
   isSaving: false,
 
   beforeCreate() {},
+  afterCreate() {},
+
+  beforeUpdate() {},
   afterUpdate() {},
 
   update(props) {
@@ -18,6 +21,8 @@ const RestModel = EmberObject.extend({
 
     props = props || this.updateProperties();
 
+    this.beforeUpdate(props);
+
     this.set("isSaving", true);
     return this.store
       .update(this.__type, this.id, props)
@@ -65,6 +70,7 @@ const RestModel = EmberObject.extend({
           this.set("__state", "created");
         }
 
+        this.afterCreate(res);
         res.target = this;
         return res;
       })
diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js.es6
index c7c44bba26..8213e96e8d 100644
--- a/test/javascripts/models/rest-model-test.js.es6
+++ b/test/javascripts/models/rest-model-test.js.es6
@@ -24,10 +24,14 @@ QUnit.test("update", async assert => {
   assert.equal(widget.get("name"), "Trout Lure");
   assert.ok(!widget.get("isSaving"), "it is not saving");
 
+  const spyBeforeUpdate = sandbox.spy(widget, "beforeUpdate");
+  const spyAfterUpdate = sandbox.spy(widget, "afterUpdate");
   const promise = widget.update({ name: "new name" });
   assert.ok(widget.get("isSaving"), "it is saving");
+  assert.ok(spyBeforeUpdate.calledOn(widget));
 
   const result = await promise;
+  assert.ok(spyAfterUpdate.calledOn(widget));
   assert.ok(!widget.get("isSaving"), "it is no longer saving");
   assert.equal(widget.get("name"), "new name");
 
@@ -61,10 +65,14 @@ QUnit.test("save new", async assert => {
   assert.ok(!widget.get("isCreated"), "it is not created");
   assert.ok(!widget.get("isSaving"), "it is not saving");
 
+  const spyBeforeCreate = sandbox.spy(widget, "beforeCreate");
+  const spyAfterCreate = sandbox.spy(widget, "afterCreate");
   const promise = widget.save({ name: "Evil Widget" });
   assert.ok(widget.get("isSaving"), "it is not saving");
+  assert.ok(spyBeforeCreate.calledOn(widget));
 
   const result = await promise;
+  assert.ok(spyAfterCreate.calledOn(widget));
   assert.ok(!widget.get("isSaving"), "it is no longer saving");
   assert.ok(widget.get("id"), "it has an id");
   assert.ok(widget.get("name"), "Evil Widget");

From 39dde33cbba1c9e7b9175b466a4fc574a0b9e35c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 23 Mar 2020 13:25:33 -0400
Subject: [PATCH 217/633] UX: Larger tap areas for profile panel in user menu
 on mobile devices

---
 .../javascripts/discourse/widgets/quick-access-profile.js   | 2 ++
 app/assets/stylesheets/common/base/menu-panel.scss          | 5 +----
 app/assets/stylesheets/mobile/menu-panel.scss               | 6 ++++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/quick-access-profile.js b/app/assets/javascripts/discourse/widgets/quick-access-profile.js
index cb4c58e154..c4c7b71927 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-profile.js
+++ b/app/assets/javascripts/discourse/widgets/quick-access-profile.js
@@ -3,6 +3,8 @@ import { createWidgetFrom } from "discourse/widgets/widget";
 import { Promise } from "rsvp";
 
 createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
+  tagName: "div.quick-access-panel.quick-access-profile",
+
   buildKey: () => "quick-access-profile",
 
   hasMore() {
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index a446bff050..ca1f2b530f 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -7,10 +7,7 @@
   }
 
   .panel-body {
-    position: absolute;
-    top: 3px;
-    bottom: 37px;
-    width: 97%;
+    width: 100%;
   }
 }
 .header-cloak {
diff --git a/app/assets/stylesheets/mobile/menu-panel.scss b/app/assets/stylesheets/mobile/menu-panel.scss
index 9392ae7898..ab6a5e33cc 100644
--- a/app/assets/stylesheets/mobile/menu-panel.scss
+++ b/app/assets/stylesheets/mobile/menu-panel.scss
@@ -15,3 +15,9 @@
     transition: opacity 0.2s ease-out;
   }
 }
+
+.user-menu .quick-access-profile li:not(.show-all) {
+  margin: 0.5em 0 0.75em;
+  padding: 0.75em;
+  border: 1px solid $primary-low;
+}

From 1ac02422011f89716ab27250d39b0e0212e03892 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 23 Mar 2020 14:15:16 -0400
Subject: [PATCH 218/633] Convert wizard es6 files to js

---
 .../{homepage-preview.js.es6 => homepage-preview.js}           | 0
 .../{image-preview-favicon.js.es6 => image-preview-favicon.js} | 0
 ...e-preview-large-icon.js.es6 => image-preview-large-icon.js} | 0
 ...e-preview-logo-small.js.es6 => image-preview-logo-small.js} | 0
 .../{image-preview-logo.js.es6 => image-preview-logo.js}       | 0
 .../{invite-list-user.js.es6 => invite-list-user.js}           | 0
 .../wizard/components/{invite-list.js.es6 => invite-list.js}   | 0
 .../components/{popular-themes.js.es6 => popular-themes.js}    | 0
 .../wizard/components/{radio-button.js.es6 => radio-button.js} | 0
 .../wizard/components/{staff-count.js.es6 => staff-count.js}   | 0
 .../components/{theme-preview.js.es6 => theme-preview.js}      | 0
 .../components/{theme-previews.js.es6 => theme-previews.js}    | 0
 .../components/{wizard-canvas.js.es6 => wizard-canvas.js}      | 0
 .../{wizard-field-dropdown.js.es6 => wizard-field-dropdown.js} | 0
 .../{wizard-field-image.js.es6 => wizard-field-image.js}       | 0
 .../{wizard-field-radio.js.es6 => wizard-field-radio.js}       | 0
 .../{wizard-field-textarea.js.es6 => wizard-field-textarea.js} | 0
 .../wizard/components/{wizard-field.js.es6 => wizard-field.js} | 0
 .../{wizard-image-preview.js.es6 => wizard-image-preview.js}   | 0
 .../{wizard-step-form.js.es6 => wizard-step-form.js}           | 0
 .../wizard/components/{wizard-step.js.es6 => wizard-step.js}   | 0
 .../wizard/controllers/{application.js.es6 => application.js}  | 0
 .../javascripts/wizard/controllers/{step.js.es6 => step.js}    | 0
 .../initializers/{load-helpers.js.es6 => load-helpers.js}      | 0
 app/assets/javascripts/wizard/lib/{ajax.js.es6 => ajax.js}     | 0
 .../javascripts/wizard/lib/{preview.js.es6 => preview.js}      | 0
 .../wizard/mixins/{valid-state.js.es6 => valid-state.js}       | 0
 app/assets/javascripts/wizard/models/{step.js.es6 => step.js}  | 0
 .../wizard/models/{wizard-field.js.es6 => wizard-field.js}     | 0
 .../javascripts/wizard/models/{wizard.js.es6 => wizard.js}     | 0
 app/assets/javascripts/wizard/{router.js.es6 => router.js}     | 0
 .../wizard/routes/{application.js.es6 => application.js}       | 0
 .../javascripts/wizard/routes/{index.js.es6 => index.js}       | 0
 app/assets/javascripts/wizard/routes/{step.js.es6 => step.js}  | 0
 .../test/acceptance/{wizard-test.js.es6 => wizard-test.js}     | 0
 .../{invite-list-test.js.es6 => invite-list-test.js}           | 0
 .../test/helpers/{component-test.js.es6 => component-test.js}  | 0
 .../wizard/test/helpers/{start-app.js.es6 => start-app.js}     | 0
 .../models/{wizard-field-test.js.es6 => wizard-field-test.js}  | 0
 .../test/{wizard-pretender.js.es6 => wizard-pretender.js}      | 0
 app/assets/javascripts/wizard/{wizard.js.es6 => wizard.js}     | 0
 lib/discourse_js_processor.rb                                  | 3 ++-
 42 files changed, 2 insertions(+), 1 deletion(-)
 rename app/assets/javascripts/wizard/components/{homepage-preview.js.es6 => homepage-preview.js} (100%)
 rename app/assets/javascripts/wizard/components/{image-preview-favicon.js.es6 => image-preview-favicon.js} (100%)
 rename app/assets/javascripts/wizard/components/{image-preview-large-icon.js.es6 => image-preview-large-icon.js} (100%)
 rename app/assets/javascripts/wizard/components/{image-preview-logo-small.js.es6 => image-preview-logo-small.js} (100%)
 rename app/assets/javascripts/wizard/components/{image-preview-logo.js.es6 => image-preview-logo.js} (100%)
 rename app/assets/javascripts/wizard/components/{invite-list-user.js.es6 => invite-list-user.js} (100%)
 rename app/assets/javascripts/wizard/components/{invite-list.js.es6 => invite-list.js} (100%)
 rename app/assets/javascripts/wizard/components/{popular-themes.js.es6 => popular-themes.js} (100%)
 rename app/assets/javascripts/wizard/components/{radio-button.js.es6 => radio-button.js} (100%)
 rename app/assets/javascripts/wizard/components/{staff-count.js.es6 => staff-count.js} (100%)
 rename app/assets/javascripts/wizard/components/{theme-preview.js.es6 => theme-preview.js} (100%)
 rename app/assets/javascripts/wizard/components/{theme-previews.js.es6 => theme-previews.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-canvas.js.es6 => wizard-canvas.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-field-dropdown.js.es6 => wizard-field-dropdown.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-field-image.js.es6 => wizard-field-image.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-field-radio.js.es6 => wizard-field-radio.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-field-textarea.js.es6 => wizard-field-textarea.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-field.js.es6 => wizard-field.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-image-preview.js.es6 => wizard-image-preview.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-step-form.js.es6 => wizard-step-form.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-step.js.es6 => wizard-step.js} (100%)
 rename app/assets/javascripts/wizard/controllers/{application.js.es6 => application.js} (100%)
 rename app/assets/javascripts/wizard/controllers/{step.js.es6 => step.js} (100%)
 rename app/assets/javascripts/wizard/initializers/{load-helpers.js.es6 => load-helpers.js} (100%)
 rename app/assets/javascripts/wizard/lib/{ajax.js.es6 => ajax.js} (100%)
 rename app/assets/javascripts/wizard/lib/{preview.js.es6 => preview.js} (100%)
 rename app/assets/javascripts/wizard/mixins/{valid-state.js.es6 => valid-state.js} (100%)
 rename app/assets/javascripts/wizard/models/{step.js.es6 => step.js} (100%)
 rename app/assets/javascripts/wizard/models/{wizard-field.js.es6 => wizard-field.js} (100%)
 rename app/assets/javascripts/wizard/models/{wizard.js.es6 => wizard.js} (100%)
 rename app/assets/javascripts/wizard/{router.js.es6 => router.js} (100%)
 rename app/assets/javascripts/wizard/routes/{application.js.es6 => application.js} (100%)
 rename app/assets/javascripts/wizard/routes/{index.js.es6 => index.js} (100%)
 rename app/assets/javascripts/wizard/routes/{step.js.es6 => step.js} (100%)
 rename app/assets/javascripts/wizard/test/acceptance/{wizard-test.js.es6 => wizard-test.js} (100%)
 rename app/assets/javascripts/wizard/test/components/{invite-list-test.js.es6 => invite-list-test.js} (100%)
 rename app/assets/javascripts/wizard/test/helpers/{component-test.js.es6 => component-test.js} (100%)
 rename app/assets/javascripts/wizard/test/helpers/{start-app.js.es6 => start-app.js} (100%)
 rename app/assets/javascripts/wizard/test/models/{wizard-field-test.js.es6 => wizard-field-test.js} (100%)
 rename app/assets/javascripts/wizard/test/{wizard-pretender.js.es6 => wizard-pretender.js} (100%)
 rename app/assets/javascripts/wizard/{wizard.js.es6 => wizard.js} (100%)

diff --git a/app/assets/javascripts/wizard/components/homepage-preview.js.es6 b/app/assets/javascripts/wizard/components/homepage-preview.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/homepage-preview.js.es6
rename to app/assets/javascripts/wizard/components/homepage-preview.js
diff --git a/app/assets/javascripts/wizard/components/image-preview-favicon.js.es6 b/app/assets/javascripts/wizard/components/image-preview-favicon.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/image-preview-favicon.js.es6
rename to app/assets/javascripts/wizard/components/image-preview-favicon.js
diff --git a/app/assets/javascripts/wizard/components/image-preview-large-icon.js.es6 b/app/assets/javascripts/wizard/components/image-preview-large-icon.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/image-preview-large-icon.js.es6
rename to app/assets/javascripts/wizard/components/image-preview-large-icon.js
diff --git a/app/assets/javascripts/wizard/components/image-preview-logo-small.js.es6 b/app/assets/javascripts/wizard/components/image-preview-logo-small.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/image-preview-logo-small.js.es6
rename to app/assets/javascripts/wizard/components/image-preview-logo-small.js
diff --git a/app/assets/javascripts/wizard/components/image-preview-logo.js.es6 b/app/assets/javascripts/wizard/components/image-preview-logo.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/image-preview-logo.js.es6
rename to app/assets/javascripts/wizard/components/image-preview-logo.js
diff --git a/app/assets/javascripts/wizard/components/invite-list-user.js.es6 b/app/assets/javascripts/wizard/components/invite-list-user.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/invite-list-user.js.es6
rename to app/assets/javascripts/wizard/components/invite-list-user.js
diff --git a/app/assets/javascripts/wizard/components/invite-list.js.es6 b/app/assets/javascripts/wizard/components/invite-list.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/invite-list.js.es6
rename to app/assets/javascripts/wizard/components/invite-list.js
diff --git a/app/assets/javascripts/wizard/components/popular-themes.js.es6 b/app/assets/javascripts/wizard/components/popular-themes.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/popular-themes.js.es6
rename to app/assets/javascripts/wizard/components/popular-themes.js
diff --git a/app/assets/javascripts/wizard/components/radio-button.js.es6 b/app/assets/javascripts/wizard/components/radio-button.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/radio-button.js.es6
rename to app/assets/javascripts/wizard/components/radio-button.js
diff --git a/app/assets/javascripts/wizard/components/staff-count.js.es6 b/app/assets/javascripts/wizard/components/staff-count.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/staff-count.js.es6
rename to app/assets/javascripts/wizard/components/staff-count.js
diff --git a/app/assets/javascripts/wizard/components/theme-preview.js.es6 b/app/assets/javascripts/wizard/components/theme-preview.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/theme-preview.js.es6
rename to app/assets/javascripts/wizard/components/theme-preview.js
diff --git a/app/assets/javascripts/wizard/components/theme-previews.js.es6 b/app/assets/javascripts/wizard/components/theme-previews.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/theme-previews.js.es6
rename to app/assets/javascripts/wizard/components/theme-previews.js
diff --git a/app/assets/javascripts/wizard/components/wizard-canvas.js.es6 b/app/assets/javascripts/wizard/components/wizard-canvas.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-canvas.js.es6
rename to app/assets/javascripts/wizard/components/wizard-canvas.js
diff --git a/app/assets/javascripts/wizard/components/wizard-field-dropdown.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-dropdown.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-field-dropdown.js.es6
rename to app/assets/javascripts/wizard/components/wizard-field-dropdown.js
diff --git a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-image.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-field-image.js.es6
rename to app/assets/javascripts/wizard/components/wizard-field-image.js
diff --git a/app/assets/javascripts/wizard/components/wizard-field-radio.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-radio.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-field-radio.js.es6
rename to app/assets/javascripts/wizard/components/wizard-field-radio.js
diff --git a/app/assets/javascripts/wizard/components/wizard-field-textarea.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-textarea.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-field-textarea.js.es6
rename to app/assets/javascripts/wizard/components/wizard-field-textarea.js
diff --git a/app/assets/javascripts/wizard/components/wizard-field.js.es6 b/app/assets/javascripts/wizard/components/wizard-field.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-field.js.es6
rename to app/assets/javascripts/wizard/components/wizard-field.js
diff --git a/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6 b/app/assets/javascripts/wizard/components/wizard-image-preview.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-image-preview.js.es6
rename to app/assets/javascripts/wizard/components/wizard-image-preview.js
diff --git a/app/assets/javascripts/wizard/components/wizard-step-form.js.es6 b/app/assets/javascripts/wizard/components/wizard-step-form.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-step-form.js.es6
rename to app/assets/javascripts/wizard/components/wizard-step-form.js
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js.es6 b/app/assets/javascripts/wizard/components/wizard-step.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-step.js.es6
rename to app/assets/javascripts/wizard/components/wizard-step.js
diff --git a/app/assets/javascripts/wizard/controllers/application.js.es6 b/app/assets/javascripts/wizard/controllers/application.js
similarity index 100%
rename from app/assets/javascripts/wizard/controllers/application.js.es6
rename to app/assets/javascripts/wizard/controllers/application.js
diff --git a/app/assets/javascripts/wizard/controllers/step.js.es6 b/app/assets/javascripts/wizard/controllers/step.js
similarity index 100%
rename from app/assets/javascripts/wizard/controllers/step.js.es6
rename to app/assets/javascripts/wizard/controllers/step.js
diff --git a/app/assets/javascripts/wizard/initializers/load-helpers.js.es6 b/app/assets/javascripts/wizard/initializers/load-helpers.js
similarity index 100%
rename from app/assets/javascripts/wizard/initializers/load-helpers.js.es6
rename to app/assets/javascripts/wizard/initializers/load-helpers.js
diff --git a/app/assets/javascripts/wizard/lib/ajax.js.es6 b/app/assets/javascripts/wizard/lib/ajax.js
similarity index 100%
rename from app/assets/javascripts/wizard/lib/ajax.js.es6
rename to app/assets/javascripts/wizard/lib/ajax.js
diff --git a/app/assets/javascripts/wizard/lib/preview.js.es6 b/app/assets/javascripts/wizard/lib/preview.js
similarity index 100%
rename from app/assets/javascripts/wizard/lib/preview.js.es6
rename to app/assets/javascripts/wizard/lib/preview.js
diff --git a/app/assets/javascripts/wizard/mixins/valid-state.js.es6 b/app/assets/javascripts/wizard/mixins/valid-state.js
similarity index 100%
rename from app/assets/javascripts/wizard/mixins/valid-state.js.es6
rename to app/assets/javascripts/wizard/mixins/valid-state.js
diff --git a/app/assets/javascripts/wizard/models/step.js.es6 b/app/assets/javascripts/wizard/models/step.js
similarity index 100%
rename from app/assets/javascripts/wizard/models/step.js.es6
rename to app/assets/javascripts/wizard/models/step.js
diff --git a/app/assets/javascripts/wizard/models/wizard-field.js.es6 b/app/assets/javascripts/wizard/models/wizard-field.js
similarity index 100%
rename from app/assets/javascripts/wizard/models/wizard-field.js.es6
rename to app/assets/javascripts/wizard/models/wizard-field.js
diff --git a/app/assets/javascripts/wizard/models/wizard.js.es6 b/app/assets/javascripts/wizard/models/wizard.js
similarity index 100%
rename from app/assets/javascripts/wizard/models/wizard.js.es6
rename to app/assets/javascripts/wizard/models/wizard.js
diff --git a/app/assets/javascripts/wizard/router.js.es6 b/app/assets/javascripts/wizard/router.js
similarity index 100%
rename from app/assets/javascripts/wizard/router.js.es6
rename to app/assets/javascripts/wizard/router.js
diff --git a/app/assets/javascripts/wizard/routes/application.js.es6 b/app/assets/javascripts/wizard/routes/application.js
similarity index 100%
rename from app/assets/javascripts/wizard/routes/application.js.es6
rename to app/assets/javascripts/wizard/routes/application.js
diff --git a/app/assets/javascripts/wizard/routes/index.js.es6 b/app/assets/javascripts/wizard/routes/index.js
similarity index 100%
rename from app/assets/javascripts/wizard/routes/index.js.es6
rename to app/assets/javascripts/wizard/routes/index.js
diff --git a/app/assets/javascripts/wizard/routes/step.js.es6 b/app/assets/javascripts/wizard/routes/step.js
similarity index 100%
rename from app/assets/javascripts/wizard/routes/step.js.es6
rename to app/assets/javascripts/wizard/routes/step.js
diff --git a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6 b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
rename to app/assets/javascripts/wizard/test/acceptance/wizard-test.js
diff --git a/app/assets/javascripts/wizard/test/components/invite-list-test.js.es6 b/app/assets/javascripts/wizard/test/components/invite-list-test.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/components/invite-list-test.js.es6
rename to app/assets/javascripts/wizard/test/components/invite-list-test.js
diff --git a/app/assets/javascripts/wizard/test/helpers/component-test.js.es6 b/app/assets/javascripts/wizard/test/helpers/component-test.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/helpers/component-test.js.es6
rename to app/assets/javascripts/wizard/test/helpers/component-test.js
diff --git a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6 b/app/assets/javascripts/wizard/test/helpers/start-app.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/helpers/start-app.js.es6
rename to app/assets/javascripts/wizard/test/helpers/start-app.js
diff --git a/app/assets/javascripts/wizard/test/models/wizard-field-test.js.es6 b/app/assets/javascripts/wizard/test/models/wizard-field-test.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/models/wizard-field-test.js.es6
rename to app/assets/javascripts/wizard/test/models/wizard-field-test.js
diff --git a/app/assets/javascripts/wizard/test/wizard-pretender.js.es6 b/app/assets/javascripts/wizard/test/wizard-pretender.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/wizard-pretender.js.es6
rename to app/assets/javascripts/wizard/test/wizard-pretender.js
diff --git a/app/assets/javascripts/wizard/wizard.js.es6 b/app/assets/javascripts/wizard/wizard.js
similarity index 100%
rename from app/assets/javascripts/wizard/wizard.js.es6
rename to app/assets/javascripts/wizard/wizard.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 5ba3673b2f..e1530090de 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -39,7 +39,8 @@ class DiscourseJsProcessor
     relative_path.start_with?("app/assets/javascripts/discourse/") ||
       relative_path.start_with?("app/assets/javascripts/admin/") ||
       relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
-      relative_path.start_with?("app/assets/javascripts/select-kit/")
+      relative_path.start_with?("app/assets/javascripts/select-kit/") ||
+      relative_path.start_with?("app/assets/javascripts/wizard/")
   end
 
   def self.skip_module?(data)

From 37ed6d5a0e0dbd919d5aea9bcb249f9c17afb9bc Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 23 Mar 2020 14:15:53 -0400
Subject: [PATCH 219/633] Ignore wizard es6 rename

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index cc4b81d793..10aef88535 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -19,3 +19,6 @@ c15056650647e8650288f973d9038500dc9cf7bb
 
 # Rename select kit from es6 -> js
 acc5cbdf8ecb9293a0fa9474ee73baf499c02428
+
+# Rename wizard from es6 -> js
+1ac02422011f89716ab27250d39b0e0212e03892

From 7f3bb06ac733f90c3c894ea735b9cfd3180c1609 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 23 Mar 2020 14:25:25 -0400
Subject: [PATCH 220/633] FIX: Wizard tests were missing

---
 app/assets/javascripts/wizard/test/test_helper.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index 50ed3d4afd..5835ba12ba 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -1,3 +1,4 @@
+// discourse-skip-module
 /*global document, sinon, Logster, QUnit */
 
 //= require env

From 8b7dc35e7687f1d2ea85c5c835f3c3c04a1b8a3a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2020 14:27:51 -0400
Subject: [PATCH 221/633] Build(deps): Bump sidekiq from 6.0.5 to 6.0.6 (#9258)

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.5 to 6.0.6.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.0.5...v6.0.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0bdf3adf50..87f3b6d817 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -374,7 +374,7 @@ GEM
       activesupport (>= 3.1)
     shoulda-matchers (4.3.0)
       activesupport (>= 4.2.0)
-    sidekiq (6.0.5)
+    sidekiq (6.0.6)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       rack-protection (>= 2.0.0)

From 27641f21e4c7a3294ac14408cdc5fd266f8d899c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 23 Mar 2020 15:05:03 -0400
Subject: [PATCH 222/633] Migrate `discourse-common` from es6 -> js

---
 .../config/{environment.js.es6 => environment.js}            | 0
 .../helpers/{bound-i18n.js.es6 => bound-i18n.js}             | 0
 ...ent-for-collection.js.es6 => component-for-collection.js} | 0
 .../{component-for-row.js.es6 => component-for-row.js}       | 0
 .../discourse-common/helpers/{d-icon.js.es6 => d-icon.js}    | 0
 .../discourse-common/helpers/{fa-icon.js.es6 => fa-icon.js}  | 0
 .../discourse-common/helpers/{get-url.js.es6 => get-url.js}  | 0
 .../helpers/{html-safe.js.es6 => html-safe.js}               | 0
 .../discourse-common/helpers/{i18n.js.es6 => i18n.js}        | 0
 .../helpers/{popular-themes.js.es6 => popular-themes.js}     | 0
 .../lib/{attribute-hook.js.es6 => attribute-hook.js}         | 0
 .../lib/{deprecated.js.es6 => deprecated.js}                 | 0
 .../discourse-common/lib/{get-owner.js.es6 => get-owner.js}  | 5 +++--
 .../discourse-common/lib/{get-url.js.es6 => get-url.js}      | 0
 .../discourse-common/lib/{helpers.js.es6 => helpers.js}      | 0
 .../lib/{icon-library.js.es6 => icon-library.js}             | 0
 ...w-handlebars-helpers.js.es6 => raw-handlebars-helpers.js} | 0
 .../lib/{raw-handlebars.js.es6 => raw-handlebars.js}         | 0
 .../mixins/{focus-event.js.es6 => focus-event.js}            | 0
 .../discourse-common/{resolver.js.es6 => resolver.js}        | 0
 .../utils/{decorators.js.es6 => decorators.js}               | 1 +
 lib/discourse_js_processor.rb                                | 3 ++-
 lib/freedom_patches/raw_handlebars.rb                        | 2 +-
 23 files changed, 7 insertions(+), 4 deletions(-)
 rename app/assets/javascripts/discourse-common/config/{environment.js.es6 => environment.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{bound-i18n.js.es6 => bound-i18n.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{component-for-collection.js.es6 => component-for-collection.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{component-for-row.js.es6 => component-for-row.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{d-icon.js.es6 => d-icon.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{fa-icon.js.es6 => fa-icon.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{get-url.js.es6 => get-url.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{html-safe.js.es6 => html-safe.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{i18n.js.es6 => i18n.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{popular-themes.js.es6 => popular-themes.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{attribute-hook.js.es6 => attribute-hook.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{deprecated.js.es6 => deprecated.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{get-owner.js.es6 => get-owner.js} (85%)
 rename app/assets/javascripts/discourse-common/lib/{get-url.js.es6 => get-url.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{helpers.js.es6 => helpers.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{icon-library.js.es6 => icon-library.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{raw-handlebars-helpers.js.es6 => raw-handlebars-helpers.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{raw-handlebars.js.es6 => raw-handlebars.js} (100%)
 rename app/assets/javascripts/discourse-common/mixins/{focus-event.js.es6 => focus-event.js} (100%)
 rename app/assets/javascripts/discourse-common/{resolver.js.es6 => resolver.js} (100%)
 rename app/assets/javascripts/discourse-common/utils/{decorators.js.es6 => decorators.js} (99%)

diff --git a/app/assets/javascripts/discourse-common/config/environment.js.es6 b/app/assets/javascripts/discourse-common/config/environment.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/config/environment.js.es6
rename to app/assets/javascripts/discourse-common/config/environment.js
diff --git a/app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/bound-i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6
rename to app/assets/javascripts/discourse-common/helpers/bound-i18n.js
diff --git a/app/assets/javascripts/discourse-common/helpers/component-for-collection.js.es6 b/app/assets/javascripts/discourse-common/helpers/component-for-collection.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/component-for-collection.js.es6
rename to app/assets/javascripts/discourse-common/helpers/component-for-collection.js
diff --git a/app/assets/javascripts/discourse-common/helpers/component-for-row.js.es6 b/app/assets/javascripts/discourse-common/helpers/component-for-row.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/component-for-row.js.es6
rename to app/assets/javascripts/discourse-common/helpers/component-for-row.js
diff --git a/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/d-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/d-icon.js.es6
rename to app/assets/javascripts/discourse-common/helpers/d-icon.js
diff --git a/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/fa-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
rename to app/assets/javascripts/discourse-common/helpers/fa-icon.js
diff --git a/app/assets/javascripts/discourse-common/helpers/get-url.js.es6 b/app/assets/javascripts/discourse-common/helpers/get-url.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/get-url.js.es6
rename to app/assets/javascripts/discourse-common/helpers/get-url.js
diff --git a/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6 b/app/assets/javascripts/discourse-common/helpers/html-safe.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
rename to app/assets/javascripts/discourse-common/helpers/html-safe.js
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/i18n.js.es6
rename to app/assets/javascripts/discourse-common/helpers/i18n.js
diff --git a/app/assets/javascripts/discourse-common/helpers/popular-themes.js.es6 b/app/assets/javascripts/discourse-common/helpers/popular-themes.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/popular-themes.js.es6
rename to app/assets/javascripts/discourse-common/helpers/popular-themes.js
diff --git a/app/assets/javascripts/discourse-common/lib/attribute-hook.js.es6 b/app/assets/javascripts/discourse-common/lib/attribute-hook.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/attribute-hook.js.es6
rename to app/assets/javascripts/discourse-common/lib/attribute-hook.js
diff --git a/app/assets/javascripts/discourse-common/lib/deprecated.js.es6 b/app/assets/javascripts/discourse-common/lib/deprecated.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/deprecated.js.es6
rename to app/assets/javascripts/discourse-common/lib/deprecated.js
diff --git a/app/assets/javascripts/discourse-common/lib/get-owner.js.es6 b/app/assets/javascripts/discourse-common/lib/get-owner.js
similarity index 85%
rename from app/assets/javascripts/discourse-common/lib/get-owner.js.es6
rename to app/assets/javascripts/discourse-common/lib/get-owner.js
index 38b75b80a0..0fd653bb9b 100644
--- a/app/assets/javascripts/discourse-common/lib/get-owner.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/get-owner.js
@@ -1,8 +1,9 @@
 import deprecated from "discourse-common/lib/deprecated";
+import { getOwner as emberGetOwner } from "@ember/application";
 
 export function getOwner(obj) {
-  if (Ember.getOwner) {
-    return Ember.getOwner(obj) || Discourse.__container__;
+  if (emberGetOwner) {
+    return emberGetOwner(obj) || Discourse.__container__;
   }
 
   return obj.container;
diff --git a/app/assets/javascripts/discourse-common/lib/get-url.js.es6 b/app/assets/javascripts/discourse-common/lib/get-url.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/get-url.js.es6
rename to app/assets/javascripts/discourse-common/lib/get-url.js
diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/helpers.js.es6
rename to app/assets/javascripts/discourse-common/lib/helpers.js
diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 b/app/assets/javascripts/discourse-common/lib/icon-library.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/icon-library.js.es6
rename to app/assets/javascripts/discourse-common/lib/icon-library.js
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js.es6
rename to app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
rename to app/assets/javascripts/discourse-common/lib/raw-handlebars.js
diff --git a/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6 b/app/assets/javascripts/discourse-common/mixins/focus-event.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
rename to app/assets/javascripts/discourse-common/mixins/focus-event.js
diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/resolver.js.es6
rename to app/assets/javascripts/discourse-common/resolver.js
diff --git a/app/assets/javascripts/discourse-common/utils/decorators.js.es6 b/app/assets/javascripts/discourse-common/utils/decorators.js
similarity index 99%
rename from app/assets/javascripts/discourse-common/utils/decorators.js.es6
rename to app/assets/javascripts/discourse-common/utils/decorators.js
index 3339eb03fa..36e537a063 100644
--- a/app/assets/javascripts/discourse-common/utils/decorators.js.es6
+++ b/app/assets/javascripts/discourse-common/utils/decorators.js
@@ -41,6 +41,7 @@ export function readOnly(target, name, desc) {
 
 import decoratorAlias from "ember-addons/decorator-alias";
 
+/* eslint-disable */
 export var on = decoratorAlias(Ember.on, "Can not `on` without event names");
 export var observes = decoratorAlias(
   Ember.observer,
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index e1530090de..d2d671e0ac 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -40,7 +40,8 @@ class DiscourseJsProcessor
       relative_path.start_with?("app/assets/javascripts/admin/") ||
       relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
       relative_path.start_with?("app/assets/javascripts/select-kit/") ||
-      relative_path.start_with?("app/assets/javascripts/wizard/")
+      relative_path.start_with?("app/assets/javascripts/wizard/") ||
+      relative_path.start_with?("app/assets/javascripts/discourse-common/")
   end
 
   def self.skip_module?(data)
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index 488061fb56..0f4a0bd8f7 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -11,7 +11,7 @@ class Barber::Precompiler
   def precompiler
     if !@precompiler
 
-      source = File.read("#{Rails.root}/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6")
+      source = File.read("#{Rails.root}/app/assets/javascripts/discourse-common/lib/raw-handlebars.js")
       transpiler = DiscourseJsProcessor::Transpiler.new(skip_module: true)
       transpiled = transpiler.perform(source)
 

From 4ecf0be93ddfba10c3711ef2afdedaeba7533c1e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 23 Mar 2020 15:05:37 -0400
Subject: [PATCH 223/633] Don't blame these renames

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 10aef88535..3e7bf97bb8 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -22,3 +22,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # Rename wizard from es6 -> js
 1ac02422011f89716ab27250d39b0e0212e03892
+
+# Rename discourse-common es6 -> js
+167503ca4824e37a2e93d74b3f50271556d0ba8e

From dc1836573d96768b4cc685c52c2c15aeac9f069e Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Tue, 24 Mar 2020 01:13:25 +0530
Subject: [PATCH 224/633] UX: display avatar flair in categories route topic
 list items (#9197)

---
 app/assets/javascripts/discourse/models/topic.js   | 14 ++++++++++++--
 .../components/latest-topic-list-item.hbs          | 11 +++++++++--
 .../templates/mobile/list/topic-list-item.hbr      |  2 +-
 .../stylesheets/desktop/latest-topic-list.scss     |  6 ++++++
 .../category_and_topic_lists_serializer.rb         | 11 +++++++++++
 5 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index a3c9ee26c6..ea118dbc7a 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -63,9 +63,19 @@ const Topic = RestModel.extend({
       const latest = posters.filter(
         p => p.extras && p.extras.indexOf("latest") >= 0
       )[0];
-      user = latest && latest.user;
+      user = latest;
     }
-    return user || this.creator;
+    return user || posters.firstObject;
+  },
+
+  @discourseComputed("lastPoster")
+  lastPosterUser(poster) {
+    return poster.user;
+  },
+
+  @discourseComputed("lastPoster")
+  lastPosterGroup(poster) {
+    return poster.primary_group;
   },
 
   @discourseComputed("posters.[]", "participants.[]", "allowed_user_count")
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
index a1f459f725..c071eaaef1 100644
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
@@ -1,7 +1,14 @@
 <div class='topic-poster'>
-  {{#user-link user=topic.lastPoster}}
-    {{avatar topic.lastPoster imageSize="large"}}
+  {{#user-link user=topic.lastPosterUser}}
+    {{avatar topic.lastPosterUser imageSize="large"}}
   {{/user-link}}
+  {{#if topic.lastPosterGroup}}
+    {{avatar-flair
+      flairURL=topic.lastPosterGroup.flair_url
+      flairBgColor=topic.lastPosterGroup.flair_bg_color
+      flairColor=topic.lastPosterGroup.flair_color
+      groupName=topic.lastPosterGroup.name}}
+  {{/if}}
 </div>
 <div class='main-link'>
   <div class='top-row'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
index 727c8382d8..07acb21db6 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
@@ -1,7 +1,7 @@
 <td>
   {{~#unless expandPinned}}
   <div class='pull-left'>
-    <a href="{{topic.lastPostUrl}}" data-user-card="{{topic.last_poster_username}}">{{avatar topic.lastPoster imageSize="large"}}</a>
+    <a href="{{topic.lastPostUrl}}" data-user-card="{{topic.last_poster_username}}">{{avatar topic.lastPosterUser imageSize="large"}}</a>
   </div>
   <div class='right'>
     {{else}}
diff --git a/app/assets/stylesheets/desktop/latest-topic-list.scss b/app/assets/stylesheets/desktop/latest-topic-list.scss
index 490023dc6f..6169e0830f 100644
--- a/app/assets/stylesheets/desktop/latest-topic-list.scss
+++ b/app/assets/stylesheets/desktop/latest-topic-list.scss
@@ -21,7 +21,13 @@
   align-items: center;
 
   .topic-poster {
+    position: relative;
     width: 60px;
+    .avatar-flair {
+      position: absolute;
+      bottom: 0;
+      right: 10px;
+    }
   }
   .main-link {
     @extend .topic-list-main-link;
diff --git a/app/serializers/category_and_topic_lists_serializer.rb b/app/serializers/category_and_topic_lists_serializer.rb
index 568ac1255a..edea6be090 100644
--- a/app/serializers/category_and_topic_lists_serializer.rb
+++ b/app/serializers/category_and_topic_lists_serializer.rb
@@ -4,6 +4,7 @@ class CategoryAndTopicListsSerializer < ApplicationSerializer
   has_one :category_list, serializer: CategoryListSerializer, embed: :objects
   has_one :topic_list, serializer: TopicListSerializer, embed: :objects
   has_many :users, serializer: BasicUserSerializer, embed: :objects
+  has_many :primary_groups, serializer: PrimaryGroupSerializer, embed: :objects
 
   def users
     users = object.topic_list.topics.map do |t|
@@ -15,4 +16,14 @@ class CategoryAndTopicListsSerializer < ApplicationSerializer
     users
   end
 
+  def primary_groups
+    groups = object.topic_list.topics.map do |t|
+      t.posters.map { |poster| poster.try(:primary_group) }
+    end
+    groups.flatten!
+    groups.compact!
+    groups.uniq!(&:id)
+    groups
+  end
+
 end

From 4b8acce92bc791b538b4a83bd07cddf180cd91db Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 5 Mar 2020 17:33:25 -0800
Subject: [PATCH 225/633] FIX: Check for permalinks before showing the 404 page

Limitations: the user profile "open external links in new tab setting" is
slightly broken for "External URL" permalinks.

Remove the copy from the admin permalinks page stating that this doesn't work.
---
 app/assets/javascripts/discourse/lib/url.js   |  1 -
 .../javascripts/discourse/routes/unknown.js   | 20 +++++++--
 app/controllers/permalinks_controller.rb      | 26 ++++++++++-
 config/locales/client.en.yml                  |  2 +-
 config/routes.rb                              |  2 +
 .../acceptance/unknown-test.js.es6            | 45 ++++++++++++++++++-
 .../helpers/create-pretender.js.es6           | 11 +++--
 7 files changed, 93 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/url.js b/app/assets/javascripts/discourse/lib/url.js
index 7892abafd9..a475c4aec3 100644
--- a/app/assets/javascripts/discourse/lib/url.js
+++ b/app/assets/javascripts/discourse/lib/url.js
@@ -24,7 +24,6 @@ const SERVER_SIDE_ONLY = [
   /^\/posts\/\d+\/raw/,
   /^\/raw\/\d+/,
   /^\/wizard/,
-  /^\/go\//, // EXPERIMENTAL: https://meta.discourse.org/t/-/142605
   /\.rss$/,
   /\.json$/,
   /^\/admin\/upgrade$/,
diff --git a/app/assets/javascripts/discourse/routes/unknown.js b/app/assets/javascripts/discourse/routes/unknown.js
index 3df278df6f..28cba698d0 100644
--- a/app/assets/javascripts/discourse/routes/unknown.js
+++ b/app/assets/javascripts/discourse/routes/unknown.js
@@ -1,8 +1,22 @@
-import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
+import DiscourseURL from "discourse/lib/url";
+import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  model() {
-    return ajax("/404-body", { dataType: "html" });
+  model(params, transition) {
+    const path = params.path;
+    return ajax("/permalink-check.json", {
+      data: { path }
+    }).then(results => {
+      if (results.found) {
+        // Avoid polluting the history stack for external links
+        transition.abort();
+        DiscourseURL.routeTo(results.target_url);
+        return "";
+      } else {
+        // 404 body HTML
+        return results.html;
+      }
+    });
   }
 });
diff --git a/app/controllers/permalinks_controller.rb b/app/controllers/permalinks_controller.rb
index 260979614e..33f8d04c40 100644
--- a/app/controllers/permalinks_controller.rb
+++ b/app/controllers/permalinks_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PermalinksController < ApplicationController
-  skip_before_action :check_xhr, :preload_json
+  skip_before_action :check_xhr, :preload_json, only: [:show]
 
   def show
     url = request.fullpath
@@ -17,4 +17,28 @@ class PermalinksController < ApplicationController
     end
   end
 
+  def check
+    begin
+      raise Discourse::NotFound if params[:path].blank?
+
+      permalink = Permalink.find_by_url(params[:path])
+
+      raise Discourse::NotFound unless permalink
+
+      data = {
+        found: true,
+        internal: permalink.external_url.nil?,
+        target_url: permalink.target_url,
+      }
+
+      render json: MultiJson.dump(data)
+    rescue Discourse::NotFound
+      data = {
+        found: false,
+        html: build_not_found_page(status: 200),
+      }
+      render json: MultiJson.dump(data)
+    end
+  end
+
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 27d207efb7..4382448fea 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4578,7 +4578,7 @@ en:
 
       permalink:
         title: "Permalinks"
-        description: "Please note this only applies to external sources, links posted on your forum will not be redirected."
+        description: "Redirections to apply for URLs not known by the forum."
         url: "URL"
         topic_id: "Topic ID"
         topic_title: "Topic"
diff --git a/config/routes.rb b/config/routes.rb
index 7cde4b038e..8306dcc40a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -954,6 +954,8 @@ Discourse::Application.routes.draw do
 
   resources :csp_reports, only: [:create]
 
+  get "/permalink-check", to: 'permalinks#check'
+
   get "*url", to: 'permalinks#show', constraints: PermalinkConstraint.new
   end
 end
diff --git a/test/javascripts/acceptance/unknown-test.js.es6 b/test/javascripts/acceptance/unknown-test.js.es6
index 3283d362ee..abc4b0d955 100644
--- a/test/javascripts/acceptance/unknown-test.js.es6
+++ b/test/javascripts/acceptance/unknown-test.js.es6
@@ -1,8 +1,49 @@
 import { acceptance } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
 acceptance("Unknown");
 
-QUnit.test("Unknown URL", async assert => {
-  assert.expect(1);
+QUnit.test("Permalink Unknown URL", async assert => {
   await visit("/url-that-doesn't-exist");
   assert.ok(exists(".page-not-found"), "The not found content is present");
 });
+
+QUnit.test("Permalink URL to a Topic", async assert => {
+  pretender.get("/permalink-check.json", () => {
+    return [
+      200,
+      { "Content-Type": "application/json" },
+      {
+        found: true,
+        internal: true,
+        target_url: "/t/internationalization-localization/280"
+      }
+    ];
+  });
+
+  await visit("/viewtopic.php?f=8&t=280");
+  assert.ok(exists(".topic-post"));
+});
+
+QUnit.test("Permalink URL to a static page", async assert => {
+  pretender.get("/permalink-check.json", () => {
+    return [
+      200,
+      { "Content-Type": "application/json" },
+      {
+        found: true,
+        internal: true,
+        target_url: "/faq"
+      }
+    ];
+  });
+
+  await visit("/not-the-url-for-faq");
+
+  // body is outside of #ember-testing-container and needs to be targeted
+  // through document instead of find
+  assert.ok(
+    document.querySelector("body.static-faq"),
+    "routed to the faq page"
+  );
+  assert.ok(exists(".body-page"));
+});
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index 934b6a652b..d5e92e55ed 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -267,12 +267,11 @@ export function applyDefaultHandlers(pretender) {
   pretender.put("/t/:id/recover", success);
   pretender.put("/t/:id/publish", success);
 
-  pretender.get("/404-body", () => {
-    return [
-      200,
-      { "Content-Type": "text/html" },
-      "<div class='page-not-found'>not found</div>"
-    ];
+  pretender.get("/permalink-check.json", () => {
+    return response({
+      found: false,
+      html: "<div class='page-not-found'>not found</div>"
+    });
   });
 
   pretender.delete("/draft.json", success);

From b8b29e79ad5341ee5a3c533b990434cc4feb42b3 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 24 Mar 2020 11:39:09 +1000
Subject: [PATCH 226/633] FIX: Improve user timezone saving (#9230)

Based on issues identified in https://meta.discourse.org/t/improved-bookmarks-with-reminders/144542/20

* Implement the resolvedTimezone() function on the user model where we return the user's timezone if it has been set, or we guess it using moment and save it to the user using an update call if it has not yet been set. This covers the cases of users who do not log out/in often who will not get their timezone set via login. This also makes sure the guess + save is done in a non-obtrusive way not on every page -- only when it is needed.

* Before if a user's timezone was blank when they visited their profile page we were autofilling the dropdown with the guessed timezone from moment. However this was confusing as it would appear you have that timezone saved in the DB when you really didn't. Now we do not autofill the dropdown and added a button to automatically guess the current timezone to make everything more explicit.
---
 .../discourse/controllers/bookmark.js         |  2 +-
 .../controllers/preferences/profile.js        |  6 ++-
 .../javascripts/discourse/models/bookmark.js  |  2 +-
 .../javascripts/discourse/models/user.js      | 33 ++++++++++++++-
 .../discourse/routes/preferences-profile.js   |  5 ---
 .../templates/preferences/profile.hbs         |  1 +
 .../discourse/widgets/post-menu.js            |  2 +-
 app/assets/stylesheets/common/base/user.scss  |  4 ++
 config/locales/client.en.yml                  |  1 +
 .../controllers/bookmark-test.js.es6          | 40 ++++++++++++-------
 test/javascripts/models/user-test.js.es6      | 38 ++++++++++++++++++
 11 files changed, 109 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index ecafa0dd23..18a6112a25 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -45,7 +45,7 @@ export default Controller.extend(ModalFunctionality, {
       customReminderTime: null,
       lastCustomReminderDate: null,
       lastCustomReminderTime: null,
-      userTimezone: this.currentUser.timezone
+      userTimezone: this.currentUser.resolvedTimezone()
     });
 
     this.loadLastUsedCustomReminderDatetime();
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js b/app/assets/javascripts/discourse/controllers/preferences/profile.js
index 57d8759ac8..71992e99fd 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js
@@ -73,6 +73,10 @@ export default Controller.extend({
       );
     },
 
+    useCurrentTimezone() {
+      this.model.set("user_option.timezone", moment.tz.guess());
+    },
+
     save() {
       this.set("saved", false);
 
@@ -95,7 +99,7 @@ export default Controller.extend({
           // update the timezone in memory so we can use the new
           // one if we change routes without reloading the user
           if (this.currentUser.id === this.model.id) {
-            this.currentUser.timezone = this.model.user_option.timezone;
+            this.currentUser.changeTimezone(this.model.user_option.timezone);
           }
 
           cookAsync(model.get("bio_raw"))
diff --git a/app/assets/javascripts/discourse/models/bookmark.js b/app/assets/javascripts/discourse/models/bookmark.js
index 0473c10811..bb88e7da52 100644
--- a/app/assets/javascripts/discourse/models/bookmark.js
+++ b/app/assets/javascripts/discourse/models/bookmark.js
@@ -113,7 +113,7 @@ const Bookmark = RestModel.extend({
   formattedReminder(bookmarkReminderAt) {
     const currentUser = PreloadStore.get("currentUser");
     return moment
-      .tz(bookmarkReminderAt, currentUser.timezone || moment.tz.guess())
+      .tz(bookmarkReminderAt, currentUser.resolvedTimezone())
       .format(I18n.t("dates.long_with_year"));
   },
 
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index 421376609a..7b106d9206 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -840,10 +840,40 @@ const User = RestModel.extend({
       !secondFactorEnabled &&
       (enforce === "all" || (enforce === "staff" && staff))
     );
+  },
+
+  resolvedTimezone() {
+    if (this._timezone) {
+      return this._timezone;
+    }
+
+    this.changeTimezone(moment.tz.guess());
+    ajax(userPath(this.username + ".json"), {
+      type: "PUT",
+      dataType: "json",
+      data: { timezone: this._timezone }
+    });
+
+    return this._timezone;
+  },
+
+  changeTimezone(tz) {
+    this._timezone = tz;
   }
 });
 
 User.reopenClass(Singleton, {
+  munge(json) {
+    // timezone should not be directly accessed, use
+    // resolvedTimezone() and changeTimezone(tz)
+    if (!json._timezone) {
+      json._timezone = json.timezone;
+      delete json.timezone;
+    }
+
+    return json;
+  },
+
   // Find a `User` for a given username.
   findByUsername(username, options) {
     const user = User.create({ username: username });
@@ -852,7 +882,7 @@ User.reopenClass(Singleton, {
 
   // TODO: Use app.register and junk Singleton
   createCurrent() {
-    const userJson = PreloadStore.get("currentUser");
+    let userJson = PreloadStore.get("currentUser");
 
     if (userJson && userJson.primary_group_id) {
       const primaryGroup = userJson.groups.find(
@@ -864,6 +894,7 @@ User.reopenClass(Singleton, {
     }
 
     if (userJson) {
+      userJson = User.munge(userJson);
       const store = Discourse.__container__.lookup("service:store");
       return store.createRecord("user", userJson);
     }
diff --git a/app/assets/javascripts/discourse/routes/preferences-profile.js b/app/assets/javascripts/discourse/routes/preferences-profile.js
index 02eb4df866..fb9a2ff527 100644
--- a/app/assets/javascripts/discourse/routes/preferences-profile.js
+++ b/app/assets/javascripts/discourse/routes/preferences-profile.js
@@ -1,13 +1,8 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
-import { set } from "@ember/object";
 
 export default RestrictedUserRoute.extend({
   showFooter: true,
   setupController(controller, model) {
-    if (!model.user_option.timezone) {
-      set(model, "user_option.timezone", moment.tz.guess());
-    }
-
     controller.set("model", model);
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index f07c8a9a38..fded99a5fd 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -14,6 +14,7 @@
     onChange=(action (mut model.user_option.timezone))
     class="input-xxlarge"
   }}
+  {{d-button icon="globe" label="user.use_current_timezone" action=(action "useCurrentTimezone") }}
 </div>
 
 <div class="control-group pref-location">
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js b/app/assets/javascripts/discourse/widgets/post-menu.js
index 95c3477ffd..c21d60f698 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js
@@ -315,7 +315,7 @@ registerButton("bookmarkWithReminder", (attrs, state, siteSettings) => {
 
     if (attrs.bookmarkReminderAt) {
       let reminderAtDate = moment(attrs.bookmarkReminderAt).tz(
-        Discourse.currentUser.timezone
+        Discourse.currentUser.resolvedTimezone()
       );
       title = "bookmarks.created_with_reminder";
       titleOptions = {
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index ae62bc5fdf..c06f4fc655 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -724,3 +724,7 @@
     }
   }
 }
+
+.timezone-input {
+  margin-bottom: 0.5em;
+}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4382448fea..9f72e5b3d8 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -846,6 +846,7 @@ en:
         clear:
           title: "Clear"
           warning: "Are you sure you want to clear your featured topic?"
+      use_current_timezone: "Use Current Timezone"
       profile_hidden: "This user's public profile is hidden."
       expand_profile: "Expand"
       collapse_profile: "Collapse"
diff --git a/test/javascripts/controllers/bookmark-test.js.es6 b/test/javascripts/controllers/bookmark-test.js.es6
index 978b7cd19f..c517ad2a89 100644
--- a/test/javascripts/controllers/bookmark-test.js.es6
+++ b/test/javascripts/controllers/bookmark-test.js.es6
@@ -1,10 +1,11 @@
-import { currentUser } from "helpers/qunit-helpers";
+import { logIn } from "helpers/qunit-helpers";
+import User from "discourse/models/user";
 let BookmarkController;
 
 moduleFor("controller:bookmark", {
   beforeEach() {
-    Discourse.currentUser = currentUser();
-    BookmarkController = this.subject({ currentUser: Discourse.currentUser });
+    logIn();
+    BookmarkController = this.subject({ currentUser: User.current() });
   },
 
   afterEach() {
@@ -119,7 +120,7 @@ QUnit.test(
   function(assert) {
     let dt = moment.tz(
       "2019-12-11T11:37:16",
-      BookmarkController.currentUser.timezone
+      BookmarkController.currentUser.resolvedTimezone()
     );
 
     assert.equal(
@@ -181,14 +182,23 @@ QUnit.test(
   }
 );
 
-QUnit.test(
-  "userHasTimezoneSet updates true/false based on whether the current user timezone is set globally",
-  function(assert) {
-    Discourse.currentUser.timezone = null;
-    BookmarkController.onShow();
-    assert.equal(BookmarkController.userHasTimezoneSet, false);
-    Discourse.currentUser.timezone = "Australia/Brisbane";
-    BookmarkController.onShow();
-    assert.equal(BookmarkController.userHasTimezoneSet, true);
-  }
-);
+QUnit.test("user timezone updates when the modal is shown", function(assert) {
+  User.current().changeTimezone(null);
+  let stub = sandbox.stub(moment.tz, "guess").returns("Europe/Moscow");
+  BookmarkController.onShow();
+  assert.equal(BookmarkController.userHasTimezoneSet, true);
+  assert.equal(
+    BookmarkController.userTimezone,
+    "Europe/Moscow",
+    "the user does not have their timezone set and a timezone is guessed"
+  );
+  User.current().changeTimezone("Australia/Brisbane");
+  BookmarkController.onShow();
+  assert.equal(BookmarkController.userHasTimezoneSet, true);
+  assert.equal(
+    BookmarkController.userTimezone,
+    "Australia/Brisbane",
+    "the user does their timezone set"
+  );
+  stub.restore();
+});
diff --git a/test/javascripts/models/user-test.js.es6 b/test/javascripts/models/user-test.js.es6
index 20ef656cf2..4675043adf 100644
--- a/test/javascripts/models/user-test.js.es6
+++ b/test/javascripts/models/user-test.js.es6
@@ -1,5 +1,7 @@
 import User from "discourse/models/user";
 import Group from "discourse/models/group";
+import * as ajaxlib from "discourse/lib/ajax";
+import pretender from "helpers/create-pretender";
 
 QUnit.module("model:user");
 
@@ -66,3 +68,39 @@ QUnit.test("canMangeGroup", assert => {
     "a group owner should be able to manage the group"
   );
 });
+
+QUnit.test("resolvedTimezone", assert => {
+  const tz = "Australia/Brisbane";
+  let user = User.create({ timezone: tz, username: "chuck" });
+  let stub = sandbox.stub(moment.tz, "guess").returns("America/Chicago");
+
+  pretender.put("/u/chuck.json", () => {
+    return [200, { "Content-Type": "application/json" }, {}];
+  });
+
+  let spy = sandbox.spy(ajaxlib, "ajax");
+  assert.equal(
+    user.resolvedTimezone(),
+    tz,
+    "if the user already has a timezone return it"
+  );
+  assert.ok(
+    spy.notCalled,
+    "if the user already has a timezone do not call AJAX update"
+  );
+  user = User.create({ username: "chuck" });
+  assert.equal(
+    user.resolvedTimezone(),
+    "America/Chicago",
+    "if the user has no timezone guess it with moment"
+  );
+  assert.ok(
+    spy.calledWith("/u/chuck.json", {
+      type: "PUT",
+      dataType: "json",
+      data: { timezone: "America/Chicago" }
+    }),
+    "if the user has no timezone save it with an AJAX update"
+  );
+  stub.restore();
+});

From 9726a0e0b447d7137031190ccdd67cf5ca15c36a Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 24 Mar 2020 15:21:50 +1100
Subject: [PATCH 227/633] DEV: upgrade json gem and add explicit dependency

json is shipped out of sync with Ruby. Even though we use OJ for many things
we still use the json gem sometimes, this ensures we use the latest

https://github.com/discourse/discourse/blob/b8b29e79ad5341ee5a3c533b990434cc4feb42b3/config/initializers/100-oj.rb#L9-L9
---
 Gemfile      | 2 ++
 Gemfile.lock | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Gemfile b/Gemfile
index a1f8015d13..2c0ed01915 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,8 @@ else
   gem 'sprockets-rails'
 end
 
+gem 'json'
+
 # TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals
 # This is a desired upgrade we should get to.
 gem 'sprockets', '3.7.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 87f3b6d817..0ce536ba02 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -157,6 +157,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    json (2.3.0)
     jwt (2.2.1)
     kgio (2.11.3)
     libv8 (7.3.492.27.1)
@@ -467,6 +468,7 @@ DEPENDENCIES
   highline (~> 1.7.0)
   htmlentities
   http_accept_language
+  json
   listen
   lograge
   logstash-event

From ecda9dbf25ddfc32a6d0dbaec16a51c9f3fd1f62 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 24 Mar 2020 16:23:16 +1100
Subject: [PATCH 228/633] DEV: Bump annotate from 3.1.0 to 3.1.1 (#9261)

Bumps [annotate](https://github.com/ctran/annotate_models) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ctran/annotate_models/releases)
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ctran/annotate_models/compare/v3.1.0...v3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Very safe upgrade, annotate only used in dev
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0ce536ba02..46656e88a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
       zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    annotate (3.1.0)
+    annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.0)

From 4452817ed0078fad248772e2f10110251b06e78f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 24 Mar 2020 16:25:52 +1100
Subject: [PATCH 229/633] DEV: Bump pg from 1.2.2 to 1.2.3 (#9235)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Pretty safe, adds protection for 2 possible segfaults.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 46656e88a8..925a89aa68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -255,7 +255,7 @@ GEM
       parallel
     parser (2.7.0.4)
       ast (~> 2.4.0)
-    pg (1.2.2)
+    pg (1.2.3)
     progress (3.5.2)
     pry (0.12.2)
       coderay (~> 1.1.0)

From 58ae0d4bd9b7d75904f2524370e0516413738039 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 23 Mar 2020 22:28:07 -0700
Subject: [PATCH 230/633] DEV: Add test case for /srv/status probers (#9259)

---
 spec/components/middleware/request_tracker_spec.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index d6c413cb9d..f0b605b53e 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -79,10 +79,18 @@ describe Middleware::RequestTracker do
 
       Middleware::RequestTracker.log_request(data)
 
+      # /srv/status is never a tracked view because content-type is text/plain
+      data = Middleware::RequestTracker.get_data(env(
+        "HTTP_USER_AGENT" => "kube-probe/1.18",
+        "REQUEST_URI" => "/srv/status?shutdown_ok=1",
+      ), ["200", { "Content-Type" => 'text/plain' }], 0.1)
+
+      Middleware::RequestTracker.log_request(data)
+
       ApplicationRequest.write_cache!
 
-      expect(ApplicationRequest.http_total.first.count).to eq(3)
-      expect(ApplicationRequest.http_2xx.first.count).to eq(3)
+      expect(ApplicationRequest.http_total.first.count).to eq(4)
+      expect(ApplicationRequest.http_2xx.first.count).to eq(4)
 
       expect(ApplicationRequest.page_view_anon.first.count).to eq(2)
       expect(ApplicationRequest.page_view_crawler.first.count).to eq(1)

From 5b3bb4b2f007edbe6a81122f441787c08e59c99e Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 24 Mar 2020 16:47:40 +1100
Subject: [PATCH 231/633] DEV: upgrade Rails

Latest version of Rails contains compatibility fixes for Ruby 2.7 and some
minor security fixes we would like to have
---
 Gemfile      | 14 ++++++-------
 Gemfile.lock | 56 ++++++++++++++++++++++++++--------------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2c0ed01915..94b5dc86f4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,13 @@ else
   # this allows us to include the bits of rails we use without pieces we do not.
   #
   # To issue a rails update bump the version number here
-  gem 'actionmailer', '6.0.1'
-  gem 'actionpack', '6.0.1'
-  gem 'actionview', '6.0.1'
-  gem 'activemodel', '6.0.1'
-  gem 'activerecord', '6.0.1'
-  gem 'activesupport', '6.0.1'
-  gem 'railties', '6.0.1'
+  gem 'actionmailer', '6.0.2.2'
+  gem 'actionpack', '6.0.2.2'
+  gem 'actionview', '6.0.2.2'
+  gem 'activemodel', '6.0.2.2'
+  gem 'activerecord', '6.0.2.2'
+  gem 'activesupport', '6.0.2.2'
+  gem 'railties', '6.0.2.2'
   gem 'sprockets-rails'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 925a89aa68..6e92b23687 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.1)
-      actionpack (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
+    actionmailer (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.1)
-      actionview (= 6.0.1)
-      activesupport (= 6.0.1)
-      rack (~> 2.0)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -24,15 +24,15 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.1)
-      activesupport (= 6.0.1)
+    activejob (6.0.2.2)
+      activesupport (= 6.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activerecord (6.0.1)
-      activemodel (= 6.0.1)
-      activesupport (= 6.0.1)
-    activesupport (6.0.1)
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activerecord (6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -283,9 +283,9 @@ GEM
     rails_multisite (2.1.1)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
-    railties (6.0.1)
-      actionpack (= 6.0.1)
-      activesupport (= 6.0.1)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -423,14 +423,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (= 6.0.1)
-  actionpack (= 6.0.1)
-  actionview (= 6.0.1)
+  actionmailer (= 6.0.2.2)
+  actionpack (= 6.0.2.2)
+  actionview (= 6.0.2.2)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 6.0.1)
-  activerecord (= 6.0.1)
-  activesupport (= 6.0.1)
+  activemodel (= 6.0.2.2)
+  activerecord (= 6.0.2.2)
+  activesupport (= 6.0.2.2)
   addressable
   annotate
   aws-sdk-s3
@@ -510,7 +510,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-protection
   rails_multisite
-  railties (= 6.0.1)
+  railties (= 6.0.2.2)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)

From 46a962224621eef623e208f2810af67ad55553c9 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 24 Mar 2020 16:59:42 +1100
Subject: [PATCH 232/633] FIX: prevent scheduled publishing to deleted category

We missed a dependency which left timers firing on missing categories.

Co-authored-by: tshenry
---
 app/models/category.rb                      | 1 +
 spec/requests/categories_controller_spec.rb | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index bb4a8d5219..6e0a073a6b 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -42,6 +42,7 @@ class Category < ActiveRecord::Base
 
   has_many :category_groups, dependent: :destroy
   has_many :groups, through: :category_groups
+  has_many :topic_timers, dependent: :destroy
 
   has_and_belongs_to_many :web_hooks
 
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index ff5110a0ac..8451936ccc 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -46,7 +46,7 @@ describe CategoriesController do
     end
 
     it "respects permalinks before redirecting /category paths to /c paths" do
-      perm = Permalink.create!(url: "category/something", category_id: category.id)
+      _perm = Permalink.create!(url: "category/something", category_id: category.id)
 
       get "/category/something"
       expect(response.status).to eq(301)
@@ -218,11 +218,15 @@ describe CategoriesController do
 
       it "deletes the record" do
         sign_in(admin)
+
+        id = Fabricate(:topic_timer, category: category).id
+
         expect do
           delete "/categories/#{category.slug}.json"
         end.to change(Category, :count).by(-1)
         expect(response.status).to eq(200)
         expect(UserHistory.count).to eq(1)
+        expect(TopicTimer.where(id: id).exists?).to eq(false)
       end
     end
   end
@@ -321,7 +325,7 @@ describe CategoriesController do
       end
 
       it "returns 422 if email_in address is already in use for other category" do
-        other_category = Fabricate(:category, name: "Other", email_in: "mail@examle.com")
+        _other_category = Fabricate(:category, name: "Other", email_in: "mail@examle.com")
 
         put "/categories/#{category.id}.json", params: {
           name: "Email",

From c7151f0fd649a7a5025e22db38754be669aa4b17 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 24 Mar 2020 17:11:13 +1100
Subject: [PATCH 233/633] Revert "DEV: upgrade Rails"

This reverts commit 5b3bb4b2f007edbe6a81122f441787c08e59c99e.

This erratically breaks multisite operation, we need more debugging
---
 Gemfile      | 14 ++++++-------
 Gemfile.lock | 56 ++++++++++++++++++++++++++--------------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index 94b5dc86f4..2c0ed01915 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,13 @@ else
   # this allows us to include the bits of rails we use without pieces we do not.
   #
   # To issue a rails update bump the version number here
-  gem 'actionmailer', '6.0.2.2'
-  gem 'actionpack', '6.0.2.2'
-  gem 'actionview', '6.0.2.2'
-  gem 'activemodel', '6.0.2.2'
-  gem 'activerecord', '6.0.2.2'
-  gem 'activesupport', '6.0.2.2'
-  gem 'railties', '6.0.2.2'
+  gem 'actionmailer', '6.0.1'
+  gem 'actionpack', '6.0.1'
+  gem 'actionview', '6.0.1'
+  gem 'activemodel', '6.0.1'
+  gem 'activerecord', '6.0.1'
+  gem 'activesupport', '6.0.1'
+  gem 'railties', '6.0.1'
   gem 'sprockets-rails'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 6e92b23687..925a89aa68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
+    actionmailer (6.0.1)
+      actionpack (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.0.1)
+      actionview (= 6.0.1)
+      activesupport (= 6.0.1)
+      rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.0.1)
+      activesupport (= 6.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -24,15 +24,15 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    activejob (6.0.1)
+      activesupport (= 6.0.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activesupport (6.0.2.2)
+    activemodel (6.0.1)
+      activesupport (= 6.0.1)
+    activerecord (6.0.1)
+      activemodel (= 6.0.1)
+      activesupport (= 6.0.1)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -283,9 +283,9 @@ GEM
     rails_multisite (2.1.1)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.0.1)
+      actionpack (= 6.0.1)
+      activesupport (= 6.0.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -423,14 +423,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (= 6.0.2.2)
-  actionpack (= 6.0.2.2)
-  actionview (= 6.0.2.2)
+  actionmailer (= 6.0.1)
+  actionpack (= 6.0.1)
+  actionview (= 6.0.1)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 6.0.2.2)
-  activerecord (= 6.0.2.2)
-  activesupport (= 6.0.2.2)
+  activemodel (= 6.0.1)
+  activerecord (= 6.0.1)
+  activesupport (= 6.0.1)
   addressable
   annotate
   aws-sdk-s3
@@ -510,7 +510,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-protection
   rails_multisite
-  railties (= 6.0.2.2)
+  railties (= 6.0.1)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)

From bef8468510fe33ef1f89c982c11363a945b0f2c4 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Tue, 24 Mar 2020 13:04:46 +0530
Subject: [PATCH 234/633] Make qunit test code more clean.

45ce9876ccfeac0c51e5f32fb15bdcc9669204c5
---
 .../admin-customize-themes-show-test.js.es6   | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
index 3e9c0f9006..63a9453e36 100644
--- a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
@@ -8,18 +8,16 @@ moduleFor("controller:admin-customize-themes-show", {
   needs: ["controller:adminUser"]
 });
 
-const repoUrl = "https://github.com/discourse/discourse-brand-header.git";
-const remoteTheme = Theme.create({
-  id: 2,
-  default: true,
-  name: "default",
-  remote_theme: {
-    remote_url: repoUrl
-  }
-});
-
 QUnit.test("can display source url for remote themes", function(assert) {
-  delete remoteTheme["remote_theme"]["branch"];
+  const repoUrl = "https://github.com/discourse/discourse-brand-header.git";
+  const remoteTheme = Theme.create({
+    id: 2,
+    default: true,
+    name: "default",
+    remote_theme: {
+      remote_url: repoUrl
+    }
+  });
   const controller = this.subject({
     model: remoteTheme
   });
@@ -34,17 +32,22 @@ QUnit.test("can display source url for remote themes", function(assert) {
 QUnit.test("can display source url for remote theme branches", function(
   assert
 ) {
-  const branchUrl =
-    "https://github.com/discourse/discourse-brand-header/tree/beta";
-  remoteTheme["remote_theme"]["branch"] = "beta";
-
+  const remoteTheme = Theme.create({
+    id: 2,
+    default: true,
+    name: "default",
+    remote_theme: {
+      remote_url: "https://github.com/discourse/discourse-brand-header.git",
+      branch: "beta"
+    }
+  });
   const controller = this.subject({
     model: remoteTheme
   });
 
   assert.deepEqual(
     controller.get("remoteThemeLink"),
-    branchUrl,
+    "https://github.com/discourse/discourse-brand-header/tree/beta",
     "returns theme's repo URL to branch"
   );
 });

From d8640fd042d23ede3bbfbd4ae9a01fa16e5f2e0d Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 24 Mar 2020 11:12:52 +0200
Subject: [PATCH 235/633] DEV: Move requested_group_id custom field from post
 to topic (#9127)

Follow-up-to accbbded15974846523c3aeca85a59454e3f2f05
---
 .../discourse/lib/transform-post.js           |  4 +++
 .../javascripts/discourse/widgets/post.js     | 21 ++++++++++++++
 .../stylesheets/common/base/topic-post.scss   |  4 +++
 .../stylesheets/desktop/topic-post.scss       |  3 ++
 app/controllers/groups_controller.rb          |  2 +-
 app/serializers/basic_post_serializer.rb      | 29 +------------------
 app/serializers/topic_view_serializer.rb      | 20 ++++++++++++-
 config/locales/client.en.yml                  |  1 +
 config/locales/server.en.yml                  |  1 -
 lib/topic_view.rb                             |  2 +-
 spec/requests/groups_controller_spec.rb       |  2 +-
 .../serializers/basic_post_serializer_spec.rb | 23 ---------------
 test/javascripts/widgets/post-test.js.es6     | 15 ++++++++++
 13 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/transform-post.js b/app/assets/javascripts/discourse/lib/transform-post.js
index 09cb6d967c..585bb02af3 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js
+++ b/app/assets/javascripts/discourse/lib/transform-post.js
@@ -139,6 +139,10 @@ export default function transformPost(
     }
   }
 
+  if (post.post_number === 1 && topic.requested_group_name) {
+    postAtts.requestedGroupName = topic.requested_group_name;
+  }
+
   const showPMMap =
     topic.archetype === "private_message" && post.post_number === 1;
   if (showPMMap) {
diff --git a/app/assets/javascripts/discourse/widgets/post.js b/app/assets/javascripts/discourse/widgets/post.js
index bd84bfb428..c6fc4f3319 100644
--- a/app/assets/javascripts/discourse/widgets/post.js
+++ b/app/assets/javascripts/discourse/widgets/post.js
@@ -344,6 +344,22 @@ createWidget("expand-post-button", {
   }
 });
 
+createWidget("post-group-request", {
+  buildKey: attrs => `post-group-request-${attrs.id}`,
+
+  buildClasses() {
+    return ["group-request"];
+  },
+
+  html(attrs) {
+    const href = Discourse.getURL(
+      "/g/" + attrs.requestedGroupName + "/requests?filter=" + attrs.username
+    );
+
+    return h("a", { attributes: { href } }, I18n.t("groups.requests.handle"));
+  }
+});
+
 createWidget("post-contents", {
   buildKey: attrs => `post-contents-${attrs.id}`,
 
@@ -366,6 +382,11 @@ createWidget("post-contents", {
     let result = [
       new PostCooked(attrs, new DecoratorHelper(this), this.currentUser)
     ];
+
+    if (attrs.requestedGroupName) {
+      result.push(this.attach("post-group-request", attrs));
+    }
+
     result = result.concat(applyDecorators(this, "after-cooked", attrs, state));
 
     if (attrs.cooked_hidden) {
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index b458f04e37..2f028e3c5d 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -552,6 +552,10 @@ blockquote {
   .cooked {
     overflow: hidden;
   }
+  .group-request {
+    border-top: 1px solid $primary-low;
+    padding-top: 0.5em;
+  }
   &.highlighted {
     animation: background-fade-highlight 2.5s ease-out;
   }
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index a23e46d335..d404169fd8 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -613,6 +613,9 @@ blockquote {
   .cooked {
     padding: 0 $topic-body-width-padding 0.25em $topic-body-width-padding;
   }
+  .group-request {
+    padding: 0.5em $topic-body-width-padding 0 $topic-body-width-padding;
+  }
   a.expand-hidden {
     padding-left: $topic-body-width-padding;
   }
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 126d0910af..0df1f49012 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -439,7 +439,7 @@ class GroupsController < ApplicationController
       raw: params[:reason],
       archetype: Archetype.private_message,
       target_usernames: usernames.join(','),
-      custom_fields: { requested_group_id: group.id },
+      topic_opts: { custom_fields: { requested_group_id: group.id } },
       skip_validations: true
     ).create!
 
diff --git a/app/serializers/basic_post_serializer.rb b/app/serializers/basic_post_serializer.rb
index 32c14b5c72..3486c47bc2 100644
--- a/app/serializers/basic_post_serializer.rb
+++ b/app/serializers/basic_post_serializer.rb
@@ -40,34 +40,7 @@ class BasicPostSerializer < ApplicationSerializer
         I18n.t('flagging.user_must_edit')
       end
     else
-      cooked = object.filter_quotes(@parent_post)
-
-      if scope&.user
-
-        # PERF: this should not run on every post, only specific ones
-        # also, why is this in basic post serializer?
-        requested_group_id = post_custom_fields['requested_group_id'].to_i
-
-        if requested_group_id > 0
-          group = Group
-            .joins('JOIN group_users ON groups.id = group_users.group_id')
-            .find_by(
-              id: object.custom_fields['requested_group_id'].to_i,
-              group_users: { user_id: scope.user.id, owner: true }
-            )
-
-          if group
-            cooked << <<~EOF
-              <hr />
-              <a href="#{Discourse.base_uri}/g/#{group.name}/requests">
-                #{I18n.t('groups.request_membership_pm.handle')}
-              </a>
-            EOF
-          end
-        end
-      end
-
-      cooked
+      object.filter_quotes(@parent_post)
     end
   end
 
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index a0f37d3d70..824dfcb068 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -70,7 +70,8 @@ class TopicViewSerializer < ApplicationSerializer
     :destination_category_id,
     :pm_with_non_human_user,
     :queued_posts_count,
-    :show_read_indicator
+    :show_read_indicator,
+    :requested_group_name
   )
 
   has_one :details, serializer: TopicViewDetailsSerializer, root: false, embed: :objects
@@ -255,4 +256,21 @@ class TopicViewSerializer < ApplicationSerializer
   def show_read_indicator
     object.show_read_indicator?
   end
+
+  def requested_group_name
+    if scope&.user
+      group = Group
+        .joins('JOIN group_users ON groups.id = group_users.group_id')
+        .find_by(
+          id: object.topic.custom_fields['requested_group_id'].to_i,
+          group_users: { user_id: scope.user.id, owner: true }
+        )
+
+      group.name if group
+    end
+  end
+
+  def include_requested_group_name?
+    object.personal_message
+  end
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9f72e5b3d8..e9ad9aac7c 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -614,6 +614,7 @@ en:
         deny: "Deny"
         denied: "denied"
         undone: "request undone"
+        handle: "handle membership request"
       manage:
         title: "Manage"
         name: "Name"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d034819d16..6d1c849522 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -427,7 +427,6 @@ en:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Membership Request for @%{group_name}"
-      handle: "handle membership request"
     view_hidden_topic_request_reason: "I would like to join the group '%{group_name}', so I may access [this topic](%{topic_url})"
 
   education:
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 3123e19b46..94f31f44b1 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -35,7 +35,7 @@ class TopicView
   end
 
   def self.default_post_custom_fields
-    @default_post_custom_fields ||= [Post::NOTICE_TYPE, Post::NOTICE_ARGS, "action_code_who", "requested_group_id"]
+    @default_post_custom_fields ||= [Post::NOTICE_TYPE, Post::NOTICE_ARGS, "action_code_who"]
   end
 
   def self.post_custom_fields_whitelisters
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index f26f2483ee..381e247e42 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1479,7 +1479,7 @@ describe GroupsController do
       body = JSON.parse(response.body)
 
       expect(body['relative_url']).to eq(topic.relative_url)
-      expect(post.custom_fields['requested_group_id'].to_i).to eq(group.id)
+      expect(post.topic.custom_fields['requested_group_id'].to_i).to eq(group.id)
       expect(post.user).to eq(user)
 
       expect(topic.title).to eq(I18n.t('groups.request_membership_pm.title',
diff --git a/spec/serializers/basic_post_serializer_spec.rb b/spec/serializers/basic_post_serializer_spec.rb
index 04f70583c4..c390527ca1 100644
--- a/spec/serializers/basic_post_serializer_spec.rb
+++ b/spec/serializers/basic_post_serializer_spec.rb
@@ -22,27 +22,4 @@ describe BasicPostSerializer do
 
   end
 
-  context "cooked" do
-    it "includes membership requests" do
-      user = Fabricate(:user)
-      member = Fabricate(:user)
-      owner = Fabricate(:user)
-
-      group = Fabricate(:group)
-      group.add(member)
-      group.add_owner(owner)
-
-      post = Fabricate(:post, custom_fields: { requested_group_id: group.id })
-
-      json = BasicPostSerializer.new(post, scope: Guardian.new(user), root: false).as_json
-      expect(json[:cooked]).not_to include(I18n.t('groups.request_membership_pm.handle'))
-
-      json = BasicPostSerializer.new(post, scope: Guardian.new(member), root: false).as_json
-      expect(json[:cooked]).not_to include(I18n.t('groups.request_membership_pm.handle'))
-
-      json = BasicPostSerializer.new(post, scope: Guardian.new(owner), root: false).as_json
-      expect(json[:cooked]).to include(I18n.t('groups.request_membership_pm.handle'))
-    end
-  end
-
 end
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js.es6
index 23a7b17bdf..7c19c715e6 100644
--- a/test/javascripts/widgets/post-test.js.es6
+++ b/test/javascripts/widgets/post-test.js.es6
@@ -922,3 +922,18 @@ widgetTest("post notice - with name", {
     );
   }
 });
+
+widgetTest("show group request in post", {
+  template: '{{mount-widget widget="post" args=args}}',
+  beforeEach() {
+    this.set("args", {
+      username: "foo",
+      requestedGroupName: "testGroup"
+    });
+  },
+  test(assert) {
+    const link = find(".group-request a");
+    assert.equal(link.text().trim(), I18n.t("groups.requests.handle"));
+    assert.equal(link.attr("href"), "/g/testGroup/requests?filter=foo");
+  }
+});

From 61c1af0124a086d034ad7d5f8d92557a445e107a Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nenciu.bianca@gmail.com>
Date: Mon, 9 Mar 2020 22:04:05 +0200
Subject: [PATCH 236/633] SECURITY: Ensure user can see group and group members

---
 app/controllers/directory_items_controller.rb    |  7 ++++++-
 spec/requests/directory_items_controller_spec.rb | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index e6d6ea4b3c..5cf99b710c 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -12,7 +12,12 @@ class DirectoryItemsController < ApplicationController
     result = DirectoryItem.where(period_type: period_type).includes(:user)
 
     if params[:group]
-      result = result.includes(user: :groups).where(users: { groups: { name: params[:group] } })
+      group = Group.find_by(name: params[:group])
+      raise Discourse::InvalidParameters.new(:group) if group.blank?
+      guardian.ensure_can_see!(group)
+      guardian.ensure_can_see_group_members!(group)
+
+      result = result.includes(user: :groups).where(users: { groups: { id: group.id } })
     else
       result = result.includes(user: :primary_group)
     end
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index 41f42b9c45..6d1e777e68 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -103,5 +103,20 @@ describe DirectoryItemsController do
       expect(json['directory_items'][0]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
       expect(json['directory_items'][1]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
     end
+
+    it "checks group permissions" do
+      group.update!(visibility_level: Group.visibility_levels[:members])
+
+      sign_in(evil_trout)
+      get '/directory_items.json', params: { period: 'all', group: group.name }
+      expect(response.status).to eq(200)
+
+      get '/directory_items.json', params: { period: 'all', group: 'not a group' }
+      expect(response.status).to eq(400)
+
+      sign_in(user)
+      get '/directory_items.json', params: { period: 'all', group: group.name }
+      expect(response.status).to eq(403)
+    end
   end
 end

From 58ced428ee84190fc9df2e0ec81ff2d9dd43242d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 24 Mar 2020 15:16:42 +0100
Subject: [PATCH 237/633] FIX: race conditions in search menu (#9262)

Race conditions could lead the previous query search term to be used in the next query. This commit also attempts to simplify code.
---
 .../discourse/widgets/search-menu-controls.js |  3 ++-
 .../discourse/widgets/search-menu.js          | 24 ++++---------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js b/app/assets/javascripts/discourse/widgets/search-menu-controls.js
index 93312553bd..7884b1ac77 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-controls.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu-controls.js
@@ -35,7 +35,8 @@ createWidget("search-term", {
     }
 
     const val = this.attrs.value;
-    const newVal = $(`#${this.buildId()}`).val();
+    // remove zero-width chars
+    const newVal = e.target.value.replace(/[\u200B-\u200D\uFEFF]/, "");
 
     if (newVal !== val) {
       this.sendWidgetAction("searchTermChanged", newVal);
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js b/app/assets/javascripts/discourse/widgets/search-menu.js
index 690dc80bff..7bc56bfdbb 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js
@@ -1,5 +1,5 @@
 import { get } from "@ember/object";
-import { debounce, later } from "@ember/runloop";
+import { debounce, cancel } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
 import { createWidget } from "discourse/widgets/widget";
@@ -23,28 +23,17 @@ initSearchData();
 // Helps with debouncing and cancelling promises
 const SearchHelper = {
   _activeSearch: null,
-  _cancelSearch: null,
 
   // for cancelling debounced search
   cancel() {
     if (this._activeSearch) {
-      this._activeSearch.abort();
+      cancel(this._activeSearch);
+      this._activeSearch = null;
     }
-
-    this._cancelSearch = true;
-    later(() => (this._cancelSearch = false), 400);
   },
 
   perform(widget) {
-    if (this._cancelSearch) {
-      this._cancelSearch = null;
-      return;
-    }
-
-    if (this._activeSearch) {
-      this._activeSearch.abort();
-      this._activeSearch = null;
-    }
+    this.cancel();
 
     const { term, typeFilter, contextEnabled } = searchData;
     const searchContext = contextEnabled ? widget.searchContext() : null;
@@ -67,11 +56,6 @@ const SearchHelper = {
       this._activeSearch
         .then(content => {
           searchData.noResults = content.resultTypes.length === 0;
-
-          if (content.grouped_search_result) {
-            searchData.term = content.grouped_search_result.term;
-          }
-
           searchData.results = content;
 
           if (searchContext && searchContext.type === "topic") {

From c9390018760d5ce6e222382c460be68f74220e65 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 24 Mar 2020 15:52:14 +0000
Subject: [PATCH 238/633] DEV: Bump theme compiler version for CSP change

We need to regenerate cached themes, so that the JS paths are updated to include the subfolder prefix

Followup to 8e98f39d9ff865be2f54ef77700eb2ae749d11d7
---
 app/models/theme_field.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index ef98ea0390..085a0e649e 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -60,7 +60,7 @@ class ThemeField < ActiveRecord::Base
   validates :name, format: { with: /\A[a-z_][a-z0-9_-]*\z/i },
                    if: Proc.new { |field| ThemeField.theme_var_type_ids.include?(field.type_id) }
 
-  BASE_COMPILER_VERSION = 14
+  BASE_COMPILER_VERSION = 15
   DEPENDENT_CONSTANTS = [
     BASE_COMPILER_VERSION,
     Ember::VERSION,

From 5b2b769eb7ed54d2c4d094f1a970067c5db776b6 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 24 Mar 2020 17:07:59 +0100
Subject: [PATCH 239/633] DEV: Ensure uploads aren't deleted during imports

Sidekiq might delete uploads if you, for some reason, create upload records before using them in posts.
---
 script/import_scripts/base.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 2d52759822..4e7ca2af27 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -83,7 +83,9 @@ class ImportScripts::Base
       max_image_size_kb: 102400,
       authorized_extensions: '*',
       clean_up_inactive_users_after_days: 0,
-      clean_up_unused_staged_users_after_days: 0
+      clean_up_unused_staged_users_after_days: 0,
+      clean_up_uploads: false,
+      clean_orphan_uploads_grace_period_hours: 1800
     }
   end
 

From 9659da1044b3bae897bff4d8f686e5cb37e2824f Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Tue, 24 Mar 2020 12:40:11 -0500
Subject: [PATCH 240/633] UI: Update margin select kit category name

---
 app/assets/stylesheets/common/components/badges.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 3881ee7b70..37fb23b821 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -29,6 +29,7 @@
     .category-name {
       text-overflow: ellipsis;
       overflow: hidden;
+      margin-left: 5px;
     }
     .d-icon {
       margin-right: 3px;

From 4d190c93b6c993ddefce9fbb8b344c19507b96af Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:10:51 -0400
Subject: [PATCH 241/633] Migrate ember-addons from ES6 -> JS

---
 .../{decorator-alias.js.es6 => decorator-alias.js}             | 0
 app/assets/javascripts/ember-addons/{fmt.js.es6 => fmt.js}     | 0
 .../ember-addons/{macro-alias.js.es6 => macro-alias.js}        | 0
 .../utils/{extract-value.js.es6 => extract-value.js}           | 0
 .../utils/{handle-descriptor.js.es6 => handle-descriptor.js}   | 0
 .../utils/{is-descriptor.js.es6 => is-descriptor.js}           | 0
 lib/discourse_js_processor.rb                                  | 3 ++-
 7 files changed, 2 insertions(+), 1 deletion(-)
 rename app/assets/javascripts/ember-addons/{decorator-alias.js.es6 => decorator-alias.js} (100%)
 rename app/assets/javascripts/ember-addons/{fmt.js.es6 => fmt.js} (100%)
 rename app/assets/javascripts/ember-addons/{macro-alias.js.es6 => macro-alias.js} (100%)
 rename app/assets/javascripts/ember-addons/utils/{extract-value.js.es6 => extract-value.js} (100%)
 rename app/assets/javascripts/ember-addons/utils/{handle-descriptor.js.es6 => handle-descriptor.js} (100%)
 rename app/assets/javascripts/ember-addons/utils/{is-descriptor.js.es6 => is-descriptor.js} (100%)

diff --git a/app/assets/javascripts/ember-addons/decorator-alias.js.es6 b/app/assets/javascripts/ember-addons/decorator-alias.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/decorator-alias.js.es6
rename to app/assets/javascripts/ember-addons/decorator-alias.js
diff --git a/app/assets/javascripts/ember-addons/fmt.js.es6 b/app/assets/javascripts/ember-addons/fmt.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/fmt.js.es6
rename to app/assets/javascripts/ember-addons/fmt.js
diff --git a/app/assets/javascripts/ember-addons/macro-alias.js.es6 b/app/assets/javascripts/ember-addons/macro-alias.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/macro-alias.js.es6
rename to app/assets/javascripts/ember-addons/macro-alias.js
diff --git a/app/assets/javascripts/ember-addons/utils/extract-value.js.es6 b/app/assets/javascripts/ember-addons/utils/extract-value.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/utils/extract-value.js.es6
rename to app/assets/javascripts/ember-addons/utils/extract-value.js
diff --git a/app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/handle-descriptor.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6
rename to app/assets/javascripts/ember-addons/utils/handle-descriptor.js
diff --git a/app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/is-descriptor.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6
rename to app/assets/javascripts/ember-addons/utils/is-descriptor.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index d2d671e0ac..5d41d23bb7 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -41,7 +41,8 @@ class DiscourseJsProcessor
       relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
       relative_path.start_with?("app/assets/javascripts/select-kit/") ||
       relative_path.start_with?("app/assets/javascripts/wizard/") ||
-      relative_path.start_with?("app/assets/javascripts/discourse-common/")
+      relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
+      relative_path.start_with?("app/assets/javascripts/ember-addons/")
   end
 
   def self.skip_module?(data)

From ac34c7740ad1b44af9c255f428e79eee360527ea Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:11:33 -0400
Subject: [PATCH 242/633] Ignore more commits

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 3e7bf97bb8..0a9d3812b4 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -25,3 +25,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # Rename discourse-common es6 -> js
 167503ca4824e37a2e93d74b3f50271556d0ba8e
+
+# Rename ember-addons es6 -> js
+16ba50bce362c1eefe1881f86c67bec66f493abb

From 0fd0a04019fff3c1a80126913be92ca290682793 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:13:30 -0400
Subject: [PATCH 243/633] This should be js

---
 app/assets/javascripts/admin/routes/admin-api-keys-new.es6 | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 app/assets/javascripts/admin/routes/admin-api-keys-new.es6

diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-new.es6 b/app/assets/javascripts/admin/routes/admin-api-keys-new.es6
deleted file mode 100644
index 3969615c9f..0000000000
--- a/app/assets/javascripts/admin/routes/admin-api-keys-new.es6
+++ /dev/null
@@ -1,7 +0,0 @@
-import Route from "@ember/routing/route";
-
-export default Route.extend({
-  model() {
-    return this.store.createRecord("api-key");
-  }
-});

From 4876884fd1ed42fde6de7e834296ee478c88f99b Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:18:56 -0400
Subject: [PATCH 244/633] More JS files

---
 app/assets/javascripts/admin/routes/admin-api-keys-new.js  | 7 +++++++
 .../{onpopstate-handler.js.es6 => onpopstate-handler.js}   | 0
 .../javascripts/{wizard-start.js.es6 => wizard-start.js}   | 0
 3 files changed, 7 insertions(+)
 create mode 100644 app/assets/javascripts/admin/routes/admin-api-keys-new.js
 rename app/assets/javascripts/{onpopstate-handler.js.es6 => onpopstate-handler.js} (100%)
 rename app/assets/javascripts/{wizard-start.js.es6 => wizard-start.js} (100%)

diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-new.js b/app/assets/javascripts/admin/routes/admin-api-keys-new.js
new file mode 100644
index 0000000000..3969615c9f
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-api-keys-new.js
@@ -0,0 +1,7 @@
+import Route from "@ember/routing/route";
+
+export default Route.extend({
+  model() {
+    return this.store.createRecord("api-key");
+  }
+});
diff --git a/app/assets/javascripts/onpopstate-handler.js.es6 b/app/assets/javascripts/onpopstate-handler.js
similarity index 100%
rename from app/assets/javascripts/onpopstate-handler.js.es6
rename to app/assets/javascripts/onpopstate-handler.js
diff --git a/app/assets/javascripts/wizard-start.js.es6 b/app/assets/javascripts/wizard-start.js
similarity index 100%
rename from app/assets/javascripts/wizard-start.js.es6
rename to app/assets/javascripts/wizard-start.js

From a11938d58d4b1bea1ff43306450da7b24f05db0a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:32:56 -0400
Subject: [PATCH 245/633] Rename more es6 files to js

---
 .../javascripts/{discourse.js.es6 => discourse.js}     |  0
 ...ication-data.js.es6 => preload-application-data.js} | 10 +++++-----
 .../{preload-store.js.es6 => preload-store.js}         |  0
 app/assets/javascripts/wizard-start.js                 |  2 +-
 lib/discourse_js_processor.rb                          |  7 ++++++-
 5 files changed, 12 insertions(+), 7 deletions(-)
 rename app/assets/javascripts/{discourse.js.es6 => discourse.js} (100%)
 rename app/assets/javascripts/{preload-application-data.js.es6 => preload-application-data.js} (87%)
 rename app/assets/javascripts/{preload-store.js.es6 => preload-store.js} (100%)

diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js
similarity index 100%
rename from app/assets/javascripts/discourse.js.es6
rename to app/assets/javascripts/discourse.js
diff --git a/app/assets/javascripts/preload-application-data.js.es6 b/app/assets/javascripts/preload-application-data.js
similarity index 87%
rename from app/assets/javascripts/preload-application-data.js.es6
rename to app/assets/javascripts/preload-application-data.js
index 6c3852f5ca..c72d4a66d1 100644
--- a/app/assets/javascripts/preload-application-data.js.es6
+++ b/app/assets/javascripts/preload-application-data.js
@@ -1,11 +1,11 @@
 // discourse-skip-module
 (function() {
-  var ps = require("preload-store").default;
-  var preloadedDataElement = document.getElementById("data-preloaded");
-  var setupData = document.getElementById("data-discourse-setup").dataset;
+  const ps = require("preload-store").default;
+  const preloadedDataElement = document.getElementById("data-preloaded");
+  const setupData = document.getElementById("data-discourse-setup").dataset;
 
   if (preloadedDataElement) {
-    var preloaded = JSON.parse(preloadedDataElement.dataset.preloaded);
+    const preloaded = JSON.parse(preloadedDataElement.dataset.preloaded);
 
     Object.keys(preloaded).forEach(function(key) {
       ps.store(key, JSON.parse(preloaded[key]));
@@ -34,7 +34,7 @@
   Discourse.start();
   Discourse.set("assetVersion", setupData.assetVersion);
 
-  let Session = require("discourse/models/session").default;
+  const Session = require("discourse/models/session").default;
   Session.currentProp(
     "disableCustomCSS",
     setupData.disableCustomCss === "true"
diff --git a/app/assets/javascripts/preload-store.js.es6 b/app/assets/javascripts/preload-store.js
similarity index 100%
rename from app/assets/javascripts/preload-store.js.es6
rename to app/assets/javascripts/preload-store.js
diff --git a/app/assets/javascripts/wizard-start.js b/app/assets/javascripts/wizard-start.js
index 79c022f6fc..4fee8d2fed 100644
--- a/app/assets/javascripts/wizard-start.js
+++ b/app/assets/javascripts/wizard-start.js
@@ -1,5 +1,5 @@
 // discourse-skip-module
 (function() {
-  var wizard = require("wizard/wizard").default.create();
+  const wizard = require("wizard/wizard").default.create();
   wizard.start();
 })();
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 5d41d23bb7..3e101328cf 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -42,7 +42,12 @@ class DiscourseJsProcessor
       relative_path.start_with?("app/assets/javascripts/select-kit/") ||
       relative_path.start_with?("app/assets/javascripts/wizard/") ||
       relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
-      relative_path.start_with?("app/assets/javascripts/ember-addons/")
+      relative_path.start_with?("app/assets/javascripts/ember-addons/") ||
+      relative_path == "app/assets/javascripts/preload-store.js" ||
+      relative_path == "app/assets/javascripts/preload-application-data.js" ||
+      relative_path == "app/assets/javascripts/wizard-start.js" ||
+      relative_path == "app/assets/javascripts/onpopstate-handler.js" ||
+      relative_path == "app/assets/javascripts/discourse.js"
   end
 
   def self.skip_module?(data)

From 772583b9c3da194db1711e4bab418349aa49238a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:33:43 -0400
Subject: [PATCH 246/633] Ignore more

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 0a9d3812b4..5e86efd0f0 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -28,3 +28,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # Rename ember-addons es6 -> js
 16ba50bce362c1eefe1881f86c67bec66f493abb
+
+# Rename some root files
+11938d58d4b1bea1ff43306450da7b24f05db0a

From 2501c0cd0f530450bb7d720711178a0bbd53b1e1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 24 Mar 2020 22:17:26 +0100
Subject: [PATCH 247/633] FIX: user-selector was not excluding currentUser
 (#9266)

concat doesn't mutate the variable so it has to be assigned.
---
 app/assets/javascripts/discourse/components/user-selector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/user-selector.js b/app/assets/javascripts/discourse/components/user-selector.js
index 3d796d03d6..d362c60e62 100644
--- a/app/assets/javascripts/discourse/components/user-selector.js
+++ b/app/assets/javascripts/discourse/components/user-selector.js
@@ -72,7 +72,7 @@ export default TextField.extend({
       let usernames = single ? [] : selected;
 
       if (currentUser && excludeCurrentUser) {
-        usernames.concat([currentUser.username]);
+        usernames = usernames.concat([currentUser.username]);
       }
 
       return usernames.concat(this.excludedUsernames || []);

From 7282435e17836997b8e084eff7122d246dce62a2 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 24 Mar 2020 14:57:44 -0700
Subject: [PATCH 248/633] FEATURE: Unassign the review queue topic when a flag
 is handled

---
 app/models/reviewable_flagged_post.rb       | 23 +++++++++++++++++++++
 spec/models/reviewable_flagged_post_spec.rb | 14 +++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index 340d63c8b5..1dc89856b2 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -120,6 +120,7 @@ class ReviewableFlaggedPost < Reviewable
     end
 
     if actions.first.present?
+      unassign_topic performed_by, post
       DiscourseEvent.trigger(:flag_reviewed, post)
       DiscourseEvent.trigger(:flag_deferred, actions.first)
     end
@@ -190,6 +191,7 @@ class ReviewableFlaggedPost < Reviewable
     Post.with_deleted.where(id: target_id).update_all(cached)
 
     if actions.first.present?
+      unassign_topic performed_by, post
       DiscourseEvent.trigger(:flag_reviewed, post)
       DiscourseEvent.trigger(:flag_disagreed, actions.first)
     end
@@ -256,6 +258,7 @@ protected
     DiscourseEvent.trigger(:confirmed_spam_post, post) if trigger_spam
 
     if actions.first.present?
+      unassign_topic performed_by, post
       DiscourseEvent.trigger(:flag_reviewed, post)
       DiscourseEvent.trigger(:flag_agreed, actions.first)
       yield(actions.first) if block_given?
@@ -279,6 +282,26 @@ protected
     end
   end
 
+  def unassign_topic(performed_by, post)
+    topic = post.topic
+    return unless topic && performed_by && SiteSetting.reviewable_claiming != 'disabled'
+    ReviewableClaimedTopic.where(topic_id: topic.id).delete_all
+    topic.reviewables.find_each do |reviewable|
+      reviewable.log_history(:unclaimed, performed_by)
+    end
+
+    user_ids = User.staff.pluck(:id)
+
+    if SiteSetting.enable_category_group_review? && group_id = topic.category&.reviewable_by_group_id.presence
+      user_ids.concat(GroupUser.where(group_id: group_id).pluck(:user_id))
+      user_ids.uniq!
+    end
+
+    data = { topic_id: topic.id }
+
+    MessageBus.publish("/reviewable_claimed", data, user_ids: user_ids)
+  end
+
 private
 
   def destroyer(performed_by, post)
diff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rb
index f656e5763b..07124680d8 100644
--- a/spec/models/reviewable_flagged_post_spec.rb
+++ b/spec/models/reviewable_flagged_post_spec.rb
@@ -93,6 +93,20 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
       expect(post).not_to be_hidden
     end
 
+    describe "with reviewable claiming enabled" do
+      fab!(:claimed) { Fabricate(:reviewable_claimed_topic, topic: post.topic, user: moderator) }
+      it "clears the claimed topic on resolve" do
+        SiteSetting.reviewable_claiming = 'required'
+        reviewable.perform(moderator, :agree_and_keep)
+        expect(reviewable).to be_approved
+        expect(score.reload).to be_agreed
+        expect(post).not_to be_hidden
+        expect(ReviewableClaimedTopic.where(topic_id: post.topic.id).exists?).to eq(false)
+        expect(post.topic.reviewables.first.history.where(reviewable_history_type: ReviewableHistory.types[:unclaimed]).size).to eq(1)
+      end
+
+    end
+
     it "agree_and_suspend agrees with the flags and keeps the post" do
       reviewable.perform(moderator, :agree_and_suspend)
       expect(reviewable).to be_approved

From 35e153d84f77351143742149a3fad1e8de9b2b6b Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 25 Mar 2020 15:38:25 +1100
Subject: [PATCH 249/633] DEV: update unicorn

This is a minor update to unicorn, in this update unicorn handles
chunked encoding a bit more correctly according to RFC

Should have no impact, but message bus will be validated in production
to confirm chunked encoding still works as expected
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 925a89aa68..471bb0f956 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -405,7 +405,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.6)
     unicode-display_width (1.6.1)
-    unicorn (5.5.3)
+    unicorn (5.5.4)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.13.0)

From 70012f20278430362649a26a28d3cb4b39449b64 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 25 Mar 2020 06:45:35 +0200
Subject: [PATCH 250/633] FEATURE: Navigate through search results using J/K
 (#9264)

---
 app/assets/javascripts/discourse/lib/keyboard-shortcuts.js  | 6 +++++-
 app/assets/stylesheets/common/base/search.scss              | 2 ++
 .../stylesheets/common/components/keyboard_shortcuts.scss   | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 5da8be5bc9..064c2eeb58 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -53,7 +53,8 @@ export let bindings = {
       ".topic-list tr.selected a.title",
       ".latest-topic-list .latest-topic-list-item.selected div.main-link a.title",
       ".top-topic-list .latest-topic-list-item.selected div.main-link a.title",
-      ".latest .featured-topic.selected a.title"
+      ".latest .featured-topic.selected a.title",
+      ".search-results .search-link"
     ].join(", "),
     anonymous: true
   }, // open selected topic on latest or categories page
@@ -589,6 +590,7 @@ export default {
     const $topicList = $(".topic-list");
     const $postsWrapper = $(".posts-wrapper");
     const $categoriesTopicsList = this.categoriesTopicsList();
+    const $searchResults = $(".search-results");
 
     if ($postsWrapper.length > 0) {
       return $(".posts-wrapper .topic-post, .topic-list tbody tr");
@@ -596,6 +598,8 @@ export default {
       return $topicList.find(".topic-list-item");
     } else if ($categoriesTopicsList.length > 0) {
       return $categoriesTopicsList;
+    } else if ($searchResults.length > 0) {
+      return $searchResults.find(".fps-result");
     }
   },
 
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index 9561a6b47d..e62f24f292 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -192,6 +192,8 @@
 
 .fps-result {
   display: flex;
+  padding: 0 0.5em;
+
   .author {
     display: inline-block;
     vertical-align: top;
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index c40eaefee9..e74397664b 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -5,7 +5,8 @@
 
 .topic-list tr.selected td:first-child,
 .topic-list-item.selected td:first-child,
-.latest-topic-list-item.selected {
+.latest-topic-list-item.selected,
+.search-results .fps-result.selected {
   box-shadow: inset 3px 0 0 $danger; // needs to be inset for Edge
 }
 

From cff9d4726c1aa51f3113b3e1bf927134877ba04a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Mar 2020 10:00:48 +0100
Subject: [PATCH 251/633] FIX: ensures search-menu is not briefly showing
 previous results (#9272)

---
 .../discourse/widgets/search-menu.js          | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js b/app/assets/javascripts/discourse/widgets/search-menu.js
index 7bc56bfdbb..cec34e75a9 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js
@@ -1,5 +1,5 @@
 import { get } from "@ember/object";
-import { debounce, cancel } from "@ember/runloop";
+import { debounce } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
 import { createWidget } from "discourse/widgets/widget";
@@ -27,7 +27,7 @@ const SearchHelper = {
   // for cancelling debounced search
   cancel() {
     if (this._activeSearch) {
-      cancel(this._activeSearch);
+      this._activeSearch.abort();
       this._activeSearch = null;
     }
   },
@@ -55,21 +55,24 @@ const SearchHelper = {
       });
       this._activeSearch
         .then(content => {
-          searchData.noResults = content.resultTypes.length === 0;
-          searchData.results = content;
+          // we ensure the current search term is the one used
+          // when starting the query
+          if (term === searchData.term) {
+            searchData.noResults = content.resultTypes.length === 0;
+            searchData.results = content;
 
-          if (searchContext && searchContext.type === "topic") {
-            widget.appEvents.trigger("post-stream:refresh", { force: true });
-            searchData.topicId = searchContext.id;
-          } else {
-            searchData.topicId = null;
+            if (searchContext && searchContext.type === "topic") {
+              widget.appEvents.trigger("post-stream:refresh", { force: true });
+              searchData.topicId = searchContext.id;
+            } else {
+              searchData.topicId = null;
+            }
           }
         })
         .catch(popupAjaxError)
         .finally(() => {
           searchData.loading = false;
           widget.scheduleRerender();
-          this._activeSearch = null;
         });
     }
   }

From 49395ec5772c86f8929ed9bcb5c1e589c3a7af31 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 25 Mar 2020 12:59:16 +0200
Subject: [PATCH 252/633] FIX: Fix image optimization pipeline (#9257)

* FIX: Do not use original filename to extract the original filename

Prefer extracting filename from the destination path, which is build
using extracted image information.

* UX: Show better error images
---
 config/locales/server.en.yml | 1 +
 lib/upload_creator.rb        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 6d1c849522..986905fba1 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3734,6 +3734,7 @@ en:
     file_missing: "Sorry, you must provide a file to upload."
     empty: "Sorry, but the file you provided is empty."
     png_to_jpg_conversion_failure_message: "An error happened when converting from PNG to JPG."
+    optimize_failure_message: "An error occured while optimizing the uploaded image."
     attachments:
       too_large: "Sorry, the file you are trying to upload is too big (maximum size is %{max_size_kb}KB)."
     images:
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 9c66754861..d9c21f1920 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -252,7 +252,6 @@ class UploadCreator
         from,
         to,
         "50%",
-        filename: @filename,
         allow_animation: allow_animation,
         raise_on_error: true
       )
@@ -264,6 +263,8 @@ class UploadCreator
 
       return if filesize >= original_size || pixels == 0 || !should_downsize?
     end
+  rescue
+    @upload.errors.add(:base, I18n.t("upload.optimize_failure_message"))
   end
 
   def is_still_too_big?

From 572bb5988f4a46bc5f66f7e9d4a09b7241c532fb Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 25 Mar 2020 18:39:19 +0530
Subject: [PATCH 253/633] FIX: word boundary regex (\b) not working in Unicode
 languages. (#9163)

---
 .../admin/components/site-text-summary.js     |  13 ++-
 .../admin/templates/search-logs-term.hbs      |   6 +-
 ...{highlight-text.js => highlight-search.js} |   4 +-
 .../discourse/lib/highlight-html.js           |  93 +++++++++++++++
 ...{highlight-text.js => highlight-search.js} |   7 +-
 .../discourse/templates/full-page-search.hbs  |   6 +-
 .../discourse/widgets/post-cooked.js          |  18 +--
 .../discourse/widgets/search-menu-results.js  |   4 +-
 app/assets/javascripts/vendor.js              |   1 -
 .../javascripts/acceptance/search-test.js.es6 |   2 +-
 .../lib/highlight-search-test.js.es6          |  48 ++++++++
 .../lib/highlight-text-test.js.es6            |  26 -----
 vendor/assets/javascripts/highlight.js        | 108 ------------------
 13 files changed, 175 insertions(+), 161 deletions(-)
 rename app/assets/javascripts/discourse/components/{highlight-text.js => highlight-search.js} (68%)
 create mode 100644 app/assets/javascripts/discourse/lib/highlight-html.js
 rename app/assets/javascripts/discourse/lib/{highlight-text.js => highlight-search.js} (71%)
 create mode 100644 test/javascripts/lib/highlight-search-test.js.es6
 delete mode 100644 test/javascripts/lib/highlight-text-test.js.es6
 delete mode 100644 vendor/assets/javascripts/highlight.js

diff --git a/app/assets/javascripts/admin/components/site-text-summary.js b/app/assets/javascripts/admin/components/site-text-summary.js
index 11c6bc45eb..23ee2d8aa6 100644
--- a/app/assets/javascripts/admin/components/site-text-summary.js
+++ b/app/assets/javascripts/admin/components/site-text-summary.js
@@ -1,5 +1,6 @@
 import Component from "@ember/component";
 import { on } from "discourse-common/utils/decorators";
+import highlightHTML from "discourse/lib/highlight-html";
 
 export default Component.extend({
   classNames: ["site-text"],
@@ -10,11 +11,13 @@ export default Component.extend({
     const term = this._searchTerm();
 
     if (term) {
-      $(
-        this.element.querySelector(".site-text-id, .site-text-value")
-      ).highlight(term, {
-        className: "text-highlight"
-      });
+      highlightHTML(
+        this.element.querySelector(".site-text-id, .site-text-value"),
+        term,
+        {
+          className: "text-highlight"
+        }
+      );
     }
     $(this.element.querySelector(".site-text-value")).ellipsis();
   },
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 27f61f2940..ac55d129e0 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
       <div class='fps-topic'>
         <div class='topic'>
           <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-search highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
           </a>
 
           <div class='search-category'>
@@ -54,9 +54,9 @@
           </span>
 
           {{#if result.blurb}}
-            {{#highlight-text highlight=term}}
+            {{#highlight-search highlight=term}}
               {{html-safe result.blurb}}
-            {{/highlight-text}}
+            {{/highlight-search}}
           {{/if}}
         </div>
       </div>
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js b/app/assets/javascripts/discourse/components/highlight-search.js
similarity index 68%
rename from app/assets/javascripts/discourse/components/highlight-text.js
rename to app/assets/javascripts/discourse/components/highlight-search.js
index a98ffdb653..322336699f 100644
--- a/app/assets/javascripts/discourse/components/highlight-text.js
+++ b/app/assets/javascripts/discourse/components/highlight-search.js
@@ -1,12 +1,12 @@
 import Component from "@ember/component";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/lib/highlight-search";
 
 export default Component.extend({
   tagName: "span",
 
   _highlightOnInsert: function() {
     const term = this.highlight;
-    highlightText($(this.element), term);
+    highlightSearch($(this.element), term);
   }
     .observes("highlight")
     .on("didInsertElement")
diff --git a/app/assets/javascripts/discourse/lib/highlight-html.js b/app/assets/javascripts/discourse/lib/highlight-html.js
new file mode 100644
index 0000000000..94a1cd863c
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/highlight-html.js
@@ -0,0 +1,93 @@
+function highlight(node, pattern, nodeName, className) {
+  if (
+    ![Node.ELEMENT_NODE, Node.TEXT_NODE].includes(node.nodeType) ||
+    ["SCRIPT", "STYLE"].includes(node.tagName) ||
+    (node.tagName === nodeName && node.className === className)
+  ) {
+    return 0;
+  }
+
+  if (node.nodeType === Node.ELEMENT_NODE && node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) {
+      i += highlight(node.childNodes[i], pattern, nodeName, className);
+    }
+    return 0;
+  }
+
+  if (node.nodeType === Node.TEXT_NODE) {
+    const match = node.data.match(pattern);
+
+    if (!match) {
+      return 0;
+    }
+
+    const element = document.createElement(nodeName);
+    element.className = className;
+    element.innerText = match[0];
+    const matchNode = node.splitText(match.index);
+    matchNode.splitText(match[0].length);
+    matchNode.parentNode.replaceChild(element, matchNode);
+    return 1;
+  }
+
+  return 0;
+}
+
+export default function(node, words, opts = {}) {
+  let settings = {
+    nodeName: "span",
+    className: "highlighted",
+    wholeWord: false,
+    matchCase: false
+  };
+
+  Object.assign(settings, opts);
+  words = typeof words === "string" ? [words] : words;
+  words = words
+    .filter(Boolean)
+    .map(word => word.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&"));
+
+  if (!words.length) return node;
+
+  let pattern = `(${words.join("|")})`;
+  let flag;
+
+  if (settings.wholeWord) {
+    const hasUnicode = words.some(word => {
+      return !word.match(new RegExp(`\b${word}\b`));
+    });
+    pattern = hasUnicode
+      ? `(?<=[\\s,.:;"']|^)${pattern}(?=[\\s,.:;"']|$)`
+      : `\b${pattern}\b`;
+  }
+
+  if (settings.matchCase) {
+    flag = "i";
+  }
+
+  highlight(
+    node,
+    new RegExp(pattern, flag),
+    settings.nodeName.toUpperCase(),
+    settings.className
+  );
+
+  return node;
+}
+
+export function unhighlightHTML(opts = {}) {
+  let settings = {
+    nodeName: "span",
+    className: "highlighted"
+  };
+
+  Object.assign(settings, opts);
+
+  document
+    .querySelectorAll(`${settings.nodeName}.${settings.className}`)
+    .forEach(e => {
+      const parentNode = e.parentNode;
+      parentNode.replaceChild(e.firstChild, e);
+      parentNode.normalize();
+    });
+}
diff --git a/app/assets/javascripts/discourse/lib/highlight-text.js b/app/assets/javascripts/discourse/lib/highlight-search.js
similarity index 71%
rename from app/assets/javascripts/discourse/lib/highlight-text.js
rename to app/assets/javascripts/discourse/lib/highlight-search.js
index 6fa7a09faf..870e9c3693 100644
--- a/app/assets/javascripts/discourse/lib/highlight-text.js
+++ b/app/assets/javascripts/discourse/lib/highlight-search.js
@@ -1,4 +1,5 @@
 import { PHRASE_MATCH_REGEXP_PATTERN } from "discourse/lib/concerns/search-constants";
+import highlightHTML from "discourse/lib/highlight-html";
 
 export const CLASS_NAME = "search-highlight";
 
@@ -11,8 +12,10 @@ export default function($elem, term, opts = {}) {
     );
 
     words = words.map(w => w.replace(/^"(.*)"$/, "$1"));
-    const highlightOpts = { wordsOnly: true };
+    const highlightOpts = { wholeWord: true };
     if (!opts.defaultClassName) highlightOpts.className = CLASS_NAME;
-    $elem.highlight(words, highlightOpts);
+    for (let i = 0; i <= $elem.length; i++) {
+      highlightHTML($elem[0], words, highlightOpts);
+    }
   }
 }
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 9394f35486..2ed17fa1bd 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -88,7 +88,7 @@
 
                   <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+                    <span class='topic-title'>{{#highlight-search highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -112,9 +112,9 @@
                   </span>
 
                   {{#if result.blurb}}
-                    {{#highlight-text highlight=highlightQuery}}
+                    {{#highlight-search highlight=highlightQuery}}
                       {{html-safe result.blurb}}
-                    {{/highlight-text}}
+                    {{/highlight-search}}
                   {{/if}}
                 </div>
 
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js b/app/assets/javascripts/discourse/widgets/post-cooked.js
index 3d55314f08..c16820de44 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js
@@ -2,7 +2,11 @@ import { iconHTML } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
 import { isValidLink } from "discourse/lib/click-track";
 import { number } from "discourse/lib/formatter";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/lib/highlight-search";
+import {
+  default as highlightHTML,
+  unhighlightHTML
+} from "discourse/lib/highlight-html";
 
 let _decorators = [];
 
@@ -52,13 +56,13 @@ export default class PostCooked {
 
     if (highlight && highlight.length > 2) {
       if (this._highlighted) {
-        $html.unhighlight();
+        unhighlightHTML($html[0]);
       }
 
-      highlightText($html, highlight, { defaultClassName: true });
+      highlightSearch($html, highlight, { defaultClassName: true });
       this._highlighted = true;
     } else if (this._highlighted) {
-      $html.unhighlight();
+      unhighlightHTML($html[0]);
       this._highlighted = false;
     }
   }
@@ -175,10 +179,8 @@ export default class PostCooked {
           div.html(result.cooked);
           _decorators.forEach(cb => cb(div, this.decoratorHelper));
 
-          div.highlight(originalText, {
-            caseSensitive: true,
-            element: "span",
-            className: "highlighted"
+          highlightHTML(div[0], originalText, {
+            matchCase: true
           });
           $blockQuote.showHtml(div, "fast", finished);
         })
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js b/app/assets/javascripts/discourse/widgets/search-menu-results.js
index 636c069f94..e85eefcd8e 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js
@@ -3,7 +3,7 @@ import { dateNode } from "discourse/helpers/node";
 import RawHtml from "discourse/widgets/raw-html";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/lib/highlight-search";
 import { escapeExpression, formatUsername } from "discourse/lib/utilities";
 import { iconNode } from "discourse-common/lib/icon-library";
 import renderTag from "discourse/lib/render-tag";
@@ -15,7 +15,7 @@ class Highlighted extends RawHtml {
   }
 
   decorate($html) {
-    highlightText($html, this.term);
+    highlightSearch($html, this.term);
   }
 }
 
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 3b36c27ea1..39626bfd19 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -29,5 +29,4 @@
 //= require jquery.autoellipsis-1.0.10
 //= require virtual-dom
 //= require virtual-dom-amd
-//= require highlight.js
 //= require intersection-observer
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6
index 1b930c7905..c9567ad8b5 100644
--- a/test/javascripts/acceptance/search-test.js.es6
+++ b/test/javascripts/acceptance/search-test.js.es6
@@ -94,7 +94,7 @@ QUnit.test("Search with context", async assert => {
 
   const highlighted = [];
 
-  find("#post_7 span.highlight-strong").map((_, span) => {
+  find("#post_7 span.highlighted").map((_, span) => {
     highlighted.push(span.innerText);
   });
 
diff --git a/test/javascripts/lib/highlight-search-test.js.es6 b/test/javascripts/lib/highlight-search-test.js.es6
new file mode 100644
index 0000000000..2a2524f765
--- /dev/null
+++ b/test/javascripts/lib/highlight-search-test.js.es6
@@ -0,0 +1,48 @@
+import highlightSearch, { CLASS_NAME } from "discourse/lib/highlight-search";
+import { fixture } from "helpers/qunit-helpers";
+
+QUnit.module("lib:highlight-search");
+
+QUnit.test("highlighting text", assert => {
+  fixture().html(
+    `
+    <p>This is some text to highlight</p>
+    `
+  );
+
+  highlightSearch(fixture(), "some text");
+
+  const terms = [];
+
+  fixture(`.${CLASS_NAME}`).each((_, elem) => {
+    terms.push(elem.textContent);
+  });
+
+  assert.equal(
+    terms.join(" "),
+    "some text",
+    "it should highlight the terms correctly"
+  );
+});
+
+QUnit.test("highlighting unicode text", assert => {
+  fixture().html(
+    `
+    <p>This is some தமிழ் and русский text to highlight</p>
+    `
+  );
+
+  highlightSearch(fixture(), "தமிழ் русский");
+
+  const terms = [];
+
+  fixture(`.${CLASS_NAME}`).each((_, elem) => {
+    terms.push(elem.textContent);
+  });
+
+  assert.equal(
+    terms.join(" "),
+    "தமிழ் русский",
+    "it should highlight the terms correctly"
+  );
+});
diff --git a/test/javascripts/lib/highlight-text-test.js.es6 b/test/javascripts/lib/highlight-text-test.js.es6
deleted file mode 100644
index d222b8a753..0000000000
--- a/test/javascripts/lib/highlight-text-test.js.es6
+++ /dev/null
@@ -1,26 +0,0 @@
-import highlightText, { CLASS_NAME } from "discourse/lib/highlight-text";
-import { fixture } from "helpers/qunit-helpers";
-
-QUnit.module("lib:highlight-text");
-
-QUnit.test("highlighting text", assert => {
-  fixture().html(
-    `
-    <p>This is some text to highlight</p>
-    `
-  );
-
-  highlightText(fixture(), "some text");
-
-  const terms = [];
-
-  fixture(`.${CLASS_NAME}`).each((_, elem) => {
-    terms.push(elem.textContent);
-  });
-
-  assert.equal(
-    terms.join(" "),
-    "some text",
-    "it should highlight the terms correctly"
-  );
-});
diff --git a/vendor/assets/javascripts/highlight.js b/vendor/assets/javascripts/highlight.js
deleted file mode 100644
index c13dd7ff9f..0000000000
--- a/vendor/assets/javascripts/highlight.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// forked cause we may want to amend the logic a bit
-/*
- * jQuery Highlight plugin
- *
- * Based on highlight v3 by Johann Burkard
- * http://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html
- *
- * Code a little bit refactored and cleaned (in my humble opinion).
- * Most important changes:
- *  - has an option to highlight only entire words (wordsOnly - false by default),
- *  - has an option to be case sensitive (caseSensitive - false by default)
- *  - highlight element tag and class names can be specified in options
- *
- * Usage:
- *   // wrap every occurrance of text 'lorem' in content
- *   // with <span class='highlight'> (default options)
- *   $('#content').highlight('lorem');
- *
- *   // search for and highlight more terms at once
- *   // so you can save some time on traversing DOM
- *   $('#content').highlight(['lorem', 'ipsum']);
- *   $('#content').highlight('lorem ipsum');
- *
- *   // search only for entire word 'lorem'
- *   $('#content').highlight('lorem', { wordsOnly: true });
- *
- *   // don't ignore case during search of term 'lorem'
- *   $('#content').highlight('lorem', { caseSensitive: true });
- *
- *   // wrap every occurrance of term 'ipsum' in content
- *   // with <em class='important'>
- *   $('#content').highlight('ipsum', { element: 'em', className: 'important' });
- *
- *   // remove default highlight
- *   $('#content').unhighlight();
- *
- *   // remove custom highlight
- *   $('#content').unhighlight({ element: 'em', className: 'important' });
- *
- *
- * Copyright (c) 2009 Bartek Szopka
- *
- * Licensed under MIT license.
- *
- */
-
-jQuery.extend({
-    highlight: function (node, re, nodeName, className) {
-        if (node.nodeType === 3) {
-            var match = node.data.match(re);
-            if (match) {
-                var highlight = document.createElement(nodeName || 'span');
-                highlight.className = className || 'highlight';
-                var wordNode = node.splitText(match.index);
-                wordNode.splitText(match[0].length);
-                var wordClone = wordNode.cloneNode(true);
-                highlight.appendChild(wordClone);
-                wordNode.parentNode.replaceChild(highlight, wordNode);
-                return 1; //skip added node in parent
-            }
-        } else if ((node.nodeType === 1 && node.childNodes) && // only element nodes that have children
-                !/(script|style)/i.test(node.tagName) && // ignore script and style nodes
-                !(node.tagName === nodeName.toUpperCase() && node.className === className)) { // skip if already highlighted
-            for (var i = 0; i < node.childNodes.length; i++) {
-                i += jQuery.highlight(node.childNodes[i], re, nodeName, className);
-            }
-        }
-        return 0;
-    }
-});
-
-jQuery.fn.unhighlight = function (options) {
-    var settings = { className: 'highlight-strong', element: 'span' };
-    jQuery.extend(settings, options);
-
-    return this.find(settings.element + "." + settings.className).each(function () {
-        var parent = this.parentNode;
-        parent.replaceChild(this.firstChild, this);
-        parent.normalize();
-    }).end();
-};
-
-jQuery.fn.highlight = function (words, options) {
-    var settings = { className: 'highlight-strong', element: 'span', caseSensitive: false, wordsOnly: false };
-    jQuery.extend(settings, options);
-
-    if (words.constructor === String) {
-        words = [words];
-    }
-    words = jQuery.grep(words, function(word){
-      return word !== '';
-    });
-    words = jQuery.map(words, function(word) {
-      return word.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-    });
-    if (words.length === 0) { return this; }
-
-    var flag = settings.caseSensitive ? "" : "i";
-    var pattern = "(" + words.join("|") + ")";
-    if (settings.wordsOnly) {
-        pattern = "\\b" + pattern + "\\b";
-    }
-    var re = new RegExp(pattern, flag);
-
-    return this.each(function () {
-        jQuery.highlight(this, re, settings.element, settings.className);
-    });
-};

From 9521a88984e7e265133dc53779663e9d38b8ce4e Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <jordan@jordanvidrine.com>
Date: Wed, 25 Mar 2020 08:59:00 -0500
Subject: [PATCH 254/633] UI: Fix 'lock' icon spacing in category dropdown

---
 app/assets/stylesheets/common/components/badges.scss        | 1 -
 app/assets/stylesheets/common/select-kit/category-drop.scss | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 37fb23b821..3881ee7b70 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -29,7 +29,6 @@
     .category-name {
       text-overflow: ellipsis;
       overflow: hidden;
-      margin-left: 5px;
     }
     .d-icon {
       margin-right: 3px;
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index 88a970fa9c..2f84f85a3c 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -12,6 +12,9 @@
 
           span.badge-category {
             margin: 0;
+            .d-icon-lock {
+              margin-right: 5px;
+            }
           }
         }
       }

From d62d258fe5948e609c9cd26bf43aef9d4960c14a Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 25 Mar 2020 14:34:45 +0000
Subject: [PATCH 255/633] Revert "FIX: word boundary regex (\b) not working in
 Unicode languages. (#9163)"

Lookbehind regex is not supported in Firefox or IE11

This reverts commit 572bb5988f4a46bc5f66f7e9d4a09b7241c532fb.
---
 .../admin/components/site-text-summary.js     |  13 +--
 .../admin/templates/search-logs-term.hbs      |   6 +-
 ...{highlight-search.js => highlight-text.js} |   4 +-
 .../discourse/lib/highlight-html.js           |  93 ---------------
 ...{highlight-search.js => highlight-text.js} |   7 +-
 .../discourse/templates/full-page-search.hbs  |   6 +-
 .../discourse/widgets/post-cooked.js          |  18 ++-
 .../discourse/widgets/search-menu-results.js  |   4 +-
 app/assets/javascripts/vendor.js              |   1 +
 .../20200323155812_add_post_thumbnails.rb     |  10 ++
 .../javascripts/acceptance/search-test.js.es6 |   2 +-
 .../lib/highlight-search-test.js.es6          |  48 --------
 .../lib/highlight-text-test.js.es6            |  26 +++++
 vendor/assets/javascripts/highlight.js        | 108 ++++++++++++++++++
 14 files changed, 171 insertions(+), 175 deletions(-)
 rename app/assets/javascripts/discourse/components/{highlight-search.js => highlight-text.js} (68%)
 delete mode 100644 app/assets/javascripts/discourse/lib/highlight-html.js
 rename app/assets/javascripts/discourse/lib/{highlight-search.js => highlight-text.js} (71%)
 create mode 100644 db/migrate/20200323155812_add_post_thumbnails.rb
 delete mode 100644 test/javascripts/lib/highlight-search-test.js.es6
 create mode 100644 test/javascripts/lib/highlight-text-test.js.es6
 create mode 100644 vendor/assets/javascripts/highlight.js

diff --git a/app/assets/javascripts/admin/components/site-text-summary.js b/app/assets/javascripts/admin/components/site-text-summary.js
index 23ee2d8aa6..11c6bc45eb 100644
--- a/app/assets/javascripts/admin/components/site-text-summary.js
+++ b/app/assets/javascripts/admin/components/site-text-summary.js
@@ -1,6 +1,5 @@
 import Component from "@ember/component";
 import { on } from "discourse-common/utils/decorators";
-import highlightHTML from "discourse/lib/highlight-html";
 
 export default Component.extend({
   classNames: ["site-text"],
@@ -11,13 +10,11 @@ export default Component.extend({
     const term = this._searchTerm();
 
     if (term) {
-      highlightHTML(
-        this.element.querySelector(".site-text-id, .site-text-value"),
-        term,
-        {
-          className: "text-highlight"
-        }
-      );
+      $(
+        this.element.querySelector(".site-text-id, .site-text-value")
+      ).highlight(term, {
+        className: "text-highlight"
+      });
     }
     $(this.element.querySelector(".site-text-value")).ellipsis();
   },
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index ac55d129e0..27f61f2940 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
       <div class='fps-topic'>
         <div class='topic'>
           <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-search highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
           </a>
 
           <div class='search-category'>
@@ -54,9 +54,9 @@
           </span>
 
           {{#if result.blurb}}
-            {{#highlight-search highlight=term}}
+            {{#highlight-text highlight=term}}
               {{html-safe result.blurb}}
-            {{/highlight-search}}
+            {{/highlight-text}}
           {{/if}}
         </div>
       </div>
diff --git a/app/assets/javascripts/discourse/components/highlight-search.js b/app/assets/javascripts/discourse/components/highlight-text.js
similarity index 68%
rename from app/assets/javascripts/discourse/components/highlight-search.js
rename to app/assets/javascripts/discourse/components/highlight-text.js
index 322336699f..a98ffdb653 100644
--- a/app/assets/javascripts/discourse/components/highlight-search.js
+++ b/app/assets/javascripts/discourse/components/highlight-text.js
@@ -1,12 +1,12 @@
 import Component from "@ember/component";
-import highlightSearch from "discourse/lib/highlight-search";
+import highlightText from "discourse/lib/highlight-text";
 
 export default Component.extend({
   tagName: "span",
 
   _highlightOnInsert: function() {
     const term = this.highlight;
-    highlightSearch($(this.element), term);
+    highlightText($(this.element), term);
   }
     .observes("highlight")
     .on("didInsertElement")
diff --git a/app/assets/javascripts/discourse/lib/highlight-html.js b/app/assets/javascripts/discourse/lib/highlight-html.js
deleted file mode 100644
index 94a1cd863c..0000000000
--- a/app/assets/javascripts/discourse/lib/highlight-html.js
+++ /dev/null
@@ -1,93 +0,0 @@
-function highlight(node, pattern, nodeName, className) {
-  if (
-    ![Node.ELEMENT_NODE, Node.TEXT_NODE].includes(node.nodeType) ||
-    ["SCRIPT", "STYLE"].includes(node.tagName) ||
-    (node.tagName === nodeName && node.className === className)
-  ) {
-    return 0;
-  }
-
-  if (node.nodeType === Node.ELEMENT_NODE && node.childNodes) {
-    for (let i = 0; i < node.childNodes.length; i++) {
-      i += highlight(node.childNodes[i], pattern, nodeName, className);
-    }
-    return 0;
-  }
-
-  if (node.nodeType === Node.TEXT_NODE) {
-    const match = node.data.match(pattern);
-
-    if (!match) {
-      return 0;
-    }
-
-    const element = document.createElement(nodeName);
-    element.className = className;
-    element.innerText = match[0];
-    const matchNode = node.splitText(match.index);
-    matchNode.splitText(match[0].length);
-    matchNode.parentNode.replaceChild(element, matchNode);
-    return 1;
-  }
-
-  return 0;
-}
-
-export default function(node, words, opts = {}) {
-  let settings = {
-    nodeName: "span",
-    className: "highlighted",
-    wholeWord: false,
-    matchCase: false
-  };
-
-  Object.assign(settings, opts);
-  words = typeof words === "string" ? [words] : words;
-  words = words
-    .filter(Boolean)
-    .map(word => word.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&"));
-
-  if (!words.length) return node;
-
-  let pattern = `(${words.join("|")})`;
-  let flag;
-
-  if (settings.wholeWord) {
-    const hasUnicode = words.some(word => {
-      return !word.match(new RegExp(`\b${word}\b`));
-    });
-    pattern = hasUnicode
-      ? `(?<=[\\s,.:;"']|^)${pattern}(?=[\\s,.:;"']|$)`
-      : `\b${pattern}\b`;
-  }
-
-  if (settings.matchCase) {
-    flag = "i";
-  }
-
-  highlight(
-    node,
-    new RegExp(pattern, flag),
-    settings.nodeName.toUpperCase(),
-    settings.className
-  );
-
-  return node;
-}
-
-export function unhighlightHTML(opts = {}) {
-  let settings = {
-    nodeName: "span",
-    className: "highlighted"
-  };
-
-  Object.assign(settings, opts);
-
-  document
-    .querySelectorAll(`${settings.nodeName}.${settings.className}`)
-    .forEach(e => {
-      const parentNode = e.parentNode;
-      parentNode.replaceChild(e.firstChild, e);
-      parentNode.normalize();
-    });
-}
diff --git a/app/assets/javascripts/discourse/lib/highlight-search.js b/app/assets/javascripts/discourse/lib/highlight-text.js
similarity index 71%
rename from app/assets/javascripts/discourse/lib/highlight-search.js
rename to app/assets/javascripts/discourse/lib/highlight-text.js
index 870e9c3693..6fa7a09faf 100644
--- a/app/assets/javascripts/discourse/lib/highlight-search.js
+++ b/app/assets/javascripts/discourse/lib/highlight-text.js
@@ -1,5 +1,4 @@
 import { PHRASE_MATCH_REGEXP_PATTERN } from "discourse/lib/concerns/search-constants";
-import highlightHTML from "discourse/lib/highlight-html";
 
 export const CLASS_NAME = "search-highlight";
 
@@ -12,10 +11,8 @@ export default function($elem, term, opts = {}) {
     );
 
     words = words.map(w => w.replace(/^"(.*)"$/, "$1"));
-    const highlightOpts = { wholeWord: true };
+    const highlightOpts = { wordsOnly: true };
     if (!opts.defaultClassName) highlightOpts.className = CLASS_NAME;
-    for (let i = 0; i <= $elem.length; i++) {
-      highlightHTML($elem[0], words, highlightOpts);
-    }
+    $elem.highlight(words, highlightOpts);
   }
 }
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 2ed17fa1bd..9394f35486 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -88,7 +88,7 @@
 
                   <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-search highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
+                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -112,9 +112,9 @@
                   </span>
 
                   {{#if result.blurb}}
-                    {{#highlight-search highlight=highlightQuery}}
+                    {{#highlight-text highlight=highlightQuery}}
                       {{html-safe result.blurb}}
-                    {{/highlight-search}}
+                    {{/highlight-text}}
                   {{/if}}
                 </div>
 
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js b/app/assets/javascripts/discourse/widgets/post-cooked.js
index c16820de44..3d55314f08 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js
@@ -2,11 +2,7 @@ import { iconHTML } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
 import { isValidLink } from "discourse/lib/click-track";
 import { number } from "discourse/lib/formatter";
-import highlightSearch from "discourse/lib/highlight-search";
-import {
-  default as highlightHTML,
-  unhighlightHTML
-} from "discourse/lib/highlight-html";
+import highlightText from "discourse/lib/highlight-text";
 
 let _decorators = [];
 
@@ -56,13 +52,13 @@ export default class PostCooked {
 
     if (highlight && highlight.length > 2) {
       if (this._highlighted) {
-        unhighlightHTML($html[0]);
+        $html.unhighlight();
       }
 
-      highlightSearch($html, highlight, { defaultClassName: true });
+      highlightText($html, highlight, { defaultClassName: true });
       this._highlighted = true;
     } else if (this._highlighted) {
-      unhighlightHTML($html[0]);
+      $html.unhighlight();
       this._highlighted = false;
     }
   }
@@ -179,8 +175,10 @@ export default class PostCooked {
           div.html(result.cooked);
           _decorators.forEach(cb => cb(div, this.decoratorHelper));
 
-          highlightHTML(div[0], originalText, {
-            matchCase: true
+          div.highlight(originalText, {
+            caseSensitive: true,
+            element: "span",
+            className: "highlighted"
           });
           $blockQuote.showHtml(div, "fast", finished);
         })
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js b/app/assets/javascripts/discourse/widgets/search-menu-results.js
index e85eefcd8e..636c069f94 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js
@@ -3,7 +3,7 @@ import { dateNode } from "discourse/helpers/node";
 import RawHtml from "discourse/widgets/raw-html";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
-import highlightSearch from "discourse/lib/highlight-search";
+import highlightText from "discourse/lib/highlight-text";
 import { escapeExpression, formatUsername } from "discourse/lib/utilities";
 import { iconNode } from "discourse-common/lib/icon-library";
 import renderTag from "discourse/lib/render-tag";
@@ -15,7 +15,7 @@ class Highlighted extends RawHtml {
   }
 
   decorate($html) {
-    highlightSearch($html, this.term);
+    highlightText($html, this.term);
   }
 }
 
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 39626bfd19..3b36c27ea1 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -29,4 +29,5 @@
 //= require jquery.autoellipsis-1.0.10
 //= require virtual-dom
 //= require virtual-dom-amd
+//= require highlight.js
 //= require intersection-observer
diff --git a/db/migrate/20200323155812_add_post_thumbnails.rb b/db/migrate/20200323155812_add_post_thumbnails.rb
new file mode 100644
index 0000000000..01ea53c1b0
--- /dev/null
+++ b/db/migrate/20200323155812_add_post_thumbnails.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddPostThumbnails < ActiveRecord::Migration[6.0]
+  def change
+    add_table :post_thumbnails do |t|
+      t.references :posts, foreign_key: { to_table: :posts }, null: false
+    end
+
+  end
+end
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6
index c9567ad8b5..1b930c7905 100644
--- a/test/javascripts/acceptance/search-test.js.es6
+++ b/test/javascripts/acceptance/search-test.js.es6
@@ -94,7 +94,7 @@ QUnit.test("Search with context", async assert => {
 
   const highlighted = [];
 
-  find("#post_7 span.highlighted").map((_, span) => {
+  find("#post_7 span.highlight-strong").map((_, span) => {
     highlighted.push(span.innerText);
   });
 
diff --git a/test/javascripts/lib/highlight-search-test.js.es6 b/test/javascripts/lib/highlight-search-test.js.es6
deleted file mode 100644
index 2a2524f765..0000000000
--- a/test/javascripts/lib/highlight-search-test.js.es6
+++ /dev/null
@@ -1,48 +0,0 @@
-import highlightSearch, { CLASS_NAME } from "discourse/lib/highlight-search";
-import { fixture } from "helpers/qunit-helpers";
-
-QUnit.module("lib:highlight-search");
-
-QUnit.test("highlighting text", assert => {
-  fixture().html(
-    `
-    <p>This is some text to highlight</p>
-    `
-  );
-
-  highlightSearch(fixture(), "some text");
-
-  const terms = [];
-
-  fixture(`.${CLASS_NAME}`).each((_, elem) => {
-    terms.push(elem.textContent);
-  });
-
-  assert.equal(
-    terms.join(" "),
-    "some text",
-    "it should highlight the terms correctly"
-  );
-});
-
-QUnit.test("highlighting unicode text", assert => {
-  fixture().html(
-    `
-    <p>This is some தமிழ் and русский text to highlight</p>
-    `
-  );
-
-  highlightSearch(fixture(), "தமிழ் русский");
-
-  const terms = [];
-
-  fixture(`.${CLASS_NAME}`).each((_, elem) => {
-    terms.push(elem.textContent);
-  });
-
-  assert.equal(
-    terms.join(" "),
-    "தமிழ் русский",
-    "it should highlight the terms correctly"
-  );
-});
diff --git a/test/javascripts/lib/highlight-text-test.js.es6 b/test/javascripts/lib/highlight-text-test.js.es6
new file mode 100644
index 0000000000..d222b8a753
--- /dev/null
+++ b/test/javascripts/lib/highlight-text-test.js.es6
@@ -0,0 +1,26 @@
+import highlightText, { CLASS_NAME } from "discourse/lib/highlight-text";
+import { fixture } from "helpers/qunit-helpers";
+
+QUnit.module("lib:highlight-text");
+
+QUnit.test("highlighting text", assert => {
+  fixture().html(
+    `
+    <p>This is some text to highlight</p>
+    `
+  );
+
+  highlightText(fixture(), "some text");
+
+  const terms = [];
+
+  fixture(`.${CLASS_NAME}`).each((_, elem) => {
+    terms.push(elem.textContent);
+  });
+
+  assert.equal(
+    terms.join(" "),
+    "some text",
+    "it should highlight the terms correctly"
+  );
+});
diff --git a/vendor/assets/javascripts/highlight.js b/vendor/assets/javascripts/highlight.js
new file mode 100644
index 0000000000..c13dd7ff9f
--- /dev/null
+++ b/vendor/assets/javascripts/highlight.js
@@ -0,0 +1,108 @@
+// forked cause we may want to amend the logic a bit
+/*
+ * jQuery Highlight plugin
+ *
+ * Based on highlight v3 by Johann Burkard
+ * http://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html
+ *
+ * Code a little bit refactored and cleaned (in my humble opinion).
+ * Most important changes:
+ *  - has an option to highlight only entire words (wordsOnly - false by default),
+ *  - has an option to be case sensitive (caseSensitive - false by default)
+ *  - highlight element tag and class names can be specified in options
+ *
+ * Usage:
+ *   // wrap every occurrance of text 'lorem' in content
+ *   // with <span class='highlight'> (default options)
+ *   $('#content').highlight('lorem');
+ *
+ *   // search for and highlight more terms at once
+ *   // so you can save some time on traversing DOM
+ *   $('#content').highlight(['lorem', 'ipsum']);
+ *   $('#content').highlight('lorem ipsum');
+ *
+ *   // search only for entire word 'lorem'
+ *   $('#content').highlight('lorem', { wordsOnly: true });
+ *
+ *   // don't ignore case during search of term 'lorem'
+ *   $('#content').highlight('lorem', { caseSensitive: true });
+ *
+ *   // wrap every occurrance of term 'ipsum' in content
+ *   // with <em class='important'>
+ *   $('#content').highlight('ipsum', { element: 'em', className: 'important' });
+ *
+ *   // remove default highlight
+ *   $('#content').unhighlight();
+ *
+ *   // remove custom highlight
+ *   $('#content').unhighlight({ element: 'em', className: 'important' });
+ *
+ *
+ * Copyright (c) 2009 Bartek Szopka
+ *
+ * Licensed under MIT license.
+ *
+ */
+
+jQuery.extend({
+    highlight: function (node, re, nodeName, className) {
+        if (node.nodeType === 3) {
+            var match = node.data.match(re);
+            if (match) {
+                var highlight = document.createElement(nodeName || 'span');
+                highlight.className = className || 'highlight';
+                var wordNode = node.splitText(match.index);
+                wordNode.splitText(match[0].length);
+                var wordClone = wordNode.cloneNode(true);
+                highlight.appendChild(wordClone);
+                wordNode.parentNode.replaceChild(highlight, wordNode);
+                return 1; //skip added node in parent
+            }
+        } else if ((node.nodeType === 1 && node.childNodes) && // only element nodes that have children
+                !/(script|style)/i.test(node.tagName) && // ignore script and style nodes
+                !(node.tagName === nodeName.toUpperCase() && node.className === className)) { // skip if already highlighted
+            for (var i = 0; i < node.childNodes.length; i++) {
+                i += jQuery.highlight(node.childNodes[i], re, nodeName, className);
+            }
+        }
+        return 0;
+    }
+});
+
+jQuery.fn.unhighlight = function (options) {
+    var settings = { className: 'highlight-strong', element: 'span' };
+    jQuery.extend(settings, options);
+
+    return this.find(settings.element + "." + settings.className).each(function () {
+        var parent = this.parentNode;
+        parent.replaceChild(this.firstChild, this);
+        parent.normalize();
+    }).end();
+};
+
+jQuery.fn.highlight = function (words, options) {
+    var settings = { className: 'highlight-strong', element: 'span', caseSensitive: false, wordsOnly: false };
+    jQuery.extend(settings, options);
+
+    if (words.constructor === String) {
+        words = [words];
+    }
+    words = jQuery.grep(words, function(word){
+      return word !== '';
+    });
+    words = jQuery.map(words, function(word) {
+      return word.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+    });
+    if (words.length === 0) { return this; }
+
+    var flag = settings.caseSensitive ? "" : "i";
+    var pattern = "(" + words.join("|") + ")";
+    if (settings.wordsOnly) {
+        pattern = "\\b" + pattern + "\\b";
+    }
+    var re = new RegExp(pattern, flag);
+
+    return this.each(function () {
+        jQuery.highlight(this, re, settings.element, settings.className);
+    });
+};

From 2ed0f8d120b16a2d53c170293c7286efffa399f3 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 25 Mar 2020 14:49:59 +0000
Subject: [PATCH 256/633] DEV: Remove migration which was erroneously added in
 d62d258f

---
 db/migrate/20200323155812_add_post_thumbnails.rb | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 db/migrate/20200323155812_add_post_thumbnails.rb

diff --git a/db/migrate/20200323155812_add_post_thumbnails.rb b/db/migrate/20200323155812_add_post_thumbnails.rb
deleted file mode 100644
index 01ea53c1b0..0000000000
--- a/db/migrate/20200323155812_add_post_thumbnails.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-class AddPostThumbnails < ActiveRecord::Migration[6.0]
-  def change
-    add_table :post_thumbnails do |t|
-      t.references :posts, foreign_key: { to_table: :posts }, null: false
-    end
-
-  end
-end

From 7d7c5641b44e56f0698874631713dce806fe80f0 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Mar 2020 15:51:30 +0100
Subject: [PATCH 257/633] DEV: allows to use routeAction from
 components/widgets (#9267)

ATM this is only usable as a helper in templates.
---
 .../discourse/helpers/route-action.js         | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/discourse/helpers/route-action.js b/app/assets/javascripts/discourse/helpers/route-action.js
index 4e010498bd..1de922938a 100644
--- a/app/assets/javascripts/discourse/helpers/route-action.js
+++ b/app/assets/javascripts/discourse/helpers/route-action.js
@@ -32,29 +32,32 @@ function getRouteWithAction(router, actionName) {
   return { action, handler };
 }
 
+export function routeAction(actionName, router, ...params) {
+  assert("[ember-route-action-helper] Unable to lookup router", router);
+
+  runInDebug(() => {
+    let { handler } = getRouteWithAction(router, actionName);
+    assert(
+      `[ember-route-action-helper] Unable to find action ${actionName}`,
+      handler
+    );
+  });
+
+  return function(...invocationArgs) {
+    let { action, handler } = getRouteWithAction(router, actionName);
+    let args = params.concat(invocationArgs);
+    return run.join(handler, action, ...args);
+  };
+}
+
 export default Helper.extend({
-  router: computed(function() {
-    return getOwner(this).lookup("router:main");
-  }).readOnly(),
+  router: computed({
+    get() {
+      return getOwner(this).lookup("router:main");
+    }
+  }),
 
   compute([actionName, ...params]) {
-    let router = get(this, "router");
-    assert("[ember-route-action-helper] Unable to lookup router", router);
-
-    runInDebug(() => {
-      let { handler } = getRouteWithAction(router, actionName);
-      assert(
-        `[ember-route-action-helper] Unable to find action ${actionName}`,
-        handler
-      );
-    });
-
-    let routeAction = function(...invocationArgs) {
-      let { action, handler } = getRouteWithAction(router, actionName);
-      let args = params.concat(invocationArgs);
-      return run.join(handler, action, ...args);
-    };
-
-    return routeAction;
+    return routeAction(actionName, get(this, "router"), ...params);
   }
 });

From 3ae26c6c59c8f9bfaabc3241495194a119026c78 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 25 Mar 2020 17:11:33 +0200
Subject: [PATCH 258/633] FEATURE: List search menu shortcuts in instructions
 modal (#9273)

---
 .../discourse/controllers/keyboard-shortcuts-help.js   | 10 ++++++++++
 .../templates/modal/keyboard-shortcuts-help.hbs        |  7 +++++++
 config/locales/client.en.yml                           |  4 ++++
 3 files changed, 21 insertions(+)

diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
index 1c2d8f4221..62feb5b404 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
@@ -172,6 +172,16 @@ export default Controller.extend(ModalFunctionality, {
         keys1: [SHIFT, "a"],
         keysDelimiter: PLUS
       })
+    },
+    search_menu: {
+      prev_next: buildShortcut("search_menu.prev_next", {
+        keys1: ["&uarr;"],
+        keys2: ["&darr;"],
+        shortcutsDelimiter: "slash"
+      }),
+      insert_url: buildShortcut("search_menu.insert_url", {
+        keys1: ["a"]
+      })
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 2203c90174..cfa90cb67e 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -78,5 +78,12 @@
         <li>{{html-safe shortcuts.actions.topic_admin_actions}}</li>
       </ul>
     </section>
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.search_menu.title"}}</h4>
+      <ul>
+        <li>{{html-safe shortcuts.search_menu.prev_next}}</li>
+        <li>{{html-safe shortcuts.search_menu.insert_url}}</li>
+      </ul>
+    </section>
   </div>
 {{/d-modal-body}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e9ad9aac7c..a793ae920d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3091,6 +3091,10 @@ en:
         print: "%{shortcut} Print topic"
         defer: "%{shortcut} Defer topic"
         topic_admin_actions: "%{shortcut} Open topic admin actions"
+      search_menu:
+        title: "Search Menu"
+        prev_next: "%{shortcut} Move selection up and down"
+        insert_url: "%{shortcut} Insert selection into open composer"
 
     badges:
       earned_n_times:

From 55b8620b4333dd616400803cdfe580cef3ea9630 Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Wed, 25 Mar 2020 12:57:31 -0300
Subject: [PATCH 259/633] FIX: TopicEmbed#absolutize_urls was trying to modify
 a frozen string

---
 app/models/topic_embed.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index b71726d413..15922f7c4c 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -192,7 +192,7 @@ class TopicEmbed < ActiveRecord::Base
       return contents
     end
     prefix = "#{uri.scheme}://#{uri.host}"
-    prefix << ":#{uri.port}" if uri.port != 80 && uri.port != 443
+    prefix += ":#{uri.port}" if uri.port != 80 && uri.port != 443
 
     fragment = Nokogiri::HTML.fragment("<div>#{contents}</div>")
     fragment.css('a').each do |a|

From f2f8ede22c7a7905a1465674779d1d1f01b24cdf Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 11:30:33 -0400
Subject: [PATCH 260/633] Last ES6 files in our app/assets/javascripts

---
 .../{activate-account.js.es6 => activate-account.js}      | 0
 .../{auto-redirect.js.es6 => auto-redirect.js}            | 0
 .../confirm-new-email/{bootstrap.js.es6 => bootstrap.js}  | 0
 .../{confirm-new-email.js.es6 => confirm-new-email.js}    | 0
 .../{auth-token-dropdown.es6 => auth-token-dropdown.js}   | 0
 ...ities.js.es6.erb => category-search-priorities.js.erb} | 0
 .../helpers/{loading-spinner.es6 => loading-spinner.js}   | 0
 ...earch-constants.js.es6.erb => search-constants.js.erb} | 0
 .../models/{live-post-counts.es6 => live-post-counts.js}  | 0
 .../{embed-application.js.es6 => embed-application.js}    | 0
 .../{google-tag-manager.js.es6 => google-tag-manager.js}  | 0
 ...sal-analytics.js.es6 => google-universal-analytics.js} | 0
 lib/discourse_js_processor.rb                             | 8 +++++++-
 13 files changed, 7 insertions(+), 1 deletion(-)
 rename app/assets/javascripts/{activate-account.js.es6 => activate-account.js} (100%)
 rename app/assets/javascripts/{auto-redirect.js.es6 => auto-redirect.js} (100%)
 rename app/assets/javascripts/confirm-new-email/{bootstrap.js.es6 => bootstrap.js} (100%)
 rename app/assets/javascripts/confirm-new-email/{confirm-new-email.js.es6 => confirm-new-email.js} (100%)
 rename app/assets/javascripts/discourse/components/{auth-token-dropdown.es6 => auth-token-dropdown.js} (100%)
 rename app/assets/javascripts/discourse/components/concerns/{category-search-priorities.js.es6.erb => category-search-priorities.js.erb} (100%)
 rename app/assets/javascripts/discourse/helpers/{loading-spinner.es6 => loading-spinner.js} (100%)
 rename app/assets/javascripts/discourse/lib/concerns/{search-constants.js.es6.erb => search-constants.js.erb} (100%)
 rename app/assets/javascripts/discourse/models/{live-post-counts.es6 => live-post-counts.js} (100%)
 rename app/assets/javascripts/{embed-application.js.es6 => embed-application.js} (100%)
 rename app/assets/javascripts/{google-tag-manager.js.es6 => google-tag-manager.js} (100%)
 rename app/assets/javascripts/{google-universal-analytics.js.es6 => google-universal-analytics.js} (100%)

diff --git a/app/assets/javascripts/activate-account.js.es6 b/app/assets/javascripts/activate-account.js
similarity index 100%
rename from app/assets/javascripts/activate-account.js.es6
rename to app/assets/javascripts/activate-account.js
diff --git a/app/assets/javascripts/auto-redirect.js.es6 b/app/assets/javascripts/auto-redirect.js
similarity index 100%
rename from app/assets/javascripts/auto-redirect.js.es6
rename to app/assets/javascripts/auto-redirect.js
diff --git a/app/assets/javascripts/confirm-new-email/bootstrap.js.es6 b/app/assets/javascripts/confirm-new-email/bootstrap.js
similarity index 100%
rename from app/assets/javascripts/confirm-new-email/bootstrap.js.es6
rename to app/assets/javascripts/confirm-new-email/bootstrap.js
diff --git a/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6 b/app/assets/javascripts/confirm-new-email/confirm-new-email.js
similarity index 100%
rename from app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6
rename to app/assets/javascripts/confirm-new-email/confirm-new-email.js
diff --git a/app/assets/javascripts/discourse/components/auth-token-dropdown.es6 b/app/assets/javascripts/discourse/components/auth-token-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/auth-token-dropdown.es6
rename to app/assets/javascripts/discourse/components/auth-token-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.es6.erb b/app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb
similarity index 100%
rename from app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.es6.erb
rename to app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb
diff --git a/app/assets/javascripts/discourse/helpers/loading-spinner.es6 b/app/assets/javascripts/discourse/helpers/loading-spinner.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/loading-spinner.es6
rename to app/assets/javascripts/discourse/helpers/loading-spinner.js
diff --git a/app/assets/javascripts/discourse/lib/concerns/search-constants.js.es6.erb b/app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb
similarity index 100%
rename from app/assets/javascripts/discourse/lib/concerns/search-constants.js.es6.erb
rename to app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb
diff --git a/app/assets/javascripts/discourse/models/live-post-counts.es6 b/app/assets/javascripts/discourse/models/live-post-counts.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/live-post-counts.es6
rename to app/assets/javascripts/discourse/models/live-post-counts.js
diff --git a/app/assets/javascripts/embed-application.js.es6 b/app/assets/javascripts/embed-application.js
similarity index 100%
rename from app/assets/javascripts/embed-application.js.es6
rename to app/assets/javascripts/embed-application.js
diff --git a/app/assets/javascripts/google-tag-manager.js.es6 b/app/assets/javascripts/google-tag-manager.js
similarity index 100%
rename from app/assets/javascripts/google-tag-manager.js.es6
rename to app/assets/javascripts/google-tag-manager.js
diff --git a/app/assets/javascripts/google-universal-analytics.js.es6 b/app/assets/javascripts/google-universal-analytics.js
similarity index 100%
rename from app/assets/javascripts/google-universal-analytics.js.es6
rename to app/assets/javascripts/google-universal-analytics.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 3e101328cf..bbadfa84af 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -43,11 +43,17 @@ class DiscourseJsProcessor
       relative_path.start_with?("app/assets/javascripts/wizard/") ||
       relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
       relative_path.start_with?("app/assets/javascripts/ember-addons/") ||
+      relative_path.start_with?("app/assets/javascripts/confirm-new-email/") ||
       relative_path == "app/assets/javascripts/preload-store.js" ||
       relative_path == "app/assets/javascripts/preload-application-data.js" ||
       relative_path == "app/assets/javascripts/wizard-start.js" ||
       relative_path == "app/assets/javascripts/onpopstate-handler.js" ||
-      relative_path == "app/assets/javascripts/discourse.js"
+      relative_path == "app/assets/javascripts/discourse.js" ||
+      relative_path == "app/assets/javascripts/google-tag-manager.js" ||
+      relative_path == "app/assets/javascripts/google-universal-analytics.js" ||
+      relative_path == "app/assets/javascripts/activate-account.js" ||
+      relative_path == "app/assets/javascripts/auto-redirect.js" ||
+      relative_path == "app/assets/javascripts/embed-application.js"
   end
 
   def self.skip_module?(data)

From 0025806b7ea9fbac10ed63d1001d25c2b433e7d7 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 12:30:08 -0400
Subject: [PATCH 261/633] Ignore latest

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 5e86efd0f0..eec6fc3a2f 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -31,3 +31,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # Rename some root files
 11938d58d4b1bea1ff43306450da7b24f05db0a
+
+# The last remaining ES6
+aabeb17aab4e73de5ef56753ab22ef5d416d2932

From c14f6d4ceda5fec6cb1730fb37d5426ef154d74a Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 25 Mar 2020 11:36:42 -0500
Subject: [PATCH 262/633] FEATURE: Allow plugins to exclude wizard steps
 (#9275)

---
 lib/wizard.rb                         |  8 ++++++++
 spec/components/wizard/wizard_spec.rb | 20 ++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/lib/wizard.rb b/lib/wizard.rb
index a254d8935d..f334081444 100644
--- a/lib/wizard.rb
+++ b/lib/wizard.rb
@@ -5,6 +5,8 @@ class Wizard
   attr_reader :steps, :user
   attr_accessor :max_topics_to_require_completion
 
+  @@excluded_steps = []
+
   def initialize(user)
     @steps = []
     @user = user
@@ -17,6 +19,8 @@ class Wizard
   end
 
   def append_step(step)
+    return if @@excluded_steps.include?(step)
+
     step = create_step(step) if step.is_a?(String)
 
     yield step if block_given?
@@ -36,6 +40,10 @@ class Wizard
     end
   end
 
+  def self.exclude_step(step)
+    @@excluded_steps << step
+  end
+
   def steps_with_fields
     @steps_with_fields ||= @steps.select(&:has_fields?)
   end
diff --git a/spec/components/wizard/wizard_spec.rb b/spec/components/wizard/wizard_spec.rb
index bf5490adef..0faef40829 100644
--- a/spec/components/wizard/wizard_spec.rb
+++ b/spec/components/wizard/wizard_spec.rb
@@ -61,6 +61,26 @@ describe Wizard do
     end
   end
 
+  describe ".exclude_step" do
+    let(:user) { Fabricate.build(:moderator) }
+    let(:wizard) { Wizard.new(user) }
+
+    it 'excludes steps even if they are added via append_step' do
+      wizard.append_step('first') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+
+      Wizard.exclude_step("random-step123")
+
+      wizard.append_step('random-step123') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('finished')
+
+      expect(wizard.steps.map(&:id)).to eq(['first', 'finished'])
+    end
+  end
+
   describe "completed?" do
     let(:user) { Fabricate.build(:moderator) }
     let(:wizard) { Wizard.new(user) }

From 105cc5505c4efe4edd43b6fe409667f34db53a43 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Mar 2020 17:57:43 +0100
Subject: [PATCH 263/633] FIX: ensures we have a date object in date-time-input
 (#9276)

---
 .../discourse/components/date-time-input.js           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/components/date-time-input.js
index 392dc5dac0..81a7a10b92 100644
--- a/app/assets/javascripts/discourse/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/components/date-time-input.js
@@ -7,19 +7,20 @@ export default Component.extend({
   showTime: true,
 
   _hours: computed("date", function() {
-    return this.date && this.showTime ? this.date.getHours() : null;
+    return this.date && this.showTime ? new Date(this.date).getHours() : null;
   }),
 
   _minutes: computed("date", function() {
-    return this.date && this.showTime ? this.date.getMinutes() : null;
+    return this.date && this.showTime ? new Date(this.date).getMinutes() : null;
   }),
 
   actions: {
     onChangeTime(time) {
       if (this.onChange) {
-        const year = this.date.getFullYear();
-        const month = this.date.getMonth();
-        const day = this.date.getDate();
+        const date = new Date(this.date);
+        const year = date.getFullYear();
+        const month = date.getMonth();
+        const day = date.getDate();
         this.onChange(new Date(year, month, day, time.hours, time.minutes));
       }
     },

From dbc323e12abb9d50a174bbe0de5c36ee54e66a12 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 25 Mar 2020 23:32:32 +0530
Subject: [PATCH 264/633] Fix the typo.

---
 app/assets/javascripts/select-kit/components/tag-chooser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js b/app/assets/javascripts/select-kit/components/tag-chooser.js
index ff43a16b66..65e7597aa9 100644
--- a/app/assets/javascripts/select-kit/components/tag-chooser.js
+++ b/app/assets/javascripts/select-kit/components/tag-chooser.js
@@ -25,7 +25,7 @@ export default MultiSelectComponent.extend(TagsMixin, {
   excludeHasSynonyms: false,
 
   canCreateTag: computed("site.can_create_tag", "allowCreate", function() {
-    return this.allowCreate || this.site.can_create_tag;
+    return this.allowCreate && this.site.can_create_tag;
   }),
 
   maximumTagCount: computed(

From 6acbd1bedfaa1c8f6d3e48cc928f3d7038333d58 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Mar 2020 19:05:11 +0100
Subject: [PATCH 265/633] DEV: allows time-input to be clearable (#9277)

---
 app/assets/javascripts/discourse/components/date-input.js   | 6 +++++-
 .../javascripts/discourse/components/date-time-input.js     | 5 +++++
 .../templates/components/date-time-input-range.hbs          | 1 +
 .../discourse/templates/components/date-time-input.hbs      | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/date-input.js b/app/assets/javascripts/discourse/components/date-input.js
index 7bb967455f..0aaea9304b 100644
--- a/app/assets/javascripts/discourse/components/date-input.js
+++ b/app/assets/javascripts/discourse/components/date-input.js
@@ -32,10 +32,14 @@ export default Component.extend({
   didUpdateAttrs() {
     this._super(...arguments);
 
-    if (this._picker && typeof date === "string") {
+    if (this._picker && typeof this.date === "string") {
       const [year, month, day] = this.date.split("-").map(x => parseInt(x, 10));
       this._picker.setDate(new Date(year, month - 1, day), true);
     }
+
+    if (this._picker && !this.date) {
+      this._picker.setDate(null);
+    }
   },
 
   _loadPikadayPicker(container) {
diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/components/date-time-input.js
index 81a7a10b92..eff8b99edc 100644
--- a/app/assets/javascripts/discourse/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/components/date-time-input.js
@@ -5,6 +5,7 @@ export default Component.extend({
   classNames: ["d-date-time-input"],
   date: null,
   showTime: true,
+  clearable: false,
 
   _hours: computed("date", function() {
     return this.date && this.showTime ? new Date(this.date).getHours() : null;
@@ -15,6 +16,10 @@ export default Component.extend({
   }),
 
   actions: {
+    onClear() {
+      this.onChange(null);
+    },
+
     onChangeTime(time) {
       if (this.onChange) {
         const date = new Date(this.date);
diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs b/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
index e4476ae948..0df2fbcc70 100644
--- a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
@@ -30,5 +30,6 @@
     date=to
     onChange=(action "_onChange" (hash prop="to"))
     showTime=showToTime
+    clearable=true
   }}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input.hbs b/app/assets/javascripts/discourse/templates/components/date-time-input.hbs
index a2da31c28c..0b243e74a4 100644
--- a/app/assets/javascripts/discourse/templates/components/date-time-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-time-input.hbs
@@ -6,4 +6,8 @@
     minutes=_minutes
     onChange=(action "onChangeTime")
   }}
+
+  {{#if clearable}}
+    {{d-button icon="times" action=(action "onClear")}}
+  {{/if}}
 {{/if}}

From b09f79366e5c31073687d56a384f35cab77f1b96 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 25 Mar 2020 23:37:46 +0530
Subject: [PATCH 266/633] UX: disallow tag creation in "default tags" site
 setting choosers.

---
 .../admin/templates/components/site-settings/tag-list.hbs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 21e7e1ab0a..1fb69c595b 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
-{{tag-chooser tags=selectedTags}}
+{{tag-chooser tags=selectedTags allowCreate=false}}
 <div class='desc'>{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}

From 6a1fe9ff8743db44fcd7620cd52b762a2bcbfd0e Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 25 Mar 2020 11:30:39 -0700
Subject: [PATCH 267/633] FIX: Use 1 column instead of 4 for permalink
 destination (#9260)

---
 .../javascripts/admin/models/permalink.js     | 13 ++++++++++++
 .../admin/templates/permalinks.hbs            | 20 +++++++------------
 config/locales/client.en.yml                  |  1 +
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/admin/models/permalink.js b/app/assets/javascripts/admin/models/permalink.js
index b86e931692..b13dcd6f52 100644
--- a/app/assets/javascripts/admin/models/permalink.js
+++ b/app/assets/javascripts/admin/models/permalink.js
@@ -1,4 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import DiscourseURL from "discourse/lib/url";
+import Category from "discourse/models/category";
 import EmberObject from "@ember/object";
 
 const Permalink = EmberObject.extend({
@@ -13,6 +16,16 @@ const Permalink = EmberObject.extend({
     });
   },
 
+  @discourseComputed("category_id")
+  category: function(category_id) {
+    return Category.findById(category_id);
+  },
+
+  @discourseComputed("external_url")
+  linkIsExternal: function(external_url) {
+    return !DiscourseURL.isInternal(external_url);
+  },
+
   destroy: function() {
     return ajax("/admin/permalinks/" + this.id + ".json", {
       type: "DELETE"
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index 7c7ac2df6b..a9f1067909 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -15,33 +15,27 @@
     <table class='admin-logs-table permalinks grid'>
       <thead class="heading-container">
         <th class="col heading first url">{{i18n 'admin.permalink.url'}}</th>
-        <th class="col heading topic">{{i18n 'admin.permalink.topic_title'}}</th>
-        <th class="col heading post">{{i18n 'admin.permalink.post_title'}}</th>
-        <th class="col heading category">{{i18n 'admin.permalink.category_title'}}</th>
-        <th class="col heading external_url">{{i18n 'admin.permalink.external_url'}}</th>
+        <th class="col heading destination">{{i18n 'admin.permalink.destination'}}</th>
         <th class="col heading actions"></th>
       </thead>
       <tbody>
         {{#each model as |pl|}}
           <tr class="admin-list-item">
             <td class="col first url">{{pl.url}}</td>
-            <td class="col topic">
+            <td class="col destination">
               {{#if pl.topic_id}}
                 <a href={{pl.topic_url}}>{{pl.topic_title}}</a>
               {{/if}}
-            </td>
-            <td class="col post">
               {{#if pl.post_id}}
-                <a href={{pl.post_url}}>#{{pl.post_number}} {{pl.post_topic_title}}</a>
+                <a href={{pl.post_url}}>{{pl.post_topic_title}} #{{pl.post_number}}</a>
               {{/if}}
-            </td>
-            <td class="col category">
               {{#if pl.category_id}}
-                <a href={{pl.category_url}}>{{pl.category_name}}</a>
+                {{category-link pl.category}}
               {{/if}}
-            </td>
-            <td class="col external_url">
               {{#if pl.external_url}}
+                {{#if pl.linkIsExternal}}
+                  {{d-icon "external-link-alt"}}
+                {{/if}}
                 <a href={{pl.external_url}}>{{pl.external_url}}</a>
               {{/if}}
             </td>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a793ae920d..50f5134381 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4593,6 +4593,7 @@ en:
         category_id: "Category ID"
         category_title: "Category"
         external_url: "External URL"
+        destination: "Destination"
         delete_confirm: Are you sure you want to delete this permalink?
         form:
           label: "New:"

From 2abe85b8344de1102c1589a9ac9421a8b296f2b5 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 14:51:05 -0400
Subject: [PATCH 268/633] Rename all test files from JS -> ES6

---
 lib/discourse_js_processor.rb                 | 39 ++++++++++---------
 .../{about-test.js.es6 => about-test.js}      |  0
 ...ed-test.js.es6 => account-created-test.js} |  0
 ...mails-test.js.es6 => admin-emails-test.js} |  0
 ...t.js.es6 => admin-search-log-term-test.js} |  0
 ...-test.js.es6 => admin-search-logs-test.js} |  0
 ...est.js.es6 => admin-site-settings-test.js} |  0
 ...xt-test.js.es6 => admin-site-text-test.js} |  0
 ...test.js.es6 => admin-suspend-user-test.js} |  0
 ...-test.js.es6 => admin-user-badges-test.js} |  0
 ...-test.js.es6 => admin-user-emails-test.js} |  0
 ...x-test.js.es6 => admin-user-index-test.js} |  0
 ...t-test.js.es6 => admin-users-list-test.js} |  0
 ...est.js.es6 => admin-watched-words-test.js} |  0
 ...lete-test.js.es6 => auth-complete-test.js} |  0
 .../{badges-test.js.es6 => badges-test.js}    |  0
 ...r-test.js.es6 => category-chooser-test.js} |  0
 ....js.es6 => category-edit-security-test.js} |  0
 ...edit-test.js.es6 => category-edit-test.js} |  0
 ...g-test.js.es6 => category-hashtag-test.js} |  0
 ...-track-test.js.es6 => click-track-test.js} |  0
 ...s-test.js.es6 => composer-actions-test.js} |  0
 ...est.js.es6 => composer-attachment-test.js} |  0
 ....js.es6 => composer-edit-conflict-test.js} |  0
 ...test.js.es6 => composer-hyperlink-test.js} |  0
 ...ox-test.js.es6 => composer-onebox-test.js} |  0
 ...{composer-test.js.es6 => composer-test.js} |  0
 ...st.js.es6 => composer-topic-links-test.js} |  0
 ....js.es6 => composer-uncategorized-test.js} |  0
 ...es6 => create-account-user-fields-test.js} |  0
 ...et-test.js.es6 => custom-html-set-test.js} |  0
 ...st.js.es6 => custom-html-template-test.js} |  0
 ...ashboard-test.js.es6 => dashboard-test.js} |  0
 ...otice-test.js.es6 => email-notice-test.js} |  0
 ...icker-test.js.es6 => emoji-picker-test.js} |  0
 .../{emoji-test.js.es6 => emoji-test.js}      |  0
 ...t.js.es6 => enforce-second-factor-test.js} |  0
 ...rd-test.js.es6 => forgot-password-test.js} |  0
 ...-test.js.es6 => group-card-mobile-test.js} |  0
 ...up-card-test.js.es6 => group-card-test.js} |  0
 ...-index-test.js.es6 => group-index-test.js} |  0
 ...s.es6 => group-manage-interaction-test.js} |  0
 ...-test.js.es6 => group-manage-logs-test.js} |  0
 ...js.es6 => group-manage-membership-test.js} |  0
 ...st.js.es6 => group-manage-profile-test.js} |  0
 ...sts-test.js.es6 => group-requests-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 ...index-test.js.es6 => groups-index-test.js} |  0
 ...ups-new-test.js.es6 => groups-new-test.js} |  0
 ...cept-test.js.es6 => invite-accept-test.js} |  0
 ...js.es6 => invite-show-user-fields-test.js} |  0
 .../{jump-to-test.js.es6 => jump-to-test.js}  |  0
 ...test.js.es6 => keyboard-shortcuts-test.js} |  0
 ...ect-test.js.es6 => login-redirect-test.js} |  0
 ...red-test.js.es6 => login-required-test.js} |  0
 ...mail-and-hide-email-address-taken-test.js} |  0
 ...n-with-email-and-no-social-logins-test.js} |  0
 ....es6 => login-with-email-disabled-test.js} |  0
 ...l-test.js.es6 => login-with-email-test.js} |  0
 ...y-test.js.es6 => mobile-discovery-test.js} |  0
 ...-in-test.js.es6 => mobile-sign-in-test.js} |  0
 ...users-test.js.es6 => mobile-users-test.js} |  0
 .../{modal-test.js.es6 => modal-test.js}      |  0
 ...essage-test.js.es6 => new-message-test.js} |  0
 ...ew-topic-test.js.es6 => new-topic-test.js} |  0
 ...set-test.js.es6 => password-reset-test.js} |  0
 ...e-test.js.es6 => personal-message-test.js} |  0
 ... => plugin-outlet-connector-class-test.js} |  0
 ...js.es6 => plugin-outlet-decorator-test.js} |  0
 ...6 => plugin-outlet-multi-template-test.js} |  0
 ... => plugin-outlet-single-template-test.js} |  0
 ...rences-test.js.es6 => preferences-test.js} |  0
 ...-test.js.es6 => raw-plugin-outlet-test.js} |  0
 ...op-test.js.es6 => redirect-to-top-test.js} |  0
 .../{reports-test.js.es6 => reports-test.js}  |  0
 .../{review-test.js.es6 => review-test.js}    |  0
 ...h-full-test.js.es6 => search-full-test.js} |  0
 ...bile-test.js.es6 => search-mobile-test.js} |  0
 .../{search-test.js.es6 => search-test.js}    |  0
 ...s.es6 => share-and-invite-desktop-test.js} |  0
 ...js.es6 => share-and-invite-mobile-test.js} |  0
 ...afts-test.js.es6 => shared-drafts-test.js} |  0
 .../{sign-in-test.js.es6 => sign-in-test.js}  |  0
 .../{static-test.js.es6 => static-test.js}    |  0
 ...-groups-test.js.es6 => tag-groups-test.js} |  0
 ...ashtag-test.js.es6 => tag-hashtag-test.js} |  0
 ...-test.js.es6 => tags-intersection-test.js} |  0
 .../{tags-test.js.es6 => tags-test.js}        |  0
 ...us-test.js.es6 => topic-anonymous-test.js} |  0
 ...ry-test.js.es6 => topic-discovery-test.js} |  0
 ...r-test.js.es6 => topic-edit-timer-test.js} |  0
 ...s6 => topic-footer-buttons-mobile-test.js} |  0
 ...s-test.js.es6 => topic-move-posts-test.js} |  0
 ...es6 => topic-notifications-button-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 .../{unknown-test.js.es6 => unknown-test.js}  |  0
 ...ous-test.js.es6 => user-anonymous-test.js} |  0
 ...e-test.js.es6 => user-card-mobile-test.js} |  0
 ...ser-card-test.js.es6 => user-card-test.js} |  0
 ...test.js.es6 => user-drafts-stream-test.js} |  0
 .../{user-test.js.es6 => user-test.js}        |  0
 .../{users-test.js.es6 => users-test.js}      |  0
 ...test.js.es6 => group-list-setting-test.js} |  0
 ...m-test.js.es6 => themes-list-item-test.js} |  0
 ...s-list-test.js.es6 => themes-list-test.js} |  0
 ...s6 => admin-customize-themes-show-test.js} |  0
 ....js.es6 => admin-customize-themes-test.js} |  0
 ...-test.js.es6 => admin-user-badges-test.js} |  0
 .../{theme-test.js.es6 => theme-test.js}      |  0
 ...-editor-test.js.es6 => ace-editor-test.js} |  0
 ...eport-test.js.es6 => admin-report-test.js} |  0
 ...-title-test.js.es6 => badge-title-test.js} |  0
 ...{d-button-test.js.es6 => d-button-test.js} |  0
 ...{d-editor-test.js.es6 => d-editor-test.js} |  0
 .../{d-icon-test.js.es6 => d-icon-test.js}    |  0
 ...e-input-test.js.es6 => date-input-test.js} |  0
 ...t.js.es6 => date-time-input-range-test.js} |  0
 ...ut-test.js.es6 => date-time-input-test.js} |  0
 ...js.es6 => group-membership-button-test.js} |  0
 ...r-test.js.es6 => html-safe-helper-test.js} |  0
 ...-html-test.js.es6 => iframed-html-test.js} |  0
 ...der-test.js.es6 => image-uploader-test.js} |  0
 ...test.js.es6 => keyboard-shortcuts-test.js} |  0
 ...oad-more-test.js.es6 => load-more-test.js} |  0
 ...-test.js.es6 => secret-value-list-test.js} |  0
 ...r-test.js.es6 => category-chooser-test.js} |  0
 ...drop-test.js.es6 => category-drop-test.js} |  0
 ...ombo-box-test.js.es6 => combo-box-test.js} |  0
 ...est.js.es6 => dropdown-select-box-test.js} |  0
 ...tting-test.js.es6 => list-setting-test.js} |  0
 ...r-test.js.es6 => mini-tag-chooser-test.js} |  0
 ...elect-test.js.es6 => multi-select-test.js} |  0
 ...st.js.es6 => notifications-button-test.js} |  0
 ...ons-test.js.es6 => pinned-options-test.js} |  0
 ...elper.js.es6 => select-kit-test-helper.js} |  0
 ...lect-test.js.es6 => single-select-test.js} |  0
 ...{tag-drop-test.js.es6 => tag-drop-test.js} |  0
 ...es6 => topic-notifications-button-test.js} |  0
 ...s6 => topic-notifications-options-test.js} |  0
 ...ooser-test.js.es6 => user-chooser-test.js} |  0
 ...utton-test.js.es6 => share-button-test.js} |  0
 .../{share-button.js.es6 => share-button.js}  |  0
 ...t-field-test.js.es6 => text-field-test.js} |  0
 ...flow-test.js.es6 => text-overflow-test.js} |  0
 ...e-input-test.js.es6 => time-input-test.js} |  0
 ...ctor-test.js.es6 => user-selector-test.js} |  0
 ...ue-list-test.js.es6 => value-list-test.js} |  0
 ...or-test.js.es6 => avatar-selector-test.js} |  0
 ...{bookmark-test.js.es6 => bookmark-test.js} |  0
 ...unt-test.js.es6 => create-account-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 .../{history-test.js.es6 => history-test.js}  |  0
 ...est.js.es6 => preferences-account-test.js} |  0
 ....es6 => preferences-second-factor-test.js} |  0
 ...test.js.es6 => reorder-categories-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 ...{resolver-test.js.es6 => resolver-test.js} |  0
 .../fixtures/{about.js.es6 => about.js}       |  0
 ...adges_fixture.js.es6 => badges_fixture.js} |  0
 ...y-fixtures.js.es6 => category-fixtures.js} |  0
 ...s.js.es6.erb => notification-types.js.erb} |  0
 ...rd-general.js.es6 => dashboard-general.js} |  0
 .../{dashboard.js.es6 => dashboard.js}        |  0
 ...-fixtures.js.es6 => directory-fixtures.js} |  0
 ..._fixtures.js.es6 => discovery_fixtures.js} |  0
 .../fixtures/{draft.js.es6 => draft.js}       |  0
 .../fixtures/{drafts.js.es6 => drafts.js}     |  0
 ...roup-fixtures.js.es6 => group-fixtures.js} |  0
 ...ups-fixtures.js.es6 => groups-fixtures.js} |  0
 ...xtures.js.es6 => notification_fixtures.js} |  0
 .../fixtures/{poll.js.es6 => poll.js}         |  0
 .../fixtures/{post.js.es6 => post.js}         |  0
 ...es.js.es6 => private_messages_fixtures.js} |  0
 .../fixtures/{problems.js.es6 => problems.js} |  0
 .../fixtures/{reports.js.es6 => reports.js}   |  0
 .../{reports_bulk.js.es6 => reports_bulk.js}  |  0
 ...rch-fixtures.js.es6 => search-fixtures.js} |  0
 ...on-fixtures.js.es6 => session-fixtures.js} |  0
 ...{site-fixtures.js.es6 => site-fixtures.js} |  0
 ...{site_settings.js.es6 => site_settings.js} |  0
 ...tic_fixtures.js.es6 => static_fixtures.js} |  0
 .../{top_fixture.js.es6 => top_fixture.js}    |  0
 .../fixtures/{topic.js.es6 => topic.js}       |  0
 .../{user-badges.js.es6 => user-badges.js}    |  0
 ...{user_fixtures.js.es6 => user_fixtures.js} |  0
 ...tures.js.es6 => watched-words-fixtures.js} |  0
 test/javascripts/helpers/assertions.js        | 13 ++++---
 ...omponent-test.js.es6 => component-test.js} |  0
 ...e-pretender.js.es6 => create-pretender.js} |  0
 .../{create-store.js.es6 => create-store.js}  |  0
 ...ditor-helper.js.es6 => d-editor-helper.js} |  0
 ...-pretender.js.es6 => fixture-pretender.js} |  0
 .../{html-helper.js.es6 => html-helper.js}    |  0
 test/javascripts/helpers/init-ember-qunit.js  |  2 -
 ...{qunit-helpers.js.es6 => qunit-helpers.js} |  0
 ...w-pretender.js.es6 => review-pretender.js} |  0
 ...kit-helper.js.es6 => select-kit-helper.js} |  0
 test/javascripts/helpers/site-settings.js     | 10 +++--
 .../helpers/{site.js.es6 => site.js}          |  0
 ...re-pretender.js.es6 => store-pretender.js} |  0
 ...er.js.es6 => textarea-selection-helper.js} |  0
 .../{widget-test.js.es6 => widget-test.js}    |  0
 ...ation-test.js.es6 => localization-test.js} |  0
 .../{bbcode-test.js.es6 => bbcode-test.js}    |  0
 ...tring-test.js.es6 => break-string-test.js} |  0
 ...dge-test.js.es6 => category-badge-test.js} |  0
 ...s.es6 => click-track-edit-history-test.js} |  0
 ...s.es6 => click-track-profile-page-test.js} |  0
 ...-track-test.js.es6 => click-track-test.js} |  0
 ...{computed-test.js.es6 => computed-test.js} |  0
 ...iscourse-test.js.es6 => discourse-test.js} |  0
 ...-store-test.js.es6 => emoji-store-test.js} |  0
 .../lib/{emoji-test.js.es6 => emoji-test.js}  |  0
 ...ormatter-test.js.es6 => formatter-test.js} |  0
 ...ext-test.js.es6 => highlight-text-test.js} |  0
 .../lib/{i18n-test.js.es6 => i18n-test.js}    |  0
 ...brary-test.js.es6 => icon-library-test.js} |  0
 ...re-test.js.es6 => key-value-store-test.js} |  0
 ...ions-test.js.es6 => link-mentions-test.js} |  0
 ...script-test.js.es6 => load-script-test.js} |  0
 ...{oneboxer-test.js.es6 => oneboxer-test.js} |  0
 ...tore-test.js.es6 => preload-store-test.js} |  0
 ...y-text-test.js.es6 => pretty-text-test.js} |  0
 ...anitizer-test.js.es6 => sanitizer-test.js} |  0
 ...track-test.js.es6 => screen-track-test.js} |  0
 .../{search-test.js.es6 => search-test.js}    |  0
 .../{sharing-test.js.es6 => sharing-test.js}  |  0
 ...ion-test.js.es6 => text-direction-test.js} |  0
 ...rkdown-test.js.es6 => to-markdown-test.js} |  0
 .../{tooltip-test.js.es6 => tooltip-test.js}  |  0
 ...l-test.js.es6 => upload-short-url-test.js} |  0
 .../{uploads-test.js.es6 => uploads-test.js}  |  0
 .../lib/{url-test.js.es6 => url-test.js}      |  0
 ...search-test.js.es6 => user-search-test.js} |  0
 ...tilities-test.js.es6 => utilities-test.js} |  0
 ...ister-test.js.es6 => white-lister-test.js} |  0
 ....js.es6 => grant-badge-controller-test.js} |  0
 ...ect-test.js.es6 => setting-object-test.js} |  0
 ...ingleton-test.js.es6 => singleton-test.js} |  0
 .../{badge-test.js.es6 => badge-test.js}      |  0
 ...{category-test.js.es6 => category-test.js} |  0
 ...{composer-test.js.es6 => composer-test.js} |  0
 ...mail-log-test.js.es6 => email-log-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 .../{invite-test.js.es6 => invite-test.js}    |  0
 ...{nav-item-test.js.es6 => nav-item-test.js} |  0
 ...stream-test.js.es6 => post-stream-test.js} |  0
 .../models/{post-test.js.es6 => post-test.js} |  0
 .../{report-test.js.es6 => report-test.js}    |  0
 ...t-model-test.js.es6 => rest-model-test.js} |  0
 ...ult-set-test.js.es6 => result-set-test.js} |  0
 .../{session-test.js.es6 => session-test.js}  |  0
 .../models/{site-test.js.es6 => site-test.js} |  0
 ...g-test.js.es6 => staff-action-log-test.js} |  0
 .../{store-test.js.es6 => store-test.js}      |  0
 ...ails-test.js.es6 => topic-details-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 ...st.js.es6 => topic-tracking-state-test.js} |  0
 ...action-test.js.es6 => user-action-test.js} |  0
 ...r-badge-test.js.es6 => user-badge-test.js} |  0
 ...drafts-test.js.es6 => user-drafts-test.js} |  0
 ...stream-test.js.es6 => user-stream-test.js} |  0
 .../models/{user-test.js.es6 => user-test.js} |  0
 ...orators-test.js.es6 => decorators-test.js} |  0
 ...ry-test.js.es6 => actions-summary-test.js} |  0
 ...flair-test.js.es6 => avatar-flair-test.js} |  0
 .../{button-test.js.es6 => button-test.js}    |  0
 ....es6 => default-notification-item-test.js} |  0
 ...enu-test.js.es6 => hamburger-menu-test.js} |  0
 .../{header-test.js.es6 => header-test.js}    |  0
 ...ome-logo-test.js.es6 => home-logo-test.js} |  0
 ...t-links-test.js.es6 => post-links-test.js} |  0
 ...stream-test.js.es6 => post-stream-test.js} |  0
 .../{post-test.js.es6 => post-test.js}        |  0
 ...r-name-test.js.es6 => poster-name-test.js} |  0
 ...-test.js.es6 => quick-access-item-test.js} |  0
 ...u-test.js.es6 => topic-admin-menu-test.js} |  0
 ...-test.js.es6 => topic-participant-test.js} |  0
 ...tatus-test.js.es6 => topic-status-test.js} |  0
 ...ser-menu-test.js.es6 => user-menu-test.js} |  0
 .../{widget-test.js.es6 => widget-test.js}    |  0
 281 files changed, 35 insertions(+), 29 deletions(-)
 rename test/javascripts/acceptance/{about-test.js.es6 => about-test.js} (100%)
 rename test/javascripts/acceptance/{account-created-test.js.es6 => account-created-test.js} (100%)
 rename test/javascripts/acceptance/{admin-emails-test.js.es6 => admin-emails-test.js} (100%)
 rename test/javascripts/acceptance/{admin-search-log-term-test.js.es6 => admin-search-log-term-test.js} (100%)
 rename test/javascripts/acceptance/{admin-search-logs-test.js.es6 => admin-search-logs-test.js} (100%)
 rename test/javascripts/acceptance/{admin-site-settings-test.js.es6 => admin-site-settings-test.js} (100%)
 rename test/javascripts/acceptance/{admin-site-text-test.js.es6 => admin-site-text-test.js} (100%)
 rename test/javascripts/acceptance/{admin-suspend-user-test.js.es6 => admin-suspend-user-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-badges-test.js.es6 => admin-user-badges-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-emails-test.js.es6 => admin-user-emails-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-index-test.js.es6 => admin-user-index-test.js} (100%)
 rename test/javascripts/acceptance/{admin-users-list-test.js.es6 => admin-users-list-test.js} (100%)
 rename test/javascripts/acceptance/{admin-watched-words-test.js.es6 => admin-watched-words-test.js} (100%)
 rename test/javascripts/acceptance/{auth-complete-test.js.es6 => auth-complete-test.js} (100%)
 rename test/javascripts/acceptance/{badges-test.js.es6 => badges-test.js} (100%)
 rename test/javascripts/acceptance/{category-chooser-test.js.es6 => category-chooser-test.js} (100%)
 rename test/javascripts/acceptance/{category-edit-security-test.js.es6 => category-edit-security-test.js} (100%)
 rename test/javascripts/acceptance/{category-edit-test.js.es6 => category-edit-test.js} (100%)
 rename test/javascripts/acceptance/{category-hashtag-test.js.es6 => category-hashtag-test.js} (100%)
 rename test/javascripts/acceptance/{click-track-test.js.es6 => click-track-test.js} (100%)
 rename test/javascripts/acceptance/{composer-actions-test.js.es6 => composer-actions-test.js} (100%)
 rename test/javascripts/acceptance/{composer-attachment-test.js.es6 => composer-attachment-test.js} (100%)
 rename test/javascripts/acceptance/{composer-edit-conflict-test.js.es6 => composer-edit-conflict-test.js} (100%)
 rename test/javascripts/acceptance/{composer-hyperlink-test.js.es6 => composer-hyperlink-test.js} (100%)
 rename test/javascripts/acceptance/{composer-onebox-test.js.es6 => composer-onebox-test.js} (100%)
 rename test/javascripts/acceptance/{composer-test.js.es6 => composer-test.js} (100%)
 rename test/javascripts/acceptance/{composer-topic-links-test.js.es6 => composer-topic-links-test.js} (100%)
 rename test/javascripts/acceptance/{composer-uncategorized-test.js.es6 => composer-uncategorized-test.js} (100%)
 rename test/javascripts/acceptance/{create-account-user-fields-test.js.es6 => create-account-user-fields-test.js} (100%)
 rename test/javascripts/acceptance/{custom-html-set-test.js.es6 => custom-html-set-test.js} (100%)
 rename test/javascripts/acceptance/{custom-html-template-test.js.es6 => custom-html-template-test.js} (100%)
 rename test/javascripts/acceptance/{dashboard-test.js.es6 => dashboard-test.js} (100%)
 rename test/javascripts/acceptance/{email-notice-test.js.es6 => email-notice-test.js} (100%)
 rename test/javascripts/acceptance/{emoji-picker-test.js.es6 => emoji-picker-test.js} (100%)
 rename test/javascripts/acceptance/{emoji-test.js.es6 => emoji-test.js} (100%)
 rename test/javascripts/acceptance/{enforce-second-factor-test.js.es6 => enforce-second-factor-test.js} (100%)
 rename test/javascripts/acceptance/{forgot-password-test.js.es6 => forgot-password-test.js} (100%)
 rename test/javascripts/acceptance/{group-card-mobile-test.js.es6 => group-card-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{group-card-test.js.es6 => group-card-test.js} (100%)
 rename test/javascripts/acceptance/{group-index-test.js.es6 => group-index-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-interaction-test.js.es6 => group-manage-interaction-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-logs-test.js.es6 => group-manage-logs-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-membership-test.js.es6 => group-manage-membership-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-profile-test.js.es6 => group-manage-profile-test.js} (100%)
 rename test/javascripts/acceptance/{group-requests-test.js.es6 => group-requests-test.js} (100%)
 rename test/javascripts/acceptance/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/acceptance/{groups-index-test.js.es6 => groups-index-test.js} (100%)
 rename test/javascripts/acceptance/{groups-new-test.js.es6 => groups-new-test.js} (100%)
 rename test/javascripts/acceptance/{invite-accept-test.js.es6 => invite-accept-test.js} (100%)
 rename test/javascripts/acceptance/{invite-show-user-fields-test.js.es6 => invite-show-user-fields-test.js} (100%)
 rename test/javascripts/acceptance/{jump-to-test.js.es6 => jump-to-test.js} (100%)
 rename test/javascripts/acceptance/{keyboard-shortcuts-test.js.es6 => keyboard-shortcuts-test.js} (100%)
 rename test/javascripts/acceptance/{login-redirect-test.js.es6 => login-redirect-test.js} (100%)
 rename test/javascripts/acceptance/{login-required-test.js.es6 => login-required-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-hide-email-address-taken-test.js.es6 => login-with-email-and-hide-email-address-taken-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-no-social-logins-test.js.es6 => login-with-email-and-no-social-logins-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-disabled-test.js.es6 => login-with-email-disabled-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-test.js.es6 => login-with-email-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-discovery-test.js.es6 => mobile-discovery-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-sign-in-test.js.es6 => mobile-sign-in-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-users-test.js.es6 => mobile-users-test.js} (100%)
 rename test/javascripts/acceptance/{modal-test.js.es6 => modal-test.js} (100%)
 rename test/javascripts/acceptance/{new-message-test.js.es6 => new-message-test.js} (100%)
 rename test/javascripts/acceptance/{new-topic-test.js.es6 => new-topic-test.js} (100%)
 rename test/javascripts/acceptance/{password-reset-test.js.es6 => password-reset-test.js} (100%)
 rename test/javascripts/acceptance/{personal-message-test.js.es6 => personal-message-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-connector-class-test.js.es6 => plugin-outlet-connector-class-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-decorator-test.js.es6 => plugin-outlet-decorator-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-multi-template-test.js.es6 => plugin-outlet-multi-template-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-single-template-test.js.es6 => plugin-outlet-single-template-test.js} (100%)
 rename test/javascripts/acceptance/{preferences-test.js.es6 => preferences-test.js} (100%)
 rename test/javascripts/acceptance/{raw-plugin-outlet-test.js.es6 => raw-plugin-outlet-test.js} (100%)
 rename test/javascripts/acceptance/{redirect-to-top-test.js.es6 => redirect-to-top-test.js} (100%)
 rename test/javascripts/acceptance/{reports-test.js.es6 => reports-test.js} (100%)
 rename test/javascripts/acceptance/{review-test.js.es6 => review-test.js} (100%)
 rename test/javascripts/acceptance/{search-full-test.js.es6 => search-full-test.js} (100%)
 rename test/javascripts/acceptance/{search-mobile-test.js.es6 => search-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{search-test.js.es6 => search-test.js} (100%)
 rename test/javascripts/acceptance/{share-and-invite-desktop-test.js.es6 => share-and-invite-desktop-test.js} (100%)
 rename test/javascripts/acceptance/{share-and-invite-mobile-test.js.es6 => share-and-invite-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{shared-drafts-test.js.es6 => shared-drafts-test.js} (100%)
 rename test/javascripts/acceptance/{sign-in-test.js.es6 => sign-in-test.js} (100%)
 rename test/javascripts/acceptance/{static-test.js.es6 => static-test.js} (100%)
 rename test/javascripts/acceptance/{tag-groups-test.js.es6 => tag-groups-test.js} (100%)
 rename test/javascripts/acceptance/{tag-hashtag-test.js.es6 => tag-hashtag-test.js} (100%)
 rename test/javascripts/acceptance/{tags-intersection-test.js.es6 => tags-intersection-test.js} (100%)
 rename test/javascripts/acceptance/{tags-test.js.es6 => tags-test.js} (100%)
 rename test/javascripts/acceptance/{topic-anonymous-test.js.es6 => topic-anonymous-test.js} (100%)
 rename test/javascripts/acceptance/{topic-discovery-test.js.es6 => topic-discovery-test.js} (100%)
 rename test/javascripts/acceptance/{topic-edit-timer-test.js.es6 => topic-edit-timer-test.js} (100%)
 rename test/javascripts/acceptance/{topic-footer-buttons-mobile-test.js.es6 => topic-footer-buttons-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{topic-move-posts-test.js.es6 => topic-move-posts-test.js} (100%)
 rename test/javascripts/acceptance/{topic-notifications-button-test.js.es6 => topic-notifications-button-test.js} (100%)
 rename test/javascripts/acceptance/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/acceptance/{unknown-test.js.es6 => unknown-test.js} (100%)
 rename test/javascripts/acceptance/{user-anonymous-test.js.es6 => user-anonymous-test.js} (100%)
 rename test/javascripts/acceptance/{user-card-mobile-test.js.es6 => user-card-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{user-card-test.js.es6 => user-card-test.js} (100%)
 rename test/javascripts/acceptance/{user-drafts-stream-test.js.es6 => user-drafts-stream-test.js} (100%)
 rename test/javascripts/acceptance/{user-test.js.es6 => user-test.js} (100%)
 rename test/javascripts/acceptance/{users-test.js.es6 => users-test.js} (100%)
 rename test/javascripts/admin/components/{group-list-setting-test.js.es6 => group-list-setting-test.js} (100%)
 rename test/javascripts/admin/components/{themes-list-item-test.js.es6 => themes-list-item-test.js} (100%)
 rename test/javascripts/admin/components/{themes-list-test.js.es6 => themes-list-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-show-test.js.es6 => admin-customize-themes-show-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-test.js.es6 => admin-customize-themes-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-user-badges-test.js.es6 => admin-user-badges-test.js} (100%)
 rename test/javascripts/admin/models/{theme-test.js.es6 => theme-test.js} (100%)
 rename test/javascripts/components/{ace-editor-test.js.es6 => ace-editor-test.js} (100%)
 rename test/javascripts/components/{admin-report-test.js.es6 => admin-report-test.js} (100%)
 rename test/javascripts/components/{badge-title-test.js.es6 => badge-title-test.js} (100%)
 rename test/javascripts/components/{d-button-test.js.es6 => d-button-test.js} (100%)
 rename test/javascripts/components/{d-editor-test.js.es6 => d-editor-test.js} (100%)
 rename test/javascripts/components/{d-icon-test.js.es6 => d-icon-test.js} (100%)
 rename test/javascripts/components/{date-input-test.js.es6 => date-input-test.js} (100%)
 rename test/javascripts/components/{date-time-input-range-test.js.es6 => date-time-input-range-test.js} (100%)
 rename test/javascripts/components/{date-time-input-test.js.es6 => date-time-input-test.js} (100%)
 rename test/javascripts/components/{group-membership-button-test.js.es6 => group-membership-button-test.js} (100%)
 rename test/javascripts/components/{html-safe-helper-test.js.es6 => html-safe-helper-test.js} (100%)
 rename test/javascripts/components/{iframed-html-test.js.es6 => iframed-html-test.js} (100%)
 rename test/javascripts/components/{image-uploader-test.js.es6 => image-uploader-test.js} (100%)
 rename test/javascripts/components/{keyboard-shortcuts-test.js.es6 => keyboard-shortcuts-test.js} (100%)
 rename test/javascripts/components/{load-more-test.js.es6 => load-more-test.js} (100%)
 rename test/javascripts/components/{secret-value-list-test.js.es6 => secret-value-list-test.js} (100%)
 rename test/javascripts/components/select-kit/{category-chooser-test.js.es6 => category-chooser-test.js} (100%)
 rename test/javascripts/components/select-kit/{category-drop-test.js.es6 => category-drop-test.js} (100%)
 rename test/javascripts/components/select-kit/{combo-box-test.js.es6 => combo-box-test.js} (100%)
 rename test/javascripts/components/select-kit/{dropdown-select-box-test.js.es6 => dropdown-select-box-test.js} (100%)
 rename test/javascripts/components/select-kit/{list-setting-test.js.es6 => list-setting-test.js} (100%)
 rename test/javascripts/components/select-kit/{mini-tag-chooser-test.js.es6 => mini-tag-chooser-test.js} (100%)
 rename test/javascripts/components/select-kit/{multi-select-test.js.es6 => multi-select-test.js} (100%)
 rename test/javascripts/components/select-kit/{notifications-button-test.js.es6 => notifications-button-test.js} (100%)
 rename test/javascripts/components/select-kit/{pinned-options-test.js.es6 => pinned-options-test.js} (100%)
 rename test/javascripts/components/select-kit/{select-kit-test-helper.js.es6 => select-kit-test-helper.js} (100%)
 rename test/javascripts/components/select-kit/{single-select-test.js.es6 => single-select-test.js} (100%)
 rename test/javascripts/components/select-kit/{tag-drop-test.js.es6 => tag-drop-test.js} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-button-test.js.es6 => topic-notifications-button-test.js} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-options-test.js.es6 => topic-notifications-options-test.js} (100%)
 rename test/javascripts/components/select-kit/{user-chooser-test.js.es6 => user-chooser-test.js} (100%)
 rename test/javascripts/components/{share-button-test.js.es6 => share-button-test.js} (100%)
 rename test/javascripts/components/{share-button.js.es6 => share-button.js} (100%)
 rename test/javascripts/components/{text-field-test.js.es6 => text-field-test.js} (100%)
 rename test/javascripts/components/{text-overflow-test.js.es6 => text-overflow-test.js} (100%)
 rename test/javascripts/components/{time-input-test.js.es6 => time-input-test.js} (100%)
 rename test/javascripts/components/{user-selector-test.js.es6 => user-selector-test.js} (100%)
 rename test/javascripts/components/{value-list-test.js.es6 => value-list-test.js} (100%)
 rename test/javascripts/controllers/{avatar-selector-test.js.es6 => avatar-selector-test.js} (100%)
 rename test/javascripts/controllers/{bookmark-test.js.es6 => bookmark-test.js} (100%)
 rename test/javascripts/controllers/{create-account-test.js.es6 => create-account-test.js} (100%)
 rename test/javascripts/controllers/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/controllers/{history-test.js.es6 => history-test.js} (100%)
 rename test/javascripts/controllers/{preferences-account-test.js.es6 => preferences-account-test.js} (100%)
 rename test/javascripts/controllers/{preferences-second-factor-test.js.es6 => preferences-second-factor-test.js} (100%)
 rename test/javascripts/controllers/{reorder-categories-test.js.es6 => reorder-categories-test.js} (100%)
 rename test/javascripts/controllers/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/ember/{resolver-test.js.es6 => resolver-test.js} (100%)
 rename test/javascripts/fixtures/{about.js.es6 => about.js} (100%)
 rename test/javascripts/fixtures/{badges_fixture.js.es6 => badges_fixture.js} (100%)
 rename test/javascripts/fixtures/{category-fixtures.js.es6 => category-fixtures.js} (100%)
 rename test/javascripts/fixtures/concerns/{notification-types.js.es6.erb => notification-types.js.erb} (100%)
 rename test/javascripts/fixtures/{dashboard-general.js.es6 => dashboard-general.js} (100%)
 rename test/javascripts/fixtures/{dashboard.js.es6 => dashboard.js} (100%)
 rename test/javascripts/fixtures/{directory-fixtures.js.es6 => directory-fixtures.js} (100%)
 rename test/javascripts/fixtures/{discovery_fixtures.js.es6 => discovery_fixtures.js} (100%)
 rename test/javascripts/fixtures/{draft.js.es6 => draft.js} (100%)
 rename test/javascripts/fixtures/{drafts.js.es6 => drafts.js} (100%)
 rename test/javascripts/fixtures/{group-fixtures.js.es6 => group-fixtures.js} (100%)
 rename test/javascripts/fixtures/{groups-fixtures.js.es6 => groups-fixtures.js} (100%)
 rename test/javascripts/fixtures/{notification_fixtures.js.es6 => notification_fixtures.js} (100%)
 rename test/javascripts/fixtures/{poll.js.es6 => poll.js} (100%)
 rename test/javascripts/fixtures/{post.js.es6 => post.js} (100%)
 rename test/javascripts/fixtures/{private_messages_fixtures.js.es6 => private_messages_fixtures.js} (100%)
 rename test/javascripts/fixtures/{problems.js.es6 => problems.js} (100%)
 rename test/javascripts/fixtures/{reports.js.es6 => reports.js} (100%)
 rename test/javascripts/fixtures/{reports_bulk.js.es6 => reports_bulk.js} (100%)
 rename test/javascripts/fixtures/{search-fixtures.js.es6 => search-fixtures.js} (100%)
 rename test/javascripts/fixtures/{session-fixtures.js.es6 => session-fixtures.js} (100%)
 rename test/javascripts/fixtures/{site-fixtures.js.es6 => site-fixtures.js} (100%)
 rename test/javascripts/fixtures/{site_settings.js.es6 => site_settings.js} (100%)
 rename test/javascripts/fixtures/{static_fixtures.js.es6 => static_fixtures.js} (100%)
 rename test/javascripts/fixtures/{top_fixture.js.es6 => top_fixture.js} (100%)
 rename test/javascripts/fixtures/{topic.js.es6 => topic.js} (100%)
 rename test/javascripts/fixtures/{user-badges.js.es6 => user-badges.js} (100%)
 rename test/javascripts/fixtures/{user_fixtures.js.es6 => user_fixtures.js} (100%)
 rename test/javascripts/fixtures/{watched-words-fixtures.js.es6 => watched-words-fixtures.js} (100%)
 rename test/javascripts/helpers/{component-test.js.es6 => component-test.js} (100%)
 rename test/javascripts/helpers/{create-pretender.js.es6 => create-pretender.js} (100%)
 rename test/javascripts/helpers/{create-store.js.es6 => create-store.js} (100%)
 rename test/javascripts/helpers/{d-editor-helper.js.es6 => d-editor-helper.js} (100%)
 rename test/javascripts/helpers/{fixture-pretender.js.es6 => fixture-pretender.js} (100%)
 rename test/javascripts/helpers/{html-helper.js.es6 => html-helper.js} (100%)
 delete mode 100644 test/javascripts/helpers/init-ember-qunit.js
 rename test/javascripts/helpers/{qunit-helpers.js.es6 => qunit-helpers.js} (100%)
 rename test/javascripts/helpers/{review-pretender.js.es6 => review-pretender.js} (100%)
 rename test/javascripts/helpers/{select-kit-helper.js.es6 => select-kit-helper.js} (100%)
 rename test/javascripts/helpers/{site.js.es6 => site.js} (100%)
 rename test/javascripts/helpers/{store-pretender.js.es6 => store-pretender.js} (100%)
 rename test/javascripts/helpers/{textarea-selection-helper.js.es6 => textarea-selection-helper.js} (100%)
 rename test/javascripts/helpers/{widget-test.js.es6 => widget-test.js} (100%)
 rename test/javascripts/initializers/{localization-test.js.es6 => localization-test.js} (100%)
 rename test/javascripts/lib/{bbcode-test.js.es6 => bbcode-test.js} (100%)
 rename test/javascripts/lib/{break-string-test.js.es6 => break-string-test.js} (100%)
 rename test/javascripts/lib/{category-badge-test.js.es6 => category-badge-test.js} (100%)
 rename test/javascripts/lib/{click-track-edit-history-test.js.es6 => click-track-edit-history-test.js} (100%)
 rename test/javascripts/lib/{click-track-profile-page-test.js.es6 => click-track-profile-page-test.js} (100%)
 rename test/javascripts/lib/{click-track-test.js.es6 => click-track-test.js} (100%)
 rename test/javascripts/lib/{computed-test.js.es6 => computed-test.js} (100%)
 rename test/javascripts/lib/{discourse-test.js.es6 => discourse-test.js} (100%)
 rename test/javascripts/lib/{emoji-store-test.js.es6 => emoji-store-test.js} (100%)
 rename test/javascripts/lib/{emoji-test.js.es6 => emoji-test.js} (100%)
 rename test/javascripts/lib/{formatter-test.js.es6 => formatter-test.js} (100%)
 rename test/javascripts/lib/{highlight-text-test.js.es6 => highlight-text-test.js} (100%)
 rename test/javascripts/lib/{i18n-test.js.es6 => i18n-test.js} (100%)
 rename test/javascripts/lib/{icon-library-test.js.es6 => icon-library-test.js} (100%)
 rename test/javascripts/lib/{key-value-store-test.js.es6 => key-value-store-test.js} (100%)
 rename test/javascripts/lib/{link-mentions-test.js.es6 => link-mentions-test.js} (100%)
 rename test/javascripts/lib/{load-script-test.js.es6 => load-script-test.js} (100%)
 rename test/javascripts/lib/{oneboxer-test.js.es6 => oneboxer-test.js} (100%)
 rename test/javascripts/lib/{preload-store-test.js.es6 => preload-store-test.js} (100%)
 rename test/javascripts/lib/{pretty-text-test.js.es6 => pretty-text-test.js} (100%)
 rename test/javascripts/lib/{sanitizer-test.js.es6 => sanitizer-test.js} (100%)
 rename test/javascripts/lib/{screen-track-test.js.es6 => screen-track-test.js} (100%)
 rename test/javascripts/lib/{search-test.js.es6 => search-test.js} (100%)
 rename test/javascripts/lib/{sharing-test.js.es6 => sharing-test.js} (100%)
 rename test/javascripts/lib/{text-direction-test.js.es6 => text-direction-test.js} (100%)
 rename test/javascripts/lib/{to-markdown-test.js.es6 => to-markdown-test.js} (100%)
 rename test/javascripts/lib/{tooltip-test.js.es6 => tooltip-test.js} (100%)
 rename test/javascripts/lib/{upload-short-url-test.js.es6 => upload-short-url-test.js} (100%)
 rename test/javascripts/lib/{uploads-test.js.es6 => uploads-test.js} (100%)
 rename test/javascripts/lib/{url-test.js.es6 => url-test.js} (100%)
 rename test/javascripts/lib/{user-search-test.js.es6 => user-search-test.js} (100%)
 rename test/javascripts/lib/{utilities-test.js.es6 => utilities-test.js} (100%)
 rename test/javascripts/lib/{white-lister-test.js.es6 => white-lister-test.js} (100%)
 rename test/javascripts/mixins/{grant-badge-controller-test.js.es6 => grant-badge-controller-test.js} (100%)
 rename test/javascripts/mixins/{setting-object-test.js.es6 => setting-object-test.js} (100%)
 rename test/javascripts/mixins/{singleton-test.js.es6 => singleton-test.js} (100%)
 rename test/javascripts/models/{badge-test.js.es6 => badge-test.js} (100%)
 rename test/javascripts/models/{category-test.js.es6 => category-test.js} (100%)
 rename test/javascripts/models/{composer-test.js.es6 => composer-test.js} (100%)
 rename test/javascripts/models/{email-log-test.js.es6 => email-log-test.js} (100%)
 rename test/javascripts/models/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/models/{invite-test.js.es6 => invite-test.js} (100%)
 rename test/javascripts/models/{nav-item-test.js.es6 => nav-item-test.js} (100%)
 rename test/javascripts/models/{post-stream-test.js.es6 => post-stream-test.js} (100%)
 rename test/javascripts/models/{post-test.js.es6 => post-test.js} (100%)
 rename test/javascripts/models/{report-test.js.es6 => report-test.js} (100%)
 rename test/javascripts/models/{rest-model-test.js.es6 => rest-model-test.js} (100%)
 rename test/javascripts/models/{result-set-test.js.es6 => result-set-test.js} (100%)
 rename test/javascripts/models/{session-test.js.es6 => session-test.js} (100%)
 rename test/javascripts/models/{site-test.js.es6 => site-test.js} (100%)
 rename test/javascripts/models/{staff-action-log-test.js.es6 => staff-action-log-test.js} (100%)
 rename test/javascripts/models/{store-test.js.es6 => store-test.js} (100%)
 rename test/javascripts/models/{topic-details-test.js.es6 => topic-details-test.js} (100%)
 rename test/javascripts/models/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/models/{topic-tracking-state-test.js.es6 => topic-tracking-state-test.js} (100%)
 rename test/javascripts/models/{user-action-test.js.es6 => user-action-test.js} (100%)
 rename test/javascripts/models/{user-badge-test.js.es6 => user-badge-test.js} (100%)
 rename test/javascripts/models/{user-drafts-test.js.es6 => user-drafts-test.js} (100%)
 rename test/javascripts/models/{user-stream-test.js.es6 => user-stream-test.js} (100%)
 rename test/javascripts/models/{user-test.js.es6 => user-test.js} (100%)
 rename test/javascripts/utils/{decorators-test.js.es6 => decorators-test.js} (100%)
 rename test/javascripts/widgets/{actions-summary-test.js.es6 => actions-summary-test.js} (100%)
 rename test/javascripts/widgets/{avatar-flair-test.js.es6 => avatar-flair-test.js} (100%)
 rename test/javascripts/widgets/{button-test.js.es6 => button-test.js} (100%)
 rename test/javascripts/widgets/{default-notification-item-test.js.es6 => default-notification-item-test.js} (100%)
 rename test/javascripts/widgets/{hamburger-menu-test.js.es6 => hamburger-menu-test.js} (100%)
 rename test/javascripts/widgets/{header-test.js.es6 => header-test.js} (100%)
 rename test/javascripts/widgets/{home-logo-test.js.es6 => home-logo-test.js} (100%)
 rename test/javascripts/widgets/{post-links-test.js.es6 => post-links-test.js} (100%)
 rename test/javascripts/widgets/{post-stream-test.js.es6 => post-stream-test.js} (100%)
 rename test/javascripts/widgets/{post-test.js.es6 => post-test.js} (100%)
 rename test/javascripts/widgets/{poster-name-test.js.es6 => poster-name-test.js} (100%)
 rename test/javascripts/widgets/{quick-access-item-test.js.es6 => quick-access-item-test.js} (100%)
 rename test/javascripts/widgets/{topic-admin-menu-test.js.es6 => topic-admin-menu-test.js} (100%)
 rename test/javascripts/widgets/{topic-participant-test.js.es6 => topic-participant-test.js} (100%)
 rename test/javascripts/widgets/{topic-status-test.js.es6 => topic-status-test.js} (100%)
 rename test/javascripts/widgets/{user-menu-test.js.es6 => user-menu-test.js} (100%)
 rename test/javascripts/widgets/{widget-test.js.es6 => widget-test.js} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index bbadfa84af..4060b16225 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -36,24 +36,27 @@ class DiscourseJsProcessor
     return false unless filename.end_with?(".js") || filename.end_with?(".js.erb")
 
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
-    relative_path.start_with?("app/assets/javascripts/discourse/") ||
-      relative_path.start_with?("app/assets/javascripts/admin/") ||
-      relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
-      relative_path.start_with?("app/assets/javascripts/select-kit/") ||
-      relative_path.start_with?("app/assets/javascripts/wizard/") ||
-      relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
-      relative_path.start_with?("app/assets/javascripts/ember-addons/") ||
-      relative_path.start_with?("app/assets/javascripts/confirm-new-email/") ||
-      relative_path == "app/assets/javascripts/preload-store.js" ||
-      relative_path == "app/assets/javascripts/preload-application-data.js" ||
-      relative_path == "app/assets/javascripts/wizard-start.js" ||
-      relative_path == "app/assets/javascripts/onpopstate-handler.js" ||
-      relative_path == "app/assets/javascripts/discourse.js" ||
-      relative_path == "app/assets/javascripts/google-tag-manager.js" ||
-      relative_path == "app/assets/javascripts/google-universal-analytics.js" ||
-      relative_path == "app/assets/javascripts/activate-account.js" ||
-      relative_path == "app/assets/javascripts/auto-redirect.js" ||
-      relative_path == "app/assets/javascripts/embed-application.js"
+
+    js_root = "app/assets/javascripts"
+    test_root = "test/javascripts"
+
+    return false if relative_path.start_with?("#{js_root}/locales/")
+
+    return true if %w(
+      preload-store
+      preload-application-data
+      wizard-start
+      onpopstate-handler
+      discourse
+      google-tag-manager
+      google-universal-analytics.js
+      activate-account.js
+      auto-redirect.js
+      embed-application
+    ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
+
+    relative_path =~ /^#{js_root}\/[^\/]+\// ||
+      relative_path =~ /^#{test_root}\/[^\/]+\//
   end
 
   def self.skip_module?(data)
diff --git a/test/javascripts/acceptance/about-test.js.es6 b/test/javascripts/acceptance/about-test.js
similarity index 100%
rename from test/javascripts/acceptance/about-test.js.es6
rename to test/javascripts/acceptance/about-test.js
diff --git a/test/javascripts/acceptance/account-created-test.js.es6 b/test/javascripts/acceptance/account-created-test.js
similarity index 100%
rename from test/javascripts/acceptance/account-created-test.js.es6
rename to test/javascripts/acceptance/account-created-test.js
diff --git a/test/javascripts/acceptance/admin-emails-test.js.es6 b/test/javascripts/acceptance/admin-emails-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-emails-test.js.es6
rename to test/javascripts/acceptance/admin-emails-test.js
diff --git a/test/javascripts/acceptance/admin-search-log-term-test.js.es6 b/test/javascripts/acceptance/admin-search-log-term-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-search-log-term-test.js.es6
rename to test/javascripts/acceptance/admin-search-log-term-test.js
diff --git a/test/javascripts/acceptance/admin-search-logs-test.js.es6 b/test/javascripts/acceptance/admin-search-logs-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-search-logs-test.js.es6
rename to test/javascripts/acceptance/admin-search-logs-test.js
diff --git a/test/javascripts/acceptance/admin-site-settings-test.js.es6 b/test/javascripts/acceptance/admin-site-settings-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-site-settings-test.js.es6
rename to test/javascripts/acceptance/admin-site-settings-test.js
diff --git a/test/javascripts/acceptance/admin-site-text-test.js.es6 b/test/javascripts/acceptance/admin-site-text-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-site-text-test.js.es6
rename to test/javascripts/acceptance/admin-site-text-test.js
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-suspend-user-test.js.es6
rename to test/javascripts/acceptance/admin-suspend-user-test.js
diff --git a/test/javascripts/acceptance/admin-user-badges-test.js.es6 b/test/javascripts/acceptance/admin-user-badges-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-badges-test.js.es6
rename to test/javascripts/acceptance/admin-user-badges-test.js
diff --git a/test/javascripts/acceptance/admin-user-emails-test.js.es6 b/test/javascripts/acceptance/admin-user-emails-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-emails-test.js.es6
rename to test/javascripts/acceptance/admin-user-emails-test.js
diff --git a/test/javascripts/acceptance/admin-user-index-test.js.es6 b/test/javascripts/acceptance/admin-user-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-index-test.js.es6
rename to test/javascripts/acceptance/admin-user-index-test.js
diff --git a/test/javascripts/acceptance/admin-users-list-test.js.es6 b/test/javascripts/acceptance/admin-users-list-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-users-list-test.js.es6
rename to test/javascripts/acceptance/admin-users-list-test.js
diff --git a/test/javascripts/acceptance/admin-watched-words-test.js.es6 b/test/javascripts/acceptance/admin-watched-words-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-watched-words-test.js.es6
rename to test/javascripts/acceptance/admin-watched-words-test.js
diff --git a/test/javascripts/acceptance/auth-complete-test.js.es6 b/test/javascripts/acceptance/auth-complete-test.js
similarity index 100%
rename from test/javascripts/acceptance/auth-complete-test.js.es6
rename to test/javascripts/acceptance/auth-complete-test.js
diff --git a/test/javascripts/acceptance/badges-test.js.es6 b/test/javascripts/acceptance/badges-test.js
similarity index 100%
rename from test/javascripts/acceptance/badges-test.js.es6
rename to test/javascripts/acceptance/badges-test.js
diff --git a/test/javascripts/acceptance/category-chooser-test.js.es6 b/test/javascripts/acceptance/category-chooser-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-chooser-test.js.es6
rename to test/javascripts/acceptance/category-chooser-test.js
diff --git a/test/javascripts/acceptance/category-edit-security-test.js.es6 b/test/javascripts/acceptance/category-edit-security-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-edit-security-test.js.es6
rename to test/javascripts/acceptance/category-edit-security-test.js
diff --git a/test/javascripts/acceptance/category-edit-test.js.es6 b/test/javascripts/acceptance/category-edit-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-edit-test.js.es6
rename to test/javascripts/acceptance/category-edit-test.js
diff --git a/test/javascripts/acceptance/category-hashtag-test.js.es6 b/test/javascripts/acceptance/category-hashtag-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-hashtag-test.js.es6
rename to test/javascripts/acceptance/category-hashtag-test.js
diff --git a/test/javascripts/acceptance/click-track-test.js.es6 b/test/javascripts/acceptance/click-track-test.js
similarity index 100%
rename from test/javascripts/acceptance/click-track-test.js.es6
rename to test/javascripts/acceptance/click-track-test.js
diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-actions-test.js.es6
rename to test/javascripts/acceptance/composer-actions-test.js
diff --git a/test/javascripts/acceptance/composer-attachment-test.js.es6 b/test/javascripts/acceptance/composer-attachment-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-attachment-test.js.es6
rename to test/javascripts/acceptance/composer-attachment-test.js
diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6 b/test/javascripts/acceptance/composer-edit-conflict-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-edit-conflict-test.js.es6
rename to test/javascripts/acceptance/composer-edit-conflict-test.js
diff --git a/test/javascripts/acceptance/composer-hyperlink-test.js.es6 b/test/javascripts/acceptance/composer-hyperlink-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-hyperlink-test.js.es6
rename to test/javascripts/acceptance/composer-hyperlink-test.js
diff --git a/test/javascripts/acceptance/composer-onebox-test.js.es6 b/test/javascripts/acceptance/composer-onebox-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-onebox-test.js.es6
rename to test/javascripts/acceptance/composer-onebox-test.js
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-test.js.es6
rename to test/javascripts/acceptance/composer-test.js
diff --git a/test/javascripts/acceptance/composer-topic-links-test.js.es6 b/test/javascripts/acceptance/composer-topic-links-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-topic-links-test.js.es6
rename to test/javascripts/acceptance/composer-topic-links-test.js
diff --git a/test/javascripts/acceptance/composer-uncategorized-test.js.es6 b/test/javascripts/acceptance/composer-uncategorized-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-uncategorized-test.js.es6
rename to test/javascripts/acceptance/composer-uncategorized-test.js
diff --git a/test/javascripts/acceptance/create-account-user-fields-test.js.es6 b/test/javascripts/acceptance/create-account-user-fields-test.js
similarity index 100%
rename from test/javascripts/acceptance/create-account-user-fields-test.js.es6
rename to test/javascripts/acceptance/create-account-user-fields-test.js
diff --git a/test/javascripts/acceptance/custom-html-set-test.js.es6 b/test/javascripts/acceptance/custom-html-set-test.js
similarity index 100%
rename from test/javascripts/acceptance/custom-html-set-test.js.es6
rename to test/javascripts/acceptance/custom-html-set-test.js
diff --git a/test/javascripts/acceptance/custom-html-template-test.js.es6 b/test/javascripts/acceptance/custom-html-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/custom-html-template-test.js.es6
rename to test/javascripts/acceptance/custom-html-template-test.js
diff --git a/test/javascripts/acceptance/dashboard-test.js.es6 b/test/javascripts/acceptance/dashboard-test.js
similarity index 100%
rename from test/javascripts/acceptance/dashboard-test.js.es6
rename to test/javascripts/acceptance/dashboard-test.js
diff --git a/test/javascripts/acceptance/email-notice-test.js.es6 b/test/javascripts/acceptance/email-notice-test.js
similarity index 100%
rename from test/javascripts/acceptance/email-notice-test.js.es6
rename to test/javascripts/acceptance/email-notice-test.js
diff --git a/test/javascripts/acceptance/emoji-picker-test.js.es6 b/test/javascripts/acceptance/emoji-picker-test.js
similarity index 100%
rename from test/javascripts/acceptance/emoji-picker-test.js.es6
rename to test/javascripts/acceptance/emoji-picker-test.js
diff --git a/test/javascripts/acceptance/emoji-test.js.es6 b/test/javascripts/acceptance/emoji-test.js
similarity index 100%
rename from test/javascripts/acceptance/emoji-test.js.es6
rename to test/javascripts/acceptance/emoji-test.js
diff --git a/test/javascripts/acceptance/enforce-second-factor-test.js.es6 b/test/javascripts/acceptance/enforce-second-factor-test.js
similarity index 100%
rename from test/javascripts/acceptance/enforce-second-factor-test.js.es6
rename to test/javascripts/acceptance/enforce-second-factor-test.js
diff --git a/test/javascripts/acceptance/forgot-password-test.js.es6 b/test/javascripts/acceptance/forgot-password-test.js
similarity index 100%
rename from test/javascripts/acceptance/forgot-password-test.js.es6
rename to test/javascripts/acceptance/forgot-password-test.js
diff --git a/test/javascripts/acceptance/group-card-mobile-test.js.es6 b/test/javascripts/acceptance/group-card-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-card-mobile-test.js.es6
rename to test/javascripts/acceptance/group-card-mobile-test.js
diff --git a/test/javascripts/acceptance/group-card-test.js.es6 b/test/javascripts/acceptance/group-card-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-card-test.js.es6
rename to test/javascripts/acceptance/group-card-test.js
diff --git a/test/javascripts/acceptance/group-index-test.js.es6 b/test/javascripts/acceptance/group-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-index-test.js.es6
rename to test/javascripts/acceptance/group-index-test.js
diff --git a/test/javascripts/acceptance/group-manage-interaction-test.js.es6 b/test/javascripts/acceptance/group-manage-interaction-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-interaction-test.js.es6
rename to test/javascripts/acceptance/group-manage-interaction-test.js
diff --git a/test/javascripts/acceptance/group-manage-logs-test.js.es6 b/test/javascripts/acceptance/group-manage-logs-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-logs-test.js.es6
rename to test/javascripts/acceptance/group-manage-logs-test.js
diff --git a/test/javascripts/acceptance/group-manage-membership-test.js.es6 b/test/javascripts/acceptance/group-manage-membership-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-membership-test.js.es6
rename to test/javascripts/acceptance/group-manage-membership-test.js
diff --git a/test/javascripts/acceptance/group-manage-profile-test.js.es6 b/test/javascripts/acceptance/group-manage-profile-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-profile-test.js.es6
rename to test/javascripts/acceptance/group-manage-profile-test.js
diff --git a/test/javascripts/acceptance/group-requests-test.js.es6 b/test/javascripts/acceptance/group-requests-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-requests-test.js.es6
rename to test/javascripts/acceptance/group-requests-test.js
diff --git a/test/javascripts/acceptance/group-test.js.es6 b/test/javascripts/acceptance/group-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-test.js.es6
rename to test/javascripts/acceptance/group-test.js
diff --git a/test/javascripts/acceptance/groups-index-test.js.es6 b/test/javascripts/acceptance/groups-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/groups-index-test.js.es6
rename to test/javascripts/acceptance/groups-index-test.js
diff --git a/test/javascripts/acceptance/groups-new-test.js.es6 b/test/javascripts/acceptance/groups-new-test.js
similarity index 100%
rename from test/javascripts/acceptance/groups-new-test.js.es6
rename to test/javascripts/acceptance/groups-new-test.js
diff --git a/test/javascripts/acceptance/invite-accept-test.js.es6 b/test/javascripts/acceptance/invite-accept-test.js
similarity index 100%
rename from test/javascripts/acceptance/invite-accept-test.js.es6
rename to test/javascripts/acceptance/invite-accept-test.js
diff --git a/test/javascripts/acceptance/invite-show-user-fields-test.js.es6 b/test/javascripts/acceptance/invite-show-user-fields-test.js
similarity index 100%
rename from test/javascripts/acceptance/invite-show-user-fields-test.js.es6
rename to test/javascripts/acceptance/invite-show-user-fields-test.js
diff --git a/test/javascripts/acceptance/jump-to-test.js.es6 b/test/javascripts/acceptance/jump-to-test.js
similarity index 100%
rename from test/javascripts/acceptance/jump-to-test.js.es6
rename to test/javascripts/acceptance/jump-to-test.js
diff --git a/test/javascripts/acceptance/keyboard-shortcuts-test.js.es6 b/test/javascripts/acceptance/keyboard-shortcuts-test.js
similarity index 100%
rename from test/javascripts/acceptance/keyboard-shortcuts-test.js.es6
rename to test/javascripts/acceptance/keyboard-shortcuts-test.js
diff --git a/test/javascripts/acceptance/login-redirect-test.js.es6 b/test/javascripts/acceptance/login-redirect-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-redirect-test.js.es6
rename to test/javascripts/acceptance/login-redirect-test.js
diff --git a/test/javascripts/acceptance/login-required-test.js.es6 b/test/javascripts/acceptance/login-required-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-required-test.js.es6
rename to test/javascripts/acceptance/login-required-test.js
diff --git a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
rename to test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
diff --git a/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6
rename to test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js
diff --git a/test/javascripts/acceptance/login-with-email-disabled-test.js.es6 b/test/javascripts/acceptance/login-with-email-disabled-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-disabled-test.js.es6
rename to test/javascripts/acceptance/login-with-email-disabled-test.js
diff --git a/test/javascripts/acceptance/login-with-email-test.js.es6 b/test/javascripts/acceptance/login-with-email-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-test.js.es6
rename to test/javascripts/acceptance/login-with-email-test.js
diff --git a/test/javascripts/acceptance/mobile-discovery-test.js.es6 b/test/javascripts/acceptance/mobile-discovery-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-discovery-test.js.es6
rename to test/javascripts/acceptance/mobile-discovery-test.js
diff --git a/test/javascripts/acceptance/mobile-sign-in-test.js.es6 b/test/javascripts/acceptance/mobile-sign-in-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-sign-in-test.js.es6
rename to test/javascripts/acceptance/mobile-sign-in-test.js
diff --git a/test/javascripts/acceptance/mobile-users-test.js.es6 b/test/javascripts/acceptance/mobile-users-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-users-test.js.es6
rename to test/javascripts/acceptance/mobile-users-test.js
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js
similarity index 100%
rename from test/javascripts/acceptance/modal-test.js.es6
rename to test/javascripts/acceptance/modal-test.js
diff --git a/test/javascripts/acceptance/new-message-test.js.es6 b/test/javascripts/acceptance/new-message-test.js
similarity index 100%
rename from test/javascripts/acceptance/new-message-test.js.es6
rename to test/javascripts/acceptance/new-message-test.js
diff --git a/test/javascripts/acceptance/new-topic-test.js.es6 b/test/javascripts/acceptance/new-topic-test.js
similarity index 100%
rename from test/javascripts/acceptance/new-topic-test.js.es6
rename to test/javascripts/acceptance/new-topic-test.js
diff --git a/test/javascripts/acceptance/password-reset-test.js.es6 b/test/javascripts/acceptance/password-reset-test.js
similarity index 100%
rename from test/javascripts/acceptance/password-reset-test.js.es6
rename to test/javascripts/acceptance/password-reset-test.js
diff --git a/test/javascripts/acceptance/personal-message-test.js.es6 b/test/javascripts/acceptance/personal-message-test.js
similarity index 100%
rename from test/javascripts/acceptance/personal-message-test.js.es6
rename to test/javascripts/acceptance/personal-message-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-connector-class-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-connector-class-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-decorator-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-decorator-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-multi-template-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-single-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-single-template-test.js
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js
similarity index 100%
rename from test/javascripts/acceptance/preferences-test.js.es6
rename to test/javascripts/acceptance/preferences-test.js
diff --git a/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6 b/test/javascripts/acceptance/raw-plugin-outlet-test.js
similarity index 100%
rename from test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
rename to test/javascripts/acceptance/raw-plugin-outlet-test.js
diff --git a/test/javascripts/acceptance/redirect-to-top-test.js.es6 b/test/javascripts/acceptance/redirect-to-top-test.js
similarity index 100%
rename from test/javascripts/acceptance/redirect-to-top-test.js.es6
rename to test/javascripts/acceptance/redirect-to-top-test.js
diff --git a/test/javascripts/acceptance/reports-test.js.es6 b/test/javascripts/acceptance/reports-test.js
similarity index 100%
rename from test/javascripts/acceptance/reports-test.js.es6
rename to test/javascripts/acceptance/reports-test.js
diff --git a/test/javascripts/acceptance/review-test.js.es6 b/test/javascripts/acceptance/review-test.js
similarity index 100%
rename from test/javascripts/acceptance/review-test.js.es6
rename to test/javascripts/acceptance/review-test.js
diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-full-test.js.es6
rename to test/javascripts/acceptance/search-full-test.js
diff --git a/test/javascripts/acceptance/search-mobile-test.js.es6 b/test/javascripts/acceptance/search-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-mobile-test.js.es6
rename to test/javascripts/acceptance/search-mobile-test.js
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-test.js.es6
rename to test/javascripts/acceptance/search-test.js
diff --git a/test/javascripts/acceptance/share-and-invite-desktop-test.js.es6 b/test/javascripts/acceptance/share-and-invite-desktop-test.js
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-desktop-test.js.es6
rename to test/javascripts/acceptance/share-and-invite-desktop-test.js
diff --git a/test/javascripts/acceptance/share-and-invite-mobile-test.js.es6 b/test/javascripts/acceptance/share-and-invite-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-mobile-test.js.es6
rename to test/javascripts/acceptance/share-and-invite-mobile-test.js
diff --git a/test/javascripts/acceptance/shared-drafts-test.js.es6 b/test/javascripts/acceptance/shared-drafts-test.js
similarity index 100%
rename from test/javascripts/acceptance/shared-drafts-test.js.es6
rename to test/javascripts/acceptance/shared-drafts-test.js
diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js
similarity index 100%
rename from test/javascripts/acceptance/sign-in-test.js.es6
rename to test/javascripts/acceptance/sign-in-test.js
diff --git a/test/javascripts/acceptance/static-test.js.es6 b/test/javascripts/acceptance/static-test.js
similarity index 100%
rename from test/javascripts/acceptance/static-test.js.es6
rename to test/javascripts/acceptance/static-test.js
diff --git a/test/javascripts/acceptance/tag-groups-test.js.es6 b/test/javascripts/acceptance/tag-groups-test.js
similarity index 100%
rename from test/javascripts/acceptance/tag-groups-test.js.es6
rename to test/javascripts/acceptance/tag-groups-test.js
diff --git a/test/javascripts/acceptance/tag-hashtag-test.js.es6 b/test/javascripts/acceptance/tag-hashtag-test.js
similarity index 100%
rename from test/javascripts/acceptance/tag-hashtag-test.js.es6
rename to test/javascripts/acceptance/tag-hashtag-test.js
diff --git a/test/javascripts/acceptance/tags-intersection-test.js.es6 b/test/javascripts/acceptance/tags-intersection-test.js
similarity index 100%
rename from test/javascripts/acceptance/tags-intersection-test.js.es6
rename to test/javascripts/acceptance/tags-intersection-test.js
diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js
similarity index 100%
rename from test/javascripts/acceptance/tags-test.js.es6
rename to test/javascripts/acceptance/tags-test.js
diff --git a/test/javascripts/acceptance/topic-anonymous-test.js.es6 b/test/javascripts/acceptance/topic-anonymous-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-anonymous-test.js.es6
rename to test/javascripts/acceptance/topic-anonymous-test.js
diff --git a/test/javascripts/acceptance/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-discovery-test.js.es6
rename to test/javascripts/acceptance/topic-discovery-test.js
diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-edit-timer-test.js.es6
rename to test/javascripts/acceptance/topic-edit-timer-test.js
diff --git a/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6 b/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6
rename to test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
diff --git a/test/javascripts/acceptance/topic-move-posts-test.js.es6 b/test/javascripts/acceptance/topic-move-posts-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-move-posts-test.js.es6
rename to test/javascripts/acceptance/topic-move-posts-test.js
diff --git a/test/javascripts/acceptance/topic-notifications-button-test.js.es6 b/test/javascripts/acceptance/topic-notifications-button-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-notifications-button-test.js.es6
rename to test/javascripts/acceptance/topic-notifications-button-test.js
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-test.js.es6
rename to test/javascripts/acceptance/topic-test.js
diff --git a/test/javascripts/acceptance/unknown-test.js.es6 b/test/javascripts/acceptance/unknown-test.js
similarity index 100%
rename from test/javascripts/acceptance/unknown-test.js.es6
rename to test/javascripts/acceptance/unknown-test.js
diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-anonymous-test.js.es6
rename to test/javascripts/acceptance/user-anonymous-test.js
diff --git a/test/javascripts/acceptance/user-card-mobile-test.js.es6 b/test/javascripts/acceptance/user-card-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-card-mobile-test.js.es6
rename to test/javascripts/acceptance/user-card-mobile-test.js
diff --git a/test/javascripts/acceptance/user-card-test.js.es6 b/test/javascripts/acceptance/user-card-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-card-test.js.es6
rename to test/javascripts/acceptance/user-card-test.js
diff --git a/test/javascripts/acceptance/user-drafts-stream-test.js.es6 b/test/javascripts/acceptance/user-drafts-stream-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-drafts-stream-test.js.es6
rename to test/javascripts/acceptance/user-drafts-stream-test.js
diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-test.js.es6
rename to test/javascripts/acceptance/user-test.js
diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js
similarity index 100%
rename from test/javascripts/acceptance/users-test.js.es6
rename to test/javascripts/acceptance/users-test.js
diff --git a/test/javascripts/admin/components/group-list-setting-test.js.es6 b/test/javascripts/admin/components/group-list-setting-test.js
similarity index 100%
rename from test/javascripts/admin/components/group-list-setting-test.js.es6
rename to test/javascripts/admin/components/group-list-setting-test.js
diff --git a/test/javascripts/admin/components/themes-list-item-test.js.es6 b/test/javascripts/admin/components/themes-list-item-test.js
similarity index 100%
rename from test/javascripts/admin/components/themes-list-item-test.js.es6
rename to test/javascripts/admin/components/themes-list-item-test.js
diff --git a/test/javascripts/admin/components/themes-list-test.js.es6 b/test/javascripts/admin/components/themes-list-test.js
similarity index 100%
rename from test/javascripts/admin/components/themes-list-test.js.es6
rename to test/javascripts/admin/components/themes-list-test.js
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
rename to test/javascripts/admin/controllers/admin-customize-themes-show-test.js
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
rename to test/javascripts/admin/controllers/admin-customize-themes-test.js
diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 b/test/javascripts/admin/controllers/admin-user-badges-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-user-badges-test.js.es6
rename to test/javascripts/admin/controllers/admin-user-badges-test.js
diff --git a/test/javascripts/admin/models/theme-test.js.es6 b/test/javascripts/admin/models/theme-test.js
similarity index 100%
rename from test/javascripts/admin/models/theme-test.js.es6
rename to test/javascripts/admin/models/theme-test.js
diff --git a/test/javascripts/components/ace-editor-test.js.es6 b/test/javascripts/components/ace-editor-test.js
similarity index 100%
rename from test/javascripts/components/ace-editor-test.js.es6
rename to test/javascripts/components/ace-editor-test.js
diff --git a/test/javascripts/components/admin-report-test.js.es6 b/test/javascripts/components/admin-report-test.js
similarity index 100%
rename from test/javascripts/components/admin-report-test.js.es6
rename to test/javascripts/components/admin-report-test.js
diff --git a/test/javascripts/components/badge-title-test.js.es6 b/test/javascripts/components/badge-title-test.js
similarity index 100%
rename from test/javascripts/components/badge-title-test.js.es6
rename to test/javascripts/components/badge-title-test.js
diff --git a/test/javascripts/components/d-button-test.js.es6 b/test/javascripts/components/d-button-test.js
similarity index 100%
rename from test/javascripts/components/d-button-test.js.es6
rename to test/javascripts/components/d-button-test.js
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js
similarity index 100%
rename from test/javascripts/components/d-editor-test.js.es6
rename to test/javascripts/components/d-editor-test.js
diff --git a/test/javascripts/components/d-icon-test.js.es6 b/test/javascripts/components/d-icon-test.js
similarity index 100%
rename from test/javascripts/components/d-icon-test.js.es6
rename to test/javascripts/components/d-icon-test.js
diff --git a/test/javascripts/components/date-input-test.js.es6 b/test/javascripts/components/date-input-test.js
similarity index 100%
rename from test/javascripts/components/date-input-test.js.es6
rename to test/javascripts/components/date-input-test.js
diff --git a/test/javascripts/components/date-time-input-range-test.js.es6 b/test/javascripts/components/date-time-input-range-test.js
similarity index 100%
rename from test/javascripts/components/date-time-input-range-test.js.es6
rename to test/javascripts/components/date-time-input-range-test.js
diff --git a/test/javascripts/components/date-time-input-test.js.es6 b/test/javascripts/components/date-time-input-test.js
similarity index 100%
rename from test/javascripts/components/date-time-input-test.js.es6
rename to test/javascripts/components/date-time-input-test.js
diff --git a/test/javascripts/components/group-membership-button-test.js.es6 b/test/javascripts/components/group-membership-button-test.js
similarity index 100%
rename from test/javascripts/components/group-membership-button-test.js.es6
rename to test/javascripts/components/group-membership-button-test.js
diff --git a/test/javascripts/components/html-safe-helper-test.js.es6 b/test/javascripts/components/html-safe-helper-test.js
similarity index 100%
rename from test/javascripts/components/html-safe-helper-test.js.es6
rename to test/javascripts/components/html-safe-helper-test.js
diff --git a/test/javascripts/components/iframed-html-test.js.es6 b/test/javascripts/components/iframed-html-test.js
similarity index 100%
rename from test/javascripts/components/iframed-html-test.js.es6
rename to test/javascripts/components/iframed-html-test.js
diff --git a/test/javascripts/components/image-uploader-test.js.es6 b/test/javascripts/components/image-uploader-test.js
similarity index 100%
rename from test/javascripts/components/image-uploader-test.js.es6
rename to test/javascripts/components/image-uploader-test.js
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js.es6 b/test/javascripts/components/keyboard-shortcuts-test.js
similarity index 100%
rename from test/javascripts/components/keyboard-shortcuts-test.js.es6
rename to test/javascripts/components/keyboard-shortcuts-test.js
diff --git a/test/javascripts/components/load-more-test.js.es6 b/test/javascripts/components/load-more-test.js
similarity index 100%
rename from test/javascripts/components/load-more-test.js.es6
rename to test/javascripts/components/load-more-test.js
diff --git a/test/javascripts/components/secret-value-list-test.js.es6 b/test/javascripts/components/secret-value-list-test.js
similarity index 100%
rename from test/javascripts/components/secret-value-list-test.js.es6
rename to test/javascripts/components/secret-value-list-test.js
diff --git a/test/javascripts/components/select-kit/category-chooser-test.js.es6 b/test/javascripts/components/select-kit/category-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/category-chooser-test.js.es6
rename to test/javascripts/components/select-kit/category-chooser-test.js
diff --git a/test/javascripts/components/select-kit/category-drop-test.js.es6 b/test/javascripts/components/select-kit/category-drop-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/category-drop-test.js.es6
rename to test/javascripts/components/select-kit/category-drop-test.js
diff --git a/test/javascripts/components/select-kit/combo-box-test.js.es6 b/test/javascripts/components/select-kit/combo-box-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/combo-box-test.js.es6
rename to test/javascripts/components/select-kit/combo-box-test.js
diff --git a/test/javascripts/components/select-kit/dropdown-select-box-test.js.es6 b/test/javascripts/components/select-kit/dropdown-select-box-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/dropdown-select-box-test.js.es6
rename to test/javascripts/components/select-kit/dropdown-select-box-test.js
diff --git a/test/javascripts/components/select-kit/list-setting-test.js.es6 b/test/javascripts/components/select-kit/list-setting-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/list-setting-test.js.es6
rename to test/javascripts/components/select-kit/list-setting-test.js
diff --git a/test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6 b/test/javascripts/components/select-kit/mini-tag-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6
rename to test/javascripts/components/select-kit/mini-tag-chooser-test.js
diff --git a/test/javascripts/components/select-kit/multi-select-test.js.es6 b/test/javascripts/components/select-kit/multi-select-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/multi-select-test.js.es6
rename to test/javascripts/components/select-kit/multi-select-test.js
diff --git a/test/javascripts/components/select-kit/notifications-button-test.js.es6 b/test/javascripts/components/select-kit/notifications-button-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/notifications-button-test.js.es6
rename to test/javascripts/components/select-kit/notifications-button-test.js
diff --git a/test/javascripts/components/select-kit/pinned-options-test.js.es6 b/test/javascripts/components/select-kit/pinned-options-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/pinned-options-test.js.es6
rename to test/javascripts/components/select-kit/pinned-options-test.js
diff --git a/test/javascripts/components/select-kit/select-kit-test-helper.js.es6 b/test/javascripts/components/select-kit/select-kit-test-helper.js
similarity index 100%
rename from test/javascripts/components/select-kit/select-kit-test-helper.js.es6
rename to test/javascripts/components/select-kit/select-kit-test-helper.js
diff --git a/test/javascripts/components/select-kit/single-select-test.js.es6 b/test/javascripts/components/select-kit/single-select-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/single-select-test.js.es6
rename to test/javascripts/components/select-kit/single-select-test.js
diff --git a/test/javascripts/components/select-kit/tag-drop-test.js.es6 b/test/javascripts/components/select-kit/tag-drop-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/tag-drop-test.js.es6
rename to test/javascripts/components/select-kit/tag-drop-test.js
diff --git a/test/javascripts/components/select-kit/topic-notifications-button-test.js.es6 b/test/javascripts/components/select-kit/topic-notifications-button-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-button-test.js.es6
rename to test/javascripts/components/select-kit/topic-notifications-button-test.js
diff --git a/test/javascripts/components/select-kit/topic-notifications-options-test.js.es6 b/test/javascripts/components/select-kit/topic-notifications-options-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-options-test.js.es6
rename to test/javascripts/components/select-kit/topic-notifications-options-test.js
diff --git a/test/javascripts/components/select-kit/user-chooser-test.js.es6 b/test/javascripts/components/select-kit/user-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/user-chooser-test.js.es6
rename to test/javascripts/components/select-kit/user-chooser-test.js
diff --git a/test/javascripts/components/share-button-test.js.es6 b/test/javascripts/components/share-button-test.js
similarity index 100%
rename from test/javascripts/components/share-button-test.js.es6
rename to test/javascripts/components/share-button-test.js
diff --git a/test/javascripts/components/share-button.js.es6 b/test/javascripts/components/share-button.js
similarity index 100%
rename from test/javascripts/components/share-button.js.es6
rename to test/javascripts/components/share-button.js
diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js
similarity index 100%
rename from test/javascripts/components/text-field-test.js.es6
rename to test/javascripts/components/text-field-test.js
diff --git a/test/javascripts/components/text-overflow-test.js.es6 b/test/javascripts/components/text-overflow-test.js
similarity index 100%
rename from test/javascripts/components/text-overflow-test.js.es6
rename to test/javascripts/components/text-overflow-test.js
diff --git a/test/javascripts/components/time-input-test.js.es6 b/test/javascripts/components/time-input-test.js
similarity index 100%
rename from test/javascripts/components/time-input-test.js.es6
rename to test/javascripts/components/time-input-test.js
diff --git a/test/javascripts/components/user-selector-test.js.es6 b/test/javascripts/components/user-selector-test.js
similarity index 100%
rename from test/javascripts/components/user-selector-test.js.es6
rename to test/javascripts/components/user-selector-test.js
diff --git a/test/javascripts/components/value-list-test.js.es6 b/test/javascripts/components/value-list-test.js
similarity index 100%
rename from test/javascripts/components/value-list-test.js.es6
rename to test/javascripts/components/value-list-test.js
diff --git a/test/javascripts/controllers/avatar-selector-test.js.es6 b/test/javascripts/controllers/avatar-selector-test.js
similarity index 100%
rename from test/javascripts/controllers/avatar-selector-test.js.es6
rename to test/javascripts/controllers/avatar-selector-test.js
diff --git a/test/javascripts/controllers/bookmark-test.js.es6 b/test/javascripts/controllers/bookmark-test.js
similarity index 100%
rename from test/javascripts/controllers/bookmark-test.js.es6
rename to test/javascripts/controllers/bookmark-test.js
diff --git a/test/javascripts/controllers/create-account-test.js.es6 b/test/javascripts/controllers/create-account-test.js
similarity index 100%
rename from test/javascripts/controllers/create-account-test.js.es6
rename to test/javascripts/controllers/create-account-test.js
diff --git a/test/javascripts/controllers/group-test.js.es6 b/test/javascripts/controllers/group-test.js
similarity index 100%
rename from test/javascripts/controllers/group-test.js.es6
rename to test/javascripts/controllers/group-test.js
diff --git a/test/javascripts/controllers/history-test.js.es6 b/test/javascripts/controllers/history-test.js
similarity index 100%
rename from test/javascripts/controllers/history-test.js.es6
rename to test/javascripts/controllers/history-test.js
diff --git a/test/javascripts/controllers/preferences-account-test.js.es6 b/test/javascripts/controllers/preferences-account-test.js
similarity index 100%
rename from test/javascripts/controllers/preferences-account-test.js.es6
rename to test/javascripts/controllers/preferences-account-test.js
diff --git a/test/javascripts/controllers/preferences-second-factor-test.js.es6 b/test/javascripts/controllers/preferences-second-factor-test.js
similarity index 100%
rename from test/javascripts/controllers/preferences-second-factor-test.js.es6
rename to test/javascripts/controllers/preferences-second-factor-test.js
diff --git a/test/javascripts/controllers/reorder-categories-test.js.es6 b/test/javascripts/controllers/reorder-categories-test.js
similarity index 100%
rename from test/javascripts/controllers/reorder-categories-test.js.es6
rename to test/javascripts/controllers/reorder-categories-test.js
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js
similarity index 100%
rename from test/javascripts/controllers/topic-test.js.es6
rename to test/javascripts/controllers/topic-test.js
diff --git a/test/javascripts/ember/resolver-test.js.es6 b/test/javascripts/ember/resolver-test.js
similarity index 100%
rename from test/javascripts/ember/resolver-test.js.es6
rename to test/javascripts/ember/resolver-test.js
diff --git a/test/javascripts/fixtures/about.js.es6 b/test/javascripts/fixtures/about.js
similarity index 100%
rename from test/javascripts/fixtures/about.js.es6
rename to test/javascripts/fixtures/about.js
diff --git a/test/javascripts/fixtures/badges_fixture.js.es6 b/test/javascripts/fixtures/badges_fixture.js
similarity index 100%
rename from test/javascripts/fixtures/badges_fixture.js.es6
rename to test/javascripts/fixtures/badges_fixture.js
diff --git a/test/javascripts/fixtures/category-fixtures.js.es6 b/test/javascripts/fixtures/category-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/category-fixtures.js.es6
rename to test/javascripts/fixtures/category-fixtures.js
diff --git a/test/javascripts/fixtures/concerns/notification-types.js.es6.erb b/test/javascripts/fixtures/concerns/notification-types.js.erb
similarity index 100%
rename from test/javascripts/fixtures/concerns/notification-types.js.es6.erb
rename to test/javascripts/fixtures/concerns/notification-types.js.erb
diff --git a/test/javascripts/fixtures/dashboard-general.js.es6 b/test/javascripts/fixtures/dashboard-general.js
similarity index 100%
rename from test/javascripts/fixtures/dashboard-general.js.es6
rename to test/javascripts/fixtures/dashboard-general.js
diff --git a/test/javascripts/fixtures/dashboard.js.es6 b/test/javascripts/fixtures/dashboard.js
similarity index 100%
rename from test/javascripts/fixtures/dashboard.js.es6
rename to test/javascripts/fixtures/dashboard.js
diff --git a/test/javascripts/fixtures/directory-fixtures.js.es6 b/test/javascripts/fixtures/directory-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/directory-fixtures.js.es6
rename to test/javascripts/fixtures/directory-fixtures.js
diff --git a/test/javascripts/fixtures/discovery_fixtures.js.es6 b/test/javascripts/fixtures/discovery_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/discovery_fixtures.js.es6
rename to test/javascripts/fixtures/discovery_fixtures.js
diff --git a/test/javascripts/fixtures/draft.js.es6 b/test/javascripts/fixtures/draft.js
similarity index 100%
rename from test/javascripts/fixtures/draft.js.es6
rename to test/javascripts/fixtures/draft.js
diff --git a/test/javascripts/fixtures/drafts.js.es6 b/test/javascripts/fixtures/drafts.js
similarity index 100%
rename from test/javascripts/fixtures/drafts.js.es6
rename to test/javascripts/fixtures/drafts.js
diff --git a/test/javascripts/fixtures/group-fixtures.js.es6 b/test/javascripts/fixtures/group-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/group-fixtures.js.es6
rename to test/javascripts/fixtures/group-fixtures.js
diff --git a/test/javascripts/fixtures/groups-fixtures.js.es6 b/test/javascripts/fixtures/groups-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/groups-fixtures.js.es6
rename to test/javascripts/fixtures/groups-fixtures.js
diff --git a/test/javascripts/fixtures/notification_fixtures.js.es6 b/test/javascripts/fixtures/notification_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/notification_fixtures.js.es6
rename to test/javascripts/fixtures/notification_fixtures.js
diff --git a/test/javascripts/fixtures/poll.js.es6 b/test/javascripts/fixtures/poll.js
similarity index 100%
rename from test/javascripts/fixtures/poll.js.es6
rename to test/javascripts/fixtures/poll.js
diff --git a/test/javascripts/fixtures/post.js.es6 b/test/javascripts/fixtures/post.js
similarity index 100%
rename from test/javascripts/fixtures/post.js.es6
rename to test/javascripts/fixtures/post.js
diff --git a/test/javascripts/fixtures/private_messages_fixtures.js.es6 b/test/javascripts/fixtures/private_messages_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/private_messages_fixtures.js.es6
rename to test/javascripts/fixtures/private_messages_fixtures.js
diff --git a/test/javascripts/fixtures/problems.js.es6 b/test/javascripts/fixtures/problems.js
similarity index 100%
rename from test/javascripts/fixtures/problems.js.es6
rename to test/javascripts/fixtures/problems.js
diff --git a/test/javascripts/fixtures/reports.js.es6 b/test/javascripts/fixtures/reports.js
similarity index 100%
rename from test/javascripts/fixtures/reports.js.es6
rename to test/javascripts/fixtures/reports.js
diff --git a/test/javascripts/fixtures/reports_bulk.js.es6 b/test/javascripts/fixtures/reports_bulk.js
similarity index 100%
rename from test/javascripts/fixtures/reports_bulk.js.es6
rename to test/javascripts/fixtures/reports_bulk.js
diff --git a/test/javascripts/fixtures/search-fixtures.js.es6 b/test/javascripts/fixtures/search-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/search-fixtures.js.es6
rename to test/javascripts/fixtures/search-fixtures.js
diff --git a/test/javascripts/fixtures/session-fixtures.js.es6 b/test/javascripts/fixtures/session-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/session-fixtures.js.es6
rename to test/javascripts/fixtures/session-fixtures.js
diff --git a/test/javascripts/fixtures/site-fixtures.js.es6 b/test/javascripts/fixtures/site-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/site-fixtures.js.es6
rename to test/javascripts/fixtures/site-fixtures.js
diff --git a/test/javascripts/fixtures/site_settings.js.es6 b/test/javascripts/fixtures/site_settings.js
similarity index 100%
rename from test/javascripts/fixtures/site_settings.js.es6
rename to test/javascripts/fixtures/site_settings.js
diff --git a/test/javascripts/fixtures/static_fixtures.js.es6 b/test/javascripts/fixtures/static_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/static_fixtures.js.es6
rename to test/javascripts/fixtures/static_fixtures.js
diff --git a/test/javascripts/fixtures/top_fixture.js.es6 b/test/javascripts/fixtures/top_fixture.js
similarity index 100%
rename from test/javascripts/fixtures/top_fixture.js.es6
rename to test/javascripts/fixtures/top_fixture.js
diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js
similarity index 100%
rename from test/javascripts/fixtures/topic.js.es6
rename to test/javascripts/fixtures/topic.js
diff --git a/test/javascripts/fixtures/user-badges.js.es6 b/test/javascripts/fixtures/user-badges.js
similarity index 100%
rename from test/javascripts/fixtures/user-badges.js.es6
rename to test/javascripts/fixtures/user-badges.js
diff --git a/test/javascripts/fixtures/user_fixtures.js.es6 b/test/javascripts/fixtures/user_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/user_fixtures.js.es6
rename to test/javascripts/fixtures/user_fixtures.js
diff --git a/test/javascripts/fixtures/watched-words-fixtures.js.es6 b/test/javascripts/fixtures/watched-words-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/watched-words-fixtures.js.es6
rename to test/javascripts/fixtures/watched-words-fixtures.js
diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js
index 95d7b2a7dd..81fbd40b1b 100644
--- a/test/javascripts/helpers/assertions.js
+++ b/test/javascripts/helpers/assertions.js
@@ -1,5 +1,4 @@
-/* exported exists, count, present, blank, containsInstance, not, visible, invisible */
-
+// discourse-skip-module
 function exists(selector) {
   return count(selector) > 0;
 }
@@ -13,8 +12,10 @@ function visible(selector) {
 }
 
 function invisible(selector) {
-  var $items = find(selector + ":visible");
-  return $items.length === 0 ||
-         $items.css("opacity") === "0" ||
-         $items.css("visibility") === "hidden";
+  const $items = find(selector + ":visible");
+  return (
+    $items.length === 0 ||
+    $items.css("opacity") === "0" ||
+    $items.css("visibility") === "hidden"
+  );
 }
diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js
similarity index 100%
rename from test/javascripts/helpers/component-test.js.es6
rename to test/javascripts/helpers/component-test.js
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js
similarity index 100%
rename from test/javascripts/helpers/create-pretender.js.es6
rename to test/javascripts/helpers/create-pretender.js
diff --git a/test/javascripts/helpers/create-store.js.es6 b/test/javascripts/helpers/create-store.js
similarity index 100%
rename from test/javascripts/helpers/create-store.js.es6
rename to test/javascripts/helpers/create-store.js
diff --git a/test/javascripts/helpers/d-editor-helper.js.es6 b/test/javascripts/helpers/d-editor-helper.js
similarity index 100%
rename from test/javascripts/helpers/d-editor-helper.js.es6
rename to test/javascripts/helpers/d-editor-helper.js
diff --git a/test/javascripts/helpers/fixture-pretender.js.es6 b/test/javascripts/helpers/fixture-pretender.js
similarity index 100%
rename from test/javascripts/helpers/fixture-pretender.js.es6
rename to test/javascripts/helpers/fixture-pretender.js
diff --git a/test/javascripts/helpers/html-helper.js.es6 b/test/javascripts/helpers/html-helper.js
similarity index 100%
rename from test/javascripts/helpers/html-helper.js.es6
rename to test/javascripts/helpers/html-helper.js
diff --git a/test/javascripts/helpers/init-ember-qunit.js b/test/javascripts/helpers/init-ember-qunit.js
deleted file mode 100644
index 32d0184e7d..0000000000
--- a/test/javascripts/helpers/init-ember-qunit.js
+++ /dev/null
@@ -1,2 +0,0 @@
-var buildResolver = require('discourse-common/resolver').buildResolver;
-window.setResolver(buildResolver('discourse').create({ namespace: Discourse }));
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js
similarity index 100%
rename from test/javascripts/helpers/qunit-helpers.js.es6
rename to test/javascripts/helpers/qunit-helpers.js
diff --git a/test/javascripts/helpers/review-pretender.js.es6 b/test/javascripts/helpers/review-pretender.js
similarity index 100%
rename from test/javascripts/helpers/review-pretender.js.es6
rename to test/javascripts/helpers/review-pretender.js
diff --git a/test/javascripts/helpers/select-kit-helper.js.es6 b/test/javascripts/helpers/select-kit-helper.js
similarity index 100%
rename from test/javascripts/helpers/select-kit-helper.js.es6
rename to test/javascripts/helpers/select-kit-helper.js
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index 621aa3d6ac..c39424b0df 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -1,4 +1,5 @@
-/*jshint maxlen:10000000 */
+// discourse-skip-module
+
 Discourse.SiteSettingsOriginal = {
   title: "QUnit Discourse Tests",
   site_logo_url: "/assets/logo.png",
@@ -12,8 +13,10 @@ Discourse.SiteSettingsOriginal = {
   ga_universal_tracking_code: "",
   ga_universal_domain_name: "auto",
   top_menu: "latest|new|unread|categories|top",
-  post_menu: "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
-  post_menu_hidden_items: "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
+  post_menu:
+    "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
+  post_menu_hidden_items:
+    "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
   share_links: "twitter|facebook|email",
   category_colors:
     "BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|27AA5B|B3B5B4|E45735",
@@ -102,6 +105,7 @@ Discourse.SiteSettingsOriginal = {
   unicode_usernames: false,
   secure_media: false
 };
+
 Discourse.SiteSettings = jQuery.extend(
   true,
   {},
diff --git a/test/javascripts/helpers/site.js.es6 b/test/javascripts/helpers/site.js
similarity index 100%
rename from test/javascripts/helpers/site.js.es6
rename to test/javascripts/helpers/site.js
diff --git a/test/javascripts/helpers/store-pretender.js.es6 b/test/javascripts/helpers/store-pretender.js
similarity index 100%
rename from test/javascripts/helpers/store-pretender.js.es6
rename to test/javascripts/helpers/store-pretender.js
diff --git a/test/javascripts/helpers/textarea-selection-helper.js.es6 b/test/javascripts/helpers/textarea-selection-helper.js
similarity index 100%
rename from test/javascripts/helpers/textarea-selection-helper.js.es6
rename to test/javascripts/helpers/textarea-selection-helper.js
diff --git a/test/javascripts/helpers/widget-test.js.es6 b/test/javascripts/helpers/widget-test.js
similarity index 100%
rename from test/javascripts/helpers/widget-test.js.es6
rename to test/javascripts/helpers/widget-test.js
diff --git a/test/javascripts/initializers/localization-test.js.es6 b/test/javascripts/initializers/localization-test.js
similarity index 100%
rename from test/javascripts/initializers/localization-test.js.es6
rename to test/javascripts/initializers/localization-test.js
diff --git a/test/javascripts/lib/bbcode-test.js.es6 b/test/javascripts/lib/bbcode-test.js
similarity index 100%
rename from test/javascripts/lib/bbcode-test.js.es6
rename to test/javascripts/lib/bbcode-test.js
diff --git a/test/javascripts/lib/break-string-test.js.es6 b/test/javascripts/lib/break-string-test.js
similarity index 100%
rename from test/javascripts/lib/break-string-test.js.es6
rename to test/javascripts/lib/break-string-test.js
diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js
similarity index 100%
rename from test/javascripts/lib/category-badge-test.js.es6
rename to test/javascripts/lib/category-badge-test.js
diff --git a/test/javascripts/lib/click-track-edit-history-test.js.es6 b/test/javascripts/lib/click-track-edit-history-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-edit-history-test.js.es6
rename to test/javascripts/lib/click-track-edit-history-test.js
diff --git a/test/javascripts/lib/click-track-profile-page-test.js.es6 b/test/javascripts/lib/click-track-profile-page-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-profile-page-test.js.es6
rename to test/javascripts/lib/click-track-profile-page-test.js
diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-test.js.es6
rename to test/javascripts/lib/click-track-test.js
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js
similarity index 100%
rename from test/javascripts/lib/computed-test.js.es6
rename to test/javascripts/lib/computed-test.js
diff --git a/test/javascripts/lib/discourse-test.js.es6 b/test/javascripts/lib/discourse-test.js
similarity index 100%
rename from test/javascripts/lib/discourse-test.js.es6
rename to test/javascripts/lib/discourse-test.js
diff --git a/test/javascripts/lib/emoji-store-test.js.es6 b/test/javascripts/lib/emoji-store-test.js
similarity index 100%
rename from test/javascripts/lib/emoji-store-test.js.es6
rename to test/javascripts/lib/emoji-store-test.js
diff --git a/test/javascripts/lib/emoji-test.js.es6 b/test/javascripts/lib/emoji-test.js
similarity index 100%
rename from test/javascripts/lib/emoji-test.js.es6
rename to test/javascripts/lib/emoji-test.js
diff --git a/test/javascripts/lib/formatter-test.js.es6 b/test/javascripts/lib/formatter-test.js
similarity index 100%
rename from test/javascripts/lib/formatter-test.js.es6
rename to test/javascripts/lib/formatter-test.js
diff --git a/test/javascripts/lib/highlight-text-test.js.es6 b/test/javascripts/lib/highlight-text-test.js
similarity index 100%
rename from test/javascripts/lib/highlight-text-test.js.es6
rename to test/javascripts/lib/highlight-text-test.js
diff --git a/test/javascripts/lib/i18n-test.js.es6 b/test/javascripts/lib/i18n-test.js
similarity index 100%
rename from test/javascripts/lib/i18n-test.js.es6
rename to test/javascripts/lib/i18n-test.js
diff --git a/test/javascripts/lib/icon-library-test.js.es6 b/test/javascripts/lib/icon-library-test.js
similarity index 100%
rename from test/javascripts/lib/icon-library-test.js.es6
rename to test/javascripts/lib/icon-library-test.js
diff --git a/test/javascripts/lib/key-value-store-test.js.es6 b/test/javascripts/lib/key-value-store-test.js
similarity index 100%
rename from test/javascripts/lib/key-value-store-test.js.es6
rename to test/javascripts/lib/key-value-store-test.js
diff --git a/test/javascripts/lib/link-mentions-test.js.es6 b/test/javascripts/lib/link-mentions-test.js
similarity index 100%
rename from test/javascripts/lib/link-mentions-test.js.es6
rename to test/javascripts/lib/link-mentions-test.js
diff --git a/test/javascripts/lib/load-script-test.js.es6 b/test/javascripts/lib/load-script-test.js
similarity index 100%
rename from test/javascripts/lib/load-script-test.js.es6
rename to test/javascripts/lib/load-script-test.js
diff --git a/test/javascripts/lib/oneboxer-test.js.es6 b/test/javascripts/lib/oneboxer-test.js
similarity index 100%
rename from test/javascripts/lib/oneboxer-test.js.es6
rename to test/javascripts/lib/oneboxer-test.js
diff --git a/test/javascripts/lib/preload-store-test.js.es6 b/test/javascripts/lib/preload-store-test.js
similarity index 100%
rename from test/javascripts/lib/preload-store-test.js.es6
rename to test/javascripts/lib/preload-store-test.js
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js
similarity index 100%
rename from test/javascripts/lib/pretty-text-test.js.es6
rename to test/javascripts/lib/pretty-text-test.js
diff --git a/test/javascripts/lib/sanitizer-test.js.es6 b/test/javascripts/lib/sanitizer-test.js
similarity index 100%
rename from test/javascripts/lib/sanitizer-test.js.es6
rename to test/javascripts/lib/sanitizer-test.js
diff --git a/test/javascripts/lib/screen-track-test.js.es6 b/test/javascripts/lib/screen-track-test.js
similarity index 100%
rename from test/javascripts/lib/screen-track-test.js.es6
rename to test/javascripts/lib/screen-track-test.js
diff --git a/test/javascripts/lib/search-test.js.es6 b/test/javascripts/lib/search-test.js
similarity index 100%
rename from test/javascripts/lib/search-test.js.es6
rename to test/javascripts/lib/search-test.js
diff --git a/test/javascripts/lib/sharing-test.js.es6 b/test/javascripts/lib/sharing-test.js
similarity index 100%
rename from test/javascripts/lib/sharing-test.js.es6
rename to test/javascripts/lib/sharing-test.js
diff --git a/test/javascripts/lib/text-direction-test.js.es6 b/test/javascripts/lib/text-direction-test.js
similarity index 100%
rename from test/javascripts/lib/text-direction-test.js.es6
rename to test/javascripts/lib/text-direction-test.js
diff --git a/test/javascripts/lib/to-markdown-test.js.es6 b/test/javascripts/lib/to-markdown-test.js
similarity index 100%
rename from test/javascripts/lib/to-markdown-test.js.es6
rename to test/javascripts/lib/to-markdown-test.js
diff --git a/test/javascripts/lib/tooltip-test.js.es6 b/test/javascripts/lib/tooltip-test.js
similarity index 100%
rename from test/javascripts/lib/tooltip-test.js.es6
rename to test/javascripts/lib/tooltip-test.js
diff --git a/test/javascripts/lib/upload-short-url-test.js.es6 b/test/javascripts/lib/upload-short-url-test.js
similarity index 100%
rename from test/javascripts/lib/upload-short-url-test.js.es6
rename to test/javascripts/lib/upload-short-url-test.js
diff --git a/test/javascripts/lib/uploads-test.js.es6 b/test/javascripts/lib/uploads-test.js
similarity index 100%
rename from test/javascripts/lib/uploads-test.js.es6
rename to test/javascripts/lib/uploads-test.js
diff --git a/test/javascripts/lib/url-test.js.es6 b/test/javascripts/lib/url-test.js
similarity index 100%
rename from test/javascripts/lib/url-test.js.es6
rename to test/javascripts/lib/url-test.js
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js
similarity index 100%
rename from test/javascripts/lib/user-search-test.js.es6
rename to test/javascripts/lib/user-search-test.js
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js
similarity index 100%
rename from test/javascripts/lib/utilities-test.js.es6
rename to test/javascripts/lib/utilities-test.js
diff --git a/test/javascripts/lib/white-lister-test.js.es6 b/test/javascripts/lib/white-lister-test.js
similarity index 100%
rename from test/javascripts/lib/white-lister-test.js.es6
rename to test/javascripts/lib/white-lister-test.js
diff --git a/test/javascripts/mixins/grant-badge-controller-test.js.es6 b/test/javascripts/mixins/grant-badge-controller-test.js
similarity index 100%
rename from test/javascripts/mixins/grant-badge-controller-test.js.es6
rename to test/javascripts/mixins/grant-badge-controller-test.js
diff --git a/test/javascripts/mixins/setting-object-test.js.es6 b/test/javascripts/mixins/setting-object-test.js
similarity index 100%
rename from test/javascripts/mixins/setting-object-test.js.es6
rename to test/javascripts/mixins/setting-object-test.js
diff --git a/test/javascripts/mixins/singleton-test.js.es6 b/test/javascripts/mixins/singleton-test.js
similarity index 100%
rename from test/javascripts/mixins/singleton-test.js.es6
rename to test/javascripts/mixins/singleton-test.js
diff --git a/test/javascripts/models/badge-test.js.es6 b/test/javascripts/models/badge-test.js
similarity index 100%
rename from test/javascripts/models/badge-test.js.es6
rename to test/javascripts/models/badge-test.js
diff --git a/test/javascripts/models/category-test.js.es6 b/test/javascripts/models/category-test.js
similarity index 100%
rename from test/javascripts/models/category-test.js.es6
rename to test/javascripts/models/category-test.js
diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js
similarity index 100%
rename from test/javascripts/models/composer-test.js.es6
rename to test/javascripts/models/composer-test.js
diff --git a/test/javascripts/models/email-log-test.js.es6 b/test/javascripts/models/email-log-test.js
similarity index 100%
rename from test/javascripts/models/email-log-test.js.es6
rename to test/javascripts/models/email-log-test.js
diff --git a/test/javascripts/models/group-test.js.es6 b/test/javascripts/models/group-test.js
similarity index 100%
rename from test/javascripts/models/group-test.js.es6
rename to test/javascripts/models/group-test.js
diff --git a/test/javascripts/models/invite-test.js.es6 b/test/javascripts/models/invite-test.js
similarity index 100%
rename from test/javascripts/models/invite-test.js.es6
rename to test/javascripts/models/invite-test.js
diff --git a/test/javascripts/models/nav-item-test.js.es6 b/test/javascripts/models/nav-item-test.js
similarity index 100%
rename from test/javascripts/models/nav-item-test.js.es6
rename to test/javascripts/models/nav-item-test.js
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js
similarity index 100%
rename from test/javascripts/models/post-stream-test.js.es6
rename to test/javascripts/models/post-stream-test.js
diff --git a/test/javascripts/models/post-test.js.es6 b/test/javascripts/models/post-test.js
similarity index 100%
rename from test/javascripts/models/post-test.js.es6
rename to test/javascripts/models/post-test.js
diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js
similarity index 100%
rename from test/javascripts/models/report-test.js.es6
rename to test/javascripts/models/report-test.js
diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js
similarity index 100%
rename from test/javascripts/models/rest-model-test.js.es6
rename to test/javascripts/models/rest-model-test.js
diff --git a/test/javascripts/models/result-set-test.js.es6 b/test/javascripts/models/result-set-test.js
similarity index 100%
rename from test/javascripts/models/result-set-test.js.es6
rename to test/javascripts/models/result-set-test.js
diff --git a/test/javascripts/models/session-test.js.es6 b/test/javascripts/models/session-test.js
similarity index 100%
rename from test/javascripts/models/session-test.js.es6
rename to test/javascripts/models/session-test.js
diff --git a/test/javascripts/models/site-test.js.es6 b/test/javascripts/models/site-test.js
similarity index 100%
rename from test/javascripts/models/site-test.js.es6
rename to test/javascripts/models/site-test.js
diff --git a/test/javascripts/models/staff-action-log-test.js.es6 b/test/javascripts/models/staff-action-log-test.js
similarity index 100%
rename from test/javascripts/models/staff-action-log-test.js.es6
rename to test/javascripts/models/staff-action-log-test.js
diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js
similarity index 100%
rename from test/javascripts/models/store-test.js.es6
rename to test/javascripts/models/store-test.js
diff --git a/test/javascripts/models/topic-details-test.js.es6 b/test/javascripts/models/topic-details-test.js
similarity index 100%
rename from test/javascripts/models/topic-details-test.js.es6
rename to test/javascripts/models/topic-details-test.js
diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js
similarity index 100%
rename from test/javascripts/models/topic-test.js.es6
rename to test/javascripts/models/topic-test.js
diff --git a/test/javascripts/models/topic-tracking-state-test.js.es6 b/test/javascripts/models/topic-tracking-state-test.js
similarity index 100%
rename from test/javascripts/models/topic-tracking-state-test.js.es6
rename to test/javascripts/models/topic-tracking-state-test.js
diff --git a/test/javascripts/models/user-action-test.js.es6 b/test/javascripts/models/user-action-test.js
similarity index 100%
rename from test/javascripts/models/user-action-test.js.es6
rename to test/javascripts/models/user-action-test.js
diff --git a/test/javascripts/models/user-badge-test.js.es6 b/test/javascripts/models/user-badge-test.js
similarity index 100%
rename from test/javascripts/models/user-badge-test.js.es6
rename to test/javascripts/models/user-badge-test.js
diff --git a/test/javascripts/models/user-drafts-test.js.es6 b/test/javascripts/models/user-drafts-test.js
similarity index 100%
rename from test/javascripts/models/user-drafts-test.js.es6
rename to test/javascripts/models/user-drafts-test.js
diff --git a/test/javascripts/models/user-stream-test.js.es6 b/test/javascripts/models/user-stream-test.js
similarity index 100%
rename from test/javascripts/models/user-stream-test.js.es6
rename to test/javascripts/models/user-stream-test.js
diff --git a/test/javascripts/models/user-test.js.es6 b/test/javascripts/models/user-test.js
similarity index 100%
rename from test/javascripts/models/user-test.js.es6
rename to test/javascripts/models/user-test.js
diff --git a/test/javascripts/utils/decorators-test.js.es6 b/test/javascripts/utils/decorators-test.js
similarity index 100%
rename from test/javascripts/utils/decorators-test.js.es6
rename to test/javascripts/utils/decorators-test.js
diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js
similarity index 100%
rename from test/javascripts/widgets/actions-summary-test.js.es6
rename to test/javascripts/widgets/actions-summary-test.js
diff --git a/test/javascripts/widgets/avatar-flair-test.js.es6 b/test/javascripts/widgets/avatar-flair-test.js
similarity index 100%
rename from test/javascripts/widgets/avatar-flair-test.js.es6
rename to test/javascripts/widgets/avatar-flair-test.js
diff --git a/test/javascripts/widgets/button-test.js.es6 b/test/javascripts/widgets/button-test.js
similarity index 100%
rename from test/javascripts/widgets/button-test.js.es6
rename to test/javascripts/widgets/button-test.js
diff --git a/test/javascripts/widgets/default-notification-item-test.js.es6 b/test/javascripts/widgets/default-notification-item-test.js
similarity index 100%
rename from test/javascripts/widgets/default-notification-item-test.js.es6
rename to test/javascripts/widgets/default-notification-item-test.js
diff --git a/test/javascripts/widgets/hamburger-menu-test.js.es6 b/test/javascripts/widgets/hamburger-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/hamburger-menu-test.js.es6
rename to test/javascripts/widgets/hamburger-menu-test.js
diff --git a/test/javascripts/widgets/header-test.js.es6 b/test/javascripts/widgets/header-test.js
similarity index 100%
rename from test/javascripts/widgets/header-test.js.es6
rename to test/javascripts/widgets/header-test.js
diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js
similarity index 100%
rename from test/javascripts/widgets/home-logo-test.js.es6
rename to test/javascripts/widgets/home-logo-test.js
diff --git a/test/javascripts/widgets/post-links-test.js.es6 b/test/javascripts/widgets/post-links-test.js
similarity index 100%
rename from test/javascripts/widgets/post-links-test.js.es6
rename to test/javascripts/widgets/post-links-test.js
diff --git a/test/javascripts/widgets/post-stream-test.js.es6 b/test/javascripts/widgets/post-stream-test.js
similarity index 100%
rename from test/javascripts/widgets/post-stream-test.js.es6
rename to test/javascripts/widgets/post-stream-test.js
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js
similarity index 100%
rename from test/javascripts/widgets/post-test.js.es6
rename to test/javascripts/widgets/post-test.js
diff --git a/test/javascripts/widgets/poster-name-test.js.es6 b/test/javascripts/widgets/poster-name-test.js
similarity index 100%
rename from test/javascripts/widgets/poster-name-test.js.es6
rename to test/javascripts/widgets/poster-name-test.js
diff --git a/test/javascripts/widgets/quick-access-item-test.js.es6 b/test/javascripts/widgets/quick-access-item-test.js
similarity index 100%
rename from test/javascripts/widgets/quick-access-item-test.js.es6
rename to test/javascripts/widgets/quick-access-item-test.js
diff --git a/test/javascripts/widgets/topic-admin-menu-test.js.es6 b/test/javascripts/widgets/topic-admin-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-admin-menu-test.js.es6
rename to test/javascripts/widgets/topic-admin-menu-test.js
diff --git a/test/javascripts/widgets/topic-participant-test.js.es6 b/test/javascripts/widgets/topic-participant-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-participant-test.js.es6
rename to test/javascripts/widgets/topic-participant-test.js
diff --git a/test/javascripts/widgets/topic-status-test.js.es6 b/test/javascripts/widgets/topic-status-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-status-test.js.es6
rename to test/javascripts/widgets/topic-status-test.js
diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/user-menu-test.js.es6
rename to test/javascripts/widgets/user-menu-test.js
diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js
similarity index 100%
rename from test/javascripts/widgets/widget-test.js.es6
rename to test/javascripts/widgets/widget-test.js

From f68c3d51fcf89d22ebc2dc343fe23b435587686a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 14:51:49 -0400
Subject: [PATCH 269/633] Another ignore entry

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index eec6fc3a2f..5167656c3c 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -34,3 +34,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # The last remaining ES6
 aabeb17aab4e73de5ef56753ab22ef5d416d2932
+
+# All test files es6 -> js
+2bf9b997eadd617e9a674360fa2be2a9c0bdc48b

From 5d66a2c16e6bd21246e6becbef34da8ed07926bc Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 15:03:02 -0400
Subject: [PATCH 270/633] Move the widget-hbs compiler to js from es6

---
 lib/discourse_js_processor.rb                               | 6 +++---
 .../{widget-hbs-compiler.js.es6 => widget-hbs-compiler.js}  | 0
 script/compile_hbs.rb                                       | 2 +-
 script/test_hbs_compiler.rb                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/javascripts/{widget-hbs-compiler.js.es6 => widget-hbs-compiler.js} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 4060b16225..fdf61e9e1c 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -55,8 +55,8 @@ class DiscourseJsProcessor
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
 
-    relative_path =~ /^#{js_root}\/[^\/]+\// ||
-      relative_path =~ /^#{test_root}\/[^\/]+\//
+    !!(relative_path =~ /^#{js_root}\/[^\/]+\// ||
+      relative_path =~ /^#{test_root}\/[^\/]+\//)
   end
 
   def self.skip_module?(data)
@@ -87,7 +87,7 @@ class DiscourseJsProcessor
       }
 
 JS
-      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
       js_source = ::JSON.generate(source, quirks_mode: true)
       js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
       ctx.eval(js)
diff --git a/lib/javascripts/widget-hbs-compiler.js.es6 b/lib/javascripts/widget-hbs-compiler.js
similarity index 100%
rename from lib/javascripts/widget-hbs-compiler.js.es6
rename to lib/javascripts/widget-hbs-compiler.js
diff --git a/script/compile_hbs.rb b/script/compile_hbs.rb
index cfec4386a2..ee072ea35d 100644
--- a/script/compile_hbs.rb
+++ b/script/compile_hbs.rb
@@ -14,7 +14,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
 js_source = ::JSON.generate(source, quirks_mode: true)
 js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
 ctx.eval(js)
diff --git a/script/test_hbs_compiler.rb b/script/test_hbs_compiler.rb
index badbd227e4..f3c5be35c1 100644
--- a/script/test_hbs_compiler.rb
+++ b/script/test_hbs_compiler.rb
@@ -22,7 +22,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
 ctx.eval(source)
 
 js_source = ::JSON.generate(template, quirks_mode: true)

From 661aebdc877a80f7debb93c4d727f2242084908f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 15:40:45 -0400
Subject: [PATCH 271/633] FIX: Resolver wasn't being set properly

---
 test/javascripts/test_helper.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index c2c3520a3b..77598e4712 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -1,3 +1,5 @@
+// discourse-skip-module
+
 /*global document, sinon, QUnit, Logster */
 //= require env
 //= require jquery.debug
@@ -42,6 +44,9 @@
 //
 //= require jquery.magnific-popup.min.js
 
+const buildResolver = require("discourse-common/resolver").buildResolver;
+window.setResolver(buildResolver("discourse").create({ namespace: Discourse }));
+
 sinon.config = {
   injectIntoThis: false,
   injectInto: null,
@@ -103,7 +108,7 @@ function resetSite(siteSettings, extras) {
 QUnit.testStart(function(ctx) {
   server = createPretender.default;
   createPretender.applyDefaultHandlers(server);
-  server.handlers = []
+  server.handlers = [];
 
   server.prepareBody = function(body) {
     if (body && typeof body === "object") {

From 6d1263812f9c23c05683868b82f611964c28e14d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:05:16 -0400
Subject: [PATCH 272/633] FIX: Allow JS transpilation

---
 app/assets/stylesheets/common/base/onebox.scss | 1 +
 app/models/theme_field.rb                      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 694ea8214a..7c5c10ec6b 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -15,6 +15,7 @@ a.loading-onebox {
   }
 }
 
+// test
 .onebox-result {
   @include post-aside;
 
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 085a0e649e..ed0966fb5c 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -134,7 +134,7 @@ class ThemeField < ActiveRecord::Base
     filename, extension = name.split(".", 2)
     begin
       case extension
-      when "js.es6"
+      when "js.es6", "js"
         js_compiler.append_module(content, filename)
       when "hbs"
         js_compiler.append_ember_template(filename.sub("discourse/templates/", ""), content)

From a12c7fcb2f76995f21cc1222add968ed2aedece3 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:13:01 -0400
Subject: [PATCH 273/633] Revert "FIX: Allow JS transpilation"

This reverts commit 6d1263812f9c23c05683868b82f611964c28e14d.
---
 app/assets/stylesheets/common/base/onebox.scss | 1 -
 app/models/theme_field.rb                      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 7c5c10ec6b..694ea8214a 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -15,7 +15,6 @@ a.loading-onebox {
   }
 }
 
-// test
 .onebox-result {
   @include post-aside;
 
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index ed0966fb5c..085a0e649e 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -134,7 +134,7 @@ class ThemeField < ActiveRecord::Base
     filename, extension = name.split(".", 2)
     begin
       case extension
-      when "js.es6", "js"
+      when "js.es6"
         js_compiler.append_module(content, filename)
       when "hbs"
         js_compiler.append_ember_template(filename.sub("discourse/templates/", ""), content)

From 8316500a3919992858861b6edadd440cb61d2d39 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:13:18 -0400
Subject: [PATCH 274/633] Revert "FIX: Resolver wasn't being set properly"

This reverts commit 661aebdc877a80f7debb93c4d727f2242084908f.
---
 test/javascripts/test_helper.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 77598e4712..c2c3520a3b 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -1,5 +1,3 @@
-// discourse-skip-module
-
 /*global document, sinon, QUnit, Logster */
 //= require env
 //= require jquery.debug
@@ -44,9 +42,6 @@
 //
 //= require jquery.magnific-popup.min.js
 
-const buildResolver = require("discourse-common/resolver").buildResolver;
-window.setResolver(buildResolver("discourse").create({ namespace: Discourse }));
-
 sinon.config = {
   injectIntoThis: false,
   injectInto: null,
@@ -108,7 +103,7 @@ function resetSite(siteSettings, extras) {
 QUnit.testStart(function(ctx) {
   server = createPretender.default;
   createPretender.applyDefaultHandlers(server);
-  server.handlers = [];
+  server.handlers = []
 
   server.prepareBody = function(body) {
     if (body && typeof body === "object") {

From eaa324ecbd4a131a4dde5fe79da11133e85f9480 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:13:26 -0400
Subject: [PATCH 275/633] Revert "Move the widget-hbs compiler to js from es6"

This reverts commit 5d66a2c16e6bd21246e6becbef34da8ed07926bc.
---
 lib/discourse_js_processor.rb                               | 6 +++---
 .../{widget-hbs-compiler.js => widget-hbs-compiler.js.es6}  | 0
 script/compile_hbs.rb                                       | 2 +-
 script/test_hbs_compiler.rb                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/javascripts/{widget-hbs-compiler.js => widget-hbs-compiler.js.es6} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index fdf61e9e1c..4060b16225 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -55,8 +55,8 @@ class DiscourseJsProcessor
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
 
-    !!(relative_path =~ /^#{js_root}\/[^\/]+\// ||
-      relative_path =~ /^#{test_root}\/[^\/]+\//)
+    relative_path =~ /^#{js_root}\/[^\/]+\// ||
+      relative_path =~ /^#{test_root}\/[^\/]+\//
   end
 
   def self.skip_module?(data)
@@ -87,7 +87,7 @@ class DiscourseJsProcessor
       }
 
 JS
-      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
+      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
       js_source = ::JSON.generate(source, quirks_mode: true)
       js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
       ctx.eval(js)
diff --git a/lib/javascripts/widget-hbs-compiler.js b/lib/javascripts/widget-hbs-compiler.js.es6
similarity index 100%
rename from lib/javascripts/widget-hbs-compiler.js
rename to lib/javascripts/widget-hbs-compiler.js.es6
diff --git a/script/compile_hbs.rb b/script/compile_hbs.rb
index ee072ea35d..cfec4386a2 100644
--- a/script/compile_hbs.rb
+++ b/script/compile_hbs.rb
@@ -14,7 +14,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
 js_source = ::JSON.generate(source, quirks_mode: true)
 js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
 ctx.eval(js)
diff --git a/script/test_hbs_compiler.rb b/script/test_hbs_compiler.rb
index f3c5be35c1..badbd227e4 100644
--- a/script/test_hbs_compiler.rb
+++ b/script/test_hbs_compiler.rb
@@ -22,7 +22,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
 ctx.eval(source)
 
 js_source = ::JSON.generate(template, quirks_mode: true)

From a42668ead08e996aa71ad10fb3373aafcf35c68f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:13:33 -0400
Subject: [PATCH 276/633] Revert "Another ignore entry"

This reverts commit f68c3d51fcf89d22ebc2dc343fe23b435587686a.
---
 .git-blame-ignore-revs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 5167656c3c..eec6fc3a2f 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -34,6 +34,3 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # The last remaining ES6
 aabeb17aab4e73de5ef56753ab22ef5d416d2932
-
-# All test files es6 -> js
-2bf9b997eadd617e9a674360fa2be2a9c0bdc48b

From 4fa580fbd13f87a295a31d83bf142e9fb56395ac Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:13:43 -0400
Subject: [PATCH 277/633] Revert "Rename all test files from JS -> ES6"

This reverts commit 2abe85b8344de1102c1589a9ac9421a8b296f2b5.
---
 lib/discourse_js_processor.rb                 | 39 +++++++++----------
 .../{about-test.js => about-test.js.es6}      |  0
 ...ed-test.js => account-created-test.js.es6} |  0
 ...mails-test.js => admin-emails-test.js.es6} |  0
 ...t.js => admin-search-log-term-test.js.es6} |  0
 ...-test.js => admin-search-logs-test.js.es6} |  0
 ...est.js => admin-site-settings-test.js.es6} |  0
 ...xt-test.js => admin-site-text-test.js.es6} |  0
 ...test.js => admin-suspend-user-test.js.es6} |  0
 ...-test.js => admin-user-badges-test.js.es6} |  0
 ...-test.js => admin-user-emails-test.js.es6} |  0
 ...x-test.js => admin-user-index-test.js.es6} |  0
 ...t-test.js => admin-users-list-test.js.es6} |  0
 ...est.js => admin-watched-words-test.js.es6} |  0
 ...lete-test.js => auth-complete-test.js.es6} |  0
 .../{badges-test.js => badges-test.js.es6}    |  0
 ...r-test.js => category-chooser-test.js.es6} |  0
 ....js => category-edit-security-test.js.es6} |  0
 ...edit-test.js => category-edit-test.js.es6} |  0
 ...g-test.js => category-hashtag-test.js.es6} |  0
 ...-track-test.js => click-track-test.js.es6} |  0
 ...s-test.js => composer-actions-test.js.es6} |  0
 ...est.js => composer-attachment-test.js.es6} |  0
 ....js => composer-edit-conflict-test.js.es6} |  0
 ...test.js => composer-hyperlink-test.js.es6} |  0
 ...ox-test.js => composer-onebox-test.js.es6} |  0
 ...{composer-test.js => composer-test.js.es6} |  0
 ...st.js => composer-topic-links-test.js.es6} |  0
 ....js => composer-uncategorized-test.js.es6} |  0
 ...=> create-account-user-fields-test.js.es6} |  0
 ...et-test.js => custom-html-set-test.js.es6} |  0
 ...st.js => custom-html-template-test.js.es6} |  0
 ...ashboard-test.js => dashboard-test.js.es6} |  0
 ...otice-test.js => email-notice-test.js.es6} |  0
 ...icker-test.js => emoji-picker-test.js.es6} |  0
 .../{emoji-test.js => emoji-test.js.es6}      |  0
 ...t.js => enforce-second-factor-test.js.es6} |  0
 ...rd-test.js => forgot-password-test.js.es6} |  0
 ...-test.js => group-card-mobile-test.js.es6} |  0
 ...up-card-test.js => group-card-test.js.es6} |  0
 ...-index-test.js => group-index-test.js.es6} |  0
 ...s => group-manage-interaction-test.js.es6} |  0
 ...-test.js => group-manage-logs-test.js.es6} |  0
 ...js => group-manage-membership-test.js.es6} |  0
 ...st.js => group-manage-profile-test.js.es6} |  0
 ...sts-test.js => group-requests-test.js.es6} |  0
 .../{group-test.js => group-test.js.es6}      |  0
 ...index-test.js => groups-index-test.js.es6} |  0
 ...ups-new-test.js => groups-new-test.js.es6} |  0
 ...cept-test.js => invite-accept-test.js.es6} |  0
 ...js => invite-show-user-fields-test.js.es6} |  0
 .../{jump-to-test.js => jump-to-test.js.es6}  |  0
 ...test.js => keyboard-shortcuts-test.js.es6} |  0
 ...ect-test.js => login-redirect-test.js.es6} |  0
 ...red-test.js => login-required-test.js.es6} |  0
 ...-and-hide-email-address-taken-test.js.es6} |  0
 ...th-email-and-no-social-logins-test.js.es6} |  0
 ... => login-with-email-disabled-test.js.es6} |  0
 ...l-test.js => login-with-email-test.js.es6} |  0
 ...y-test.js => mobile-discovery-test.js.es6} |  0
 ...-in-test.js => mobile-sign-in-test.js.es6} |  0
 ...users-test.js => mobile-users-test.js.es6} |  0
 .../{modal-test.js => modal-test.js.es6}      |  0
 ...essage-test.js => new-message-test.js.es6} |  0
 ...ew-topic-test.js => new-topic-test.js.es6} |  0
 ...set-test.js => password-reset-test.js.es6} |  0
 ...e-test.js => personal-message-test.js.es6} |  0
 ...plugin-outlet-connector-class-test.js.es6} |  0
 ...js => plugin-outlet-decorator-test.js.es6} |  0
 ... plugin-outlet-multi-template-test.js.es6} |  0
 ...plugin-outlet-single-template-test.js.es6} |  0
 ...rences-test.js => preferences-test.js.es6} |  0
 ...-test.js => raw-plugin-outlet-test.js.es6} |  0
 ...op-test.js => redirect-to-top-test.js.es6} |  0
 .../{reports-test.js => reports-test.js.es6}  |  0
 .../{review-test.js => review-test.js.es6}    |  0
 ...h-full-test.js => search-full-test.js.es6} |  0
 ...bile-test.js => search-mobile-test.js.es6} |  0
 .../{search-test.js => search-test.js.es6}    |  0
 ...s => share-and-invite-desktop-test.js.es6} |  0
 ...js => share-and-invite-mobile-test.js.es6} |  0
 ...afts-test.js => shared-drafts-test.js.es6} |  0
 .../{sign-in-test.js => sign-in-test.js.es6}  |  0
 .../{static-test.js => static-test.js.es6}    |  0
 ...-groups-test.js => tag-groups-test.js.es6} |  0
 ...ashtag-test.js => tag-hashtag-test.js.es6} |  0
 ...-test.js => tags-intersection-test.js.es6} |  0
 .../{tags-test.js => tags-test.js.es6}        |  0
 ...us-test.js => topic-anonymous-test.js.es6} |  0
 ...ry-test.js => topic-discovery-test.js.es6} |  0
 ...r-test.js => topic-edit-timer-test.js.es6} |  0
 ...> topic-footer-buttons-mobile-test.js.es6} |  0
 ...s-test.js => topic-move-posts-test.js.es6} |  0
 ...=> topic-notifications-button-test.js.es6} |  0
 .../{topic-test.js => topic-test.js.es6}      |  0
 .../{unknown-test.js => unknown-test.js.es6}  |  0
 ...ous-test.js => user-anonymous-test.js.es6} |  0
 ...e-test.js => user-card-mobile-test.js.es6} |  0
 ...ser-card-test.js => user-card-test.js.es6} |  0
 ...test.js => user-drafts-stream-test.js.es6} |  0
 .../{user-test.js => user-test.js.es6}        |  0
 .../{users-test.js => users-test.js.es6}      |  0
 ...test.js => group-list-setting-test.js.es6} |  0
 ...m-test.js => themes-list-item-test.js.es6} |  0
 ...s-list-test.js => themes-list-test.js.es6} |  0
 ...> admin-customize-themes-show-test.js.es6} |  0
 ....js => admin-customize-themes-test.js.es6} |  0
 ...-test.js => admin-user-badges-test.js.es6} |  0
 .../{theme-test.js => theme-test.js.es6}      |  0
 ...-editor-test.js => ace-editor-test.js.es6} |  0
 ...eport-test.js => admin-report-test.js.es6} |  0
 ...-title-test.js => badge-title-test.js.es6} |  0
 ...{d-button-test.js => d-button-test.js.es6} |  0
 ...{d-editor-test.js => d-editor-test.js.es6} |  0
 .../{d-icon-test.js => d-icon-test.js.es6}    |  0
 ...e-input-test.js => date-input-test.js.es6} |  0
 ...t.js => date-time-input-range-test.js.es6} |  0
 ...ut-test.js => date-time-input-test.js.es6} |  0
 ...js => group-membership-button-test.js.es6} |  0
 ...r-test.js => html-safe-helper-test.js.es6} |  0
 ...-html-test.js => iframed-html-test.js.es6} |  0
 ...der-test.js => image-uploader-test.js.es6} |  0
 ...test.js => keyboard-shortcuts-test.js.es6} |  0
 ...oad-more-test.js => load-more-test.js.es6} |  0
 ...-test.js => secret-value-list-test.js.es6} |  0
 ...r-test.js => category-chooser-test.js.es6} |  0
 ...drop-test.js => category-drop-test.js.es6} |  0
 ...ombo-box-test.js => combo-box-test.js.es6} |  0
 ...est.js => dropdown-select-box-test.js.es6} |  0
 ...tting-test.js => list-setting-test.js.es6} |  0
 ...r-test.js => mini-tag-chooser-test.js.es6} |  0
 ...elect-test.js => multi-select-test.js.es6} |  0
 ...st.js => notifications-button-test.js.es6} |  0
 ...ons-test.js => pinned-options-test.js.es6} |  0
 ...elper.js => select-kit-test-helper.js.es6} |  0
 ...lect-test.js => single-select-test.js.es6} |  0
 ...{tag-drop-test.js => tag-drop-test.js.es6} |  0
 ...=> topic-notifications-button-test.js.es6} |  0
 ...> topic-notifications-options-test.js.es6} |  0
 ...ooser-test.js => user-chooser-test.js.es6} |  0
 ...utton-test.js => share-button-test.js.es6} |  0
 .../{share-button.js => share-button.js.es6}  |  0
 ...t-field-test.js => text-field-test.js.es6} |  0
 ...flow-test.js => text-overflow-test.js.es6} |  0
 ...e-input-test.js => time-input-test.js.es6} |  0
 ...ctor-test.js => user-selector-test.js.es6} |  0
 ...ue-list-test.js => value-list-test.js.es6} |  0
 ...or-test.js => avatar-selector-test.js.es6} |  0
 ...{bookmark-test.js => bookmark-test.js.es6} |  0
 ...unt-test.js => create-account-test.js.es6} |  0
 .../{group-test.js => group-test.js.es6}      |  0
 .../{history-test.js => history-test.js.es6}  |  0
 ...est.js => preferences-account-test.js.es6} |  0
 ... => preferences-second-factor-test.js.es6} |  0
 ...test.js => reorder-categories-test.js.es6} |  0
 .../{topic-test.js => topic-test.js.es6}      |  0
 ...{resolver-test.js => resolver-test.js.es6} |  0
 .../fixtures/{about.js => about.js.es6}       |  0
 ...adges_fixture.js => badges_fixture.js.es6} |  0
 ...y-fixtures.js => category-fixtures.js.es6} |  0
 ...s.js.erb => notification-types.js.es6.erb} |  0
 ...rd-general.js => dashboard-general.js.es6} |  0
 .../{dashboard.js => dashboard.js.es6}        |  0
 ...-fixtures.js => directory-fixtures.js.es6} |  0
 ..._fixtures.js => discovery_fixtures.js.es6} |  0
 .../fixtures/{draft.js => draft.js.es6}       |  0
 .../fixtures/{drafts.js => drafts.js.es6}     |  0
 ...roup-fixtures.js => group-fixtures.js.es6} |  0
 ...ups-fixtures.js => groups-fixtures.js.es6} |  0
 ...xtures.js => notification_fixtures.js.es6} |  0
 .../fixtures/{poll.js => poll.js.es6}         |  0
 .../fixtures/{post.js => post.js.es6}         |  0
 ...es.js => private_messages_fixtures.js.es6} |  0
 .../fixtures/{problems.js => problems.js.es6} |  0
 .../fixtures/{reports.js => reports.js.es6}   |  0
 .../{reports_bulk.js => reports_bulk.js.es6}  |  0
 ...rch-fixtures.js => search-fixtures.js.es6} |  0
 ...on-fixtures.js => session-fixtures.js.es6} |  0
 ...{site-fixtures.js => site-fixtures.js.es6} |  0
 ...{site_settings.js => site_settings.js.es6} |  0
 ...tic_fixtures.js => static_fixtures.js.es6} |  0
 .../{top_fixture.js => top_fixture.js.es6}    |  0
 .../fixtures/{topic.js => topic.js.es6}       |  0
 .../{user-badges.js => user-badges.js.es6}    |  0
 ...{user_fixtures.js => user_fixtures.js.es6} |  0
 ...tures.js => watched-words-fixtures.js.es6} |  0
 test/javascripts/helpers/assertions.js        | 13 +++----
 ...omponent-test.js => component-test.js.es6} |  0
 ...e-pretender.js => create-pretender.js.es6} |  0
 .../{create-store.js => create-store.js.es6}  |  0
 ...ditor-helper.js => d-editor-helper.js.es6} |  0
 ...-pretender.js => fixture-pretender.js.es6} |  0
 .../{html-helper.js => html-helper.js.es6}    |  0
 test/javascripts/helpers/init-ember-qunit.js  |  2 +
 ...{qunit-helpers.js => qunit-helpers.js.es6} |  0
 ...w-pretender.js => review-pretender.js.es6} |  0
 ...kit-helper.js => select-kit-helper.js.es6} |  0
 test/javascripts/helpers/site-settings.js     | 10 ++---
 .../helpers/{site.js => site.js.es6}          |  0
 ...re-pretender.js => store-pretender.js.es6} |  0
 ...er.js => textarea-selection-helper.js.es6} |  0
 .../{widget-test.js => widget-test.js.es6}    |  0
 ...ation-test.js => localization-test.js.es6} |  0
 .../{bbcode-test.js => bbcode-test.js.es6}    |  0
 ...tring-test.js => break-string-test.js.es6} |  0
 ...dge-test.js => category-badge-test.js.es6} |  0
 ...s => click-track-edit-history-test.js.es6} |  0
 ...s => click-track-profile-page-test.js.es6} |  0
 ...-track-test.js => click-track-test.js.es6} |  0
 ...{computed-test.js => computed-test.js.es6} |  0
 ...iscourse-test.js => discourse-test.js.es6} |  0
 ...-store-test.js => emoji-store-test.js.es6} |  0
 .../lib/{emoji-test.js => emoji-test.js.es6}  |  0
 ...ormatter-test.js => formatter-test.js.es6} |  0
 ...ext-test.js => highlight-text-test.js.es6} |  0
 .../lib/{i18n-test.js => i18n-test.js.es6}    |  0
 ...brary-test.js => icon-library-test.js.es6} |  0
 ...re-test.js => key-value-store-test.js.es6} |  0
 ...ions-test.js => link-mentions-test.js.es6} |  0
 ...script-test.js => load-script-test.js.es6} |  0
 ...{oneboxer-test.js => oneboxer-test.js.es6} |  0
 ...tore-test.js => preload-store-test.js.es6} |  0
 ...y-text-test.js => pretty-text-test.js.es6} |  0
 ...anitizer-test.js => sanitizer-test.js.es6} |  0
 ...track-test.js => screen-track-test.js.es6} |  0
 .../{search-test.js => search-test.js.es6}    |  0
 .../{sharing-test.js => sharing-test.js.es6}  |  0
 ...ion-test.js => text-direction-test.js.es6} |  0
 ...rkdown-test.js => to-markdown-test.js.es6} |  0
 .../{tooltip-test.js => tooltip-test.js.es6}  |  0
 ...l-test.js => upload-short-url-test.js.es6} |  0
 .../{uploads-test.js => uploads-test.js.es6}  |  0
 .../lib/{url-test.js => url-test.js.es6}      |  0
 ...search-test.js => user-search-test.js.es6} |  0
 ...tilities-test.js => utilities-test.js.es6} |  0
 ...ister-test.js => white-lister-test.js.es6} |  0
 ....js => grant-badge-controller-test.js.es6} |  0
 ...ect-test.js => setting-object-test.js.es6} |  0
 ...ingleton-test.js => singleton-test.js.es6} |  0
 .../{badge-test.js => badge-test.js.es6}      |  0
 ...{category-test.js => category-test.js.es6} |  0
 ...{composer-test.js => composer-test.js.es6} |  0
 ...mail-log-test.js => email-log-test.js.es6} |  0
 .../{group-test.js => group-test.js.es6}      |  0
 .../{invite-test.js => invite-test.js.es6}    |  0
 ...{nav-item-test.js => nav-item-test.js.es6} |  0
 ...stream-test.js => post-stream-test.js.es6} |  0
 .../models/{post-test.js => post-test.js.es6} |  0
 .../{report-test.js => report-test.js.es6}    |  0
 ...t-model-test.js => rest-model-test.js.es6} |  0
 ...ult-set-test.js => result-set-test.js.es6} |  0
 .../{session-test.js => session-test.js.es6}  |  0
 .../models/{site-test.js => site-test.js.es6} |  0
 ...g-test.js => staff-action-log-test.js.es6} |  0
 .../{store-test.js => store-test.js.es6}      |  0
 ...ails-test.js => topic-details-test.js.es6} |  0
 .../{topic-test.js => topic-test.js.es6}      |  0
 ...st.js => topic-tracking-state-test.js.es6} |  0
 ...action-test.js => user-action-test.js.es6} |  0
 ...r-badge-test.js => user-badge-test.js.es6} |  0
 ...drafts-test.js => user-drafts-test.js.es6} |  0
 ...stream-test.js => user-stream-test.js.es6} |  0
 .../models/{user-test.js => user-test.js.es6} |  0
 ...orators-test.js => decorators-test.js.es6} |  0
 ...ry-test.js => actions-summary-test.js.es6} |  0
 ...flair-test.js => avatar-flair-test.js.es6} |  0
 .../{button-test.js => button-test.js.es6}    |  0
 ... => default-notification-item-test.js.es6} |  0
 ...enu-test.js => hamburger-menu-test.js.es6} |  0
 .../{header-test.js => header-test.js.es6}    |  0
 ...ome-logo-test.js => home-logo-test.js.es6} |  0
 ...t-links-test.js => post-links-test.js.es6} |  0
 ...stream-test.js => post-stream-test.js.es6} |  0
 .../{post-test.js => post-test.js.es6}        |  0
 ...r-name-test.js => poster-name-test.js.es6} |  0
 ...-test.js => quick-access-item-test.js.es6} |  0
 ...u-test.js => topic-admin-menu-test.js.es6} |  0
 ...-test.js => topic-participant-test.js.es6} |  0
 ...tatus-test.js => topic-status-test.js.es6} |  0
 ...ser-menu-test.js => user-menu-test.js.es6} |  0
 .../{widget-test.js => widget-test.js.es6}    |  0
 281 files changed, 29 insertions(+), 35 deletions(-)
 rename test/javascripts/acceptance/{about-test.js => about-test.js.es6} (100%)
 rename test/javascripts/acceptance/{account-created-test.js => account-created-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-emails-test.js => admin-emails-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-search-log-term-test.js => admin-search-log-term-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-search-logs-test.js => admin-search-logs-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-site-settings-test.js => admin-site-settings-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-site-text-test.js => admin-site-text-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-suspend-user-test.js => admin-suspend-user-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-user-badges-test.js => admin-user-badges-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-user-emails-test.js => admin-user-emails-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-user-index-test.js => admin-user-index-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-users-list-test.js => admin-users-list-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-watched-words-test.js => admin-watched-words-test.js.es6} (100%)
 rename test/javascripts/acceptance/{auth-complete-test.js => auth-complete-test.js.es6} (100%)
 rename test/javascripts/acceptance/{badges-test.js => badges-test.js.es6} (100%)
 rename test/javascripts/acceptance/{category-chooser-test.js => category-chooser-test.js.es6} (100%)
 rename test/javascripts/acceptance/{category-edit-security-test.js => category-edit-security-test.js.es6} (100%)
 rename test/javascripts/acceptance/{category-edit-test.js => category-edit-test.js.es6} (100%)
 rename test/javascripts/acceptance/{category-hashtag-test.js => category-hashtag-test.js.es6} (100%)
 rename test/javascripts/acceptance/{click-track-test.js => click-track-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-actions-test.js => composer-actions-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-attachment-test.js => composer-attachment-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-edit-conflict-test.js => composer-edit-conflict-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-hyperlink-test.js => composer-hyperlink-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-onebox-test.js => composer-onebox-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-test.js => composer-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-topic-links-test.js => composer-topic-links-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-uncategorized-test.js => composer-uncategorized-test.js.es6} (100%)
 rename test/javascripts/acceptance/{create-account-user-fields-test.js => create-account-user-fields-test.js.es6} (100%)
 rename test/javascripts/acceptance/{custom-html-set-test.js => custom-html-set-test.js.es6} (100%)
 rename test/javascripts/acceptance/{custom-html-template-test.js => custom-html-template-test.js.es6} (100%)
 rename test/javascripts/acceptance/{dashboard-test.js => dashboard-test.js.es6} (100%)
 rename test/javascripts/acceptance/{email-notice-test.js => email-notice-test.js.es6} (100%)
 rename test/javascripts/acceptance/{emoji-picker-test.js => emoji-picker-test.js.es6} (100%)
 rename test/javascripts/acceptance/{emoji-test.js => emoji-test.js.es6} (100%)
 rename test/javascripts/acceptance/{enforce-second-factor-test.js => enforce-second-factor-test.js.es6} (100%)
 rename test/javascripts/acceptance/{forgot-password-test.js => forgot-password-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-card-mobile-test.js => group-card-mobile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-card-test.js => group-card-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-index-test.js => group-index-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-manage-interaction-test.js => group-manage-interaction-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-manage-logs-test.js => group-manage-logs-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-manage-membership-test.js => group-manage-membership-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-manage-profile-test.js => group-manage-profile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-requests-test.js => group-requests-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-test.js => group-test.js.es6} (100%)
 rename test/javascripts/acceptance/{groups-index-test.js => groups-index-test.js.es6} (100%)
 rename test/javascripts/acceptance/{groups-new-test.js => groups-new-test.js.es6} (100%)
 rename test/javascripts/acceptance/{invite-accept-test.js => invite-accept-test.js.es6} (100%)
 rename test/javascripts/acceptance/{invite-show-user-fields-test.js => invite-show-user-fields-test.js.es6} (100%)
 rename test/javascripts/acceptance/{jump-to-test.js => jump-to-test.js.es6} (100%)
 rename test/javascripts/acceptance/{keyboard-shortcuts-test.js => keyboard-shortcuts-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-redirect-test.js => login-redirect-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-required-test.js => login-required-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-hide-email-address-taken-test.js => login-with-email-and-hide-email-address-taken-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-no-social-logins-test.js => login-with-email-and-no-social-logins-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-with-email-disabled-test.js => login-with-email-disabled-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-with-email-test.js => login-with-email-test.js.es6} (100%)
 rename test/javascripts/acceptance/{mobile-discovery-test.js => mobile-discovery-test.js.es6} (100%)
 rename test/javascripts/acceptance/{mobile-sign-in-test.js => mobile-sign-in-test.js.es6} (100%)
 rename test/javascripts/acceptance/{mobile-users-test.js => mobile-users-test.js.es6} (100%)
 rename test/javascripts/acceptance/{modal-test.js => modal-test.js.es6} (100%)
 rename test/javascripts/acceptance/{new-message-test.js => new-message-test.js.es6} (100%)
 rename test/javascripts/acceptance/{new-topic-test.js => new-topic-test.js.es6} (100%)
 rename test/javascripts/acceptance/{password-reset-test.js => password-reset-test.js.es6} (100%)
 rename test/javascripts/acceptance/{personal-message-test.js => personal-message-test.js.es6} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-connector-class-test.js => plugin-outlet-connector-class-test.js.es6} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-decorator-test.js => plugin-outlet-decorator-test.js.es6} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-multi-template-test.js => plugin-outlet-multi-template-test.js.es6} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-single-template-test.js => plugin-outlet-single-template-test.js.es6} (100%)
 rename test/javascripts/acceptance/{preferences-test.js => preferences-test.js.es6} (100%)
 rename test/javascripts/acceptance/{raw-plugin-outlet-test.js => raw-plugin-outlet-test.js.es6} (100%)
 rename test/javascripts/acceptance/{redirect-to-top-test.js => redirect-to-top-test.js.es6} (100%)
 rename test/javascripts/acceptance/{reports-test.js => reports-test.js.es6} (100%)
 rename test/javascripts/acceptance/{review-test.js => review-test.js.es6} (100%)
 rename test/javascripts/acceptance/{search-full-test.js => search-full-test.js.es6} (100%)
 rename test/javascripts/acceptance/{search-mobile-test.js => search-mobile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{search-test.js => search-test.js.es6} (100%)
 rename test/javascripts/acceptance/{share-and-invite-desktop-test.js => share-and-invite-desktop-test.js.es6} (100%)
 rename test/javascripts/acceptance/{share-and-invite-mobile-test.js => share-and-invite-mobile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{shared-drafts-test.js => shared-drafts-test.js.es6} (100%)
 rename test/javascripts/acceptance/{sign-in-test.js => sign-in-test.js.es6} (100%)
 rename test/javascripts/acceptance/{static-test.js => static-test.js.es6} (100%)
 rename test/javascripts/acceptance/{tag-groups-test.js => tag-groups-test.js.es6} (100%)
 rename test/javascripts/acceptance/{tag-hashtag-test.js => tag-hashtag-test.js.es6} (100%)
 rename test/javascripts/acceptance/{tags-intersection-test.js => tags-intersection-test.js.es6} (100%)
 rename test/javascripts/acceptance/{tags-test.js => tags-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-anonymous-test.js => topic-anonymous-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-discovery-test.js => topic-discovery-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-edit-timer-test.js => topic-edit-timer-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-footer-buttons-mobile-test.js => topic-footer-buttons-mobile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-move-posts-test.js => topic-move-posts-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-notifications-button-test.js => topic-notifications-button-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-test.js => topic-test.js.es6} (100%)
 rename test/javascripts/acceptance/{unknown-test.js => unknown-test.js.es6} (100%)
 rename test/javascripts/acceptance/{user-anonymous-test.js => user-anonymous-test.js.es6} (100%)
 rename test/javascripts/acceptance/{user-card-mobile-test.js => user-card-mobile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{user-card-test.js => user-card-test.js.es6} (100%)
 rename test/javascripts/acceptance/{user-drafts-stream-test.js => user-drafts-stream-test.js.es6} (100%)
 rename test/javascripts/acceptance/{user-test.js => user-test.js.es6} (100%)
 rename test/javascripts/acceptance/{users-test.js => users-test.js.es6} (100%)
 rename test/javascripts/admin/components/{group-list-setting-test.js => group-list-setting-test.js.es6} (100%)
 rename test/javascripts/admin/components/{themes-list-item-test.js => themes-list-item-test.js.es6} (100%)
 rename test/javascripts/admin/components/{themes-list-test.js => themes-list-test.js.es6} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-show-test.js => admin-customize-themes-show-test.js.es6} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-test.js => admin-customize-themes-test.js.es6} (100%)
 rename test/javascripts/admin/controllers/{admin-user-badges-test.js => admin-user-badges-test.js.es6} (100%)
 rename test/javascripts/admin/models/{theme-test.js => theme-test.js.es6} (100%)
 rename test/javascripts/components/{ace-editor-test.js => ace-editor-test.js.es6} (100%)
 rename test/javascripts/components/{admin-report-test.js => admin-report-test.js.es6} (100%)
 rename test/javascripts/components/{badge-title-test.js => badge-title-test.js.es6} (100%)
 rename test/javascripts/components/{d-button-test.js => d-button-test.js.es6} (100%)
 rename test/javascripts/components/{d-editor-test.js => d-editor-test.js.es6} (100%)
 rename test/javascripts/components/{d-icon-test.js => d-icon-test.js.es6} (100%)
 rename test/javascripts/components/{date-input-test.js => date-input-test.js.es6} (100%)
 rename test/javascripts/components/{date-time-input-range-test.js => date-time-input-range-test.js.es6} (100%)
 rename test/javascripts/components/{date-time-input-test.js => date-time-input-test.js.es6} (100%)
 rename test/javascripts/components/{group-membership-button-test.js => group-membership-button-test.js.es6} (100%)
 rename test/javascripts/components/{html-safe-helper-test.js => html-safe-helper-test.js.es6} (100%)
 rename test/javascripts/components/{iframed-html-test.js => iframed-html-test.js.es6} (100%)
 rename test/javascripts/components/{image-uploader-test.js => image-uploader-test.js.es6} (100%)
 rename test/javascripts/components/{keyboard-shortcuts-test.js => keyboard-shortcuts-test.js.es6} (100%)
 rename test/javascripts/components/{load-more-test.js => load-more-test.js.es6} (100%)
 rename test/javascripts/components/{secret-value-list-test.js => secret-value-list-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{category-chooser-test.js => category-chooser-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{category-drop-test.js => category-drop-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{combo-box-test.js => combo-box-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{dropdown-select-box-test.js => dropdown-select-box-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{list-setting-test.js => list-setting-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{mini-tag-chooser-test.js => mini-tag-chooser-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{multi-select-test.js => multi-select-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{notifications-button-test.js => notifications-button-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{pinned-options-test.js => pinned-options-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{select-kit-test-helper.js => select-kit-test-helper.js.es6} (100%)
 rename test/javascripts/components/select-kit/{single-select-test.js => single-select-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{tag-drop-test.js => tag-drop-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-button-test.js => topic-notifications-button-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-options-test.js => topic-notifications-options-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{user-chooser-test.js => user-chooser-test.js.es6} (100%)
 rename test/javascripts/components/{share-button-test.js => share-button-test.js.es6} (100%)
 rename test/javascripts/components/{share-button.js => share-button.js.es6} (100%)
 rename test/javascripts/components/{text-field-test.js => text-field-test.js.es6} (100%)
 rename test/javascripts/components/{text-overflow-test.js => text-overflow-test.js.es6} (100%)
 rename test/javascripts/components/{time-input-test.js => time-input-test.js.es6} (100%)
 rename test/javascripts/components/{user-selector-test.js => user-selector-test.js.es6} (100%)
 rename test/javascripts/components/{value-list-test.js => value-list-test.js.es6} (100%)
 rename test/javascripts/controllers/{avatar-selector-test.js => avatar-selector-test.js.es6} (100%)
 rename test/javascripts/controllers/{bookmark-test.js => bookmark-test.js.es6} (100%)
 rename test/javascripts/controllers/{create-account-test.js => create-account-test.js.es6} (100%)
 rename test/javascripts/controllers/{group-test.js => group-test.js.es6} (100%)
 rename test/javascripts/controllers/{history-test.js => history-test.js.es6} (100%)
 rename test/javascripts/controllers/{preferences-account-test.js => preferences-account-test.js.es6} (100%)
 rename test/javascripts/controllers/{preferences-second-factor-test.js => preferences-second-factor-test.js.es6} (100%)
 rename test/javascripts/controllers/{reorder-categories-test.js => reorder-categories-test.js.es6} (100%)
 rename test/javascripts/controllers/{topic-test.js => topic-test.js.es6} (100%)
 rename test/javascripts/ember/{resolver-test.js => resolver-test.js.es6} (100%)
 rename test/javascripts/fixtures/{about.js => about.js.es6} (100%)
 rename test/javascripts/fixtures/{badges_fixture.js => badges_fixture.js.es6} (100%)
 rename test/javascripts/fixtures/{category-fixtures.js => category-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/concerns/{notification-types.js.erb => notification-types.js.es6.erb} (100%)
 rename test/javascripts/fixtures/{dashboard-general.js => dashboard-general.js.es6} (100%)
 rename test/javascripts/fixtures/{dashboard.js => dashboard.js.es6} (100%)
 rename test/javascripts/fixtures/{directory-fixtures.js => directory-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{discovery_fixtures.js => discovery_fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{draft.js => draft.js.es6} (100%)
 rename test/javascripts/fixtures/{drafts.js => drafts.js.es6} (100%)
 rename test/javascripts/fixtures/{group-fixtures.js => group-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{groups-fixtures.js => groups-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{notification_fixtures.js => notification_fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{poll.js => poll.js.es6} (100%)
 rename test/javascripts/fixtures/{post.js => post.js.es6} (100%)
 rename test/javascripts/fixtures/{private_messages_fixtures.js => private_messages_fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{problems.js => problems.js.es6} (100%)
 rename test/javascripts/fixtures/{reports.js => reports.js.es6} (100%)
 rename test/javascripts/fixtures/{reports_bulk.js => reports_bulk.js.es6} (100%)
 rename test/javascripts/fixtures/{search-fixtures.js => search-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{session-fixtures.js => session-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{site-fixtures.js => site-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{site_settings.js => site_settings.js.es6} (100%)
 rename test/javascripts/fixtures/{static_fixtures.js => static_fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{top_fixture.js => top_fixture.js.es6} (100%)
 rename test/javascripts/fixtures/{topic.js => topic.js.es6} (100%)
 rename test/javascripts/fixtures/{user-badges.js => user-badges.js.es6} (100%)
 rename test/javascripts/fixtures/{user_fixtures.js => user_fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{watched-words-fixtures.js => watched-words-fixtures.js.es6} (100%)
 rename test/javascripts/helpers/{component-test.js => component-test.js.es6} (100%)
 rename test/javascripts/helpers/{create-pretender.js => create-pretender.js.es6} (100%)
 rename test/javascripts/helpers/{create-store.js => create-store.js.es6} (100%)
 rename test/javascripts/helpers/{d-editor-helper.js => d-editor-helper.js.es6} (100%)
 rename test/javascripts/helpers/{fixture-pretender.js => fixture-pretender.js.es6} (100%)
 rename test/javascripts/helpers/{html-helper.js => html-helper.js.es6} (100%)
 create mode 100644 test/javascripts/helpers/init-ember-qunit.js
 rename test/javascripts/helpers/{qunit-helpers.js => qunit-helpers.js.es6} (100%)
 rename test/javascripts/helpers/{review-pretender.js => review-pretender.js.es6} (100%)
 rename test/javascripts/helpers/{select-kit-helper.js => select-kit-helper.js.es6} (100%)
 rename test/javascripts/helpers/{site.js => site.js.es6} (100%)
 rename test/javascripts/helpers/{store-pretender.js => store-pretender.js.es6} (100%)
 rename test/javascripts/helpers/{textarea-selection-helper.js => textarea-selection-helper.js.es6} (100%)
 rename test/javascripts/helpers/{widget-test.js => widget-test.js.es6} (100%)
 rename test/javascripts/initializers/{localization-test.js => localization-test.js.es6} (100%)
 rename test/javascripts/lib/{bbcode-test.js => bbcode-test.js.es6} (100%)
 rename test/javascripts/lib/{break-string-test.js => break-string-test.js.es6} (100%)
 rename test/javascripts/lib/{category-badge-test.js => category-badge-test.js.es6} (100%)
 rename test/javascripts/lib/{click-track-edit-history-test.js => click-track-edit-history-test.js.es6} (100%)
 rename test/javascripts/lib/{click-track-profile-page-test.js => click-track-profile-page-test.js.es6} (100%)
 rename test/javascripts/lib/{click-track-test.js => click-track-test.js.es6} (100%)
 rename test/javascripts/lib/{computed-test.js => computed-test.js.es6} (100%)
 rename test/javascripts/lib/{discourse-test.js => discourse-test.js.es6} (100%)
 rename test/javascripts/lib/{emoji-store-test.js => emoji-store-test.js.es6} (100%)
 rename test/javascripts/lib/{emoji-test.js => emoji-test.js.es6} (100%)
 rename test/javascripts/lib/{formatter-test.js => formatter-test.js.es6} (100%)
 rename test/javascripts/lib/{highlight-text-test.js => highlight-text-test.js.es6} (100%)
 rename test/javascripts/lib/{i18n-test.js => i18n-test.js.es6} (100%)
 rename test/javascripts/lib/{icon-library-test.js => icon-library-test.js.es6} (100%)
 rename test/javascripts/lib/{key-value-store-test.js => key-value-store-test.js.es6} (100%)
 rename test/javascripts/lib/{link-mentions-test.js => link-mentions-test.js.es6} (100%)
 rename test/javascripts/lib/{load-script-test.js => load-script-test.js.es6} (100%)
 rename test/javascripts/lib/{oneboxer-test.js => oneboxer-test.js.es6} (100%)
 rename test/javascripts/lib/{preload-store-test.js => preload-store-test.js.es6} (100%)
 rename test/javascripts/lib/{pretty-text-test.js => pretty-text-test.js.es6} (100%)
 rename test/javascripts/lib/{sanitizer-test.js => sanitizer-test.js.es6} (100%)
 rename test/javascripts/lib/{screen-track-test.js => screen-track-test.js.es6} (100%)
 rename test/javascripts/lib/{search-test.js => search-test.js.es6} (100%)
 rename test/javascripts/lib/{sharing-test.js => sharing-test.js.es6} (100%)
 rename test/javascripts/lib/{text-direction-test.js => text-direction-test.js.es6} (100%)
 rename test/javascripts/lib/{to-markdown-test.js => to-markdown-test.js.es6} (100%)
 rename test/javascripts/lib/{tooltip-test.js => tooltip-test.js.es6} (100%)
 rename test/javascripts/lib/{upload-short-url-test.js => upload-short-url-test.js.es6} (100%)
 rename test/javascripts/lib/{uploads-test.js => uploads-test.js.es6} (100%)
 rename test/javascripts/lib/{url-test.js => url-test.js.es6} (100%)
 rename test/javascripts/lib/{user-search-test.js => user-search-test.js.es6} (100%)
 rename test/javascripts/lib/{utilities-test.js => utilities-test.js.es6} (100%)
 rename test/javascripts/lib/{white-lister-test.js => white-lister-test.js.es6} (100%)
 rename test/javascripts/mixins/{grant-badge-controller-test.js => grant-badge-controller-test.js.es6} (100%)
 rename test/javascripts/mixins/{setting-object-test.js => setting-object-test.js.es6} (100%)
 rename test/javascripts/mixins/{singleton-test.js => singleton-test.js.es6} (100%)
 rename test/javascripts/models/{badge-test.js => badge-test.js.es6} (100%)
 rename test/javascripts/models/{category-test.js => category-test.js.es6} (100%)
 rename test/javascripts/models/{composer-test.js => composer-test.js.es6} (100%)
 rename test/javascripts/models/{email-log-test.js => email-log-test.js.es6} (100%)
 rename test/javascripts/models/{group-test.js => group-test.js.es6} (100%)
 rename test/javascripts/models/{invite-test.js => invite-test.js.es6} (100%)
 rename test/javascripts/models/{nav-item-test.js => nav-item-test.js.es6} (100%)
 rename test/javascripts/models/{post-stream-test.js => post-stream-test.js.es6} (100%)
 rename test/javascripts/models/{post-test.js => post-test.js.es6} (100%)
 rename test/javascripts/models/{report-test.js => report-test.js.es6} (100%)
 rename test/javascripts/models/{rest-model-test.js => rest-model-test.js.es6} (100%)
 rename test/javascripts/models/{result-set-test.js => result-set-test.js.es6} (100%)
 rename test/javascripts/models/{session-test.js => session-test.js.es6} (100%)
 rename test/javascripts/models/{site-test.js => site-test.js.es6} (100%)
 rename test/javascripts/models/{staff-action-log-test.js => staff-action-log-test.js.es6} (100%)
 rename test/javascripts/models/{store-test.js => store-test.js.es6} (100%)
 rename test/javascripts/models/{topic-details-test.js => topic-details-test.js.es6} (100%)
 rename test/javascripts/models/{topic-test.js => topic-test.js.es6} (100%)
 rename test/javascripts/models/{topic-tracking-state-test.js => topic-tracking-state-test.js.es6} (100%)
 rename test/javascripts/models/{user-action-test.js => user-action-test.js.es6} (100%)
 rename test/javascripts/models/{user-badge-test.js => user-badge-test.js.es6} (100%)
 rename test/javascripts/models/{user-drafts-test.js => user-drafts-test.js.es6} (100%)
 rename test/javascripts/models/{user-stream-test.js => user-stream-test.js.es6} (100%)
 rename test/javascripts/models/{user-test.js => user-test.js.es6} (100%)
 rename test/javascripts/utils/{decorators-test.js => decorators-test.js.es6} (100%)
 rename test/javascripts/widgets/{actions-summary-test.js => actions-summary-test.js.es6} (100%)
 rename test/javascripts/widgets/{avatar-flair-test.js => avatar-flair-test.js.es6} (100%)
 rename test/javascripts/widgets/{button-test.js => button-test.js.es6} (100%)
 rename test/javascripts/widgets/{default-notification-item-test.js => default-notification-item-test.js.es6} (100%)
 rename test/javascripts/widgets/{hamburger-menu-test.js => hamburger-menu-test.js.es6} (100%)
 rename test/javascripts/widgets/{header-test.js => header-test.js.es6} (100%)
 rename test/javascripts/widgets/{home-logo-test.js => home-logo-test.js.es6} (100%)
 rename test/javascripts/widgets/{post-links-test.js => post-links-test.js.es6} (100%)
 rename test/javascripts/widgets/{post-stream-test.js => post-stream-test.js.es6} (100%)
 rename test/javascripts/widgets/{post-test.js => post-test.js.es6} (100%)
 rename test/javascripts/widgets/{poster-name-test.js => poster-name-test.js.es6} (100%)
 rename test/javascripts/widgets/{quick-access-item-test.js => quick-access-item-test.js.es6} (100%)
 rename test/javascripts/widgets/{topic-admin-menu-test.js => topic-admin-menu-test.js.es6} (100%)
 rename test/javascripts/widgets/{topic-participant-test.js => topic-participant-test.js.es6} (100%)
 rename test/javascripts/widgets/{topic-status-test.js => topic-status-test.js.es6} (100%)
 rename test/javascripts/widgets/{user-menu-test.js => user-menu-test.js.es6} (100%)
 rename test/javascripts/widgets/{widget-test.js => widget-test.js.es6} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 4060b16225..bbadfa84af 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -36,27 +36,24 @@ class DiscourseJsProcessor
     return false unless filename.end_with?(".js") || filename.end_with?(".js.erb")
 
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
-
-    js_root = "app/assets/javascripts"
-    test_root = "test/javascripts"
-
-    return false if relative_path.start_with?("#{js_root}/locales/")
-
-    return true if %w(
-      preload-store
-      preload-application-data
-      wizard-start
-      onpopstate-handler
-      discourse
-      google-tag-manager
-      google-universal-analytics.js
-      activate-account.js
-      auto-redirect.js
-      embed-application
-    ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
-
-    relative_path =~ /^#{js_root}\/[^\/]+\// ||
-      relative_path =~ /^#{test_root}\/[^\/]+\//
+    relative_path.start_with?("app/assets/javascripts/discourse/") ||
+      relative_path.start_with?("app/assets/javascripts/admin/") ||
+      relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
+      relative_path.start_with?("app/assets/javascripts/select-kit/") ||
+      relative_path.start_with?("app/assets/javascripts/wizard/") ||
+      relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
+      relative_path.start_with?("app/assets/javascripts/ember-addons/") ||
+      relative_path.start_with?("app/assets/javascripts/confirm-new-email/") ||
+      relative_path == "app/assets/javascripts/preload-store.js" ||
+      relative_path == "app/assets/javascripts/preload-application-data.js" ||
+      relative_path == "app/assets/javascripts/wizard-start.js" ||
+      relative_path == "app/assets/javascripts/onpopstate-handler.js" ||
+      relative_path == "app/assets/javascripts/discourse.js" ||
+      relative_path == "app/assets/javascripts/google-tag-manager.js" ||
+      relative_path == "app/assets/javascripts/google-universal-analytics.js" ||
+      relative_path == "app/assets/javascripts/activate-account.js" ||
+      relative_path == "app/assets/javascripts/auto-redirect.js" ||
+      relative_path == "app/assets/javascripts/embed-application.js"
   end
 
   def self.skip_module?(data)
diff --git a/test/javascripts/acceptance/about-test.js b/test/javascripts/acceptance/about-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/about-test.js
rename to test/javascripts/acceptance/about-test.js.es6
diff --git a/test/javascripts/acceptance/account-created-test.js b/test/javascripts/acceptance/account-created-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/account-created-test.js
rename to test/javascripts/acceptance/account-created-test.js.es6
diff --git a/test/javascripts/acceptance/admin-emails-test.js b/test/javascripts/acceptance/admin-emails-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-emails-test.js
rename to test/javascripts/acceptance/admin-emails-test.js.es6
diff --git a/test/javascripts/acceptance/admin-search-log-term-test.js b/test/javascripts/acceptance/admin-search-log-term-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-search-log-term-test.js
rename to test/javascripts/acceptance/admin-search-log-term-test.js.es6
diff --git a/test/javascripts/acceptance/admin-search-logs-test.js b/test/javascripts/acceptance/admin-search-logs-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-search-logs-test.js
rename to test/javascripts/acceptance/admin-search-logs-test.js.es6
diff --git a/test/javascripts/acceptance/admin-site-settings-test.js b/test/javascripts/acceptance/admin-site-settings-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-site-settings-test.js
rename to test/javascripts/acceptance/admin-site-settings-test.js.es6
diff --git a/test/javascripts/acceptance/admin-site-text-test.js b/test/javascripts/acceptance/admin-site-text-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-site-text-test.js
rename to test/javascripts/acceptance/admin-site-text-test.js.es6
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-suspend-user-test.js
rename to test/javascripts/acceptance/admin-suspend-user-test.js.es6
diff --git a/test/javascripts/acceptance/admin-user-badges-test.js b/test/javascripts/acceptance/admin-user-badges-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-user-badges-test.js
rename to test/javascripts/acceptance/admin-user-badges-test.js.es6
diff --git a/test/javascripts/acceptance/admin-user-emails-test.js b/test/javascripts/acceptance/admin-user-emails-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-user-emails-test.js
rename to test/javascripts/acceptance/admin-user-emails-test.js.es6
diff --git a/test/javascripts/acceptance/admin-user-index-test.js b/test/javascripts/acceptance/admin-user-index-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-user-index-test.js
rename to test/javascripts/acceptance/admin-user-index-test.js.es6
diff --git a/test/javascripts/acceptance/admin-users-list-test.js b/test/javascripts/acceptance/admin-users-list-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-users-list-test.js
rename to test/javascripts/acceptance/admin-users-list-test.js.es6
diff --git a/test/javascripts/acceptance/admin-watched-words-test.js b/test/javascripts/acceptance/admin-watched-words-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-watched-words-test.js
rename to test/javascripts/acceptance/admin-watched-words-test.js.es6
diff --git a/test/javascripts/acceptance/auth-complete-test.js b/test/javascripts/acceptance/auth-complete-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/auth-complete-test.js
rename to test/javascripts/acceptance/auth-complete-test.js.es6
diff --git a/test/javascripts/acceptance/badges-test.js b/test/javascripts/acceptance/badges-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/badges-test.js
rename to test/javascripts/acceptance/badges-test.js.es6
diff --git a/test/javascripts/acceptance/category-chooser-test.js b/test/javascripts/acceptance/category-chooser-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/category-chooser-test.js
rename to test/javascripts/acceptance/category-chooser-test.js.es6
diff --git a/test/javascripts/acceptance/category-edit-security-test.js b/test/javascripts/acceptance/category-edit-security-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/category-edit-security-test.js
rename to test/javascripts/acceptance/category-edit-security-test.js.es6
diff --git a/test/javascripts/acceptance/category-edit-test.js b/test/javascripts/acceptance/category-edit-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/category-edit-test.js
rename to test/javascripts/acceptance/category-edit-test.js.es6
diff --git a/test/javascripts/acceptance/category-hashtag-test.js b/test/javascripts/acceptance/category-hashtag-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/category-hashtag-test.js
rename to test/javascripts/acceptance/category-hashtag-test.js.es6
diff --git a/test/javascripts/acceptance/click-track-test.js b/test/javascripts/acceptance/click-track-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/click-track-test.js
rename to test/javascripts/acceptance/click-track-test.js.es6
diff --git a/test/javascripts/acceptance/composer-actions-test.js b/test/javascripts/acceptance/composer-actions-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-actions-test.js
rename to test/javascripts/acceptance/composer-actions-test.js.es6
diff --git a/test/javascripts/acceptance/composer-attachment-test.js b/test/javascripts/acceptance/composer-attachment-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-attachment-test.js
rename to test/javascripts/acceptance/composer-attachment-test.js.es6
diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js b/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-edit-conflict-test.js
rename to test/javascripts/acceptance/composer-edit-conflict-test.js.es6
diff --git a/test/javascripts/acceptance/composer-hyperlink-test.js b/test/javascripts/acceptance/composer-hyperlink-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-hyperlink-test.js
rename to test/javascripts/acceptance/composer-hyperlink-test.js.es6
diff --git a/test/javascripts/acceptance/composer-onebox-test.js b/test/javascripts/acceptance/composer-onebox-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-onebox-test.js
rename to test/javascripts/acceptance/composer-onebox-test.js.es6
diff --git a/test/javascripts/acceptance/composer-test.js b/test/javascripts/acceptance/composer-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-test.js
rename to test/javascripts/acceptance/composer-test.js.es6
diff --git a/test/javascripts/acceptance/composer-topic-links-test.js b/test/javascripts/acceptance/composer-topic-links-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-topic-links-test.js
rename to test/javascripts/acceptance/composer-topic-links-test.js.es6
diff --git a/test/javascripts/acceptance/composer-uncategorized-test.js b/test/javascripts/acceptance/composer-uncategorized-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-uncategorized-test.js
rename to test/javascripts/acceptance/composer-uncategorized-test.js.es6
diff --git a/test/javascripts/acceptance/create-account-user-fields-test.js b/test/javascripts/acceptance/create-account-user-fields-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/create-account-user-fields-test.js
rename to test/javascripts/acceptance/create-account-user-fields-test.js.es6
diff --git a/test/javascripts/acceptance/custom-html-set-test.js b/test/javascripts/acceptance/custom-html-set-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/custom-html-set-test.js
rename to test/javascripts/acceptance/custom-html-set-test.js.es6
diff --git a/test/javascripts/acceptance/custom-html-template-test.js b/test/javascripts/acceptance/custom-html-template-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/custom-html-template-test.js
rename to test/javascripts/acceptance/custom-html-template-test.js.es6
diff --git a/test/javascripts/acceptance/dashboard-test.js b/test/javascripts/acceptance/dashboard-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/dashboard-test.js
rename to test/javascripts/acceptance/dashboard-test.js.es6
diff --git a/test/javascripts/acceptance/email-notice-test.js b/test/javascripts/acceptance/email-notice-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/email-notice-test.js
rename to test/javascripts/acceptance/email-notice-test.js.es6
diff --git a/test/javascripts/acceptance/emoji-picker-test.js b/test/javascripts/acceptance/emoji-picker-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/emoji-picker-test.js
rename to test/javascripts/acceptance/emoji-picker-test.js.es6
diff --git a/test/javascripts/acceptance/emoji-test.js b/test/javascripts/acceptance/emoji-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/emoji-test.js
rename to test/javascripts/acceptance/emoji-test.js.es6
diff --git a/test/javascripts/acceptance/enforce-second-factor-test.js b/test/javascripts/acceptance/enforce-second-factor-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/enforce-second-factor-test.js
rename to test/javascripts/acceptance/enforce-second-factor-test.js.es6
diff --git a/test/javascripts/acceptance/forgot-password-test.js b/test/javascripts/acceptance/forgot-password-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/forgot-password-test.js
rename to test/javascripts/acceptance/forgot-password-test.js.es6
diff --git a/test/javascripts/acceptance/group-card-mobile-test.js b/test/javascripts/acceptance/group-card-mobile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-card-mobile-test.js
rename to test/javascripts/acceptance/group-card-mobile-test.js.es6
diff --git a/test/javascripts/acceptance/group-card-test.js b/test/javascripts/acceptance/group-card-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-card-test.js
rename to test/javascripts/acceptance/group-card-test.js.es6
diff --git a/test/javascripts/acceptance/group-index-test.js b/test/javascripts/acceptance/group-index-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-index-test.js
rename to test/javascripts/acceptance/group-index-test.js.es6
diff --git a/test/javascripts/acceptance/group-manage-interaction-test.js b/test/javascripts/acceptance/group-manage-interaction-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-manage-interaction-test.js
rename to test/javascripts/acceptance/group-manage-interaction-test.js.es6
diff --git a/test/javascripts/acceptance/group-manage-logs-test.js b/test/javascripts/acceptance/group-manage-logs-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-manage-logs-test.js
rename to test/javascripts/acceptance/group-manage-logs-test.js.es6
diff --git a/test/javascripts/acceptance/group-manage-membership-test.js b/test/javascripts/acceptance/group-manage-membership-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-manage-membership-test.js
rename to test/javascripts/acceptance/group-manage-membership-test.js.es6
diff --git a/test/javascripts/acceptance/group-manage-profile-test.js b/test/javascripts/acceptance/group-manage-profile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-manage-profile-test.js
rename to test/javascripts/acceptance/group-manage-profile-test.js.es6
diff --git a/test/javascripts/acceptance/group-requests-test.js b/test/javascripts/acceptance/group-requests-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-requests-test.js
rename to test/javascripts/acceptance/group-requests-test.js.es6
diff --git a/test/javascripts/acceptance/group-test.js b/test/javascripts/acceptance/group-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-test.js
rename to test/javascripts/acceptance/group-test.js.es6
diff --git a/test/javascripts/acceptance/groups-index-test.js b/test/javascripts/acceptance/groups-index-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/groups-index-test.js
rename to test/javascripts/acceptance/groups-index-test.js.es6
diff --git a/test/javascripts/acceptance/groups-new-test.js b/test/javascripts/acceptance/groups-new-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/groups-new-test.js
rename to test/javascripts/acceptance/groups-new-test.js.es6
diff --git a/test/javascripts/acceptance/invite-accept-test.js b/test/javascripts/acceptance/invite-accept-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/invite-accept-test.js
rename to test/javascripts/acceptance/invite-accept-test.js.es6
diff --git a/test/javascripts/acceptance/invite-show-user-fields-test.js b/test/javascripts/acceptance/invite-show-user-fields-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/invite-show-user-fields-test.js
rename to test/javascripts/acceptance/invite-show-user-fields-test.js.es6
diff --git a/test/javascripts/acceptance/jump-to-test.js b/test/javascripts/acceptance/jump-to-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/jump-to-test.js
rename to test/javascripts/acceptance/jump-to-test.js.es6
diff --git a/test/javascripts/acceptance/keyboard-shortcuts-test.js b/test/javascripts/acceptance/keyboard-shortcuts-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/keyboard-shortcuts-test.js
rename to test/javascripts/acceptance/keyboard-shortcuts-test.js.es6
diff --git a/test/javascripts/acceptance/login-redirect-test.js b/test/javascripts/acceptance/login-redirect-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-redirect-test.js
rename to test/javascripts/acceptance/login-redirect-test.js.es6
diff --git a/test/javascripts/acceptance/login-required-test.js b/test/javascripts/acceptance/login-required-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-required-test.js
rename to test/javascripts/acceptance/login-required-test.js.es6
diff --git a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
rename to test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
diff --git a/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js b/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js
rename to test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6
diff --git a/test/javascripts/acceptance/login-with-email-disabled-test.js b/test/javascripts/acceptance/login-with-email-disabled-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-disabled-test.js
rename to test/javascripts/acceptance/login-with-email-disabled-test.js.es6
diff --git a/test/javascripts/acceptance/login-with-email-test.js b/test/javascripts/acceptance/login-with-email-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-test.js
rename to test/javascripts/acceptance/login-with-email-test.js.es6
diff --git a/test/javascripts/acceptance/mobile-discovery-test.js b/test/javascripts/acceptance/mobile-discovery-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/mobile-discovery-test.js
rename to test/javascripts/acceptance/mobile-discovery-test.js.es6
diff --git a/test/javascripts/acceptance/mobile-sign-in-test.js b/test/javascripts/acceptance/mobile-sign-in-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/mobile-sign-in-test.js
rename to test/javascripts/acceptance/mobile-sign-in-test.js.es6
diff --git a/test/javascripts/acceptance/mobile-users-test.js b/test/javascripts/acceptance/mobile-users-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/mobile-users-test.js
rename to test/javascripts/acceptance/mobile-users-test.js.es6
diff --git a/test/javascripts/acceptance/modal-test.js b/test/javascripts/acceptance/modal-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/modal-test.js
rename to test/javascripts/acceptance/modal-test.js.es6
diff --git a/test/javascripts/acceptance/new-message-test.js b/test/javascripts/acceptance/new-message-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/new-message-test.js
rename to test/javascripts/acceptance/new-message-test.js.es6
diff --git a/test/javascripts/acceptance/new-topic-test.js b/test/javascripts/acceptance/new-topic-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/new-topic-test.js
rename to test/javascripts/acceptance/new-topic-test.js.es6
diff --git a/test/javascripts/acceptance/password-reset-test.js b/test/javascripts/acceptance/password-reset-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/password-reset-test.js
rename to test/javascripts/acceptance/password-reset-test.js.es6
diff --git a/test/javascripts/acceptance/personal-message-test.js b/test/javascripts/acceptance/personal-message-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/personal-message-test.js
rename to test/javascripts/acceptance/personal-message-test.js.es6
diff --git a/test/javascripts/acceptance/plugin-outlet-connector-class-test.js b/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-connector-class-test.js
rename to test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
diff --git a/test/javascripts/acceptance/plugin-outlet-decorator-test.js b/test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-decorator-test.js
rename to test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6
diff --git a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-multi-template-test.js
rename to test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
diff --git a/test/javascripts/acceptance/plugin-outlet-single-template-test.js b/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-single-template-test.js
rename to test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
diff --git a/test/javascripts/acceptance/preferences-test.js b/test/javascripts/acceptance/preferences-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/preferences-test.js
rename to test/javascripts/acceptance/preferences-test.js.es6
diff --git a/test/javascripts/acceptance/raw-plugin-outlet-test.js b/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/raw-plugin-outlet-test.js
rename to test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
diff --git a/test/javascripts/acceptance/redirect-to-top-test.js b/test/javascripts/acceptance/redirect-to-top-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/redirect-to-top-test.js
rename to test/javascripts/acceptance/redirect-to-top-test.js.es6
diff --git a/test/javascripts/acceptance/reports-test.js b/test/javascripts/acceptance/reports-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/reports-test.js
rename to test/javascripts/acceptance/reports-test.js.es6
diff --git a/test/javascripts/acceptance/review-test.js b/test/javascripts/acceptance/review-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/review-test.js
rename to test/javascripts/acceptance/review-test.js.es6
diff --git a/test/javascripts/acceptance/search-full-test.js b/test/javascripts/acceptance/search-full-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/search-full-test.js
rename to test/javascripts/acceptance/search-full-test.js.es6
diff --git a/test/javascripts/acceptance/search-mobile-test.js b/test/javascripts/acceptance/search-mobile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/search-mobile-test.js
rename to test/javascripts/acceptance/search-mobile-test.js.es6
diff --git a/test/javascripts/acceptance/search-test.js b/test/javascripts/acceptance/search-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/search-test.js
rename to test/javascripts/acceptance/search-test.js.es6
diff --git a/test/javascripts/acceptance/share-and-invite-desktop-test.js b/test/javascripts/acceptance/share-and-invite-desktop-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-desktop-test.js
rename to test/javascripts/acceptance/share-and-invite-desktop-test.js.es6
diff --git a/test/javascripts/acceptance/share-and-invite-mobile-test.js b/test/javascripts/acceptance/share-and-invite-mobile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-mobile-test.js
rename to test/javascripts/acceptance/share-and-invite-mobile-test.js.es6
diff --git a/test/javascripts/acceptance/shared-drafts-test.js b/test/javascripts/acceptance/shared-drafts-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/shared-drafts-test.js
rename to test/javascripts/acceptance/shared-drafts-test.js.es6
diff --git a/test/javascripts/acceptance/sign-in-test.js b/test/javascripts/acceptance/sign-in-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/sign-in-test.js
rename to test/javascripts/acceptance/sign-in-test.js.es6
diff --git a/test/javascripts/acceptance/static-test.js b/test/javascripts/acceptance/static-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/static-test.js
rename to test/javascripts/acceptance/static-test.js.es6
diff --git a/test/javascripts/acceptance/tag-groups-test.js b/test/javascripts/acceptance/tag-groups-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/tag-groups-test.js
rename to test/javascripts/acceptance/tag-groups-test.js.es6
diff --git a/test/javascripts/acceptance/tag-hashtag-test.js b/test/javascripts/acceptance/tag-hashtag-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/tag-hashtag-test.js
rename to test/javascripts/acceptance/tag-hashtag-test.js.es6
diff --git a/test/javascripts/acceptance/tags-intersection-test.js b/test/javascripts/acceptance/tags-intersection-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/tags-intersection-test.js
rename to test/javascripts/acceptance/tags-intersection-test.js.es6
diff --git a/test/javascripts/acceptance/tags-test.js b/test/javascripts/acceptance/tags-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/tags-test.js
rename to test/javascripts/acceptance/tags-test.js.es6
diff --git a/test/javascripts/acceptance/topic-anonymous-test.js b/test/javascripts/acceptance/topic-anonymous-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-anonymous-test.js
rename to test/javascripts/acceptance/topic-anonymous-test.js.es6
diff --git a/test/javascripts/acceptance/topic-discovery-test.js b/test/javascripts/acceptance/topic-discovery-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-discovery-test.js
rename to test/javascripts/acceptance/topic-discovery-test.js.es6
diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-edit-timer-test.js
rename to test/javascripts/acceptance/topic-edit-timer-test.js.es6
diff --git a/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js b/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
rename to test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6
diff --git a/test/javascripts/acceptance/topic-move-posts-test.js b/test/javascripts/acceptance/topic-move-posts-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-move-posts-test.js
rename to test/javascripts/acceptance/topic-move-posts-test.js.es6
diff --git a/test/javascripts/acceptance/topic-notifications-button-test.js b/test/javascripts/acceptance/topic-notifications-button-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-notifications-button-test.js
rename to test/javascripts/acceptance/topic-notifications-button-test.js.es6
diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-test.js
rename to test/javascripts/acceptance/topic-test.js.es6
diff --git a/test/javascripts/acceptance/unknown-test.js b/test/javascripts/acceptance/unknown-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/unknown-test.js
rename to test/javascripts/acceptance/unknown-test.js.es6
diff --git a/test/javascripts/acceptance/user-anonymous-test.js b/test/javascripts/acceptance/user-anonymous-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/user-anonymous-test.js
rename to test/javascripts/acceptance/user-anonymous-test.js.es6
diff --git a/test/javascripts/acceptance/user-card-mobile-test.js b/test/javascripts/acceptance/user-card-mobile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/user-card-mobile-test.js
rename to test/javascripts/acceptance/user-card-mobile-test.js.es6
diff --git a/test/javascripts/acceptance/user-card-test.js b/test/javascripts/acceptance/user-card-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/user-card-test.js
rename to test/javascripts/acceptance/user-card-test.js.es6
diff --git a/test/javascripts/acceptance/user-drafts-stream-test.js b/test/javascripts/acceptance/user-drafts-stream-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/user-drafts-stream-test.js
rename to test/javascripts/acceptance/user-drafts-stream-test.js.es6
diff --git a/test/javascripts/acceptance/user-test.js b/test/javascripts/acceptance/user-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/user-test.js
rename to test/javascripts/acceptance/user-test.js.es6
diff --git a/test/javascripts/acceptance/users-test.js b/test/javascripts/acceptance/users-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/users-test.js
rename to test/javascripts/acceptance/users-test.js.es6
diff --git a/test/javascripts/admin/components/group-list-setting-test.js b/test/javascripts/admin/components/group-list-setting-test.js.es6
similarity index 100%
rename from test/javascripts/admin/components/group-list-setting-test.js
rename to test/javascripts/admin/components/group-list-setting-test.js.es6
diff --git a/test/javascripts/admin/components/themes-list-item-test.js b/test/javascripts/admin/components/themes-list-item-test.js.es6
similarity index 100%
rename from test/javascripts/admin/components/themes-list-item-test.js
rename to test/javascripts/admin/components/themes-list-item-test.js.es6
diff --git a/test/javascripts/admin/components/themes-list-test.js b/test/javascripts/admin/components/themes-list-test.js.es6
similarity index 100%
rename from test/javascripts/admin/components/themes-list-test.js
rename to test/javascripts/admin/components/themes-list-test.js.es6
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-show-test.js
rename to test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-test.js b/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-test.js
rename to test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
similarity index 100%
rename from test/javascripts/admin/controllers/admin-user-badges-test.js
rename to test/javascripts/admin/controllers/admin-user-badges-test.js.es6
diff --git a/test/javascripts/admin/models/theme-test.js b/test/javascripts/admin/models/theme-test.js.es6
similarity index 100%
rename from test/javascripts/admin/models/theme-test.js
rename to test/javascripts/admin/models/theme-test.js.es6
diff --git a/test/javascripts/components/ace-editor-test.js b/test/javascripts/components/ace-editor-test.js.es6
similarity index 100%
rename from test/javascripts/components/ace-editor-test.js
rename to test/javascripts/components/ace-editor-test.js.es6
diff --git a/test/javascripts/components/admin-report-test.js b/test/javascripts/components/admin-report-test.js.es6
similarity index 100%
rename from test/javascripts/components/admin-report-test.js
rename to test/javascripts/components/admin-report-test.js.es6
diff --git a/test/javascripts/components/badge-title-test.js b/test/javascripts/components/badge-title-test.js.es6
similarity index 100%
rename from test/javascripts/components/badge-title-test.js
rename to test/javascripts/components/badge-title-test.js.es6
diff --git a/test/javascripts/components/d-button-test.js b/test/javascripts/components/d-button-test.js.es6
similarity index 100%
rename from test/javascripts/components/d-button-test.js
rename to test/javascripts/components/d-button-test.js.es6
diff --git a/test/javascripts/components/d-editor-test.js b/test/javascripts/components/d-editor-test.js.es6
similarity index 100%
rename from test/javascripts/components/d-editor-test.js
rename to test/javascripts/components/d-editor-test.js.es6
diff --git a/test/javascripts/components/d-icon-test.js b/test/javascripts/components/d-icon-test.js.es6
similarity index 100%
rename from test/javascripts/components/d-icon-test.js
rename to test/javascripts/components/d-icon-test.js.es6
diff --git a/test/javascripts/components/date-input-test.js b/test/javascripts/components/date-input-test.js.es6
similarity index 100%
rename from test/javascripts/components/date-input-test.js
rename to test/javascripts/components/date-input-test.js.es6
diff --git a/test/javascripts/components/date-time-input-range-test.js b/test/javascripts/components/date-time-input-range-test.js.es6
similarity index 100%
rename from test/javascripts/components/date-time-input-range-test.js
rename to test/javascripts/components/date-time-input-range-test.js.es6
diff --git a/test/javascripts/components/date-time-input-test.js b/test/javascripts/components/date-time-input-test.js.es6
similarity index 100%
rename from test/javascripts/components/date-time-input-test.js
rename to test/javascripts/components/date-time-input-test.js.es6
diff --git a/test/javascripts/components/group-membership-button-test.js b/test/javascripts/components/group-membership-button-test.js.es6
similarity index 100%
rename from test/javascripts/components/group-membership-button-test.js
rename to test/javascripts/components/group-membership-button-test.js.es6
diff --git a/test/javascripts/components/html-safe-helper-test.js b/test/javascripts/components/html-safe-helper-test.js.es6
similarity index 100%
rename from test/javascripts/components/html-safe-helper-test.js
rename to test/javascripts/components/html-safe-helper-test.js.es6
diff --git a/test/javascripts/components/iframed-html-test.js b/test/javascripts/components/iframed-html-test.js.es6
similarity index 100%
rename from test/javascripts/components/iframed-html-test.js
rename to test/javascripts/components/iframed-html-test.js.es6
diff --git a/test/javascripts/components/image-uploader-test.js b/test/javascripts/components/image-uploader-test.js.es6
similarity index 100%
rename from test/javascripts/components/image-uploader-test.js
rename to test/javascripts/components/image-uploader-test.js.es6
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js b/test/javascripts/components/keyboard-shortcuts-test.js.es6
similarity index 100%
rename from test/javascripts/components/keyboard-shortcuts-test.js
rename to test/javascripts/components/keyboard-shortcuts-test.js.es6
diff --git a/test/javascripts/components/load-more-test.js b/test/javascripts/components/load-more-test.js.es6
similarity index 100%
rename from test/javascripts/components/load-more-test.js
rename to test/javascripts/components/load-more-test.js.es6
diff --git a/test/javascripts/components/secret-value-list-test.js b/test/javascripts/components/secret-value-list-test.js.es6
similarity index 100%
rename from test/javascripts/components/secret-value-list-test.js
rename to test/javascripts/components/secret-value-list-test.js.es6
diff --git a/test/javascripts/components/select-kit/category-chooser-test.js b/test/javascripts/components/select-kit/category-chooser-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/category-chooser-test.js
rename to test/javascripts/components/select-kit/category-chooser-test.js.es6
diff --git a/test/javascripts/components/select-kit/category-drop-test.js b/test/javascripts/components/select-kit/category-drop-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/category-drop-test.js
rename to test/javascripts/components/select-kit/category-drop-test.js.es6
diff --git a/test/javascripts/components/select-kit/combo-box-test.js b/test/javascripts/components/select-kit/combo-box-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/combo-box-test.js
rename to test/javascripts/components/select-kit/combo-box-test.js.es6
diff --git a/test/javascripts/components/select-kit/dropdown-select-box-test.js b/test/javascripts/components/select-kit/dropdown-select-box-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/dropdown-select-box-test.js
rename to test/javascripts/components/select-kit/dropdown-select-box-test.js.es6
diff --git a/test/javascripts/components/select-kit/list-setting-test.js b/test/javascripts/components/select-kit/list-setting-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/list-setting-test.js
rename to test/javascripts/components/select-kit/list-setting-test.js.es6
diff --git a/test/javascripts/components/select-kit/mini-tag-chooser-test.js b/test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/mini-tag-chooser-test.js
rename to test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6
diff --git a/test/javascripts/components/select-kit/multi-select-test.js b/test/javascripts/components/select-kit/multi-select-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/multi-select-test.js
rename to test/javascripts/components/select-kit/multi-select-test.js.es6
diff --git a/test/javascripts/components/select-kit/notifications-button-test.js b/test/javascripts/components/select-kit/notifications-button-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/notifications-button-test.js
rename to test/javascripts/components/select-kit/notifications-button-test.js.es6
diff --git a/test/javascripts/components/select-kit/pinned-options-test.js b/test/javascripts/components/select-kit/pinned-options-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/pinned-options-test.js
rename to test/javascripts/components/select-kit/pinned-options-test.js.es6
diff --git a/test/javascripts/components/select-kit/select-kit-test-helper.js b/test/javascripts/components/select-kit/select-kit-test-helper.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/select-kit-test-helper.js
rename to test/javascripts/components/select-kit/select-kit-test-helper.js.es6
diff --git a/test/javascripts/components/select-kit/single-select-test.js b/test/javascripts/components/select-kit/single-select-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/single-select-test.js
rename to test/javascripts/components/select-kit/single-select-test.js.es6
diff --git a/test/javascripts/components/select-kit/tag-drop-test.js b/test/javascripts/components/select-kit/tag-drop-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/tag-drop-test.js
rename to test/javascripts/components/select-kit/tag-drop-test.js.es6
diff --git a/test/javascripts/components/select-kit/topic-notifications-button-test.js b/test/javascripts/components/select-kit/topic-notifications-button-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-button-test.js
rename to test/javascripts/components/select-kit/topic-notifications-button-test.js.es6
diff --git a/test/javascripts/components/select-kit/topic-notifications-options-test.js b/test/javascripts/components/select-kit/topic-notifications-options-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-options-test.js
rename to test/javascripts/components/select-kit/topic-notifications-options-test.js.es6
diff --git a/test/javascripts/components/select-kit/user-chooser-test.js b/test/javascripts/components/select-kit/user-chooser-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/user-chooser-test.js
rename to test/javascripts/components/select-kit/user-chooser-test.js.es6
diff --git a/test/javascripts/components/share-button-test.js b/test/javascripts/components/share-button-test.js.es6
similarity index 100%
rename from test/javascripts/components/share-button-test.js
rename to test/javascripts/components/share-button-test.js.es6
diff --git a/test/javascripts/components/share-button.js b/test/javascripts/components/share-button.js.es6
similarity index 100%
rename from test/javascripts/components/share-button.js
rename to test/javascripts/components/share-button.js.es6
diff --git a/test/javascripts/components/text-field-test.js b/test/javascripts/components/text-field-test.js.es6
similarity index 100%
rename from test/javascripts/components/text-field-test.js
rename to test/javascripts/components/text-field-test.js.es6
diff --git a/test/javascripts/components/text-overflow-test.js b/test/javascripts/components/text-overflow-test.js.es6
similarity index 100%
rename from test/javascripts/components/text-overflow-test.js
rename to test/javascripts/components/text-overflow-test.js.es6
diff --git a/test/javascripts/components/time-input-test.js b/test/javascripts/components/time-input-test.js.es6
similarity index 100%
rename from test/javascripts/components/time-input-test.js
rename to test/javascripts/components/time-input-test.js.es6
diff --git a/test/javascripts/components/user-selector-test.js b/test/javascripts/components/user-selector-test.js.es6
similarity index 100%
rename from test/javascripts/components/user-selector-test.js
rename to test/javascripts/components/user-selector-test.js.es6
diff --git a/test/javascripts/components/value-list-test.js b/test/javascripts/components/value-list-test.js.es6
similarity index 100%
rename from test/javascripts/components/value-list-test.js
rename to test/javascripts/components/value-list-test.js.es6
diff --git a/test/javascripts/controllers/avatar-selector-test.js b/test/javascripts/controllers/avatar-selector-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/avatar-selector-test.js
rename to test/javascripts/controllers/avatar-selector-test.js.es6
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/bookmark-test.js
rename to test/javascripts/controllers/bookmark-test.js.es6
diff --git a/test/javascripts/controllers/create-account-test.js b/test/javascripts/controllers/create-account-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/create-account-test.js
rename to test/javascripts/controllers/create-account-test.js.es6
diff --git a/test/javascripts/controllers/group-test.js b/test/javascripts/controllers/group-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/group-test.js
rename to test/javascripts/controllers/group-test.js.es6
diff --git a/test/javascripts/controllers/history-test.js b/test/javascripts/controllers/history-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/history-test.js
rename to test/javascripts/controllers/history-test.js.es6
diff --git a/test/javascripts/controllers/preferences-account-test.js b/test/javascripts/controllers/preferences-account-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/preferences-account-test.js
rename to test/javascripts/controllers/preferences-account-test.js.es6
diff --git a/test/javascripts/controllers/preferences-second-factor-test.js b/test/javascripts/controllers/preferences-second-factor-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/preferences-second-factor-test.js
rename to test/javascripts/controllers/preferences-second-factor-test.js.es6
diff --git a/test/javascripts/controllers/reorder-categories-test.js b/test/javascripts/controllers/reorder-categories-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/reorder-categories-test.js
rename to test/javascripts/controllers/reorder-categories-test.js.es6
diff --git a/test/javascripts/controllers/topic-test.js b/test/javascripts/controllers/topic-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/topic-test.js
rename to test/javascripts/controllers/topic-test.js.es6
diff --git a/test/javascripts/ember/resolver-test.js b/test/javascripts/ember/resolver-test.js.es6
similarity index 100%
rename from test/javascripts/ember/resolver-test.js
rename to test/javascripts/ember/resolver-test.js.es6
diff --git a/test/javascripts/fixtures/about.js b/test/javascripts/fixtures/about.js.es6
similarity index 100%
rename from test/javascripts/fixtures/about.js
rename to test/javascripts/fixtures/about.js.es6
diff --git a/test/javascripts/fixtures/badges_fixture.js b/test/javascripts/fixtures/badges_fixture.js.es6
similarity index 100%
rename from test/javascripts/fixtures/badges_fixture.js
rename to test/javascripts/fixtures/badges_fixture.js.es6
diff --git a/test/javascripts/fixtures/category-fixtures.js b/test/javascripts/fixtures/category-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/category-fixtures.js
rename to test/javascripts/fixtures/category-fixtures.js.es6
diff --git a/test/javascripts/fixtures/concerns/notification-types.js.erb b/test/javascripts/fixtures/concerns/notification-types.js.es6.erb
similarity index 100%
rename from test/javascripts/fixtures/concerns/notification-types.js.erb
rename to test/javascripts/fixtures/concerns/notification-types.js.es6.erb
diff --git a/test/javascripts/fixtures/dashboard-general.js b/test/javascripts/fixtures/dashboard-general.js.es6
similarity index 100%
rename from test/javascripts/fixtures/dashboard-general.js
rename to test/javascripts/fixtures/dashboard-general.js.es6
diff --git a/test/javascripts/fixtures/dashboard.js b/test/javascripts/fixtures/dashboard.js.es6
similarity index 100%
rename from test/javascripts/fixtures/dashboard.js
rename to test/javascripts/fixtures/dashboard.js.es6
diff --git a/test/javascripts/fixtures/directory-fixtures.js b/test/javascripts/fixtures/directory-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/directory-fixtures.js
rename to test/javascripts/fixtures/directory-fixtures.js.es6
diff --git a/test/javascripts/fixtures/discovery_fixtures.js b/test/javascripts/fixtures/discovery_fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/discovery_fixtures.js
rename to test/javascripts/fixtures/discovery_fixtures.js.es6
diff --git a/test/javascripts/fixtures/draft.js b/test/javascripts/fixtures/draft.js.es6
similarity index 100%
rename from test/javascripts/fixtures/draft.js
rename to test/javascripts/fixtures/draft.js.es6
diff --git a/test/javascripts/fixtures/drafts.js b/test/javascripts/fixtures/drafts.js.es6
similarity index 100%
rename from test/javascripts/fixtures/drafts.js
rename to test/javascripts/fixtures/drafts.js.es6
diff --git a/test/javascripts/fixtures/group-fixtures.js b/test/javascripts/fixtures/group-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/group-fixtures.js
rename to test/javascripts/fixtures/group-fixtures.js.es6
diff --git a/test/javascripts/fixtures/groups-fixtures.js b/test/javascripts/fixtures/groups-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/groups-fixtures.js
rename to test/javascripts/fixtures/groups-fixtures.js.es6
diff --git a/test/javascripts/fixtures/notification_fixtures.js b/test/javascripts/fixtures/notification_fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/notification_fixtures.js
rename to test/javascripts/fixtures/notification_fixtures.js.es6
diff --git a/test/javascripts/fixtures/poll.js b/test/javascripts/fixtures/poll.js.es6
similarity index 100%
rename from test/javascripts/fixtures/poll.js
rename to test/javascripts/fixtures/poll.js.es6
diff --git a/test/javascripts/fixtures/post.js b/test/javascripts/fixtures/post.js.es6
similarity index 100%
rename from test/javascripts/fixtures/post.js
rename to test/javascripts/fixtures/post.js.es6
diff --git a/test/javascripts/fixtures/private_messages_fixtures.js b/test/javascripts/fixtures/private_messages_fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/private_messages_fixtures.js
rename to test/javascripts/fixtures/private_messages_fixtures.js.es6
diff --git a/test/javascripts/fixtures/problems.js b/test/javascripts/fixtures/problems.js.es6
similarity index 100%
rename from test/javascripts/fixtures/problems.js
rename to test/javascripts/fixtures/problems.js.es6
diff --git a/test/javascripts/fixtures/reports.js b/test/javascripts/fixtures/reports.js.es6
similarity index 100%
rename from test/javascripts/fixtures/reports.js
rename to test/javascripts/fixtures/reports.js.es6
diff --git a/test/javascripts/fixtures/reports_bulk.js b/test/javascripts/fixtures/reports_bulk.js.es6
similarity index 100%
rename from test/javascripts/fixtures/reports_bulk.js
rename to test/javascripts/fixtures/reports_bulk.js.es6
diff --git a/test/javascripts/fixtures/search-fixtures.js b/test/javascripts/fixtures/search-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/search-fixtures.js
rename to test/javascripts/fixtures/search-fixtures.js.es6
diff --git a/test/javascripts/fixtures/session-fixtures.js b/test/javascripts/fixtures/session-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/session-fixtures.js
rename to test/javascripts/fixtures/session-fixtures.js.es6
diff --git a/test/javascripts/fixtures/site-fixtures.js b/test/javascripts/fixtures/site-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/site-fixtures.js
rename to test/javascripts/fixtures/site-fixtures.js.es6
diff --git a/test/javascripts/fixtures/site_settings.js b/test/javascripts/fixtures/site_settings.js.es6
similarity index 100%
rename from test/javascripts/fixtures/site_settings.js
rename to test/javascripts/fixtures/site_settings.js.es6
diff --git a/test/javascripts/fixtures/static_fixtures.js b/test/javascripts/fixtures/static_fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/static_fixtures.js
rename to test/javascripts/fixtures/static_fixtures.js.es6
diff --git a/test/javascripts/fixtures/top_fixture.js b/test/javascripts/fixtures/top_fixture.js.es6
similarity index 100%
rename from test/javascripts/fixtures/top_fixture.js
rename to test/javascripts/fixtures/top_fixture.js.es6
diff --git a/test/javascripts/fixtures/topic.js b/test/javascripts/fixtures/topic.js.es6
similarity index 100%
rename from test/javascripts/fixtures/topic.js
rename to test/javascripts/fixtures/topic.js.es6
diff --git a/test/javascripts/fixtures/user-badges.js b/test/javascripts/fixtures/user-badges.js.es6
similarity index 100%
rename from test/javascripts/fixtures/user-badges.js
rename to test/javascripts/fixtures/user-badges.js.es6
diff --git a/test/javascripts/fixtures/user_fixtures.js b/test/javascripts/fixtures/user_fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/user_fixtures.js
rename to test/javascripts/fixtures/user_fixtures.js.es6
diff --git a/test/javascripts/fixtures/watched-words-fixtures.js b/test/javascripts/fixtures/watched-words-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/watched-words-fixtures.js
rename to test/javascripts/fixtures/watched-words-fixtures.js.es6
diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js
index 81fbd40b1b..95d7b2a7dd 100644
--- a/test/javascripts/helpers/assertions.js
+++ b/test/javascripts/helpers/assertions.js
@@ -1,4 +1,5 @@
-// discourse-skip-module
+/* exported exists, count, present, blank, containsInstance, not, visible, invisible */
+
 function exists(selector) {
   return count(selector) > 0;
 }
@@ -12,10 +13,8 @@ function visible(selector) {
 }
 
 function invisible(selector) {
-  const $items = find(selector + ":visible");
-  return (
-    $items.length === 0 ||
-    $items.css("opacity") === "0" ||
-    $items.css("visibility") === "hidden"
-  );
+  var $items = find(selector + ":visible");
+  return $items.length === 0 ||
+         $items.css("opacity") === "0" ||
+         $items.css("visibility") === "hidden";
 }
diff --git a/test/javascripts/helpers/component-test.js b/test/javascripts/helpers/component-test.js.es6
similarity index 100%
rename from test/javascripts/helpers/component-test.js
rename to test/javascripts/helpers/component-test.js.es6
diff --git a/test/javascripts/helpers/create-pretender.js b/test/javascripts/helpers/create-pretender.js.es6
similarity index 100%
rename from test/javascripts/helpers/create-pretender.js
rename to test/javascripts/helpers/create-pretender.js.es6
diff --git a/test/javascripts/helpers/create-store.js b/test/javascripts/helpers/create-store.js.es6
similarity index 100%
rename from test/javascripts/helpers/create-store.js
rename to test/javascripts/helpers/create-store.js.es6
diff --git a/test/javascripts/helpers/d-editor-helper.js b/test/javascripts/helpers/d-editor-helper.js.es6
similarity index 100%
rename from test/javascripts/helpers/d-editor-helper.js
rename to test/javascripts/helpers/d-editor-helper.js.es6
diff --git a/test/javascripts/helpers/fixture-pretender.js b/test/javascripts/helpers/fixture-pretender.js.es6
similarity index 100%
rename from test/javascripts/helpers/fixture-pretender.js
rename to test/javascripts/helpers/fixture-pretender.js.es6
diff --git a/test/javascripts/helpers/html-helper.js b/test/javascripts/helpers/html-helper.js.es6
similarity index 100%
rename from test/javascripts/helpers/html-helper.js
rename to test/javascripts/helpers/html-helper.js.es6
diff --git a/test/javascripts/helpers/init-ember-qunit.js b/test/javascripts/helpers/init-ember-qunit.js
new file mode 100644
index 0000000000..32d0184e7d
--- /dev/null
+++ b/test/javascripts/helpers/init-ember-qunit.js
@@ -0,0 +1,2 @@
+var buildResolver = require('discourse-common/resolver').buildResolver;
+window.setResolver(buildResolver('discourse').create({ namespace: Discourse }));
diff --git a/test/javascripts/helpers/qunit-helpers.js b/test/javascripts/helpers/qunit-helpers.js.es6
similarity index 100%
rename from test/javascripts/helpers/qunit-helpers.js
rename to test/javascripts/helpers/qunit-helpers.js.es6
diff --git a/test/javascripts/helpers/review-pretender.js b/test/javascripts/helpers/review-pretender.js.es6
similarity index 100%
rename from test/javascripts/helpers/review-pretender.js
rename to test/javascripts/helpers/review-pretender.js.es6
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js.es6
similarity index 100%
rename from test/javascripts/helpers/select-kit-helper.js
rename to test/javascripts/helpers/select-kit-helper.js.es6
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index c39424b0df..621aa3d6ac 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -1,5 +1,4 @@
-// discourse-skip-module
-
+/*jshint maxlen:10000000 */
 Discourse.SiteSettingsOriginal = {
   title: "QUnit Discourse Tests",
   site_logo_url: "/assets/logo.png",
@@ -13,10 +12,8 @@ Discourse.SiteSettingsOriginal = {
   ga_universal_tracking_code: "",
   ga_universal_domain_name: "auto",
   top_menu: "latest|new|unread|categories|top",
-  post_menu:
-    "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
-  post_menu_hidden_items:
-    "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
+  post_menu: "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
+  post_menu_hidden_items: "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
   share_links: "twitter|facebook|email",
   category_colors:
     "BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|27AA5B|B3B5B4|E45735",
@@ -105,7 +102,6 @@ Discourse.SiteSettingsOriginal = {
   unicode_usernames: false,
   secure_media: false
 };
-
 Discourse.SiteSettings = jQuery.extend(
   true,
   {},
diff --git a/test/javascripts/helpers/site.js b/test/javascripts/helpers/site.js.es6
similarity index 100%
rename from test/javascripts/helpers/site.js
rename to test/javascripts/helpers/site.js.es6
diff --git a/test/javascripts/helpers/store-pretender.js b/test/javascripts/helpers/store-pretender.js.es6
similarity index 100%
rename from test/javascripts/helpers/store-pretender.js
rename to test/javascripts/helpers/store-pretender.js.es6
diff --git a/test/javascripts/helpers/textarea-selection-helper.js b/test/javascripts/helpers/textarea-selection-helper.js.es6
similarity index 100%
rename from test/javascripts/helpers/textarea-selection-helper.js
rename to test/javascripts/helpers/textarea-selection-helper.js.es6
diff --git a/test/javascripts/helpers/widget-test.js b/test/javascripts/helpers/widget-test.js.es6
similarity index 100%
rename from test/javascripts/helpers/widget-test.js
rename to test/javascripts/helpers/widget-test.js.es6
diff --git a/test/javascripts/initializers/localization-test.js b/test/javascripts/initializers/localization-test.js.es6
similarity index 100%
rename from test/javascripts/initializers/localization-test.js
rename to test/javascripts/initializers/localization-test.js.es6
diff --git a/test/javascripts/lib/bbcode-test.js b/test/javascripts/lib/bbcode-test.js.es6
similarity index 100%
rename from test/javascripts/lib/bbcode-test.js
rename to test/javascripts/lib/bbcode-test.js.es6
diff --git a/test/javascripts/lib/break-string-test.js b/test/javascripts/lib/break-string-test.js.es6
similarity index 100%
rename from test/javascripts/lib/break-string-test.js
rename to test/javascripts/lib/break-string-test.js.es6
diff --git a/test/javascripts/lib/category-badge-test.js b/test/javascripts/lib/category-badge-test.js.es6
similarity index 100%
rename from test/javascripts/lib/category-badge-test.js
rename to test/javascripts/lib/category-badge-test.js.es6
diff --git a/test/javascripts/lib/click-track-edit-history-test.js b/test/javascripts/lib/click-track-edit-history-test.js.es6
similarity index 100%
rename from test/javascripts/lib/click-track-edit-history-test.js
rename to test/javascripts/lib/click-track-edit-history-test.js.es6
diff --git a/test/javascripts/lib/click-track-profile-page-test.js b/test/javascripts/lib/click-track-profile-page-test.js.es6
similarity index 100%
rename from test/javascripts/lib/click-track-profile-page-test.js
rename to test/javascripts/lib/click-track-profile-page-test.js.es6
diff --git a/test/javascripts/lib/click-track-test.js b/test/javascripts/lib/click-track-test.js.es6
similarity index 100%
rename from test/javascripts/lib/click-track-test.js
rename to test/javascripts/lib/click-track-test.js.es6
diff --git a/test/javascripts/lib/computed-test.js b/test/javascripts/lib/computed-test.js.es6
similarity index 100%
rename from test/javascripts/lib/computed-test.js
rename to test/javascripts/lib/computed-test.js.es6
diff --git a/test/javascripts/lib/discourse-test.js b/test/javascripts/lib/discourse-test.js.es6
similarity index 100%
rename from test/javascripts/lib/discourse-test.js
rename to test/javascripts/lib/discourse-test.js.es6
diff --git a/test/javascripts/lib/emoji-store-test.js b/test/javascripts/lib/emoji-store-test.js.es6
similarity index 100%
rename from test/javascripts/lib/emoji-store-test.js
rename to test/javascripts/lib/emoji-store-test.js.es6
diff --git a/test/javascripts/lib/emoji-test.js b/test/javascripts/lib/emoji-test.js.es6
similarity index 100%
rename from test/javascripts/lib/emoji-test.js
rename to test/javascripts/lib/emoji-test.js.es6
diff --git a/test/javascripts/lib/formatter-test.js b/test/javascripts/lib/formatter-test.js.es6
similarity index 100%
rename from test/javascripts/lib/formatter-test.js
rename to test/javascripts/lib/formatter-test.js.es6
diff --git a/test/javascripts/lib/highlight-text-test.js b/test/javascripts/lib/highlight-text-test.js.es6
similarity index 100%
rename from test/javascripts/lib/highlight-text-test.js
rename to test/javascripts/lib/highlight-text-test.js.es6
diff --git a/test/javascripts/lib/i18n-test.js b/test/javascripts/lib/i18n-test.js.es6
similarity index 100%
rename from test/javascripts/lib/i18n-test.js
rename to test/javascripts/lib/i18n-test.js.es6
diff --git a/test/javascripts/lib/icon-library-test.js b/test/javascripts/lib/icon-library-test.js.es6
similarity index 100%
rename from test/javascripts/lib/icon-library-test.js
rename to test/javascripts/lib/icon-library-test.js.es6
diff --git a/test/javascripts/lib/key-value-store-test.js b/test/javascripts/lib/key-value-store-test.js.es6
similarity index 100%
rename from test/javascripts/lib/key-value-store-test.js
rename to test/javascripts/lib/key-value-store-test.js.es6
diff --git a/test/javascripts/lib/link-mentions-test.js b/test/javascripts/lib/link-mentions-test.js.es6
similarity index 100%
rename from test/javascripts/lib/link-mentions-test.js
rename to test/javascripts/lib/link-mentions-test.js.es6
diff --git a/test/javascripts/lib/load-script-test.js b/test/javascripts/lib/load-script-test.js.es6
similarity index 100%
rename from test/javascripts/lib/load-script-test.js
rename to test/javascripts/lib/load-script-test.js.es6
diff --git a/test/javascripts/lib/oneboxer-test.js b/test/javascripts/lib/oneboxer-test.js.es6
similarity index 100%
rename from test/javascripts/lib/oneboxer-test.js
rename to test/javascripts/lib/oneboxer-test.js.es6
diff --git a/test/javascripts/lib/preload-store-test.js b/test/javascripts/lib/preload-store-test.js.es6
similarity index 100%
rename from test/javascripts/lib/preload-store-test.js
rename to test/javascripts/lib/preload-store-test.js.es6
diff --git a/test/javascripts/lib/pretty-text-test.js b/test/javascripts/lib/pretty-text-test.js.es6
similarity index 100%
rename from test/javascripts/lib/pretty-text-test.js
rename to test/javascripts/lib/pretty-text-test.js.es6
diff --git a/test/javascripts/lib/sanitizer-test.js b/test/javascripts/lib/sanitizer-test.js.es6
similarity index 100%
rename from test/javascripts/lib/sanitizer-test.js
rename to test/javascripts/lib/sanitizer-test.js.es6
diff --git a/test/javascripts/lib/screen-track-test.js b/test/javascripts/lib/screen-track-test.js.es6
similarity index 100%
rename from test/javascripts/lib/screen-track-test.js
rename to test/javascripts/lib/screen-track-test.js.es6
diff --git a/test/javascripts/lib/search-test.js b/test/javascripts/lib/search-test.js.es6
similarity index 100%
rename from test/javascripts/lib/search-test.js
rename to test/javascripts/lib/search-test.js.es6
diff --git a/test/javascripts/lib/sharing-test.js b/test/javascripts/lib/sharing-test.js.es6
similarity index 100%
rename from test/javascripts/lib/sharing-test.js
rename to test/javascripts/lib/sharing-test.js.es6
diff --git a/test/javascripts/lib/text-direction-test.js b/test/javascripts/lib/text-direction-test.js.es6
similarity index 100%
rename from test/javascripts/lib/text-direction-test.js
rename to test/javascripts/lib/text-direction-test.js.es6
diff --git a/test/javascripts/lib/to-markdown-test.js b/test/javascripts/lib/to-markdown-test.js.es6
similarity index 100%
rename from test/javascripts/lib/to-markdown-test.js
rename to test/javascripts/lib/to-markdown-test.js.es6
diff --git a/test/javascripts/lib/tooltip-test.js b/test/javascripts/lib/tooltip-test.js.es6
similarity index 100%
rename from test/javascripts/lib/tooltip-test.js
rename to test/javascripts/lib/tooltip-test.js.es6
diff --git a/test/javascripts/lib/upload-short-url-test.js b/test/javascripts/lib/upload-short-url-test.js.es6
similarity index 100%
rename from test/javascripts/lib/upload-short-url-test.js
rename to test/javascripts/lib/upload-short-url-test.js.es6
diff --git a/test/javascripts/lib/uploads-test.js b/test/javascripts/lib/uploads-test.js.es6
similarity index 100%
rename from test/javascripts/lib/uploads-test.js
rename to test/javascripts/lib/uploads-test.js.es6
diff --git a/test/javascripts/lib/url-test.js b/test/javascripts/lib/url-test.js.es6
similarity index 100%
rename from test/javascripts/lib/url-test.js
rename to test/javascripts/lib/url-test.js.es6
diff --git a/test/javascripts/lib/user-search-test.js b/test/javascripts/lib/user-search-test.js.es6
similarity index 100%
rename from test/javascripts/lib/user-search-test.js
rename to test/javascripts/lib/user-search-test.js.es6
diff --git a/test/javascripts/lib/utilities-test.js b/test/javascripts/lib/utilities-test.js.es6
similarity index 100%
rename from test/javascripts/lib/utilities-test.js
rename to test/javascripts/lib/utilities-test.js.es6
diff --git a/test/javascripts/lib/white-lister-test.js b/test/javascripts/lib/white-lister-test.js.es6
similarity index 100%
rename from test/javascripts/lib/white-lister-test.js
rename to test/javascripts/lib/white-lister-test.js.es6
diff --git a/test/javascripts/mixins/grant-badge-controller-test.js b/test/javascripts/mixins/grant-badge-controller-test.js.es6
similarity index 100%
rename from test/javascripts/mixins/grant-badge-controller-test.js
rename to test/javascripts/mixins/grant-badge-controller-test.js.es6
diff --git a/test/javascripts/mixins/setting-object-test.js b/test/javascripts/mixins/setting-object-test.js.es6
similarity index 100%
rename from test/javascripts/mixins/setting-object-test.js
rename to test/javascripts/mixins/setting-object-test.js.es6
diff --git a/test/javascripts/mixins/singleton-test.js b/test/javascripts/mixins/singleton-test.js.es6
similarity index 100%
rename from test/javascripts/mixins/singleton-test.js
rename to test/javascripts/mixins/singleton-test.js.es6
diff --git a/test/javascripts/models/badge-test.js b/test/javascripts/models/badge-test.js.es6
similarity index 100%
rename from test/javascripts/models/badge-test.js
rename to test/javascripts/models/badge-test.js.es6
diff --git a/test/javascripts/models/category-test.js b/test/javascripts/models/category-test.js.es6
similarity index 100%
rename from test/javascripts/models/category-test.js
rename to test/javascripts/models/category-test.js.es6
diff --git a/test/javascripts/models/composer-test.js b/test/javascripts/models/composer-test.js.es6
similarity index 100%
rename from test/javascripts/models/composer-test.js
rename to test/javascripts/models/composer-test.js.es6
diff --git a/test/javascripts/models/email-log-test.js b/test/javascripts/models/email-log-test.js.es6
similarity index 100%
rename from test/javascripts/models/email-log-test.js
rename to test/javascripts/models/email-log-test.js.es6
diff --git a/test/javascripts/models/group-test.js b/test/javascripts/models/group-test.js.es6
similarity index 100%
rename from test/javascripts/models/group-test.js
rename to test/javascripts/models/group-test.js.es6
diff --git a/test/javascripts/models/invite-test.js b/test/javascripts/models/invite-test.js.es6
similarity index 100%
rename from test/javascripts/models/invite-test.js
rename to test/javascripts/models/invite-test.js.es6
diff --git a/test/javascripts/models/nav-item-test.js b/test/javascripts/models/nav-item-test.js.es6
similarity index 100%
rename from test/javascripts/models/nav-item-test.js
rename to test/javascripts/models/nav-item-test.js.es6
diff --git a/test/javascripts/models/post-stream-test.js b/test/javascripts/models/post-stream-test.js.es6
similarity index 100%
rename from test/javascripts/models/post-stream-test.js
rename to test/javascripts/models/post-stream-test.js.es6
diff --git a/test/javascripts/models/post-test.js b/test/javascripts/models/post-test.js.es6
similarity index 100%
rename from test/javascripts/models/post-test.js
rename to test/javascripts/models/post-test.js.es6
diff --git a/test/javascripts/models/report-test.js b/test/javascripts/models/report-test.js.es6
similarity index 100%
rename from test/javascripts/models/report-test.js
rename to test/javascripts/models/report-test.js.es6
diff --git a/test/javascripts/models/rest-model-test.js b/test/javascripts/models/rest-model-test.js.es6
similarity index 100%
rename from test/javascripts/models/rest-model-test.js
rename to test/javascripts/models/rest-model-test.js.es6
diff --git a/test/javascripts/models/result-set-test.js b/test/javascripts/models/result-set-test.js.es6
similarity index 100%
rename from test/javascripts/models/result-set-test.js
rename to test/javascripts/models/result-set-test.js.es6
diff --git a/test/javascripts/models/session-test.js b/test/javascripts/models/session-test.js.es6
similarity index 100%
rename from test/javascripts/models/session-test.js
rename to test/javascripts/models/session-test.js.es6
diff --git a/test/javascripts/models/site-test.js b/test/javascripts/models/site-test.js.es6
similarity index 100%
rename from test/javascripts/models/site-test.js
rename to test/javascripts/models/site-test.js.es6
diff --git a/test/javascripts/models/staff-action-log-test.js b/test/javascripts/models/staff-action-log-test.js.es6
similarity index 100%
rename from test/javascripts/models/staff-action-log-test.js
rename to test/javascripts/models/staff-action-log-test.js.es6
diff --git a/test/javascripts/models/store-test.js b/test/javascripts/models/store-test.js.es6
similarity index 100%
rename from test/javascripts/models/store-test.js
rename to test/javascripts/models/store-test.js.es6
diff --git a/test/javascripts/models/topic-details-test.js b/test/javascripts/models/topic-details-test.js.es6
similarity index 100%
rename from test/javascripts/models/topic-details-test.js
rename to test/javascripts/models/topic-details-test.js.es6
diff --git a/test/javascripts/models/topic-test.js b/test/javascripts/models/topic-test.js.es6
similarity index 100%
rename from test/javascripts/models/topic-test.js
rename to test/javascripts/models/topic-test.js.es6
diff --git a/test/javascripts/models/topic-tracking-state-test.js b/test/javascripts/models/topic-tracking-state-test.js.es6
similarity index 100%
rename from test/javascripts/models/topic-tracking-state-test.js
rename to test/javascripts/models/topic-tracking-state-test.js.es6
diff --git a/test/javascripts/models/user-action-test.js b/test/javascripts/models/user-action-test.js.es6
similarity index 100%
rename from test/javascripts/models/user-action-test.js
rename to test/javascripts/models/user-action-test.js.es6
diff --git a/test/javascripts/models/user-badge-test.js b/test/javascripts/models/user-badge-test.js.es6
similarity index 100%
rename from test/javascripts/models/user-badge-test.js
rename to test/javascripts/models/user-badge-test.js.es6
diff --git a/test/javascripts/models/user-drafts-test.js b/test/javascripts/models/user-drafts-test.js.es6
similarity index 100%
rename from test/javascripts/models/user-drafts-test.js
rename to test/javascripts/models/user-drafts-test.js.es6
diff --git a/test/javascripts/models/user-stream-test.js b/test/javascripts/models/user-stream-test.js.es6
similarity index 100%
rename from test/javascripts/models/user-stream-test.js
rename to test/javascripts/models/user-stream-test.js.es6
diff --git a/test/javascripts/models/user-test.js b/test/javascripts/models/user-test.js.es6
similarity index 100%
rename from test/javascripts/models/user-test.js
rename to test/javascripts/models/user-test.js.es6
diff --git a/test/javascripts/utils/decorators-test.js b/test/javascripts/utils/decorators-test.js.es6
similarity index 100%
rename from test/javascripts/utils/decorators-test.js
rename to test/javascripts/utils/decorators-test.js.es6
diff --git a/test/javascripts/widgets/actions-summary-test.js b/test/javascripts/widgets/actions-summary-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/actions-summary-test.js
rename to test/javascripts/widgets/actions-summary-test.js.es6
diff --git a/test/javascripts/widgets/avatar-flair-test.js b/test/javascripts/widgets/avatar-flair-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/avatar-flair-test.js
rename to test/javascripts/widgets/avatar-flair-test.js.es6
diff --git a/test/javascripts/widgets/button-test.js b/test/javascripts/widgets/button-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/button-test.js
rename to test/javascripts/widgets/button-test.js.es6
diff --git a/test/javascripts/widgets/default-notification-item-test.js b/test/javascripts/widgets/default-notification-item-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/default-notification-item-test.js
rename to test/javascripts/widgets/default-notification-item-test.js.es6
diff --git a/test/javascripts/widgets/hamburger-menu-test.js b/test/javascripts/widgets/hamburger-menu-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/hamburger-menu-test.js
rename to test/javascripts/widgets/hamburger-menu-test.js.es6
diff --git a/test/javascripts/widgets/header-test.js b/test/javascripts/widgets/header-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/header-test.js
rename to test/javascripts/widgets/header-test.js.es6
diff --git a/test/javascripts/widgets/home-logo-test.js b/test/javascripts/widgets/home-logo-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/home-logo-test.js
rename to test/javascripts/widgets/home-logo-test.js.es6
diff --git a/test/javascripts/widgets/post-links-test.js b/test/javascripts/widgets/post-links-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/post-links-test.js
rename to test/javascripts/widgets/post-links-test.js.es6
diff --git a/test/javascripts/widgets/post-stream-test.js b/test/javascripts/widgets/post-stream-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/post-stream-test.js
rename to test/javascripts/widgets/post-stream-test.js.es6
diff --git a/test/javascripts/widgets/post-test.js b/test/javascripts/widgets/post-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/post-test.js
rename to test/javascripts/widgets/post-test.js.es6
diff --git a/test/javascripts/widgets/poster-name-test.js b/test/javascripts/widgets/poster-name-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/poster-name-test.js
rename to test/javascripts/widgets/poster-name-test.js.es6
diff --git a/test/javascripts/widgets/quick-access-item-test.js b/test/javascripts/widgets/quick-access-item-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/quick-access-item-test.js
rename to test/javascripts/widgets/quick-access-item-test.js.es6
diff --git a/test/javascripts/widgets/topic-admin-menu-test.js b/test/javascripts/widgets/topic-admin-menu-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/topic-admin-menu-test.js
rename to test/javascripts/widgets/topic-admin-menu-test.js.es6
diff --git a/test/javascripts/widgets/topic-participant-test.js b/test/javascripts/widgets/topic-participant-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/topic-participant-test.js
rename to test/javascripts/widgets/topic-participant-test.js.es6
diff --git a/test/javascripts/widgets/topic-status-test.js b/test/javascripts/widgets/topic-status-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/topic-status-test.js
rename to test/javascripts/widgets/topic-status-test.js.es6
diff --git a/test/javascripts/widgets/user-menu-test.js b/test/javascripts/widgets/user-menu-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/user-menu-test.js
rename to test/javascripts/widgets/user-menu-test.js.es6
diff --git a/test/javascripts/widgets/widget-test.js b/test/javascripts/widgets/widget-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/widget-test.js
rename to test/javascripts/widgets/widget-test.js.es6

From 097851c1352210be38d78e47eae50cd68a780770 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 26 Mar 2020 07:16:02 +1000
Subject: [PATCH 278/633] FIX: Change secure media to encompass attachments as
 well (#9271)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the “secure media” site setting is enabled then ALL files uploaded to Discourse (images, video, audio, pdf, txt, zip etc. etc.) will follow the secure media rules. The “prevent anons from downloading files” setting will no longer have any bearing on upload security. Basically, the feature will more appropriately be called “secure uploads” instead of “secure media”.

This is being done because there are communities out there that would like all attachments and media to be secure based on category rules but still allow anonymous users to download attachments in public places, which is not possible in the current arrangement.
---
 app/controllers/uploads_controller.rb         |  5 +-
 .../regular/update_private_uploads_acl.rb     | 17 ------
 .../initializers/014-track-setting-changes.rb |  2 -
 config/locales/server.en.yml                  |  2 +-
 lib/post_creator.rb                           |  5 +-
 lib/tasks/s3.rake                             |  3 +-
 lib/upload_security.rb                        | 10 +---
 .../update_private_uploads_acl_spec.rb        | 54 ------------------
 spec/lib/upload_creator_spec.rb               | 11 ----
 spec/lib/upload_security_spec.rb              |  8 +--
 spec/models/post_spec.rb                      |  6 +-
 spec/models/upload_spec.rb                    |  8 +--
 spec/multisite/s3_store_spec.rb               |  1 -
 .../uploads_controller_multisite_spec.rb      | 35 ++++++++++++
 spec/requests/uploads_controller_spec.rb      | 57 ++++++++++++++++---
 spec/tasks/uploads_spec.rb                    |  9 +--
 16 files changed, 106 insertions(+), 127 deletions(-)
 delete mode 100644 app/jobs/regular/update_private_uploads_acl.rb
 delete mode 100644 spec/jobs/regular/update_private_uploads_acl_spec.rb
 create mode 100644 spec/requests/uploads_controller_multisite_spec.rb

diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index ad72f998c9..ccbd762e72 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -3,7 +3,7 @@
 require "mini_mime"
 
 class UploadsController < ApplicationController
-  requires_login except: [:show, :show_short]
+  requires_login except: [:show, :show_short, :show_secure]
 
   skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show, :show_short, :show_secure]
   protect_from_forgery except: :show
@@ -130,6 +130,7 @@ class UploadsController < ApplicationController
     upload = Upload.find_by(sha1: sha1)
     return render_404 if upload.blank?
 
+    return render_404 if SiteSetting.prevent_anons_from_downloading_files && current_user.nil?
     return handle_secure_upload_request(upload, path_with_ext) if SiteSetting.secure_media?
 
     # we don't want to 404 here if secure media gets disabled
@@ -146,6 +147,8 @@ class UploadsController < ApplicationController
   def handle_secure_upload_request(upload, path_with_ext = nil)
     if upload.access_control_post_id.present?
       raise Discourse::InvalidAccess if !guardian.can_see?(upload.access_control_post)
+    else
+      return render_404 if current_user.nil?
     end
 
     # url_for figures out the full URL, handling multisite DBs,
diff --git a/app/jobs/regular/update_private_uploads_acl.rb b/app/jobs/regular/update_private_uploads_acl.rb
deleted file mode 100644
index 661f84437c..0000000000
--- a/app/jobs/regular/update_private_uploads_acl.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class UpdatePrivateUploadsAcl < ::Jobs::Base
-    # only runs when SiteSetting.prevent_anons_from_downloading_files is updated
-    def execute(args)
-      return if !SiteSetting.Upload.enable_s3_uploads
-
-      Upload.find_each do |upload|
-        if !FileHelper.is_supported_media?(upload.original_filename)
-          upload.update_secure_status
-        end
-      end
-    end
-
-  end
-end
diff --git a/config/initializers/014-track-setting-changes.rb b/config/initializers/014-track-setting-changes.rb
index 200f2c2da6..d3156d46d9 100644
--- a/config/initializers/014-track-setting-changes.rb
+++ b/config/initializers/014-track-setting-changes.rb
@@ -35,8 +35,6 @@ DiscourseEvent.on(:site_setting_changed) do |name, old_value, new_value|
 
   Jobs.enqueue(:update_s3_inventory) if [:enable_s3_inventory, :s3_upload_bucket].include?(name)
 
-  Jobs.enqueue(:update_private_uploads_acl) if name == :prevent_anons_from_downloading_files
-
   SvgSprite.expire_cache if name.to_s.include?("_icon")
 
   if SiteIconManager::WATCHED_SETTINGS.include?(name)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 986905fba1..110d3980d5 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2079,7 +2079,7 @@ en:
     bootstrap_mode_min_users: "Minimum number of users required to disable bootstrap mode (set to 0 to disable)"
 
     prevent_anons_from_downloading_files: "Prevent anonymous users from downloading attachments. WARNING: this will prevent any non-image site assets posted as attachments from working."
-    secure_media: 'Limits access to media uploads (images, video, audio). If "login required" is enabled, only logged-in users can access media uploads. Otherwise, access will be limited only for media uploads in private messages. Note: S3 uploads must be enabled prior to enabling this setting.'
+    secure_media: 'Limits access to ALL uploads (images, video, audio, text, pdfs, zips, and others). If “login required” is enabled, only logged-in users can access uploads. Otherwise, access will be limited only for media uploads in private messages and private categories. WARNING: This setting is complex and requires deep administrative understanding. See <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">the secure media topic on Meta</a> for details.'
     slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
 
     enable_emoji: "Enable emoji"
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 39fe22c283..fab3de1954 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -379,9 +379,8 @@ class PostCreator
   end
 
   def update_uploads_secure_status
-    if SiteSetting.secure_media? || SiteSetting.prevent_anons_from_downloading_files?
-      @post.update_uploads_secure_status
-    end
+    return if !SiteSetting.secure_media?
+    @post.update_uploads_secure_status
   end
 
   def handle_spam
diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rake
index f1b42dd90d..b72b9e083f 100644
--- a/lib/tasks/s3.rake
+++ b/lib/tasks/s3.rake
@@ -147,7 +147,6 @@ task 's3:correct_cachecontrol' => :environment do
 
   base_url = Discourse.store.absolute_base_url
 
-  acl = SiteSetting.prevent_anons_from_downloading_files ? 'private' : 'public-read'
   cache_control = 'max-age=31556952, public, immutable'
 
   objects = Upload.pluck(:id, :url).map { |array| array << :upload }
@@ -165,7 +164,7 @@ task 's3:correct_cachecontrol' => :environment do
         object = Discourse.store.s3_helper.object(key)
         object.copy_from(
           copy_source: "#{object.bucket_name}/#{object.key}",
-          acl: acl,
+          acl: "public-read",
           cache_control: cache_control,
           content_type: object.content_type,
           content_disposition: object.content_disposition,
diff --git a/lib/upload_security.rb b/lib/upload_security.rb
index 2c9d2f2386..5ce74ece10 100644
--- a/lib/upload_security.rb
+++ b/lib/upload_security.rb
@@ -23,7 +23,7 @@ class UploadSecurity
   def should_be_secure?
     return false if !SiteSetting.secure_media?
     return false if uploading_in_public_context?
-    (secure_attachment? || supported_media?) && uploading_in_secure_context?
+    uploading_in_secure_context?
   end
 
   private
@@ -32,14 +32,6 @@ class UploadSecurity
     @upload.for_theme || @upload.for_site_setting || @upload.for_gravatar || public_type? || used_for_custom_emoji? || based_on_regular_emoji?
   end
 
-  def supported_media?
-    FileHelper.is_supported_media?(@upload.original_filename)
-  end
-
-  def secure_attachment?
-    !supported_media? && SiteSetting.prevent_anons_from_downloading_files
-  end
-
   def uploading_in_secure_context?
     return true if SiteSetting.login_required?
     if @upload.access_control_post_id.present?
diff --git a/spec/jobs/regular/update_private_uploads_acl_spec.rb b/spec/jobs/regular/update_private_uploads_acl_spec.rb
deleted file mode 100644
index 9c51ef734f..0000000000
--- a/spec/jobs/regular/update_private_uploads_acl_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Jobs::UpdatePrivateUploadsAcl do
-  let(:args) { [] }
-
-  before do
-    SiteSetting.authorized_extensions = "pdf"
-  end
-
-  describe '#execute' do
-    context "if not SiteSetting.Upload.enable_s3_uploads" do
-      before do
-        SiteSetting.Upload.stubs(:enable_s3_uploads).returns(false)
-      end
-      it "returns early and changes no uploads" do
-        Upload.expects(:find_each).never
-        subject.execute(args)
-      end
-    end
-    context "if SiteSetting.Upload.enable_s3_uploads" do
-      let!(:upload) { Fabricate(:upload_s3, extension: 'pdf', original_filename: "watchmen.pdf", secure: false) }
-      before do
-        SiteSetting.login_required = true
-        SiteSetting.prevent_anons_from_downloading_files = true
-        Discourse.stubs(:store).returns(stub(external?: false))
-        enable_s3_uploads([upload])
-        SiteSetting.secure_media = true
-      end
-
-      it "changes the upload to secure" do
-        subject.execute(args)
-        expect(upload.reload.secure).to eq(true)
-      end
-    end
-  end
-
-  def enable_s3_uploads(uploads)
-    SiteSetting.enable_s3_uploads = true
-    SiteSetting.s3_upload_bucket = "s3-upload-bucket"
-    SiteSetting.s3_access_key_id = "some key"
-    SiteSetting.s3_secret_access_key = "some secrets3_region key"
-
-    stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
-
-    uploads.each do |upload|
-      stub_request(
-        :put,
-        "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{upload.sha1}.#{upload.extension}?acl"
-      )
-    end
-  end
-end
diff --git a/spec/lib/upload_creator_spec.rb b/spec/lib/upload_creator_spec.rb
index 6e796ea36f..cc012acd25 100644
--- a/spec/lib/upload_creator_spec.rb
+++ b/spec/lib/upload_creator_spec.rb
@@ -178,7 +178,6 @@ RSpec.describe UploadCreator do
       before do
         enable_s3_uploads
         SiteSetting.secure_media = true
-        SiteSetting.prevent_anons_from_downloading_files = true
         SiteSetting.authorized_extensions = 'pdf|svg|jpg'
       end
 
@@ -195,15 +194,6 @@ RSpec.describe UploadCreator do
 
         expect(upload.secure?).to eq(false)
       end
-
-      it 'should not apply prevent_anons_from_downloading_files to image uploads' do
-        fname = "logo.jpg"
-        upload = UploadCreator.new(file_from_fixtures(fname), fname).create_for(user.id)
-        stored_upload = Upload.last
-
-        expect(stored_upload.original_filename).to eq(fname)
-        expect(stored_upload.secure?).to eq(false)
-      end
     end
 
     context 'uploading to s3' do
@@ -228,7 +218,6 @@ RSpec.describe UploadCreator do
       end
 
       it 'should return signed URL for secure attachments in S3' do
-        SiteSetting.prevent_anons_from_downloading_files = true
         SiteSetting.authorized_extensions = 'pdf'
         SiteSetting.secure_media = true
 
diff --git a/spec/lib/upload_security_spec.rb b/spec/lib/upload_security_spec.rb
index eabf061678..8f99025df2 100644
--- a/spec/lib/upload_security_spec.rb
+++ b/spec/lib/upload_security_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe UploadSecurity do
   let(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
   let(:post_in_secure_context) { Fabricate(:post, topic: Fabricate(:topic, category: private_category)) }
-  let(:upload) { Fabricate(:upload) }
+  fab!(:upload) { Fabricate(:upload) }
   let(:type) { nil }
   let(:opts) { { type: type } }
   subject { described_class.new(upload, opts) }
@@ -144,9 +144,8 @@ RSpec.describe UploadSecurity do
       end
     end
 
-    context "when prevent_anons_from_downloading_files enabled for attachment" do
+    context "for attachments" do
       before do
-        SiteSetting.prevent_anons_from_downloading_files = true
         upload.update(original_filename: 'test.pdf')
       end
 
@@ -169,9 +168,8 @@ RSpec.describe UploadSecurity do
       expect(subject.should_be_secure?).to eq(false)
     end
 
-    context "when prevent_anons_from_downloading_files enabled for attachment" do
+    context "for attachments" do
       before do
-        SiteSetting.prevent_anons_from_downloading_files = true
         upload.update(original_filename: 'test.pdf')
       end
       it "returns false" do
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 903f5c10b0..66ba358ad5 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1415,13 +1415,14 @@ describe Post do
         )
       end
 
-      it "marks image uploads as secure in PMs when secure_media is ON" do
+      it "marks image and attachment uploads as secure in PMs when secure_media is ON" do
+        SiteSetting.secure_media = true
         post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:private_message_topic, user: user))
         post.link_post_uploads
         post.update_uploads_secure_status
 
         expect(PostUpload.where(post: post).joins(:upload).pluck(:upload_id, :secure)).to contain_exactly(
-          [attachment_upload.id, false],
+          [attachment_upload.id, true],
           [image_upload.id, true]
         )
       end
@@ -1439,7 +1440,6 @@ describe Post do
       end
 
       it "marks attachments as secure when relevant setting is enabled" do
-        SiteSetting.prevent_anons_from_downloading_files = true
         SiteSetting.secure_media = true
         private_category = Fabricate(:private_category, group: Fabricate(:group))
         post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:topic, user: user, category: private_category))
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index 5ae6b3ced0..739ab43d5a 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -356,8 +356,7 @@ describe Upload do
       expect(upload.secure).to eq(false)
     end
 
-    it 'marks a local attachment as secure if prevent_anons_from_downloading_files is enabled' do
-      SiteSetting.prevent_anons_from_downloading_files = true
+    it 'marks a local attachment as secure if secure media enabled' do
       SiteSetting.authorized_extensions = "pdf"
       upload.update!(original_filename: "small.pdf", extension: "pdf", secure: false, access_control_post: Fabricate(:private_message_post))
       enable_secure_media
@@ -368,8 +367,7 @@ describe Upload do
       expect(upload.secure).to eq(true)
     end
 
-    it 'marks a local attachment as not secure if prevent_anons_from_downloading_files is disabled' do
-      SiteSetting.prevent_anons_from_downloading_files = false
+    it 'marks a local attachment as not secure if secure media enabled' do
       SiteSetting.authorized_extensions = "pdf"
       upload.update!(original_filename: "small.pdf", extension: "pdf", secure: true)
 
@@ -379,7 +377,7 @@ describe Upload do
       expect(upload.secure).to eq(false)
     end
 
-    it 'does not change secure status of a non-attachment when prevent_anons_from_downloading_files is enabled' do
+    it 'does not change secure status of a non-attachment when prevent_anons_from_downloading_files is enabled by itself' do
       SiteSetting.prevent_anons_from_downloading_files = true
       SiteSetting.authorized_extensions = "mp4"
       upload.update!(original_filename: "small.mp4", extension: "mp4")
diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index f2107a4b0b..922c5f433b 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -134,7 +134,6 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
       SiteSetting.s3_access_key_id = "s3-access-key-id"
       SiteSetting.s3_secret_access_key = "s3-secret-access-key"
       SiteSetting.enable_s3_uploads = true
-      SiteSetting.prevent_anons_from_downloading_files = true
       SiteSetting.authorized_extensions = "pdf|png|jpg|gif"
     end
 
diff --git a/spec/requests/uploads_controller_multisite_spec.rb b/spec/requests/uploads_controller_multisite_spec.rb
new file mode 100644
index 0000000000..0865dd6752
--- /dev/null
+++ b/spec/requests/uploads_controller_multisite_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe UploadsController do
+  let!(:user) { Fabricate(:user) }
+
+  describe "#show_short" do
+    describe "s3 store" do
+      let(:upload) { Fabricate(:upload_s3) }
+
+      before do
+        SiteSetting.enable_s3_uploads = true
+        SiteSetting.s3_access_key_id = "fakeid7974664"
+        SiteSetting.s3_secret_access_key = "fakesecretid7974664"
+      end
+
+      context "when upload is secure and secure media enabled" do
+        before do
+          SiteSetting.secure_media = true
+          upload.update(secure: true)
+          stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
+        end
+        context "when running on a multisite connection", type: :multisite do
+          it "redirects to the signed_url_for_path with the multisite DB name in the url" do
+            sign_in(user)
+            freeze_time
+            get upload.short_path
+            expect(response.body).to include(RailsMultisite::ConnectionManagement.current_db)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index e7d66b1ee7..baa2f54270 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -352,7 +352,7 @@ describe UploadsController do
       end
 
       it "returns the right response when anon tries to download a file " \
-         "when prevent_anons_from_downloading_files is true" do
+        "when prevent_anons_from_downloading_files is true" do
 
         delete "/session/#{user.username}.json"
         SiteSetting.prevent_anons_from_downloading_files = true
@@ -386,6 +386,7 @@ describe UploadsController do
         end
 
         it "redirects to the signed_url_for_path" do
+          sign_in(user)
           freeze_time
           get upload.short_path
 
@@ -393,6 +394,7 @@ describe UploadsController do
         end
 
         it "raises invalid access if the user cannot access the upload access control post" do
+          sign_in(user)
           post = Fabricate(:post)
           post.topic.change_category_to_id(Fabricate(:private_category, group: Fabricate(:group)).id)
           upload.update(access_control_post: post)
@@ -400,14 +402,6 @@ describe UploadsController do
           get upload.short_path
           expect(response.code).to eq("403")
         end
-
-        context "when running on a multisite connection", type: :multisite do
-          it "redirects to the signed_url_for_path with the multisite DB name in the url" do
-            freeze_time
-            get upload.short_path
-            expect(response.body).to include(RailsMultisite::ConnectionManagement.current_db)
-          end
-        end
       end
     end
   end
@@ -430,10 +424,15 @@ describe UploadsController do
 
       def sign_in_and_stub_head
         sign_in(user)
+        stub_head
+      end
+
+      def stub_head
         stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
       end
 
       before do
+        SiteSetting.authorized_extensions = "*"
         SiteSetting.enable_s3_uploads = true
         SiteSetting.s3_upload_bucket = "s3-upload-bucket"
         SiteSetting.s3_access_key_id = "fakeid7974664"
@@ -508,6 +507,46 @@ describe UploadsController do
         end
       end
 
+      context "when the upload is an attachment file" do
+        before do
+          upload.update(original_filename: 'test.pdf')
+        end
+        it "redirects to the signed_url_for_path" do
+          sign_in_and_stub_head
+          get secure_url
+          expect(response.status).to eq(302)
+          expect(response.redirect_url).to match("Amz-Expires")
+        end
+
+        context "when the user does not have access to the access control post via guardian" do
+          let(:post) { Fabricate(:post) }
+          let!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
+
+          before do
+            post.topic.change_category_to_id(private_category.id)
+            upload.update(access_control_post_id: post.id)
+          end
+
+          it "returns a 403" do
+            sign_in_and_stub_head
+            get secure_url
+            expect(response.status).to eq(403)
+          end
+        end
+
+        context "when the prevent_anons_from_downloading_files setting is enabled and the user is anon" do
+          before do
+            SiteSetting.prevent_anons_from_downloading_files = true
+          end
+          it "returns a 404" do
+            stub_head
+            delete "/session/#{user.username}.json"
+            get secure_url
+            expect(response.status).to eq(404)
+          end
+        end
+      end
+
       context "when secure media is disabled" do
         before do
           SiteSetting.secure_media = false
diff --git a/spec/tasks/uploads_spec.rb b/spec/tasks/uploads_spec.rb
index 15afad903c..4041d8a968 100644
--- a/spec/tasks/uploads_spec.rb
+++ b/spec/tasks/uploads_spec.rb
@@ -14,13 +14,14 @@ RSpec.describe "tasks/uploads" do
       [
         multi_post_upload1,
         upload1,
-        upload2
+        upload2,
+        upload3
       ]
     end
     let(:multi_post_upload1) { Fabricate(:upload_s3) }
     let(:upload1) { Fabricate(:upload_s3) }
     let(:upload2) { Fabricate(:upload_s3) }
-    let(:upload3) { Fabricate(:upload_s3, original_filename: 'test.pdf') }
+    let(:upload3) { Fabricate(:upload_s3, original_filename: 'test.pdf', extension: 'pdf') }
 
     let!(:post1) { Fabricate(:post) }
     let!(:post2) { Fabricate(:post) }
@@ -65,12 +66,12 @@ RSpec.describe "tasks/uploads" do
           expect(upload3.reload.access_control_post).to eq(post3)
         end
 
-        it "sets the upload in the read restricted topic category to secure" do
+        it "sets the uploads that are media and attachments in the read restricted topic category to secure" do
           post3.topic.update(category: Fabricate(:private_category, group: Fabricate(:group)))
           invoke_task
           expect(upload2.reload.secure).to eq(true)
           expect(upload1.reload.secure).to eq(false)
-          expect(upload3.reload.secure).to eq(false)
+          expect(upload3.reload.secure).to eq(true)
         end
 
         it "sets the upload in the PM topic to secure" do

From ecb098bcbb0aad9e7d3777e036e4eafb0cfece9b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Mar 2020 22:40:52 +0100
Subject: [PATCH 279/633] DEV: skip this test for now, failing randomly on CI
 (#9280)

Works on local
---
 test/javascripts/acceptance/topic-edit-timer-test.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
index 39d99e7598..83190f6a94 100644
--- a/test/javascripts/acceptance/topic-edit-timer-test.js.es6
+++ b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
@@ -66,7 +66,7 @@ QUnit.test("autoclose - specific time", async assert => {
   assert.ok(regex.test(html));
 });
 
-QUnit.test("autoclose", async assert => {
+QUnit.skip("autoclose", async assert => {
   updateCurrentUser({ moderator: true, canManageTopic: true });
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 

From b2aa203e67ac9f87e85a78060b624c4f29f601a5 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 25 Mar 2020 21:40:51 -0400
Subject: [PATCH 280/633] Add additional classes to topic-map stats

---
 .../javascripts/discourse/widgets/topic-map.js     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js b/app/assets/javascripts/discourse/widgets/topic-map.js
index fcd719fcb9..c434e84985 100644
--- a/app/assets/javascripts/discourse/widgets/topic-map.js
+++ b/app/assets/javascripts/discourse/widgets/topic-map.js
@@ -85,7 +85,7 @@ createWidget("topic-map-summary", {
   html(attrs, state) {
     const contents = [];
     contents.push(
-      h("li", [
+      h("li.created-at", [
         h(
           "h4",
           {
@@ -105,7 +105,7 @@ createWidget("topic-map-summary", {
     );
     contents.push(
       h(
-        "li",
+        "li.last-reply",
         h("a", { attributes: { href: attrs.lastPostUrl } }, [
           h(
             "h4",
@@ -126,7 +126,7 @@ createWidget("topic-map-summary", {
       )
     );
     contents.push(
-      h("li", [
+      h("li.replies", [
         numberNode(attrs.topicReplyCount),
         h(
           "h4",
@@ -140,7 +140,7 @@ createWidget("topic-map-summary", {
       ])
     );
     contents.push(
-      h("li.secondary", [
+      h("li.secondary.views", [
         numberNode(attrs.topicViews, { className: attrs.topicViewsHeat }),
         h(
           "h4",
@@ -154,7 +154,7 @@ createWidget("topic-map-summary", {
 
     if (attrs.participantCount > 0) {
       contents.push(
-        h("li.secondary", [
+        h("li.secondary.users", [
           numberNode(attrs.participantCount),
           h(
             "h4",
@@ -171,7 +171,7 @@ createWidget("topic-map-summary", {
 
     if (attrs.topicLikeCount) {
       contents.push(
-        h("li.secondary", [
+        h("li.secondary.likes", [
           numberNode(attrs.topicLikeCount),
           h(
             "h4",
@@ -188,7 +188,7 @@ createWidget("topic-map-summary", {
 
     if (attrs.topicLinkLength > 0) {
       contents.push(
-        h("li.secondary", [
+        h("li.secondary.links", [
           numberNode(attrs.topicLinkLength),
           h(
             "h4",

From ecbccab1599d44903477fd9656e44286e8200829 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 26 Mar 2020 13:44:02 +1100
Subject: [PATCH 281/633] FEATURE: invite_code is case-insensitive

Previously we required exact casing for invite code, this can cause a lot
of confusion. Relax the requirement.
---
 app/controllers/users_controller.rb    | 2 +-
 config/locales/server.en.yml           | 2 +-
 spec/requests/users_controller_spec.rb | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index da9ba484ee..79bee4208d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -425,7 +425,7 @@ class UsersController < ApplicationController
       return fail_with("login.email_too_long")
     end
 
-    if SiteSetting.require_invite_code && SiteSetting.invite_code != params[:invite_code]
+    if SiteSetting.require_invite_code && SiteSetting.invite_code.strip.downcase != params[:invite_code].strip.downcase
       return fail_with("login.wrong_invite_code")
     end
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 110d3980d5..b1fd87890d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1529,7 +1529,7 @@ en:
     markdown_typographer_quotation_marks: "List of double and single quotes replacement pairs"
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
     must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site."
-    invite_code: "User must type this code to be allowed account registration, ignored when empty"
+    invite_code: "User must type this code to be allowed account registration, ignored when empty (case-insensitive)"
     approve_suspect_users: "Add suspicious users to the review queue. Suspicious users have entered a bio/website but have no reading activity."
     pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications."
     maximum_session_age: "User will remain logged in for n hours since last visit"
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 57a936aa33..95d675f372 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -618,7 +618,7 @@ describe UsersController do
 
       it 'requires invite code when specified' do
         expect(SiteSetting.require_invite_code).to eq(false)
-        SiteSetting.invite_code = "abc"
+        SiteSetting.invite_code = "abc def"
         expect(SiteSetting.require_invite_code).to eq(true)
 
         post_user(invite_code: "abcd")
@@ -626,7 +626,8 @@ describe UsersController do
         json = JSON.parse(response.body)
         expect(json["success"]).to eq(false)
 
-        post_user(invite_code: "abc")
+        # case insensitive and stripped of leading/ending spaces
+        post_user(invite_code: " AbC deF ")
         expect(response.status).to eq(200)
         json = JSON.parse(response.body)
         expect(json["success"]).to eq(true)

From efd5fb665b0f478c0159b7dfb315dc0afa820c17 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 26 Mar 2020 13:31:39 +1000
Subject: [PATCH 282/633] DEV: Fix flaky time sensitive uploads.rake specs
 (#9283)

Also fix issues in spec where certain uploads were not considered secure
---
 lib/tasks/uploads.rake       |  2 +-
 spec/support/time_matcher.rb |  3 +++
 spec/tasks/uploads_spec.rb   | 37 +++++++++++++++++++++++-------------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 33c69b7d6c..6b7473ebb3 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -768,7 +768,7 @@ def adjust_acls(uploads_to_adjust_acl_for)
     Discourse.store.update_upload_ACL(upload)
     i += 1
   end
-  RakeHelpers.print_status_with_label("Updaing ACLs complete!        ", i, total_count)
+  RakeHelpers.print_status_with_label("Updating ACLs complete!        ", i, total_count)
 end
 
 def mark_all_as_secure_login_required(uploads_to_update)
diff --git a/spec/support/time_matcher.rb b/spec/support/time_matcher.rb
index ec7930e35a..b578fe3833 100644
--- a/spec/support/time_matcher.rb
+++ b/spec/support/time_matcher.rb
@@ -16,4 +16,7 @@ RSpec::Matchers.define :eq_time do |expected_time|
   failure_message do |actual_time|
     "#{actual_time} is not within 1 millisecond of #{expected_time}"
   end
+  failure_message_when_negated do |actual_time|
+    "#{actual_time} is within 1 millisecond of #{expected_time}"
+  end
 end
diff --git a/spec/tasks/uploads_spec.rb b/spec/tasks/uploads_spec.rb
index 4041d8a968..cbbd5b1705 100644
--- a/spec/tasks/uploads_spec.rb
+++ b/spec/tasks/uploads_spec.rb
@@ -81,16 +81,19 @@ RSpec.describe "tasks/uploads" do
           expect(upload1.reload.secure).to eq(false)
         end
 
-        it "rebakes the posts attached" do
-          post1_baked = post1.baked_at
-          post2_baked = post2.baked_at
-          post3_baked = post3.baked_at
+        it "rebakes the posts attached for uploads that change secure status" do
+          post3.topic.update(category: Fabricate(:private_category, group: Fabricate(:group)))
+          freeze_time
+
+          post1.update_columns(baked_at: 1.week.ago)
+          post2.update_columns(baked_at: 1.week.ago)
+          post3.update_columns(baked_at: 1.week.ago)
 
           invoke_task
 
-          expect(post1.reload.baked_at).not_to eq(post1_baked)
-          expect(post2.reload.baked_at).not_to eq(post2_baked)
-          expect(post3.reload.baked_at).not_to eq(post3_baked)
+          expect(post1.reload.baked_at).to eq_time(1.week.ago)
+          expect(post2.reload.baked_at).to eq_time(1.week.ago)
+          expect(post3.reload.baked_at).not_to eq_time(1.week.ago)
         end
 
         context "for an upload that is already secure and does not need to change" do
@@ -98,12 +101,17 @@ RSpec.describe "tasks/uploads" do
             post3.topic.update(archetype: 'private_message', category: nil)
             upload2.update(access_control_post: post3)
             upload2.update_secure_status
+            upload3.update(access_control_post: post3)
+            upload3.update_secure_status
           end
 
           it "does not rebake the associated post" do
-            post3_baked = post3.baked_at.to_s
+            freeze_time
+
+            post3.update_columns(baked_at: 1.week.ago)
             invoke_task
-            expect(post3.reload.baked_at.to_s).to eq(post3_baked)
+
+            expect(post3.reload.baked_at).to eq_time(1.week.ago)
           end
 
           it "does not attempt to update the acl" do
@@ -168,11 +176,14 @@ RSpec.describe "tasks/uploads" do
     end
 
     it "rebakes the associated posts" do
-      baked_post1 = post1.baked_at
-      baked_post2 = post2.baked_at
+      freeze_time
+
+      post1.update_columns(baked_at: 1.week.ago)
+      post2.update_columns(baked_at: 1.week.ago)
       invoke_task
-      expect(post1.reload.baked_at).not_to eq(baked_post1)
-      expect(post2.reload.baked_at).not_to eq(baked_post2)
+
+      expect(post1.reload.baked_at).not_to eq_time(1.week.ago)
+      expect(post2.reload.baked_at).not_to eq_time(1.week.ago)
     end
 
     it "updates the affected ACLs" do

From 6f978bc95cf806a32c4fe133a117aae83178fecf Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 26 Mar 2020 15:59:57 +1000
Subject: [PATCH 283/633] FIX: First pass to improve efficiency of secure
 uploads rake task (#9284)

Get rid of harmful each loop over uploads to update. Instead we put all the unique access control posts for the uploads into a map for fast access (vs using the slow .find through array) and look up the post when it is needed when looping through the uploads in batches.

On a Discourse instance with ~93k uploads, a simplified version of the old method takes > 1 minute, and a simplified version of the new method takes ~18s and uses a lot less memory.
---
 lib/tasks/uploads.rake | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 6b7473ebb3..f02534610c 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -710,13 +710,6 @@ task "uploads:secure_upload_analyse_and_update" => :environment do
       # secure based on site settings.
       uploads_to_update = Upload.includes(:posts, :optimized_images).joins(:post_uploads)
 
-      # we do this to avoid a heavier post query, and to make sure we only
-      # get unique posts AND include deleted posts (unscoped)
-      unique_access_control_posts = Post.unscoped.select(:id, :topic_id).includes(topic: :category).where(id: uploads_to_update.pluck(:access_control_post_id).uniq)
-      uploads_to_update.each do |upload|
-        upload.access_control_post = unique_access_control_posts.find { |post| post.id == upload.access_control_post_id }
-      end
-
       puts "There are #{uploads_to_update.count} upload(s) that could be marked secure.", ""
 
       # Simply mark all these uploads as secure if login_required because no anons will be able to access them
@@ -840,8 +833,20 @@ def determine_upload_security_and_posts_to_rebake(uploads_to_update, mark_secure
   uploads_to_adjust_acl_for = []
   posts_to_rebake = {}
 
+  # we do this to avoid a heavier post query, and to make sure we only
+  # get unique posts AND include deleted posts (unscoped)
+  unique_access_control_posts = {}
+  Post.unscoped.select(:id, :topic_id)
+    .includes(topic: :category)
+    .where(id: uploads_to_update.pluck(:access_control_post_id).uniq).find_each do |post|
+    unique_access_control_posts[post.id] = post
+  end
+
   i = 0
-  uploads_to_update.find_each(batch_size: 50) do |upload_to_update|
+  uploads_to_update.find_each do |upload_to_update|
+
+    # fetch the post out of the already populated map to avoid n1s
+    upload_to_update.access_control_post = unique_access_control_posts[upload_to_update.access_control_post_id]
 
     # we just need to determine the post security here so the ACL is set to the correct thing,
     # because the update_upload_ACL method uses upload.secure?

From 25f1f23288e116ef04ce787df803460ed5e51dca Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 26 Mar 2020 17:35:32 +1100
Subject: [PATCH 284/633] FEATURE: Stricter rules for user presence

Previously we would consider a user "present" and "last seen" if the
browser window was visible.

This has many edge cases, you could be considered present and around for
days just by having a window open and no screensaver on.

Instead we now also check that you either clicked, transitioned around app
or scrolled the page in the last minute in combination with window
visibility

This will lead to more reliable notifications via email and reduce load of
message bus for cases where a user walks away from the terminal
---
 Gemfile.lock                                  |  2 +-
 app/assets/javascripts/application.js         |  2 +-
 .../discourse/initializers/message-bus.js     | 11 ++---
 app/assets/javascripts/discourse/lib/ajax.js  |  6 +--
 .../discourse/lib/user-presence.js            | 45 +++++++++++++++++++
 .../javascripts/discourse/routes/discourse.js |  5 +++
 config/initializers/004-message_bus.rb        |  2 +-
 config/initializers/008-rack-cors.rb          |  2 +-
 lib/auth/default_current_user_provider.rb     |  2 +-
 .../default_current_user_provider_spec.rb     |  8 ++--
 spec/components/hijack_spec.rb                |  2 +-
 11 files changed, 69 insertions(+), 18 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/lib/user-presence.js

diff --git a/Gemfile.lock b/Gemfile.lock
index 471bb0f956..08056d633d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,7 +182,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (2.2.3)
+    message_bus (2.2.4)
       rack (>= 1.1.3)
     metaclass (0.0.4)
     method_source (0.9.2)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 35cc29acce..9addddf9ef 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,7 +11,7 @@
 // Stuff we need to load first
 //= require ./discourse/lib/to-markdown
 //= require ./discourse/lib/utilities
-//= require ./discourse/lib/page-visible
+//= require ./discourse/lib/user-presence
 //= require ./discourse/lib/logout
 //= require ./discourse/mixins/singleton
 //= require ./discourse/models/rest
diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js b/app/assets/javascripts/discourse/initializers/message-bus.js
index 960aaaaf1c..61905e42a0 100644
--- a/app/assets/javascripts/discourse/initializers/message-bus.js
+++ b/app/assets/javascripts/discourse/initializers/message-bus.js
@@ -1,5 +1,5 @@
 // Initialize the message bus to receive messages.
-import pageVisible from "discourse/lib/page-visible";
+import userPresent from "discourse/lib/user-presence";
 import { handleLogoff } from "discourse/lib/ajax";
 
 function ajax(opts) {
@@ -31,6 +31,7 @@ export default {
       siteSettings = container.lookup("site-settings:main");
 
     messageBus.alwaysLongPoll = Discourse.Environment === "development";
+    messageBus.shouldLongPollCallback = userPresent;
 
     // we do not want to start anything till document is complete
     messageBus.stop();
@@ -65,16 +66,16 @@ export default {
         opts.headers["X-Shared-Session-Key"] = $(
           "meta[name=shared_session_key]"
         ).attr("content");
-        if (pageVisible()) {
-          opts.headers["Discourse-Visible"] = "true";
+        if (userPresent()) {
+          opts.headers["Discourse-Present"] = "true";
         }
         return ajax(opts);
       };
     } else {
       messageBus.ajax = function(opts) {
         opts.headers = opts.headers || {};
-        if (pageVisible()) {
-          opts.headers["Discourse-Visible"] = "true";
+        if (userPresent()) {
+          opts.headers["Discourse-Present"] = "true";
         }
         return ajax(opts);
       };
diff --git a/app/assets/javascripts/discourse/lib/ajax.js b/app/assets/javascripts/discourse/lib/ajax.js
index 54de18d4c8..37052a4d79 100644
--- a/app/assets/javascripts/discourse/lib/ajax.js
+++ b/app/assets/javascripts/discourse/lib/ajax.js
@@ -1,5 +1,5 @@
 import { run } from "@ember/runloop";
-import pageVisible from "discourse/lib/page-visible";
+import userPresent from "discourse/lib/user-presence";
 import logout from "discourse/lib/logout";
 import Session from "discourse/models/session";
 import { Promise } from "rsvp";
@@ -92,8 +92,8 @@ export function ajax() {
       args.headers["Discourse-Track-View"] = "true";
     }
 
-    if (pageVisible()) {
-      args.headers["Discourse-Visible"] = "true";
+    if (userPresent()) {
+      args.headers["Discourse-Present"] = "true";
     }
 
     args.success = (data, textStatus, xhr) => {
diff --git a/app/assets/javascripts/discourse/lib/user-presence.js b/app/assets/javascripts/discourse/lib/user-presence.js
new file mode 100644
index 0000000000..67d332981f
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/user-presence.js
@@ -0,0 +1,45 @@
+// for android we test webkit
+const hiddenProperty =
+  document.hidden !== undefined
+    ? "hidden"
+    : document.webkitHidden !== undefined
+    ? "webkitHidden"
+    : undefined;
+
+const MAX_UNSEEN_TIME = 60000;
+
+let seenUserTime = Date.now();
+
+export default function() {
+  const now = Date.now();
+
+  if (seenUserTime + MAX_UNSEEN_TIME < now) {
+    return false;
+  }
+
+  if (hiddenProperty !== undefined) {
+    return !document[hiddenProperty];
+  } else {
+    return document && document.hasFocus;
+  }
+}
+
+export function seenUser() {
+  seenUserTime = Date.now();
+}
+
+// We could piggieback on the Scroll mixin, but it is not applied
+// consistently to all pages
+//
+// We try to keep this as cheap as possible by performing absolute minimal
+// amount of work when the event handler is fired
+//
+// An alternative would be to use a timer that looks at the scroll position
+// however this will not work as message bus can issue page updates and scroll
+// page around when user is not present
+//
+// We avoid tracking mouse move which would be very expensive
+
+$(document).bind("touchmove.discourse-track-presence", seenUser);
+$(document).bind("click.discourse-track-presence", seenUser);
+$(window).bind("scroll.discourse-track-presence", seenUser);
diff --git a/app/assets/javascripts/discourse/routes/discourse.js b/app/assets/javascripts/discourse/routes/discourse.js
index 980e986cd9..91be0b4331 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js
+++ b/app/assets/javascripts/discourse/routes/discourse.js
@@ -3,10 +3,15 @@ import Composer from "discourse/models/composer";
 import { getOwner } from "discourse-common/lib/get-owner";
 import Route from "@ember/routing/route";
 import deprecated from "discourse-common/lib/deprecated";
+import { seenUser } from "discourse/lib/user-presence";
 
 const DiscourseRoute = Route.extend({
   showFooter: false,
 
+  willTransition() {
+    seenUser();
+  },
+
   // Set to true to refresh a model without a transition if a query param
   // changes
   resfreshQueryWithoutTransition: false,
diff --git a/config/initializers/004-message_bus.rb b/config/initializers/004-message_bus.rb
index da12f03bed..924fe6dc71 100644
--- a/config/initializers/004-message_bus.rb
+++ b/config/initializers/004-message_bus.rb
@@ -30,7 +30,7 @@ def setup_message_bus_env(env)
     extra_headers = {
       "Access-Control-Allow-Origin" => Discourse.base_url_no_prefix,
       "Access-Control-Allow-Methods" => "GET, POST",
-      "Access-Control-Allow-Headers" => "X-SILENCE-LOGGER, X-Shared-Session-Key, Dont-Chunk, Discourse-Visible"
+      "Access-Control-Allow-Headers" => "X-SILENCE-LOGGER, X-Shared-Session-Key, Dont-Chunk, Discourse-Present"
     }
 
     user = nil
diff --git a/config/initializers/008-rack-cors.rb b/config/initializers/008-rack-cors.rb
index 5f1c6f4068..cc5bb8cd96 100644
--- a/config/initializers/008-rack-cors.rb
+++ b/config/initializers/008-rack-cors.rb
@@ -39,7 +39,7 @@ class Discourse::Cors
       end
 
       headers['Access-Control-Allow-Origin'] = origin || cors_origins[0]
-      headers['Access-Control-Allow-Headers'] = 'Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Visible, User-Api-Key, User-Api-Client-Id, Authorization'
+      headers['Access-Control-Allow-Headers'] = 'Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Present, User-Api-Key, User-Api-Client-Id, Authorization'
       headers['Access-Control-Allow-Credentials'] = 'true'
       headers['Access-Control-Allow-Methods'] = 'POST, PUT, GET, OPTIONS, DELETE'
     end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index ca8ec4d197..3e293dcb77 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -251,7 +251,7 @@ class Auth::DefaultCurrentUserProvider
     api = !!(@env[API_KEY_ENV]) || !!(@env[USER_API_KEY_ENV])
 
     if @request.xhr? || api
-      @env["HTTP_DISCOURSE_VISIBLE".freeze] == "true".freeze
+      @env["HTTP_DISCOURSE_PRESENT"] == "true"
     else
       true
     end
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 2fd165c848..f0c6fbc90e 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -462,18 +462,18 @@ describe Auth::DefaultCurrentUserProvider do
     expect(provider("/topic/anything/goes",
                     :method => "POST",
                     "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest",
-                    "HTTP_DISCOURSE_VISIBLE" => "true"
+                    "HTTP_DISCOURSE_PRESENT" => "true"
           ).should_update_last_seen?).to eq(true)
   end
 
-  it "should not update last seen for ajax calls without Discourse-Visible header" do
+  it "should not update last seen for ajax calls without Discourse-Present header" do
     expect(provider("/topic/anything/goes",
                     :method => "POST",
                     "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest"
           ).should_update_last_seen?).to eq(false)
   end
 
-  it "should update last seen for API calls with Discourse-Visible header" do
+  it "should update last seen for API calls with Discourse-Present header" do
     user = Fabricate(:user)
     api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
     params = { :method => "POST",
@@ -482,7 +482,7 @@ describe Auth::DefaultCurrentUserProvider do
               }
 
     expect(provider("/topic/anything/goes", params).should_update_last_seen?).to eq(false)
-    expect(provider("/topic/anything/goes", params.merge("HTTP_DISCOURSE_VISIBLE" => "true")).should_update_last_seen?).to eq(true)
+    expect(provider("/topic/anything/goes", params.merge("HTTP_DISCOURSE_PRESENT" => "true")).should_update_last_seen?).to eq(true)
   end
 
   it "correctly rotates tokens" do
diff --git a/spec/components/hijack_spec.rb b/spec/components/hijack_spec.rb
index 7e30a5439e..93bf9c98bf 100644
--- a/spec/components/hijack_spec.rb
+++ b/spec/components/hijack_spec.rb
@@ -108,7 +108,7 @@ describe Hijack do
 
     expected = {
       "Access-Control-Allow-Origin" => "www.rainbows.com",
-      "Access-Control-Allow-Headers" => "Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Visible, User-Api-Key, User-Api-Client-Id, Authorization",
+      "Access-Control-Allow-Headers" => "Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Present, User-Api-Key, User-Api-Client-Id, Authorization",
       "Access-Control-Allow-Credentials" => "true",
       "Access-Control-Allow-Methods" => "POST, PUT, GET, OPTIONS, DELETE"
     }

From e62071830d734e598acd81a800f37a3b9dfd5275 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 26 Mar 2020 17:36:42 +1100
Subject: [PATCH 285/633] DEV: prefer Date.now() over new Date().getTime()

`New Date().getTime()` is both uglier and slower than `Date.now()`

`Date.now()` is available on all the browsers we support.
---
 app/assets/javascripts/discourse/components/mount-widget.js | 4 ++--
 app/assets/javascripts/discourse/components/signup-cta.js   | 2 +-
 app/assets/javascripts/discourse/initializers/signup-cta.js | 2 +-
 app/assets/javascripts/discourse/lib/lock-on.js             | 4 ++--
 app/assets/javascripts/discourse/lib/screen-track.js        | 6 +++---
 app/assets/javascripts/discourse/lib/url.js                 | 2 +-
 app/assets/javascripts/discourse/mixins/pan-events.js       | 4 ++--
 .../javascripts/discourse/routes/topic-from-params.js       | 2 +-
 .../javascripts/discourse/widgets/post-edits-indicator.js   | 2 +-
 app/assets/javascripts/discourse/widgets/post.js            | 4 ++--
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/mount-widget.js b/app/assets/javascripts/discourse/components/mount-widget.js
index dc98bf9f6d..dc1eb2e166 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js
+++ b/app/assets/javascripts/discourse/components/mount-widget.js
@@ -112,7 +112,7 @@ export default Component.extend({
         return;
       }
 
-      const t0 = new Date().getTime();
+      const t0 = Date.now();
       const args = this.args || this.buildArgs();
       const opts = {
         model: this.model,
@@ -139,7 +139,7 @@ export default Component.extend({
 
       if (this.profileWidget) {
         // eslint-disable-next-line no-console
-        console.log(new Date().getTime() - t0);
+        console.log(Date.now() - t0);
       }
     }
   }
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js b/app/assets/javascripts/discourse/components/signup-cta.js
index 7d6f1623e4..43aee26cc9 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js
+++ b/app/assets/javascripts/discourse/components/signup-cta.js
@@ -12,7 +12,7 @@ export default Component.extend({
     },
     hideForSession() {
       this.session.set("hideSignupCta", true);
-      this.keyValueStore.setItem("anon-cta-hidden", new Date().getTime());
+      this.keyValueStore.setItem("anon-cta-hidden", Date.now());
       later(() => this.session.set("showSignupCta", false), 20 * 1000);
     }
   },
diff --git a/app/assets/javascripts/discourse/initializers/signup-cta.js b/app/assets/javascripts/discourse/initializers/signup-cta.js
index a46d12f851..db674ccde1 100644
--- a/app/assets/javascripts/discourse/initializers/signup-cta.js
+++ b/app/assets/javascripts/discourse/initializers/signup-cta.js
@@ -38,7 +38,7 @@ export default {
         return; // hidden forever
       }
 
-      const now = new Date().getTime();
+      const now = Date.now();
       const hiddenAt = keyValueStore.getInt("anon-cta-hidden", 0);
       if (hiddenAt > now - PROMPT_HIDE_DURATION) {
         return; // hidden in last 24 hours
diff --git a/app/assets/javascripts/discourse/lib/lock-on.js b/app/assets/javascripts/discourse/lib/lock-on.js
index 90cc641dfe..d17353d4c1 100644
--- a/app/assets/javascripts/discourse/lib/lock-on.js
+++ b/app/assets/javascripts/discourse/lib/lock-on.js
@@ -49,7 +49,7 @@ export default class LockOn {
   }
 
   lock() {
-    const startedAt = new Date().getTime();
+    const startedAt = Date.now();
     let previousTop = this.elementTop();
     previousTop && $(window).scrollTop(previousTop);
 
@@ -73,7 +73,7 @@ export default class LockOn {
       }
 
       // Stop after a little while
-      if (new Date().getTime() - startedAt > LOCK_DURATION_MS) {
+      if (Date.now() - startedAt > LOCK_DURATION_MS) {
         return this.clearLock(interval);
       }
     }, 50);
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js b/app/assets/javascripts/discourse/lib/screen-track.js
index 91e0d42a83..ccfd9d8b3f 100644
--- a/app/assets/javascripts/discourse/lib/screen-track.js
+++ b/app/assets/javascripts/discourse/lib/screen-track.js
@@ -65,7 +65,7 @@ export default class {
 
   // Reset our timers
   reset() {
-    const now = new Date().getTime();
+    const now = Date.now();
     this._lastTick = now;
     this._lastScrolled = now;
     this._lastFlush = 0;
@@ -79,7 +79,7 @@ export default class {
   }
 
   scrolled() {
-    this._lastScrolled = new Date().getTime();
+    this._lastScrolled = Date.now();
   }
 
   registerAnonCallback(cb) {
@@ -212,7 +212,7 @@ export default class {
   }
 
   tick() {
-    const now = new Date().getTime();
+    const now = Date.now();
 
     // If the user hasn't scrolled the browser in a long time, stop tracking time read
     const sinceScrolled = now - this._lastScrolled;
diff --git a/app/assets/javascripts/discourse/lib/url.js b/app/assets/javascripts/discourse/lib/url.js
index a475c4aec3..ed46452529 100644
--- a/app/assets/javascripts/discourse/lib/url.js
+++ b/app/assets/javascripts/discourse/lib/url.js
@@ -368,7 +368,7 @@ const DiscourseURL = EmberObject.extend({
           const closest = postStream.closestPostNumberFor(opts.nearPost || 1);
           topicController.setProperties({
             "model.currentPost": closest,
-            enteredAt: new Date().getTime().toString()
+            enteredAt: Date.now().toString()
           });
 
           this.appEvents.trigger("post:highlight", closest);
diff --git a/app/assets/javascripts/discourse/mixins/pan-events.js b/app/assets/javascripts/discourse/mixins/pan-events.js
index fb05901205..b41d002f63 100644
--- a/app/assets/javascripts/discourse/mixins/pan-events.js
+++ b/app/assets/javascripts/discourse/mixins/pan-events.js
@@ -61,7 +61,7 @@ export default Mixin.create({
     if (e.type === "pointerup" || e.type === "pointercancel") {
       return oldState;
     }
-    const newTimestamp = new Date().getTime();
+    const newTimestamp = Date.now();
     const timeDiffSeconds = newTimestamp - oldState.timestamp;
     if (timeDiffSeconds === 0) {
       return oldState;
@@ -109,7 +109,7 @@ export default Mixin.create({
       deltaY: 0,
       distance: 0,
       start: true,
-      timestamp: new Date().getTime(),
+      timestamp: Date.now(),
       direction: null
     };
     this.set("_panState", newState);
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js b/app/assets/javascripts/discourse/routes/topic-from-params.js
index dd2215520f..1429fb0c16 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js
@@ -53,7 +53,7 @@ export default DiscourseRoute.extend({
         topicController.setProperties({
           "model.currentPost": closest,
           enteredIndex: topic.postStream.progressIndexOfPost(closestPost),
-          enteredAt: new Date().getTime().toString()
+          enteredAt: Date.now().toString()
         });
 
         this.appEvents.trigger("page:topic-loaded", topic);
diff --git a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js
index 46f7ed3f4d..f928df4727 100644
--- a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js
+++ b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js
@@ -13,7 +13,7 @@ export function historyHeat(siteSettings, updatedAt) {
   }
 
   // Show heat on age
-  const rightNow = new Date().getTime();
+  const rightNow = Date.now();
   const updatedAtTime = updatedAt.getTime();
 
   if (updatedAtTime > rightNow - mult(siteSettings.history_hours_low)) {
diff --git a/app/assets/javascripts/discourse/widgets/post.js b/app/assets/javascripts/discourse/widgets/post.js
index c6fc4f3319..d2f79335e2 100644
--- a/app/assets/javascripts/discourse/widgets/post.js
+++ b/app/assets/javascripts/discourse/widgets/post.js
@@ -730,7 +730,7 @@ export default createWidget("post", {
     const lastWarnedLikes = kvs.get("lastWarnedLikes");
 
     // only warn once per day
-    const yesterday = new Date().getTime() - 1000 * 60 * 60 * 24;
+    const yesterday = Date.now() - 1000 * 60 * 60 * 24;
     if (lastWarnedLikes && parseInt(lastWarnedLikes, 10) > yesterday) {
       return;
     }
@@ -739,7 +739,7 @@ export default createWidget("post", {
     const threshold = Math.ceil(max * 0.1);
     if (remaining === threshold) {
       bootbox.alert(I18n.t("post.few_likes_left"));
-      kvs.set({ key: "lastWarnedLikes", value: new Date().getTime() });
+      kvs.set({ key: "lastWarnedLikes", value: Date.now() });
     }
   }
 });

From 6bceb1d15a49a205d9fddba9b1314d0d6152d0aa Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Thu, 26 Mar 2020 09:07:41 -0300
Subject: [PATCH 286/633] FIX: Display small post actions when embedding a
 topic (#9278)

---
 app/helpers/embed_helper.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/helpers/embed_helper.rb b/app/helpers/embed_helper.rb
index 9db2fa5b9b..42e728ddba 100644
--- a/app/helpers/embed_helper.rb
+++ b/app/helpers/embed_helper.rb
@@ -17,6 +17,9 @@ module EmbedHelper
   end
 
   def get_html(post)
-    raw PrettyText.format_for_email(post.cooked, post)
+    key = "js.action_codes.#{post.action_code}"
+    cooked = post.cooked.blank? ? I18n.t(key, when: nil).humanize : post.cooked
+
+    raw PrettyText.format_for_email(cooked, post)
   end
 end

From ba1a08510eb9574803955a9a2e6e7a8f7b2d1a43 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 26 Mar 2020 14:24:07 +0200
Subject: [PATCH 287/633] FIX: Use correct spacing in emails with code (#9274)

Follow-up-to 778454e26b5c38c94dad6ccbc9f11439a51f6b6d
---
 lib/email/styles.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 0b6c3f8d77..4d299fcff3 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -195,7 +195,8 @@ module Email
       style('div.summary-footer', 'color:#666; font-size:95%; text-align:center; padding-top:15px;')
       style('span.post-count', 'margin: 0 5px; color: #777;')
       style('pre', 'word-wrap: break-word; max-width: 694px;')
-      style('code', 'background-color: #f1f1ff; line-height: 50%; padding: 2px 5px;')
+      style('code', 'background-color: #f1f1ff; padding: 2px 5px;')
+      style('code ol', 'line-height: 50%;')
       style('pre code', 'display: block; background-color: #f1f1ff; padding: 5px;')
       style('.featured-topic a', "text-decoration: none; font-weight: bold; color: #{SiteSetting.email_link_color}; line-height:1.5em;")
       style('.secure-image-notice', 'font-style: italic; background-color: #f1f1ff; padding: 5px;')

From 7952cbb9a2598d6389bdb77e23c2ce64665a1d4f Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 26 Mar 2020 16:40:00 +0200
Subject: [PATCH 288/633] FIX: Perform crop using user-specified image sizes
 (#9224)

* FIX: Perform crop using user-specified image sizes

It used to resize the images to max width and height first and then
perform the crop operation. This is wrong because it ignored the user
specified image sizes from the Markdown.

* DEV: Use real images in test
---
 app/assets/stylesheets/common/d-editor.scss   |  4 ++
 lib/cooked_post_processor.rb                  | 30 +++++-----
 spec/components/cooked_post_processor_spec.rb | 57 ++++++++++---------
 spec/fabricators/upload_fabricator.rb         | 14 +++++
 4 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index c4a7979588..401a4cc4f6 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -187,6 +187,10 @@
   &.site-icon {
     padding-bottom: 0;
   }
+  &.resizable {
+    object-fit: cover;
+    object-position: top;
+  }
 }
 
 .d-editor-preview .image-wrapper {
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index bd56c12ca0..2ec33c0d2c 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -308,29 +308,34 @@ class CookedPostProcessor
   end
 
   def convert_to_link!(img)
+    w, h = img["width"].to_i, img["height"].to_i
+    user_width, user_height = (w > 0 && h > 0 && [w, h]) ||
+                              get_size_from_attributes(img) ||
+                              get_size_from_image_sizes(img["src"], @opts[:image_sizes])
+
+    limit_size!(img)
+
     src = img["src"]
     return if src.blank? || is_a_hyperlink?(img) || is_svg?(img)
 
-    width, height = img["width"].to_i, img["height"].to_i
-    # TODO: store original dimentions in db
     original_width, original_height = (get_size(src) || [0, 0]).map(&:to_i)
-
-    # can't reach the image...
     if original_width == 0 || original_height == 0
       Rails.logger.info "Can't reach '#{src}' to get its dimension."
       return
     end
 
-    return if original_width <= width && original_height <= height
     return if original_width <= SiteSetting.max_image_width && original_height <= SiteSetting.max_image_height
 
-    crop   = SiteSetting.min_ratio_to_crop > 0
-    crop &&= original_width.to_f / original_height.to_f < SiteSetting.min_ratio_to_crop
+    user_width, user_height = [original_width, original_height] if user_width.to_i <= 0 && user_height.to_i <= 0
+    width, height = user_width, user_height
+
+    crop = SiteSetting.min_ratio_to_crop > 0 && width.to_f / height.to_f < SiteSetting.min_ratio_to_crop
 
     if crop
-      width, height = ImageSizer.crop(original_width, original_height)
-      img["width"] = width
-      img["height"] = height
+      width, height = ImageSizer.crop(width, height)
+      img["width"], img["height"] = width, height
+    else
+      width, height = ImageSizer.resize(width, height)
     end
 
     # if the upload already exists and is attached to a different post,
@@ -700,10 +705,7 @@ class CookedPostProcessor
 
   def post_process_images
     extract_images.each do |img|
-      unless add_image_placeholder!(img)
-        limit_size!(img)
-        convert_to_link!(img)
-      end
+      convert_to_link!(img) unless add_image_placeholder!(img)
     end
   end
 
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 799e3a3cd3..d986651562 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -416,12 +416,17 @@ describe CookedPostProcessor do
       end
 
       context "with unsized images" do
+        fab!(:upload) { Fabricate(:image_upload, width: 123, height: 456) }
+
+        fab!(:post) do
+          Fabricate(:post, raw: <<~HTML)
+          <img src="#{upload.url}">
+          HTML
+        end
 
-        fab!(:post) { Fabricate(:post_with_unsized_images) }
         let(:cpp) { CookedPostProcessor.new(post) }
 
         it "adds the width and height to images that don't have them" do
-          FastImage.expects(:size).returns([123, 456])
           cpp.post_process
           expect(cpp.html).to match(/width="123" height="456"/)
           expect(cpp).to be_dirty
@@ -430,6 +435,8 @@ describe CookedPostProcessor do
       end
 
       context "with large images" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1750, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}">
@@ -441,13 +448,9 @@ describe CookedPostProcessor do
         before do
           SiteSetting.max_image_height = 2000
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1750, 2000])
         end
 
         it "generates overlay information" do
-          OptimizedImage.expects(:resize).returns(true)
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
-
           cpp.post_process
 
           expect(cpp.html).to match_html <<~HTML
@@ -468,6 +471,8 @@ describe CookedPostProcessor do
           end
 
           it 'should not add lightbox' do
+            FastImage.expects(:size).returns([1750, 2000])
+
             cpp.post_process
 
             expect(cpp.html).to match_html <<~HTML
@@ -482,6 +487,8 @@ describe CookedPostProcessor do
           end
 
           it 'should not add lightbox' do
+            FastImage.expects(:size).returns([1750, 2000])
+
             cpp.post_process
 
             expect(cpp.html).to match_html <<~HTML
@@ -495,6 +502,8 @@ describe CookedPostProcessor do
             end
 
             it 'should not add lightbox' do
+              FastImage.expects(:size).returns([1750, 2000])
+
               SiteSetting.crawl_images = true
               cpp.post_process
 
@@ -537,8 +546,8 @@ describe CookedPostProcessor do
 
           context "when the upload is attached to the correct post" do
             before do
+              FastImage.expects(:size).returns([1750, 2000])
               OptimizedImage.expects(:resize).returns(true)
-              FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
               Discourse.store.class.any_instance.expects(:has_been_uploaded?).at_least_once.returns(true)
               upload.update(secure: true, access_control_post: post)
             end
@@ -568,6 +577,8 @@ describe CookedPostProcessor do
       end
 
       context "with tall images" do
+        fab!(:upload) { Fabricate(:image_upload, width: 860, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}">
@@ -578,10 +589,6 @@ describe CookedPostProcessor do
 
         before do
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([860, 2000])
-          OptimizedImage.expects(:resize).never
-          OptimizedImage.expects(:crop).returns(true)
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "crops the image" do
@@ -594,6 +601,8 @@ describe CookedPostProcessor do
       end
 
       context "with iPhone X screenshots" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1125, height: 2436) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}">
@@ -604,10 +613,6 @@ describe CookedPostProcessor do
 
         before do
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1125, 2436])
-          OptimizedImage.expects(:resize).returns(true)
-          OptimizedImage.expects(:crop).never
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "crops the image" do
@@ -625,6 +630,8 @@ describe CookedPostProcessor do
       end
 
       context "with large images when using subfolders" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1750, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="/subfolder#{upload.url}">
@@ -635,13 +642,10 @@ describe CookedPostProcessor do
 
         before do
           set_subfolder "/subfolder"
+          stub_request(:get, "http://#{Discourse.current_hostname}/subfolder#{upload.url}").to_return(status: 200, body: File.new(Discourse.store.path_for(upload)))
 
           SiteSetting.max_image_height = 2000
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1750, 2000])
-          OptimizedImage.expects(:resize).returns(true)
-
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "generates overlay information" do
@@ -670,6 +674,8 @@ describe CookedPostProcessor do
       end
 
       context "with title and alt" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1750, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}" title="WAT" alt="RED">
@@ -681,9 +687,6 @@ describe CookedPostProcessor do
         before do
           SiteSetting.max_image_height = 2000
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1750, 2000])
-          OptimizedImage.expects(:resize).returns(true)
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "generates overlay information using image title and ignores alt" do
@@ -701,6 +704,8 @@ describe CookedPostProcessor do
       end
 
       context "with title only" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1750, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}" title="WAT">
@@ -712,9 +717,6 @@ describe CookedPostProcessor do
         before do
           SiteSetting.max_image_height = 2000
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1750, 2000])
-          OptimizedImage.expects(:resize).returns(true)
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "generates overlay information using image title" do
@@ -732,6 +734,8 @@ describe CookedPostProcessor do
       end
 
       context "with alt only" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1750, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}" alt="RED">
@@ -743,9 +747,6 @@ describe CookedPostProcessor do
         before do
           SiteSetting.max_image_height = 2000
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1750, 2000])
-          OptimizedImage.expects(:resize).returns(true)
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "generates overlay information using image alt" do
diff --git a/spec/fabricators/upload_fabricator.rb b/spec/fabricators/upload_fabricator.rb
index 01d05d9da5..72bcb6c723 100644
--- a/spec/fabricators/upload_fabricator.rb
+++ b/spec/fabricators/upload_fabricator.rb
@@ -21,6 +21,20 @@ Fabricator(:upload) do
   extension "png"
 end
 
+Fabricator(:image_upload, from: :upload) do
+  after_create do |upload|
+    file = Tempfile.new(['fabricated', '.png'])
+    `convert -size #{upload.width}x#{upload.height} xc:white "#{file.path}"`
+
+    upload.url = Discourse.store.store_upload(file, upload)
+    upload.sha1 = Upload.generate_digest(file.path)
+
+    WebMock
+      .stub_request(:get, "http://#{Discourse.current_hostname}#{upload.url}")
+      .to_return(status: 200, body: File.new(file.path))
+  end
+end
+
 Fabricator(:video_upload, from: :upload) do
   original_filename "video.mp4"
   width nil

From ef3d6d6580941872344b7f7138db078be4c0402c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 26 Mar 2020 15:46:31 +0100
Subject: [PATCH 289/633] FIX: groups filtering input was causing a full page
 reload (#9282)

---
 .../discourse/controllers/groups-index.js     | 58 ++++++++++++-------
 .../discourse/routes/groups-index.js          | 10 +---
 .../discourse/templates/groups/index.hbs      | 27 +++++----
 3 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js b/app/assets/javascripts/discourse/controllers/groups-index.js
index 6674322677..228527bc38 100644
--- a/app/assets/javascripts/discourse/controllers/groups-index.js
+++ b/app/assets/javascripts/discourse/controllers/groups-index.js
@@ -1,6 +1,8 @@
 import Controller, { inject as controller } from "@ember/controller";
-import discourseDebounce from "discourse/lib/debounce";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { debounce } from "@ember/runloop";
+import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   application: controller(),
@@ -9,37 +11,53 @@ export default Controller.extend({
   asc: null,
   filter: "",
   type: null,
+  groups: null,
+  isLoading: false,
 
-  @discourseComputed("model.extras.type_filters")
+  @discourseComputed("groups.extras.type_filters")
   types(typeFilters) {
     const types = [];
 
     if (typeFilters) {
-      typeFilters.forEach(type => {
-        types.push({ id: type, name: I18n.t(`groups.index.${type}_groups`) });
-      });
+      typeFilters.forEach(type =>
+        types.push({ id: type, name: I18n.t(`groups.index.${type}_groups`) })
+      );
     }
 
     return types;
   },
 
-  @observes("filterInput")
-  _setFilter: discourseDebounce(function() {
-    this.set("filter", this.filterInput);
-  }, 500),
+  loadGroups(params) {
+    this.set("isLoading", true);
 
-  @observes("model.canLoadMore")
-  _showFooter() {
-    this.set("application.showFooter", !this.get("model.canLoadMore"));
+    this.store
+      .findAll("group", params)
+      .then(groups => {
+        this.set("groups", groups);
+
+        if (groups.canLoadMore) {
+          this.set("application.showFooter", !groups.canLoadMore);
+        }
+      })
+      .finally(() => this.set("isLoading", false));
   },
 
-  actions: {
-    loadMore() {
-      this.model.loadMore();
-    },
+  @action
+  onFilterChanged(filter) {
+    debounce(this, this._debouncedFilter, filter, INPUT_DELAY);
+  },
 
-    new() {
-      this.transitionToRoute("groups.new");
-    }
+  @action
+  loadMore() {
+    this.groups && this.groups.loadMore();
+  },
+
+  @action
+  new() {
+    this.transitionToRoute("groups.new");
+  },
+
+  _debouncedFilter(filter) {
+    this.set("filter", filter);
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/groups-index.js b/app/assets/javascripts/discourse/routes/groups-index.js
index a510bd93b6..dff87c3cb2 100644
--- a/app/assets/javascripts/discourse/routes/groups-index.js
+++ b/app/assets/javascripts/discourse/routes/groups-index.js
@@ -14,14 +14,10 @@ export default DiscourseRoute.extend({
   },
 
   model(params) {
-    this._params = params;
-    return this.store.findAll("group", params);
+    return params;
   },
 
-  setupController(controller, model) {
-    controller.setProperties({
-      model,
-      filterInput: this._params.filter
-    });
+  setupController(controller, params) {
+    controller.loadGroups(params);
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index 36d0a644b1..bf610c81ac 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -1,16 +1,21 @@
 {{#d-section pageClass="groups"}}
   <div class="groups-header">
     {{#if currentUser.admin}}
-      {{d-button action=(action "new")
-          class="btn-default groups-header-new pull-right"
-          icon="plus"
-          label="admin.groups.new.title"}}
+      {{d-button
+        action=(action "new")
+        class="btn-default groups-header-new pull-right"
+        icon="plus"
+        label="admin.groups.new.title"
+      }}
     {{/if}}
 
     <div class="groups-header-filters">
-      {{text-field value=filterInput
-          placeholderKey="groups.index.all"
-          class="groups-header-filters-name no-blur"}}
+      {{input
+        value=(readonly filter)
+        placeholderKey="groups.index.all"
+        class="groups-header-filters-name no-blur"
+        input=(action "onFilterChanged" value="target.value")
+      }}
 
       {{combo-box
         value=type
@@ -25,12 +30,12 @@
     </div>
   </div>
 
-  {{#if model}}
-    {{#conditional-loading-spinner condition=model.loading}}
+  {{#if groups}}
+    {{#conditional-loading-spinner condition=isLoading}}
       {{#load-more selector=".groups-boxes .group-box" action=(action "loadMore")}}
         <div class='container'>
           <div class="groups-boxes">
-            {{#each model as |group|}}
+            {{#each groups as |group|}}
               {{#link-to "group.members" group.name class="group-box"}}
                 <div class="group-box-inner">
                   <div class="group-info-wrapper">
@@ -87,7 +92,7 @@
         </div>
       {{/load-more}}
 
-      {{conditional-loading-spinner condition=model.loadingMore}}
+      {{conditional-loading-spinner condition=groups.loadingMore}}
     {{/conditional-loading-spinner}}
   {{else}}
     <p>{{i18n "groups.index.empty"}}</p>

From d21d80198c7e77a420590d00dc773e3de8b23ef5 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 26 Mar 2020 16:32:41 +0100
Subject: [PATCH 290/633] DEV: Update rubocop-discourse (#9270)

Includes:
* DEV: Use `eq_time` matcher
---
 .rubocop.yml                                    | 17 ++++++++---------
 Gemfile.lock                                    |  4 ++--
 lib/autospec/simple_runner.rb                   |  2 +-
 script/plugin-translations.rb                   |  2 +-
 spec/lib/bookmark_manager_spec.rb               | 10 ++++++----
 spec/models/post_spec.rb                        |  2 +-
 spec/rails_helper.rb                            |  4 ++--
 .../user_bookmark_serializer_spec.rb            |  6 +++---
 spec/services/anonymous_shadow_creator_spec.rb  |  2 +-
 9 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 1e682c1045..f9dafa672c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -12,6 +12,14 @@ AllCops:
     - "public/**/*"
     - "plugins/**/gems/**/*"
 
+Discourse:
+  Enabled: true
+
+Discourse/NoChdir:
+  Exclude:
+    - 'spec/**/*' # Specs are run sequentially, so chdir can be used
+    - 'plugins/*/spec/**/*'
+
 # Prefer &&/|| over and/or.
 Style/AndOr:
   Enabled: true
@@ -127,15 +135,6 @@ Style/Semicolon:
 Style/RedundantReturn:
   Enabled: true
 
-DiscourseCops/NoChdir:
-  Enabled: true
-  Exclude:
-    - 'spec/**/*' # Specs are run sequentially, so chdir can be used
-    - 'plugins/*/spec/**/*'
-
-DiscourseCops/NoURIEscapeEncode:
-  Enabled: true
-
 Style/GlobalVars:
   Enabled: true
   Severity: warning
diff --git a/Gemfile.lock b/Gemfile.lock
index 08056d633d..cc1ebd682f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,7 +253,7 @@ GEM
     parallel (1.19.1)
     parallel_tests (2.32.0)
       parallel
-    parser (2.7.0.4)
+    parser (2.7.0.5)
       ast (~> 2.4.0)
     pg (1.2.3)
     progress (3.5.2)
@@ -348,7 +348,7 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-discourse (1.0.2)
+    rubocop-discourse (2.0.1)
       rubocop (>= 0.69.0)
     ruby-prof (1.3.1)
     ruby-progressbar (1.10.1)
diff --git a/lib/autospec/simple_runner.rb b/lib/autospec/simple_runner.rb
index 1f944d906f..a5c295d929 100644
--- a/lib/autospec/simple_runner.rb
+++ b/lib/autospec/simple_runner.rb
@@ -32,7 +32,7 @@ module Autospec
       end
 
       # launch rspec
-      Dir.chdir(Rails.root) do # rubocop:disable DiscourseCops/NoChdir because this is not part of the app
+      Dir.chdir(Rails.root) do # rubocop:disable Discourse/NoChdir because this is not part of the app
         env = { "RAILS_ENV" => "test" }
         if specs.split(' ').any? { |s| s =~ /^(.\/)?plugins/ }
           env["LOAD_PLUGINS"] = "1"
diff --git a/script/plugin-translations.rb b/script/plugin-translations.rb
index 78535b4a54..87bf4e8db8 100644
--- a/script/plugin-translations.rb
+++ b/script/plugin-translations.rb
@@ -42,7 +42,7 @@ class PluginTxUpdater
     PLUGINS.each do |plugin_name|
       plugin_dir = File.join(@base_dir, plugin_name)
       Bundler.with_clean_env do
-        Dir.chdir(plugin_dir) do # rubocop:disable DiscourseCops/NoChdir because this is not part of the app
+        Dir.chdir(plugin_dir) do # rubocop:disable Discourse/NoChdir because this is not part of the app
           puts '', plugin_dir, '-' * 80, ''
 
           begin
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 11a0b7d859..a19380bb83 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe BookmarkManager do
   let(:user) { Fabricate(:user) }
 
   let(:reminder_type) { 'tomorrow' }
-  let(:reminder_at) { (Time.zone.now + 1.day).iso8601 }
+  let(:reminder_at) { 1.day.from_now }
   fab!(:post) { Fabricate(:post) }
   let(:name) { 'Check this out!' }
 
@@ -26,7 +26,7 @@ RSpec.describe BookmarkManager do
         subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
         bookmark = Bookmark.find_by(user: user)
 
-        expect(bookmark.reminder_at).to eq(reminder_at)
+        expect(bookmark.reminder_at).to eq_time(reminder_at)
         expect(bookmark.reminder_set_at).not_to eq(nil)
         expect(bookmark.reminder_type).to eq(Bookmark.reminder_types[:tomorrow])
       end
@@ -76,7 +76,8 @@ RSpec.describe BookmarkManager do
     end
 
     context "when the reminder time is in the past" do
-      let(:reminder_at) { (Time.zone.now - 10.days).iso8601 }
+      let(:reminder_at) { 10.days.ago }
+
       it "adds an error to the manager" do
         subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
         expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.cannot_set_past_reminder"))
@@ -84,7 +85,8 @@ RSpec.describe BookmarkManager do
     end
 
     context "when the reminder time is far-flung (> 10 years from now)" do
-      let(:reminder_at) { (Time.zone.now + 11.years).iso8601 }
+      let(:reminder_at) { 11.years.from_now }
+
       it "adds an error to the manager" do
         subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
         expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.cannot_set_reminder_in_distant_future"))
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 66ba358ad5..4cc716d691 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1172,7 +1172,7 @@ describe Post do
 
       result = post.rebake!
 
-      expect(post.baked_at).not_to eq(first_baked)
+      expect(post.baked_at).not_to eq_time(first_baked)
       expect(post.cooked).to eq(first_cooked)
       expect(result).to eq(true)
     end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 4bc237ab27..dc649a9b91 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -240,7 +240,7 @@ RSpec.configure do |config|
   config.before :each, &TestSetup.method(:test_setup)
 
   config.before(:each, type: :multisite) do
-    Rails.configuration.multisite = true
+    Rails.configuration.multisite = true # rubocop:disable Discourse/NoDirectMultisiteManipulation
 
     RailsMultisite::ConnectionManagement.config_filename =
       "spec/fixtures/multisite/two_dbs.yml"
@@ -248,7 +248,7 @@ RSpec.configure do |config|
 
   config.after(:each, type: :multisite) do
     ActiveRecord::Base.clear_all_connections!
-    Rails.configuration.multisite = false
+    Rails.configuration.multisite = false # rubocop:disable Discourse/NoDirectMultisiteManipulation
     RailsMultisite::ConnectionManagement.clear_settings!
     ActiveRecord::Base.establish_connection
   end
diff --git a/spec/serializers/user_bookmark_serializer_spec.rb b/spec/serializers/user_bookmark_serializer_spec.rb
index 36b05abf7b..e97ebfe467 100644
--- a/spec/serializers/user_bookmark_serializer_spec.rb
+++ b/spec/serializers/user_bookmark_serializer_spec.rb
@@ -12,12 +12,12 @@ RSpec.describe UserBookmarkSerializer do
     s = UserBookmarkSerializer.new(bookmark_list.last)
 
     expect(s.id).to eq(bookmark.id)
-    expect(s.created_at).to eq(bookmark.created_at)
+    expect(s.created_at).to eq_time(bookmark.created_at)
     expect(s.topic_id).to eq(bookmark.topic_id)
     expect(s.linked_post_number).to eq(bookmark.post.post_number)
     expect(s.post_id).to eq(bookmark.post_id)
     expect(s.name).to eq(bookmark.name)
-    expect(s.reminder_at).to eq(bookmark.reminder_at)
+    expect(s.reminder_at).to eq_time(bookmark.reminder_at)
     expect(s.title).to eq(bookmark.topic.title)
     expect(s.deleted).to eq(false)
     expect(s.hidden).to eq(false)
@@ -26,7 +26,7 @@ RSpec.describe UserBookmarkSerializer do
     expect(s.category_id).to eq(bookmark.topic.category_id)
     expect(s.archetype).to eq(bookmark.topic.archetype)
     expect(s.highest_post_number).to eq(1)
-    expect(s.bumped_at.to_s).to eq(bookmark.topic.bumped_at.to_s)
+    expect(s.bumped_at).to eq_time(bookmark.topic.bumped_at)
     expect(s.slug).to eq(bookmark.topic.slug)
     expect(s.username).to eq(bookmark.post.user.username)
   end
diff --git a/spec/services/anonymous_shadow_creator_spec.rb b/spec/services/anonymous_shadow_creator_spec.rb
index c47635f955..cb5fcb4abd 100644
--- a/spec/services/anonymous_shadow_creator_spec.rb
+++ b/spec/services/anonymous_shadow_creator_spec.rb
@@ -56,7 +56,7 @@ describe AnonymousShadowCreator do
       expect(shadow.trust_level).to eq(1)
       expect(shadow.username).to eq("anonymous")
 
-      expect(shadow.created_at).not_to eq(user.created_at)
+      expect(shadow.created_at).not_to eq_time(user.created_at)
 
       p = create_post
 

From c94b63bc756ff8468087d7be7f4b423da1d445e5 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 26 Mar 2020 16:33:38 +0100
Subject: [PATCH 291/633] DEV: Improve import of attachments from Telligent

---
 script/import_scripts/telligent.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/script/import_scripts/telligent.rb b/script/import_scripts/telligent.rb
index 0e166523cd..d9b364fb15 100644
--- a/script/import_scripts/telligent.rb
+++ b/script/import_scripts/telligent.rb
@@ -42,8 +42,13 @@ class ImportScripts::Telligent < ImportScripts::Base
   BATCH_SIZE ||= 1000
   LOCAL_AVATAR_REGEX ||= /\A~\/.*(?<directory>communityserver-components-(?:selectable)?avatars)\/(?<path>[^\/]+)\/(?<filename>.+)/i
   REMOTE_AVATAR_REGEX ||= /\Ahttps?:\/\//i
-  EMBEDDED_ATTACHMENT_REGEX ||= /<a href="\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)".*?>.*?<\/a>/i
-  EMBEDDED_VIEW_ATTACHMENT_REGEX ||= /\[View:~\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)(?:\:[:\d\s]*?)\]/i
+  ATTACHMENT_REGEXES ||= [
+    /<a[^>]*\shref="[^"]*?\/cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)".*?>.*?<\/a>/i,
+    /<img[^>]*\ssrc="[^"]*?\/cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)".*?>/i,
+    /\[View:[^\]]*?\/cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)(?:\:[:\d\s]*?)?\]/i,
+    /\[(?<tag>img|url)\][^\[]*?cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)\[\/\k<tag>\]/i,
+    /\[(?<tag>img|url)=[^\[]*?cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)\][^\[]*?\[\/\k<tag>\]/i
+  ]
   PROPERTY_NAMES_REGEX ||= /(?<name>\w+):S:(?<start>\d+):(?<length>\d+):/
 
   CATEGORY_LINK_NORMALIZATION = '/.*?(f\/\d+)$/\1'
@@ -560,7 +565,7 @@ class ImportScripts::Telligent < ImportScripts::Base
 
     return [raw, paths, upload_ids] if @filestore_root_directory.blank?
 
-    [EMBEDDED_ATTACHMENT_REGEX, EMBEDDED_VIEW_ATTACHMENT_REGEX].each do |regex|
+    ATTACHMENT_REGEXES.each do |regex|
       raw = raw.gsub(regex) do
         match_data = Regexp.last_match
 
@@ -579,6 +584,7 @@ class ImportScripts::Telligent < ImportScripts::Base
         else
           path = File.join(path, match_data[:filename])
           STDERR.puts "Could not find file: #{path}"
+          match_data[0]
         end
       end
     end

From d216483c532f3394d56808fa5362f8ccfede5781 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 26 Mar 2020 16:36:38 +0100
Subject: [PATCH 292/633] FIX: Importing with pgbouncer failed

Checking if all records have been imported uses a temp table in PostgreSQL. This fails when pgbouncer is used unless the temp table is created inside a transaction.
---
 script/import_scripts/base.rb | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 4e7ca2af27..ea43db2730 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -219,24 +219,28 @@ class ImportScripts::Base
   def all_records_exist?(type, import_ids)
     return false if import_ids.empty?
 
-    connection = ActiveRecord::Base.connection.raw_connection
-    connection.exec('CREATE TEMP TABLE import_ids(val text PRIMARY KEY)')
+    ActiveRecord::Base.transaction do
+      begin
+        connection = ActiveRecord::Base.connection.raw_connection
+        connection.exec('CREATE TEMP TABLE import_ids(val text PRIMARY KEY)')
 
-    import_id_clause = import_ids.map { |id| "('#{PG::Connection.escape_string(id.to_s)}')" }.join(",")
+        import_id_clause = import_ids.map { |id| "('#{PG::Connection.escape_string(id.to_s)}')" }.join(",")
 
-    connection.exec("INSERT INTO import_ids VALUES #{import_id_clause}")
+        connection.exec("INSERT INTO import_ids VALUES #{import_id_clause}")
 
-    existing = "#{type.to_s.classify}CustomField".constantize
-    existing = existing.where(name: 'import_id')
-      .joins('JOIN import_ids ON val = value')
-      .count
+        existing = "#{type.to_s.classify}CustomField".constantize
+        existing = existing.where(name: 'import_id')
+          .joins('JOIN import_ids ON val = value')
+          .count
 
-    if existing == import_ids.length
-      puts "Skipping #{import_ids.length} already imported #{type}"
-      true
+        if existing == import_ids.length
+          puts "Skipping #{import_ids.length} already imported #{type}"
+          true
+        end
+      ensure
+        connection.exec('DROP TABLE import_ids') unless connection.nil?
+      end
     end
-  ensure
-    connection.exec('DROP TABLE import_ids') unless connection.nil?
   end
 
   def created_user(user)

From 5bffb033dfcd4ca1bdba8575e550a092a606ca12 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 26 Mar 2020 16:37:42 +0100
Subject: [PATCH 293/633] FIX: The migrate_to_s3 rake task couldn't find the
 AWS SDK

---
 lib/file_store/to_s3_migration.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/file_store/to_s3_migration.rb b/lib/file_store/to_s3_migration.rb
index 456e428657..01c69dc1ee 100644
--- a/lib/file_store/to_s3_migration.rb
+++ b/lib/file_store/to_s3_migration.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'aws-sdk-s3'
+
 module FileStore
   ToS3MigrationError = Class.new(RuntimeError)
 

From 739430c01e5d24d582e5feb87923ae59f0cca589 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 26 Mar 2020 16:40:34 +0100
Subject: [PATCH 294/633] FIX: mbox import failed if no tags were configured

---
 script/import_scripts/mbox/support/settings.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/import_scripts/mbox/support/settings.rb b/script/import_scripts/mbox/support/settings.rb
index 9311dff5e7..e1fd15b869 100644
--- a/script/import_scripts/mbox/support/settings.rb
+++ b/script/import_scripts/mbox/support/settings.rb
@@ -40,8 +40,8 @@ module ImportScripts::Mbox
       @automatically_remove_list_name_prefix = yaml['automatically_remove_list_name_prefix']
       @show_trimmed_content = yaml['show_trimmed_content']
 
+      @tags = []
       if yaml['tags'].present?
-        @tags = []
         yaml['tags'].each do |tag_name, value|
           prefixes = Regexp.union(value).source
           @tags << {

From 60df2ade8db0ff2ad3105fd2965f8ec7a114e992 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 26 Mar 2020 12:22:33 -0400
Subject: [PATCH 295/633] Retry: Rename all test files from JS -> ES6

---
 lib/discourse_js_processor.rb                 | 40 ++++++++++---------
 .../{about-test.js.es6 => about-test.js}      |  0
 ...ed-test.js.es6 => account-created-test.js} |  0
 ...mails-test.js.es6 => admin-emails-test.js} |  0
 ...t.js.es6 => admin-search-log-term-test.js} |  0
 ...-test.js.es6 => admin-search-logs-test.js} |  0
 ...est.js.es6 => admin-site-settings-test.js} |  0
 ...xt-test.js.es6 => admin-site-text-test.js} |  0
 ...test.js.es6 => admin-suspend-user-test.js} |  0
 ...-test.js.es6 => admin-user-badges-test.js} |  0
 ...-test.js.es6 => admin-user-emails-test.js} |  0
 ...x-test.js.es6 => admin-user-index-test.js} |  0
 ...t-test.js.es6 => admin-users-list-test.js} |  0
 ...est.js.es6 => admin-watched-words-test.js} |  0
 ...lete-test.js.es6 => auth-complete-test.js} |  0
 .../{badges-test.js.es6 => badges-test.js}    |  0
 ...r-test.js.es6 => category-chooser-test.js} |  0
 ....js.es6 => category-edit-security-test.js} |  0
 ...edit-test.js.es6 => category-edit-test.js} |  0
 ...g-test.js.es6 => category-hashtag-test.js} |  0
 ...-track-test.js.es6 => click-track-test.js} |  0
 ...s-test.js.es6 => composer-actions-test.js} |  0
 ...est.js.es6 => composer-attachment-test.js} |  0
 ....js.es6 => composer-edit-conflict-test.js} |  0
 ...test.js.es6 => composer-hyperlink-test.js} |  0
 ...ox-test.js.es6 => composer-onebox-test.js} |  0
 ...{composer-test.js.es6 => composer-test.js} |  0
 ...st.js.es6 => composer-topic-links-test.js} |  0
 ....js.es6 => composer-uncategorized-test.js} |  0
 ...es6 => create-account-user-fields-test.js} |  0
 ...et-test.js.es6 => custom-html-set-test.js} |  0
 ...st.js.es6 => custom-html-template-test.js} |  0
 ...ashboard-test.js.es6 => dashboard-test.js} |  0
 ...otice-test.js.es6 => email-notice-test.js} |  0
 ...icker-test.js.es6 => emoji-picker-test.js} |  0
 .../{emoji-test.js.es6 => emoji-test.js}      |  0
 ...t.js.es6 => enforce-second-factor-test.js} |  0
 ...rd-test.js.es6 => forgot-password-test.js} |  0
 ...-test.js.es6 => group-card-mobile-test.js} |  0
 ...up-card-test.js.es6 => group-card-test.js} |  0
 ...-index-test.js.es6 => group-index-test.js} |  0
 ...s.es6 => group-manage-interaction-test.js} |  0
 ...-test.js.es6 => group-manage-logs-test.js} |  0
 ...js.es6 => group-manage-membership-test.js} |  0
 ...st.js.es6 => group-manage-profile-test.js} |  0
 ...sts-test.js.es6 => group-requests-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 ...index-test.js.es6 => groups-index-test.js} |  0
 ...ups-new-test.js.es6 => groups-new-test.js} |  0
 ...cept-test.js.es6 => invite-accept-test.js} |  0
 ...js.es6 => invite-show-user-fields-test.js} |  0
 .../{jump-to-test.js.es6 => jump-to-test.js}  |  0
 ...test.js.es6 => keyboard-shortcuts-test.js} |  0
 ...ect-test.js.es6 => login-redirect-test.js} |  0
 ...red-test.js.es6 => login-required-test.js} |  0
 ...mail-and-hide-email-address-taken-test.js} |  0
 ...n-with-email-and-no-social-logins-test.js} |  0
 ....es6 => login-with-email-disabled-test.js} |  0
 ...l-test.js.es6 => login-with-email-test.js} |  0
 ...y-test.js.es6 => mobile-discovery-test.js} |  0
 ...-in-test.js.es6 => mobile-sign-in-test.js} |  0
 ...users-test.js.es6 => mobile-users-test.js} |  0
 .../{modal-test.js.es6 => modal-test.js}      |  0
 ...essage-test.js.es6 => new-message-test.js} |  0
 ...ew-topic-test.js.es6 => new-topic-test.js} |  0
 ...set-test.js.es6 => password-reset-test.js} |  0
 ...e-test.js.es6 => personal-message-test.js} |  0
 ... => plugin-outlet-connector-class-test.js} |  0
 ...js.es6 => plugin-outlet-decorator-test.js} |  0
 ...6 => plugin-outlet-multi-template-test.js} |  0
 ... => plugin-outlet-single-template-test.js} |  0
 ...rences-test.js.es6 => preferences-test.js} |  0
 ...-test.js.es6 => raw-plugin-outlet-test.js} |  0
 ...op-test.js.es6 => redirect-to-top-test.js} |  0
 .../{reports-test.js.es6 => reports-test.js}  |  0
 .../{review-test.js.es6 => review-test.js}    |  0
 ...h-full-test.js.es6 => search-full-test.js} |  0
 ...bile-test.js.es6 => search-mobile-test.js} |  0
 .../{search-test.js.es6 => search-test.js}    |  0
 ...s.es6 => share-and-invite-desktop-test.js} |  0
 ...js.es6 => share-and-invite-mobile-test.js} |  0
 ...afts-test.js.es6 => shared-drafts-test.js} |  0
 .../{sign-in-test.js.es6 => sign-in-test.js}  |  0
 .../{static-test.js.es6 => static-test.js}    |  0
 ...-groups-test.js.es6 => tag-groups-test.js} |  0
 ...ashtag-test.js.es6 => tag-hashtag-test.js} |  0
 ...-test.js.es6 => tags-intersection-test.js} |  0
 .../{tags-test.js.es6 => tags-test.js}        |  0
 ...us-test.js.es6 => topic-anonymous-test.js} |  0
 ...ry-test.js.es6 => topic-discovery-test.js} |  0
 ...r-test.js.es6 => topic-edit-timer-test.js} |  0
 ...s6 => topic-footer-buttons-mobile-test.js} |  0
 ...s-test.js.es6 => topic-move-posts-test.js} |  0
 ...es6 => topic-notifications-button-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 .../{unknown-test.js.es6 => unknown-test.js}  |  0
 ...ous-test.js.es6 => user-anonymous-test.js} |  0
 ...e-test.js.es6 => user-card-mobile-test.js} |  0
 ...ser-card-test.js.es6 => user-card-test.js} |  0
 ...test.js.es6 => user-drafts-stream-test.js} |  0
 .../{user-test.js.es6 => user-test.js}        |  0
 .../{users-test.js.es6 => users-test.js}      |  0
 ...test.js.es6 => group-list-setting-test.js} |  0
 ...m-test.js.es6 => themes-list-item-test.js} |  0
 ...s-list-test.js.es6 => themes-list-test.js} |  0
 ...s6 => admin-customize-themes-show-test.js} |  0
 ....js.es6 => admin-customize-themes-test.js} |  0
 ...-test.js.es6 => admin-user-badges-test.js} |  0
 .../{theme-test.js.es6 => theme-test.js}      |  0
 ...-editor-test.js.es6 => ace-editor-test.js} |  0
 ...eport-test.js.es6 => admin-report-test.js} |  0
 ...-title-test.js.es6 => badge-title-test.js} |  0
 ...{d-button-test.js.es6 => d-button-test.js} |  0
 ...{d-editor-test.js.es6 => d-editor-test.js} |  0
 .../{d-icon-test.js.es6 => d-icon-test.js}    |  0
 ...e-input-test.js.es6 => date-input-test.js} |  0
 ...t.js.es6 => date-time-input-range-test.js} |  0
 ...ut-test.js.es6 => date-time-input-test.js} |  0
 ...js.es6 => group-membership-button-test.js} |  0
 ...r-test.js.es6 => html-safe-helper-test.js} |  0
 ...-html-test.js.es6 => iframed-html-test.js} |  0
 ...der-test.js.es6 => image-uploader-test.js} |  0
 ...test.js.es6 => keyboard-shortcuts-test.js} |  0
 ...oad-more-test.js.es6 => load-more-test.js} |  0
 ...-test.js.es6 => secret-value-list-test.js} |  0
 ...r-test.js.es6 => category-chooser-test.js} |  0
 ...drop-test.js.es6 => category-drop-test.js} |  0
 ...ombo-box-test.js.es6 => combo-box-test.js} |  0
 ...est.js.es6 => dropdown-select-box-test.js} |  0
 ...tting-test.js.es6 => list-setting-test.js} |  0
 ...r-test.js.es6 => mini-tag-chooser-test.js} |  0
 ...elect-test.js.es6 => multi-select-test.js} |  0
 ...st.js.es6 => notifications-button-test.js} |  0
 ...ons-test.js.es6 => pinned-options-test.js} |  0
 ...elper.js.es6 => select-kit-test-helper.js} |  0
 ...lect-test.js.es6 => single-select-test.js} |  0
 ...{tag-drop-test.js.es6 => tag-drop-test.js} |  0
 ...es6 => topic-notifications-button-test.js} |  0
 ...s6 => topic-notifications-options-test.js} |  0
 ...ooser-test.js.es6 => user-chooser-test.js} |  0
 ...utton-test.js.es6 => share-button-test.js} |  0
 .../{share-button.js.es6 => share-button.js}  |  0
 ...t-field-test.js.es6 => text-field-test.js} |  0
 ...flow-test.js.es6 => text-overflow-test.js} |  0
 ...e-input-test.js.es6 => time-input-test.js} |  0
 ...ctor-test.js.es6 => user-selector-test.js} |  0
 ...ue-list-test.js.es6 => value-list-test.js} |  0
 ...or-test.js.es6 => avatar-selector-test.js} |  0
 ...{bookmark-test.js.es6 => bookmark-test.js} |  0
 ...unt-test.js.es6 => create-account-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 .../{history-test.js.es6 => history-test.js}  |  0
 ...est.js.es6 => preferences-account-test.js} |  0
 ....es6 => preferences-second-factor-test.js} |  0
 ...test.js.es6 => reorder-categories-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 ...{resolver-test.js.es6 => resolver-test.js} |  0
 .../fixtures/{about.js.es6 => about.js}       |  0
 ...adges_fixture.js.es6 => badges_fixture.js} |  0
 ...y-fixtures.js.es6 => category-fixtures.js} |  0
 ...s.js.es6.erb => notification-types.js.erb} |  0
 ...rd-general.js.es6 => dashboard-general.js} |  0
 .../{dashboard.js.es6 => dashboard.js}        |  0
 ...-fixtures.js.es6 => directory-fixtures.js} |  0
 ..._fixtures.js.es6 => discovery_fixtures.js} |  0
 .../fixtures/{draft.js.es6 => draft.js}       |  0
 .../fixtures/{drafts.js.es6 => drafts.js}     |  0
 ...roup-fixtures.js.es6 => group-fixtures.js} |  0
 ...ups-fixtures.js.es6 => groups-fixtures.js} |  0
 ...xtures.js.es6 => notification_fixtures.js} |  0
 .../fixtures/{poll.js.es6 => poll.js}         |  0
 .../fixtures/{post.js.es6 => post.js}         |  0
 ...es.js.es6 => private_messages_fixtures.js} |  0
 .../fixtures/{problems.js.es6 => problems.js} |  0
 .../fixtures/{reports.js.es6 => reports.js}   |  0
 .../{reports_bulk.js.es6 => reports_bulk.js}  |  0
 ...rch-fixtures.js.es6 => search-fixtures.js} |  0
 ...on-fixtures.js.es6 => session-fixtures.js} |  0
 ...{site-fixtures.js.es6 => site-fixtures.js} |  0
 ...{site_settings.js.es6 => site_settings.js} |  0
 ...tic_fixtures.js.es6 => static_fixtures.js} |  0
 .../{top_fixture.js.es6 => top_fixture.js}    |  0
 .../fixtures/{topic.js.es6 => topic.js}       |  0
 .../{user-badges.js.es6 => user-badges.js}    |  0
 ...{user_fixtures.js.es6 => user_fixtures.js} |  0
 ...tures.js.es6 => watched-words-fixtures.js} |  0
 test/javascripts/helpers/assertions.js        | 13 +++---
 ...omponent-test.js.es6 => component-test.js} |  0
 ...e-pretender.js.es6 => create-pretender.js} |  0
 .../{create-store.js.es6 => create-store.js}  |  0
 ...ditor-helper.js.es6 => d-editor-helper.js} |  0
 ...-pretender.js.es6 => fixture-pretender.js} |  0
 .../{html-helper.js.es6 => html-helper.js}    |  0
 test/javascripts/helpers/init-ember-qunit.js  |  2 -
 ...{qunit-helpers.js.es6 => qunit-helpers.js} |  0
 ...w-pretender.js.es6 => review-pretender.js} |  0
 ...kit-helper.js.es6 => select-kit-helper.js} |  0
 test/javascripts/helpers/site-settings.js     | 10 +++--
 .../helpers/{site.js.es6 => site.js}          |  0
 ...re-pretender.js.es6 => store-pretender.js} |  0
 ...er.js.es6 => textarea-selection-helper.js} |  0
 .../{widget-test.js.es6 => widget-test.js}    |  0
 ...ation-test.js.es6 => localization-test.js} |  0
 .../{bbcode-test.js.es6 => bbcode-test.js}    |  0
 ...tring-test.js.es6 => break-string-test.js} |  0
 ...dge-test.js.es6 => category-badge-test.js} |  0
 ...s.es6 => click-track-edit-history-test.js} |  0
 ...s.es6 => click-track-profile-page-test.js} |  0
 ...-track-test.js.es6 => click-track-test.js} |  0
 ...{computed-test.js.es6 => computed-test.js} |  0
 ...iscourse-test.js.es6 => discourse-test.js} |  0
 ...-store-test.js.es6 => emoji-store-test.js} |  0
 .../lib/{emoji-test.js.es6 => emoji-test.js}  |  0
 ...ormatter-test.js.es6 => formatter-test.js} |  0
 ...ext-test.js.es6 => highlight-text-test.js} |  0
 .../lib/{i18n-test.js.es6 => i18n-test.js}    |  0
 ...brary-test.js.es6 => icon-library-test.js} |  0
 ...re-test.js.es6 => key-value-store-test.js} |  0
 ...ions-test.js.es6 => link-mentions-test.js} |  0
 ...script-test.js.es6 => load-script-test.js} |  0
 ...{oneboxer-test.js.es6 => oneboxer-test.js} |  0
 ...tore-test.js.es6 => preload-store-test.js} |  0
 ...y-text-test.js.es6 => pretty-text-test.js} |  0
 ...anitizer-test.js.es6 => sanitizer-test.js} |  0
 ...track-test.js.es6 => screen-track-test.js} |  0
 .../{search-test.js.es6 => search-test.js}    |  0
 .../{sharing-test.js.es6 => sharing-test.js}  |  0
 ...ion-test.js.es6 => text-direction-test.js} |  0
 ...rkdown-test.js.es6 => to-markdown-test.js} |  0
 .../{tooltip-test.js.es6 => tooltip-test.js}  |  0
 ...l-test.js.es6 => upload-short-url-test.js} |  0
 .../{uploads-test.js.es6 => uploads-test.js}  |  0
 .../lib/{url-test.js.es6 => url-test.js}      |  0
 ...search-test.js.es6 => user-search-test.js} |  0
 ...tilities-test.js.es6 => utilities-test.js} |  0
 ...ister-test.js.es6 => white-lister-test.js} |  0
 ....js.es6 => grant-badge-controller-test.js} |  0
 ...ect-test.js.es6 => setting-object-test.js} |  0
 ...ingleton-test.js.es6 => singleton-test.js} |  0
 .../{badge-test.js.es6 => badge-test.js}      |  0
 ...{category-test.js.es6 => category-test.js} |  0
 ...{composer-test.js.es6 => composer-test.js} |  0
 ...mail-log-test.js.es6 => email-log-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 .../{invite-test.js.es6 => invite-test.js}    |  0
 ...{nav-item-test.js.es6 => nav-item-test.js} |  0
 ...stream-test.js.es6 => post-stream-test.js} |  0
 .../models/{post-test.js.es6 => post-test.js} |  0
 .../{report-test.js.es6 => report-test.js}    |  0
 ...t-model-test.js.es6 => rest-model-test.js} |  0
 ...ult-set-test.js.es6 => result-set-test.js} |  0
 .../{session-test.js.es6 => session-test.js}  |  0
 .../models/{site-test.js.es6 => site-test.js} |  0
 ...g-test.js.es6 => staff-action-log-test.js} |  0
 .../{store-test.js.es6 => store-test.js}      |  0
 ...ails-test.js.es6 => topic-details-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 ...st.js.es6 => topic-tracking-state-test.js} |  0
 ...action-test.js.es6 => user-action-test.js} |  0
 ...r-badge-test.js.es6 => user-badge-test.js} |  0
 ...drafts-test.js.es6 => user-drafts-test.js} |  0
 ...stream-test.js.es6 => user-stream-test.js} |  0
 .../models/{user-test.js.es6 => user-test.js} |  0
 ...orators-test.js.es6 => decorators-test.js} |  0
 ...ry-test.js.es6 => actions-summary-test.js} |  0
 ...flair-test.js.es6 => avatar-flair-test.js} |  0
 .../{button-test.js.es6 => button-test.js}    |  0
 ....es6 => default-notification-item-test.js} |  0
 ...enu-test.js.es6 => hamburger-menu-test.js} |  0
 .../{header-test.js.es6 => header-test.js}    |  0
 ...ome-logo-test.js.es6 => home-logo-test.js} |  0
 ...t-links-test.js.es6 => post-links-test.js} |  0
 ...stream-test.js.es6 => post-stream-test.js} |  0
 .../{post-test.js.es6 => post-test.js}        |  0
 ...r-name-test.js.es6 => poster-name-test.js} |  0
 ...-test.js.es6 => quick-access-item-test.js} |  0
 ...u-test.js.es6 => topic-admin-menu-test.js} |  0
 ...-test.js.es6 => topic-participant-test.js} |  0
 ...tatus-test.js.es6 => topic-status-test.js} |  0
 ...ser-menu-test.js.es6 => user-menu-test.js} |  0
 .../{widget-test.js.es6 => widget-test.js}    |  0
 281 files changed, 36 insertions(+), 29 deletions(-)
 rename test/javascripts/acceptance/{about-test.js.es6 => about-test.js} (100%)
 rename test/javascripts/acceptance/{account-created-test.js.es6 => account-created-test.js} (100%)
 rename test/javascripts/acceptance/{admin-emails-test.js.es6 => admin-emails-test.js} (100%)
 rename test/javascripts/acceptance/{admin-search-log-term-test.js.es6 => admin-search-log-term-test.js} (100%)
 rename test/javascripts/acceptance/{admin-search-logs-test.js.es6 => admin-search-logs-test.js} (100%)
 rename test/javascripts/acceptance/{admin-site-settings-test.js.es6 => admin-site-settings-test.js} (100%)
 rename test/javascripts/acceptance/{admin-site-text-test.js.es6 => admin-site-text-test.js} (100%)
 rename test/javascripts/acceptance/{admin-suspend-user-test.js.es6 => admin-suspend-user-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-badges-test.js.es6 => admin-user-badges-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-emails-test.js.es6 => admin-user-emails-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-index-test.js.es6 => admin-user-index-test.js} (100%)
 rename test/javascripts/acceptance/{admin-users-list-test.js.es6 => admin-users-list-test.js} (100%)
 rename test/javascripts/acceptance/{admin-watched-words-test.js.es6 => admin-watched-words-test.js} (100%)
 rename test/javascripts/acceptance/{auth-complete-test.js.es6 => auth-complete-test.js} (100%)
 rename test/javascripts/acceptance/{badges-test.js.es6 => badges-test.js} (100%)
 rename test/javascripts/acceptance/{category-chooser-test.js.es6 => category-chooser-test.js} (100%)
 rename test/javascripts/acceptance/{category-edit-security-test.js.es6 => category-edit-security-test.js} (100%)
 rename test/javascripts/acceptance/{category-edit-test.js.es6 => category-edit-test.js} (100%)
 rename test/javascripts/acceptance/{category-hashtag-test.js.es6 => category-hashtag-test.js} (100%)
 rename test/javascripts/acceptance/{click-track-test.js.es6 => click-track-test.js} (100%)
 rename test/javascripts/acceptance/{composer-actions-test.js.es6 => composer-actions-test.js} (100%)
 rename test/javascripts/acceptance/{composer-attachment-test.js.es6 => composer-attachment-test.js} (100%)
 rename test/javascripts/acceptance/{composer-edit-conflict-test.js.es6 => composer-edit-conflict-test.js} (100%)
 rename test/javascripts/acceptance/{composer-hyperlink-test.js.es6 => composer-hyperlink-test.js} (100%)
 rename test/javascripts/acceptance/{composer-onebox-test.js.es6 => composer-onebox-test.js} (100%)
 rename test/javascripts/acceptance/{composer-test.js.es6 => composer-test.js} (100%)
 rename test/javascripts/acceptance/{composer-topic-links-test.js.es6 => composer-topic-links-test.js} (100%)
 rename test/javascripts/acceptance/{composer-uncategorized-test.js.es6 => composer-uncategorized-test.js} (100%)
 rename test/javascripts/acceptance/{create-account-user-fields-test.js.es6 => create-account-user-fields-test.js} (100%)
 rename test/javascripts/acceptance/{custom-html-set-test.js.es6 => custom-html-set-test.js} (100%)
 rename test/javascripts/acceptance/{custom-html-template-test.js.es6 => custom-html-template-test.js} (100%)
 rename test/javascripts/acceptance/{dashboard-test.js.es6 => dashboard-test.js} (100%)
 rename test/javascripts/acceptance/{email-notice-test.js.es6 => email-notice-test.js} (100%)
 rename test/javascripts/acceptance/{emoji-picker-test.js.es6 => emoji-picker-test.js} (100%)
 rename test/javascripts/acceptance/{emoji-test.js.es6 => emoji-test.js} (100%)
 rename test/javascripts/acceptance/{enforce-second-factor-test.js.es6 => enforce-second-factor-test.js} (100%)
 rename test/javascripts/acceptance/{forgot-password-test.js.es6 => forgot-password-test.js} (100%)
 rename test/javascripts/acceptance/{group-card-mobile-test.js.es6 => group-card-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{group-card-test.js.es6 => group-card-test.js} (100%)
 rename test/javascripts/acceptance/{group-index-test.js.es6 => group-index-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-interaction-test.js.es6 => group-manage-interaction-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-logs-test.js.es6 => group-manage-logs-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-membership-test.js.es6 => group-manage-membership-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-profile-test.js.es6 => group-manage-profile-test.js} (100%)
 rename test/javascripts/acceptance/{group-requests-test.js.es6 => group-requests-test.js} (100%)
 rename test/javascripts/acceptance/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/acceptance/{groups-index-test.js.es6 => groups-index-test.js} (100%)
 rename test/javascripts/acceptance/{groups-new-test.js.es6 => groups-new-test.js} (100%)
 rename test/javascripts/acceptance/{invite-accept-test.js.es6 => invite-accept-test.js} (100%)
 rename test/javascripts/acceptance/{invite-show-user-fields-test.js.es6 => invite-show-user-fields-test.js} (100%)
 rename test/javascripts/acceptance/{jump-to-test.js.es6 => jump-to-test.js} (100%)
 rename test/javascripts/acceptance/{keyboard-shortcuts-test.js.es6 => keyboard-shortcuts-test.js} (100%)
 rename test/javascripts/acceptance/{login-redirect-test.js.es6 => login-redirect-test.js} (100%)
 rename test/javascripts/acceptance/{login-required-test.js.es6 => login-required-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-hide-email-address-taken-test.js.es6 => login-with-email-and-hide-email-address-taken-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-no-social-logins-test.js.es6 => login-with-email-and-no-social-logins-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-disabled-test.js.es6 => login-with-email-disabled-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-test.js.es6 => login-with-email-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-discovery-test.js.es6 => mobile-discovery-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-sign-in-test.js.es6 => mobile-sign-in-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-users-test.js.es6 => mobile-users-test.js} (100%)
 rename test/javascripts/acceptance/{modal-test.js.es6 => modal-test.js} (100%)
 rename test/javascripts/acceptance/{new-message-test.js.es6 => new-message-test.js} (100%)
 rename test/javascripts/acceptance/{new-topic-test.js.es6 => new-topic-test.js} (100%)
 rename test/javascripts/acceptance/{password-reset-test.js.es6 => password-reset-test.js} (100%)
 rename test/javascripts/acceptance/{personal-message-test.js.es6 => personal-message-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-connector-class-test.js.es6 => plugin-outlet-connector-class-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-decorator-test.js.es6 => plugin-outlet-decorator-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-multi-template-test.js.es6 => plugin-outlet-multi-template-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-single-template-test.js.es6 => plugin-outlet-single-template-test.js} (100%)
 rename test/javascripts/acceptance/{preferences-test.js.es6 => preferences-test.js} (100%)
 rename test/javascripts/acceptance/{raw-plugin-outlet-test.js.es6 => raw-plugin-outlet-test.js} (100%)
 rename test/javascripts/acceptance/{redirect-to-top-test.js.es6 => redirect-to-top-test.js} (100%)
 rename test/javascripts/acceptance/{reports-test.js.es6 => reports-test.js} (100%)
 rename test/javascripts/acceptance/{review-test.js.es6 => review-test.js} (100%)
 rename test/javascripts/acceptance/{search-full-test.js.es6 => search-full-test.js} (100%)
 rename test/javascripts/acceptance/{search-mobile-test.js.es6 => search-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{search-test.js.es6 => search-test.js} (100%)
 rename test/javascripts/acceptance/{share-and-invite-desktop-test.js.es6 => share-and-invite-desktop-test.js} (100%)
 rename test/javascripts/acceptance/{share-and-invite-mobile-test.js.es6 => share-and-invite-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{shared-drafts-test.js.es6 => shared-drafts-test.js} (100%)
 rename test/javascripts/acceptance/{sign-in-test.js.es6 => sign-in-test.js} (100%)
 rename test/javascripts/acceptance/{static-test.js.es6 => static-test.js} (100%)
 rename test/javascripts/acceptance/{tag-groups-test.js.es6 => tag-groups-test.js} (100%)
 rename test/javascripts/acceptance/{tag-hashtag-test.js.es6 => tag-hashtag-test.js} (100%)
 rename test/javascripts/acceptance/{tags-intersection-test.js.es6 => tags-intersection-test.js} (100%)
 rename test/javascripts/acceptance/{tags-test.js.es6 => tags-test.js} (100%)
 rename test/javascripts/acceptance/{topic-anonymous-test.js.es6 => topic-anonymous-test.js} (100%)
 rename test/javascripts/acceptance/{topic-discovery-test.js.es6 => topic-discovery-test.js} (100%)
 rename test/javascripts/acceptance/{topic-edit-timer-test.js.es6 => topic-edit-timer-test.js} (100%)
 rename test/javascripts/acceptance/{topic-footer-buttons-mobile-test.js.es6 => topic-footer-buttons-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{topic-move-posts-test.js.es6 => topic-move-posts-test.js} (100%)
 rename test/javascripts/acceptance/{topic-notifications-button-test.js.es6 => topic-notifications-button-test.js} (100%)
 rename test/javascripts/acceptance/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/acceptance/{unknown-test.js.es6 => unknown-test.js} (100%)
 rename test/javascripts/acceptance/{user-anonymous-test.js.es6 => user-anonymous-test.js} (100%)
 rename test/javascripts/acceptance/{user-card-mobile-test.js.es6 => user-card-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{user-card-test.js.es6 => user-card-test.js} (100%)
 rename test/javascripts/acceptance/{user-drafts-stream-test.js.es6 => user-drafts-stream-test.js} (100%)
 rename test/javascripts/acceptance/{user-test.js.es6 => user-test.js} (100%)
 rename test/javascripts/acceptance/{users-test.js.es6 => users-test.js} (100%)
 rename test/javascripts/admin/components/{group-list-setting-test.js.es6 => group-list-setting-test.js} (100%)
 rename test/javascripts/admin/components/{themes-list-item-test.js.es6 => themes-list-item-test.js} (100%)
 rename test/javascripts/admin/components/{themes-list-test.js.es6 => themes-list-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-show-test.js.es6 => admin-customize-themes-show-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-test.js.es6 => admin-customize-themes-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-user-badges-test.js.es6 => admin-user-badges-test.js} (100%)
 rename test/javascripts/admin/models/{theme-test.js.es6 => theme-test.js} (100%)
 rename test/javascripts/components/{ace-editor-test.js.es6 => ace-editor-test.js} (100%)
 rename test/javascripts/components/{admin-report-test.js.es6 => admin-report-test.js} (100%)
 rename test/javascripts/components/{badge-title-test.js.es6 => badge-title-test.js} (100%)
 rename test/javascripts/components/{d-button-test.js.es6 => d-button-test.js} (100%)
 rename test/javascripts/components/{d-editor-test.js.es6 => d-editor-test.js} (100%)
 rename test/javascripts/components/{d-icon-test.js.es6 => d-icon-test.js} (100%)
 rename test/javascripts/components/{date-input-test.js.es6 => date-input-test.js} (100%)
 rename test/javascripts/components/{date-time-input-range-test.js.es6 => date-time-input-range-test.js} (100%)
 rename test/javascripts/components/{date-time-input-test.js.es6 => date-time-input-test.js} (100%)
 rename test/javascripts/components/{group-membership-button-test.js.es6 => group-membership-button-test.js} (100%)
 rename test/javascripts/components/{html-safe-helper-test.js.es6 => html-safe-helper-test.js} (100%)
 rename test/javascripts/components/{iframed-html-test.js.es6 => iframed-html-test.js} (100%)
 rename test/javascripts/components/{image-uploader-test.js.es6 => image-uploader-test.js} (100%)
 rename test/javascripts/components/{keyboard-shortcuts-test.js.es6 => keyboard-shortcuts-test.js} (100%)
 rename test/javascripts/components/{load-more-test.js.es6 => load-more-test.js} (100%)
 rename test/javascripts/components/{secret-value-list-test.js.es6 => secret-value-list-test.js} (100%)
 rename test/javascripts/components/select-kit/{category-chooser-test.js.es6 => category-chooser-test.js} (100%)
 rename test/javascripts/components/select-kit/{category-drop-test.js.es6 => category-drop-test.js} (100%)
 rename test/javascripts/components/select-kit/{combo-box-test.js.es6 => combo-box-test.js} (100%)
 rename test/javascripts/components/select-kit/{dropdown-select-box-test.js.es6 => dropdown-select-box-test.js} (100%)
 rename test/javascripts/components/select-kit/{list-setting-test.js.es6 => list-setting-test.js} (100%)
 rename test/javascripts/components/select-kit/{mini-tag-chooser-test.js.es6 => mini-tag-chooser-test.js} (100%)
 rename test/javascripts/components/select-kit/{multi-select-test.js.es6 => multi-select-test.js} (100%)
 rename test/javascripts/components/select-kit/{notifications-button-test.js.es6 => notifications-button-test.js} (100%)
 rename test/javascripts/components/select-kit/{pinned-options-test.js.es6 => pinned-options-test.js} (100%)
 rename test/javascripts/components/select-kit/{select-kit-test-helper.js.es6 => select-kit-test-helper.js} (100%)
 rename test/javascripts/components/select-kit/{single-select-test.js.es6 => single-select-test.js} (100%)
 rename test/javascripts/components/select-kit/{tag-drop-test.js.es6 => tag-drop-test.js} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-button-test.js.es6 => topic-notifications-button-test.js} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-options-test.js.es6 => topic-notifications-options-test.js} (100%)
 rename test/javascripts/components/select-kit/{user-chooser-test.js.es6 => user-chooser-test.js} (100%)
 rename test/javascripts/components/{share-button-test.js.es6 => share-button-test.js} (100%)
 rename test/javascripts/components/{share-button.js.es6 => share-button.js} (100%)
 rename test/javascripts/components/{text-field-test.js.es6 => text-field-test.js} (100%)
 rename test/javascripts/components/{text-overflow-test.js.es6 => text-overflow-test.js} (100%)
 rename test/javascripts/components/{time-input-test.js.es6 => time-input-test.js} (100%)
 rename test/javascripts/components/{user-selector-test.js.es6 => user-selector-test.js} (100%)
 rename test/javascripts/components/{value-list-test.js.es6 => value-list-test.js} (100%)
 rename test/javascripts/controllers/{avatar-selector-test.js.es6 => avatar-selector-test.js} (100%)
 rename test/javascripts/controllers/{bookmark-test.js.es6 => bookmark-test.js} (100%)
 rename test/javascripts/controllers/{create-account-test.js.es6 => create-account-test.js} (100%)
 rename test/javascripts/controllers/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/controllers/{history-test.js.es6 => history-test.js} (100%)
 rename test/javascripts/controllers/{preferences-account-test.js.es6 => preferences-account-test.js} (100%)
 rename test/javascripts/controllers/{preferences-second-factor-test.js.es6 => preferences-second-factor-test.js} (100%)
 rename test/javascripts/controllers/{reorder-categories-test.js.es6 => reorder-categories-test.js} (100%)
 rename test/javascripts/controllers/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/ember/{resolver-test.js.es6 => resolver-test.js} (100%)
 rename test/javascripts/fixtures/{about.js.es6 => about.js} (100%)
 rename test/javascripts/fixtures/{badges_fixture.js.es6 => badges_fixture.js} (100%)
 rename test/javascripts/fixtures/{category-fixtures.js.es6 => category-fixtures.js} (100%)
 rename test/javascripts/fixtures/concerns/{notification-types.js.es6.erb => notification-types.js.erb} (100%)
 rename test/javascripts/fixtures/{dashboard-general.js.es6 => dashboard-general.js} (100%)
 rename test/javascripts/fixtures/{dashboard.js.es6 => dashboard.js} (100%)
 rename test/javascripts/fixtures/{directory-fixtures.js.es6 => directory-fixtures.js} (100%)
 rename test/javascripts/fixtures/{discovery_fixtures.js.es6 => discovery_fixtures.js} (100%)
 rename test/javascripts/fixtures/{draft.js.es6 => draft.js} (100%)
 rename test/javascripts/fixtures/{drafts.js.es6 => drafts.js} (100%)
 rename test/javascripts/fixtures/{group-fixtures.js.es6 => group-fixtures.js} (100%)
 rename test/javascripts/fixtures/{groups-fixtures.js.es6 => groups-fixtures.js} (100%)
 rename test/javascripts/fixtures/{notification_fixtures.js.es6 => notification_fixtures.js} (100%)
 rename test/javascripts/fixtures/{poll.js.es6 => poll.js} (100%)
 rename test/javascripts/fixtures/{post.js.es6 => post.js} (100%)
 rename test/javascripts/fixtures/{private_messages_fixtures.js.es6 => private_messages_fixtures.js} (100%)
 rename test/javascripts/fixtures/{problems.js.es6 => problems.js} (100%)
 rename test/javascripts/fixtures/{reports.js.es6 => reports.js} (100%)
 rename test/javascripts/fixtures/{reports_bulk.js.es6 => reports_bulk.js} (100%)
 rename test/javascripts/fixtures/{search-fixtures.js.es6 => search-fixtures.js} (100%)
 rename test/javascripts/fixtures/{session-fixtures.js.es6 => session-fixtures.js} (100%)
 rename test/javascripts/fixtures/{site-fixtures.js.es6 => site-fixtures.js} (100%)
 rename test/javascripts/fixtures/{site_settings.js.es6 => site_settings.js} (100%)
 rename test/javascripts/fixtures/{static_fixtures.js.es6 => static_fixtures.js} (100%)
 rename test/javascripts/fixtures/{top_fixture.js.es6 => top_fixture.js} (100%)
 rename test/javascripts/fixtures/{topic.js.es6 => topic.js} (100%)
 rename test/javascripts/fixtures/{user-badges.js.es6 => user-badges.js} (100%)
 rename test/javascripts/fixtures/{user_fixtures.js.es6 => user_fixtures.js} (100%)
 rename test/javascripts/fixtures/{watched-words-fixtures.js.es6 => watched-words-fixtures.js} (100%)
 rename test/javascripts/helpers/{component-test.js.es6 => component-test.js} (100%)
 rename test/javascripts/helpers/{create-pretender.js.es6 => create-pretender.js} (100%)
 rename test/javascripts/helpers/{create-store.js.es6 => create-store.js} (100%)
 rename test/javascripts/helpers/{d-editor-helper.js.es6 => d-editor-helper.js} (100%)
 rename test/javascripts/helpers/{fixture-pretender.js.es6 => fixture-pretender.js} (100%)
 rename test/javascripts/helpers/{html-helper.js.es6 => html-helper.js} (100%)
 delete mode 100644 test/javascripts/helpers/init-ember-qunit.js
 rename test/javascripts/helpers/{qunit-helpers.js.es6 => qunit-helpers.js} (100%)
 rename test/javascripts/helpers/{review-pretender.js.es6 => review-pretender.js} (100%)
 rename test/javascripts/helpers/{select-kit-helper.js.es6 => select-kit-helper.js} (100%)
 rename test/javascripts/helpers/{site.js.es6 => site.js} (100%)
 rename test/javascripts/helpers/{store-pretender.js.es6 => store-pretender.js} (100%)
 rename test/javascripts/helpers/{textarea-selection-helper.js.es6 => textarea-selection-helper.js} (100%)
 rename test/javascripts/helpers/{widget-test.js.es6 => widget-test.js} (100%)
 rename test/javascripts/initializers/{localization-test.js.es6 => localization-test.js} (100%)
 rename test/javascripts/lib/{bbcode-test.js.es6 => bbcode-test.js} (100%)
 rename test/javascripts/lib/{break-string-test.js.es6 => break-string-test.js} (100%)
 rename test/javascripts/lib/{category-badge-test.js.es6 => category-badge-test.js} (100%)
 rename test/javascripts/lib/{click-track-edit-history-test.js.es6 => click-track-edit-history-test.js} (100%)
 rename test/javascripts/lib/{click-track-profile-page-test.js.es6 => click-track-profile-page-test.js} (100%)
 rename test/javascripts/lib/{click-track-test.js.es6 => click-track-test.js} (100%)
 rename test/javascripts/lib/{computed-test.js.es6 => computed-test.js} (100%)
 rename test/javascripts/lib/{discourse-test.js.es6 => discourse-test.js} (100%)
 rename test/javascripts/lib/{emoji-store-test.js.es6 => emoji-store-test.js} (100%)
 rename test/javascripts/lib/{emoji-test.js.es6 => emoji-test.js} (100%)
 rename test/javascripts/lib/{formatter-test.js.es6 => formatter-test.js} (100%)
 rename test/javascripts/lib/{highlight-text-test.js.es6 => highlight-text-test.js} (100%)
 rename test/javascripts/lib/{i18n-test.js.es6 => i18n-test.js} (100%)
 rename test/javascripts/lib/{icon-library-test.js.es6 => icon-library-test.js} (100%)
 rename test/javascripts/lib/{key-value-store-test.js.es6 => key-value-store-test.js} (100%)
 rename test/javascripts/lib/{link-mentions-test.js.es6 => link-mentions-test.js} (100%)
 rename test/javascripts/lib/{load-script-test.js.es6 => load-script-test.js} (100%)
 rename test/javascripts/lib/{oneboxer-test.js.es6 => oneboxer-test.js} (100%)
 rename test/javascripts/lib/{preload-store-test.js.es6 => preload-store-test.js} (100%)
 rename test/javascripts/lib/{pretty-text-test.js.es6 => pretty-text-test.js} (100%)
 rename test/javascripts/lib/{sanitizer-test.js.es6 => sanitizer-test.js} (100%)
 rename test/javascripts/lib/{screen-track-test.js.es6 => screen-track-test.js} (100%)
 rename test/javascripts/lib/{search-test.js.es6 => search-test.js} (100%)
 rename test/javascripts/lib/{sharing-test.js.es6 => sharing-test.js} (100%)
 rename test/javascripts/lib/{text-direction-test.js.es6 => text-direction-test.js} (100%)
 rename test/javascripts/lib/{to-markdown-test.js.es6 => to-markdown-test.js} (100%)
 rename test/javascripts/lib/{tooltip-test.js.es6 => tooltip-test.js} (100%)
 rename test/javascripts/lib/{upload-short-url-test.js.es6 => upload-short-url-test.js} (100%)
 rename test/javascripts/lib/{uploads-test.js.es6 => uploads-test.js} (100%)
 rename test/javascripts/lib/{url-test.js.es6 => url-test.js} (100%)
 rename test/javascripts/lib/{user-search-test.js.es6 => user-search-test.js} (100%)
 rename test/javascripts/lib/{utilities-test.js.es6 => utilities-test.js} (100%)
 rename test/javascripts/lib/{white-lister-test.js.es6 => white-lister-test.js} (100%)
 rename test/javascripts/mixins/{grant-badge-controller-test.js.es6 => grant-badge-controller-test.js} (100%)
 rename test/javascripts/mixins/{setting-object-test.js.es6 => setting-object-test.js} (100%)
 rename test/javascripts/mixins/{singleton-test.js.es6 => singleton-test.js} (100%)
 rename test/javascripts/models/{badge-test.js.es6 => badge-test.js} (100%)
 rename test/javascripts/models/{category-test.js.es6 => category-test.js} (100%)
 rename test/javascripts/models/{composer-test.js.es6 => composer-test.js} (100%)
 rename test/javascripts/models/{email-log-test.js.es6 => email-log-test.js} (100%)
 rename test/javascripts/models/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/models/{invite-test.js.es6 => invite-test.js} (100%)
 rename test/javascripts/models/{nav-item-test.js.es6 => nav-item-test.js} (100%)
 rename test/javascripts/models/{post-stream-test.js.es6 => post-stream-test.js} (100%)
 rename test/javascripts/models/{post-test.js.es6 => post-test.js} (100%)
 rename test/javascripts/models/{report-test.js.es6 => report-test.js} (100%)
 rename test/javascripts/models/{rest-model-test.js.es6 => rest-model-test.js} (100%)
 rename test/javascripts/models/{result-set-test.js.es6 => result-set-test.js} (100%)
 rename test/javascripts/models/{session-test.js.es6 => session-test.js} (100%)
 rename test/javascripts/models/{site-test.js.es6 => site-test.js} (100%)
 rename test/javascripts/models/{staff-action-log-test.js.es6 => staff-action-log-test.js} (100%)
 rename test/javascripts/models/{store-test.js.es6 => store-test.js} (100%)
 rename test/javascripts/models/{topic-details-test.js.es6 => topic-details-test.js} (100%)
 rename test/javascripts/models/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/models/{topic-tracking-state-test.js.es6 => topic-tracking-state-test.js} (100%)
 rename test/javascripts/models/{user-action-test.js.es6 => user-action-test.js} (100%)
 rename test/javascripts/models/{user-badge-test.js.es6 => user-badge-test.js} (100%)
 rename test/javascripts/models/{user-drafts-test.js.es6 => user-drafts-test.js} (100%)
 rename test/javascripts/models/{user-stream-test.js.es6 => user-stream-test.js} (100%)
 rename test/javascripts/models/{user-test.js.es6 => user-test.js} (100%)
 rename test/javascripts/utils/{decorators-test.js.es6 => decorators-test.js} (100%)
 rename test/javascripts/widgets/{actions-summary-test.js.es6 => actions-summary-test.js} (100%)
 rename test/javascripts/widgets/{avatar-flair-test.js.es6 => avatar-flair-test.js} (100%)
 rename test/javascripts/widgets/{button-test.js.es6 => button-test.js} (100%)
 rename test/javascripts/widgets/{default-notification-item-test.js.es6 => default-notification-item-test.js} (100%)
 rename test/javascripts/widgets/{hamburger-menu-test.js.es6 => hamburger-menu-test.js} (100%)
 rename test/javascripts/widgets/{header-test.js.es6 => header-test.js} (100%)
 rename test/javascripts/widgets/{home-logo-test.js.es6 => home-logo-test.js} (100%)
 rename test/javascripts/widgets/{post-links-test.js.es6 => post-links-test.js} (100%)
 rename test/javascripts/widgets/{post-stream-test.js.es6 => post-stream-test.js} (100%)
 rename test/javascripts/widgets/{post-test.js.es6 => post-test.js} (100%)
 rename test/javascripts/widgets/{poster-name-test.js.es6 => poster-name-test.js} (100%)
 rename test/javascripts/widgets/{quick-access-item-test.js.es6 => quick-access-item-test.js} (100%)
 rename test/javascripts/widgets/{topic-admin-menu-test.js.es6 => topic-admin-menu-test.js} (100%)
 rename test/javascripts/widgets/{topic-participant-test.js.es6 => topic-participant-test.js} (100%)
 rename test/javascripts/widgets/{topic-status-test.js.es6 => topic-status-test.js} (100%)
 rename test/javascripts/widgets/{user-menu-test.js.es6 => user-menu-test.js} (100%)
 rename test/javascripts/widgets/{widget-test.js.es6 => widget-test.js} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index bbadfa84af..c0ebc2210e 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -36,24 +36,28 @@ class DiscourseJsProcessor
     return false unless filename.end_with?(".js") || filename.end_with?(".js.erb")
 
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
-    relative_path.start_with?("app/assets/javascripts/discourse/") ||
-      relative_path.start_with?("app/assets/javascripts/admin/") ||
-      relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
-      relative_path.start_with?("app/assets/javascripts/select-kit/") ||
-      relative_path.start_with?("app/assets/javascripts/wizard/") ||
-      relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
-      relative_path.start_with?("app/assets/javascripts/ember-addons/") ||
-      relative_path.start_with?("app/assets/javascripts/confirm-new-email/") ||
-      relative_path == "app/assets/javascripts/preload-store.js" ||
-      relative_path == "app/assets/javascripts/preload-application-data.js" ||
-      relative_path == "app/assets/javascripts/wizard-start.js" ||
-      relative_path == "app/assets/javascripts/onpopstate-handler.js" ||
-      relative_path == "app/assets/javascripts/discourse.js" ||
-      relative_path == "app/assets/javascripts/google-tag-manager.js" ||
-      relative_path == "app/assets/javascripts/google-universal-analytics.js" ||
-      relative_path == "app/assets/javascripts/activate-account.js" ||
-      relative_path == "app/assets/javascripts/auto-redirect.js" ||
-      relative_path == "app/assets/javascripts/embed-application.js"
+
+    js_root = "app/assets/javascripts"
+    test_root = "test/javascripts"
+
+    return false if relative_path.start_with?("#{js_root}/locales/")
+    return false if relative_path.start_with?("#{js_root}/plugins/")
+
+    return true if %w(
+      preload-store
+      preload-application-data
+      wizard-start
+      onpopstate-handler
+      discourse
+      google-tag-manager
+      google-universal-analytics.js
+      activate-account.js
+      auto-redirect.js
+      embed-application
+    ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
+
+    relative_path =~ /^#{js_root}\/[^\/]+\// ||
+      relative_path =~ /^#{test_root}\/[^\/]+\//
   end
 
   def self.skip_module?(data)
diff --git a/test/javascripts/acceptance/about-test.js.es6 b/test/javascripts/acceptance/about-test.js
similarity index 100%
rename from test/javascripts/acceptance/about-test.js.es6
rename to test/javascripts/acceptance/about-test.js
diff --git a/test/javascripts/acceptance/account-created-test.js.es6 b/test/javascripts/acceptance/account-created-test.js
similarity index 100%
rename from test/javascripts/acceptance/account-created-test.js.es6
rename to test/javascripts/acceptance/account-created-test.js
diff --git a/test/javascripts/acceptance/admin-emails-test.js.es6 b/test/javascripts/acceptance/admin-emails-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-emails-test.js.es6
rename to test/javascripts/acceptance/admin-emails-test.js
diff --git a/test/javascripts/acceptance/admin-search-log-term-test.js.es6 b/test/javascripts/acceptance/admin-search-log-term-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-search-log-term-test.js.es6
rename to test/javascripts/acceptance/admin-search-log-term-test.js
diff --git a/test/javascripts/acceptance/admin-search-logs-test.js.es6 b/test/javascripts/acceptance/admin-search-logs-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-search-logs-test.js.es6
rename to test/javascripts/acceptance/admin-search-logs-test.js
diff --git a/test/javascripts/acceptance/admin-site-settings-test.js.es6 b/test/javascripts/acceptance/admin-site-settings-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-site-settings-test.js.es6
rename to test/javascripts/acceptance/admin-site-settings-test.js
diff --git a/test/javascripts/acceptance/admin-site-text-test.js.es6 b/test/javascripts/acceptance/admin-site-text-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-site-text-test.js.es6
rename to test/javascripts/acceptance/admin-site-text-test.js
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-suspend-user-test.js.es6
rename to test/javascripts/acceptance/admin-suspend-user-test.js
diff --git a/test/javascripts/acceptance/admin-user-badges-test.js.es6 b/test/javascripts/acceptance/admin-user-badges-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-badges-test.js.es6
rename to test/javascripts/acceptance/admin-user-badges-test.js
diff --git a/test/javascripts/acceptance/admin-user-emails-test.js.es6 b/test/javascripts/acceptance/admin-user-emails-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-emails-test.js.es6
rename to test/javascripts/acceptance/admin-user-emails-test.js
diff --git a/test/javascripts/acceptance/admin-user-index-test.js.es6 b/test/javascripts/acceptance/admin-user-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-index-test.js.es6
rename to test/javascripts/acceptance/admin-user-index-test.js
diff --git a/test/javascripts/acceptance/admin-users-list-test.js.es6 b/test/javascripts/acceptance/admin-users-list-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-users-list-test.js.es6
rename to test/javascripts/acceptance/admin-users-list-test.js
diff --git a/test/javascripts/acceptance/admin-watched-words-test.js.es6 b/test/javascripts/acceptance/admin-watched-words-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-watched-words-test.js.es6
rename to test/javascripts/acceptance/admin-watched-words-test.js
diff --git a/test/javascripts/acceptance/auth-complete-test.js.es6 b/test/javascripts/acceptance/auth-complete-test.js
similarity index 100%
rename from test/javascripts/acceptance/auth-complete-test.js.es6
rename to test/javascripts/acceptance/auth-complete-test.js
diff --git a/test/javascripts/acceptance/badges-test.js.es6 b/test/javascripts/acceptance/badges-test.js
similarity index 100%
rename from test/javascripts/acceptance/badges-test.js.es6
rename to test/javascripts/acceptance/badges-test.js
diff --git a/test/javascripts/acceptance/category-chooser-test.js.es6 b/test/javascripts/acceptance/category-chooser-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-chooser-test.js.es6
rename to test/javascripts/acceptance/category-chooser-test.js
diff --git a/test/javascripts/acceptance/category-edit-security-test.js.es6 b/test/javascripts/acceptance/category-edit-security-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-edit-security-test.js.es6
rename to test/javascripts/acceptance/category-edit-security-test.js
diff --git a/test/javascripts/acceptance/category-edit-test.js.es6 b/test/javascripts/acceptance/category-edit-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-edit-test.js.es6
rename to test/javascripts/acceptance/category-edit-test.js
diff --git a/test/javascripts/acceptance/category-hashtag-test.js.es6 b/test/javascripts/acceptance/category-hashtag-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-hashtag-test.js.es6
rename to test/javascripts/acceptance/category-hashtag-test.js
diff --git a/test/javascripts/acceptance/click-track-test.js.es6 b/test/javascripts/acceptance/click-track-test.js
similarity index 100%
rename from test/javascripts/acceptance/click-track-test.js.es6
rename to test/javascripts/acceptance/click-track-test.js
diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-actions-test.js.es6
rename to test/javascripts/acceptance/composer-actions-test.js
diff --git a/test/javascripts/acceptance/composer-attachment-test.js.es6 b/test/javascripts/acceptance/composer-attachment-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-attachment-test.js.es6
rename to test/javascripts/acceptance/composer-attachment-test.js
diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6 b/test/javascripts/acceptance/composer-edit-conflict-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-edit-conflict-test.js.es6
rename to test/javascripts/acceptance/composer-edit-conflict-test.js
diff --git a/test/javascripts/acceptance/composer-hyperlink-test.js.es6 b/test/javascripts/acceptance/composer-hyperlink-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-hyperlink-test.js.es6
rename to test/javascripts/acceptance/composer-hyperlink-test.js
diff --git a/test/javascripts/acceptance/composer-onebox-test.js.es6 b/test/javascripts/acceptance/composer-onebox-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-onebox-test.js.es6
rename to test/javascripts/acceptance/composer-onebox-test.js
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-test.js.es6
rename to test/javascripts/acceptance/composer-test.js
diff --git a/test/javascripts/acceptance/composer-topic-links-test.js.es6 b/test/javascripts/acceptance/composer-topic-links-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-topic-links-test.js.es6
rename to test/javascripts/acceptance/composer-topic-links-test.js
diff --git a/test/javascripts/acceptance/composer-uncategorized-test.js.es6 b/test/javascripts/acceptance/composer-uncategorized-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-uncategorized-test.js.es6
rename to test/javascripts/acceptance/composer-uncategorized-test.js
diff --git a/test/javascripts/acceptance/create-account-user-fields-test.js.es6 b/test/javascripts/acceptance/create-account-user-fields-test.js
similarity index 100%
rename from test/javascripts/acceptance/create-account-user-fields-test.js.es6
rename to test/javascripts/acceptance/create-account-user-fields-test.js
diff --git a/test/javascripts/acceptance/custom-html-set-test.js.es6 b/test/javascripts/acceptance/custom-html-set-test.js
similarity index 100%
rename from test/javascripts/acceptance/custom-html-set-test.js.es6
rename to test/javascripts/acceptance/custom-html-set-test.js
diff --git a/test/javascripts/acceptance/custom-html-template-test.js.es6 b/test/javascripts/acceptance/custom-html-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/custom-html-template-test.js.es6
rename to test/javascripts/acceptance/custom-html-template-test.js
diff --git a/test/javascripts/acceptance/dashboard-test.js.es6 b/test/javascripts/acceptance/dashboard-test.js
similarity index 100%
rename from test/javascripts/acceptance/dashboard-test.js.es6
rename to test/javascripts/acceptance/dashboard-test.js
diff --git a/test/javascripts/acceptance/email-notice-test.js.es6 b/test/javascripts/acceptance/email-notice-test.js
similarity index 100%
rename from test/javascripts/acceptance/email-notice-test.js.es6
rename to test/javascripts/acceptance/email-notice-test.js
diff --git a/test/javascripts/acceptance/emoji-picker-test.js.es6 b/test/javascripts/acceptance/emoji-picker-test.js
similarity index 100%
rename from test/javascripts/acceptance/emoji-picker-test.js.es6
rename to test/javascripts/acceptance/emoji-picker-test.js
diff --git a/test/javascripts/acceptance/emoji-test.js.es6 b/test/javascripts/acceptance/emoji-test.js
similarity index 100%
rename from test/javascripts/acceptance/emoji-test.js.es6
rename to test/javascripts/acceptance/emoji-test.js
diff --git a/test/javascripts/acceptance/enforce-second-factor-test.js.es6 b/test/javascripts/acceptance/enforce-second-factor-test.js
similarity index 100%
rename from test/javascripts/acceptance/enforce-second-factor-test.js.es6
rename to test/javascripts/acceptance/enforce-second-factor-test.js
diff --git a/test/javascripts/acceptance/forgot-password-test.js.es6 b/test/javascripts/acceptance/forgot-password-test.js
similarity index 100%
rename from test/javascripts/acceptance/forgot-password-test.js.es6
rename to test/javascripts/acceptance/forgot-password-test.js
diff --git a/test/javascripts/acceptance/group-card-mobile-test.js.es6 b/test/javascripts/acceptance/group-card-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-card-mobile-test.js.es6
rename to test/javascripts/acceptance/group-card-mobile-test.js
diff --git a/test/javascripts/acceptance/group-card-test.js.es6 b/test/javascripts/acceptance/group-card-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-card-test.js.es6
rename to test/javascripts/acceptance/group-card-test.js
diff --git a/test/javascripts/acceptance/group-index-test.js.es6 b/test/javascripts/acceptance/group-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-index-test.js.es6
rename to test/javascripts/acceptance/group-index-test.js
diff --git a/test/javascripts/acceptance/group-manage-interaction-test.js.es6 b/test/javascripts/acceptance/group-manage-interaction-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-interaction-test.js.es6
rename to test/javascripts/acceptance/group-manage-interaction-test.js
diff --git a/test/javascripts/acceptance/group-manage-logs-test.js.es6 b/test/javascripts/acceptance/group-manage-logs-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-logs-test.js.es6
rename to test/javascripts/acceptance/group-manage-logs-test.js
diff --git a/test/javascripts/acceptance/group-manage-membership-test.js.es6 b/test/javascripts/acceptance/group-manage-membership-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-membership-test.js.es6
rename to test/javascripts/acceptance/group-manage-membership-test.js
diff --git a/test/javascripts/acceptance/group-manage-profile-test.js.es6 b/test/javascripts/acceptance/group-manage-profile-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-profile-test.js.es6
rename to test/javascripts/acceptance/group-manage-profile-test.js
diff --git a/test/javascripts/acceptance/group-requests-test.js.es6 b/test/javascripts/acceptance/group-requests-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-requests-test.js.es6
rename to test/javascripts/acceptance/group-requests-test.js
diff --git a/test/javascripts/acceptance/group-test.js.es6 b/test/javascripts/acceptance/group-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-test.js.es6
rename to test/javascripts/acceptance/group-test.js
diff --git a/test/javascripts/acceptance/groups-index-test.js.es6 b/test/javascripts/acceptance/groups-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/groups-index-test.js.es6
rename to test/javascripts/acceptance/groups-index-test.js
diff --git a/test/javascripts/acceptance/groups-new-test.js.es6 b/test/javascripts/acceptance/groups-new-test.js
similarity index 100%
rename from test/javascripts/acceptance/groups-new-test.js.es6
rename to test/javascripts/acceptance/groups-new-test.js
diff --git a/test/javascripts/acceptance/invite-accept-test.js.es6 b/test/javascripts/acceptance/invite-accept-test.js
similarity index 100%
rename from test/javascripts/acceptance/invite-accept-test.js.es6
rename to test/javascripts/acceptance/invite-accept-test.js
diff --git a/test/javascripts/acceptance/invite-show-user-fields-test.js.es6 b/test/javascripts/acceptance/invite-show-user-fields-test.js
similarity index 100%
rename from test/javascripts/acceptance/invite-show-user-fields-test.js.es6
rename to test/javascripts/acceptance/invite-show-user-fields-test.js
diff --git a/test/javascripts/acceptance/jump-to-test.js.es6 b/test/javascripts/acceptance/jump-to-test.js
similarity index 100%
rename from test/javascripts/acceptance/jump-to-test.js.es6
rename to test/javascripts/acceptance/jump-to-test.js
diff --git a/test/javascripts/acceptance/keyboard-shortcuts-test.js.es6 b/test/javascripts/acceptance/keyboard-shortcuts-test.js
similarity index 100%
rename from test/javascripts/acceptance/keyboard-shortcuts-test.js.es6
rename to test/javascripts/acceptance/keyboard-shortcuts-test.js
diff --git a/test/javascripts/acceptance/login-redirect-test.js.es6 b/test/javascripts/acceptance/login-redirect-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-redirect-test.js.es6
rename to test/javascripts/acceptance/login-redirect-test.js
diff --git a/test/javascripts/acceptance/login-required-test.js.es6 b/test/javascripts/acceptance/login-required-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-required-test.js.es6
rename to test/javascripts/acceptance/login-required-test.js
diff --git a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
rename to test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
diff --git a/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6
rename to test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js
diff --git a/test/javascripts/acceptance/login-with-email-disabled-test.js.es6 b/test/javascripts/acceptance/login-with-email-disabled-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-disabled-test.js.es6
rename to test/javascripts/acceptance/login-with-email-disabled-test.js
diff --git a/test/javascripts/acceptance/login-with-email-test.js.es6 b/test/javascripts/acceptance/login-with-email-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-test.js.es6
rename to test/javascripts/acceptance/login-with-email-test.js
diff --git a/test/javascripts/acceptance/mobile-discovery-test.js.es6 b/test/javascripts/acceptance/mobile-discovery-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-discovery-test.js.es6
rename to test/javascripts/acceptance/mobile-discovery-test.js
diff --git a/test/javascripts/acceptance/mobile-sign-in-test.js.es6 b/test/javascripts/acceptance/mobile-sign-in-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-sign-in-test.js.es6
rename to test/javascripts/acceptance/mobile-sign-in-test.js
diff --git a/test/javascripts/acceptance/mobile-users-test.js.es6 b/test/javascripts/acceptance/mobile-users-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-users-test.js.es6
rename to test/javascripts/acceptance/mobile-users-test.js
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js
similarity index 100%
rename from test/javascripts/acceptance/modal-test.js.es6
rename to test/javascripts/acceptance/modal-test.js
diff --git a/test/javascripts/acceptance/new-message-test.js.es6 b/test/javascripts/acceptance/new-message-test.js
similarity index 100%
rename from test/javascripts/acceptance/new-message-test.js.es6
rename to test/javascripts/acceptance/new-message-test.js
diff --git a/test/javascripts/acceptance/new-topic-test.js.es6 b/test/javascripts/acceptance/new-topic-test.js
similarity index 100%
rename from test/javascripts/acceptance/new-topic-test.js.es6
rename to test/javascripts/acceptance/new-topic-test.js
diff --git a/test/javascripts/acceptance/password-reset-test.js.es6 b/test/javascripts/acceptance/password-reset-test.js
similarity index 100%
rename from test/javascripts/acceptance/password-reset-test.js.es6
rename to test/javascripts/acceptance/password-reset-test.js
diff --git a/test/javascripts/acceptance/personal-message-test.js.es6 b/test/javascripts/acceptance/personal-message-test.js
similarity index 100%
rename from test/javascripts/acceptance/personal-message-test.js.es6
rename to test/javascripts/acceptance/personal-message-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-connector-class-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-connector-class-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-decorator-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-decorator-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-multi-template-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-single-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-single-template-test.js
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js
similarity index 100%
rename from test/javascripts/acceptance/preferences-test.js.es6
rename to test/javascripts/acceptance/preferences-test.js
diff --git a/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6 b/test/javascripts/acceptance/raw-plugin-outlet-test.js
similarity index 100%
rename from test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
rename to test/javascripts/acceptance/raw-plugin-outlet-test.js
diff --git a/test/javascripts/acceptance/redirect-to-top-test.js.es6 b/test/javascripts/acceptance/redirect-to-top-test.js
similarity index 100%
rename from test/javascripts/acceptance/redirect-to-top-test.js.es6
rename to test/javascripts/acceptance/redirect-to-top-test.js
diff --git a/test/javascripts/acceptance/reports-test.js.es6 b/test/javascripts/acceptance/reports-test.js
similarity index 100%
rename from test/javascripts/acceptance/reports-test.js.es6
rename to test/javascripts/acceptance/reports-test.js
diff --git a/test/javascripts/acceptance/review-test.js.es6 b/test/javascripts/acceptance/review-test.js
similarity index 100%
rename from test/javascripts/acceptance/review-test.js.es6
rename to test/javascripts/acceptance/review-test.js
diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-full-test.js.es6
rename to test/javascripts/acceptance/search-full-test.js
diff --git a/test/javascripts/acceptance/search-mobile-test.js.es6 b/test/javascripts/acceptance/search-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-mobile-test.js.es6
rename to test/javascripts/acceptance/search-mobile-test.js
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-test.js.es6
rename to test/javascripts/acceptance/search-test.js
diff --git a/test/javascripts/acceptance/share-and-invite-desktop-test.js.es6 b/test/javascripts/acceptance/share-and-invite-desktop-test.js
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-desktop-test.js.es6
rename to test/javascripts/acceptance/share-and-invite-desktop-test.js
diff --git a/test/javascripts/acceptance/share-and-invite-mobile-test.js.es6 b/test/javascripts/acceptance/share-and-invite-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-mobile-test.js.es6
rename to test/javascripts/acceptance/share-and-invite-mobile-test.js
diff --git a/test/javascripts/acceptance/shared-drafts-test.js.es6 b/test/javascripts/acceptance/shared-drafts-test.js
similarity index 100%
rename from test/javascripts/acceptance/shared-drafts-test.js.es6
rename to test/javascripts/acceptance/shared-drafts-test.js
diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js
similarity index 100%
rename from test/javascripts/acceptance/sign-in-test.js.es6
rename to test/javascripts/acceptance/sign-in-test.js
diff --git a/test/javascripts/acceptance/static-test.js.es6 b/test/javascripts/acceptance/static-test.js
similarity index 100%
rename from test/javascripts/acceptance/static-test.js.es6
rename to test/javascripts/acceptance/static-test.js
diff --git a/test/javascripts/acceptance/tag-groups-test.js.es6 b/test/javascripts/acceptance/tag-groups-test.js
similarity index 100%
rename from test/javascripts/acceptance/tag-groups-test.js.es6
rename to test/javascripts/acceptance/tag-groups-test.js
diff --git a/test/javascripts/acceptance/tag-hashtag-test.js.es6 b/test/javascripts/acceptance/tag-hashtag-test.js
similarity index 100%
rename from test/javascripts/acceptance/tag-hashtag-test.js.es6
rename to test/javascripts/acceptance/tag-hashtag-test.js
diff --git a/test/javascripts/acceptance/tags-intersection-test.js.es6 b/test/javascripts/acceptance/tags-intersection-test.js
similarity index 100%
rename from test/javascripts/acceptance/tags-intersection-test.js.es6
rename to test/javascripts/acceptance/tags-intersection-test.js
diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js
similarity index 100%
rename from test/javascripts/acceptance/tags-test.js.es6
rename to test/javascripts/acceptance/tags-test.js
diff --git a/test/javascripts/acceptance/topic-anonymous-test.js.es6 b/test/javascripts/acceptance/topic-anonymous-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-anonymous-test.js.es6
rename to test/javascripts/acceptance/topic-anonymous-test.js
diff --git a/test/javascripts/acceptance/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-discovery-test.js.es6
rename to test/javascripts/acceptance/topic-discovery-test.js
diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-edit-timer-test.js.es6
rename to test/javascripts/acceptance/topic-edit-timer-test.js
diff --git a/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6 b/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6
rename to test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
diff --git a/test/javascripts/acceptance/topic-move-posts-test.js.es6 b/test/javascripts/acceptance/topic-move-posts-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-move-posts-test.js.es6
rename to test/javascripts/acceptance/topic-move-posts-test.js
diff --git a/test/javascripts/acceptance/topic-notifications-button-test.js.es6 b/test/javascripts/acceptance/topic-notifications-button-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-notifications-button-test.js.es6
rename to test/javascripts/acceptance/topic-notifications-button-test.js
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-test.js.es6
rename to test/javascripts/acceptance/topic-test.js
diff --git a/test/javascripts/acceptance/unknown-test.js.es6 b/test/javascripts/acceptance/unknown-test.js
similarity index 100%
rename from test/javascripts/acceptance/unknown-test.js.es6
rename to test/javascripts/acceptance/unknown-test.js
diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-anonymous-test.js.es6
rename to test/javascripts/acceptance/user-anonymous-test.js
diff --git a/test/javascripts/acceptance/user-card-mobile-test.js.es6 b/test/javascripts/acceptance/user-card-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-card-mobile-test.js.es6
rename to test/javascripts/acceptance/user-card-mobile-test.js
diff --git a/test/javascripts/acceptance/user-card-test.js.es6 b/test/javascripts/acceptance/user-card-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-card-test.js.es6
rename to test/javascripts/acceptance/user-card-test.js
diff --git a/test/javascripts/acceptance/user-drafts-stream-test.js.es6 b/test/javascripts/acceptance/user-drafts-stream-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-drafts-stream-test.js.es6
rename to test/javascripts/acceptance/user-drafts-stream-test.js
diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-test.js.es6
rename to test/javascripts/acceptance/user-test.js
diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js
similarity index 100%
rename from test/javascripts/acceptance/users-test.js.es6
rename to test/javascripts/acceptance/users-test.js
diff --git a/test/javascripts/admin/components/group-list-setting-test.js.es6 b/test/javascripts/admin/components/group-list-setting-test.js
similarity index 100%
rename from test/javascripts/admin/components/group-list-setting-test.js.es6
rename to test/javascripts/admin/components/group-list-setting-test.js
diff --git a/test/javascripts/admin/components/themes-list-item-test.js.es6 b/test/javascripts/admin/components/themes-list-item-test.js
similarity index 100%
rename from test/javascripts/admin/components/themes-list-item-test.js.es6
rename to test/javascripts/admin/components/themes-list-item-test.js
diff --git a/test/javascripts/admin/components/themes-list-test.js.es6 b/test/javascripts/admin/components/themes-list-test.js
similarity index 100%
rename from test/javascripts/admin/components/themes-list-test.js.es6
rename to test/javascripts/admin/components/themes-list-test.js
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
rename to test/javascripts/admin/controllers/admin-customize-themes-show-test.js
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
rename to test/javascripts/admin/controllers/admin-customize-themes-test.js
diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 b/test/javascripts/admin/controllers/admin-user-badges-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-user-badges-test.js.es6
rename to test/javascripts/admin/controllers/admin-user-badges-test.js
diff --git a/test/javascripts/admin/models/theme-test.js.es6 b/test/javascripts/admin/models/theme-test.js
similarity index 100%
rename from test/javascripts/admin/models/theme-test.js.es6
rename to test/javascripts/admin/models/theme-test.js
diff --git a/test/javascripts/components/ace-editor-test.js.es6 b/test/javascripts/components/ace-editor-test.js
similarity index 100%
rename from test/javascripts/components/ace-editor-test.js.es6
rename to test/javascripts/components/ace-editor-test.js
diff --git a/test/javascripts/components/admin-report-test.js.es6 b/test/javascripts/components/admin-report-test.js
similarity index 100%
rename from test/javascripts/components/admin-report-test.js.es6
rename to test/javascripts/components/admin-report-test.js
diff --git a/test/javascripts/components/badge-title-test.js.es6 b/test/javascripts/components/badge-title-test.js
similarity index 100%
rename from test/javascripts/components/badge-title-test.js.es6
rename to test/javascripts/components/badge-title-test.js
diff --git a/test/javascripts/components/d-button-test.js.es6 b/test/javascripts/components/d-button-test.js
similarity index 100%
rename from test/javascripts/components/d-button-test.js.es6
rename to test/javascripts/components/d-button-test.js
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js
similarity index 100%
rename from test/javascripts/components/d-editor-test.js.es6
rename to test/javascripts/components/d-editor-test.js
diff --git a/test/javascripts/components/d-icon-test.js.es6 b/test/javascripts/components/d-icon-test.js
similarity index 100%
rename from test/javascripts/components/d-icon-test.js.es6
rename to test/javascripts/components/d-icon-test.js
diff --git a/test/javascripts/components/date-input-test.js.es6 b/test/javascripts/components/date-input-test.js
similarity index 100%
rename from test/javascripts/components/date-input-test.js.es6
rename to test/javascripts/components/date-input-test.js
diff --git a/test/javascripts/components/date-time-input-range-test.js.es6 b/test/javascripts/components/date-time-input-range-test.js
similarity index 100%
rename from test/javascripts/components/date-time-input-range-test.js.es6
rename to test/javascripts/components/date-time-input-range-test.js
diff --git a/test/javascripts/components/date-time-input-test.js.es6 b/test/javascripts/components/date-time-input-test.js
similarity index 100%
rename from test/javascripts/components/date-time-input-test.js.es6
rename to test/javascripts/components/date-time-input-test.js
diff --git a/test/javascripts/components/group-membership-button-test.js.es6 b/test/javascripts/components/group-membership-button-test.js
similarity index 100%
rename from test/javascripts/components/group-membership-button-test.js.es6
rename to test/javascripts/components/group-membership-button-test.js
diff --git a/test/javascripts/components/html-safe-helper-test.js.es6 b/test/javascripts/components/html-safe-helper-test.js
similarity index 100%
rename from test/javascripts/components/html-safe-helper-test.js.es6
rename to test/javascripts/components/html-safe-helper-test.js
diff --git a/test/javascripts/components/iframed-html-test.js.es6 b/test/javascripts/components/iframed-html-test.js
similarity index 100%
rename from test/javascripts/components/iframed-html-test.js.es6
rename to test/javascripts/components/iframed-html-test.js
diff --git a/test/javascripts/components/image-uploader-test.js.es6 b/test/javascripts/components/image-uploader-test.js
similarity index 100%
rename from test/javascripts/components/image-uploader-test.js.es6
rename to test/javascripts/components/image-uploader-test.js
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js.es6 b/test/javascripts/components/keyboard-shortcuts-test.js
similarity index 100%
rename from test/javascripts/components/keyboard-shortcuts-test.js.es6
rename to test/javascripts/components/keyboard-shortcuts-test.js
diff --git a/test/javascripts/components/load-more-test.js.es6 b/test/javascripts/components/load-more-test.js
similarity index 100%
rename from test/javascripts/components/load-more-test.js.es6
rename to test/javascripts/components/load-more-test.js
diff --git a/test/javascripts/components/secret-value-list-test.js.es6 b/test/javascripts/components/secret-value-list-test.js
similarity index 100%
rename from test/javascripts/components/secret-value-list-test.js.es6
rename to test/javascripts/components/secret-value-list-test.js
diff --git a/test/javascripts/components/select-kit/category-chooser-test.js.es6 b/test/javascripts/components/select-kit/category-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/category-chooser-test.js.es6
rename to test/javascripts/components/select-kit/category-chooser-test.js
diff --git a/test/javascripts/components/select-kit/category-drop-test.js.es6 b/test/javascripts/components/select-kit/category-drop-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/category-drop-test.js.es6
rename to test/javascripts/components/select-kit/category-drop-test.js
diff --git a/test/javascripts/components/select-kit/combo-box-test.js.es6 b/test/javascripts/components/select-kit/combo-box-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/combo-box-test.js.es6
rename to test/javascripts/components/select-kit/combo-box-test.js
diff --git a/test/javascripts/components/select-kit/dropdown-select-box-test.js.es6 b/test/javascripts/components/select-kit/dropdown-select-box-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/dropdown-select-box-test.js.es6
rename to test/javascripts/components/select-kit/dropdown-select-box-test.js
diff --git a/test/javascripts/components/select-kit/list-setting-test.js.es6 b/test/javascripts/components/select-kit/list-setting-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/list-setting-test.js.es6
rename to test/javascripts/components/select-kit/list-setting-test.js
diff --git a/test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6 b/test/javascripts/components/select-kit/mini-tag-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6
rename to test/javascripts/components/select-kit/mini-tag-chooser-test.js
diff --git a/test/javascripts/components/select-kit/multi-select-test.js.es6 b/test/javascripts/components/select-kit/multi-select-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/multi-select-test.js.es6
rename to test/javascripts/components/select-kit/multi-select-test.js
diff --git a/test/javascripts/components/select-kit/notifications-button-test.js.es6 b/test/javascripts/components/select-kit/notifications-button-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/notifications-button-test.js.es6
rename to test/javascripts/components/select-kit/notifications-button-test.js
diff --git a/test/javascripts/components/select-kit/pinned-options-test.js.es6 b/test/javascripts/components/select-kit/pinned-options-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/pinned-options-test.js.es6
rename to test/javascripts/components/select-kit/pinned-options-test.js
diff --git a/test/javascripts/components/select-kit/select-kit-test-helper.js.es6 b/test/javascripts/components/select-kit/select-kit-test-helper.js
similarity index 100%
rename from test/javascripts/components/select-kit/select-kit-test-helper.js.es6
rename to test/javascripts/components/select-kit/select-kit-test-helper.js
diff --git a/test/javascripts/components/select-kit/single-select-test.js.es6 b/test/javascripts/components/select-kit/single-select-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/single-select-test.js.es6
rename to test/javascripts/components/select-kit/single-select-test.js
diff --git a/test/javascripts/components/select-kit/tag-drop-test.js.es6 b/test/javascripts/components/select-kit/tag-drop-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/tag-drop-test.js.es6
rename to test/javascripts/components/select-kit/tag-drop-test.js
diff --git a/test/javascripts/components/select-kit/topic-notifications-button-test.js.es6 b/test/javascripts/components/select-kit/topic-notifications-button-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-button-test.js.es6
rename to test/javascripts/components/select-kit/topic-notifications-button-test.js
diff --git a/test/javascripts/components/select-kit/topic-notifications-options-test.js.es6 b/test/javascripts/components/select-kit/topic-notifications-options-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-options-test.js.es6
rename to test/javascripts/components/select-kit/topic-notifications-options-test.js
diff --git a/test/javascripts/components/select-kit/user-chooser-test.js.es6 b/test/javascripts/components/select-kit/user-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/user-chooser-test.js.es6
rename to test/javascripts/components/select-kit/user-chooser-test.js
diff --git a/test/javascripts/components/share-button-test.js.es6 b/test/javascripts/components/share-button-test.js
similarity index 100%
rename from test/javascripts/components/share-button-test.js.es6
rename to test/javascripts/components/share-button-test.js
diff --git a/test/javascripts/components/share-button.js.es6 b/test/javascripts/components/share-button.js
similarity index 100%
rename from test/javascripts/components/share-button.js.es6
rename to test/javascripts/components/share-button.js
diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js
similarity index 100%
rename from test/javascripts/components/text-field-test.js.es6
rename to test/javascripts/components/text-field-test.js
diff --git a/test/javascripts/components/text-overflow-test.js.es6 b/test/javascripts/components/text-overflow-test.js
similarity index 100%
rename from test/javascripts/components/text-overflow-test.js.es6
rename to test/javascripts/components/text-overflow-test.js
diff --git a/test/javascripts/components/time-input-test.js.es6 b/test/javascripts/components/time-input-test.js
similarity index 100%
rename from test/javascripts/components/time-input-test.js.es6
rename to test/javascripts/components/time-input-test.js
diff --git a/test/javascripts/components/user-selector-test.js.es6 b/test/javascripts/components/user-selector-test.js
similarity index 100%
rename from test/javascripts/components/user-selector-test.js.es6
rename to test/javascripts/components/user-selector-test.js
diff --git a/test/javascripts/components/value-list-test.js.es6 b/test/javascripts/components/value-list-test.js
similarity index 100%
rename from test/javascripts/components/value-list-test.js.es6
rename to test/javascripts/components/value-list-test.js
diff --git a/test/javascripts/controllers/avatar-selector-test.js.es6 b/test/javascripts/controllers/avatar-selector-test.js
similarity index 100%
rename from test/javascripts/controllers/avatar-selector-test.js.es6
rename to test/javascripts/controllers/avatar-selector-test.js
diff --git a/test/javascripts/controllers/bookmark-test.js.es6 b/test/javascripts/controllers/bookmark-test.js
similarity index 100%
rename from test/javascripts/controllers/bookmark-test.js.es6
rename to test/javascripts/controllers/bookmark-test.js
diff --git a/test/javascripts/controllers/create-account-test.js.es6 b/test/javascripts/controllers/create-account-test.js
similarity index 100%
rename from test/javascripts/controllers/create-account-test.js.es6
rename to test/javascripts/controllers/create-account-test.js
diff --git a/test/javascripts/controllers/group-test.js.es6 b/test/javascripts/controllers/group-test.js
similarity index 100%
rename from test/javascripts/controllers/group-test.js.es6
rename to test/javascripts/controllers/group-test.js
diff --git a/test/javascripts/controllers/history-test.js.es6 b/test/javascripts/controllers/history-test.js
similarity index 100%
rename from test/javascripts/controllers/history-test.js.es6
rename to test/javascripts/controllers/history-test.js
diff --git a/test/javascripts/controllers/preferences-account-test.js.es6 b/test/javascripts/controllers/preferences-account-test.js
similarity index 100%
rename from test/javascripts/controllers/preferences-account-test.js.es6
rename to test/javascripts/controllers/preferences-account-test.js
diff --git a/test/javascripts/controllers/preferences-second-factor-test.js.es6 b/test/javascripts/controllers/preferences-second-factor-test.js
similarity index 100%
rename from test/javascripts/controllers/preferences-second-factor-test.js.es6
rename to test/javascripts/controllers/preferences-second-factor-test.js
diff --git a/test/javascripts/controllers/reorder-categories-test.js.es6 b/test/javascripts/controllers/reorder-categories-test.js
similarity index 100%
rename from test/javascripts/controllers/reorder-categories-test.js.es6
rename to test/javascripts/controllers/reorder-categories-test.js
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js
similarity index 100%
rename from test/javascripts/controllers/topic-test.js.es6
rename to test/javascripts/controllers/topic-test.js
diff --git a/test/javascripts/ember/resolver-test.js.es6 b/test/javascripts/ember/resolver-test.js
similarity index 100%
rename from test/javascripts/ember/resolver-test.js.es6
rename to test/javascripts/ember/resolver-test.js
diff --git a/test/javascripts/fixtures/about.js.es6 b/test/javascripts/fixtures/about.js
similarity index 100%
rename from test/javascripts/fixtures/about.js.es6
rename to test/javascripts/fixtures/about.js
diff --git a/test/javascripts/fixtures/badges_fixture.js.es6 b/test/javascripts/fixtures/badges_fixture.js
similarity index 100%
rename from test/javascripts/fixtures/badges_fixture.js.es6
rename to test/javascripts/fixtures/badges_fixture.js
diff --git a/test/javascripts/fixtures/category-fixtures.js.es6 b/test/javascripts/fixtures/category-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/category-fixtures.js.es6
rename to test/javascripts/fixtures/category-fixtures.js
diff --git a/test/javascripts/fixtures/concerns/notification-types.js.es6.erb b/test/javascripts/fixtures/concerns/notification-types.js.erb
similarity index 100%
rename from test/javascripts/fixtures/concerns/notification-types.js.es6.erb
rename to test/javascripts/fixtures/concerns/notification-types.js.erb
diff --git a/test/javascripts/fixtures/dashboard-general.js.es6 b/test/javascripts/fixtures/dashboard-general.js
similarity index 100%
rename from test/javascripts/fixtures/dashboard-general.js.es6
rename to test/javascripts/fixtures/dashboard-general.js
diff --git a/test/javascripts/fixtures/dashboard.js.es6 b/test/javascripts/fixtures/dashboard.js
similarity index 100%
rename from test/javascripts/fixtures/dashboard.js.es6
rename to test/javascripts/fixtures/dashboard.js
diff --git a/test/javascripts/fixtures/directory-fixtures.js.es6 b/test/javascripts/fixtures/directory-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/directory-fixtures.js.es6
rename to test/javascripts/fixtures/directory-fixtures.js
diff --git a/test/javascripts/fixtures/discovery_fixtures.js.es6 b/test/javascripts/fixtures/discovery_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/discovery_fixtures.js.es6
rename to test/javascripts/fixtures/discovery_fixtures.js
diff --git a/test/javascripts/fixtures/draft.js.es6 b/test/javascripts/fixtures/draft.js
similarity index 100%
rename from test/javascripts/fixtures/draft.js.es6
rename to test/javascripts/fixtures/draft.js
diff --git a/test/javascripts/fixtures/drafts.js.es6 b/test/javascripts/fixtures/drafts.js
similarity index 100%
rename from test/javascripts/fixtures/drafts.js.es6
rename to test/javascripts/fixtures/drafts.js
diff --git a/test/javascripts/fixtures/group-fixtures.js.es6 b/test/javascripts/fixtures/group-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/group-fixtures.js.es6
rename to test/javascripts/fixtures/group-fixtures.js
diff --git a/test/javascripts/fixtures/groups-fixtures.js.es6 b/test/javascripts/fixtures/groups-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/groups-fixtures.js.es6
rename to test/javascripts/fixtures/groups-fixtures.js
diff --git a/test/javascripts/fixtures/notification_fixtures.js.es6 b/test/javascripts/fixtures/notification_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/notification_fixtures.js.es6
rename to test/javascripts/fixtures/notification_fixtures.js
diff --git a/test/javascripts/fixtures/poll.js.es6 b/test/javascripts/fixtures/poll.js
similarity index 100%
rename from test/javascripts/fixtures/poll.js.es6
rename to test/javascripts/fixtures/poll.js
diff --git a/test/javascripts/fixtures/post.js.es6 b/test/javascripts/fixtures/post.js
similarity index 100%
rename from test/javascripts/fixtures/post.js.es6
rename to test/javascripts/fixtures/post.js
diff --git a/test/javascripts/fixtures/private_messages_fixtures.js.es6 b/test/javascripts/fixtures/private_messages_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/private_messages_fixtures.js.es6
rename to test/javascripts/fixtures/private_messages_fixtures.js
diff --git a/test/javascripts/fixtures/problems.js.es6 b/test/javascripts/fixtures/problems.js
similarity index 100%
rename from test/javascripts/fixtures/problems.js.es6
rename to test/javascripts/fixtures/problems.js
diff --git a/test/javascripts/fixtures/reports.js.es6 b/test/javascripts/fixtures/reports.js
similarity index 100%
rename from test/javascripts/fixtures/reports.js.es6
rename to test/javascripts/fixtures/reports.js
diff --git a/test/javascripts/fixtures/reports_bulk.js.es6 b/test/javascripts/fixtures/reports_bulk.js
similarity index 100%
rename from test/javascripts/fixtures/reports_bulk.js.es6
rename to test/javascripts/fixtures/reports_bulk.js
diff --git a/test/javascripts/fixtures/search-fixtures.js.es6 b/test/javascripts/fixtures/search-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/search-fixtures.js.es6
rename to test/javascripts/fixtures/search-fixtures.js
diff --git a/test/javascripts/fixtures/session-fixtures.js.es6 b/test/javascripts/fixtures/session-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/session-fixtures.js.es6
rename to test/javascripts/fixtures/session-fixtures.js
diff --git a/test/javascripts/fixtures/site-fixtures.js.es6 b/test/javascripts/fixtures/site-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/site-fixtures.js.es6
rename to test/javascripts/fixtures/site-fixtures.js
diff --git a/test/javascripts/fixtures/site_settings.js.es6 b/test/javascripts/fixtures/site_settings.js
similarity index 100%
rename from test/javascripts/fixtures/site_settings.js.es6
rename to test/javascripts/fixtures/site_settings.js
diff --git a/test/javascripts/fixtures/static_fixtures.js.es6 b/test/javascripts/fixtures/static_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/static_fixtures.js.es6
rename to test/javascripts/fixtures/static_fixtures.js
diff --git a/test/javascripts/fixtures/top_fixture.js.es6 b/test/javascripts/fixtures/top_fixture.js
similarity index 100%
rename from test/javascripts/fixtures/top_fixture.js.es6
rename to test/javascripts/fixtures/top_fixture.js
diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js
similarity index 100%
rename from test/javascripts/fixtures/topic.js.es6
rename to test/javascripts/fixtures/topic.js
diff --git a/test/javascripts/fixtures/user-badges.js.es6 b/test/javascripts/fixtures/user-badges.js
similarity index 100%
rename from test/javascripts/fixtures/user-badges.js.es6
rename to test/javascripts/fixtures/user-badges.js
diff --git a/test/javascripts/fixtures/user_fixtures.js.es6 b/test/javascripts/fixtures/user_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/user_fixtures.js.es6
rename to test/javascripts/fixtures/user_fixtures.js
diff --git a/test/javascripts/fixtures/watched-words-fixtures.js.es6 b/test/javascripts/fixtures/watched-words-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/watched-words-fixtures.js.es6
rename to test/javascripts/fixtures/watched-words-fixtures.js
diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js
index 95d7b2a7dd..81fbd40b1b 100644
--- a/test/javascripts/helpers/assertions.js
+++ b/test/javascripts/helpers/assertions.js
@@ -1,5 +1,4 @@
-/* exported exists, count, present, blank, containsInstance, not, visible, invisible */
-
+// discourse-skip-module
 function exists(selector) {
   return count(selector) > 0;
 }
@@ -13,8 +12,10 @@ function visible(selector) {
 }
 
 function invisible(selector) {
-  var $items = find(selector + ":visible");
-  return $items.length === 0 ||
-         $items.css("opacity") === "0" ||
-         $items.css("visibility") === "hidden";
+  const $items = find(selector + ":visible");
+  return (
+    $items.length === 0 ||
+    $items.css("opacity") === "0" ||
+    $items.css("visibility") === "hidden"
+  );
 }
diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js
similarity index 100%
rename from test/javascripts/helpers/component-test.js.es6
rename to test/javascripts/helpers/component-test.js
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js
similarity index 100%
rename from test/javascripts/helpers/create-pretender.js.es6
rename to test/javascripts/helpers/create-pretender.js
diff --git a/test/javascripts/helpers/create-store.js.es6 b/test/javascripts/helpers/create-store.js
similarity index 100%
rename from test/javascripts/helpers/create-store.js.es6
rename to test/javascripts/helpers/create-store.js
diff --git a/test/javascripts/helpers/d-editor-helper.js.es6 b/test/javascripts/helpers/d-editor-helper.js
similarity index 100%
rename from test/javascripts/helpers/d-editor-helper.js.es6
rename to test/javascripts/helpers/d-editor-helper.js
diff --git a/test/javascripts/helpers/fixture-pretender.js.es6 b/test/javascripts/helpers/fixture-pretender.js
similarity index 100%
rename from test/javascripts/helpers/fixture-pretender.js.es6
rename to test/javascripts/helpers/fixture-pretender.js
diff --git a/test/javascripts/helpers/html-helper.js.es6 b/test/javascripts/helpers/html-helper.js
similarity index 100%
rename from test/javascripts/helpers/html-helper.js.es6
rename to test/javascripts/helpers/html-helper.js
diff --git a/test/javascripts/helpers/init-ember-qunit.js b/test/javascripts/helpers/init-ember-qunit.js
deleted file mode 100644
index 32d0184e7d..0000000000
--- a/test/javascripts/helpers/init-ember-qunit.js
+++ /dev/null
@@ -1,2 +0,0 @@
-var buildResolver = require('discourse-common/resolver').buildResolver;
-window.setResolver(buildResolver('discourse').create({ namespace: Discourse }));
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js
similarity index 100%
rename from test/javascripts/helpers/qunit-helpers.js.es6
rename to test/javascripts/helpers/qunit-helpers.js
diff --git a/test/javascripts/helpers/review-pretender.js.es6 b/test/javascripts/helpers/review-pretender.js
similarity index 100%
rename from test/javascripts/helpers/review-pretender.js.es6
rename to test/javascripts/helpers/review-pretender.js
diff --git a/test/javascripts/helpers/select-kit-helper.js.es6 b/test/javascripts/helpers/select-kit-helper.js
similarity index 100%
rename from test/javascripts/helpers/select-kit-helper.js.es6
rename to test/javascripts/helpers/select-kit-helper.js
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index 621aa3d6ac..c39424b0df 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -1,4 +1,5 @@
-/*jshint maxlen:10000000 */
+// discourse-skip-module
+
 Discourse.SiteSettingsOriginal = {
   title: "QUnit Discourse Tests",
   site_logo_url: "/assets/logo.png",
@@ -12,8 +13,10 @@ Discourse.SiteSettingsOriginal = {
   ga_universal_tracking_code: "",
   ga_universal_domain_name: "auto",
   top_menu: "latest|new|unread|categories|top",
-  post_menu: "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
-  post_menu_hidden_items: "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
+  post_menu:
+    "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
+  post_menu_hidden_items:
+    "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
   share_links: "twitter|facebook|email",
   category_colors:
     "BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|27AA5B|B3B5B4|E45735",
@@ -102,6 +105,7 @@ Discourse.SiteSettingsOriginal = {
   unicode_usernames: false,
   secure_media: false
 };
+
 Discourse.SiteSettings = jQuery.extend(
   true,
   {},
diff --git a/test/javascripts/helpers/site.js.es6 b/test/javascripts/helpers/site.js
similarity index 100%
rename from test/javascripts/helpers/site.js.es6
rename to test/javascripts/helpers/site.js
diff --git a/test/javascripts/helpers/store-pretender.js.es6 b/test/javascripts/helpers/store-pretender.js
similarity index 100%
rename from test/javascripts/helpers/store-pretender.js.es6
rename to test/javascripts/helpers/store-pretender.js
diff --git a/test/javascripts/helpers/textarea-selection-helper.js.es6 b/test/javascripts/helpers/textarea-selection-helper.js
similarity index 100%
rename from test/javascripts/helpers/textarea-selection-helper.js.es6
rename to test/javascripts/helpers/textarea-selection-helper.js
diff --git a/test/javascripts/helpers/widget-test.js.es6 b/test/javascripts/helpers/widget-test.js
similarity index 100%
rename from test/javascripts/helpers/widget-test.js.es6
rename to test/javascripts/helpers/widget-test.js
diff --git a/test/javascripts/initializers/localization-test.js.es6 b/test/javascripts/initializers/localization-test.js
similarity index 100%
rename from test/javascripts/initializers/localization-test.js.es6
rename to test/javascripts/initializers/localization-test.js
diff --git a/test/javascripts/lib/bbcode-test.js.es6 b/test/javascripts/lib/bbcode-test.js
similarity index 100%
rename from test/javascripts/lib/bbcode-test.js.es6
rename to test/javascripts/lib/bbcode-test.js
diff --git a/test/javascripts/lib/break-string-test.js.es6 b/test/javascripts/lib/break-string-test.js
similarity index 100%
rename from test/javascripts/lib/break-string-test.js.es6
rename to test/javascripts/lib/break-string-test.js
diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js
similarity index 100%
rename from test/javascripts/lib/category-badge-test.js.es6
rename to test/javascripts/lib/category-badge-test.js
diff --git a/test/javascripts/lib/click-track-edit-history-test.js.es6 b/test/javascripts/lib/click-track-edit-history-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-edit-history-test.js.es6
rename to test/javascripts/lib/click-track-edit-history-test.js
diff --git a/test/javascripts/lib/click-track-profile-page-test.js.es6 b/test/javascripts/lib/click-track-profile-page-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-profile-page-test.js.es6
rename to test/javascripts/lib/click-track-profile-page-test.js
diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-test.js.es6
rename to test/javascripts/lib/click-track-test.js
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js
similarity index 100%
rename from test/javascripts/lib/computed-test.js.es6
rename to test/javascripts/lib/computed-test.js
diff --git a/test/javascripts/lib/discourse-test.js.es6 b/test/javascripts/lib/discourse-test.js
similarity index 100%
rename from test/javascripts/lib/discourse-test.js.es6
rename to test/javascripts/lib/discourse-test.js
diff --git a/test/javascripts/lib/emoji-store-test.js.es6 b/test/javascripts/lib/emoji-store-test.js
similarity index 100%
rename from test/javascripts/lib/emoji-store-test.js.es6
rename to test/javascripts/lib/emoji-store-test.js
diff --git a/test/javascripts/lib/emoji-test.js.es6 b/test/javascripts/lib/emoji-test.js
similarity index 100%
rename from test/javascripts/lib/emoji-test.js.es6
rename to test/javascripts/lib/emoji-test.js
diff --git a/test/javascripts/lib/formatter-test.js.es6 b/test/javascripts/lib/formatter-test.js
similarity index 100%
rename from test/javascripts/lib/formatter-test.js.es6
rename to test/javascripts/lib/formatter-test.js
diff --git a/test/javascripts/lib/highlight-text-test.js.es6 b/test/javascripts/lib/highlight-text-test.js
similarity index 100%
rename from test/javascripts/lib/highlight-text-test.js.es6
rename to test/javascripts/lib/highlight-text-test.js
diff --git a/test/javascripts/lib/i18n-test.js.es6 b/test/javascripts/lib/i18n-test.js
similarity index 100%
rename from test/javascripts/lib/i18n-test.js.es6
rename to test/javascripts/lib/i18n-test.js
diff --git a/test/javascripts/lib/icon-library-test.js.es6 b/test/javascripts/lib/icon-library-test.js
similarity index 100%
rename from test/javascripts/lib/icon-library-test.js.es6
rename to test/javascripts/lib/icon-library-test.js
diff --git a/test/javascripts/lib/key-value-store-test.js.es6 b/test/javascripts/lib/key-value-store-test.js
similarity index 100%
rename from test/javascripts/lib/key-value-store-test.js.es6
rename to test/javascripts/lib/key-value-store-test.js
diff --git a/test/javascripts/lib/link-mentions-test.js.es6 b/test/javascripts/lib/link-mentions-test.js
similarity index 100%
rename from test/javascripts/lib/link-mentions-test.js.es6
rename to test/javascripts/lib/link-mentions-test.js
diff --git a/test/javascripts/lib/load-script-test.js.es6 b/test/javascripts/lib/load-script-test.js
similarity index 100%
rename from test/javascripts/lib/load-script-test.js.es6
rename to test/javascripts/lib/load-script-test.js
diff --git a/test/javascripts/lib/oneboxer-test.js.es6 b/test/javascripts/lib/oneboxer-test.js
similarity index 100%
rename from test/javascripts/lib/oneboxer-test.js.es6
rename to test/javascripts/lib/oneboxer-test.js
diff --git a/test/javascripts/lib/preload-store-test.js.es6 b/test/javascripts/lib/preload-store-test.js
similarity index 100%
rename from test/javascripts/lib/preload-store-test.js.es6
rename to test/javascripts/lib/preload-store-test.js
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js
similarity index 100%
rename from test/javascripts/lib/pretty-text-test.js.es6
rename to test/javascripts/lib/pretty-text-test.js
diff --git a/test/javascripts/lib/sanitizer-test.js.es6 b/test/javascripts/lib/sanitizer-test.js
similarity index 100%
rename from test/javascripts/lib/sanitizer-test.js.es6
rename to test/javascripts/lib/sanitizer-test.js
diff --git a/test/javascripts/lib/screen-track-test.js.es6 b/test/javascripts/lib/screen-track-test.js
similarity index 100%
rename from test/javascripts/lib/screen-track-test.js.es6
rename to test/javascripts/lib/screen-track-test.js
diff --git a/test/javascripts/lib/search-test.js.es6 b/test/javascripts/lib/search-test.js
similarity index 100%
rename from test/javascripts/lib/search-test.js.es6
rename to test/javascripts/lib/search-test.js
diff --git a/test/javascripts/lib/sharing-test.js.es6 b/test/javascripts/lib/sharing-test.js
similarity index 100%
rename from test/javascripts/lib/sharing-test.js.es6
rename to test/javascripts/lib/sharing-test.js
diff --git a/test/javascripts/lib/text-direction-test.js.es6 b/test/javascripts/lib/text-direction-test.js
similarity index 100%
rename from test/javascripts/lib/text-direction-test.js.es6
rename to test/javascripts/lib/text-direction-test.js
diff --git a/test/javascripts/lib/to-markdown-test.js.es6 b/test/javascripts/lib/to-markdown-test.js
similarity index 100%
rename from test/javascripts/lib/to-markdown-test.js.es6
rename to test/javascripts/lib/to-markdown-test.js
diff --git a/test/javascripts/lib/tooltip-test.js.es6 b/test/javascripts/lib/tooltip-test.js
similarity index 100%
rename from test/javascripts/lib/tooltip-test.js.es6
rename to test/javascripts/lib/tooltip-test.js
diff --git a/test/javascripts/lib/upload-short-url-test.js.es6 b/test/javascripts/lib/upload-short-url-test.js
similarity index 100%
rename from test/javascripts/lib/upload-short-url-test.js.es6
rename to test/javascripts/lib/upload-short-url-test.js
diff --git a/test/javascripts/lib/uploads-test.js.es6 b/test/javascripts/lib/uploads-test.js
similarity index 100%
rename from test/javascripts/lib/uploads-test.js.es6
rename to test/javascripts/lib/uploads-test.js
diff --git a/test/javascripts/lib/url-test.js.es6 b/test/javascripts/lib/url-test.js
similarity index 100%
rename from test/javascripts/lib/url-test.js.es6
rename to test/javascripts/lib/url-test.js
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js
similarity index 100%
rename from test/javascripts/lib/user-search-test.js.es6
rename to test/javascripts/lib/user-search-test.js
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js
similarity index 100%
rename from test/javascripts/lib/utilities-test.js.es6
rename to test/javascripts/lib/utilities-test.js
diff --git a/test/javascripts/lib/white-lister-test.js.es6 b/test/javascripts/lib/white-lister-test.js
similarity index 100%
rename from test/javascripts/lib/white-lister-test.js.es6
rename to test/javascripts/lib/white-lister-test.js
diff --git a/test/javascripts/mixins/grant-badge-controller-test.js.es6 b/test/javascripts/mixins/grant-badge-controller-test.js
similarity index 100%
rename from test/javascripts/mixins/grant-badge-controller-test.js.es6
rename to test/javascripts/mixins/grant-badge-controller-test.js
diff --git a/test/javascripts/mixins/setting-object-test.js.es6 b/test/javascripts/mixins/setting-object-test.js
similarity index 100%
rename from test/javascripts/mixins/setting-object-test.js.es6
rename to test/javascripts/mixins/setting-object-test.js
diff --git a/test/javascripts/mixins/singleton-test.js.es6 b/test/javascripts/mixins/singleton-test.js
similarity index 100%
rename from test/javascripts/mixins/singleton-test.js.es6
rename to test/javascripts/mixins/singleton-test.js
diff --git a/test/javascripts/models/badge-test.js.es6 b/test/javascripts/models/badge-test.js
similarity index 100%
rename from test/javascripts/models/badge-test.js.es6
rename to test/javascripts/models/badge-test.js
diff --git a/test/javascripts/models/category-test.js.es6 b/test/javascripts/models/category-test.js
similarity index 100%
rename from test/javascripts/models/category-test.js.es6
rename to test/javascripts/models/category-test.js
diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js
similarity index 100%
rename from test/javascripts/models/composer-test.js.es6
rename to test/javascripts/models/composer-test.js
diff --git a/test/javascripts/models/email-log-test.js.es6 b/test/javascripts/models/email-log-test.js
similarity index 100%
rename from test/javascripts/models/email-log-test.js.es6
rename to test/javascripts/models/email-log-test.js
diff --git a/test/javascripts/models/group-test.js.es6 b/test/javascripts/models/group-test.js
similarity index 100%
rename from test/javascripts/models/group-test.js.es6
rename to test/javascripts/models/group-test.js
diff --git a/test/javascripts/models/invite-test.js.es6 b/test/javascripts/models/invite-test.js
similarity index 100%
rename from test/javascripts/models/invite-test.js.es6
rename to test/javascripts/models/invite-test.js
diff --git a/test/javascripts/models/nav-item-test.js.es6 b/test/javascripts/models/nav-item-test.js
similarity index 100%
rename from test/javascripts/models/nav-item-test.js.es6
rename to test/javascripts/models/nav-item-test.js
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js
similarity index 100%
rename from test/javascripts/models/post-stream-test.js.es6
rename to test/javascripts/models/post-stream-test.js
diff --git a/test/javascripts/models/post-test.js.es6 b/test/javascripts/models/post-test.js
similarity index 100%
rename from test/javascripts/models/post-test.js.es6
rename to test/javascripts/models/post-test.js
diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js
similarity index 100%
rename from test/javascripts/models/report-test.js.es6
rename to test/javascripts/models/report-test.js
diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js
similarity index 100%
rename from test/javascripts/models/rest-model-test.js.es6
rename to test/javascripts/models/rest-model-test.js
diff --git a/test/javascripts/models/result-set-test.js.es6 b/test/javascripts/models/result-set-test.js
similarity index 100%
rename from test/javascripts/models/result-set-test.js.es6
rename to test/javascripts/models/result-set-test.js
diff --git a/test/javascripts/models/session-test.js.es6 b/test/javascripts/models/session-test.js
similarity index 100%
rename from test/javascripts/models/session-test.js.es6
rename to test/javascripts/models/session-test.js
diff --git a/test/javascripts/models/site-test.js.es6 b/test/javascripts/models/site-test.js
similarity index 100%
rename from test/javascripts/models/site-test.js.es6
rename to test/javascripts/models/site-test.js
diff --git a/test/javascripts/models/staff-action-log-test.js.es6 b/test/javascripts/models/staff-action-log-test.js
similarity index 100%
rename from test/javascripts/models/staff-action-log-test.js.es6
rename to test/javascripts/models/staff-action-log-test.js
diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js
similarity index 100%
rename from test/javascripts/models/store-test.js.es6
rename to test/javascripts/models/store-test.js
diff --git a/test/javascripts/models/topic-details-test.js.es6 b/test/javascripts/models/topic-details-test.js
similarity index 100%
rename from test/javascripts/models/topic-details-test.js.es6
rename to test/javascripts/models/topic-details-test.js
diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js
similarity index 100%
rename from test/javascripts/models/topic-test.js.es6
rename to test/javascripts/models/topic-test.js
diff --git a/test/javascripts/models/topic-tracking-state-test.js.es6 b/test/javascripts/models/topic-tracking-state-test.js
similarity index 100%
rename from test/javascripts/models/topic-tracking-state-test.js.es6
rename to test/javascripts/models/topic-tracking-state-test.js
diff --git a/test/javascripts/models/user-action-test.js.es6 b/test/javascripts/models/user-action-test.js
similarity index 100%
rename from test/javascripts/models/user-action-test.js.es6
rename to test/javascripts/models/user-action-test.js
diff --git a/test/javascripts/models/user-badge-test.js.es6 b/test/javascripts/models/user-badge-test.js
similarity index 100%
rename from test/javascripts/models/user-badge-test.js.es6
rename to test/javascripts/models/user-badge-test.js
diff --git a/test/javascripts/models/user-drafts-test.js.es6 b/test/javascripts/models/user-drafts-test.js
similarity index 100%
rename from test/javascripts/models/user-drafts-test.js.es6
rename to test/javascripts/models/user-drafts-test.js
diff --git a/test/javascripts/models/user-stream-test.js.es6 b/test/javascripts/models/user-stream-test.js
similarity index 100%
rename from test/javascripts/models/user-stream-test.js.es6
rename to test/javascripts/models/user-stream-test.js
diff --git a/test/javascripts/models/user-test.js.es6 b/test/javascripts/models/user-test.js
similarity index 100%
rename from test/javascripts/models/user-test.js.es6
rename to test/javascripts/models/user-test.js
diff --git a/test/javascripts/utils/decorators-test.js.es6 b/test/javascripts/utils/decorators-test.js
similarity index 100%
rename from test/javascripts/utils/decorators-test.js.es6
rename to test/javascripts/utils/decorators-test.js
diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js
similarity index 100%
rename from test/javascripts/widgets/actions-summary-test.js.es6
rename to test/javascripts/widgets/actions-summary-test.js
diff --git a/test/javascripts/widgets/avatar-flair-test.js.es6 b/test/javascripts/widgets/avatar-flair-test.js
similarity index 100%
rename from test/javascripts/widgets/avatar-flair-test.js.es6
rename to test/javascripts/widgets/avatar-flair-test.js
diff --git a/test/javascripts/widgets/button-test.js.es6 b/test/javascripts/widgets/button-test.js
similarity index 100%
rename from test/javascripts/widgets/button-test.js.es6
rename to test/javascripts/widgets/button-test.js
diff --git a/test/javascripts/widgets/default-notification-item-test.js.es6 b/test/javascripts/widgets/default-notification-item-test.js
similarity index 100%
rename from test/javascripts/widgets/default-notification-item-test.js.es6
rename to test/javascripts/widgets/default-notification-item-test.js
diff --git a/test/javascripts/widgets/hamburger-menu-test.js.es6 b/test/javascripts/widgets/hamburger-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/hamburger-menu-test.js.es6
rename to test/javascripts/widgets/hamburger-menu-test.js
diff --git a/test/javascripts/widgets/header-test.js.es6 b/test/javascripts/widgets/header-test.js
similarity index 100%
rename from test/javascripts/widgets/header-test.js.es6
rename to test/javascripts/widgets/header-test.js
diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js
similarity index 100%
rename from test/javascripts/widgets/home-logo-test.js.es6
rename to test/javascripts/widgets/home-logo-test.js
diff --git a/test/javascripts/widgets/post-links-test.js.es6 b/test/javascripts/widgets/post-links-test.js
similarity index 100%
rename from test/javascripts/widgets/post-links-test.js.es6
rename to test/javascripts/widgets/post-links-test.js
diff --git a/test/javascripts/widgets/post-stream-test.js.es6 b/test/javascripts/widgets/post-stream-test.js
similarity index 100%
rename from test/javascripts/widgets/post-stream-test.js.es6
rename to test/javascripts/widgets/post-stream-test.js
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js
similarity index 100%
rename from test/javascripts/widgets/post-test.js.es6
rename to test/javascripts/widgets/post-test.js
diff --git a/test/javascripts/widgets/poster-name-test.js.es6 b/test/javascripts/widgets/poster-name-test.js
similarity index 100%
rename from test/javascripts/widgets/poster-name-test.js.es6
rename to test/javascripts/widgets/poster-name-test.js
diff --git a/test/javascripts/widgets/quick-access-item-test.js.es6 b/test/javascripts/widgets/quick-access-item-test.js
similarity index 100%
rename from test/javascripts/widgets/quick-access-item-test.js.es6
rename to test/javascripts/widgets/quick-access-item-test.js
diff --git a/test/javascripts/widgets/topic-admin-menu-test.js.es6 b/test/javascripts/widgets/topic-admin-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-admin-menu-test.js.es6
rename to test/javascripts/widgets/topic-admin-menu-test.js
diff --git a/test/javascripts/widgets/topic-participant-test.js.es6 b/test/javascripts/widgets/topic-participant-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-participant-test.js.es6
rename to test/javascripts/widgets/topic-participant-test.js
diff --git a/test/javascripts/widgets/topic-status-test.js.es6 b/test/javascripts/widgets/topic-status-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-status-test.js.es6
rename to test/javascripts/widgets/topic-status-test.js
diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/user-menu-test.js.es6
rename to test/javascripts/widgets/user-menu-test.js
diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js
similarity index 100%
rename from test/javascripts/widgets/widget-test.js.es6
rename to test/javascripts/widgets/widget-test.js

From 6f2e3d61eec5a023ab898f4bb7b11021a3e821b1 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 26 Mar 2020 12:33:29 -0400
Subject: [PATCH 296/633] Revert "FIX: Resolver wasn't being set properly"

This reverts commit 661aebdc877a80f7debb93c4d727f2242084908f.
---
 test/javascripts/test_helper.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index c2c3520a3b..77598e4712 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -1,3 +1,5 @@
+// discourse-skip-module
+
 /*global document, sinon, QUnit, Logster */
 //= require env
 //= require jquery.debug
@@ -42,6 +44,9 @@
 //
 //= require jquery.magnific-popup.min.js
 
+const buildResolver = require("discourse-common/resolver").buildResolver;
+window.setResolver(buildResolver("discourse").create({ namespace: Discourse }));
+
 sinon.config = {
   injectIntoThis: false,
   injectInto: null,
@@ -103,7 +108,7 @@ function resetSite(siteSettings, extras) {
 QUnit.testStart(function(ctx) {
   server = createPretender.default;
   createPretender.applyDefaultHandlers(server);
-  server.handlers = []
+  server.handlers = [];
 
   server.prepareBody = function(body) {
     if (body && typeof body === "object") {

From 358ddb9b954837befe37e2c0b16c524dd8ffe52f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 26 Mar 2020 12:47:10 -0400
Subject: [PATCH 297/633] FIX: `nil` != `false`

---
 lib/discourse_js_processor.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index c0ebc2210e..49fa3a7601 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -56,8 +56,8 @@ class DiscourseJsProcessor
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
 
-    relative_path =~ /^#{js_root}\/[^\/]+\// ||
-      relative_path =~ /^#{test_root}\/[^\/]+\//
+    !!(relative_path =~ /^#{js_root}\/[^\/]+\// ||
+      relative_path =~ /^#{test_root}\/[^\/]+\//)
   end
 
   def self.skip_module?(data)

From 388e14b9dc1d13750f8bc782a863277fd638a2da Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 26 Mar 2020 13:12:17 -0400
Subject: [PATCH 298/633] FIX: Broken transpilation

---
 lib/discourse_js_processor.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 49fa3a7601..40cf861795 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -50,8 +50,8 @@ class DiscourseJsProcessor
       onpopstate-handler
       discourse
       google-tag-manager
-      google-universal-analytics.js
-      activate-account.js
+      google-universal-analytics
+      activate-account
       auto-redirect.js
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }

From 7d2c71dd5f14ac4591507080f2e6fa621fca9c1e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 26 Mar 2020 13:21:04 -0400
Subject: [PATCH 299/633] FIX: Auto redirect had invalid extension

---
 lib/discourse_js_processor.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 40cf861795..ebe2559982 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -52,7 +52,7 @@ class DiscourseJsProcessor
       google-tag-manager
       google-universal-analytics
       activate-account
-      auto-redirect.js
+      auto-redirect
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
 

From 05e2824a232cbc929a5a325d36f0c83d995143ec Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 26 Mar 2020 19:59:33 +0100
Subject: [PATCH 300/633] DEV: Fix flaky emoji-store tests

This set of tests cleared the emoji store *before* each test, while the other set - *after*. So if these were run first, they would break a single test from the other set.
---
 test/javascripts/acceptance/emoji-picker-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/acceptance/emoji-picker-test.js b/test/javascripts/acceptance/emoji-picker-test.js
index 1b90106d4d..71e06e1321 100644
--- a/test/javascripts/acceptance/emoji-picker-test.js
+++ b/test/javascripts/acceptance/emoji-picker-test.js
@@ -3,7 +3,7 @@ import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
 
 acceptance("EmojiPicker", {
   loggedIn: true,
-  beforeEach() {
+  afterEach() {
     const store = Discourse.__container__.lookup("service:emoji-store");
     store.reset();
   }

From af41c37d42247630b1e7de2e6df02e0591b7bb8f Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:13:54 -0700
Subject: [PATCH 301/633] DEV: Enable all 'recommended' passing ember template
 linting rules

Also sort the ember template linting rules
---
 .template-lintrc.js | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 17279244f3..32360e0a9e 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -3,17 +3,36 @@ module.exports = {
   ignore: ["**/*.raw"],
 
   rules: {
-    "self-closing-void-elements": true,
-    "table-groups": true,
-    "style-concatenation": true,
-    "no-invalid-interactive": true,
+    "deprecated-render-helper": true,
     "link-rel-noopener": true,
+    "no-abstract-roles": true,
+    "no-args-paths": true,
+    "no-attrs-in-components": true,
+    "no-debugger": true,
+    "no-extra-mut-helper-argument": true,
+    "no-html-comments": true,
+    "no-index-component-invocation": true,
+    "no-input-block": true,
+    "no-input-tagname": true,
+    "no-invalid-interactive": true,
+    "no-invalid-link-text": true,
+    "no-invalid-meta": true,
+    "no-invalid-role": true,
+    "no-log": true,
+    "no-negated-condition": true,
+    "no-nested-interactive": true,
+    "no-obsolete-elements": true,
+    "no-outlet-outside-routes": true,
+    "no-partial": true,
+    "no-shadowed-elements": true,
+    "no-triple-curlies": true,
     "no-unnecessary-concat": true,
+    "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
     "no-unbound": true,
+    "self-closing-void-elements": true,
     "simple-unless": true,
-    "no-triple-curlies": true,
-    "no-partial": true,
-    "no-html-comments": true
+    "style-concatenation": true,
+    "table-groups": true
   }
 };

From a17fa222afff6e035d5b610487d6888896913d35 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:17:31 -0700
Subject: [PATCH 302/633] DEV: Enable and fix link-href-attributes lint

---
 .template-lintrc.js                                           | 1 +
 .../discourse/templates/components/share-panel.hbs            | 2 +-
 .../discourse/templates/components/share-popup.hbs            | 2 +-
 app/assets/javascripts/discourse/templates/composer.hbs       | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 32360e0a9e..994a145b9b 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -5,6 +5,7 @@ module.exports = {
   rules: {
     "deprecated-render-helper": true,
     "link-rel-noopener": true,
+    "link-href-attributes": true,
     "no-abstract-roles": true,
     "no-args-paths": true,
     "no-attrs-in-components": true,
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index 1808d6cc1f..4a2b9935cf 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -4,7 +4,7 @@
 
 <div class="body">
   {{textarea value=shareUrl class="topic-share-url"}}
-  <div class="topic-share-url-for-touch"><a></a></div>
+  <div class="topic-share-url-for-touch"><a href>{{! set by component }}</a></div>
 
   <div class="sources">
     {{#each sources as |source|}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 54e8029cf6..38641694bd 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -8,7 +8,7 @@
 
 <div>
   <input type="text">
-  <div class="share-for-touch"><div class="overflow-ellipsis"><a></a></div></div>
+  <div class="share-for-touch"><div class="overflow-ellipsis"><a href>{{! set by component }}</a></div></div>
 </div>
 
 <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 43af40a527..f255cd5d4d 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -191,7 +191,7 @@
 
               {{#if site.mobileView}}
                 {{#if allowUpload}}
-                  <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
+                  <a href class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
                     {{d-icon uploadIcon}}
                   </a>
                 {{/if}}
@@ -213,7 +213,7 @@
       {{else}}
         <div class='saving-text'>
           {{#if model.createdPost}}
-            {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+            {{i18n 'composer.saved'}} <a href class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
           {{else}}
             {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
           {{/if}}

From 07dc8d20c43e7b6487f0a8bfef3ff0216512c09a Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:31:02 -0700
Subject: [PATCH 303/633] DEV: Enable and fix the 'require-iframe-title' lint

---
 .template-lintrc.js                                             | 1 +
 app/assets/javascripts/admin/templates/email-preview-digest.hbs | 2 +-
 config/locales/client.en.yml                                    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 994a145b9b..344b969597 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -31,6 +31,7 @@ module.exports = {
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
     "no-unbound": true,
+    "require-iframe-title": true,
     "self-closing-void-elements": true,
     "simple-unless": true,
     "style-concatenation": true,
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 58733c1eb3..0dfcb04531 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -50,7 +50,7 @@
         {{#if htmlEmpty}}
           <p>{{i18n 'admin.email.no_result'}}</p>
         {{else}}
-          <iframe srcdoc={{model.html_content}} />
+          <iframe title={{i18n 'admin.email.html_preview'}} srcdoc={{model.html_content}} />
         {{/if}}
       {{else}}
         <pre>{{html-safe model.text_content}}</pre>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 50f5134381..f3ea234cb8 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3907,6 +3907,7 @@ en:
         format: "Format"
         html: "html"
         text: "text"
+        html_preview: "Email Content Preview"
         last_seen_user: "Last Seen User:"
         no_result: "No results found for summary."
         reply_key: "Reply Key"

From eff4974829567e7512584a269720171e35132bda Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:31:31 -0700
Subject: [PATCH 304/633] sorting fix

---
 .template-lintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 344b969597..8013d049aa 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -27,10 +27,10 @@ module.exports = {
     "no-partial": true,
     "no-shadowed-elements": true,
     "no-triple-curlies": true,
+    "no-unbound": true,
     "no-unnecessary-concat": true,
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
-    "no-unbound": true,
     "require-iframe-title": true,
     "self-closing-void-elements": true,
     "simple-unless": true,

From e98e83a1ff0fdbbd2c95b15c6e0188e8d028dfe2 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:37:12 -0700
Subject: [PATCH 305/633] DEV: Disable all failing 'recommended' lints and
 extend 'recommended'

---
 .template-lintrc.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 8013d049aa..b0823d968f 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -1,20 +1,25 @@
 module.exports = {
-  // extends: "recommended",
+  extends: "recommended",
   ignore: ["**/*.raw"],
 
   rules: {
+    "block-indentation": false,
     "deprecated-render-helper": true,
+    "img-alt-attributes": false,
     "link-rel-noopener": true,
     "link-href-attributes": true,
     "no-abstract-roles": true,
     "no-args-paths": true,
     "no-attrs-in-components": true,
     "no-debugger": true,
+    "no-duplicate-attributes": false,
     "no-extra-mut-helper-argument": true,
     "no-html-comments": true,
     "no-index-component-invocation": true,
+    "no-inline-styles": false,
     "no-input-block": true,
     "no-input-tagname": true,
+    "no-implicit-this": false,
     "no-invalid-interactive": true,
     "no-invalid-link-text": true,
     "no-invalid-meta": true,
@@ -25,13 +30,18 @@ module.exports = {
     "no-obsolete-elements": true,
     "no-outlet-outside-routes": true,
     "no-partial": true,
+    "no-positive-tabindex": false,
+    "no-quoteless-attributes": false,
     "no-shadowed-elements": true,
     "no-triple-curlies": true,
     "no-unbound": true,
     "no-unnecessary-concat": true,
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
+    "quotes": false,
+    "require-button-type": false,
     "require-iframe-title": true,
+    "require-valid-alt-text": false,
     "self-closing-void-elements": true,
     "simple-unless": true,
     "style-concatenation": true,

From 7c14d9ae9f376f39bff0bf4aaabecbdc4767e465 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:48:28 -0700
Subject: [PATCH 306/633] DEV: Add and disable all failing 'stylistic' lints

---
 .template-lintrc.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index b0823d968f..41c0cd5e34 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -2,10 +2,14 @@ module.exports = {
   extends: "recommended",
   ignore: ["**/*.raw"],
 
+  // Pending:
+  // "eol-last": "always",
+
   rules: {
     "block-indentation": false,
     "deprecated-render-helper": true,
     "img-alt-attributes": false,
+    "linebreak-style": true,
     "link-rel-noopener": true,
     "link-href-attributes": true,
     "no-abstract-roles": true,
@@ -27,12 +31,14 @@ module.exports = {
     "no-log": true,
     "no-negated-condition": true,
     "no-nested-interactive": true,
+    "no-multiple-empty-lines": false,
     "no-obsolete-elements": true,
     "no-outlet-outside-routes": true,
     "no-partial": true,
     "no-positive-tabindex": false,
     "no-quoteless-attributes": false,
     "no-shadowed-elements": true,
+    "no-trailing-spaces": false,
     "no-triple-curlies": true,
     "no-unbound": true,
     "no-unnecessary-concat": true,

From 17211b940fc6d897d3b1db58f6d7a7a456ebe703 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 12:21:20 -0700
Subject: [PATCH 307/633] DEV: Enable and fix the 'no-duplicate-attributes'
 lint

---
 .template-lintrc.js                                     | 2 +-
 app/assets/javascripts/discourse/templates/composer.hbs | 2 +-
 app/assets/javascripts/discourse/templates/topic.hbs    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 41c0cd5e34..85a2b8381e 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -16,7 +16,7 @@ module.exports = {
     "no-args-paths": true,
     "no-attrs-in-components": true,
     "no-debugger": true,
-    "no-duplicate-attributes": false,
+    "no-duplicate-attributes": true,
     "no-extra-mut-helper-argument": true,
     "no-html-comments": true,
     "no-index-component-invocation": true,
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index f255cd5d4d..e86aefbfe3 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -213,7 +213,7 @@
       {{else}}
         <div class='saving-text'>
           {{#if model.createdPost}}
-            {{i18n 'composer.saved'}} <a href class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+            {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
           {{else}}
             {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 7b8c2d1b81..c79b3da18a 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -36,7 +36,6 @@
                 options=(hash
                   filterable=true
                   categoryId=buffered.category_id
-                  filterable=true
                 )
               }}
             {{/if}}

From 67b34600d54f1476b002291d6530f20ad31b73be Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 26 Mar 2020 21:00:10 +0100
Subject: [PATCH 308/633] DEV: Use `type` instead of `method` in ajax calls
 (#8974)

Even though `type` is an alias for `method`, we have custom logic in `/discourse/lib/ajax` that checks only `type`, and ~200 other ajax calls in the codebase already use `type` param.
---
 .../controllers/admin-customize-robots-txt.js |  4 ++--
 .../controllers/admin-watched-words-action.js |  2 +-
 .../modals/admin-edit-badge-groupings.js      |  2 +-
 .../controllers/modals/admin-install-theme.js |  2 +-
 .../admin/controllers/modals/admin-reseed.js  |  2 +-
 .../admin/models/email-template.js            |  2 +-
 .../admin/models/screened-email.js            |  2 +-
 .../javascripts/admin/models/site-text.js     |  2 +-
 .../admin/routes/admin-badges-show.js         |  2 +-
 .../javascripts/discourse/adapters/post.js    |  2 +-
 .../javascripts/discourse/adapters/rest.js    |  2 +-
 .../components/reviewable-claimed-topic.js    |  2 +-
 .../discourse/components/reviewable-item.js   |  2 +-
 .../discourse/controllers/avatar-selector.js  |  2 +-
 .../discourse/controllers/group-bulk-add.js   |  2 +-
 .../discourse/controllers/review-settings.js  |  2 +-
 .../discourse/controllers/static.js           |  2 +-
 .../controllers/user-notifications.js         |  2 +-
 app/assets/javascripts/discourse/lib/ajax.js  |  5 +++++
 .../javascripts/discourse/lib/export-csv.js   |  2 +-
 .../javascripts/discourse/models/topic.js     |  2 +-
 .../discourse/routes/application.js           |  2 +-
 .../discourse/widgets/hamburger-menu.js       |  2 +-
 .../widgets/quick-access-notifications.js     |  2 +-
 .../pretty-text/upload-short-url.js           |  2 +-
 test/javascripts/models/rest-model-test.js    | 10 ++++------
 test/javascripts/models/store-test.js         | 19 ++++++++-----------
 27 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js b/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
index 5c6d2499f4..a3e43f2038 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
+++ b/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
@@ -18,7 +18,7 @@ export default Controller.extend(bufferedProperty("model"), {
       });
 
       ajax("robots.json", {
-        method: "PUT",
+        type: "PUT",
         data: { robots_txt: this.buffered.get("robots_txt") }
       })
         .then(data => {
@@ -34,7 +34,7 @@ export default Controller.extend(bufferedProperty("model"), {
         isSaving: true,
         saved: false
       });
-      ajax("robots.json", { method: "DELETE" })
+      ajax("robots.json", { type: "DELETE" })
         .then(data => {
           this.buffered.set("robots_txt", data.robots_txt);
           this.commitBuffer();
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
index 5de00031a5..cf5815da73 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
@@ -92,7 +92,7 @@ export default Controller.extend({
         result => {
           if (result) {
             ajax(`/admin/logs/watched_words/action/${actionKey}.json`, {
-              method: "DELETE"
+              type: "DELETE"
             }).then(() => {
               const action = this.findAction(actionKey);
               if (action) {
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
index 7bc3603887..f1d1274abd 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
@@ -65,7 +65,7 @@ export default Controller.extend(ModalFunctionality, {
 
       ajax("/admin/badges/badge_groupings", {
         data: { ids: groupIds, names },
-        method: "POST"
+        type: "POST"
       }).then(
         data => {
           items = this.model;
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
index 7c0036539c..16cf2034d5 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
@@ -84,7 +84,7 @@ export default Controller.extend(ModalFunctionality, {
     const checked = this.privateChecked;
     if (checked && !this._keyLoading) {
       this._keyLoading = true;
-      ajax(this.keyGenUrl, { method: "POST" })
+      ajax(this.keyGenUrl, { type: "POST" })
         .then(pair => {
           this.setProperties({
             privateKey: pair.private_key,
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
index 176c46be36..326a3a66a7 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
@@ -31,7 +31,7 @@ export default Controller.extend(ModalFunctionality, {
           category_ids: this._extractSelectedIds(this.categories),
           topic_ids: this._extractSelectedIds(this.topics)
         },
-        method: "POST"
+        type: "POST"
       })
         .then(
           () => this.send("closeModal"),
diff --git a/app/assets/javascripts/admin/models/email-template.js b/app/assets/javascripts/admin/models/email-template.js
index 2dddb272dc..550148e0ab 100644
--- a/app/assets/javascripts/admin/models/email-template.js
+++ b/app/assets/javascripts/admin/models/email-template.js
@@ -5,7 +5,7 @@ const { getProperties } = Ember;
 export default RestModel.extend({
   revert() {
     return ajax(`/admin/customize/email_templates/${this.id}`, {
-      method: "DELETE"
+      type: "DELETE"
     }).then(result =>
       getProperties(result.email_template, "subject", "body", "can_revert")
     );
diff --git a/app/assets/javascripts/admin/models/screened-email.js b/app/assets/javascripts/admin/models/screened-email.js
index ea72510551..4ef3217edf 100644
--- a/app/assets/javascripts/admin/models/screened-email.js
+++ b/app/assets/javascripts/admin/models/screened-email.js
@@ -10,7 +10,7 @@ const ScreenedEmail = EmberObject.extend({
 
   clearBlock: function() {
     return ajax("/admin/logs/screened_emails/" + this.id, {
-      method: "DELETE"
+      type: "DELETE"
     });
   }
 });
diff --git a/app/assets/javascripts/admin/models/site-text.js b/app/assets/javascripts/admin/models/site-text.js
index 8bcb8c7f0f..793ab33b54 100644
--- a/app/assets/javascripts/admin/models/site-text.js
+++ b/app/assets/javascripts/admin/models/site-text.js
@@ -5,7 +5,7 @@ const { getProperties } = Ember;
 export default RestModel.extend({
   revert() {
     return ajax(`/admin/customize/site_texts/${this.id}`, {
-      method: "DELETE"
+      type: "DELETE"
     }).then(result => getProperties(result.site_text, "value", "can_revert"));
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js b/app/assets/javascripts/admin/routes/admin-badges-show.js
index 67acdcba58..4a29cfae0a 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js
@@ -40,7 +40,7 @@ export default Route.extend({
     preview(badge, explain) {
       badge.set("preview_loading", true);
       ajax("/admin/badges/preview.json", {
-        method: "post",
+        type: "POST",
         data: {
           sql: badge.get("query"),
           target_posts: !!badge.get("target_posts"),
diff --git a/app/assets/javascripts/discourse/adapters/post.js b/app/assets/javascripts/discourse/adapters/post.js
index 950198067e..1382d8d1f3 100644
--- a/app/assets/javascripts/discourse/adapters/post.js
+++ b/app/assets/javascripts/discourse/adapters/post.js
@@ -13,7 +13,7 @@ export default RestAdapter.extend({
   createRecord(store, type, args) {
     const typeField = underscore(type);
     args.nested_post = true;
-    return ajax(this.pathFor(store, type), { method: "POST", data: args }).then(
+    return ajax(this.pathFor(store, type), { type: "POST", data: args }).then(
       function(json) {
         return new Result(json[typeField], json);
       }
diff --git a/app/assets/javascripts/discourse/adapters/rest.js b/app/assets/javascripts/discourse/adapters/rest.js
index bc2839985f..e92f325f84 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js
+++ b/app/assets/javascripts/discourse/adapters/rest.js
@@ -133,7 +133,7 @@ export default EmberObject.extend({
 
   destroyRecord(store, type, record) {
     return ajax(this.pathFor(store, type, record.get("id")), {
-      method: "DELETE"
+      type: "DELETE"
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js b/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
index 273b51afa7..5ebc97aeb0 100644
--- a/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
+++ b/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
@@ -14,7 +14,7 @@ export default Component.extend({
   actions: {
     unclaim() {
       ajax(`/reviewable_claimed_topics/${this.topicId}`, {
-        method: "DELETE"
+        type: "DELETE"
       }).then(() => {
         this.set("claimedBy", null);
       });
diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js b/app/assets/javascripts/discourse/components/reviewable-item.js
index c301f1aa93..6f62710478 100644
--- a/app/assets/javascripts/discourse/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/components/reviewable-item.js
@@ -97,7 +97,7 @@ export default Component.extend({
       return ajax(
         `/review/${reviewable.id}/perform/${action.id}?version=${version}`,
         {
-          method: "PUT"
+          type: "PUT"
         }
       )
         .then(result => {
diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js b/app/assets/javascripts/discourse/controllers/avatar-selector.js
index 5fdbe79e3e..38d5da9a69 100644
--- a/app/assets/javascripts/discourse/controllers/avatar-selector.js
+++ b/app/assets/javascripts/discourse/controllers/avatar-selector.js
@@ -63,7 +63,7 @@ export default Controller.extend(ModalFunctionality, {
 
       return ajax(
         `/user_avatar/${this.get("user.username")}/refresh_gravatar.json`,
-        { method: "POST" }
+        { type: "POST" }
       )
         .then(result => {
           if (!result.gravatar_upload_id) {
diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js b/app/assets/javascripts/discourse/controllers/group-bulk-add.js
index 0310d4e309..cf4f86916c 100644
--- a/app/assets/javascripts/discourse/controllers/group-bulk-add.js
+++ b/app/assets/javascripts/discourse/controllers/group-bulk-add.js
@@ -31,7 +31,7 @@ export default Controller.extend(ModalFunctionality, {
 
       ajax("/admin/groups/bulk", {
         data: { users, group_id: this.get("model.id") },
-        method: "PUT"
+        type: "PUT"
       })
         .then(result => {
           this.set("result", result);
diff --git a/app/assets/javascripts/discourse/controllers/review-settings.js b/app/assets/javascripts/discourse/controllers/review-settings.js
index 8e670adb2a..e98e4d8c37 100644
--- a/app/assets/javascripts/discourse/controllers/review-settings.js
+++ b/app/assets/javascripts/discourse/controllers/review-settings.js
@@ -15,7 +15,7 @@ export default Controller.extend({
 
       this.set("saving", true);
       ajax("/review/settings", {
-        method: "PUT",
+        type: "PUT",
         data: { reviewable_priorities: priorities }
       })
         .then(() => {
diff --git a/app/assets/javascripts/discourse/controllers/static.js b/app/assets/javascripts/discourse/controllers/static.js
index 9f139b6d92..9474c20c64 100644
--- a/app/assets/javascripts/discourse/controllers/static.js
+++ b/app/assets/javascripts/discourse/controllers/static.js
@@ -23,7 +23,7 @@ export default Controller.extend({
     markFaqRead() {
       const currentUser = this.currentUser;
       if (currentUser) {
-        ajax(userPath("read-faq"), { method: "POST" }).then(() => {
+        ajax(userPath("read-faq"), { type: "POST" }).then(() => {
           currentUser.set("read_faq", true);
         });
       }
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js b/app/assets/javascripts/discourse/controllers/user-notifications.js
index b6cceef185..dc9147105e 100644
--- a/app/assets/javascripts/discourse/controllers/user-notifications.js
+++ b/app/assets/javascripts/discourse/controllers/user-notifications.js
@@ -28,7 +28,7 @@ export default Controller.extend({
 
   actions: {
     resetNew() {
-      ajax("/notifications/mark-read", { method: "PUT" }).then(() => {
+      ajax("/notifications/mark-read", { type: "PUT" }).then(() => {
         this.model.forEach(n => n.set("read", true));
       });
     },
diff --git a/app/assets/javascripts/discourse/lib/ajax.js b/app/assets/javascripts/discourse/lib/ajax.js
index 37052a4d79..e2318b0d9f 100644
--- a/app/assets/javascripts/discourse/lib/ajax.js
+++ b/app/assets/javascripts/discourse/lib/ajax.js
@@ -139,6 +139,11 @@ export function ajax() {
       });
     };
 
+    if (args.method) {
+      args.type = args.method;
+      delete args.method;
+    }
+
     // We default to JSON on GET. If we don't, sometimes if the server doesn't return the proper header
     // it will not be parsed as an object.
     if (!args.type) args.type = "GET";
diff --git a/app/assets/javascripts/discourse/lib/export-csv.js b/app/assets/javascripts/discourse/lib/export-csv.js
index 39b19771f3..41957f9bf5 100644
--- a/app/assets/javascripts/discourse/lib/export-csv.js
+++ b/app/assets/javascripts/discourse/lib/export-csv.js
@@ -3,7 +3,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 
 function exportEntityByType(type, entity, args) {
   return ajax("/export_csv/export_entity.json", {
-    method: "POST",
+    type: "POST",
     data: { entity, args }
   });
 }
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index ea118dbc7a..26afbd4ba2 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -634,7 +634,7 @@ const Topic = RestModel.extend({
   updateDestinationCategory(categoryId) {
     this.set("destination_category_id", categoryId);
     return ajax(`/t/${this.id}/shared-draft`, {
-      method: "PUT",
+      type: "PUT",
       data: { category_id: categoryId }
     });
   },
diff --git a/app/assets/javascripts/discourse/routes/application.js b/app/assets/javascripts/discourse/routes/application.js
index 0a028cdceb..07926eb568 100644
--- a/app/assets/javascripts/discourse/routes/application.js
+++ b/app/assets/javascripts/discourse/routes/application.js
@@ -29,7 +29,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
   actions: {
     toggleAnonymous() {
-      ajax(userPath("toggle-anon"), { method: "POST" }).then(() => {
+      ajax(userPath("toggle-anon"), { type: "POST" }).then(() => {
         window.location.reload();
       });
     },
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js b/app/assets/javascripts/discourse/widgets/hamburger-menu.js
index 912594351e..48af267c16 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js
@@ -26,7 +26,7 @@ createWidget("priority-faq-link", {
   click(e) {
     e.preventDefault();
     if (this.siteSettings.faq_url === this.attrs.href) {
-      ajax(userPath("read-faq"), { method: "POST" }).then(() => {
+      ajax(userPath("read-faq"), { type: "POST" }).then(() => {
         this.currentUser.set("read_faq", true);
         DiscourseURL.routeToTag($(e.target).closest("a")[0]);
       });
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-notifications.js b/app/assets/javascripts/discourse/widgets/quick-access-notifications.js
index 515e702ace..2841da9a84 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-notifications.js
+++ b/app/assets/javascripts/discourse/widgets/quick-access-notifications.js
@@ -7,7 +7,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-notifications", {
   emptyStatePlaceholderItemKey: "notifications.empty",
 
   markReadRequest() {
-    return ajax("/notifications/mark-read", { method: "PUT" });
+    return ajax("/notifications/mark-read", { type: "PUT" });
   },
 
   newItemsLoaded() {
diff --git a/app/assets/javascripts/pretty-text/upload-short-url.js b/app/assets/javascripts/pretty-text/upload-short-url.js
index 401d73dff0..87d948693d 100644
--- a/app/assets/javascripts/pretty-text/upload-short-url.js
+++ b/app/assets/javascripts/pretty-text/upload-short-url.js
@@ -15,7 +15,7 @@ export function lookupUncachedUploadUrls(urls, ajax) {
   }
 
   return ajax("/uploads/lookup-urls", {
-    method: "POST",
+    type: "POST",
     data: { short_urls: urls }
   }).then(uploads => {
     uploads.forEach(upload => {
diff --git a/test/javascripts/models/rest-model-test.js b/test/javascripts/models/rest-model-test.js
index 8213e96e8d..c6aea1e7dd 100644
--- a/test/javascripts/models/rest-model-test.js
+++ b/test/javascripts/models/rest-model-test.js
@@ -100,13 +100,11 @@ QUnit.test("creating simultaneously", assert => {
   });
 });
 
-QUnit.test("destroyRecord", assert => {
+QUnit.test("destroyRecord", async assert => {
   const store = createStore();
-  return store.find("widget", 123).then(function(widget) {
-    widget.destroyRecord().then(function(result) {
-      assert.ok(result);
-    });
-  });
+  const widget = await store.find("widget", 123);
+
+  assert.ok(await widget.destroyRecord());
 });
 
 QUnit.test("custom api name", async assert => {
diff --git a/test/javascripts/models/store-test.js b/test/javascripts/models/store-test.js
index 2e220b152c..386094151c 100644
--- a/test/javascripts/models/store-test.js
+++ b/test/javascripts/models/store-test.js
@@ -114,21 +114,18 @@ QUnit.test("findAll", async assert => {
   assert.equal(widget.get("name"), "Evil Repellant");
 });
 
-QUnit.test("destroyRecord", function(assert) {
+QUnit.test("destroyRecord", async assert => {
   const store = createStore();
-  return store.find("widget", 123).then(function(w) {
-    store.destroyRecord("widget", w).then(function(result) {
-      assert.ok(result);
-    });
-  });
+  const widget = await store.find("widget", 123);
+
+  assert.ok(await store.destroyRecord("widget", widget));
 });
 
-QUnit.test("destroyRecord when new", function(assert) {
+QUnit.test("destroyRecord when new", async assert => {
   const store = createStore();
-  const w = store.createRecord("widget", { name: "hello" });
-  store.destroyRecord("widget", w).then(function(result) {
-    assert.ok(result);
-  });
+  const widget = store.createRecord("widget", { name: "hello" });
+
+  assert.ok(await store.destroyRecord("widget", widget));
 });
 
 QUnit.test("find embedded", async assert => {

From 257f59f36643a33afa084fcbd69a25e7e0399cce Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 27 Mar 2020 03:41:56 +0530
Subject: [PATCH 309/633] FEATURE: option to update child theme components via
 theme CLI.

https://github.com/discourse/discourse_theme/commit/423ce44112ac1ac56eaafa36252b7d7eea04193f
---
 app/controllers/admin/themes_controller.rb |  3 ++-
 app/models/remote_theme.rb                 | 24 +++++++++++++++++++---
 app/models/theme.rb                        |  4 +++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index d6bc528c3f..00e17991b8 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -97,9 +97,10 @@ class Admin::ThemesController < Admin::AdminController
       # params[:bundle] used by theme CLI. params[:theme] used by admin UI
       bundle = params[:bundle] || params[:theme]
       theme_id = params[:theme_id]
+      update_components = params[:components]
       match_theme_by_name = !!params[:bundle] && !params.key?(:theme_id) # Old theme CLI behavior, match by name. Remove Jan 2020
       begin
-        @theme = RemoteTheme.update_zipped_theme(bundle.path, bundle.original_filename, match_theme: match_theme_by_name, user: theme_user, theme_id: theme_id)
+        @theme = RemoteTheme.update_zipped_theme(bundle.path, bundle.original_filename, match_theme: match_theme_by_name, user: theme_user, theme_id: theme_id, update_components: update_components)
         log_theme_change(nil, @theme)
         render json: @theme, status: :created
       rescue RemoteTheme::ImportError => e
diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index e95fe25c51..292ba79d7e 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -30,17 +30,22 @@ class RemoteTheme < ActiveRecord::Base
     raise ImportError.new I18n.t("themes.import_error.about_json")
   end
 
-  def self.update_zipped_theme(filename, original_filename, match_theme: false, user: Discourse.system_user, theme_id: nil)
+  def self.update_zipped_theme(filename, original_filename, match_theme: false, user: Discourse.system_user, theme_id: nil, update_components: nil)
     importer = ThemeStore::ZipImporter.new(filename, original_filename)
     importer.import!
 
     theme_info = RemoteTheme.extract_theme_info(importer)
     theme = Theme.find_by(name: theme_info["name"]) if match_theme # Old theme CLI method, remove Jan 2020
     theme = Theme.find_by(id: theme_id) if theme_id # New theme CLI method
-    theme ||= Theme.new(user_id: user&.id || -1, name: theme_info["name"])
+
+    existing = true
+    if theme.blank?
+      theme = Theme.new(user_id: user&.id || -1, name: theme_info["name"])
+      existing = false
+    end
 
     theme.component = theme_info["component"].to_s == "true"
-    theme.child_components = theme_info["components"].presence || []
+    theme.child_components = child_components = theme_info["components"].presence || []
 
     remote_theme = new
     remote_theme.theme = theme
@@ -48,6 +53,19 @@ class RemoteTheme < ActiveRecord::Base
     remote_theme.update_from_remote(importer, skip_update: true)
 
     theme.save!
+
+    if existing && update_components.present? && update_components != "none"
+      child_components = child_components.map { |url| ThemeStore::GitImporter.new(url.strip).url }
+
+      if update_components == "sync"
+        ChildTheme.joins(child_theme: :remote_theme).where("remote_themes.remote_url NOT IN (?)", child_components).delete_all
+      end
+
+      child_components -= theme.child_themes.joins(:remote_theme).where("remote_themes.remote_url IN (?)", child_components).pluck("remote_themes.remote_url")
+      theme.child_components = child_components
+      theme.update_child_components
+    end
+
     theme
   ensure
     begin
diff --git a/app/models/theme.rb b/app/models/theme.rb
index c20e04d905..69f6c2899e 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -25,6 +25,8 @@ class Theme < ActiveRecord::Base
 
   validate :component_validations
 
+  after_create :update_child_components
+
   scope :user_selectable, ->() {
     where('user_selectable OR id = ?', SiteSetting.default_theme_id)
   }
@@ -70,7 +72,7 @@ class Theme < ActiveRecord::Base
     notify_theme_change(with_scheme: notify_with_scheme)
   end
 
-  after_create do
+  def update_child_components
     if !component? && child_components.present?
       child_components.each do |url|
         url = ThemeStore::GitImporter.new(url.strip).url

From bed3f7f69a718a0b47199e09bc1570a3164597a8 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 27 Mar 2020 10:14:13 +1100
Subject: [PATCH 310/633] DEV: long poll for 20 extra minutes when user stops
 interacting

We have no way of detecting if a browser window is behind another window
or off screen on a virtual desktop.

In some cases we may want events to be delivered quicker to the browser.
Specifically a user may still have a window in view but is not interacting.

This gives users 20 minutes of extra "long polling time" prior to shifting
to short polling.
---
 app/assets/javascripts/discourse/initializers/message-bus.js | 5 ++++-
 app/assets/javascripts/discourse/lib/user-presence.js        | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js b/app/assets/javascripts/discourse/initializers/message-bus.js
index 61905e42a0..f732065c0f 100644
--- a/app/assets/javascripts/discourse/initializers/message-bus.js
+++ b/app/assets/javascripts/discourse/initializers/message-bus.js
@@ -2,6 +2,8 @@
 import userPresent from "discourse/lib/user-presence";
 import { handleLogoff } from "discourse/lib/ajax";
 
+const LONG_POLL_AFTER_UNSEEN_TIME = 1200000; // 20 minutes
+
 function ajax(opts) {
   if (opts.complete) {
     const oldComplete = opts.complete;
@@ -31,7 +33,8 @@ export default {
       siteSettings = container.lookup("site-settings:main");
 
     messageBus.alwaysLongPoll = Discourse.Environment === "development";
-    messageBus.shouldLongPollCallback = userPresent;
+    messageBus.shouldLongPollCallback = () =>
+      userPresent(LONG_POLL_AFTER_UNSEEN_TIME);
 
     // we do not want to start anything till document is complete
     messageBus.stop();
diff --git a/app/assets/javascripts/discourse/lib/user-presence.js b/app/assets/javascripts/discourse/lib/user-presence.js
index 67d332981f..7d6e02d737 100644
--- a/app/assets/javascripts/discourse/lib/user-presence.js
+++ b/app/assets/javascripts/discourse/lib/user-presence.js
@@ -10,10 +10,11 @@ const MAX_UNSEEN_TIME = 60000;
 
 let seenUserTime = Date.now();
 
-export default function() {
+export default function(maxUnseenTime) {
+  maxUnseenTime = maxUnseenTime === undefined ? MAX_UNSEEN_TIME : maxUnseenTime;
   const now = Date.now();
 
-  if (seenUserTime + MAX_UNSEEN_TIME < now) {
+  if (seenUserTime + maxUnseenTime < now) {
     return false;
   }
 

From 33350c31c07330e8dec8e5ba35ee8de6728a1c6a Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 26 Mar 2020 19:15:33 -0400
Subject: [PATCH 311/633] UX: Align bulk select menu toggle relative to main
 wrapper when possible

---
 .../discourse/components/bulk-select-button.js  | 15 +++++++++++++++
 app/assets/stylesheets/desktop/topic-list.scss  | 17 ++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js b/app/assets/javascripts/discourse/components/bulk-select-button.js
index 1070402ca0..11beee344e 100644
--- a/app/assets/javascripts/discourse/components/bulk-select-button.js
+++ b/app/assets/javascripts/discourse/components/bulk-select-button.js
@@ -1,9 +1,24 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import showModal from "discourse/lib/show-modal";
 
 export default Component.extend({
   classNames: ["bulk-select-container"],
 
+  didInsertElement() {
+    this._super(...arguments);
+
+    schedule("afterRender", () => {
+      let mainOutletPadding =
+        window.getComputedStyle(document.querySelector("#main-outlet"))
+          .paddingTop || 0;
+
+      document.querySelector(
+        ".bulk-select-container"
+      ).style.top = mainOutletPadding;
+    });
+  },
+
   actions: {
     showBulkActions() {
       const controller = showModal("topic-bulk-actions", {
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 03ab18a8b9..13e1d03da1 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -188,13 +188,28 @@
   }
 }
 
+.bulk-select-container {
+  @supports (position: sticky) {
+    @media screen and (min-width: 1250px) {
+      position: sticky;
+      position: -webkit-sticky;
+    }
+  }
+}
+
 #bulk-select {
   position: fixed;
   right: 20px;
   top: 130px;
-  padding: 5px;
   background-color: $secondary;
   z-index: z("dropdown");
+  @supports (position: sticky) {
+    @media screen and (min-width: 1250px) {
+      position: absolute;
+      right: -60px;
+      top: 0;
+    }
+  }
 }
 
 button.dismiss-read {

From 40b6e278a08d58ffd9525c52318daac397465b37 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 27 Mar 2020 12:41:06 +1100
Subject: [PATCH 312/633] FIX: ensure wiki editor is assigned consistently

`DISTINCT ON` was not providing stability, this ensures the backfill will
be stable on a specific post avoiding risk around double grants.
---
 lib/badge_queries.rb      | 18 ++++++++++++------
 spec/models/badge_spec.rb | 22 +++++++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/lib/badge_queries.rb b/lib/badge_queries.rb
index 1c42e99b7b..8348087873 100644
--- a/lib/badge_queries.rb
+++ b/lib/badge_queries.rb
@@ -103,12 +103,18 @@ module BadgeQueries
   SQL
 
   WikiEditor = <<~SQL
-    SELECT DISTINCT ON (pr.user_id) pr.user_id, pr.post_id, pr.created_at granted_at
-    FROM post_revisions pr
-    JOIN badge_posts p on p.id = pr.post_id
-    WHERE p.wiki
-        AND NOT pr.hidden
-        AND (:backfill OR p.id IN (:post_ids))
+    SELECT pr2.user_id, pr2.post_id, pr2.created_at granted_at
+    FROM
+    (
+      SELECT min(pr.id) id
+      FROM post_revisions pr
+      JOIN badge_posts p on p.id = pr.post_id
+      WHERE p.wiki
+          AND NOT pr.hidden
+          AND (:backfill OR p.id IN (:post_ids))
+      GROUP BY pr.user_id
+    ) as X
+    JOIN post_revisions pr2 ON pr2.id = X.id
   SQL
 
   Welcome = <<~SQL
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index bd1639a69c..221569de08 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -3,13 +3,6 @@
 require 'rails_helper'
 
 describe Badge do
-  it { is_expected.to belong_to(:badge_type) }
-  it { is_expected.to belong_to(:badge_grouping) }
-  it { is_expected.to have_many(:user_badges).dependent(:destroy) }
-
-  it { is_expected.to validate_presence_of(:name) }
-  it { is_expected.to validate_presence_of(:badge_type) }
-  it { is_expected.to validate_uniqueness_of(:name) }
 
   it 'has a valid system attribute for new badges' do
     expect(Badge.create!(name: "test", badge_type_id: 1).system?).to be false
@@ -151,6 +144,21 @@ describe Badge do
     end
   end
 
+  context "WikiEditor badge" do
+
+    it "is awarded" do
+      wiki_editor_badge = Badge.find(Badge::WikiEditor)
+      post = Fabricate(:post, wiki: true)
+      revisor = PostRevisor.new(post)
+      revisor.revise!(post.user, { raw: "I am editing a wiki" }, force_new_version: true)
+
+      BadgeGranter.backfill(wiki_editor_badge)
+
+      expect(UserBadge.where(user_id: post.user.id, badge_id: Badge::WikiEditor).count).to eq(1)
+    end
+
+  end
+
   context "PopularLink badge" do
 
     let(:popular_link_badge) do

From 0cb40fe9ed5b97214a41e48de6d6d9c94819ff16 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 27 Mar 2020 12:17:18 +1000
Subject: [PATCH 313/633] FIX: Narrative bot not working for bookmarks with
 reminders (#9289)

Reported https://meta.discourse.org/t/improved-bookmarks-with-reminders/144542/42?u=mjrbrennan

* There was no callback on the bookmark model to trigger the next step of the narrative bot on bookmark.
* Also the translation URL path was hardcoded, needs to be conditional based on whether the site setting is enabled.
---
 .../config/locales/server.en.yml              |  2 +-
 .../new_user_narrative.rb                     |  8 ++++++-
 plugins/discourse-narrative-bot/plugin.rb     |  8 +++++++
 .../new_user_narrative_spec.rb                | 21 ++++++++++++++++++-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index 1aa80d2df1..86d081b5bb 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -244,7 +244,7 @@ en:
         instructions: |-
           If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message**. If you do, there may be a :gift: in your future!
         reply: |-
-          Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{profile_page_url}/activity/bookmarks). Just select your profile picture at the upper right &#8599;
+          Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{bookmark_url}). Just select your profile picture at the upper right &#8599;
         not_found: |-
           Uh oh, I don’t see any bookmarks in this topic. Did you find the bookmark under each post? Use the show more <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> to reveal additional actions if needed.
 
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index 8d033ac6be..0acd31d5bb 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -233,8 +233,14 @@ module DiscourseNarrativeBot
       return unless valid_topic?(@post.topic_id)
       return unless @post.user_id == self.discobot_user.id
 
+      profile_page_url = url_helpers(:user_url, username: @user.username)
+      bookmark_url = if SiteSetting.enable_bookmarks_with_reminders?
+        "#{profile_page_url}/activity/bookmarks-with-reminders"
+      else
+        "#{profile_page_url}/activity/bookmarks"
+      end
       raw = <<~RAW
-        #{I18n.t("#{I18N_KEY}.bookmark.reply", i18n_post_args(profile_page_url: url_helpers(:user_url, username: @user.username)))}
+        #{I18n.t("#{I18N_KEY}.bookmark.reply", i18n_post_args(bookmark_url: bookmark_url))}
 
         #{instance_eval(&@next_instructions)}
       RAW
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index ea145c4873..3acbcc7a92 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -240,6 +240,14 @@ after_initialize do
     end
   end
 
+  self.add_model_callback(Bookmark, :after_commit, on: :create) do
+    if SiteSetting.enable_bookmarks_with_reminders?
+      if self.post && self.user.enqueue_narrative_bot_job?
+        Jobs.enqueue(:bot_input, user_id: self.user_id, post_id: self.post_id, input: :bookmark)
+      end
+    end
+  end
+
   self.on(:topic_notification_level_changed) do |_, user_id, topic_id|
     user = User.find_by(id: user_id)
 
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
index bb642a733e..6648337caf 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -256,7 +256,26 @@ describe DiscourseNarrativeBot::NewUserNarrative do
         profile_page_url = "#{Discourse.base_url}/u/#{user.username}"
 
         expected_raw = <<~RAW
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', profile_page_url: profile_page_url, base_uri: '')}
+          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', bookmark_url: "#{profile_page_url}/activity/bookmarks", base_uri: '')}
+
+          #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.instructions', base_uri: '')}
+        RAW
+
+        expect(new_post.raw).to eq(expected_raw.chomp)
+        expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_onebox)
+      end
+
+      it 'should create the right reply when bookmarks with reminders are enabled' do
+        SiteSetting.enable_bookmarks_with_reminders = true
+        post.update!(user: discobot_user)
+        narrative.expects(:enqueue_timeout_job).with(user)
+
+        narrative.input(:bookmark, user, post: post)
+        new_post = Post.last
+        profile_page_url = "#{Discourse.base_url}/u/#{user.username}"
+
+        expected_raw = <<~RAW
+          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', bookmark_url: "#{profile_page_url}/activity/bookmarks-with-reminders", base_uri: '')}
 
           #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.instructions', base_uri: '')}
         RAW

From 57321b90f09a321bf7baaa0b4547c4070b3548e6 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 27 Mar 2020 07:38:55 -0300
Subject: [PATCH 314/633] Completely remove read only mode during backups
 (#9279)

---
 lib/backup_restore/backuper.rb | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index 0ae246dd88..ae7cee8696 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -34,9 +34,6 @@ module BackupRestore
 
       update_metadata
 
-      ### READ-ONLY / START ###
-      enable_readonly_mode
-
       begin
         pause_sidekiq
         wait_for_sidekiq
@@ -45,9 +42,6 @@ module BackupRestore
         unpause_sidekiq
       end
 
-      disable_readonly_mode
-      ### READ-ONLY / END ###
-
       log "Finalizing backup..."
 
       @with_uploads ? create_archive : move_dump_backup
@@ -106,7 +100,6 @@ module BackupRestore
         end
 
       @logs = []
-      @readonly_mode_was_enabled = Discourse.readonly_mode?
     end
 
     def listen_for_shutdown_signal
@@ -134,12 +127,6 @@ module BackupRestore
       BackupMetadata.create!(name: "multisite", value: Rails.configuration.multisite)
     end
 
-    def enable_readonly_mode
-      return if @readonly_mode_was_enabled
-      log "Enabling readonly mode..."
-      Discourse.enable_readonly_mode
-    end
-
     def pause_sidekiq
       log "Pausing sidekiq..."
       Sidekiq.pause!
@@ -364,7 +351,6 @@ module BackupRestore
       log "Cleaning stuff up..."
       delete_uploaded_archive
       remove_tar_leftovers
-      disable_readonly_mode if Discourse.readonly_mode?
       mark_backup_as_not_running
       refresh_disk_space
     end
@@ -411,14 +397,6 @@ module BackupRestore
       log "Something went wrong while unpausing Sidekiq.", ex
     end
 
-    def disable_readonly_mode
-      return if @readonly_mode_was_enabled
-      log "Disabling readonly mode..."
-      Discourse.disable_readonly_mode
-    rescue => ex
-      log "Something went wrong while disabling readonly mode.", ex
-    end
-
     def mark_backup_as_not_running
       log "Marking backup as finished..."
       BackupRestore.mark_as_not_running!

From e6e6d209125f37bbcb5da9e5ec87c78f36cf8f9c Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 27 Mar 2020 11:43:00 +0000
Subject: [PATCH 315/633] Revert "DEV: Enable and fix link-href-attributes
 lint"

Introducing an href attribute on the upload button caused the page to reload when clicked

This reverts commit a17fa222afff6e035d5b610487d6888896913d35.
---
 .template-lintrc.js                                             | 1 -
 .../javascripts/discourse/templates/components/share-panel.hbs  | 2 +-
 .../javascripts/discourse/templates/components/share-popup.hbs  | 2 +-
 app/assets/javascripts/discourse/templates/composer.hbs         | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 85a2b8381e..7c94a35a76 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -11,7 +11,6 @@ module.exports = {
     "img-alt-attributes": false,
     "linebreak-style": true,
     "link-rel-noopener": true,
-    "link-href-attributes": true,
     "no-abstract-roles": true,
     "no-args-paths": true,
     "no-attrs-in-components": true,
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index 4a2b9935cf..1808d6cc1f 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -4,7 +4,7 @@
 
 <div class="body">
   {{textarea value=shareUrl class="topic-share-url"}}
-  <div class="topic-share-url-for-touch"><a href>{{! set by component }}</a></div>
+  <div class="topic-share-url-for-touch"><a></a></div>
 
   <div class="sources">
     {{#each sources as |source|}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 38641694bd..54e8029cf6 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -8,7 +8,7 @@
 
 <div>
   <input type="text">
-  <div class="share-for-touch"><div class="overflow-ellipsis"><a href>{{! set by component }}</a></div></div>
+  <div class="share-for-touch"><div class="overflow-ellipsis"><a></a></div></div>
 </div>
 
 <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index e86aefbfe3..43af40a527 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -191,7 +191,7 @@
 
               {{#if site.mobileView}}
                 {{#if allowUpload}}
-                  <a href class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
+                  <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
                     {{d-icon uploadIcon}}
                   </a>
                 {{/if}}

From 1b09a0cd1782364f95ec359d76398ec66e060c82 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 27 Mar 2020 13:29:58 +0100
Subject: [PATCH 316/633] UX: improves date-time-input on mobile (#9291)

---
 .../javascripts/discourse/components/date-time-input.js     | 1 +
 app/assets/stylesheets/common/components/date-input.scss    | 3 +++
 .../stylesheets/common/components/date-time-input.scss      | 6 ++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/components/date-time-input.js
index eff8b99edc..592b94a33a 100644
--- a/app/assets/javascripts/discourse/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/components/date-time-input.js
@@ -32,6 +32,7 @@ export default Component.extend({
 
     onChangeDate(date) {
       if (this.onChange) {
+        date = new Date(this.date);
         const year = date.getFullYear();
         const month = date.getMonth();
         const day = date.getDate();
diff --git a/app/assets/stylesheets/common/components/date-input.scss b/app/assets/stylesheets/common/components/date-input.scss
index 583039a001..7917f408d0 100644
--- a/app/assets/stylesheets/common/components/date-input.scss
+++ b/app/assets/stylesheets/common/components/date-input.scss
@@ -1,4 +1,7 @@
 .d-date-input {
+  display: flex;
+  flex: 1;
+
   .date-picker {
     margin: 0;
     text-align: left;
diff --git a/app/assets/stylesheets/common/components/date-time-input.scss b/app/assets/stylesheets/common/components/date-time-input.scss
index 634bc21961..1ebe50f9f9 100644
--- a/app/assets/stylesheets/common/components/date-time-input.scss
+++ b/app/assets/stylesheets/common/components/date-time-input.scss
@@ -2,14 +2,16 @@
   display: flex;
   align-items: center;
   border: 1px solid $primary-low;
-  width: 258px;
   box-sizing: border-box;
   position: relative;
   flex: 1;
-  justify-content: space-between;
 
   .date-picker,
   .fields {
     border: 0;
   }
+
+  .d-date-time-input {
+    margin-left: auto;
+  }
 }

From eda8f319a2f84e4c54a5433eeaf070ceb402d69a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 27 Mar 2020 14:15:14 +0100
Subject: [PATCH 317/633] FIX: keep date object (#9292)

---
 app/assets/javascripts/discourse/components/date-time-input.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/components/date-time-input.js
index 592b94a33a..eff8b99edc 100644
--- a/app/assets/javascripts/discourse/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/components/date-time-input.js
@@ -32,7 +32,6 @@ export default Component.extend({
 
     onChangeDate(date) {
       if (this.onChange) {
-        date = new Date(this.date);
         const year = date.getFullYear();
         const month = date.getMonth();
         const day = date.getDate();

From c721bdb3005278e990f0cae0cfcfaa1892bc893c Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 27 Mar 2020 10:02:48 -0500
Subject: [PATCH 318/633] DEV: Add build_plugin_html to wizard head (#9293)

---
 app/views/wizard/index.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/wizard/index.html.erb b/app/views/wizard/index.html.erb
index 382f68b433..a4ca2cb460 100644
--- a/app/views/wizard/index.html.erb
+++ b/app/views/wizard/index.html.erb
@@ -9,6 +9,7 @@
     <%= preload_script 'wizard-vendor' %>
     <%= preload_script 'wizard-application' %>
     <%= preload_script_url ExtraLocalesController.url('wizard') %>
+    <%= build_plugin_html 'wizard:head' %>
     <%= csrf_meta_tags %>
 
     <%= render partial: "layouts/head" %>

From 38e347aee6c9bd4ab8fb6e88fec647fa97d23999 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 27 Mar 2020 16:50:31 +0100
Subject: [PATCH 319/633] DEV: allows to decorate topic list item (#9294)

Co-authored-by: David Taylor <david@taylorhq.com>
---
 .../discourse/components/topic-list-item.js   | 14 +++++++++
 .../discourse/components/topic-title.js       | 29 ++++++++++++++++++-
 .../javascripts/discourse/lib/plugin-api.js   | 23 ++++++++++++++-
 test/javascripts/acceptance/topic-test.js     | 28 ++++++++++++++++++
 test/javascripts/helpers/qunit-helpers.js     |  2 ++
 5 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js b/app/assets/javascripts/discourse/components/topic-list-item.js
index 7bc2d64603..0746ed95f6 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js
@@ -7,6 +7,8 @@ import { findRawTemplate } from "discourse/lib/raw-templates";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { on } from "@ember/object/evented";
 
+import { topicTitleDecorators } from "discourse/components/topic-title";
+
 export function showEntrance(e) {
   let target = $(e.target);
 
@@ -67,6 +69,18 @@ export default Component.extend({
         }
       });
     }
+
+    schedule("afterRender", () => {
+      if (this.element && !this.isDestroying && !this.isDestroyed) {
+        const rawTopicLink = this.element.querySelector(".raw-topic-link");
+
+        rawTopicLink &&
+          topicTitleDecorators &&
+          topicTitleDecorators.forEach(cb =>
+            cb(this.topic, rawTopicLink, "topic-list-item-title")
+          );
+      }
+    });
   },
 
   willDestroyElement() {
diff --git a/app/assets/javascripts/discourse/components/topic-title.js b/app/assets/javascripts/discourse/components/topic-title.js
index 7bbc478cb3..82d41f4ad0 100644
--- a/app/assets/javascripts/discourse/components/topic-title.js
+++ b/app/assets/javascripts/discourse/components/topic-title.js
@@ -1,6 +1,33 @@
 import Component from "@ember/component";
 import KeyEnterEscape from "discourse/mixins/key-enter-escape";
+import { schedule } from "@ember/runloop";
+
+export let topicTitleDecorators = [];
+
+export function addTopicTitleDecorator(decorator) {
+  topicTitleDecorators.push(decorator);
+}
+
+export function resetTopicTitleDecorators() {
+  topicTitleDecorators = [];
+}
 
 export default Component.extend(KeyEnterEscape, {
-  elementId: "topic-title"
+  elementId: "topic-title",
+
+  didInsertElement() {
+    this._super(...arguments);
+
+    schedule("afterRender", () => {
+      if (this.element && !this.isDestroying && !this.isDestroyed) {
+        const fancyTitle = this.element.querySelector(".fancy-title");
+
+        fancyTitle &&
+          topicTitleDecorators &&
+          topicTitleDecorators.forEach(cb =>
+            cb(this.model, fancyTitle, "topic-title")
+          );
+      }
+    });
+  }
 });
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js b/app/assets/javascripts/discourse/lib/plugin-api.js
index 9439b16319..aaafba5b4c 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js
@@ -3,6 +3,7 @@ import deprecated from "discourse-common/lib/deprecated";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { addDecorator } from "discourse/widgets/post-cooked";
 import { addPluginOutletDecorator } from "discourse/components/plugin-connector";
+import { addTopicTitleDecorator } from "discourse/components/topic-title";
 import ComposerEditor from "discourse/components/composer-editor";
 import DiscourseBanner from "discourse/components/discourse-banner";
 import { addButton } from "discourse/widgets/post-menu";
@@ -54,7 +55,7 @@ import { on } from "@ember/object/evented";
 import KeyboardShortcuts, { bindings } from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.39";
+const PLUGIN_API_VERSION = "0.8.40";
 
 class PluginApi {
   constructor(version, container) {
@@ -1017,6 +1018,26 @@ class PluginApi {
   decoratePluginOutlet(outletName, callback, opts) {
     addPluginOutletDecorator(outletName, callback, opts || {});
   }
+
+  /**
+   * Allows altering the topic title in the topic list, and in the topic view
+   *
+   * topicTitleType can be `topic-title` or `topic-list-item-title`
+   *
+   * For example, to replace the topic title:
+   *
+   * ```
+   * api.decorateTopicTitle(
+   *   (topicModel, node, topicTitleType) => {
+   *     node.innerText("my new topic title");
+   *   }
+   * );
+   * ```
+   *
+   **/
+  decorateTopicTitle(callback) {
+    addTopicTitleDecorator(callback);
+  }
 }
 
 let _pluginv01;
diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js
index af05e5fc9e..68e6ab2c8a 100644
--- a/test/javascripts/acceptance/topic-test.js
+++ b/test/javascripts/acceptance/topic-test.js
@@ -1,3 +1,4 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
 import selectKit from "helpers/select-kit-helper";
 import { acceptance } from "helpers/qunit-helpers";
 import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
@@ -358,3 +359,30 @@ QUnit.test("Bookmarks Modal", async assert => {
   await click(".topic-post:first-child button.bookmark");
   assert.ok(exists("#bookmark-reminder-modal"), "it shows the bookmark modal");
 });
+
+acceptance("Topic with title decorated", {
+  loggedIn: true,
+  beforeEach() {
+    withPluginApi("0.8.40", api => {
+      api.decorateTopicTitle((topic, node, topicTitleType) => {
+        node.innerText = `${node.innerText}-${topic.id}-${topicTitleType}`;
+      });
+    });
+  }
+});
+
+QUnit.test("Decorate topic title", async assert => {
+  await visit("/t/internationalization-localization/280");
+
+  assert.ok(
+    find(".fancy-title")[0].innerText.endsWith("-280-topic-title"),
+    "it decorates topic title"
+  );
+
+  assert.ok(
+    find(".raw-topic-link:nth-child(1)")[0].innerText.endsWith(
+      "-27331-topic-list-item-title"
+    ),
+    "it decorates topic list item title"
+  );
+});
diff --git a/test/javascripts/helpers/qunit-helpers.js b/test/javascripts/helpers/qunit-helpers.js
index 4b6ed9330f..e0621c294d 100644
--- a/test/javascripts/helpers/qunit-helpers.js
+++ b/test/javascripts/helpers/qunit-helpers.js
@@ -16,6 +16,7 @@ import { clearRewrites } from "discourse/lib/url";
 import { initSearchData } from "discourse/widgets/search-menu";
 import { resetDecorators } from "discourse/widgets/widget";
 import { resetWidgetCleanCallbacks } from "discourse/components/mount-widget";
+import { resetTopicTitleDecorators } from "discourse/components/topic-title";
 import { resetDecorators as resetPostCookedDecorators } from "discourse/widgets/post-cooked";
 import { resetDecorators as resetPluginOutletDecorators } from "discourse/components/plugin-connector";
 import { resetCache as resetOneboxCache } from "pretty-text/oneboxer";
@@ -129,6 +130,7 @@ export function acceptance(name, options) {
       resetDecorators();
       resetPostCookedDecorators();
       resetPluginOutletDecorators();
+      resetTopicTitleDecorators();
       resetOneboxCache();
       resetCustomPostMessageCallbacks();
       Discourse._runInitializer("instanceInitializers", function(

From b2b7afd31085aa0c15e6dfdf84f9ee994659b70d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 27 Mar 2020 12:06:14 -0400
Subject: [PATCH 320/633] Rename the server side widget hbs compiler

---
 lib/discourse_js_processor.rb                                   | 2 +-
 .../{widget-hbs-compiler.js.es6 => widget-hbs-compiler.js}      | 0
 script/compile_hbs.rb                                           | 2 +-
 script/test_hbs_compiler.rb                                     | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/javascripts/{widget-hbs-compiler.js.es6 => widget-hbs-compiler.js} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index ebe2559982..7417207ff5 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -88,7 +88,7 @@ class DiscourseJsProcessor
       }
 
 JS
-      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
       js_source = ::JSON.generate(source, quirks_mode: true)
       js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
       ctx.eval(js)
diff --git a/lib/javascripts/widget-hbs-compiler.js.es6 b/lib/javascripts/widget-hbs-compiler.js
similarity index 100%
rename from lib/javascripts/widget-hbs-compiler.js.es6
rename to lib/javascripts/widget-hbs-compiler.js
diff --git a/script/compile_hbs.rb b/script/compile_hbs.rb
index cfec4386a2..ee072ea35d 100644
--- a/script/compile_hbs.rb
+++ b/script/compile_hbs.rb
@@ -14,7 +14,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
 js_source = ::JSON.generate(source, quirks_mode: true)
 js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
 ctx.eval(js)
diff --git a/script/test_hbs_compiler.rb b/script/test_hbs_compiler.rb
index badbd227e4..f3c5be35c1 100644
--- a/script/test_hbs_compiler.rb
+++ b/script/test_hbs_compiler.rb
@@ -22,7 +22,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
 ctx.eval(source)
 
 js_source = ::JSON.generate(template, quirks_mode: true)

From 7ff889574d85464b946b4cc140e637ab9ed62cff Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 27 Mar 2020 17:35:40 +0100
Subject: [PATCH 321/633] DEV: Add rubocop-rspec (#9288)

This adds rubocop-rspec, and enables some cops that were either already passing or are passing now, after fixing them in this commit.

Some new cops are disabled for now, with annotation: "TODO" or "To be decided". Those either need to be discussed first, or require manual changes, or the number of found and fixed offenses is too large to bundle them up in a single PR.

Includes:

* DEV: Update rubocop's `TargetRubyVersion` to 2.6
* DEV: Enable RSpec/VoidExpect
* DEV: Enable RSpec/SharedContext
* DEV: Enable RSpec/EmptyExampleGroup (Removed an obsolete empty spec file)
* DEV: Enable RSpec/ItBehavesLike
* DEV: Remove RSpec/ScatteredLet (It's too strict, as it doesn't recognize fab! as a let-like)
* DEV: Remove RSpec/MultipleExpectations
---
 .rubocop.yml                                  | 212 +++++++++++++++++-
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   3 +
 spec/lib/backup_restore/restorer_spec.rb      |   7 -
 spec/lib/seed_data/categories_spec.rb         |   2 +-
 .../lib/topic_upload_security_manager_spec.rb |   8 +-
 spec/mailers/user_notifications_spec.rb       |   2 +-
 spec/models/site_setting_spec.rb              |   2 +-
 spec/models/topic_spec.rb                     |   4 +-
 9 files changed, 224 insertions(+), 17 deletions(-)
 delete mode 100644 spec/lib/backup_restore/restorer_spec.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index f9dafa672c..f74aa303ee 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,8 +1,9 @@
 require:
   - rubocop-discourse
+  - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
   DisabledByDefault: true
   Exclude:
     - "db/schema.rb"
@@ -143,3 +144,212 @@ Style/GlobalVars:
     - 'script/**/*'
     - 'spec/**/*.rb'
     - 'plugins/*/spec/**/*'
+
+# Specs
+
+RSpec/AnyInstance:
+  Enabled: false # To be decided
+
+RSpec/AroundBlock:
+  Enabled: true
+
+RSpec/BeforeAfterAll:
+  Enabled: false # To be decided
+
+RSpec/ContextMethod:
+  Enabled: false # TODO
+
+RSpec/ContextWording:
+  Enabled: false # To be decided
+
+RSpec/DescribeClass:
+  Enabled: false # To be decided
+
+RSpec/DescribeMethod:
+  Enabled: true
+
+RSpec/DescribeSymbol:
+  Enabled: false # To be decided
+
+RSpec/DescribedClass:
+  Enabled: false # To be decided
+
+RSpec/DescribedClassModuleWrapping:
+  Enabled: false # To be decided
+
+RSpec/EmptyExampleGroup:
+  Enabled: true
+
+RSpec/EmptyLineAfterExample:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterExampleGroup:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterFinalLet:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterHook:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterSubject:
+  Enabled: false # TODO
+
+RSpec/ExampleLength:
+  Enabled: false # To be decided
+
+RSpec/ExampleWithoutDescription:
+  Enabled: true
+
+RSpec/ExampleWording:
+  Enabled: false # TODO
+
+RSpec/ExpectActual:
+  Enabled: true
+
+RSpec/ExpectChange:
+  Enabled: false # To be decided
+
+RSpec/ExpectInHook:
+  Enabled: false # To be decided
+
+RSpec/ExpectOutput:
+  Enabled: true
+
+RSpec/FilePath:
+  Enabled: false # To be decided
+
+RSpec/Focus:
+  Enabled: true
+
+RSpec/HookArgument:
+  Enabled: false # TODO
+
+RSpec/HooksBeforeExamples:
+  Enabled: false # TODO
+
+RSpec/ImplicitBlockExpectation:
+  Enabled: true
+
+RSpec/ImplicitExpect:
+  Enabled: false # To be decided
+
+RSpec/ImplicitSubject:
+  Enabled: false # To be decided
+
+RSpec/InstanceSpy:
+  Enabled: true
+
+RSpec/InstanceVariable:
+  Enabled: false # TODO
+
+RSpec/InvalidPredicateMatcher:
+  Enabled: true
+
+RSpec/ItBehavesLike:
+  Enabled: true
+
+RSpec/IteratedExpectation:
+  Enabled: false # To be decided
+
+RSpec/LeadingSubject:
+  Enabled: false # TODO
+
+RSpec/LeakyConstantDeclaration:
+  Enabled: false # To be decided
+
+RSpec/LetBeforeExamples:
+  Enabled: false # TODO
+
+RSpec/LetSetup:
+  Enabled: false # TODO
+
+RSpec/MessageChain:
+  Enabled: true
+
+RSpec/MessageSpies:
+  Enabled: true
+
+RSpec/MissingExampleGroupArgument:
+  Enabled: true
+
+RSpec/MultipleDescribes:
+  Enabled: false # TODO
+
+RSpec/MultipleSubjects:
+  Enabled: true
+
+RSpec/NamedSubject:
+  Enabled: false # To be decided
+
+RSpec/NestedGroups:
+  Enabled: false # To be decided
+
+RSpec/OverwritingSetup:
+  Enabled: true
+
+RSpec/ReceiveCounts:
+  Enabled: true
+
+RSpec/ReceiveNever:
+  Enabled: true
+
+RSpec/RepeatedDescription:
+  Enabled: false # TODO
+
+RSpec/RepeatedExample:
+  Enabled: false # TODO
+
+RSpec/RepeatedExampleGroupBody:
+  Enabled: false # TODO
+
+RSpec/RepeatedExampleGroupDescription:
+  Enabled: false # TODO
+
+RSpec/ReturnFromStub:
+  Enabled: true
+
+RSpec/ScatteredSetup:
+  Enabled: false # TODO
+
+RSpec/SharedContext:
+  Enabled: true
+
+RSpec/SharedExamples:
+  Enabled: true
+
+RSpec/SingleArgumentMessageChain:
+  Enabled: true
+
+RSpec/SubjectStub:
+  Enabled: true
+
+RSpec/UnspecifiedException:
+  Enabled: true
+
+RSpec/VerifiedDoubles:
+  Enabled: true
+
+RSpec/VoidExpect:
+  Enabled: true
+
+RSpec/Yield:
+  Enabled: true
+
+Capybara/CurrentPathExpectation:
+  Enabled: true
+
+Capybara/FeatureMethods:
+  Enabled: true
+
+FactoryBot/AttributeDefinedStatically:
+  Enabled: true
+
+FactoryBot/CreateList:
+  Enabled: true
+
+FactoryBot/FactoryClassName:
+  Enabled: true
+
+Rails/HttpStatus:
+  Enabled: true
diff --git a/Gemfile b/Gemfile
index 2c0ed01915..9e4b7cb7bf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -180,6 +180,7 @@ group :test, :development do
   gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri
   gem 'rubocop', require: false
   gem "rubocop-discourse", require: false
+  gem "rubocop-rspec", require: false
   gem 'parallel_tests'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index cc1ebd682f..71e97943f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -350,6 +350,8 @@ GEM
       unicode-display_width (>= 1.4.0, < 1.7)
     rubocop-discourse (2.0.1)
       rubocop (>= 0.69.0)
+    rubocop-rspec (1.38.1)
+      rubocop (>= 0.68.1)
     ruby-prof (1.3.1)
     ruby-progressbar (1.10.1)
     ruby-readability (0.7.0)
@@ -527,6 +529,7 @@ DEPENDENCIES
   rtlit
   rubocop
   rubocop-discourse
+  rubocop-rspec
   ruby-prof
   ruby-readability
   rubyzip
diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
deleted file mode 100644
index 47dea3e32d..0000000000
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe BackupRestore::Restorer do
-
-end
diff --git a/spec/lib/seed_data/categories_spec.rb b/spec/lib/seed_data/categories_spec.rb
index 90a58cd996..e848c5ef38 100644
--- a/spec/lib/seed_data/categories_spec.rb
+++ b/spec/lib/seed_data/categories_spec.rb
@@ -33,7 +33,7 @@ describe SeedData::Categories do
       expect(category.user_id).to eq(Discourse::SYSTEM_USER_ID)
       expect(category.category_groups.count).to eq(1)
       expect(category.category_groups.first).to have_attributes(permissions(:staff, :full))
-      expect(Topic.exists?(category.topic_id))
+      expect(Topic.exists?(category.topic_id)).to eq(true)
       expect(description_post(category).raw).to eq(I18n.t("staff_category_description"))
       expect(SiteSetting.staff_category_id).to eq(category.id)
     end
diff --git a/spec/lib/topic_upload_security_manager_spec.rb b/spec/lib/topic_upload_security_manager_spec.rb
index e0800f503c..5947ceecab 100644
--- a/spec/lib/topic_upload_security_manager_spec.rb
+++ b/spec/lib/topic_upload_security_manager_spec.rb
@@ -120,7 +120,7 @@ describe TopicUploadSecurityManager do
         end
 
         it "changes the upload secure status to true and changes the ACL and rebakes the post and sets the access control post" do
-          expect(Post.any_instance.expects(:rebake!).once)
+          Post.any_instance.expects(:rebake!).once
           subject.run
           expect(upload3.reload.secure?).to eq(true)
           expect(upload3.reload.access_control_post).to eq(post4)
@@ -146,7 +146,7 @@ describe TopicUploadSecurityManager do
         end
 
         it "does not change the upload secure status and does not set the access control post" do
-          expect(Post.any_instance.expects(:rebake!).never)
+          Post.any_instance.expects(:rebake!).never
           subject.run
           expect(upload3.reload.secure?).to eq(false)
           expect(upload3.reload.access_control_post).to eq(nil)
@@ -174,14 +174,14 @@ describe TopicUploadSecurityManager do
   end
 
   def expect_upload_status_not_to_change
-    expect(Post.any_instance.expects(:rebake!).never)
+    Post.any_instance.expects(:rebake!).never
     subject.run
     expect(upload.reload.secure?).to eq(true)
     expect(upload2.reload.secure?).to eq(true)
   end
 
   def expect_upload_status_to_change_and_rebake
-    expect(Post.any_instance.expects(:rebake!).twice)
+    Post.any_instance.expects(:rebake!).twice
     subject.run
     expect(upload.reload.secure?).to eq(false)
     expect(upload2.reload.secure?).to eq(false)
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index dd86e29e3c..90f6535cb1 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -968,7 +968,7 @@ describe UserNotifications do
   end
 
   # notification emails derived from templates are translated into the user's locale
-  shared_examples "notification derived from template" do
+  shared_context "notification derived from template" do
     let(:user) { Fabricate(:user, locale: locale) }
     let(:mail_type) { mail_type }
     let(:notification) { Fabricate(:notification, user: user) }
diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb
index 5c8f973ccc..fc18541545 100644
--- a/spec/models/site_setting_spec.rb
+++ b/spec/models/site_setting_spec.rb
@@ -178,7 +178,7 @@ describe SiteSetting do
         end.to change { @fake_logger.warnings.count }.by(2)
 
         expect do
-          expect(SiteSetting.use_https(warn: false))
+          SiteSetting.use_https(warn: false)
         end.to_not change { @fake_logger.warnings }
 
         SiteSetting.use_https = false
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 64ad9b005d..d2661162f7 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -1122,7 +1122,7 @@ describe Topic do
 
     context 'closed' do
       let(:status) { 'closed' }
-      it_should_behave_like 'a status that closes a topic'
+      it_behaves_like 'a status that closes a topic'
 
       it 'should archive group message' do
         group = Fabricate(:group)
@@ -1135,7 +1135,7 @@ describe Topic do
 
     context 'autoclosed' do
       let(:status) { 'autoclosed' }
-      it_should_behave_like 'a status that closes a topic'
+      it_behaves_like 'a status that closes a topic'
 
       context 'topic was set to close when it was created' do
         it 'includes the autoclose duration in the moderator post' do

From 702879cbda52b69179002c4410ac9b8fcfc4b12d Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Fri, 27 Mar 2020 23:01:48 +0530
Subject: [PATCH 322/633] FIX: check for presence of name before normalizing

---
 app/assets/javascripts/discourse/components/about-page-users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/about-page-users.js b/app/assets/javascripts/discourse/components/about-page-users.js
index 92936610d2..ce2589491d 100644
--- a/app/assets/javascripts/discourse/components/about-page-users.js
+++ b/app/assets/javascripts/discourse/components/about-page-users.js
@@ -13,7 +13,7 @@ export default Component.extend({
       let username = user.username;
       let prioritizeName = prioritizeNameInUx(name, this.siteSettings);
       let hideName = false;
-      if (normalize(username) === normalize(name)) {
+      if (name && normalize(username) === normalize(name)) {
         hideName = true;
       }
 

From 9026c55fe468e155c5d82e144888827c1e37a531 Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Fri, 27 Mar 2020 14:16:14 -0400
Subject: [PATCH 323/633] FIX: custom SQL with a trailing comment might break
 BadgeGranter SQL (#9285)

For example given a custom badge with SQL:
```
SELECT 1
-- I am a comment
```

You end up with

```
FROM (SELECT 1
-- I am a comment) q
```

This fix adds newlines so you end up with the now-valid:

```
FROM (
  SELECT 1
-- I am a comment
) q
```
---
 app/services/badge_granter.rb       | 36 ++++++++++++++++++++---------
 spec/services/badge_granter_spec.rb | 11 +++++++++
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 18dc48493f..2249b33692 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -222,13 +222,21 @@ class BadgeGranter
     BadgeGranter.contract_checks!(sql, opts)
 
     # hack to allow for params, otherwise sanitizer will trigger sprintf
-    count_sql = "SELECT COUNT(*) count FROM (#{sql}) q WHERE :backfill = :backfill"
+    count_sql = <<~SQL
+      SELECT COUNT(*) count
+                 FROM (
+                        #{sql}
+                      ) q
+                WHERE :backfill = :backfill
+    SQL
     grant_count = DB.query_single(count_sql, params).first.to_i
 
     grants_sql = if opts[:target_posts]
       <<~SQL
         SELECT u.id, u.username, q.post_id, t.title, q.granted_at
-          FROM (#{sql}) q
+          FROM (
+                 #{sql}
+               ) q
           JOIN users u on u.id = q.user_id
      LEFT JOIN badge_posts p on p.id = q.post_id
      LEFT JOIN topics t on t.id = p.topic_id
@@ -238,7 +246,9 @@ class BadgeGranter
     else
       <<~SQL
         SELECT u.id, u.username, q.granted_at
-         FROM (#{sql}) q
+         FROM (
+                #{sql}
+              ) q
          JOIN users u on u.id = q.user_id
         WHERE :backfill = :backfill
         LIMIT 10
@@ -293,13 +303,15 @@ class BadgeGranter
 
     sql = <<~SQL
       DELETE FROM user_badges
-       WHERE id IN (
-         SELECT ub.id
-           FROM user_badges ub
-      LEFT JOIN (#{badge.query}) q ON q.user_id = ub.user_id
-         #{post_clause}
-         WHERE ub.badge_id = :id AND q.user_id IS NULL
-      )
+        WHERE id IN (
+          SELECT ub.id
+          FROM user_badges ub
+          LEFT JOIN (
+            #{badge.query}
+          ) q ON q.user_id = ub.user_id
+          #{post_clause}
+          WHERE ub.badge_id = :id AND q.user_id IS NULL
+        )
     SQL
 
     DB.exec(
@@ -315,7 +327,9 @@ class BadgeGranter
       WITH w as (
         INSERT INTO user_badges(badge_id, user_id, granted_at, granted_by_id, post_id)
         SELECT :id, q.user_id, q.granted_at, -1, #{post_id_field}
-          FROM (#{badge.query}) q
+          FROM (
+                 #{badge.query}
+               ) q
      LEFT JOIN user_badges ub ON ub.badge_id = :id AND ub.user_id = q.user_id
         #{post_clause}
         /*where*/
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index 362e03dff3..d6e08a1a63 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -47,6 +47,11 @@ describe BadgeGranter do
       expect(result[:grant_count]).to eq(1)
       expect(result[:query_plan]).to be_present
     end
+
+    it 'with badges containing trailing comments do not break generated SQL' do
+      query = Badge.find(1).query + "\n-- a comment"
+      expect(BadgeGranter.preview(query)[:errors]).to be_nil
+    end
   end
 
   describe 'backfill' do
@@ -114,6 +119,12 @@ describe BadgeGranter do
 
       expect(notification_badge_name).not_to eq(name_english)
     end
+
+    it 'with badges containing trailing comments do not break generated SQL' do
+      badge = Fabricate(:badge)
+      badge.query = Badge.find(1).query + "\n-- a comment"
+      expect { BadgeGranter.backfill(badge) }.not_to raise_error
+    end
   end
 
   describe 'grant' do

From 104b647ca4874329717657b228a87450e5ab5a69 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 27 Mar 2020 20:39:25 +0100
Subject: [PATCH 324/633] DEV: Fix another time-sensitive flaky spec

---
 spec/models/topic_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index d2661162f7..525541e414 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -1748,6 +1748,7 @@ describe Topic do
       let(:topic) { Fabricate(:topic, category: category) }
 
       it "should be able to override category's default auto close" do
+        freeze_time
         Jobs.run_immediately!
 
         expect(topic.topic_timers.first.execute_at).to eq_time(topic.created_at + 4.hours)

From a3d47f1aad104402383f1559edeac0e73ce3f59e Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 27 Mar 2020 16:06:40 -0400
Subject: [PATCH 325/633] UX: Better spacing for icons in select-kit labels

Followup to c14e3adac5349b0500fe7d51bd96704d7a813929
---
 app/assets/stylesheets/common/select-kit/select-kit.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index d45978ba64..65a2125971 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -79,12 +79,16 @@
 
       .name {
         display: inline-block;
-        .d-icon {
+        > .d-icon {
           margin-left: 0.5em;
           margin-right: 0;
         }
       }
 
+      > .d-icon {
+        margin-right: 0;
+      }
+
       &.select-kit-selected-color {
         border-bottom-width: 5px;
         border-bottom-style: solid;

From 7a32a995953db70c778f69a9f69a6e5c7f96463e Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Sat, 28 Mar 2020 22:24:43 +0530
Subject: [PATCH 326/633] FIX: Quoting a nested quote should preserve original
 post info.

---
 app/assets/javascripts/discourse/components/quote-button.js | 1 +
 app/assets/javascripts/discourse/lib/utilities.js           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/quote-button.js b/app/assets/javascripts/discourse/components/quote-button.js
index 141d9f32ac..3a9ec42fe0 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js
+++ b/app/assets/javascripts/discourse/components/quote-button.js
@@ -65,6 +65,7 @@ export default Component.extend({
         opts.username = element.dataset.username || getQuoteTitle(element);
         opts.post = element.dataset.post;
         opts.topic = element.dataset.topic;
+        break;
       }
     }
 
diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index e44a60d53a..87aeb9a821 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -149,7 +149,7 @@ export function selectedText() {
 export function selectedElement() {
   const selection = window.getSelection();
   if (selection.rangeCount > 0) {
-    return selection.getRangeAt(0).startContainer.parentElement;
+    return selection.getRangeAt(0).commonAncestorContainer.parentElement;
   }
 }
 

From 3914e9cb5c719f74813597e55367d8bcd59309ae Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Sat, 28 Mar 2020 20:20:51 +0200
Subject: [PATCH 327/633] FIX: get_size_from_image_sizes should return [width,
 height] or nil (#9298)

---
 lib/cooked_post_processor.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 2ec33c0d2c..3cbada96b1 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -268,6 +268,7 @@ class CookedPostProcessor
         return [size["width"], size["height"]]
       end
     end
+    nil
   end
 
   def add_to_size_cache(url, w, h)

From 8ab39f69169d6336c3a319c4c259a41f4d7eaae3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 07:52:04 +0300
Subject: [PATCH 328/633] Build(deps): Bump logster from 2.7.1 to 2.8.0 (#9310)

This includes Font Awesome upgrade to version 5.

Bumps [logster](https://github.com/discourse/logster) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/discourse/logster/releases)
- [Changelog](https://github.com/discourse/logster/blob/master/CHANGELOG.md)
- [Commits](https://github.com/discourse/logster/compare/v2.7.1...v2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 71e97943f9..5dc837b089 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
     logstash-event (1.2.02)
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
-    logster (2.7.1)
+    logster (2.8.0)
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

From 435fe8ac6e17423eb8a786846338f613a39f385a Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 30 Mar 2020 10:35:12 +0530
Subject: [PATCH 329/633] FIX: allow invite email field to be blank for invite
 tokens

---
 app/models/invite.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/invite.rb b/app/models/invite.rb
index bced2785df..2618b37de9 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -18,7 +18,7 @@ class Invite < ActiveRecord::Base
   has_many :topic_invites
   has_many :topics, through: :topic_invites, source: :topic
   validates_presence_of :invited_by_id
-  validates :email, email: true, format: { with: EmailValidator.email_regex }
+  validates :email, email: true, format: { with: EmailValidator.email_regex }, allow_blank: true
 
   before_create do
     self.invite_key ||= SecureRandom.hex

From 92e81d2ae536c1822c2d4b484f79a5a62d1f5c9d Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 30 Mar 2020 09:23:00 -0400
Subject: [PATCH 330/633] UX: Fix composer position on iPads with a hardware
 keyboard

Adds padding to the composer when the keyboard accessory bar is shown (i.e. submit button no longer hides behind said bar)
---
 .../discourse/components/composer-body.js       | 17 +++++++++++++++++
 app/assets/stylesheets/common/base/compose.scss |  8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/composer-body.js b/app/assets/javascripts/discourse/components/composer-body.js
index 1bd4c639ed..80bb8d38bb 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js
+++ b/app/assets/javascripts/discourse/components/composer-body.js
@@ -156,6 +156,23 @@ export default Component.extend(KeyEnterEscape, {
       "--composer-vh",
       `${composerVH}px`
     );
+
+    const viewportWindowDiff =
+      window.innerHeight - window.visualViewport.height;
+
+    // adds bottom padding when using a hardware keyboard and the accessory bar is visible
+    // accessory bar height is 55px, using 75 allows a small buffer
+    if (viewportWindowDiff > 0 && viewportWindowDiff < 75) {
+      document.documentElement.style.setProperty(
+        "--composer-ipad-padding",
+        `${viewportWindowDiff}px`
+      );
+    } else {
+      document.documentElement.style.setProperty(
+        "--composer-ipad-padding",
+        "0px"
+      );
+    }
   },
 
   didInsertElement() {
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 7dca1ac5ea..d67224cc61 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -18,7 +18,7 @@
   }
   z-index: z("composer", "content");
   transition: height 250ms ease, background 250ms ease, transform 250ms ease,
-    max-width 250ms ease;
+    max-width 250ms ease, padding-bottom 250ms ease;
   background-color: $secondary;
   box-shadow: shadow("composer");
 
@@ -496,3 +496,9 @@ body.ios-safari-composer-hacks {
     }
   }
 }
+
+body:not(.ios-safari-composer-hacks) {
+  #reply-control.open {
+    padding-bottom: var(--composer-ipad-padding);
+  }
+}

From 2b78bd01ab2431aa90b642326d170df7c51e492b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 15:23:59 +0200
Subject: [PATCH 331/633] FIX: allows adapters to define a custom primaryKey
 (#9254)

---
 .../javascripts/discourse/adapters/rest.js    |  4 +-
 .../javascripts/discourse/models/store.js     | 59 +++++++++++--------
 test/javascripts/helpers/create-store.js      |  9 +++
 test/javascripts/helpers/store-pretender.js   | 14 +++++
 test/javascripts/models/store-test.js         |  6 ++
 5 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/discourse/adapters/rest.js b/app/assets/javascripts/discourse/adapters/rest.js
index e92f325f84..a2287919dc 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js
+++ b/app/assets/javascripts/discourse/adapters/rest.js
@@ -27,6 +27,8 @@ function rethrow(error) {
 }
 
 export default EmberObject.extend({
+  primaryKey: "id",
+
   storageKey(type, findArgs, options) {
     if (options && options.cacheKey) {
       return options.cacheKey;
@@ -132,7 +134,7 @@ export default EmberObject.extend({
   },
 
   destroyRecord(store, type, record) {
-    return ajax(this.pathFor(store, type, record.get("id")), {
+    return ajax(this.pathFor(store, type, record.get(this.primaryKey)), {
       type: "DELETE"
     });
   }
diff --git a/app/assets/javascripts/discourse/models/store.js b/app/assets/javascripts/discourse/models/store.js
index 1bc9fdf355..94441169e1 100644
--- a/app/assets/javascripts/discourse/models/store.js
+++ b/app/assets/javascripts/discourse/models/store.js
@@ -124,14 +124,14 @@ export default EmberObject.extend({
 
       if (adapter.cache) {
         const stale = adapter.findStale(this, type, findArgs, opts);
-        hydrated = this._updateStale(stale, hydrated);
+        hydrated = this._updateStale(stale, hydrated, adapter.primaryKey);
         adapter.cacheFind(this, type, findArgs, opts, hydrated);
       }
       return hydrated;
     });
   },
 
-  _updateStale(stale, hydrated) {
+  _updateStale(stale, hydrated, primaryKey) {
     if (!stale) {
       return hydrated;
     }
@@ -139,7 +139,7 @@ export default EmberObject.extend({
     hydrated.set(
       "content",
       hydrated.get("content").map(item => {
-        var staleItem = stale.content.findBy("id", item.get("id"));
+        var staleItem = stale.content.findBy(primaryKey, item.get(primaryKey));
         if (staleItem) {
           staleItem.setProperties(item);
         } else {
@@ -186,12 +186,11 @@ export default EmberObject.extend({
   },
 
   update(type, id, attrs) {
-    return this.adapterFor(type).update(this, type, id, attrs, function(
-      result
-    ) {
-      if (result && result[type] && result[type].id) {
+    const adapter = this.adapterFor(type);
+    return adapter.update(this, type, id, attrs, function(result) {
+      if (result && result[type] && result[type][adapter.primaryKey]) {
         const oldRecord = findAndRemoveMap(type, id);
-        storeMap(type, result[type].id, oldRecord);
+        storeMap(type, result[type][adapter.primaryKey], oldRecord);
       }
       return result;
     });
@@ -199,22 +198,25 @@ export default EmberObject.extend({
 
   createRecord(type, attrs) {
     attrs = attrs || {};
-    return !!attrs.id ? this._hydrate(type, attrs) : this._build(type, attrs);
+    const adapter = this.adapterFor(type);
+    return !!attrs[adapter.primaryKey]
+      ? this._hydrate(type, attrs)
+      : this._build(type, attrs);
   },
 
   destroyRecord(type, record) {
+    const adapter = this.adapterFor(type);
+
     // If the record is new, don't perform an Ajax call
     if (record.get("isNew")) {
-      removeMap(type, record.get("id"));
+      removeMap(type, record.get(adapter.primaryKey));
       return Promise.resolve(true);
     }
 
-    return this.adapterFor(type)
-      .destroyRecord(this, type, record)
-      .then(function(result) {
-        removeMap(type, record.get("id"));
-        return result;
-      });
+    return adapter.destroyRecord(this, type, record).then(function(result) {
+      removeMap(type, record.get(adapter.primaryKey));
+      return result;
+    });
   },
 
   _resultSet(type, result, findArgs) {
@@ -252,9 +254,10 @@ export default EmberObject.extend({
   },
 
   _build(type, obj) {
+    const adapter = this.adapterFor(type);
     obj.store = this;
     obj.__type = type;
-    obj.__state = obj.id ? "created" : "new";
+    obj.__state = obj[adapter.primaryKey] ? "created" : "new";
 
     // TODO: Have injections be automatic
     obj.topicTrackingState = this.register.lookup("topic-tracking-state:main");
@@ -264,7 +267,7 @@ export default EmberObject.extend({
     const klass = this.register.lookupFactory("model:" + type) || RestModel;
     const model = klass.create(obj);
 
-    storeMap(type, obj.id, model);
+    storeMap(type, obj[adapter.primaryKey], model);
     return model;
   },
 
@@ -288,6 +291,7 @@ export default EmberObject.extend({
       subType = root.meta.types[subType] || subType;
     }
 
+    const subTypeAdapter = this.adapterFor(subType);
     const pluralType = this.pluralize(subType);
     const collection = root[this.pluralize(subType)];
     if (collection) {
@@ -296,7 +300,7 @@ export default EmberObject.extend({
       if (!hashedCollection) {
         hashedCollection = {};
         collection.forEach(function(it) {
-          hashedCollection[it.id] = it;
+          hashedCollection[it[subTypeAdapter.primaryKey]] = it;
         });
         root[hashedProp] = hashedCollection;
       }
@@ -311,7 +315,12 @@ export default EmberObject.extend({
   },
 
   _hydrateEmbedded(type, obj, root) {
+    const adapter = this.adapterFor(type);
     Object.keys(obj).forEach(k => {
+      if (k === adapter.primaryKey) {
+        return;
+      }
+
       const m = /(.+)\_id(s?)$/.exec(k);
       if (m) {
         const subType = m[1];
@@ -340,9 +349,13 @@ export default EmberObject.extend({
       throw new Error("Can't hydrate " + type + " of `null`");
     }
 
-    const id = obj.id;
+    const adapter = this.adapterFor(type);
+
+    const id = obj[adapter.primaryKey];
     if (!id) {
-      throw new Error("Can't hydrate " + type + " without an `id`");
+      throw new Error(
+        `Can't hydrate ${type} without primaryKey: \`${adapter.primaryKey}\``
+      );
     }
 
     root = root || obj;
@@ -357,7 +370,7 @@ export default EmberObject.extend({
     }
 
     if (existing) {
-      delete obj.id;
+      delete obj[adapter.primaryKey];
       let klass = this.register.lookupFactory("model:" + type);
 
       if (klass && klass.class) {
@@ -369,7 +382,7 @@ export default EmberObject.extend({
       }
 
       existing.setProperties(klass.munge(obj));
-      obj.id = id;
+      obj[adapter.primaryKey] = id;
       return existing;
     }
 
diff --git a/test/javascripts/helpers/create-store.js b/test/javascripts/helpers/create-store.js
index 8eccc0d6ea..5385a48fd0 100644
--- a/test/javascripts/helpers/create-store.js
+++ b/test/javascripts/helpers/create-store.js
@@ -5,12 +5,21 @@ import TopicListAdapter from "discourse/adapters/topic-list";
 import TopicTrackingState from "discourse/models/topic-tracking-state";
 import { buildResolver } from "discourse-common/resolver";
 
+const CatAdapter = RestAdapter.extend({
+  primaryKey: "cat_id"
+});
+
 export default function(customLookup = () => {}) {
   const resolver = buildResolver("discourse").create();
 
   return Store.create({
     register: {
       lookup(type) {
+        if (type === "adapter:cat") {
+          this._catAdapter =
+            this._catAdapter || CatAdapter.create({ owner: this });
+          return this._catAdapter;
+        }
         if (type === "adapter:rest") {
           if (!this._restAdapter) {
             this._restAdapter = RestAdapter.create({ owner: this });
diff --git a/test/javascripts/helpers/store-pretender.js b/test/javascripts/helpers/store-pretender.js
index 30be5640f7..1579abaace 100644
--- a/test/javascripts/helpers/store-pretender.js
+++ b/test/javascripts/helpers/store-pretender.js
@@ -26,9 +26,23 @@ const colors = [
   { id: 3, name: "Yellow" }
 ];
 
+const cats = [
+  {
+    cat_id: 1,
+    name: "souna"
+  }
+];
+
 export default function(helpers) {
   const { response, success, parsePostData } = helpers;
 
+  this.get("/cats", function() {
+    return response({
+      __rest_serializer: "1",
+      cats
+    });
+  });
+
   this.get("/fruits/:id", function(request) {
     const fruit = fruits.find(f => f.id === parseInt(request.params.id, 10));
     return response({ __rest_serializer: "1", fruit, farmers, colors });
diff --git a/test/javascripts/models/store-test.js b/test/javascripts/models/store-test.js
index 386094151c..f002726e65 100644
--- a/test/javascripts/models/store-test.js
+++ b/test/javascripts/models/store-test.js
@@ -182,3 +182,9 @@ QUnit.test("findAll embedded", async assert => {
 
   assert.equal(fruits.objectAt(2).get("farmer.name"), "Luke Skywalker");
 });
+
+QUnit.test("custom primaryKey", async assert => {
+  const store = createStore();
+  const cats = await store.findAll("cat");
+  assert.equal(cats.objectAt(0).name, "souna");
+});

From 0841ba1c6b76ef554e651c459af89a5804ea3ce0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 11:18:31 -0400
Subject: [PATCH 332/633] Build(deps): Bump unf_ext from 0.0.7.6 to 0.0.7.7
 (#9306)

Bumps [unf_ext](https://github.com/knu/ruby-unf_ext) from 0.0.7.6 to 0.0.7.7.
- [Release notes](https://github.com/knu/ruby-unf_ext/releases)
- [Changelog](https://github.com/knu/ruby-unf_ext/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knu/ruby-unf_ext/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5dc837b089..3645c97d85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -405,7 +405,7 @@ GEM
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
     unicode-display_width (1.6.1)
     unicorn (5.5.4)
       kgio (~> 2.6)

From 14b8e221e7332cd4334b3f71e04e568f6b259aac Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 11:18:55 -0400
Subject: [PATCH 333/633] Build(deps): Bump cose from 0.11.0 to 1.0.0 (#9307)

Bumps [cose](https://github.com/cedarcode/cose-ruby) from 0.11.0 to 1.0.0.
- [Release notes](https://github.com/cedarcode/cose-ruby/releases)
- [Changelog](https://github.com/cedarcode/cose-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cedarcode/cose-ruby/compare/v0.11.0...v1.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3645c97d85..75aa846e21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,9 +86,9 @@ GEM
     colored2 (3.1.2)
     concurrent-ruby (1.1.6)
     connection_pool (2.2.2)
-    cose (0.11.0)
+    cose (1.0.0)
       cbor (~> 0.5.9)
-      openssl-signature_algorithm (~> 0.3.0)
+      openssl-signature_algorithm (~> 0.4.0)
     cppjieba_rb (0.3.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -248,7 +248,7 @@ GEM
       mustache
       nokogiri (~> 1.7)
       sanitize
-    openssl-signature_algorithm (0.3.0)
+    openssl-signature_algorithm (0.4.0)
     optimist (3.0.0)
     parallel (1.19.1)
     parallel_tests (2.32.0)

From d0d5f0c912a207abfc5b993bef25c880ee530831 Mon Sep 17 00:00:00 2001
From: Zdravko Curic <zcuric@users.noreply.github.com>
Date: Mon, 30 Mar 2020 17:37:14 +0200
Subject: [PATCH 334/633] DEV: Add Ember.PromiseProxyMixin to ember modules
 (#9312)

---
 app/assets/javascripts/discourse-loader.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index cde52ac72c..e73ecd2b7b 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -77,6 +77,7 @@ var define, requirejs;
       },
       "@ember/object/mixin": { default: Ember.Mixin },
       "@ember/object/proxy": { default: Ember.ObjectProxy },
+      "@ember/object/promise-proxy-mixin": { default: Ember.PromiseProxyMixin },
       "@ember/object/evented": {
         default: Ember.Evented,
         on: Ember.on

From 6c2717eda04885ca54a5836eb55c271548067e1e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 17:59:25 +0200
Subject: [PATCH 335/633] UX: ensures esc key is correctly working when in
 dates form (#9299)

1 esc close modal focus date button in toolbar
2 esc reduces composer
---
 .../discourse-local-dates-create-modal.js.es6 | 21 +++++++++++++++++++
 .../discourse-local-dates-create-form.hbs     |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 plugins/discourse-local-dates/assets/javascripts/discourse/controllers/discourse-local-dates-create-modal.js.es6

diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/controllers/discourse-local-dates-create-modal.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse/controllers/discourse-local-dates-create-modal.js.es6
new file mode 100644
index 0000000000..103ac02adc
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/controllers/discourse-local-dates-create-modal.js.es6
@@ -0,0 +1,21 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { schedule } from "@ember/runloop";
+
+export default Controller.extend(ModalFunctionality, {
+  onShow() {
+    schedule("afterRender", () => {
+      const fromButton = document.getElementById("from-date-time");
+      fromButton && fromButton.focus();
+    });
+  },
+
+  onClose() {
+    schedule("afterRender", () => {
+      const localDatesBtn = document.querySelector(
+        ".d-editor-button-bar .local-dates.btn"
+      );
+      localDatesBtn && localDatesBtn.focus();
+    });
+  }
+});
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 30bc69e34d..92adae679a 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -23,6 +23,7 @@
         <div class="date-time-control from {{if fromSelected 'is-selected'}} {{if fromFilled 'is-filled'}}">
           {{d-icon "calendar-alt"}}
           {{d-button
+            id="from-date-time"
             action=(action "focusFrom")
             translatedLabel=formattedFrom
             class="date-time"}}

From 96e841a635776e23a788f93e2fe99b78b45f73f2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 18:02:34 +0200
Subject: [PATCH 336/633] DEV: trigger :username_changed when a user is renamed
 (#9301)

---
 app/jobs/regular/update_username.rb    | 2 ++
 spec/services/username_changer_spec.rb | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rb
index a92cf82c6e..d43c119060 100644
--- a/app/jobs/regular/update_username.rb
+++ b/app/jobs/regular/update_username.rb
@@ -34,6 +34,8 @@ module Jobs
       update_revisions
       update_notifications
       update_post_custom_fields
+
+      DiscourseEvent.trigger(:username_changed, @old_username, @new_username)
     end
 
     def update_posts
diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb
index 3fb20ceb4d..0013c82a94 100644
--- a/spec/services/username_changer_spec.rb
+++ b/spec/services/username_changer_spec.rb
@@ -11,13 +11,20 @@ describe UsernameChanger do
     let(:user) { Fabricate(:user) }
 
     context 'success' do
+      let!(:old_username) { user.username }
       let(:new_username) { "#{user.username}1234" }
 
       it 'should change the username' do
-        @result = UsernameChanger.change(user, new_username)
+        event = DiscourseEvent.track_events {
+          @result = UsernameChanger.change(user, new_username)
+        }.last
 
         expect(@result).to eq(true)
 
+        expect(event[:event_name]).to eq(:username_changed)
+        expect(event[:params].first).to eq(old_username)
+        expect(event[:params].second).to eq(new_username)
+
         user.reload
         expect(user.username).to eq(new_username)
         expect(user.username_lower).to eq(new_username.downcase)

From acdbcabd0e45cadb0a2de843fdacf5cf75157e2a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 18:12:32 +0200
Subject: [PATCH 337/633] DEV: Allows moduleForWidget to use before/afterEach
 options (#9296)

---
 test/javascripts/helpers/widget-test.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/javascripts/helpers/widget-test.js b/test/javascripts/helpers/widget-test.js
index 2289e7381d..6cd3fbd16f 100644
--- a/test/javascripts/helpers/widget-test.js
+++ b/test/javascripts/helpers/widget-test.js
@@ -1,7 +1,14 @@
 import componentTest from "helpers/component-test";
 
-export function moduleForWidget(name) {
-  moduleForComponent(name, `widget:${name}`, { integration: true });
+export function moduleForWidget(name, options = {}) {
+  moduleForComponent(
+    name,
+    `widget:${name}`,
+    Object.assign(
+      { integration: true },
+      { beforeEach: options.beforeEach, afterEach: options.afterEach }
+    )
+  );
 }
 
 export function widgetTest(name, opts) {

From f8cb46c0e1886992b45ee9860e0f9ceab2c6851b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 18:55:15 +0200
Subject: [PATCH 338/633] FIX: prevents exception when clicking component title
 above ace editor (#9309)

---
 app/assets/javascripts/admin/components/ace-editor.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/components/ace-editor.js b/app/assets/javascripts/admin/components/ace-editor.js
index 4fc881dae4..123193c0c0 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js
+++ b/app/assets/javascripts/admin/components/ace-editor.js
@@ -57,7 +57,7 @@ export default Component.extend({
     }
     if (this.appEvents) {
       // xxx: don't run during qunit tests
-      this.appEvents.off("ace:resize", this, this.resize);
+      this.appEvents.off("ace:resize", this, "resize");
     }
 
     $(window).off("ace:resize");
@@ -97,9 +97,7 @@ export default Component.extend({
 
         $(window)
           .off("ace:resize")
-          .on("ace:resize", () => {
-            this.appEvents.trigger("ace:resize");
-          });
+          .on("ace:resize", () => this.appEvents.trigger("ace:resize"));
 
         if (this.appEvents) {
           // xxx: don't run during qunit tests

From aeaea3c154c5caa0d44b059015efd4b234467187 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 19:08:47 +0200
Subject: [PATCH 339/633] FIX: correctly take category/group filters into csv
 export (#9300)

---
 app/jobs/regular/export_csv_file.rb | 13 ++++++++++--
 spec/jobs/export_csv_file_spec.rb   | 33 ++++++++++++++++++++++-------
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index ee172de679..39f9c565b1 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -7,6 +7,10 @@ module Jobs
   class ExportCsvFile < ::Jobs::Base
     sidekiq_options retry: false
 
+    attr_accessor :extra
+    attr_accessor :current_user
+    attr_accessor :entity
+
     HEADER_ATTRS_FOR ||= HashWithIndifferentAccess.new(
       user_archive: ['topic_title', 'categories', 'is_pm', 'post', 'like_count', 'reply_count', 'url', 'created_at'],
       user_list: ['id', 'name', 'username', 'email', 'title', 'created_at', 'last_seen_at', 'last_posted_at', 'last_emailed_at', 'trust_level', 'approved', 'suspended_at', 'suspended_till', 'silenced_till', 'active', 'admin', 'moderator', 'ip_address', 'staged', 'secondary_emails'],
@@ -180,8 +184,13 @@ module Jobs
 
       @extra[:start_date] = @extra[:start_date].to_date.beginning_of_day if @extra[:start_date].is_a?(String)
       @extra[:end_date] = @extra[:end_date].to_date.end_of_day if @extra[:end_date].is_a?(String)
-      @extra[:category_id] = @extra[:category_id].present? ? @extra[:category_id].to_i : nil
-      @extra[:group_id] = @extra[:group_id].present? ? @extra[:group_id].to_i : nil
+      @extra[:filters] = {}
+      if @extra[:category_id].present?
+        @extra[:filters][:category] = @extra[:category_id].to_i
+      end
+      if @extra[:group_id].present?
+        @extra[:filters][:group] = @extra[:group_id].to_i
+      end
 
       report = Report.find(@extra[:name], @extra)
 
diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb
index 3852494cb1..62ffb151ba 100644
--- a/spec/jobs/export_csv_file_spec.rb
+++ b/spec/jobs/export_csv_file_spec.rb
@@ -55,7 +55,7 @@ describe Jobs::ExportCsvFile do
       post = Fabricate(:post, topic: topic, user: user)
 
       exporter = Jobs::ExportCsvFile.new
-      exporter.instance_variable_set(:@current_user, User.find_by(id: user.id))
+      exporter.current_user = User.find_by(id: user.id)
 
       rows = []
       exporter.user_archive_export { |row| rows << row }
@@ -79,9 +79,9 @@ describe Jobs::ExportCsvFile do
 
     let(:exporter) do
       exporter = Jobs::ExportCsvFile.new
-      exporter.instance_variable_set(:@entity, 'report')
-      exporter.instance_variable_set(:@extra, HashWithIndifferentAccess.new(start_date: '2010-01-01', end_date: '2011-01-01'))
-      exporter.instance_variable_set(:@current_user, User.find_by(id: user.id))
+      exporter.entity = 'report'
+      exporter.extra = HashWithIndifferentAccess.new(start_date: '2010-01-01', end_date: '2011-01-01')
+      exporter.current_user = User.find_by(id: user.id)
       exporter
     end
 
@@ -89,7 +89,7 @@ describe Jobs::ExportCsvFile do
       user.user_visits.create!(visited_at: '2010-01-01', posts_read: 42)
       Fabricate(:user).user_visits.create!(visited_at: '2010-01-03', posts_read: 420)
 
-      exporter.instance_variable_get(:@extra)['name'] = 'dau_by_mau'
+      exporter.extra['name'] = 'dau_by_mau'
       report = exporter.report_export.to_a
 
       expect(report.first).to contain_exactly("Day", "Percent")
@@ -97,11 +97,28 @@ describe Jobs::ExportCsvFile do
       expect(report.third).to contain_exactly("2010-01-03", "50.0")
     end
 
+    it 'works with filters' do
+      user.user_visits.create!(visited_at: '2010-01-01', posts_read: 42)
+
+      group = Fabricate(:group)
+      user1 = Fabricate(:user)
+      group_user = Fabricate(:group_user, group: group, user: user1)
+      user1.user_visits.create!(visited_at: '2010-01-03', posts_read: 420)
+
+      exporter.extra['name'] = 'visits'
+      exporter.extra['group_id'] = group.id
+      report = exporter.report_export.to_a
+
+      expect(report.length).to eq(2)
+      expect(report.first).to contain_exactly("Day", "Count")
+      expect(report.second).to contain_exactly("2010-01-03", "1")
+    end
+
     it 'works with single-column reports with default label' do
       user.user_visits.create!(visited_at: '2010-01-01')
       Fabricate(:user).user_visits.create!(visited_at: '2010-01-03')
 
-      exporter.instance_variable_get(:@extra)['name'] = 'visits'
+      exporter.extra['name'] = 'visits'
       report = exporter.report_export.to_a
 
       expect(report.first).to contain_exactly("Day", "Count")
@@ -113,7 +130,7 @@ describe Jobs::ExportCsvFile do
       DiscourseIpInfo.stubs(:get).with("1.1.1.1").returns(location: "Earth")
       user.user_auth_token_logs.create!(action: "login", client_ip: "1.1.1.1", created_at: '2010-01-01')
 
-      exporter.instance_variable_get(:@extra)['name'] = 'staff_logins'
+      exporter.extra['name'] = 'staff_logins'
       report = exporter.report_export.to_a
 
       expect(report.first).to contain_exactly("User", "Location", "Login at")
@@ -133,7 +150,7 @@ describe Jobs::ExportCsvFile do
       ApplicationRequest.create!(date: '2010-01-02', req_type: 'page_view_crawler', count: 8)
       ApplicationRequest.create!(date: '2010-01-03', req_type: 'page_view_crawler', count: 9)
 
-      exporter.instance_variable_get(:@extra)['name'] = 'consolidated_page_views'
+      exporter.extra['name'] = 'consolidated_page_views'
       report = exporter.report_export.to_a
 
       expect(report[0]).to contain_exactly("Day", "Logged in users", "Anonymous users", "Crawlers")

From a3345057f2a14b25cf8f436e248d17e78502a8ce Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 19:17:08 +0200
Subject: [PATCH 340/633] FIX: prevents rendering empty timeline-controls
 (#9304)

The streamlength/height code when true would return just after we had inserted the timeline-controls, resulting, on topic-progress event to display an empty timeline-controls when clicked.

I think this code in unecessary and we should only rely on the code in `hideProgress` which will currenly hide the progress is the stream has only one post displayed on desktop (always shown on mobile).
---
 .../javascripts/discourse/components/topic-progress.js |  7 ++-----
 .../javascripts/discourse/widgets/topic-timeline.js    | 10 ----------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/topic-progress.js b/app/assets/javascripts/discourse/components/topic-progress.js
index 61c4484be4..35e40d175e 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js
+++ b/app/assets/javascripts/discourse/components/topic-progress.js
@@ -34,11 +34,8 @@ export default Component.extend({
     "postStream.filteredPostsCount"
   )
   hideProgress(loaded, currentPost, filteredPostsCount) {
-    return (
-      !loaded ||
-      !currentPost ||
-      (!this.site.mobileView && filteredPostsCount < 2)
-    );
+    const hideOnShortStream = !this.site.mobileView && filteredPostsCount < 2;
+    return !loaded || !currentPost || hideOnShortStream;
   },
 
   @discourseComputed("postStream.filteredPostsCount")
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js b/app/assets/javascripts/discourse/widgets/topic-timeline.js
index f6ba07b742..617a13bcd4 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js
@@ -442,7 +442,6 @@ export default createWidget("topic-timeline", {
   html(attrs) {
     const { topic } = attrs;
     const createdAt = new Date(topic.created_at);
-    const stream = attrs.topic.get("postStream.stream");
     const { currentUser } = this;
     const { tagging_enabled, topic_featured_link_enabled } = this.siteSettings;
 
@@ -517,15 +516,6 @@ export default createWidget("topic-timeline", {
     }
 
     result.push(this.attach("timeline-controls", attrs));
-    const streamLength = stream.length;
-
-    if (streamLength !== 0 && streamLength < 3) {
-      const topicHeight = $("#topic").height();
-      const windowHeight = $(window).height();
-      if (topicHeight / windowHeight < 2.0) {
-        return result;
-      }
-    }
 
     const bottomAge = relativeAge(new Date(topic.last_posted_at), {
       addAgo: true,

From fa5ba6beb88be44c64c9db9bdede4e2e7da65d3d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 19:34:53 +0200
Subject: [PATCH 341/633] FIX: ensures mini-tag-chooser display min tags req if
 no selection (#9303)

---
 .../select-kit/components/mini-tag-chooser.js      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
index 4f89e380b8..d8c63c9ae5 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
@@ -77,6 +77,20 @@ export default ComboBox.extend(TagsMixin, {
     );
   }),
 
+  modifyNoSelection() {
+    if (this.selectKit.options.minimum) {
+      const minimum = parseInt(this.selectKit.options.minimum, 10);
+      if (minimum > 0) {
+        return this.defaultItem(
+          null,
+          I18n.t("select_kit.min_content_not_reached", { count: minimum })
+        );
+      }
+    }
+
+    return this._super(...arguments);
+  },
+
   init() {
     this._super(...arguments);
 

From 0996c3b7b36c37c3b478985da6e968f54dc4835c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 20:16:10 +0200
Subject: [PATCH 342/633] FEATURE: allows multiple custom emoji groups (#9308)

Note: DBHelper would fail with a sql syntax error on columns like "group".

Co-authored-by: Jarek Radosz <jradosz@gmail.com>
---
 .../admin/controllers/admin-emojis.js         | 83 ++++++++++++++-----
 .../javascripts/admin/templates/emojis.hbs    | 68 +++++++++------
 .../discourse/components/emoji-picker.js      | 29 +++++--
 .../discourse/components/emoji-uploader.js    | 48 +++++++++--
 .../discourse/initializers/enable-emoji.js    |  2 +-
 .../templates/components/emoji-uploader.hbs   | 59 ++++++++++---
 .../discourse/templates/emoji-picker.hbr.erb  | 36 ++++----
 app/assets/javascripts/pretty-text/emoji.js   | 14 ++--
 .../stylesheets/common/admin/admin_base.scss  |  1 +
 .../common/admin/admin_emojis.scss            | 50 +++++++++++
 .../stylesheets/common/admin/customize.scss   |  2 +-
 app/assets/stylesheets/common/base/emoji.scss |  2 +
 app/assets/stylesheets/mobile/emoji.scss      |  4 +
 app/controllers/admin/emojis_controller.rb    |  5 +-
 app/models/custom_emoji.rb                    |  1 +
 app/models/emoji.rb                           | 18 ++--
 app/serializers/emoji_serializer.rb           |  2 +-
 config/locales/client.en.yml                  |  3 +-
 ...200116092259_add_group_to_custom_emojis.rb |  7 ++
 lib/db_helper.rb                              | 22 ++---
 lib/plugin/instance.rb                        | 25 ++++--
 spec/components/plugin/instance_spec.rb       | 26 ++++++
 spec/requests/admin/emojis_controller_spec.rb | 40 ++++++---
 test/javascripts/lib/pretty-text-test.js      | 19 +++++
 24 files changed, 428 insertions(+), 138 deletions(-)
 create mode 100644 app/assets/stylesheets/common/admin/admin_emojis.scss
 create mode 100644 db/migrate/20200116092259_add_group_to_custom_emojis.rb

diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js b/app/assets/javascripts/admin/controllers/admin-emojis.js
index 6a1d295759..1a49670703 100644
--- a/app/assets/javascripts/admin/controllers/admin-emojis.js
+++ b/app/assets/javascripts/admin/controllers/admin-emojis.js
@@ -1,37 +1,74 @@
 import { sort } from "@ember/object/computed";
-import EmberObject from "@ember/object";
+import EmberObject, { action, computed } from "@ember/object";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
+
+const ALL_FILTER = "all";
+
 export default Controller.extend({
-  sortedEmojis: sort("model", "emojiSorting"),
+  filter: null,
+  sorting: null,
 
   init() {
     this._super(...arguments);
 
-    this.emojiSorting = ["name"];
+    this.setProperties({
+      filter: ALL_FILTER,
+      sorting: ["group", "name"]
+    });
   },
 
-  actions: {
-    emojiUploaded(emoji) {
-      emoji.url += "?t=" + new Date().getTime();
-      this.model.pushObject(EmberObject.create(emoji));
-    },
+  sortedEmojis: sort("filteredEmojis.[]", "sorting"),
 
-    destroy(emoji) {
-      return bootbox.confirm(
-        I18n.t("admin.emoji.delete_confirm", { name: emoji.get("name") }),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        destroy => {
-          if (destroy) {
-            return ajax("/admin/customize/emojis/" + emoji.get("name"), {
-              type: "DELETE"
-            }).then(() => {
-              this.model.removeObject(emoji);
-            });
-          }
-        }
-      );
+  emojiGroups: computed("model", {
+    get() {
+      return this.model.mapBy("group").uniq();
     }
+  }),
+
+  sortingGroups: computed("emojiGroups.[]", {
+    get() {
+      return [ALL_FILTER].concat(this.emojiGroups);
+    }
+  }),
+
+  filteredEmojis: computed("model.[]", "filter", {
+    get() {
+      if (!this.filter || this.filter === ALL_FILTER) {
+        return this.model;
+      } else {
+        return this.model.filterBy("group", this.filter);
+      }
+    }
+  }),
+
+  @action
+  filterGroups(value) {
+    this.set("filter", value);
+  },
+
+  @action
+  emojiUploaded(emoji, group) {
+    emoji.url += "?t=" + new Date().getTime();
+    emoji.group = group;
+    this.model.pushObject(EmberObject.create(emoji));
+  },
+
+  @action
+  destroyEmoji(emoji) {
+    return bootbox.confirm(
+      I18n.t("admin.emoji.delete_confirm", { name: emoji.get("name") }),
+      I18n.t("no_value"),
+      I18n.t("yes_value"),
+      destroy => {
+        if (destroy) {
+          return ajax("/admin/customize/emojis/" + emoji.get("name"), {
+            type: "DELETE"
+          }).then(() => {
+            this.model.removeObject(emoji);
+          });
+        }
+      }
+    );
   }
 });
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index 5f9de8104c..f2547b9678 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -1,35 +1,49 @@
-<div class='emoji'>
-  <h2>{{i18n 'admin.emoji.title'}}</h2>
+<div class='admin-emojis'>
+  <h1>{{i18n 'admin.emoji.title'}}</h1>
 
-  <p class="desc">{{i18n 'admin.emoji.help'}}</p>
+  <p class="desc">{{i18n "admin.emoji.help"}}</p>
 
-  <p>{{emoji-uploader done=(action "emojiUploaded")}}</p>
+  {{emoji-uploader
+    emojiGroups=emojiGroups
+    done=(action "emojiUploaded")
+  }}
+
+  <hr>
 
   {{#if sortedEmojis}}
-    <div>
-      <table id="custom_emoji">
-        <thead>
+    <table id="custom_emoji">
+      <thead>
+        <tr>
+          <th>{{i18n "admin.emoji.image"}}</th>
+          <th>{{i18n "admin.emoji.name"}}</th>
+          <th>
+            {{combo-box
+              value=filter
+              content=sortingGroups
+              nameProperty=null
+              valueProperty=null
+              onChange=(action "filterGroups")
+            }}
+          </th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        {{#each sortedEmojis as |e|}}
           <tr>
-            <th>{{i18n "admin.emoji.image"}}</th>
-            <th>{{i18n "admin.emoji.name"}}</th>
-            <th></th>
+            <th><img class="emoji emoji-custom" src={{e.url}} title={{e.name}}></th>
+            <th>:{{e.name}}:</th>
+            <th>{{e.group}}</th>
+            <th>
+              {{d-button
+                action=(action "destroyEmoji" e)
+                class="btn-danger"
+                icon="far-trash-alt"
+              }}
+            </th>
           </tr>
-        </thead>
-        <tbody>
-          {{#each sortedEmojis as |e|}}
-            <tr>
-              <th><img class="emoji emoji-custom" src={{e.url}} title={{e.name}}></th>
-              <th>:{{e.name}}:</th>
-              <th>
-                {{d-button
-                  action=(action "destroy" e)
-                  class="btn-danger pull-right"
-                  icon="far-trash-alt"}}
-              </th>
-            </tr>
-          {{/each}}
-        </tbody>
-      </table>
-    </div>
+        {{/each}}
+      </tbody>
+    </table>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js b/app/assets/javascripts/discourse/components/emoji-picker.js
index 2696ca1358..ef56c4182a 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js
@@ -14,9 +14,26 @@ import ENV, { INPUT_DELAY } from "discourse-common/config/environment";
 const { run } = Ember;
 
 const PER_ROW = 11;
-const customEmojis = _.keys(extendedEmojiList()).map(code => {
-  return { code, src: emojiUrlFor(code) };
-});
+function customEmojis() {
+  const list = extendedEmojiList();
+  const emojis = Object.keys(list)
+    .map(code => {
+      const { group } = list[code];
+      return {
+        code,
+        src: emojiUrlFor(code),
+        group,
+        key: `emoji_picker.${group || "default"}`
+      };
+    })
+    .reduce((acc, curr) => {
+      if (!acc[curr.group]) acc[curr.group] = [];
+      acc[curr.group].push(curr);
+      return acc;
+    }, {});
+
+  return Object.values(emojis);
+}
 
 export default Component.extend({
   automaticPositioning: true,
@@ -35,7 +52,9 @@ export default Component.extend({
   },
 
   show() {
-    const template = findRawTemplate("emoji-picker")({ customEmojis });
+    const template = findRawTemplate("emoji-picker")({
+      customEmojis: customEmojis()
+    });
     this.$picker.html(template);
 
     this.$filter = this.$picker.find(".filter");
@@ -579,7 +598,7 @@ export default Component.extend({
       this.$picker.width() -
       this.$picker.find(".categories-column").width() -
       this.$picker.find(".diversity-picker").width() -
-      32;
+      60;
     this.$picker.find(".info").css("max-width", infoMaxWidth);
   },
 
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js b/app/assets/javascripts/discourse/components/emoji-uploader.js
index 77e2d5e9ff..9693811c15 100644
--- a/app/assets/javascripts/discourse/components/emoji-uploader.js
+++ b/app/assets/javascripts/discourse/components/emoji-uploader.js
@@ -1,23 +1,53 @@
 import { notEmpty, not } from "@ember/object/computed";
+import { action } from "@ember/object";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import UploadMixin from "discourse/mixins/upload";
 
+const DEFAULT_GROUP = "default";
+
 export default Component.extend(UploadMixin, {
   type: "emoji",
   uploadUrl: "/admin/customize/emojis",
   hasName: notEmpty("name"),
+  hasGroup: notEmpty("group"),
   addDisabled: not("hasName"),
+  group: "default",
+  emojiGroups: null,
+  newEmojiGroups: null,
+  tagName: null,
 
-  uploadOptions() {
-    return {
-      sequentialUploads: true
-    };
+  didReceiveAttrs() {
+    this._super(...arguments);
+
+    this.set("newEmojiGroups", this.emojiGroups);
   },
 
-  @discourseComputed("hasName", "name")
-  data(hasName, name) {
-    return hasName ? { name } : {};
+  uploadOptions() {
+    return { sequentialUploads: true };
+  },
+
+  @action
+  createEmojiGroup(group) {
+    this.setProperties({
+      newEmojiGroups: this.emojiGroups.concat([group]).uniq(),
+      group
+    });
+  },
+
+  @discourseComputed("hasName", "name", "hasGroup", "group")
+  data(hasName, name, hasGroup, group) {
+    const payload = {};
+
+    if (hasName) {
+      payload.name = name;
+    }
+
+    if (hasGroup && group !== DEFAULT_GROUP) {
+      payload.group = group;
+    }
+
+    return payload;
   },
 
   validateUploadedFilesOptions() {
@@ -25,7 +55,7 @@ export default Component.extend(UploadMixin, {
   },
 
   uploadDone(upload) {
-    this.set("name", null);
-    this.done(upload);
+    this.done(upload, this.group);
+    this.setProperties({ name: null, group: DEFAULT_GROUP });
   }
 });
diff --git a/app/assets/javascripts/discourse/initializers/enable-emoji.js b/app/assets/javascripts/discourse/initializers/enable-emoji.js
index 71bf416025..a6e3e6d03a 100644
--- a/app/assets/javascripts/discourse/initializers/enable-emoji.js
+++ b/app/assets/javascripts/discourse/initializers/enable-emoji.js
@@ -24,7 +24,7 @@ export default {
     });
 
     (PreloadStore.get("customEmoji") || []).forEach(emoji =>
-      registerEmoji(emoji.name, emoji.url)
+      registerEmoji(emoji.name, emoji.url, emoji.group)
     );
   }
 };
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
index 153fe696a6..186ee15afe 100644
--- a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
@@ -1,11 +1,48 @@
-{{text-field name="name" placeholderKey="admin.emoji.name" value=name}}
-
-<label class="btn btn-primary {{if addDisabled 'disabled'}}">
-  {{d-icon "plus"}}
-  {{i18n "admin.emoji.add"}}
-  <input
-    class="hidden-upload-field"
-    disabled={{addDisabled}}
-    type="file"
-    accept=".png,.gif">
-</label>
+{{#conditional-loading-section isLoading=uploading}}
+  <div class="emoji-uploader">
+    <div class="control">
+      <span class="label">
+        {{i18n "admin.emoji.name"}}
+      </span>
+      <div class="input">
+        {{input
+          name="name"
+          placeholderKey="admin.emoji.name"
+          value=(readonly name)
+          input=(action (mut name) value="target.value")
+        }}
+      </div>
+    </div>
+    <div class="control">
+      <span class="label">
+        {{i18n "admin.emoji.group"}}
+      </span>
+      <div class="input">
+        {{combo-box
+          name="group"
+          value=group
+          content=newEmojiGroups
+          onChange=(action "createEmojiGroup")
+          valueProperty=null
+          nameProperty=null
+          options=(hash
+            allowAny=true
+          )
+        }}
+      </div>
+    </div>
+    <div class="control">
+      <div class="input">
+        <label class="btn btn-default btn-primary {{if addDisabled 'disabled'}}">
+          {{d-icon "plus"}}
+          {{i18n "admin.emoji.add"}}
+          <input
+            class="hidden-upload-field"
+            disabled={{addDisabled}}
+            type="file"
+            accept=".png,.gif">
+        </label>
+      </div>
+    </div>
+  </div>
+{{/conditional-loading-section}}
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb b/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb
index dd04f149d3..5a33352165 100644
--- a/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb
+++ b/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb
@@ -9,10 +9,12 @@
     </div>
   <% end %>
 
-  <% if !Emoji.custom.blank? %>
-    <div class='category-icon'>
-      <button data-tabicon="<%= Emoji.custom.first.name %>" type="button" class="emoji" tabindex="-1" data-section="ungrouped" title="{{i18n 'emoji_picker.custom'}}"></button>
-    </div>
+  <% Emoji.custom.group_by { |emoji| emoji.group }.each do |group, emojis| %>
+    <% if emojis.present? %>
+      <div class='category-icon'>
+        <button data-tabicon="<%= emojis.first.name %>" type="button" class="emoji" tabindex="-1" data-section="custom-<%= group %>" title="{{i18n 'emoji_picker.<%= group %>'}}"></button>
+      </div>
+    <% end %>
   <% end %>
 </div>
 
@@ -49,18 +51,22 @@
       </div>
     <% end %>
 
-    {{#if customEmojis.length}}
-      <div class='section' data-section='ungrouped'>
-        <div class='section-header'>
-          <span class="title">{{i18n 'emoji_picker.custom'}}</span>
+    {{#each customEmojis as |emojis|}}
+      {{#if emojis.length}}
+        <div class='section' data-section='custom-{{emojis.firstObject.group}}'>
+          <div class='section-header'>
+            <span class="title">
+              {{i18n emojis.firstObject.key}}
+            </span>
+          </div>
+          <div class='section-group'>
+            {{#each emojis as |emoji|}}
+              <button style="background-url: url("{{emoji.src}}")" type="button" class="emoji" tabindex="-1" title="{{emoji.code}}"></button>
+            {{/each}}
+          </div>
         </div>
-        <div class='section-group'>
-          {{#each customEmojis as |emoji|}}
-            <button style="background-url: url("{{emoji.src}}")" type="button" class="emoji" tabindex="-1" title="{{emoji.code}}"></button>
-          {{/each}}
-        </div>
-      </div>
-    {{/if}}
+      {{/if}}
+    {{/each}}
   </div>
   <div class='footer'>
     <div class='info'></div>
diff --git a/app/assets/javascripts/pretty-text/emoji.js b/app/assets/javascripts/pretty-text/emoji.js
index fa7754da59..6346cd93b1 100644
--- a/app/assets/javascripts/pretty-text/emoji.js
+++ b/app/assets/javascripts/pretty-text/emoji.js
@@ -10,9 +10,9 @@ import { IMAGE_VERSION } from "pretty-text/emoji/version";
 
 const extendedEmoji = {};
 
-export function registerEmoji(code, url) {
+export function registerEmoji(code, url, group) {
   code = code.toLowerCase();
-  extendedEmoji[code] = url;
+  extendedEmoji[code] = { url, group };
 }
 
 export function extendedEmojiList() {
@@ -92,7 +92,7 @@ function isReplacableInlineEmoji(string, index, inlineEmoji) {
 }
 
 export function performEmojiUnescape(string, opts) {
-  if (!string || typeof string !== "string") {
+  if (!string) {
     return;
   }
 
@@ -126,6 +126,8 @@ export function performEmojiUnescape(string, opts) {
         } alt='${emojiVal}' class='${classes}'>`
       : m;
   });
+
+  return string;
 }
 
 export function performEmojiEscape(string, opts) {
@@ -143,6 +145,8 @@ export function performEmojiEscape(string, opts) {
 
     return m;
   });
+
+  return string;
 }
 
 export function isCustomEmoji(code, opts) {
@@ -157,11 +161,11 @@ export function buildEmojiUrl(code, opts) {
   let url;
   code = String(code).toLowerCase();
   if (extendedEmoji.hasOwnProperty(code)) {
-    url = extendedEmoji[code];
+    url = extendedEmoji[code].url;
   }
 
   if (opts && opts.customEmoji && opts.customEmoji[code]) {
-    url = opts.customEmoji[code];
+    url = opts.customEmoji[code].url || opts.customEmoji[code];
   }
 
   const noToneMatch = code.match(/([^:]+):?/);
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 61f73bc2b2..afdc9a7e3b 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -979,3 +979,4 @@ a.inline-editable-field {
 @import "common/admin/admin_report_table";
 @import "common/admin/admin_report_inline_table";
 @import "common/admin/admin_intro";
+@import "common/admin/admin_emojis";
diff --git a/app/assets/stylesheets/common/admin/admin_emojis.scss b/app/assets/stylesheets/common/admin/admin_emojis.scss
new file mode 100644
index 0000000000..c6cf4c2fbd
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/admin_emojis.scss
@@ -0,0 +1,50 @@
+.admin-emojis {
+  #custom_emoji {
+    .select-kit {
+      width: 220px;
+    }
+  }
+}
+
+.emoji-uploader {
+  display: flex;
+  align-items: flex-end;
+
+  input,
+  .select-kit {
+    width: 220px;
+    margin: 0 1em 0 0;
+  }
+
+  .upload-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+  }
+}
+
+.mobile-view {
+  .admin-emojis {
+    .emoji-uploader {
+      flex-direction: column;
+
+      .fields {
+        input,
+        .select-kit {
+          width: 100%;
+        }
+      }
+
+      .upload-container {
+        margin: 1em 0 0 0;
+      }
+    }
+
+    #custom_emoji {
+      .select-kit {
+        display: none;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 86c1cb9442..d887275e94 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -556,7 +556,7 @@
 }
 
 #custom_emoji {
-  width: 27%;
+  width: 100%;
 }
 
 .modal-body .inputs .branch {
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index d7a29b8dc6..b4c2098104 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -45,6 +45,8 @@ sup img.emoji {
   justify-content: space-between;
   border-right: 1px solid $primary-low;
   min-width: 36px;
+  overflow-y: auto;
+  padding: 0.5em;
 }
 
 .emoji-picker .category-icon {
diff --git a/app/assets/stylesheets/mobile/emoji.scss b/app/assets/stylesheets/mobile/emoji.scss
index 233c32bd05..d130186a7e 100644
--- a/app/assets/stylesheets/mobile/emoji.scss
+++ b/app/assets/stylesheets/mobile/emoji.scss
@@ -6,3 +6,7 @@
 .emoji-picker .category-icon {
   margin: 2px;
 }
+
+.emoji-picker .categories-column {
+  padding: 0;
+}
diff --git a/app/controllers/admin/emojis_controller.rb b/app/controllers/admin/emojis_controller.rb
index cc74777778..72e1c30801 100644
--- a/app/controllers/admin/emojis_controller.rb
+++ b/app/controllers/admin/emojis_controller.rb
@@ -9,6 +9,7 @@ class Admin::EmojisController < Admin::AdminController
   def create
     file = params[:file] || params[:files].first
     name = params[:name] || File.basename(file.original_filename, ".*")
+    group = params[:group] ? params[:group].downcase : nil
 
     hijack do
       # fix the name
@@ -26,11 +27,11 @@ class Admin::EmojisController < Admin::AdminController
 
       data =
         if upload.persisted?
-          custom_emoji = CustomEmoji.new(name: name, upload: upload)
+          custom_emoji = CustomEmoji.new(name: name, upload: upload, group: group)
 
           if custom_emoji.save
             Emoji.clear_cache
-            { name: custom_emoji.name, url: custom_emoji.upload.url }
+            { name: custom_emoji.name, url: custom_emoji.upload.url, group: group }
           else
             good = false
             failed_json.merge(errors: custom_emoji.errors.full_messages)
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 8a9d3c9236..118615c98e 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -14,6 +14,7 @@ end
 #  id         :integer          not null, primary key
 #  name       :string           not null
 #  upload_id  :integer          not null
+#  group      :string
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index 5b8774c2c0..e57fc3b81a 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -6,9 +6,11 @@ class Emoji
 
   FITZPATRICK_SCALE ||= [ "1f3fb", "1f3fc", "1f3fd", "1f3fe", "1f3ff" ]
 
+  DEFAULT_GROUP ||= "default"
+
   include ActiveModel::SerializerSupport
 
-  attr_accessor :name, :url, :tonable
+  attr_accessor :name, :url, :tonable, :group
 
   def self.all
     Discourse.cache.fetch(cache_key("all_emojis")) { standard | custom }
@@ -104,15 +106,19 @@ class Emoji
         result << Emoji.new.tap do |e|
           e.name = emoji.name
           e.url = emoji.upload&.url
+          e.group = emoji.group || DEFAULT_GROUP
         end
       end
     end
 
-    Plugin::CustomEmoji.emojis.each do |name, url|
-      result << Emoji.new.tap do |e|
-        e.name = name
-        url = (Discourse.base_uri + url) if url[/^\/[^\/]/]
-        e.url = url
+    Plugin::CustomEmoji.emojis.each do |group, emojis|
+      emojis.each do |name, url|
+        result << Emoji.new.tap do |e|
+          e.name = name
+          url = (Discourse.base_uri + url) if url[/^\/[^\/]/]
+          e.url = url
+          e.group = group || DEFAULT_GROUP
+        end
       end
     end
 
diff --git a/app/serializers/emoji_serializer.rb b/app/serializers/emoji_serializer.rb
index 2e45b03415..d0d440e24d 100644
--- a/app/serializers/emoji_serializer.rb
+++ b/app/serializers/emoji_serializer.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class EmojiSerializer < ApplicationSerializer
-  attributes :name, :url
+  attributes :name, :url, :group
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f3ea234cb8..c60d83b608 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1651,7 +1651,6 @@ en:
       objects: Objects
       symbols: Symbols
       flags: Flags
-      custom: Custom emojis
       recent: Recently used
       default_tone: No skin tone
       light_tone: Light skin tone
@@ -1659,6 +1658,7 @@ en:
       medium_tone: Medium skin tone
       medium_dark_tone: Medium dark skin tone
       dark_tone: Dark skin tone
+      default: Custom emojis
 
     shared_drafts:
       title: "Shared Drafts"
@@ -4556,6 +4556,7 @@ en:
         help: "Add new emoji that will be available to everyone. (PROTIP: drag & drop multiple files at once)"
         add: "Add New Emoji"
         name: "Name"
+        group: "Group"
         image: "Image"
         delete_confirm: "Are you sure you want to delete the :%{name}: emoji?"
 
diff --git a/db/migrate/20200116092259_add_group_to_custom_emojis.rb b/db/migrate/20200116092259_add_group_to_custom_emojis.rb
new file mode 100644
index 0000000000..ddc80c984a
--- /dev/null
+++ b/db/migrate/20200116092259_add_group_to_custom_emojis.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddGroupToCustomEmojis < ActiveRecord::Migration[6.0]
+  def change
+    add_column :custom_emojis, :group, :string, null: true, limit: 20
+  end
+end
diff --git a/lib/db_helper.rb b/lib/db_helper.rb
index ede8cf0de2..86f14ebc8b 100644
--- a/lib/db_helper.rb
+++ b/lib/db_helper.rb
@@ -29,17 +29,17 @@ class DbHelper
 
     text_columns.each do |table, columns|
       set = columns.map do |column|
-        replace = "REPLACE(#{column[:name]}, :from, :to)"
+        replace = "REPLACE(\"#{column[:name]}\", :from, :to)"
         replace = truncate(replace, table, column)
-        "#{column[:name]} = #{replace}"
+        "\"#{column[:name]}\" = #{replace}"
       end.join(", ")
 
       where = columns.map do |column|
-        "#{column[:name]} IS NOT NULL AND #{column[:name]} LIKE :like"
+        "\"#{column[:name]}\" IS NOT NULL AND \"#{column[:name]}\" LIKE :like"
       end.join(" OR ")
 
       rows = DB.exec(<<~SQL, from: from, to: to, like: like)
-        UPDATE #{table}
+        UPDATE \"#{table}\"
            SET #{set}
          WHERE #{where}
       SQL
@@ -55,17 +55,17 @@ class DbHelper
 
     text_columns.each do |table, columns|
       set = columns.map do |column|
-        replace = "REGEXP_REPLACE(#{column[:name]}, :pattern, :replacement, :flags)"
+        replace = "REGEXP_REPLACE(\"#{column[:name]}\", :pattern, :replacement, :flags)"
         replace = truncate(replace, table, column)
-        "#{column[:name]} = #{replace}"
+        "\"#{column[:name]}\" = #{replace}"
       end.join(", ")
 
       where = columns.map do |column|
-        "#{column[:name]} IS NOT NULL AND #{column[:name]} #{match} :pattern"
+        "\"#{column[:name]}\" IS NOT NULL AND \"#{column[:name]}\" #{match} :pattern"
       end.join(" OR ")
 
       rows = DB.exec(<<~SQL, pattern: pattern, replacement: replacement, flags: flags, match: match)
-        UPDATE #{table}
+        UPDATE \"#{table}\"
            SET #{set}
          WHERE #{where}
       SQL
@@ -84,9 +84,9 @@ class DbHelper
       next if excluded_tables.include?(r.table_name)
 
       rows = DB.query(<<~SQL, like: like)
-        SELECT #{r.column_name}
-          FROM #{r.table_name}
-         WHERE #{r.column_name} LIKE :like
+        SELECT \"#{r.column_name}\"
+          FROM \"#{r.table_name}\"
+         WHERE \""#{r.column_name}"\" LIKE :like
       SQL
 
       if rows.size > 0
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 06070d5f02..2510e6c499 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -6,21 +6,29 @@ require_dependency 'plugin/metadata'
 require_dependency 'auth'
 
 class Plugin::CustomEmoji
+  CACHE_KEY ||= "plugin-emoji"
   def self.cache_key
-    @@cache_key ||= "plugin-emoji"
+    @@cache_key ||= CACHE_KEY
   end
 
   def self.emojis
     @@emojis ||= {}
   end
 
-  def self.register(name, url)
-    @@cache_key = Digest::SHA1.hexdigest(cache_key + name)[0..10]
-    emojis[name] = url
+  def self.clear_cache
+    @@cache_key = CACHE_KEY
+    @@emojis = {}
   end
 
-  def self.unregister(name)
-    emojis.delete(name)
+  def self.register(name, url, group = Emoji::DEFAULT_GROUP)
+    @@cache_key = Digest::SHA1.hexdigest(cache_key + name + group)[0..10]
+    new_group = emojis[group] || {}
+    new_group[name] = url
+    emojis[group] = new_group
+  end
+
+  def self.unregister(name, group = Emoji::DEFAULT_GROUP)
+    emojis[group].delete(name)
   end
 
   def self.translations
@@ -471,8 +479,9 @@ class Plugin::Instance
     DiscoursePluginRegistry.register_seed_path_builder(&block)
   end
 
-  def register_emoji(name, url)
-    Plugin::CustomEmoji.register(name, url)
+  def register_emoji(name, url, group = Emoji::DEFAULT_GROUP)
+    Plugin::CustomEmoji.register(name, url, group)
+    Emoji.clear_cache
   end
 
   def translate_emoji(from, to)
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index bd33bb4847..6453339706 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -538,4 +538,30 @@ describe Plugin::Instance do
       expect(Reviewable.types).to match_array(current_list << new_element)
     end
   end
+
+  describe '#register_emoji' do
+    before do
+      Plugin::CustomEmoji.clear_cache
+    end
+
+    it 'allows to register an emoji' do
+      Plugin::Instance.new.register_emoji("foo", "/foo/bar.png")
+
+      custom_emoji = Emoji.custom.first
+
+      expect(custom_emoji.name).to eq("foo")
+      expect(custom_emoji.url).to eq("/foo/bar.png")
+      expect(custom_emoji.group).to eq(Emoji::DEFAULT_GROUP)
+    end
+
+    it 'allows to register an emoji with a group' do
+      Plugin::Instance.new.register_emoji("bar", "/baz/bar.png", "baz")
+
+      custom_emoji = Emoji.custom.first
+
+      expect(custom_emoji.name).to eq("bar")
+      expect(custom_emoji.url).to eq("/baz/bar.png")
+      expect(custom_emoji.group).to eq("baz")
+    end
+  end
 end
diff --git a/spec/requests/admin/emojis_controller_spec.rb b/spec/requests/admin/emojis_controller_spec.rb
index a0f6d8cec8..5ab52b3447 100644
--- a/spec/requests/admin/emojis_controller_spec.rb
+++ b/spec/requests/admin/emojis_controller_spec.rb
@@ -59,22 +59,38 @@ RSpec.describe Admin::EmojisController do
     it 'should allow an admin to add a custom emoji' do
       Emoji.expects(:clear_cache)
 
-        post "/admin/customize/emojis.json", params: {
-          name: 'test',
-          file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
-        }
+      post "/admin/customize/emojis.json", params: {
+        name: 'test',
+        file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
+      }
 
-        custom_emoji = CustomEmoji.last
-        upload = custom_emoji.upload
+      custom_emoji = CustomEmoji.last
+      upload = custom_emoji.upload
 
-        expect(upload.original_filename).to eq('logo.png')
+      expect(upload.original_filename).to eq('logo.png')
 
-        data = JSON.parse(response.body)
+      data = JSON.parse(response.body)
+      expect(response.status).to eq(200)
+      expect(data["errors"]).to eq(nil)
+      expect(data["name"]).to eq(custom_emoji.name)
+      expect(data["url"]).to eq(upload.url)
+      expect(custom_emoji.group).to eq(nil)
+    end
 
-        expect(response.status).to eq(200)
-        expect(data["errors"]).to eq(nil)
-        expect(data["name"]).to eq(custom_emoji.name)
-        expect(data["url"]).to eq(upload.url)
+    it 'should allow an admin to add a custom emoji with a custom group' do
+      Emoji.expects(:clear_cache)
+
+      post "/admin/customize/emojis.json", params: {
+        name: 'test',
+        group: 'Foo',
+        file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
+      }
+
+      custom_emoji = CustomEmoji.last
+
+      data = JSON.parse(response.body)
+      expect(response.status).to eq(200)
+      expect(custom_emoji.group).to eq("foo")
     end
   end
 
diff --git a/test/javascripts/lib/pretty-text-test.js b/test/javascripts/lib/pretty-text-test.js
index 7c75034529..522356e6de 100644
--- a/test/javascripts/lib/pretty-text-test.js
+++ b/test/javascripts/lib/pretty-text-test.js
@@ -8,6 +8,7 @@ import {
   deleteCachedInlineOnebox
 } from "pretty-text/inline-oneboxer";
 import { extractDataAttribute } from "pretty-text/engines/discourse-markdown-it";
+import { registerEmoji } from "pretty-text/emoji";
 
 QUnit.module("lib:pretty-text");
 
@@ -1519,6 +1520,24 @@ QUnit.test("emoji - emojiSet", assert => {
   );
 });
 
+QUnit.test("emoji - registerEmoji", assert => {
+  registerEmoji("foo", "/foo.png");
+
+  assert.cookedOptions(
+    ":foo:",
+    {},
+    `<p><img src="/foo.png?v=${v}" title=":foo:" class="emoji emoji-custom only-emoji" alt=":foo:"></p>`
+  );
+
+  registerEmoji("bar", "/bar.png", "baz");
+
+  assert.cookedOptions(
+    ":bar:",
+    {},
+    `<p><img src="/bar.png?v=${v}" title=":bar:" class="emoji emoji-custom only-emoji" alt=":bar:"></p>`
+  );
+});
+
 QUnit.test("extractDataAttribute", assert => {
   assert.deepEqual(extractDataAttribute("foo="), ["data-foo", ""]);
   assert.deepEqual(extractDataAttribute("foo=bar"), ["data-foo", "bar"]);

From db35baba26946d327a104fe6507857913242649e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 30 Mar 2020 14:27:49 -0400
Subject: [PATCH 343/633] FEATURE: Display "Last Updated At" on user directory

---
 .../javascripts/discourse/routes/users.js      |  6 +++++-
 .../discourse/templates/mobile/users.hbs       |  8 +++++++-
 .../javascripts/discourse/templates/users.hbs  | 12 ++++++++++--
 .../stylesheets/common/base/directory.scss     | 18 ++++++++++++------
 app/assets/stylesheets/mobile/directory.scss   |  4 ++--
 app/controllers/directory_items_controller.rb  |  2 ++
 app/models/directory_item.rb                   |  9 +++++++++
 config/locales/client.en.yml                   |  1 +
 .../directory_items_controller_spec.rb         |  1 +
 9 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/routes/users.js b/app/assets/javascripts/discourse/routes/users.js
index 4fec3c1604..76f310d11b 100644
--- a/app/assets/javascripts/discourse/routes/users.js
+++ b/app/assets/javascripts/discourse/routes/users.js
@@ -1,4 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { longDate } from "discourse/lib/formatter";
 
 export default DiscourseRoute.extend({
   queryParams: {
@@ -22,7 +23,8 @@ export default DiscourseRoute.extend({
         asc: null,
         name: "",
         group: null,
-        exclude_usernames: null
+        exclude_usernames: null,
+        lastUpdatedAt: null
       });
     }
   },
@@ -41,8 +43,10 @@ export default DiscourseRoute.extend({
 
   setupController(controller, model) {
     const params = this._params;
+    const lastUpdatedAt = model.get("resultSetMeta.last_updated_at");
     controller.setProperties({
       model,
+      lastUpdatedAt: lastUpdatedAt ? longDate(lastUpdatedAt) : null,
       period: params.period,
       nameInput: params.name
     });
diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs
index 776409d6b5..7f208e2abb 100644
--- a/app/assets/javascripts/discourse/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs
@@ -3,8 +3,14 @@
     <div class='directory'>
       {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
 
-      <div class='clearfix user-controls'>
+      <div class='directory-controls'>
         {{period-chooser period=period onChange=(action (mut period))}}
+        {{#if lastUpdatedAt}}
+          <div class='directory-last-updated'>
+            {{i18n "directory.last_updated"}}
+            {{lastUpdatedAt}}
+          </div>
+        {{/if}}
         {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}}
       </div>
 
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index 6a44c7ce1b..09f4ba4f0c 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -3,8 +3,16 @@
     <div class="container">
       <div class='directory'>
         {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
-        <div class='clearfix'>
-          {{period-chooser period=period onChange=(action (mut period))}}
+        <div class='directory-controls'>
+          <div class='period-controls'>
+            {{period-chooser period=period onChange=(action (mut period))}}
+            {{#if lastUpdatedAt}}
+              <div class='directory-last-updated'>
+                {{i18n "directory.last_updated"}}
+                {{lastUpdatedAt}}
+              </div>
+            {{/if}}
+          </div>
           {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}}
         </div>
 
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 4bc304f8a6..81045260a5 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -5,16 +5,22 @@
     margin-bottom: 0;
   }
 
-  .period-chooser {
-    float: left;
-  }
-  .filter-name {
-    float: right;
-  }
   .spinner {
     clear: both;
   }
 
+  .directory-controls {
+    display: flex;
+    justify-content: space-between;
+    .filter-name {
+      height: 1em;
+    }
+  }
+  .directory-last-updated {
+    margin-bottom: 0.5em;
+    color: $primary-medium;
+  }
+
   table {
     width: 100%;
     margin-bottom: 1em;
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index 90de7b3517..c1057bd636 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -6,8 +6,8 @@
     margin-bottom: 0.25em;
   }
 
-  .filter-name {
-    float: left;
+  .directory-controls {
+    display: block;
   }
 
   .total-rows {
diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 5cf99b710c..9acc1a24eb 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -79,7 +79,9 @@ class DirectoryItemsController < ApplicationController
 
     end
 
+    last_updated_at = DirectoryItem.last_updated_at(period_type)
     render_json_dump(directory_items: serialize_data(result, DirectoryItemSerializer),
+                     meta: { last_updated_at: last_updated_at },
                      total_rows_directory_items: result_count,
                      load_more_directory_items: directory_items_path(more_params))
   end
diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb
index 89f8daf2d3..930c782929 100644
--- a/app/models/directory_item.rb
+++ b/app/models/directory_item.rb
@@ -27,8 +27,17 @@ class DirectoryItem < ActiveRecord::Base
     period_types.each_key { |p| refresh_period!(p) }
   end
 
+  def self.last_updated_at(period_type)
+    val = Discourse.redis.get("directory_#{period_type}")
+    return nil if val.nil?
+
+    Time.zone.at(val.to_i)
+  end
+
   def self.refresh_period!(period_type, force: false)
 
+    Discourse.redis.set("directory_#{period_types[period_type]}", Time.zone.now.to_i)
+
     # Don't calculate it if the user directory is disabled
     return unless SiteSetting.enable_user_directory? || force
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c60d83b608..98d4a5bf1b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -587,6 +587,7 @@ en:
       days_visited_long: "Days Visited"
       posts_read: "Read"
       posts_read_long: "Posts Read"
+      last_updated: "Last Updated:"
       total_rows:
         one: "%{count} user"
         other: "%{count} users"
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index 6d1e777e68..8dc0ccabce 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -46,6 +46,7 @@ describe DirectoryItemsController do
       expect(json['directory_items']).to be_present
       expect(json['total_rows_directory_items']).to be_present
       expect(json['load_more_directory_items']).to be_present
+      expect(json['meta']['last_updated_at']).to be_present
 
       expect(json['directory_items'].length).to eq(4)
       expect(json['total_rows_directory_items']).to eq(4)

From 339ddb8701bbb1933969530346b63ea32157bc08 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 22:02:24 +0200
Subject: [PATCH 344/633] FIX: makes clicking and displaying date picker more
 reliable (#9302)

---
 .../discourse/components/date-input.js        | 59 ++++++++++---------
 .../templates/components/date-input.hbs       |  3 +
 .../common/components/date-input.scss         |  3 +
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/date-input.js b/app/assets/javascripts/discourse/components/date-input.js
index 0aaea9304b..b44640bcd4 100644
--- a/app/assets/javascripts/discourse/components/date-input.js
+++ b/app/assets/javascripts/discourse/components/date-input.js
@@ -1,4 +1,4 @@
-import { next } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
@@ -16,17 +16,19 @@ export default Component.extend({
 
   @on("didInsertElement")
   _loadDatePicker() {
-    const container = this.element.querySelector(`#${this.containerId}`);
+    schedule("afterRender", () => {
+      const container = this.element.querySelector(`#${this.containerId}`);
 
-    if (this.site.mobileView) {
-      this._loadNativePicker(container);
-    } else {
-      this._loadPikadayPicker(container);
-    }
+      if (this.site.mobileView) {
+        this._loadNativePicker(container);
+      } else {
+        this._loadPikadayPicker(container);
+      }
 
-    if (this.date && this._picker) {
-      this._picker.setDate(this.date, true);
-    }
+      if (this.date && this._picker) {
+        this._picker.setDate(this.date, true);
+      }
+    });
   },
 
   didUpdateAttrs() {
@@ -44,26 +46,25 @@ export default Component.extend({
 
   _loadPikadayPicker(container) {
     loadScript("/javascripts/pikaday.js").then(() => {
-      next(() => {
-        const default_opts = {
-          field: this.element.querySelector(".date-picker"),
-          container: container || this.element,
-          bound: container === null,
-          format: "LL",
-          firstDay: 1,
-          i18n: {
-            previousMonth: I18n.t("dates.previous_month"),
-            nextMonth: I18n.t("dates.next_month"),
-            months: moment.months(),
-            weekdays: moment.weekdays(),
-            weekdaysShort: moment.weekdaysShort()
-          },
-          onSelect: date => this._handleSelection(date)
-        };
+      const defaultOptions = {
+        field: this.element.querySelector(".date-picker"),
+        container: container || this.element.querySelector(".picker-container"),
+        bound: container === null,
+        format: "LL",
+        firstDay: 1,
+        trigger: this.element,
+        i18n: {
+          previousMonth: I18n.t("dates.previous_month"),
+          nextMonth: I18n.t("dates.next_month"),
+          months: moment.months(),
+          weekdays: moment.weekdays(),
+          weekdaysShort: moment.weekdaysShort()
+        },
+        onSelect: date => this._handleSelection(date)
+      };
 
-        this._picker = new Pikaday(Object.assign(default_opts, this._opts()));
-        this._picker.setDate(this.date, true);
-      });
+      this._picker = new Pikaday(Object.assign(defaultOptions, this._opts()));
+      this._picker.setDate(this.date, true);
     });
   },
 
diff --git a/app/assets/javascripts/discourse/templates/components/date-input.hbs b/app/assets/javascripts/discourse/templates/components/date-input.hbs
index 3ed544b507..ad48e3e25d 100644
--- a/app/assets/javascripts/discourse/templates/components/date-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-input.hbs
@@ -4,4 +4,7 @@
   placeholder=placeholder
   value=value
   input=(action "onInput")
+  readonly=true
 }}
+
+<div class="picker-container"></div>
diff --git a/app/assets/stylesheets/common/components/date-input.scss b/app/assets/stylesheets/common/components/date-input.scss
index 7917f408d0..b24ad8ea4e 100644
--- a/app/assets/stylesheets/common/components/date-input.scss
+++ b/app/assets/stylesheets/common/components/date-input.scss
@@ -1,8 +1,11 @@
 .d-date-input {
   display: flex;
   flex: 1;
+  cursor: pointer;
+  flex-direction: column;
 
   .date-picker {
+    cursor: pointer;
     margin: 0;
     text-align: left;
     width: 100%;

From 29e733832d7f95669310a662594ca53b07938f38 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 30 Mar 2020 16:42:47 -0400
Subject: [PATCH 345/633] FIX: error when changing a topic's category and
 creating a tag

---
 app/controllers/topics_controller.rb    |  2 ++
 spec/requests/topics_controller_spec.rb | 26 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 99ff5fb625..238746ffb0 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -342,6 +342,8 @@ class TopicsController < ApplicationController
             end
           end
 
+          invalid_tags = Tag.where_name(invalid_tags).pluck(:name)
+
           if !invalid_tags.empty?
             if (invalid_tags & DiscourseTagging.hidden_tag_names).present?
               return render_json_error(I18n.t('category.errors.disallowed_tags_generic'))
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 947d244971..c5ff3ecc7a 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -1038,6 +1038,32 @@ RSpec.describe TopicsController do
             expect(topic.tags.pluck(:id)).to contain_exactly(tag.id)
           end
 
+          it "can create a tag" do
+            SiteSetting.min_trust_to_create_tag = 0
+            expect do
+              put "/t/#{topic.slug}/#{topic.id}.json", params: {
+                tags: ["newtag"]
+              }
+            end.to change { topic.reload.first_post.revisions.count }.by(1)
+
+            expect(response.status).to eq(200)
+            expect(topic.reload.tags.pluck(:name)).to contain_exactly("newtag")
+          end
+
+          it "can change the category and create a new tag" do
+            SiteSetting.min_trust_to_create_tag = 0
+            category = Fabricate(:category)
+            expect do
+              put "/t/#{topic.slug}/#{topic.id}.json", params: {
+                tags: ["newtag"],
+                category_id: category.id
+              }
+            end.to change { topic.reload.first_post.revisions.count }.by(1)
+
+            expect(response.status).to eq(200)
+            expect(topic.reload.tags.pluck(:name)).to contain_exactly("newtag")
+          end
+
           it "can add a tag to wiki topic" do
             SiteSetting.min_trust_to_edit_wiki_post = 2
             topic.first_post.update!(wiki: true)

From 170327005502b27d3d3c6658a1486842efbfe839 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:49:38 -0700
Subject: [PATCH 346/633] DEV: Enable and fix no-trailing-spaces lint

---
 .template-lintrc.js                                           | 2 +-
 app/assets/javascripts/admin/templates/api-keys-index.hbs     | 3 +--
 .../discourse/templates/modal/associate-account-confirm.hbs   | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 7c94a35a76..0a26ee1992 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -37,7 +37,7 @@ module.exports = {
     "no-positive-tabindex": false,
     "no-quoteless-attributes": false,
     "no-shadowed-elements": true,
-    "no-trailing-spaces": false,
+    "no-trailing-spaces": true,
     "no-triple-curlies": true,
     "no-unbound": true,
     "no-unnecessary-concat": true,
diff --git a/app/assets/javascripts/admin/templates/api-keys-index.hbs b/app/assets/javascripts/admin/templates/api-keys-index.hbs
index 7943a5b9e2..bd91228055 100644
--- a/app/assets/javascripts/admin/templates/api-keys-index.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-index.hbs
@@ -61,7 +61,6 @@
               icon="times"
               title="admin.api.revoke"}}
           {{/if}}
-          
         </td>
       </tr>
     {{/each}}
@@ -69,4 +68,4 @@
   </table>
 {{else}}
   <p>{{i18n "admin.api.none"}}</p>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs b/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
index d24c1d7392..ae5a9419f4 100644
--- a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
@@ -1,6 +1,6 @@
-{{#d-modal-body 
+{{#d-modal-body
     rawTitle=(
-      i18n "user.associated_accounts.confirm_modal_title" 
+      i18n "user.associated_accounts.confirm_modal_title"
       provider=(i18n (concat "login." model.provider_name ".name"))
     )
 }}

From f900efaa4a294c499b43db7be1268fc9a645ec75 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:55:42 -0700
Subject: [PATCH 347/633] DEV: composer.hbs: fix indentation

---
 .../discourse/templates/composer.hbs          | 376 +++++++++---------
 1 file changed, 187 insertions(+), 189 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 43af40a527..7cd5c8f42a 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -6,136 +6,136 @@
                  save=(action "save")}}
   <div class="grippie"></div>
   {{#if visible}}
-      {{composer-messages composer=model
-                          messageCount=messageCount
-                          addLinkLookup=(action "addLinkLookup")}}
-      {{#if model.viewOpenOrFullscreen}}
-        <div class="reply-area {{if canEditTags 'with-tags'}}">
-          <div class='composer-fields'>
-            {{plugin-outlet name="composer-open" args=(hash model=model)}}
-            <div class='reply-to'>
-              {{#unless model.viewFullscreen}}
-                <div class="reply-details">
-                  {{composer-action-title
-                    model=model
-                    openComposer=(action "openComposer")
-                    closeComposer=(action "closeComposer")
-                    canWhisper=canWhisper
-                    tabindex=8}}
-                  {{plugin-outlet name="composer-action-after" noTags=true args=(hash model=model)}}
-
-                  {{#unless site.mobileView}}
-                    {{#if isWhispering}}
-                      <span class='whisper'>{{d-icon "far-eye-slash"}}</span>
-                    {{/if}}
-                    {{#if model.unlistTopic}}
-                      <span class='whisper'>({{i18n 'composer.unlist'}})</span>
-                    {{/if}}
-                    {{#if model.noBump}}
-                      <span class="no-bump">{{d-icon "anchor"}}</span>
-                    {{/if}}
-                  {{/unless}}
-
-                  {{#if canEdit}}
-                    {{#link-to-input onClick=(action "displayEditReason") showInput=showEditReason icon="info-circle" class="display-edit-reason"}}
-                      {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
-                    {{/link-to-input}}
-                  {{/if}}
-                </div>
-              {{/unless}}
-              {{composer-toggles composeState=model.composeState
-                        toggleComposer=(action "toggle")
-                        toggleToolbar=(action "toggleToolbar")
-                        toggleFullscreen=(action "fullscreenComposer")}}
-            </div>
+    {{composer-messages composer=model
+                        messageCount=messageCount
+                        addLinkLookup=(action "addLinkLookup")}}
+    {{#if model.viewOpenOrFullscreen}}
+      <div class="reply-area {{if canEditTags 'with-tags'}}">
+        <div class='composer-fields'>
+          {{plugin-outlet name="composer-open" args=(hash model=model)}}
+          <div class='reply-to'>
             {{#unless model.viewFullscreen}}
-              {{#if model.canEditTitle}}
-                {{#if model.creatingPrivateMessage}}
-                  <div class='user-selector'>
-                    {{composer-user-selector topicId=topicModel.id
-                                             usernames=model.targetRecipients
-                                             hasGroups=model.hasTargetGroups
-                                             focusTarget=focusTarget
-                                             class="users-input"}}
-                    {{#if showWarning}}
-                      <label class='add-warning'>
-                        {{input type="checkbox" checked=model.isWarning tabindex="3"}}
-                        {{i18n "composer.add_warning"}}
-                      </label>
-                    {{/if}}
-                  </div>
-                {{/if}}
+              <div class="reply-details">
+                {{composer-action-title
+                  model=model
+                  openComposer=(action "openComposer")
+                  closeComposer=(action "closeComposer")
+                  canWhisper=canWhisper
+                  tabindex=8}}
+                {{plugin-outlet name="composer-action-after" noTags=true args=(hash model=model)}}
 
-                <div class="title-and-category {{if showPreview 'with-preview'}}">
-
-                  {{composer-title composer=model lastValidatedAt=lastValidatedAt focusTarget=focusTarget}}
-
-                  {{#if model.showCategoryChooser}}
-                    <div class="category-input">
-                      {{category-chooser
-                        value=model.categoryId
-                        tabindex="3"
-                        onChange=(action (mut model.categoryId))
-                        isDisabled=disableCategoryChooser
-                        options=(hash
-                          scopedCategoryId=scopedCategoryId
-                        )
-                      }}
-                      {{popup-input-tip validation=categoryValidation}}
-                    </div>
+                {{#unless site.mobileView}}
+                  {{#if isWhispering}}
+                    <span class='whisper'>{{d-icon "far-eye-slash"}}</span>
                   {{/if}}
-                  {{#if canEditTags}}
-                    {{mini-tag-chooser
-                      value=model.tags
-                      tabindex=4
-                      isDisabled=disableTagsChooser
-                      onChange=(action (mut model.tags))
-                      options=(hash
-                        categoryId=model.categoryId
-                        minimum=model.minimumRequiredTags
-                      )
-                    }}
-                    {{popup-input-tip validation=tagValidation}}
+                  {{#if model.unlistTopic}}
+                    <span class='whisper'>({{i18n 'composer.unlist'}})</span>
+                  {{/if}}
+                  {{#if model.noBump}}
+                    <span class="no-bump">{{d-icon "anchor"}}</span>
+                  {{/if}}
+                {{/unless}}
+
+                {{#if canEdit}}
+                  {{#link-to-input onClick=(action "displayEditReason") showInput=showEditReason icon="info-circle" class="display-edit-reason"}}
+                    {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
+                  {{/link-to-input}}
+                {{/if}}
+              </div>
+            {{/unless}}
+            {{composer-toggles composeState=model.composeState
+                      toggleComposer=(action "toggle")
+                      toggleToolbar=(action "toggleToolbar")
+                      toggleFullscreen=(action "fullscreenComposer")}}
+          </div>
+          {{#unless model.viewFullscreen}}
+            {{#if model.canEditTitle}}
+              {{#if model.creatingPrivateMessage}}
+                <div class='user-selector'>
+                  {{composer-user-selector topicId=topicModel.id
+                                           usernames=model.targetRecipients
+                                           hasGroups=model.hasTargetGroups
+                                           focusTarget=focusTarget
+                                           class="users-input"}}
+                  {{#if showWarning}}
+                    <label class='add-warning'>
+                      {{input type="checkbox" checked=model.isWarning tabindex="3"}}
+                      {{i18n "composer.add_warning"}}
+                    </label>
                   {{/if}}
                 </div>
               {{/if}}
 
-              {{plugin-outlet name="composer-fields" args=(hash model=model)}}
-            {{/unless}}
+              <div class="title-and-category {{if showPreview 'with-preview'}}">
 
-          </div>
+                {{composer-title composer=model lastValidatedAt=lastValidatedAt focusTarget=focusTarget}}
 
-          {{composer-editor topic=topic
-                            composer=model
-                            lastValidatedAt=lastValidatedAt
-                            canWhisper=canWhisper
-                            storeToolbarState=(action "storeToolbarState")
-                            onPopupMenuAction=(action "onPopupMenuAction")
-                            showUploadModal=(route-action "showUploadSelector")
-                            popupMenuOptions=popupMenuOptions
-                            draftStatus=model.draftStatus
-                            isUploading=isUploading
-                            allowUpload=allowUpload
-                            uploadIcon=uploadIcon
-                            isCancellable=isCancellable
-                            uploadProgress=uploadProgress
-                            groupsMentioned=(action "groupsMentioned")
-                            cannotSeeMention=(action "cannotSeeMention")
-                            importQuote=(action "importQuote")
-                            togglePreview=(action "togglePreview")
-                            showToolbar=showToolbar
-                            afterRefresh=(action "afterRefresh")
-                            focusTarget=focusTarget}}
+                {{#if model.showCategoryChooser}}
+                  <div class="category-input">
+                    {{category-chooser
+                      value=model.categoryId
+                      tabindex="3"
+                      onChange=(action (mut model.categoryId))
+                      isDisabled=disableCategoryChooser
+                      options=(hash
+                        scopedCategoryId=scopedCategoryId
+                      )
+                    }}
+                    {{popup-input-tip validation=categoryValidation}}
+                  </div>
+                {{/if}}
+                {{#if canEditTags}}
+                  {{mini-tag-chooser
+                    value=model.tags
+                    tabindex=4
+                    isDisabled=disableTagsChooser
+                    onChange=(action (mut model.tags))
+                    options=(hash
+                      categoryId=model.categoryId
+                      minimum=model.minimumRequiredTags
+                    )
+                  }}
+                  {{popup-input-tip validation=tagValidation}}
+                {{/if}}
+              </div>
+            {{/if}}
 
-          <div class='submit-panel'>
-            {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
+            {{plugin-outlet name="composer-fields" args=(hash model=model)}}
+          {{/unless}}
 
-            <div class='save-or-cancel'>
-              {{#unless model.viewFullscreen}}
-                {{composer-save-button action=(action "save")
-                                       icon=saveIcon
-                                       label=saveLabel
-                                       disableSubmit=disableSubmit}}
+        </div>
+
+        {{composer-editor topic=topic
+                          composer=model
+                          lastValidatedAt=lastValidatedAt
+                          canWhisper=canWhisper
+                          storeToolbarState=(action "storeToolbarState")
+                          onPopupMenuAction=(action "onPopupMenuAction")
+                          showUploadModal=(route-action "showUploadSelector")
+                          popupMenuOptions=popupMenuOptions
+                          draftStatus=model.draftStatus
+                          isUploading=isUploading
+                          allowUpload=allowUpload
+                          uploadIcon=uploadIcon
+                          isCancellable=isCancellable
+                          uploadProgress=uploadProgress
+                          groupsMentioned=(action "groupsMentioned")
+                          cannotSeeMention=(action "cannotSeeMention")
+                          importQuote=(action "importQuote")
+                          togglePreview=(action "togglePreview")
+                          showToolbar=showToolbar
+                          afterRefresh=(action "afterRefresh")
+                          focusTarget=focusTarget}}
+
+        <div class='submit-panel'>
+          {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
+
+          <div class='save-or-cancel'>
+            {{#unless model.viewFullscreen}}
+              {{composer-save-button action=(action "save")
+                                     icon=saveIcon
+                                     label=saveLabel
+                                     disableSubmit=disableSubmit}}
 
               {{#if site.mobileView}}
                 <a href {{action "cancel"}} class='cancel' tabindex="6" title={{i18n 'cancel'}}>
@@ -150,89 +150,87 @@
               {{/if}}
             {{/unless}}
 
-
-              {{#if site.mobileView}}
-                {{#if whisperOrUnlistTopic}}
-                  <span class='whisper'>
-                    {{d-icon "far-eye-slash"}}
-                  </span>
-                {{/if}}
-                {{#if model.noBump}}
-                  <span class="no-bump">{{d-icon "anchor"}}</span>
-                {{/if}}
+            {{#if site.mobileView}}
+              {{#if whisperOrUnlistTopic}}
+                <span class='whisper'>
+                  {{d-icon "far-eye-slash"}}
+                </span>
               {{/if}}
-
-
-              {{#if isUploading}}
-                <div id="file-uploading">
-                  {{loading-spinner size="small"}}<span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
-                  {{#if isCancellable}}
-                    <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
-                  {{/if}}
-                </div>
+              {{#if model.noBump}}
+                <span class="no-bump">{{d-icon "anchor"}}</span>
               {{/if}}
-              <div id='draft-status' class={{if isUploading 'hidden'}}>
-                {{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
-                {{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
-                {{#if model.draftStatus}}
-                  <span title={{model.draftStatus}}>
-                    {{#if model.draftConflictUser}}
-                      {{avatar model.draftConflictUser imageSize="small"}} {{d-icon 'user-edit'}}
-                    {{else}}
-                      {{d-icon 'sync-alt'}}
-                    {{/if}}
-                    {{#unless site.mobileView}}
-                      {{model.draftStatus}}
-                    {{/unless}}
-                  </span>
+            {{/if}}
+
+            {{#if isUploading}}
+              <div id="file-uploading">
+                {{loading-spinner size="small"}}<span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
+                {{#if isCancellable}}
+                  <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
                 {{/if}}
               </div>
-            </div>
-
-              {{#if site.mobileView}}
-                {{#if allowUpload}}
-                  <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
-                    {{d-icon uploadIcon}}
-                  </a>
-                {{/if}}
-
-                <a href class="btn btn-default no-text mobile-preview" title={{i18n 'composer.show_preview'}} {{action "togglePreview"}}>
-                  {{d-icon "desktop"}}
-                </a>
-
-                {{#if showPreview}}
-                  {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
-                {{/if}}
-              {{else}}
-                <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
+            {{/if}}
+            <div id='draft-status' class={{if isUploading 'hidden'}}>
+              {{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
+              {{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
+              {{#if model.draftStatus}}
+                <span title={{model.draftStatus}}>
+                  {{#if model.draftConflictUser}}
+                    {{avatar model.draftConflictUser imageSize="small"}} {{d-icon 'user-edit'}}
+                  {{else}}
+                    {{d-icon 'sync-alt'}}
+                  {{/if}}
+                  {{#unless site.mobileView}}
+                    {{model.draftStatus}}
+                  {{/unless}}
+                </span>
               {{/if}}
-
+            </div>
           </div>
-        </div>
 
-      {{else}}
-        <div class='saving-text'>
-          {{#if model.createdPost}}
-            {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+          {{#if site.mobileView}}
+            {{#if allowUpload}}
+              <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
+                {{d-icon uploadIcon}}
+              </a>
+            {{/if}}
+
+            <a href class="btn btn-default no-text mobile-preview" title={{i18n 'composer.show_preview'}} {{action "togglePreview"}}>
+              {{d-icon "desktop"}}
+            </a>
+
+            {{#if showPreview}}
+              {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
+            {{/if}}
           {{else}}
-            {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
+            <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
           {{/if}}
+
         </div>
+      </div>
 
-        <div class='draft-text'>
-          {{#if model.topic}}
-            {{d-icon "share"}} {{html-safe draftTitle}}
-          {{else}}
-            {{i18n "composer.saved_draft"}}
-          {{/if}}
-        </div>
+    {{else}}
+      <div class='saving-text'>
+        {{#if model.createdPost}}
+          {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+        {{else}}
+          {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
+        {{/if}}
+      </div>
 
-        {{composer-toggles composeState=model.composeState
-          toggleFullscreen=(action "openIfDraft")
-          toggleComposer=(action "toggle")
-          toggleToolbar=(action "toggleToolbar")}}
+      <div class='draft-text'>
+        {{#if model.topic}}
+          {{d-icon "share"}} {{html-safe draftTitle}}
+        {{else}}
+          {{i18n "composer.saved_draft"}}
+        {{/if}}
+      </div>
 
-      {{/if}}
+      {{composer-toggles composeState=model.composeState
+        toggleFullscreen=(action "openIfDraft")
+        toggleComposer=(action "toggle")
+        toggleToolbar=(action "toggleToolbar")}}
+
+    {{/if}}
 
   {{/if}}
 

From 2afb95fe3e5dc82bda23166e6d38b81ed5d69a0c Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:56:42 -0700
Subject: [PATCH 348/633] DEV: Enable and fix the 'no-multiple-empty-lines'
 lint

---
 .template-lintrc.js                                            | 2 +-
 app/assets/javascripts/admin/templates/admin.hbs               | 2 --
 .../admin/templates/components/admin-theme-editor.hbs          | 1 -
 .../javascripts/admin/templates/components/themes-list.hbs     | 2 --
 app/assets/javascripts/admin/templates/plugins-index.hbs       | 3 ---
 .../discourse/templates/components/image-uploader.hbs          | 1 -
 .../javascripts/discourse/templates/components/share-popup.hbs | 1 -
 .../javascripts/discourse/templates/preferences/account.hbs    | 2 --
 .../javascripts/discourse/templates/preferences/categories.hbs | 2 --
 .../javascripts/discourse/templates/preferences/interface.hbs  | 1 -
 .../javascripts/discourse/templates/preferences/profile.hbs    | 1 -
 .../javascripts/discourse/templates/preferences/users.hbs      | 1 -
 app/assets/javascripts/discourse/templates/topic.hbs           | 1 -
 13 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 0a26ee1992..1f377ea0f1 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -30,7 +30,7 @@ module.exports = {
     "no-log": true,
     "no-negated-condition": true,
     "no-nested-interactive": true,
-    "no-multiple-empty-lines": false,
+    "no-multiple-empty-lines": true,
     "no-obsolete-elements": true,
     "no-outlet-outside-routes": true,
     "no-partial": true,
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index aec3433a0b..2396114db6 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -29,11 +29,9 @@
         {{/if}}
         {{nav-item route='adminPlugins' label='admin.plugins.title'}}
         {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}}
-
       </ul>
       </div>
 
-
       <div class='boxed white admin-content'>
         <div class='admin-contents {{adminContentsClassName}}'>
           {{outlet}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
index ad669f4d3d..ba31c888c3 100644
--- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
@@ -87,7 +87,6 @@
     </nav>
 </div>
 
-
 {{#if error}}
     <pre class='field-error'>{{error}}</pre>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
index 4654371a23..2bfbc8843b 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -44,8 +44,6 @@
       <span class="empty">{{i18n "admin.customize.theme.empty"}}</span>
     </div>
   {{/if}}
-
-
 </div>
 
 <div class="create-actions">
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index 9370d8457c..d3d7c23785 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -1,9 +1,6 @@
 {{#if model.length}}
-
-
   <h3>{{i18n "admin.plugins.installed"}}</h3>
 
-
   <table class="admin-plugins grid">
     <thead>
       <tr>
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index bf75d0929a..9820cb33a0 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -29,7 +29,6 @@
     <span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
   </div>
 
-
   {{#if imageUrl}}
     <a class="lightbox"
        href={{imageCDNURL}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 54e8029cf6..c61f43cf64 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -35,7 +35,6 @@
       </div>
     {{/if}}
 
-
     {{d-button action="close" class="btn btn-flat close" icon="times" aria-label="share.close" title="share.close"}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 3f02b15238..70b8d20cd8 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -165,7 +165,6 @@
   </div>
 {{/if}}
 
-
 {{#if canCheckEmails}}
   <div class="control-group pref-auth-tokens">
     <label class="control-label">{{i18n 'user.auth_tokens.title'}}</label>
@@ -218,7 +217,6 @@
   {{save-controls model=model action=(action "save") saved=saved}}
 {{/if}}
 
-
 {{#if model.canDeleteAccount}}
   <div class="control-group delete-account">
     <br>
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index b0fc96c15b..dacfbc1c8b 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -14,7 +14,6 @@
   </div>
   <div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
 
-
   <div class="controls tracking-controls">
     <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
     {{#if canSee}}
@@ -28,7 +27,6 @@
   </div>
   <div class="instructions">{{i18n 'user.tracked_categories_instructions'}}</div>
 
-
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching-first"}} {{i18n 'user.watched_first_post_categories'}}</label>
     {{category-selector
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index 338a7d883e..acd5aa60bb 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -54,7 +54,6 @@
   </div>
 {{/if}}
 
-
 <div class="control-group home">
   <label class="control-label">{{i18n 'user.home'}}</label>
   <div class="controls">
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index fded99a5fd..fed0da9e91 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -87,7 +87,6 @@
   </div>
 {{/if}}
 
-
 {{plugin-outlet name="user-preferences-profile" args=(hash model=model save=(action "save"))}}
 
 {{plugin-outlet name="user-custom-preferences" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/users.hbs b/app/assets/javascripts/discourse/templates/preferences/users.hbs
index d4c183c3a0..799b9c5c5a 100644
--- a/app/assets/javascripts/discourse/templates/preferences/users.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/users.hbs
@@ -27,5 +27,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-
 {{#save-controls model=model action=(action "save") saved=saved}}{{/save-controls}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index c79b3da18a..c6297b021d 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -87,7 +87,6 @@
       {{/topic-title}}
     {{/if}}
 
-
     <div class="container posts">
       <div class='selected-posts {{unless multiSelect 'hidden'}}'>
         {{selected-posts

From 2a2555e598034a4cb320ffa705353ad81e46f018 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 12:36:19 -0700
Subject: [PATCH 349/633] DEV: Partial 'block-indentation' linting fixes

---
 .../templates/components/user-fields/text.hbs |  4 +-
 .../mobile/components/basic-topic-list.hbs    | 98 +++++++++----------
 .../mobile/components/categories-only.hbs     | 90 +++++++++--------
 .../mobile/components/mobile-nav.hbs          |  2 +-
 .../mobile/components/navigation-bar.hbs      | 16 +--
 .../templates/components/invite-list.hbs      | 10 +-
 6 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 1c33ea1452..1518688a95 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,4 +1,6 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>
+  {{html-safe field.name}}
+  {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 0949b56ee7..72ed944b94 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -1,59 +1,59 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if hasIncoming}}
-  <div class="show-mores">
-    <a href class='alert alert-info clickable' {{action showInserted}}>
-      {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
-    </a>
-  </div>
+    <div class="show-mores">
+      <a href class='alert alert-info clickable' {{action showInserted}}>
+	{{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
+      </a>
+    </div>
   {{/if}}
 
   {{#if topics}}
     <table class="topic-list">
       <tbody>
-      {{#each topics as |t|}}
-        <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
-          <td>
-            <div class='main-link'>
-              {{topic-status topic=t}}
-              {{topic-link t}}
-              {{raw "list/unread-indicator" includeUnreadIndicator=showUnreadIndicator
-                                            topicId=t.id
-                                            unreadClass=(if t.unread_by_group_member "" "read")}}
-              {{#if t.unseen}}
-                <span class="badge-notification new-topic"></span>
-              {{/if}}
-              {{#if t.hasExcerpt}}
-                <div class="topic-excerpt">
-                  {{html-safe t.excerpt}}
-                  {{#if t.excerptTruncated}}
-                    {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
-                  {{/if}}
-                  {{#if t.canClearPin}}
-                    <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
-                  {{/if}}
-                </div>
-              {{/if}}
-            </div>
-            <div class='pull-right'>
-              {{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
-            </div>
-            <div class='clearfix'></div>
-            <div class="topic-item-stats clearfix">
-              {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
-              <div class="pull-right">
-                {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
-              </div>
-              {{#unless hideCategory}}
-                <div class='category'>
-                  {{category-link t.category}}
-                </div>
-              {{/unless}}
-              <div class="clearfix"></div>
-            </div>
-          </td>
-        </tr>
-      {{/each}}
+	{{#each topics as |t|}}
+	  <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
+	    <td>
+	      <div class='main-link'>
+		{{topic-status topic=t}}
+		{{topic-link t}}
+		{{raw "list/unread-indicator" includeUnreadIndicator=showUnreadIndicator
+					      topicId=t.id
+					      unreadClass=(if t.unread_by_group_member "" "read")}}
+		{{#if t.unseen}}
+		  <span class="badge-notification new-topic"></span>
+		{{/if}}
+		{{#if t.hasExcerpt}}
+		  <div class="topic-excerpt">
+		    {{html-safe t.excerpt}}
+		    {{#if t.excerptTruncated}}
+		      {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
+		    {{/if}}
+		    {{#if t.canClearPin}}
+		      <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
+		    {{/if}}
+		  </div>
+		{{/if}}
+	      </div>
+	      <div class='pull-right'>
+		{{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
+	      </div>
+	      <div class='clearfix'></div>
+	      <div class="topic-item-stats clearfix">
+		{{discourse-tags t mode="list" tagsForUser=tagsForUser}}
+		<div class="pull-right">
+		  {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
+		  <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
+		</div>
+		{{#unless hideCategory}}
+		  <div class='category'>
+		    {{category-link t.category}}
+		  </div>
+		{{/unless}}
+		<div class="clearfix"></div>
+	      </div>
+	    </td>
+	  </tr>
+	{{/each}}
       </tbody>
     </table>
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index ac7691bd10..b57dfeb001 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -11,58 +11,56 @@
             </tr>
 
             {{#unless c.isMuted}}
-            {{#if c.description_excerpt}}
-              <tr class="category-description">
-                <td colspan="3">
-                  {{html-safe c.description_excerpt}}
-                </td>
-              </tr>
-            {{/if}}
+	      {{#if c.description_excerpt}}
+		<tr class="category-description">
+		  <td colspan="3">
+		    {{html-safe c.description_excerpt}}
+		  </td>
+		</tr>
+	      {{/if}}
 
-            {{#if showTopics}}
-              {{#each c.topics as |t|}}
-                {{mobile-category-topic topic=t}}
-              {{/each}}
-            {{/if}}
+	      {{#if showTopics}}
+		{{#each c.topics as |t|}}
+		  {{mobile-category-topic topic=t}}
+		{{/each}}
+	      {{/if}}
 
-            {{#if c.isGrandParent}}
-              {{#each c.subcategories as |subcategory|}}
-                <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
-                  <td>
-                    {{category-title-link tagName="h4" category=subcategory}}
-
-                    <div class="subcategories-list">
-                      {{#if subcategory.subcategories}}
-                        <div class='subcategories'>
-                          {{#each subcategory.subcategories as |subsubcategory|}}
-                            {{#unless subsubcategory.isMuted}}
-                              {{category-link subsubcategory}}
-                            {{/unless}}
-                          {{/each}}
-                        </div>
-                      {{/if}}
-                    </div>
-                  </td>
-                </tr>
-              {{/each}}
-            {{else if c.subcategories}}
-              <tr class="subcategories-list">
-                <td>
-                  <div class='subcategories'>
-                    {{#each c.subcategories as |subcategory|}}
-                      {{#unless subcategory.isMuted}}
-                        {{category-link subcategory}}
-                      {{/unless}}
-                    {{/each}}
-                  </div>
-                </td>
-              </tr>
-            {{/if}}
+	      {{#if c.isGrandParent}}
+		{{#each c.subcategories as |subcategory|}}
+		  <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
+		    <td>
+		      {{category-title-link tagName="h4" category=subcategory}}
+		      <div class="subcategories-list">
+			{{#if subcategory.subcategories}}
+			  <div class='subcategories'>
+			    {{#each subcategory.subcategories as |subsubcategory|}}
+			      {{#unless subsubcategory.isMuted}}
+				{{category-link subsubcategory}}
+			      {{/unless}}
+			    {{/each}}
+			  </div>
+			{{/if}}
+		      </div>
+		    </td>
+		  </tr>
+		{{/each}}
+	      {{else if c.subcategories}}
+		<tr class="subcategories-list">
+		  <td>
+		    <div class='subcategories'>
+		      {{#each c.subcategories as |subcategory|}}
+			{{#unless subcategory.isMuted}}
+			  {{category-link subcategory}}
+			{{/unless}}
+		      {{/each}}
+		    </div>
+		  </td>
+		</tr>
+	      {{/if}}
             {{/unless}}
           </tbody>
         </table>
         <footer class="clearfix">
-
           <figure title={{i18n 'all_time_desc'}}>{{number c.topics_all_time}} <figcaption>{{i18n 'all_time'}}</figcaption></figure>
 
           {{#if c.pickMonth}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index ca6140be54..c657025ee4 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -7,5 +7,5 @@
   </li>
 {{/if}}
 <ul class='drop {{if expanded 'expanded'}}'>
-{{yield}}
+  {{yield}}
 </ul>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
index d760be82d2..dc7b593da3 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
@@ -5,12 +5,12 @@
   </a>
 </li>
 {{#if expanded}}
-<ul class='drop'>
-  {{#each navItems as |navItem|}}
-    {{navigation-item content=navItem filterMode=filterMode category=category}}
-  {{/each}}
-  {{#each connectors as |c|}}
-  {{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
-  {{/each}}
-</ul>
+  <ul class='drop'>
+    {{#each navItems as |navItem|}}
+      {{navigation-item content=navItem filterMode=filterMode category=category}}
+    {{/each}}
+    {{#each connectors as |c|}}
+      {{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
+    {{/each}}
+  </ul>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
index 4a8ea1ffae..95739573ee 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
@@ -1,10 +1,10 @@
 
 {{#if users}}
-<div class="users-list">
-  {{#each users as |user|}}
-    {{invite-list-user user=user roles=roles removeUser=(action "removeUser")}}
-  {{/each}}
-</div>
+  <div class="users-list">
+    {{#each users as |user|}}
+      {{invite-list-user user=user roles=roles removeUser=(action "removeUser")}}
+    {{/each}}
+  </div>
 {{/if}}
 
 <div class="new-user">

From 5b6cdd6fb544786947c58a205fbc819ff0943bfe Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 23:17:00 +0200
Subject: [PATCH 350/633] DEV: adds a loading property to d-button (#9072)

Usage:

```
{{d-button icon="times" label="foo.bar" isLoading=true}}
```

Note that  a button loading without an icon will shrink text size to prevent button to jump in size.

A button while loading is disabled.
---
 .../discourse/components/d-button.js          | 24 +++++++++-
 .../templates/components/d-button.hbs         | 10 +++-
 .../common/components/buttons.scss            | 25 ++++++++++
 lib/svg_sprite/svg_sprite.rb                  |  3 +-
 test/javascripts/components/d-button-test.js  | 46 +++++++++++++++++++
 5 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/d-button.js b/app/assets/javascripts/discourse/components/d-button.js
index 1210432127..4df816a347 100644
--- a/app/assets/javascripts/discourse/components/d-button.js
+++ b/app/assets/javascripts/discourse/components/d-button.js
@@ -1,4 +1,5 @@
 import { notEmpty, empty, equal } from "@ember/object/computed";
+import { computed } from "@ember/object";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import DiscourseURL from "discourse/lib/url";
@@ -11,17 +12,36 @@ export default Component.extend({
 
   type: "button",
 
+  isLoading: computed({
+    set(key, value) {
+      this.set("forceDisabled", value);
+      return value;
+    }
+  }),
+
   tagName: "button",
-  classNameBindings: ["btnLink::btn", "btnLink", "noText", "btnType"],
+  classNameBindings: [
+    "isLoading:is-loading",
+    "btnLink::btn",
+    "btnLink",
+    "noText",
+    "btnType"
+  ],
   attributeBindings: [
     "form",
-    "disabled",
+    "isDisabled:disabled",
     "translatedTitle:title",
     "translatedLabel:aria-label",
     "tabindex",
     "type"
   ],
 
+  isDisabled: computed("disabled", "forceDisabled", function() {
+    return this.forceDisabled || this.disabled;
+  }),
+
+  forceDisabled: false,
+
   btnIcon: notEmpty("icon"),
 
   btnLink: equal("display", "link"),
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index aeb5f6b6f6..58105b2cd2 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -1,5 +1,13 @@
 {{#if icon}}
-  {{d-icon icon}}
+  {{#if isLoading}}
+    {{d-icon "spinner" class="loading-icon"}}
+  {{else}}
+    {{d-icon icon}}
+  {{/if}}
+{{else}}
+  {{#if isLoading}}
+    {{d-icon "spinner" class="loading-icon"}}
+  {{/if}}
 {{/if}}
 
 {{#if translatedLabel}}
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index 1f7ea76555..643975ec50 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -67,6 +67,31 @@
     }
     cursor: not-allowed;
   }
+
+  .loading-container {
+    display: none;
+    margin: 0 6.75px 0 0;
+  }
+
+  &.is-loading {
+    &.btn-text {
+      .d-button-label {
+        font-size: $font-down-2;
+      }
+
+      &.btn-small {
+        .loading-icon {
+          font-size: $font-down-1;
+          margin-right: 0.2em;
+        }
+      }
+    }
+
+    .loading-icon {
+      -webkit-animation: rotate-forever 1s infinite linear, fadein 1s;
+      animation: rotate-forever 1s infinite linear, fadein 1s;
+    }
+  }
 }
 
 .btn.hidden {
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index a1f1c12822..f2c4bcdbb7 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -198,7 +198,8 @@ module SvgSprite
     "user-shield",
     "user-times",
     "users",
-    "wrench"
+    "wrench",
+    "spinner"
   ])
 
   FA_ICON_MAP = { 'far fa-' => 'far-', 'fab fa-' => 'fab-', 'fas fa-' => '', 'fa-' => '' }
diff --git a/test/javascripts/components/d-button-test.js b/test/javascripts/components/d-button-test.js
index cf86842b98..521fe7bb18 100644
--- a/test/javascripts/components/d-button-test.js
+++ b/test/javascripts/components/d-button-test.js
@@ -54,3 +54,49 @@ componentTest("link-styled button", {
     );
   }
 });
+
+componentTest("isLoading button", {
+  template: "{{d-button isLoading=isLoading}}",
+
+  beforeEach() {
+    this.set("isLoading", true);
+  },
+
+  test(assert) {
+    assert.ok(
+      find("button.is-loading .spinner").length,
+      "it has a spinner showing"
+    );
+    assert.ok(
+      find("button[disabled]").length,
+      "while loading the button is disabled"
+    );
+
+    this.set("isLoading", false);
+
+    assert.notOk(
+      find("button .spinner").length,
+      "it doesn't have a spinner showing"
+    );
+    assert.ok(
+      find("button:not([disabled])").length,
+      "while not loading the button is enabled"
+    );
+  }
+});
+
+componentTest("disabled button", {
+  template: "{{d-button disabled=disabled}}",
+
+  beforeEach() {
+    this.set("disabled", true);
+  },
+
+  test(assert) {
+    assert.ok(find("button[disabled]").length, "the button is disabled");
+
+    this.set("disabled", false);
+
+    assert.ok(find("button:not([disabled])").length, "the button is enabled");
+  }
+});

From 8f4b54fedd7273d3b8544f1ec7a254392a4daca5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 23:42:21 +0200
Subject: [PATCH 351/633] fix d-button tests (#9316)

---
 test/javascripts/components/d-button-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/javascripts/components/d-button-test.js b/test/javascripts/components/d-button-test.js
index 521fe7bb18..5b0bdeb150 100644
--- a/test/javascripts/components/d-button-test.js
+++ b/test/javascripts/components/d-button-test.js
@@ -64,7 +64,7 @@ componentTest("isLoading button", {
 
   test(assert) {
     assert.ok(
-      find("button.is-loading .spinner").length,
+      find("button.is-loading .loading-icon").length,
       "it has a spinner showing"
     );
     assert.ok(
@@ -75,7 +75,7 @@ componentTest("isLoading button", {
     this.set("isLoading", false);
 
     assert.notOk(
-      find("button .spinner").length,
+      find("button .loading-icon").length,
       "it doesn't have a spinner showing"
     );
     assert.ok(

From 5f1c95329e1a727bc6badab11f32dabf2ed950c1 Mon Sep 17 00:00:00 2001
From: Ben Bowler <ben@benbowler.com>
Date: Mon, 30 Mar 2020 23:52:23 +0100
Subject: [PATCH 352/633] DOCS: Update DEVELOPER-ADVANCED.md (#9313)

Update correct python software-properties-common package post Ubuntu 12.04
---
 docs/DEVELOPER-ADVANCED.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md
index d6f39aabee..2dc64f098b 100644
--- a/docs/DEVELOPER-ADVANCED.md
+++ b/docs/DEVELOPER-ADVANCED.md
@@ -12,7 +12,7 @@ To get your Ubuntu 16.04 or 18.04 LTS install up and running to develop Discours
     whoami > /tmp/username
     sudo add-apt-repository ppa:chris-lea/redis-server
     sudo apt-get -yqq update
-    sudo apt-get -yqq install python-software-properties vim curl expect debconf-utils git-core build-essential zlib1g-dev libssl-dev openssl libcurl4-openssl-dev libreadline6-dev libpcre3 libpcre3-dev imagemagick redis-server advancecomp gifsicle jhead jpegoptim libjpeg-turbo-progs optipng pngcrush pngquant gnupg2
+    sudo apt-get -yqq install software-properties-common vim curl expect debconf-utils git-core build-essential zlib1g-dev libssl-dev openssl libcurl4-openssl-dev libreadline6-dev libpcre3 libpcre3-dev imagemagick redis-server advancecomp gifsicle jhead jpegoptim libjpeg-turbo-progs optipng pngcrush pngquant gnupg2
 
     # Ruby
     curl -sSL https://rvm.io/mpapis.asc | gpg2 --import -

From a34711c23a58c991e44af2ff5e62f618107b244d Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 31 Mar 2020 11:48:54 +1100
Subject: [PATCH 353/633] FIX: do not save draft while it is loading

When editing a post we were incorrectly saving a draft prior to user typing

This caused a bloat in the amount of drafts saved per user and inconsistency
around behavior of "escape" button.

It also lead to lots of warnings about draft conflicts when copying stuff
between posts.

The code is improved to use promises more appropriately, however further
changes are needed to clean up internals so methods consistently return
promises.

Too many methods in the controller sometimes return a promise and sometimes
an object. Long term the methods will become async and all of this will be
corrected.
---
 .../discourse/controllers/composer.js         | 140 +++++++++++-------
 .../javascripts/discourse/models/composer.js  |  41 ++---
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js b/app/assets/javascripts/discourse/controllers/composer.js
index e7d02fbd3c..297d635fc0 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js
+++ b/app/assets/javascripts/discourse/controllers/composer.js
@@ -27,6 +27,8 @@ import EmberObject, { computed } from "@ember/object";
 import deprecated from "discourse-common/lib/deprecated";
 
 function loadDraft(store, opts) {
+  let promise = Promise.resolve();
+
   opts = opts || {};
 
   let draft = opts.draft;
@@ -59,10 +61,10 @@ function loadDraft(store, opts) {
       attrs[f] = draft[f] || opts[f];
     });
 
-    composer.open(attrs);
-
-    return composer;
+    promise = promise.then(() => composer.open(attrs)).then(() => composer);
   }
+
+  return promise;
 }
 
 const _popupMenuOptionsCallbacks = [];
@@ -799,7 +801,8 @@ export default Controller.extend({
     this.setProperties({
       showEditReason: false,
       editReason: null,
-      scopedCategoryId: null
+      scopedCategoryId: null,
+      skipAutoSave: true
     });
 
     // Scope the categories drop down to the category we opened the composer with.
@@ -820,7 +823,7 @@ export default Controller.extend({
       composerModel = null;
     }
 
-    return new Promise((resolve, reject) => {
+    let promise = new Promise((resolve, reject) => {
       if (composerModel && composerModel.replyDirty) {
         // If we're already open, we don't have to do anything
         if (
@@ -870,7 +873,7 @@ export default Controller.extend({
               opts.draft = data.draft;
             }
             opts.draftSequence = data.draft_sequence;
-            this._setModel(composerModel, opts);
+            return this._setModel(composerModel, opts);
           })
           .then(resolve, reject);
       }
@@ -884,72 +887,88 @@ export default Controller.extend({
             if (data.draft) {
               opts.draft = data.draft;
               opts.draftSequence = data.draft_sequence;
-              this.open(opts);
+              return this.open(opts);
             }
           });
       }
 
-      this._setModel(composerModel, opts);
-      resolve();
+      this._setModel(composerModel, opts).then(resolve, reject);
     });
+
+    promise = promise.finally(() => {
+      this.skipAutoSave = false;
+    });
+    return promise;
   },
 
   // Given a potential instance and options, set the model for this composer.
-  _setModel(composerModel, opts) {
+  _setModel(optionalComposerModel, opts) {
+    let promise = Promise.resolve();
+
     this.set("linkLookup", null);
 
-    if (opts.draft) {
-      composerModel = loadDraft(this.store, opts);
-      if (composerModel) {
-        composerModel.set("topic", opts.topic);
+    promise = promise.then(() => {
+      if (opts.draft) {
+        return loadDraft(this.store, opts).then(model => {
+          if (!model) {
+            throw new Error("draft was not found");
+          }
+          return model;
+        });
+      } else {
+        let model =
+          optionalComposerModel || this.store.createRecord("composer");
+        return model.open(opts).then(() => model);
       }
-    } else {
-      composerModel = composerModel || this.store.createRecord("composer");
-      composerModel.open(opts);
-    }
-
-    this.set("model", composerModel);
-    composerModel.setProperties({
-      composeState: Composer.OPEN,
-      isWarning: false
     });
 
-    if (!this.model.targetRecipients) {
-      if (opts.usernames) {
-        deprecated("`usernames` is deprecated, use `recipients` instead.");
-        this.model.set("targetRecipients", opts.usernames);
-      } else if (opts.recipients) {
-        this.model.set("targetRecipients", opts.recipients);
+    promise.then(composerModel => {
+      this.set("model", composerModel);
+
+      composerModel.setProperties({
+        composeState: Composer.OPEN,
+        isWarning: false
+      });
+
+      if (!this.model.targetRecipients) {
+        if (opts.usernames) {
+          deprecated("`usernames` is deprecated, use `recipients` instead.");
+          this.model.set("targetRecipients", opts.usernames);
+        } else if (opts.recipients) {
+          this.model.set("targetRecipients", opts.recipients);
+        }
       }
-    }
 
-    if (
-      opts.topicTitle &&
-      opts.topicTitle.length <= this.siteSettings.max_topic_title_length
-    ) {
-      this.model.set("title", opts.topicTitle);
-    }
+      if (
+        opts.topicTitle &&
+        opts.topicTitle.length <= this.siteSettings.max_topic_title_length
+      ) {
+        this.model.set("title", opts.topicTitle);
+      }
 
-    if (opts.topicCategoryId) {
-      this.model.set("categoryId", opts.topicCategoryId);
-    }
+      if (opts.topicCategoryId) {
+        this.model.set("categoryId", opts.topicCategoryId);
+      }
 
-    if (opts.topicTags && !this.site.mobileView && this.site.can_tag_topics) {
-      let tags = escapeExpression(opts.topicTags)
-        .split(",")
-        .slice(0, this.siteSettings.max_tags_per_topic);
+      if (opts.topicTags && !this.site.mobileView && this.site.can_tag_topics) {
+        let tags = escapeExpression(opts.topicTags)
+          .split(",")
+          .slice(0, this.siteSettings.max_tags_per_topic);
 
-      tags.forEach(
-        (tag, index, array) =>
-          (array[index] = tag.substring(0, this.siteSettings.max_tag_length))
-      );
+        tags.forEach(
+          (tag, index, array) =>
+            (array[index] = tag.substring(0, this.siteSettings.max_tag_length))
+        );
 
-      this.model.set("tags", tags);
-    }
+        this.model.set("tags", tags);
+      }
 
-    if (opts.topicBody) {
-      this.model.set("reply", opts.topicBody);
-    }
+      if (opts.topicBody) {
+        this.model.set("reply", opts.topicBody);
+      }
+    });
+
+    return promise;
   },
 
   viewNewReply() {
@@ -1009,10 +1028,12 @@ export default Controller.extend({
   },
 
   cancelComposer(differentDraft = false) {
+    this.skipAutoSave = true;
+
     const keyPrefix =
       this.model.action === "edit" ? "post.abandon_edit" : "post.abandon";
 
-    return new Promise(resolve => {
+    let promise = new Promise(resolve => {
       if (this.get("model.hasMetaData") || this.get("model.replyDirty")) {
         bootbox.dialog(I18n.t(keyPrefix + ".confirm"), [
           {
@@ -1051,6 +1072,10 @@ export default Controller.extend({
         });
       }
     });
+
+    return promise.finally(() => {
+      this.skipAutoSave = false;
+    });
   },
 
   shrink() {
@@ -1073,7 +1098,14 @@ export default Controller.extend({
 
   @observes("model.reply", "model.title")
   _shouldSaveDraft() {
-    debounce(this, this._saveDraft, 2000);
+    if (
+      this.model &&
+      !this.model.loading &&
+      !this.skipAutoSave &&
+      !this.model.disableDrafts
+    ) {
+      debounce(this, this._saveDraft, 2000);
+    }
   },
 
   @discourseComputed("model.categoryId", "lastValidatedAt")
diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 1b53ed8927..9d0dcb8c45 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -673,14 +673,16 @@ const Composer = RestModel.extend({
        quote    - If we're opening a reply from a quote, the quote we're making
   */
   open(opts) {
+    let promise = Promise.resolve();
+
     if (!opts) opts = {};
-    this.set("loading", false);
+    this.set("loading", true);
 
     const replyBlank = isEmpty(this.reply);
 
     const composer = this;
     if (!replyBlank && (opts.reply || isEdit(opts.action)) && this.replyDirty) {
-      return;
+      return promise;
     }
 
     if (opts.action === REPLY && isEdit(this.action)) {
@@ -741,11 +743,11 @@ const Composer = RestModel.extend({
     }
 
     if (opts.postId) {
-      this.set("loading", true);
-
-      this.store
-        .find("post", opts.postId)
-        .then(post => composer.setProperties({ post, loading: false }));
+      promise = promise.then(() =>
+        this.store
+          .find("post", opts.postId)
+          .then(post => composer.setProperties({ post }))
+      );
     }
 
     // If we are editing a post, load it.
@@ -759,15 +761,16 @@ const Composer = RestModel.extend({
       }
       this.setProperties(topicProps);
 
-      this.store.find("post", opts.post.id).then(post => {
-        composer.setProperties({
-          reply: post.raw,
-          originalText: post.raw,
-          loading: false
-        });
+      promise = promise.then(() =>
+        this.store.find("post", opts.post.id).then(post => {
+          composer.setProperties({
+            reply: post.raw,
+            originalText: post.raw
+          });
 
-        composer.appEvents.trigger("composer:reply-reloaded", composer);
-      });
+          composer.appEvents.trigger("composer:reply-reloaded", composer);
+        })
+      );
     } else if (opts.action === REPLY && opts.quote) {
       this.setProperties({
         reply: opts.quote,
@@ -785,7 +788,9 @@ const Composer = RestModel.extend({
     }
 
     if (!isEdit(opts.action) || !opts.post) {
-      composer.appEvents.trigger("composer:reply-reloaded", composer);
+      promise = promise.then(() =>
+        composer.appEvents.trigger("composer:reply-reloaded", composer)
+      );
     }
 
     // Ensure additional draft fields are set
@@ -793,7 +798,9 @@ const Composer = RestModel.extend({
       this.set(_add_draft_fields[f], opts[f]);
     });
 
-    return false;
+    return promise.finally(() => {
+      this.set("loading", false);
+    });
   },
 
   // Overwrite to implement custom logic

From d282233d3178dcbceb8ada3464aa94a3d0e1728d Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 30 Mar 2020 21:40:11 -0400
Subject: [PATCH 354/633] UX: Add flair styles to latest topic list

---
 app/assets/stylesheets/common/base/topic-post.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 2f028e3c5d..1f4e99171c 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -464,7 +464,8 @@ blockquote {
 .user-card-avatar,
 .topic-map .poster,
 .user-profile-avatar,
-.user-image {
+.user-image,
+.latest-topic-list-item {
   .avatar-flair {
     display: flex;
     align-items: center;
@@ -479,7 +480,8 @@ blockquote {
 .topic-avatar .avatar-flair,
 .avatar-flair-preview .avatar-flair,
 .collapsed-info .user-profile-avatar .avatar-flair,
-.user-image .avatar-flair {
+.user-image .avatar-flair,
+.latest-topic-list-item .avatar-flair {
   background-size: 20px 20px;
   width: 20px;
   height: 20px;

From fcc5ef9625069e7a33a7ae75063ae5de38fc06e9 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 31 Mar 2020 14:40:00 +1100
Subject: [PATCH 355/633] FIX: when switching reply type update options

Previously we were not correctly updating reply types leading to inconsistent
behavior when using drop down in composer (for reply type)
---
 .../select-kit/components/composer-actions.js          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 773c2b10e7..720dddd2ca 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -20,6 +20,7 @@ export function _clearSnapshots() {
 }
 
 export default DropdownSelectBoxComponent.extend({
+  _seq: 0,
   pluginApiIdentifiers: ["composer-actions"],
   classNames: ["composer-actions"],
 
@@ -29,6 +30,10 @@ export default DropdownSelectBoxComponent.extend({
     showFullTitle: false
   },
 
+  contentChanged() {
+    this.set("_seq", this._seq + 1);
+  },
+
   didReceiveAttrs() {
     this._super(...arguments);
 
@@ -40,6 +45,7 @@ export default DropdownSelectBoxComponent.extend({
     ) {
       _topicSnapshot = this.get("composerModel.topic");
       _postSnapshot = this.get("composerModel.post");
+      this.contentChanged();
     }
 
     // if we hit reply on a different post we want to change postSnapshot
@@ -48,6 +54,7 @@ export default DropdownSelectBoxComponent.extend({
       (!_postSnapshot || this.get("composerModel.post.id") !== _postSnapshot.id)
     ) {
       _postSnapshot = this.get("composerModel.post");
+      this.contentChanged();
     }
 
     if (isEmpty(this.content)) {
@@ -59,7 +66,7 @@ export default DropdownSelectBoxComponent.extend({
     return {};
   },
 
-  content: computed(function() {
+  content: computed("_seq", function() {
     let items = [];
 
     if (
@@ -304,6 +311,7 @@ export default DropdownSelectBoxComponent.extend({
           ),
           this.composerModel
         );
+        this.contentChanged();
       } else {
         // eslint-disable-next-line no-console
         console.error(`No method '${action}' found`);

From 6d3d9ecf6c2323d239357df2318ea74aee8d1080 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 31 Mar 2020 14:40:40 +1100
Subject: [PATCH 356/633] DEV: adjust rake autospec to work with renamed es6
 files

We no longer use es6 files, update autospec
---
 lib/autospec/qunit_runner.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/autospec/qunit_runner.rb b/lib/autospec/qunit_runner.rb
index 37bc6d76e0..579e6834ce 100644
--- a/lib/autospec/qunit_runner.rb
+++ b/lib/autospec/qunit_runner.rb
@@ -16,9 +16,9 @@ module Autospec
     end
 
     # Discourse specific
-    watch(%r{^app/assets/javascripts/discourse/(.+)\.js.es6$}) { |m| "test/javascripts/#{m[1]}-test.js.es6" }
-    watch(%r{^app/assets/javascripts/admin/(.+)\.js.es6$})     { |m| "test/javascripts/admin/#{m[1]}-test.js.es6" }
-    watch(%r{^test/javascripts/.+\.js.es6$})
+    watch(%r{^app/assets/javascripts/discourse/(.+)\.js$}) { |m| "test/javascripts/#{m[1]}-test.js" }
+    watch(%r{^app/assets/javascripts/admin/(.+)\.js$})     { |m| "test/javascripts/admin/#{m[1]}-test.js" }
+    watch(%r{^test/javascripts/.+\.js$})
 
     RELOADERS = Set.new
     def self.reload(pattern)
@@ -33,7 +33,7 @@ module Autospec
     reload(%r{^test/javascripts/(helpers|mixins)/.+\.js(\.es6)?$})
     reload("test/javascripts/test_helper.js")
 
-    watch(%r{^plugins/.*/test/.+\.js.es6$})
+    watch(%r{^plugins/.*/test/.+\.js(\.es6)?$})
 
     require "socket"
 

From a0f59a55ccc75678703e34748b58d9531f4254e1 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 31 Mar 2020 16:19:47 +1100
Subject: [PATCH 357/633] FIX: when a post is moved copy notifications level
 (#9311)

This is a revert of https://github.com/discourse/discourse/commit/2c011252f1c0443965ca5317169550083a43c657

More information on meta: https://meta.discourse.org/t/when-a-reply-is-moved-to-a-new-topic-the-followers-of-the-previous-topic-are-automatically-follower-of-the-new-topic-as-well/130025
---
 app/models/post_mover.rb       | 23 +++++++++--------------
 spec/models/post_mover_spec.rb |  4 ++--
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 1037c3ff00..0e36834ac8 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -332,8 +332,7 @@ class PostMover
       old_topic_id: original_topic.id,
       new_topic_id: destination_topic.id,
       old_highest_post_number: destination_topic.highest_post_number,
-      old_highest_staff_post_number: destination_topic.highest_staff_post_number,
-      default_notification_level: NotificationLevels.topic_levels[:regular]
+      old_highest_staff_post_number: destination_topic.highest_staff_post_number
     }
 
     DB.exec(<<~SQL, params)
@@ -342,9 +341,13 @@ class PostMover
                               notifications_changed_at, notifications_reason_id)
       SELECT tu.user_id,
              :new_topic_id                               AS topic_id,
-             CASE
-               WHEN p.user_id IS NULL THEN FALSE
-               ELSE TRUE END                             AS posted,
+               EXISTS(
+                 SELECT 1
+                 FROM posts p
+                 WHERE p.topic_id = :new_topic_id
+                   AND p.user_id = tu.user_id
+                 LIMIT 1
+               )                                         AS posted,
              (
                SELECT MAX(lr.new_post_number)
                FROM moved_posts lr
@@ -365,19 +368,11 @@ class PostMover
              )                                           AS last_emailed_post_number,
              GREATEST(tu.first_visited_at, t.created_at) AS first_visited_at,
              GREATEST(tu.last_visited_at, t.created_at)  AS last_visited_at,
-             CASE
-               WHEN p.user_id IS NOT NULL THEN tu.notification_level
-               ELSE :default_notification_level END      AS notification_level,
+             tu.notification_level,
              tu.notifications_changed_at,
              tu.notifications_reason_id
       FROM topic_users tu
            JOIN topics t ON (t.id = :new_topic_id)
-           LEFT OUTER JOIN
-           (
-             SELECT DISTINCT user_id
-             FROM posts
-             WHERE topic_id = :new_topic_id
-           ) p ON (p.user_id = tu.user_id)
       WHERE tu.topic_id = :old_topic_id
         AND GREATEST(
                 tu.last_read_post_number,
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index d198e2d33c..aebfefe12d 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -470,7 +470,7 @@ describe PostMover do
                       last_read_post_number: 2,
                       highest_seen_post_number: 2,
                       last_emailed_post_number: 2,
-                      notification_level: TopicUser.notification_levels[:regular],
+                      notification_level: TopicUser.notification_levels[:tracking],
                       posted: false
                     )
               expect(TopicUser.find_by(topic: new_topic, user: user2))
@@ -486,7 +486,7 @@ describe PostMover do
                       last_read_post_number: 1,
                       highest_seen_post_number: 2,
                       last_emailed_post_number: 2,
-                      notification_level: TopicUser.notification_levels[:regular],
+                      notification_level: TopicUser.notification_levels[:watching],
                       posted: false
                     )
             end

From 9bbaaea1e8561692d7c095c034637de99a791d29 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 08:55:47 +0200
Subject: [PATCH 358/633] UX: better customize emoji layout on mobile (#9319)

---
 .../common/admin/admin_emojis.scss            | 49 +++++--------------
 app/assets/stylesheets/mobile.scss            |  1 +
 .../stylesheets/mobile/admin_emojis.scss      | 35 +++++++++++++
 3 files changed, 48 insertions(+), 37 deletions(-)
 create mode 100644 app/assets/stylesheets/mobile/admin_emojis.scss

diff --git a/app/assets/stylesheets/common/admin/admin_emojis.scss b/app/assets/stylesheets/common/admin/admin_emojis.scss
index c6cf4c2fbd..fd2cfddb06 100644
--- a/app/assets/stylesheets/common/admin/admin_emojis.scss
+++ b/app/assets/stylesheets/common/admin/admin_emojis.scss
@@ -4,47 +4,22 @@
       width: 220px;
     }
   }
-}
 
-.emoji-uploader {
-  display: flex;
-  align-items: flex-end;
-
-  input,
-  .select-kit {
-    width: 220px;
-    margin: 0 1em 0 0;
-  }
-
-  .upload-container {
+  .emoji-uploader {
     display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-direction: column;
-  }
-}
+    align-items: flex-end;
 
-.mobile-view {
-  .admin-emojis {
-    .emoji-uploader {
+    input,
+    .select-kit {
+      width: 220px;
+      margin: 0 1em 0 0;
+    }
+
+    .upload-container {
+      display: flex;
+      align-items: center;
+      justify-content: center;
       flex-direction: column;
-
-      .fields {
-        input,
-        .select-kit {
-          width: 100%;
-        }
-      }
-
-      .upload-container {
-        margin: 1em 0 0 0;
-      }
-    }
-
-    #custom_emoji {
-      .select-kit {
-        display: none;
-      }
     }
   }
 }
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index 567a051794..ee9c3ed92d 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -29,6 +29,7 @@
 @import "mobile/admin_report";
 @import "mobile/admin_report_table";
 @import "mobile/admin_report_counters";
+@import "mobile/admin_emojis";
 @import "mobile/menu-panel";
 @import "mobile/reviewables";
 
diff --git a/app/assets/stylesheets/mobile/admin_emojis.scss b/app/assets/stylesheets/mobile/admin_emojis.scss
new file mode 100644
index 0000000000..2014a51ba3
--- /dev/null
+++ b/app/assets/stylesheets/mobile/admin_emojis.scss
@@ -0,0 +1,35 @@
+.admin-emojis {
+  #custom_emoji {
+    .select-kit {
+      display: none;
+    }
+
+    tbody tr th {
+      @include ellipsis;
+
+      &:nth-child(2) {
+        max-width: 80px;
+      }
+    }
+  }
+
+  .emoji-uploader {
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+
+    .control {
+      margin-bottom: 1em;
+      width: 100%;
+
+      input,
+      .select-kit {
+        width: 100%;
+      }
+    }
+
+    .upload-container {
+      margin: 0;
+    }
+  }
+}

From 4f6d722e45e02eb80efa392c474cce41d276195c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 09:13:16 +0200
Subject: [PATCH 359/633] DEV: adds a new dropdown widget usable in any widget
 (#9297)

---
 .../discourse/widgets/widget-dropdown.js      | 263 ++++++++++++++++
 .../common/components/widget-dropdown.scss    |  51 +++
 .../widgets/widget-dropdown-test.js           | 298 ++++++++++++++++++
 3 files changed, 612 insertions(+)
 create mode 100644 app/assets/javascripts/discourse/widgets/widget-dropdown.js
 create mode 100644 app/assets/stylesheets/common/components/widget-dropdown.scss
 create mode 100644 test/javascripts/widgets/widget-dropdown-test.js

diff --git a/app/assets/javascripts/discourse/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/widgets/widget-dropdown.js
new file mode 100644
index 0000000000..e882588d67
--- /dev/null
+++ b/app/assets/javascripts/discourse/widgets/widget-dropdown.js
@@ -0,0 +1,263 @@
+import { createWidget } from "discourse/widgets/widget";
+import hbs from "discourse/widgets/hbs-compiler";
+
+/*
+
+  widget-dropdown
+
+  Usage
+  -----
+
+  {{attach
+    widget="widget-dropdown"
+    attrs=(hash
+      id=id
+      label=label
+      content=content
+      onChange=onChange
+      options=(hash)
+    )
+  }}
+
+  Mandatory attributes:
+
+    - id: must be unique in the application
+
+    - label or translatedLabel:
+        - label: an i18n key to be translated and displayed on the header
+        - translatedLabel: an already translated label to display on the header
+
+    - onChange: action called when a click happens on a row, content[rowIndex] will be passed as params
+
+  Optional attributes:
+
+    - class: adds css class to the dropdown
+    - content: list of items to display, if undefined or empty dropdown won't display
+      Example content:
+
+      ```
+      [
+        { id: 1, label: "foo.bar" },
+        "separator",
+        { id: 2, translatedLabel: "FooBar" },
+        { id: 3 label: "foo.baz", icon: "times" },
+        { id: 4, html: "<b>foo</b>" }
+      ]
+      ```
+
+    - options: accepts a hash of optional attributes
+      - headerClass: adds css class to the dropdown header
+      - bodyClass: adds css class to the dropdown header
+*/
+
+export const WidgetDropdownHeaderClass = {
+  tagName: "button",
+
+  transform(attrs) {
+    return {
+      label: attrs.translatedLabel ? attrs.translatedLabel : I18n.t(attrs.label)
+    };
+  },
+
+  buildClasses(attrs) {
+    let classes = ["widget-dropdown-header", "btn", "btn-default"];
+    if (attrs.class) {
+      classes = classes.concat(attrs.class.split(" "));
+    }
+    return classes.filter(Boolean).join(" ");
+  },
+
+  click(event) {
+    event.preventDefault();
+
+    this.sendWidgetAction("_onTrigger");
+  },
+
+  template: hbs`
+    {{#if attrs.icon}}
+      {{d-icon attrs.icon}}
+    {{/if}}
+    <span class="label">
+      {{transformed.label}}
+    </span>
+  `
+};
+
+createWidget("widget-dropdown-header", WidgetDropdownHeaderClass);
+
+export const WidgetDropdownItemClass = {
+  tagName: "div",
+
+  transform(attrs) {
+    return {
+      content:
+        attrs.item === "separator"
+          ? "<hr>"
+          : attrs.item.html
+          ? attrs.item.html
+          : attrs.item.translatedLabel
+          ? attrs.item.translatedLabel
+          : I18n.t(attrs.item.label)
+    };
+  },
+
+  buildAttributes(attrs) {
+    return { "data-id": attrs.item.id };
+  },
+
+  buildClasses(attrs) {
+    return [
+      "widget-dropdown-item",
+      attrs.item === "separator" ? "separator" : `item-${attrs.item.id}`
+    ].join(" ");
+  },
+
+  click(event) {
+    event.preventDefault();
+
+    this.sendWidgetAction("_onChange", this.attrs.item);
+  },
+
+  template: hbs`
+    {{#if attrs.item.icon}}
+      {{d-icon attrs.item.icon}}
+    {{/if}}
+    {{{transformed.content}}}
+  `
+};
+
+createWidget("widget-dropdown-item", WidgetDropdownItemClass);
+
+export const WidgetDropdownClass = {
+  tagName: "div",
+
+  init(attrs) {
+    if (!attrs) {
+      throw "A widget-dropdown expects attributes.";
+    }
+
+    if (!attrs.id) {
+      throw "A widget-dropdown expects a unique `id` attribute.";
+    }
+
+    if (!attrs.label && !attrs.translatedLabel) {
+      throw "A widget-dropdown expects at least a `label` or `translatedLabel`";
+    }
+  },
+
+  buildKey: attrs => {
+    return attrs.id;
+  },
+
+  buildAttributes(attrs) {
+    return { id: attrs.id };
+  },
+
+  defaultState() {
+    return {
+      opened: false
+    };
+  },
+
+  buildClasses(attrs) {
+    const classes = ["widget-dropdown"];
+    classes.push(this.state.opened ? "opened" : "closed");
+    return classes.join(" ") + " " + (attrs.class || "");
+  },
+
+  transform(attrs) {
+    const options = attrs.options || {};
+
+    return {
+      options,
+      bodyClass: `widget-dropdown-body ${options.bodyClass || ""}`
+    };
+  },
+
+  clickOutside() {
+    this.state.opened = false;
+    this.scheduleRerender();
+  },
+
+  _onChange(params) {
+    this.state.opened = false;
+    if (this.attrs.onChange) {
+      if (typeof this.attrs.onChange === "string") {
+        this.sendWidgetAction(this.attrs.onChange, params);
+      } else {
+        this.attrs.onChange(params);
+      }
+    }
+  },
+
+  _onTrigger() {
+    if (this.state.opened) {
+      this.state.opened = false;
+      this._closeDropdown(this.attrs.id);
+    } else {
+      this.state.opened = true;
+      this._openDropdown(this.attrs.id);
+    }
+
+    this._popper && this._popper.update();
+  },
+
+  destroy() {
+    if (this._popper) {
+      this._popper.destroy();
+      this._popper = null;
+    }
+  },
+
+  template: hbs`
+    {{#if attrs.content}}
+      {{attach
+        widget="widget-dropdown-header"
+        attrs=(hash
+          icon=attrs.icon
+          label=attrs.label
+          translatedLabel=attrs.translatedLabel
+          class=this.transformed.options.headerClass
+        )
+      }}
+
+      <div class={{transformed.bodyClass}}>
+        {{#each attrs.content as |item|}}
+          {{attach
+            widget="widget-dropdown-item"
+            attrs=(hash item=item)
+          }}
+        {{/each}}
+      </div>
+    {{/if}}
+  `,
+
+  _closeDropdown() {
+    this._popper && this._popper.destroy();
+  },
+
+  _openDropdown(id) {
+    const dropdownHeader = document.querySelector(
+      `#${id} .widget-dropdown-header`
+    );
+    const dropdownBody = document.querySelector(`#${id} .widget-dropdown-body`);
+
+    if (dropdownHeader && dropdownBody) {
+      /* global Popper:true */
+      this._popper = Popper.createPopper(dropdownHeader, dropdownBody, {
+        strategy: "fixed",
+        placement: "bottom-start",
+        modifiers: [
+          {
+            name: "offset",
+            options: {
+              offset: [0, 5]
+            }
+          }
+        ]
+      });
+    }
+  }
+};
+
+export default createWidget("widget-dropdown", WidgetDropdownClass);
diff --git a/app/assets/stylesheets/common/components/widget-dropdown.scss b/app/assets/stylesheets/common/components/widget-dropdown.scss
new file mode 100644
index 0000000000..b84b389bf9
--- /dev/null
+++ b/app/assets/stylesheets/common/components/widget-dropdown.scss
@@ -0,0 +1,51 @@
+.widget-dropdown {
+  margin: 1em;
+  display: inline-flex;
+  box-sizing: border-box;
+
+  &.closed {
+    .widget-dropdown-body {
+      display: none;
+    }
+  }
+
+  .widget-dropdown-body {
+    display: flex;
+    flex-direction: column;
+    padding: 0.25em;
+    background: $secondary;
+    margin-top: 5px;
+    z-index: z("dropdown");
+    border: 1px solid $primary-low;
+    max-height: 250px;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+
+  .widget-dropdown-item {
+    cursor: pointer;
+    padding: 0.25em;
+    display: flex;
+    flex: 1;
+    align-items: center;
+
+    .d-icon {
+      color: $primary-medium;
+      margin-right: 0.25em;
+    }
+
+    &.separator {
+      padding: 0;
+      background: $primary-low;
+      margin: 0.25em 0;
+    }
+
+    &:hover {
+      background: $tertiary-low;
+    }
+  }
+
+  .widget-dropdown-header {
+    cursor: pointer;
+  }
+}
diff --git a/test/javascripts/widgets/widget-dropdown-test.js b/test/javascripts/widgets/widget-dropdown-test.js
new file mode 100644
index 0000000000..511af7964f
--- /dev/null
+++ b/test/javascripts/widgets/widget-dropdown-test.js
@@ -0,0 +1,298 @@
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
+
+moduleForWidget("widget-dropdown");
+
+const DEFAULT_CONTENT = {
+  content: [
+    { id: 1, label: "foo" },
+    { id: 2, translatedLabel: "FooBar" },
+    "separator",
+    { id: 3, translatedLabel: "With icon", icon: "times" },
+    { id: 4, html: "<b>baz</b>" }
+  ],
+  label: "foo"
+};
+
+async function clickRowById(id) {
+  await click(`#my-dropdown .widget-dropdown-item.item-${id}`);
+}
+
+function rowById(id) {
+  return find(`#my-dropdown .widget-dropdown-item.item-${id}`)[0];
+}
+
+async function toggle() {
+  await click("#my-dropdown .widget-dropdown-header");
+}
+
+function headerLabel() {
+  return find(
+    "#my-dropdown .widget-dropdown-header .label"
+  )[0].innerText.trim();
+}
+
+function header() {
+  return find("#my-dropdown .widget-dropdown-header")[0];
+}
+
+function body() {
+  return find("#my-dropdown .widget-dropdown-body")[0];
+}
+
+const TEMPLATE = `
+  {{mount-widget
+    widget="widget-dropdown"
+    args=(hash
+      id="my-dropdown"
+      icon=icon
+      label=label
+      class=class
+      translatedLabel=translatedLabel
+      content=content
+      options=options
+    )
+}}`;
+
+widgetTest("dropdown id", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.ok(exists("#my-dropdown"));
+  }
+});
+
+widgetTest("label", {
+  template: TEMPLATE,
+
+  _translations: I18n.translations,
+
+  beforeEach() {
+    I18n.translations = { en: { js: { foo: "FooBaz" } } };
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  afterEach() {
+    I18n.translations = this._translations;
+  },
+
+  test(assert) {
+    assert.equal(headerLabel(), "FooBaz");
+  }
+});
+
+widgetTest("translatedLabel", {
+  template: TEMPLATE,
+
+  _translations: I18n.translations,
+
+  beforeEach() {
+    I18n.translations = { en: { js: { foo: "FooBaz" } } };
+    this.setProperties(DEFAULT_CONTENT);
+    this.set("translatedLabel", "BazFoo");
+  },
+
+  afterEach() {
+    I18n.translations = this._translations;
+  },
+
+  test(assert) {
+    assert.equal(headerLabel(), this.translatedLabel);
+  }
+});
+
+widgetTest("content", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.equal(rowById(1).dataset.id, 1, "it creates rows");
+    assert.equal(rowById(2).dataset.id, 2, "it creates rows");
+    assert.equal(rowById(3).dataset.id, 3, "it creates rows");
+  }
+});
+
+widgetTest("onChange action", {
+  template: `
+    <div id="test"></div>
+    {{mount-widget
+      widget="widget-dropdown"
+      args=(hash
+        id="my-dropdown"
+        label=label
+        content=content
+        onChange=(action "onChange")
+      )
+    }}
+  `,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+
+    this.on(
+      "onChange",
+      item => (this._element.querySelector("#test").innerText = item.id)
+    );
+  },
+
+  async test(assert) {
+    await clickRowById(2);
+    assert.equal(find("#test").text(), 2, "it calls the onChange actions");
+  }
+});
+
+widgetTest("can be opened and closed", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  async test(assert) {
+    assert.ok(exists("#my-dropdown.closed"));
+    await toggle();
+    assert.ok(exists("#my-dropdown.opened"));
+    await toggle();
+    assert.ok(exists("#my-dropdown.closed"));
+  }
+});
+
+widgetTest("icon", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+    this.set("icon", "times");
+  },
+
+  test(assert) {
+    assert.ok(exists(header().querySelector(".d-icon-times")));
+  }
+});
+
+widgetTest("class", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+    this.set("class", "activated");
+  },
+
+  test(assert) {
+    assert.ok(exists("#my-dropdown.activated"));
+  }
+});
+
+widgetTest("content with translatedLabel", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.equal(rowById(2).innerText.trim(), "FooBar");
+  }
+});
+
+widgetTest("content with label", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    I18n.translations = { en: { js: { foo: "FooBaz" } } };
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.equal(rowById(1).innerText.trim(), "FooBaz");
+  }
+});
+
+widgetTest("content with icon", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.ok(exists(rowById(3).querySelector(".d-icon-times")));
+  }
+});
+
+widgetTest("content with html", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.equal(rowById(4).innerHTML.trim(), "<span><b>baz</b></span>");
+  }
+});
+
+widgetTest("separator", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.ok(
+      find(
+        "#my-dropdown .widget-dropdown-item:nth-child(3)"
+      )[0].classList.contains("separator")
+    );
+  }
+});
+
+widgetTest("hides widget if no content", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties({ content: null, label: "foo" });
+  },
+
+  test(assert) {
+    assert.notOk(exists("#my-dropdown .widget-dropdown-header"));
+    assert.notOk(exists("#my-dropdown .widget-dropdown-body"));
+  }
+});
+
+widgetTest("headerClass option", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+    this.set("options", { headerClass: "btn-small and-text" });
+  },
+
+  test(assert) {
+    assert.ok(header().classList.contains("widget-dropdown-header"));
+    assert.ok(header().classList.contains("btn-small"));
+    assert.ok(header().classList.contains("and-text"));
+  }
+});
+
+widgetTest("bodyClass option", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+    this.set("options", { bodyClass: "gigantic and-yet-small" });
+  },
+
+  test(assert) {
+    assert.ok(body().classList.contains("widget-dropdown-body"));
+    assert.ok(body().classList.contains("gigantic"));
+    assert.ok(body().classList.contains("and-yet-small"));
+  }
+});

From acc0a9673e929ad3823dc44180b37cb566418af1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 09:21:59 +0200
Subject: [PATCH 360/633] FIX: the correct action for group-member-dropdown is
 now actOnGroup (#9320)

---
 app/assets/javascripts/discourse/templates/group-index.hbs | 4 ----
 .../javascripts/discourse/templates/mobile/group-index.hbs | 7 +++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index 01393c0dfa..36d9acfe88 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -63,11 +63,7 @@
             <td>
               {{#if canManageGroup}}
                 {{group-member-dropdown
-                  removeMember=(action "removeMember")
-                  makeOwner=(action "makeOwner")
-                  removeOwner=(action "removeOwner")
                   member=m
-                  group=model
                   onChange=(action "actOnGroup" m)
                 }}
               {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
index 84a906d4c4..e95a8cb20f 100644
--- a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
@@ -41,10 +41,9 @@
 
             {{#if canManageGroup}}
               {{group-member-dropdown
-                  removeMember=(action "removeMember")
-                  makeOwner=(action "makeOwner")
-                  removeOwner=(action "removeOwner")
-                  member=user}}
+                member=user
+                onChange=(action "actOnGroup" user)
+              }}
             {{/if}}
           {{/user-info}}
         </div>

From cbd72d51b441277d1a5249aa20c62d61a57b4543 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 09:26:35 +0200
Subject: [PATCH 361/633] fix translations impacting other tests (#9321)

---
 test/javascripts/widgets/widget-dropdown-test.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/javascripts/widgets/widget-dropdown-test.js b/test/javascripts/widgets/widget-dropdown-test.js
index 511af7964f..46625d7d7b 100644
--- a/test/javascripts/widgets/widget-dropdown-test.js
+++ b/test/javascripts/widgets/widget-dropdown-test.js
@@ -204,11 +204,17 @@ widgetTest("content with translatedLabel", {
 widgetTest("content with label", {
   template: TEMPLATE,
 
+  _translations: I18n.translations,
+
   beforeEach() {
     I18n.translations = { en: { js: { foo: "FooBaz" } } };
     this.setProperties(DEFAULT_CONTENT);
   },
 
+  afterEach() {
+    I18n.translations = this._translations;
+  },
+
   test(assert) {
     assert.equal(rowById(1).innerText.trim(), "FooBaz");
   }

From f724cf1cfeab9beb8754d611ab3591b7679ca214 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 10:12:52 +0200
Subject: [PATCH 362/633] UX: minor tweaks to users directory last updated at
 styling (#9322)

---
 .../discourse/templates/mobile/users.hbs         |  2 +-
 .../javascripts/discourse/templates/users.hbs    |  2 +-
 .../stylesheets/common/base/directory.scss       | 13 +++++++++++++
 app/assets/stylesheets/mobile/directory.scss     | 16 ++++++++++++----
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs
index 7f208e2abb..808458bbcb 100644
--- a/app/assets/javascripts/discourse/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs
@@ -1,6 +1,6 @@
 {{#load-more selector=".directory .user" action=(action "loadMore")}}
   <div class="container">
-    <div class='directory'>
+    <div class='users-directory directory'>
       {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
 
       <div class='directory-controls'>
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index 09f4ba4f0c..af5d17f15b 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -1,7 +1,7 @@
 {{#d-section pageClass="users"}}
   {{#load-more selector=".directory tbody tr" action=(action "loadMore")}}
     <div class="container">
-      <div class='directory'>
+      <div class='users-directory directory'>
         {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
         <div class='directory-controls'>
           <div class='period-controls'>
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 81045260a5..b01248d144 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -1,6 +1,17 @@
 .directory {
   margin-bottom: 100px;
 
+  &.users-directory {
+    .period-chooser {
+      .selected-name {
+        margin: 0;
+      }
+      .period-chooser-header .caret-icon {
+        margin: 0;
+      }
+    }
+  }
+
   .user-info {
     margin-bottom: 0;
   }
@@ -16,9 +27,11 @@
       height: 1em;
     }
   }
+
   .directory-last-updated {
     margin-bottom: 0.5em;
     color: $primary-medium;
+    font-size: $font-down-1;
   }
 
   table {
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index c1057bd636..f963433e29 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -1,9 +1,17 @@
 .directory {
-  .select-kit.dropdown-select-box.period-chooser
-    .period-chooser-header
-    h2.selected-name {
+  .period-chooser .period-chooser-header h2.selected-name {
     font-size: $font-up-1;
-    margin-bottom: 0.25em;
+  }
+
+  &.users-directory {
+    .filter-name {
+      width: 100%;
+      margin-bottom: 1em;
+    }
+
+    .directory-last-updated {
+      margin-bottom: 1em;
+    }
   }
 
   .directory-controls {

From 511264879616cd5bae10aa7a07dc17aa99f8b34c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 17:19:47 +0200
Subject: [PATCH 363/633] fix documentation (#9327)

---
 app/assets/javascripts/discourse/lib/plugin-api.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js b/app/assets/javascripts/discourse/lib/plugin-api.js
index aaafba5b4c..b0594f7b8d 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js
@@ -1027,11 +1027,9 @@ class PluginApi {
    * For example, to replace the topic title:
    *
    * ```
-   * api.decorateTopicTitle(
-   *   (topicModel, node, topicTitleType) => {
-   *     node.innerText("my new topic title");
-   *   }
-   * );
+   * api.decorateTopicTitle((topicModel, node, topicTitleType) => {
+   *   node.innerText = "my new topic title";
+   * });
    * ```
    *
    **/

From 0e3fa4072fb83994e52df58909d46c5744e03009 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 31 Mar 2020 15:47:13 +0100
Subject: [PATCH 364/633] FIX: Bypass serviceworker cache for auth routes

This avoids samesite cookie-related issues in iOS PWAs during the authentication flow
---
 app/assets/javascripts/service-worker.js.erb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/service-worker.js.erb b/app/assets/javascripts/service-worker.js.erb
index 1d88932289..f264094817 100644
--- a/app/assets/javascripts/service-worker.js.erb
+++ b/app/assets/javascripts/service-worker.js.erb
@@ -7,11 +7,15 @@ workbox.setConfig({
   debug: false
 });
 
+var authUrl = "<%= Discourse.base_path %>/auth/";
+
 var cacheVersion = "1";
 
 // Cache all GET requests, so Discourse can be used while offline
 workbox.routing.registerRoute(
-  new RegExp('.*?'), // Matches all, GET is implicit
+  function(args) {
+    return !(args.url.origin === location.origin && args.url.pathname.startsWith(authUrl));
+  }, // Match all except auth routes
   new workbox.strategies.NetworkFirst({ // This will only use the cache when a network request fails
     cacheName: "discourse-" + cacheVersion,
     plugins: [

From b2a0d34bb783d251ae61881e5d4b9b9aafdf9c09 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Tue, 31 Mar 2020 23:59:15 +0530
Subject: [PATCH 365/633] FEATURE: add setting `auto_approve_email_domains` to
 auto approve users (#9323)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* FEATURE: add setting `auto_approve_email_domains` to auto approve users

This commit adds a new site setting `auto_approve_email_domains` to
auto approve users based on their email address domain.

Note that if a domain already exists in `email_domains_whitelist` then
`auto_approve_email_domains` needs to be duplicated there as well,
since users won’t be able to register with email address that is
not allowed in `email_domains_whitelist`.

* Update config/locales/server.en.yml

Co-Authored-By: Robin Ward <robin.ward@gmail.com>
---
 app/controllers/users_controller.rb            |  7 +++++--
 app/models/invite_redeemer.rb                  |  4 +++-
 config/locales/server.en.yml                   |  1 +
 config/site_settings.yml                       |  3 +++
 lib/validators/email_validator.rb              |  8 ++++++++
 .../validators/email_validator_spec.rb         | 17 +++++++++++++++++
 spec/models/invite_redeemer_spec.rb            | 12 +++++++++++-
 spec/requests/users_controller_spec.rb         | 18 +++++++++++++++++-
 8 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 79bee4208d..15e36dd9d1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -447,8 +447,11 @@ class UsersController < ApplicationController
     user ||= User.new
     user.attributes = new_user_params
 
-    # Handle API approval
-    ReviewableUser.set_approved_fields!(user, current_user) if user.approved?
+    # Handle API approval and
+    # auto approve users based on auto_approve_email_domains setting
+    if user.approved? || EmailValidator.can_auto_approve_user?(user.email)
+      ReviewableUser.set_approved_fields!(user, current_user)
+    end
 
     # Handle custom fields
     user_fields = UserField.all
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index 68a415d274..172e06f3a7 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -36,7 +36,9 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
       registration_ip_address: ip_address
     }
 
-    if !SiteSetting.must_approve_users? || (SiteSetting.must_approve_users? && invite.invited_by.staff?)
+    if !SiteSetting.must_approve_users? ||
+        (SiteSetting.must_approve_users? && invite.invited_by.staff?) ||
+        EmailValidator.can_auto_approve_user?(user.email)
       ReviewableUser.set_approved_fields!(user, invite.invited_by)
     end
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index b1fd87890d..8fa0a36087 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1582,6 +1582,7 @@ en:
     allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines. In exceptional cases you can permanently <a href='%{base_path}/admin/customize/robots'>override robots.txt</a>."
     email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net"
     email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
+    auto_approve_email_domains: "Users with email addresses from this list of domains will be automatically approved."
     hide_email_address_taken: "Don't inform users that an account exists with a given email address during signup and from the forgot password form."
     log_out_strict: "When logging out, log out ALL sessions for the user on all devices"
     version_checks: "Ping the Discourse Hub for version updates and show new version messages on the <a href='%{base_path}/admin' target='_blank'>/admin</a> dashboard"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 52b7c6002d..33501a4df4 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -459,6 +459,9 @@ login:
   email_domains_whitelist:
     default: ""
     type: list
+  auto_approve_email_domains:
+    default: ""
+    type: list
   hide_email_address_taken: false
   log_out_strict: true
   pending_users_reminder_delay:
diff --git a/lib/validators/email_validator.rb b/lib/validators/email_validator.rb
index 46d47f8f0d..6436161b82 100644
--- a/lib/validators/email_validator.rb
+++ b/lib/validators/email_validator.rb
@@ -22,6 +22,14 @@ class EmailValidator < ActiveModel::EachValidator
     true
   end
 
+  def self.can_auto_approve_user?(email)
+    if (setting = SiteSetting.auto_approve_email_domains).present?
+      return !!(EmailValidator.allowed?(email) && email_in_restriction_setting?(setting, email))
+    end
+
+    false
+  end
+
   def self.email_in_restriction_setting?(setting, value)
     domains = setting.gsub('.', '\.')
     regexp = Regexp.new("@(.+\\.)?(#{domains})$", true)
diff --git a/spec/components/validators/email_validator_spec.rb b/spec/components/validators/email_validator_spec.rb
index 0c4616817a..41c29e1b51 100644
--- a/spec/components/validators/email_validator_spec.rb
+++ b/spec/components/validators/email_validator_spec.rb
@@ -41,6 +41,23 @@ describe EmailValidator do
     end
   end
 
+  context "auto approve email domains" do
+    it "works as expected" do
+      SiteSetting.auto_approve_email_domains = "example.com"
+
+      expect(EmailValidator.can_auto_approve_user?("foobar@example.com.fr")).to eq(false)
+      expect(EmailValidator.can_auto_approve_user?("foobar@example.com")).to eq(true)
+    end
+
+    it "returns false if domain not present in email_domains_whitelist" do
+      SiteSetting.email_domains_whitelist = "googlemail.com"
+      SiteSetting.auto_approve_email_domains = "example.com|googlemail.com"
+
+      expect(EmailValidator.can_auto_approve_user?("foobar@example.com")).to eq(false)
+      expect(EmailValidator.can_auto_approve_user?("foobar@googlemail.com")).to eq(true)
+    end
+  end
+
   context '.email_regex' do
     it 'should match valid emails' do
       expect(!!('test@discourse.org' =~ EmailValidator.email_regex)).to eq(true)
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index 6098adddcd..814fe42124 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -59,7 +59,7 @@ describe InviteRedeemer do
   end
 
   describe "#redeem" do
-    fab!(:invite) { Fabricate(:invite) }
+    fab!(:invite) { Fabricate(:invite, email: "foobar@example.com") }
     let(:name) { 'john snow' }
     let(:username) { 'kingofthenorth' }
     let(:password) { 'know5nOthiNG' }
@@ -102,6 +102,16 @@ describe InviteRedeemer do
       expect(user.approved).to eq(true)
     end
 
+    it "should redeem the invite if invited by non staff and approve if email in auto_approve_email_domains setting" do
+      SiteSetting.must_approve_users = true
+      SiteSetting.auto_approve_email_domains = "example.com"
+      user = invite_redeemer.redeem
+
+      expect(user.name).to eq(name)
+      expect(user.username).to eq(username)
+      expect(user.approved).to eq(true)
+    end
+
     it "should not blow up if invited_by user has been removed" do
       invite.invited_by.destroy!
       invite.reload
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 95d675f372..561eaeb12d 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -583,7 +583,7 @@ describe UsersController do
       UsersController.any_instance.stubs(:honeypot_value).returns(nil)
       UsersController.any_instance.stubs(:challenge_value).returns(nil)
       SiteSetting.allow_new_registrations = true
-      @user = Fabricate.build(:user, password: "strongpassword")
+      @user = Fabricate.build(:user, email: "foobar@example.com", password: "strongpassword")
     end
 
     let(:post_user_params) do
@@ -826,6 +826,22 @@ describe UsersController do
           new_user = User.find(json["user_id"])
           expect(new_user.locale).not_to eq("fr")
         end
+
+        it "will auto approve user if the user email domain matches auto_approve_email_domains setting" do
+          Jobs.run_immediately!
+          SiteSetting.must_approve_users = true
+          SiteSetting.auto_approve_email_domains = "example.com"
+
+          post "/u.json", params: post_user_params.merge(active: true, api_key: api_key.key)
+
+          expect(response.status).to eq(200)
+          json = JSON.parse(response.body)
+
+          new_user = User.find(json["user_id"])
+          expect(json['active']).to be_truthy
+          expect(new_user.approved).to be_truthy
+          expect(ReviewableUser.pending.find_by(target: new_user)).to be_blank
+        end
       end
     end
 

From b79ea986ac44c1ced0b332722c1bb16b4239b565 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 1 Apr 2020 09:09:20 +1000
Subject: [PATCH 366/633] FEATURE: High priority bookmark reminder
 notifications (#9290)

Introduce the concept of "high priority notifications" which include PM and bookmark reminder notifications. Now bookmark reminder notifications act in the same way as PM notifications (float to top of recent list, show in the green bubble) and most instances of unread_private_messages in the UI have been replaced with unread_high_priority_notifications.

The user email digest is changed to just have a section about unread high priority notifications, the unread PM section has been removed.

A high_priority boolean column has been added to the Notification table and relevant indices added to account for it.

unread_private_messages has been kept on the User model purely for backwards compat, but now just returns unread_high_priority_notifications count so this may cause some inconsistencies in the UI.
---
 .../discourse/components/site-header.js       |  2 +-
 .../discourse/initializers/badging.js         |  2 +-
 .../subscribe-user-notifications.js           | 11 ++--
 .../initializers/title-notifications.js       |  2 +-
 .../javascripts/discourse/widgets/header.js   | 14 +++--
 .../stylesheets/common/base/discourse.scss    |  2 +-
 .../stylesheets/common/base/header.scss       |  2 +-
 app/mailers/user_notifications.rb             |  4 +-
 app/models/notification.rb                    | 38 ++++++++----
 app/models/user.rb                            | 45 ++++++++++----
 app/serializers/current_user_serializer.rb    |  1 +
 config/locales/client.en.yml                  |  3 +
 config/locales/server.en.yml                  |  2 +-
 ...d_high_priority_column_to_notifications.rb | 42 +++++++++++++
 ...drop_old_unread_pm_notification_indices.rb | 12 ++++
 spec/fabricators/notification_fabricator.rb   | 19 ++++++
 spec/models/notification_spec.rb              | 53 +++++++++++++---
 spec/models/user_spec.rb                      | 62 +++++++++++++++++--
 test/javascripts/fixtures/session-fixtures.js |  1 +
 19 files changed, 263 insertions(+), 54 deletions(-)
 create mode 100644 db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
 create mode 100644 db/post_migrate/20200330233427_drop_old_unread_pm_notification_indices.rb

diff --git a/app/assets/javascripts/discourse/components/site-header.js b/app/assets/javascripts/discourse/components/site-header.js
index b8b6ed90e3..03bc7b3608 100644
--- a/app/assets/javascripts/discourse/components/site-header.js
+++ b/app/assets/javascripts/discourse/components/site-header.js
@@ -24,7 +24,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
 
   @observes(
     "currentUser.unread_notifications",
-    "currentUser.unread_private_messages",
+    "currentUser.unread_high_priority_notifications",
     "currentUser.reviewable_count"
   )
   notificationsChanged() {
diff --git a/app/assets/javascripts/discourse/initializers/badging.js b/app/assets/javascripts/discourse/initializers/badging.js
index f406604dfa..8bcefa7915 100644
--- a/app/assets/javascripts/discourse/initializers/badging.js
+++ b/app/assets/javascripts/discourse/initializers/badging.js
@@ -10,7 +10,7 @@ export default {
     if (!user) return; // must be logged in
 
     this.notifications =
-      user.unread_notifications + user.unread_private_messages;
+      user.unread_notifications + user.unread_high_priority_notifications;
 
     container
       .lookup("service:app-events")
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
index 14c2bc5f95..1482cf9d18 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
@@ -32,24 +32,27 @@ export default {
         data => {
           const store = container.lookup("service:store");
           const oldUnread = user.get("unread_notifications");
-          const oldPM = user.get("unread_private_messages");
+          const oldHighPriority = user.get(
+            "unread_high_priority_notifications"
+          );
 
           user.setProperties({
             unread_notifications: data.unread_notifications,
-            unread_private_messages: data.unread_private_messages,
+            unread_high_priority_notifications:
+              data.unread_high_priority_notifications,
             read_first_notification: data.read_first_notification
           });
 
           if (
             oldUnread !== data.unread_notifications ||
-            oldPM !== data.unread_private_messages
+            oldHighPriority !== data.unread_high_priority_notifications
           ) {
             appEvents.trigger("notifications:changed");
 
             if (
               site.mobileView &&
               (data.unread_notifications - oldUnread > 0 ||
-                data.unread_private_messages - oldPM > 0)
+                data.unread_high_priority_notifications - oldHighPriority > 0)
             ) {
               appEvents.trigger("header:update-topic", null, 5000);
             }
diff --git a/app/assets/javascripts/discourse/initializers/title-notifications.js b/app/assets/javascripts/discourse/initializers/title-notifications.js
index 9801e1f688..cfc0c3ed6d 100644
--- a/app/assets/javascripts/discourse/initializers/title-notifications.js
+++ b/app/assets/javascripts/discourse/initializers/title-notifications.js
@@ -18,7 +18,7 @@ export default {
     if (!user) return; // must be logged in
 
     const notifications =
-      user.unread_notifications + user.unread_private_messages;
+      user.unread_notifications + user.unread_high_priority_notifications;
 
     Discourse.updateNotificationCount(notifications);
   }
diff --git a/app/assets/javascripts/discourse/widgets/header.js b/app/assets/javascripts/discourse/widgets/header.js
index e08bab8741..4910913a4e 100644
--- a/app/assets/javascripts/discourse/widgets/header.js
+++ b/app/assets/javascripts/discourse/widgets/header.js
@@ -67,8 +67,9 @@ createWidget("header-notifications", {
       );
     }
 
-    const unreadPMs = user.get("unread_private_messages");
-    if (!!unreadPMs) {
+    const unreadHighPriority = user.get("unread_high_priority_notifications");
+    if (!!unreadHighPriority) {
+      // highlight the avatar if the first ever PM is not read
       if (
         !user.get("read_first_notification") &&
         !user.get("enforcedSecondFactor")
@@ -90,14 +91,15 @@ createWidget("header-notifications", {
         }
       }
 
+      // add the counter for the unread high priority
       contents.push(
         this.attach("link", {
           action: attrs.action,
-          className: "badge-notification unread-private-messages",
-          rawLabel: unreadPMs,
+          className: "badge-notification unread-high-priority-notifications",
+          rawLabel: unreadHighPriority,
           omitSpan: true,
-          title: "notifications.tooltip.message",
-          titleOptions: { count: unreadPMs }
+          title: "notifications.tooltip.high_priority",
+          titleOptions: { count: unreadHighPriority }
         })
       );
     }
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 023154c7da..831aba61b0 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -422,7 +422,7 @@ table {
   align-items: center;
 }
 
-.unread-private-messages {
+.unread-high-priority-notifications {
   color: $secondary;
   background: $success;
 
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index ba3ccb1d2f..42e57ae88f 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -202,7 +202,7 @@
     right: -3px;
     background-color: dark-light-choose($tertiary-medium, $tertiary);
   }
-  .unread-private-messages,
+  .unread-high-priority-notifications,
   .ring {
     left: auto;
     right: 25px;
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index d91ee570ec..7b35e9b3e8 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -216,8 +216,8 @@ class UserNotifications < ActionMailer::Base
       value = user.unread_notifications
       @counts << { label_key: 'user_notifications.digest.unread_notifications', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
 
-      value = user.unread_private_messages
-      @counts << { label_key: 'user_notifications.digest.unread_messages', value: value, href: "#{Discourse.base_url}/my/messages" } if value > 0
+      value = user.unread_high_priority_notifications
+      @counts << { label_key: 'user_notifications.digest.unread_high_priority', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
 
       if @counts.size < 3
         value = user.unread_notifications_of_type(Notification.types[:liked])
diff --git a/app/models/notification.rb b/app/models/notification.rb
index a44086f652..0407f17c96 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -44,6 +44,10 @@ class Notification < ActiveRecord::Base
     send_email unless NotificationConsolidator.new(self).consolidate!
   end
 
+  before_create do
+    self.high_priority = Notification.high_priority_types.include?(self.notification_type)
+  end
+
   def self.purge_old!
     return if SiteSetting.max_notifications_per_user == 0
 
@@ -64,10 +68,10 @@ class Notification < ActiveRecord::Base
   end
 
   def self.ensure_consistency!
-    DB.exec(<<~SQL, Notification.types[:private_message])
+    DB.exec(<<~SQL)
       DELETE
         FROM notifications n
-       WHERE notification_type = ?
+       WHERE high_priority
          AND NOT EXISTS (
             SELECT 1
               FROM posts p
@@ -108,6 +112,17 @@ class Notification < ActiveRecord::Base
                        )
   end
 
+  def self.high_priority_types
+    @high_priority_types ||= [
+      types[:private_message],
+      types[:bookmark_reminder]
+    ]
+  end
+
+  def self.normal_priority_types
+    @normal_priority_types ||= types.reject { |_k, v| high_priority_types.include?(v) }.values
+  end
+
   def self.mark_posts_read(user, topic_id, post_numbers)
     Notification
       .where(
@@ -210,14 +225,14 @@ class Notification < ActiveRecord::Base
 
     if notifications.present?
 
-      ids = DB.query_single(<<~SQL, count.to_i)
+      ids = DB.query_single(<<~SQL, limit: count.to_i)
          SELECT n.id FROM notifications n
          WHERE
-           n.notification_type = 6 AND
+           n.high_priority = TRUE AND
            n.user_id = #{user.id.to_i} AND
            NOT read
         ORDER BY n.id ASC
-        LIMIT ?
+        LIMIT :limit
       SQL
 
       if ids.length > 0
@@ -230,9 +245,9 @@ class Notification < ActiveRecord::Base
       end
 
       notifications.uniq(&:id).sort do |x, y|
-        if x.unread_pm? && !y.unread_pm?
+        if x.unread_high_priority? && !y.unread_high_priority?
           -1
-        elsif y.unread_pm? && !x.unread_pm?
+        elsif y.unread_high_priority? && !x.unread_high_priority?
           1
         else
           y.created_at <=> x.created_at
@@ -244,8 +259,8 @@ class Notification < ActiveRecord::Base
 
   end
 
-  def unread_pm?
-    Notification.types[:private_message] == self.notification_type && !read
+  def unread_high_priority?
+    self.high_priority? && !read
   end
 
   def post_id
@@ -280,14 +295,15 @@ end
 #  topic_id          :integer
 #  post_number       :integer
 #  post_action_id    :integer
+#  high_priority     :boolean          default(FALSE), not null
 #
 # Indexes
 #
 #  idx_notifications_speedup_unread_count                       (user_id,notification_type) WHERE (NOT read)
 #  index_notifications_on_post_action_id                        (post_action_id)
-#  index_notifications_on_read_or_n_type                        (user_id,id DESC,read,topic_id) UNIQUE WHERE (read OR (notification_type <> 6))
 #  index_notifications_on_topic_id_and_post_number              (topic_id,post_number)
 #  index_notifications_on_user_id_and_created_at                (user_id,created_at)
-#  index_notifications_on_user_id_and_id                        (user_id,id) UNIQUE WHERE ((notification_type = 6) AND (NOT read))
 #  index_notifications_on_user_id_and_topic_id_and_post_number  (user_id,topic_id,post_number)
+#  index_notifications_read_or_not_high_priority                (user_id,id DESC,read,topic_id) WHERE (read OR (high_priority = false))
+#  index_notifications_unique_unread_high_priority              (user_id,id) UNIQUE WHERE ((NOT read) AND (high_priority = true))
 #
diff --git a/app/models/user.rb b/app/models/user.rb
index 3993d4ea79..284f15c788 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -470,6 +470,8 @@ class User < ActiveRecord::Base
     @unread_notifications = nil
     @unread_total_notifications = nil
     @unread_pms = nil
+    @unread_bookmarks = nil
+    @unread_high_prios = nil
     @user_fields_cache = nil
     @ignored_user_ids = nil
     @muted_user_ids = nil
@@ -491,17 +493,41 @@ class User < ActiveRecord::Base
           FROM notifications n
      LEFT JOIN topics t ON t.id = n.topic_id
          WHERE t.deleted_at IS NULL
-           AND n.notification_type = :type
+           AND n.notification_type = :notification_type
            AND n.user_id = :user_id
            AND NOT read
     SQL
 
     # to avoid coalesce we do to_i
-    DB.query_single(sql, user_id: id, type: notification_type)[0].to_i
+    DB.query_single(sql, user_id: id, notification_type: notification_type)[0].to_i
   end
 
+  def unread_notifications_of_priority(high_priority:)
+    # perf critical, much more efficient than AR
+    sql = <<~SQL
+        SELECT COUNT(*)
+          FROM notifications n
+     LEFT JOIN topics t ON t.id = n.topic_id
+         WHERE t.deleted_at IS NULL
+           AND n.high_priority = :high_priority
+           AND n.user_id = :user_id
+           AND NOT read
+    SQL
+
+    # to avoid coalesce we do to_i
+    DB.query_single(sql, user_id: id, high_priority: high_priority)[0].to_i
+  end
+
+  ###
+  # DEPRECATED: This is only maintained for backwards compat until v2.5. There
+  # may be inconsistencies with counts in the UI because of this, because unread
+  # high priority includes PMs AND bookmark reminders.
   def unread_private_messages
-    @unread_pms ||= unread_notifications_of_type(Notification.types[:private_message])
+    @unread_pms ||= unread_high_priority_notifications
+  end
+
+  def unread_high_priority_notifications
+    @unread_high_prios ||= unread_notifications_of_priority(high_priority: true)
   end
 
   # PERF: This safeguard is in place to avoid situations where
@@ -526,7 +552,7 @@ class User < ActiveRecord::Base
           notifications n
           LEFT JOIN topics t ON t.id = n.topic_id
            WHERE t.deleted_at IS NULL AND
-            n.notification_type <> :pm AND
+            n.high_priority = FALSE AND
             n.user_id = :user_id AND
             n.id > :seen_notification_id AND
             NOT read
@@ -537,7 +563,6 @@ class User < ActiveRecord::Base
       DB.query_single(sql,
         user_id: id,
         seen_notification_id: seen_notification_id,
-        pm: Notification.types[:private_message],
         limit: User.max_unread_notifications
     )[0].to_i
     end
@@ -579,7 +604,7 @@ class User < ActiveRecord::Base
          LEFT JOIN topics t ON n.topic_id = t.id
          WHERE
           t.deleted_at IS NULL AND
-          n.notification_type = :type AND
+          n.high_priority AND
           n.user_id = :user_id AND
           NOT read
         ORDER BY n.id DESC
@@ -591,23 +616,21 @@ class User < ActiveRecord::Base
        LEFT JOIN topics t ON n.topic_id = t.id
        WHERE
         t.deleted_at IS NULL AND
-        (n.notification_type <> :type OR read) AND
+        (n.high_priority = FALSE OR read) AND
         n.user_id = :user_id
        ORDER BY n.id DESC
        LIMIT 20
       ) AS y
     SQL
 
-    recent = DB.query(sql,
-      user_id: id,
-      type: Notification.types[:private_message]
-    ).map! do |r|
+    recent = DB.query(sql, user_id: id).map! do |r|
       [r.id, r.read]
     end
 
     payload = {
       unread_notifications: unread_notifications,
       unread_private_messages: unread_private_messages,
+      unread_high_priority_notifications: unread_high_priority_notifications,
       read_first_notification: read_first_notification?,
       last_notification: json,
       recent: recent,
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 9851baab7d..5fa2db54e8 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -5,6 +5,7 @@ class CurrentUserSerializer < BasicUserSerializer
   attributes :name,
              :unread_notifications,
              :unread_private_messages,
+             :unread_high_priority_notifications,
              :read_first_notification?,
              :admin?,
              :notification_channel_position,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 98d4a5bf1b..e9bbb29609 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1812,6 +1812,9 @@ en:
         message:
           one: "%{count} unread message"
           other: "{{count}} unread messages"
+        high_priority:
+          one: "%{count} unread high priority notification"
+          other: "%{count} unread high priority notificationis"
       title: "notifications of @name mentions, replies to your posts and topics, messages, etc"
       none: "Unable to load notifications at this time."
       empty: "No notifications found."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 8fa0a36087..e3b8271e5d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3521,8 +3521,8 @@ en:
       why: "A brief summary of %{site_link} since your last visit on %{last_seen_at}"
       since_last_visit: "Since your last visit"
       new_topics: "New Topics"
-      unread_messages: "Unread Messages"
       unread_notifications: "Unread Notifications"
+      unread_high_priority: "Unread High Priority Notifications"
       liked_received: "Likes Received"
       new_users: "New Users"
       popular_topics: "Popular Topics"
diff --git a/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb b/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
new file mode 100644
index 0000000000..4bb5f39d1e
--- /dev/null
+++ b/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class AddHighPriorityColumnToNotifications < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction!
+  def up
+    if !column_exists?(:notifications, :high_priority)
+      add_column :notifications, :high_priority, :boolean, default: nil
+    end
+
+    # type 6 = private message, 24 = bookmark reminder
+    # priority 0 = low, 1 = normal, 2 = high
+    if column_exists?(:notifications, :high_priority)
+      execute <<~SQL
+        UPDATE notifications SET high_priority = TRUE WHERE notification_type IN (6, 24);
+      SQL
+
+      execute <<~SQL
+        UPDATE notifications SET high_priority = FALSE WHERE notification_type NOT IN (6, 24);
+      SQL
+
+      execute <<~SQL
+        ALTER TABLE notifications ALTER COLUMN high_priority SET DEFAULT FALSE;
+      SQL
+
+      execute <<~SQL
+        ALTER TABLE notifications ALTER COLUMN high_priority SET NOT NULL;
+      SQL
+    end
+
+    execute <<~SQL
+      CREATE INDEX CONCURRENTLY IF NOT EXISTS index_notifications_read_or_not_high_priority ON notifications(user_id, id DESC, read, topic_id) WHERE (read OR (high_priority = FALSE));
+    SQL
+
+    execute <<~SQL
+      CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS index_notifications_unique_unread_high_priority ON notifications(user_id, id) WHERE NOT read AND high_priority = TRUE;
+    SQL
+  end
+
+  def down
+    DB.exec("ALTER TABLE notifications DROP COLUMN IF EXISTS high_priority")
+  end
+end
diff --git a/db/post_migrate/20200330233427_drop_old_unread_pm_notification_indices.rb b/db/post_migrate/20200330233427_drop_old_unread_pm_notification_indices.rb
new file mode 100644
index 0000000000..33f27cffa2
--- /dev/null
+++ b/db/post_migrate/20200330233427_drop_old_unread_pm_notification_indices.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class DropOldUnreadPmNotificationIndices < ActiveRecord::Migration[6.0]
+  def up
+    DB.exec("DROP INDEX IF EXISTS index_notifications_on_user_id_and_id")
+    DB.exec("DROP INDEX IF EXISTS index_notifications_on_read_or_n_type")
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/spec/fabricators/notification_fabricator.rb b/spec/fabricators/notification_fabricator.rb
index 6c386c7336..6ee4c1bcfb 100644
--- a/spec/fabricators/notification_fabricator.rb
+++ b/spec/fabricators/notification_fabricator.rb
@@ -3,6 +3,7 @@
 Fabricator(:notification) do
   transient :post
   notification_type Notification.types[:mentioned]
+  high_priority false
   user
   topic { |attrs| attrs[:post]&.topic || Fabricate(:topic, user: attrs[:user]) }
   post_number { |attrs| attrs[:post]&.post_number }
@@ -17,6 +18,7 @@ end
 
 Fabricator(:private_message_notification, from: :notification) do
   notification_type Notification.types[:private_message]
+  high_priority true
   data do |attrs|
     post = attrs[:post] || Fabricate(:post, topic: attrs[:topic], user: attrs[:user])
     {
@@ -30,6 +32,23 @@ Fabricator(:private_message_notification, from: :notification) do
   end
 end
 
+Fabricator(:bookmark_reminder_notification, from: :notification) do
+  notification_type Notification.types[:bookmark_reminder]
+  high_priority true
+  data do |attrs|
+    post = attrs[:post] || Fabricate(:post, topic: attrs[:topic], user: attrs[:user])
+    {
+      topic_title: attrs[:topic].title,
+      original_post_id: post.id,
+      original_post_type: post.post_type,
+      original_username: post.user.username,
+      revision_number: nil,
+      display_username: post.user.username,
+      bookmark_name: "Check out Mr Freeze's opinion here"
+    }.to_json
+  end
+end
+
 Fabricator(:replied_notification, from: :notification) do
   notification_type Notification.types[:replied]
   data do |attrs|
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index f8bf62a82f..9f0a38a836 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -117,6 +117,24 @@ describe Notification do
       it "increases unread_private_messages" do
         expect { Fabricate(:private_message_notification, user: user); user.reload }.to change(user, :unread_private_messages)
       end
+
+      it "increases unread_high_priority_notifications" do
+        expect { Fabricate(:private_message_notification, user: user); user.reload }.to change(user, :unread_high_priority_notifications)
+      end
+    end
+
+    context 'a bookmark reminder message' do
+      it "doesn't increase unread_notifications" do
+        expect { Fabricate(:bookmark_reminder_notification, user: user); user.reload }.not_to change(user, :unread_notifications)
+      end
+
+      it 'increases total_unread_notifications' do
+        expect { Fabricate(:notification, user: user); user.reload }.to change(user, :total_unread_notifications)
+      end
+
+      it "increases unread_high_priority_notifications" do
+        expect { Fabricate(:bookmark_reminder_notification, user: user); user.reload }.to change(user, :unread_high_priority_notifications)
+      end
     end
 
   end
@@ -219,6 +237,13 @@ describe Notification do
                            data: '{}',
                            notification_type: Notification.types[:private_message])
 
+      Notification.create!(read: false,
+                           user_id: user.id,
+                           topic_id: t.id,
+                           post_number: 1,
+                           data: '{}',
+                           notification_type: Notification.types[:bookmark_reminder])
+
       other = Notification.create!(read: false,
                                    user_id: user.id,
                                    topic_id: t.id,
@@ -230,8 +255,11 @@ describe Notification do
       user.reload
 
       expect(user.unread_notifications).to eq(0)
-      expect(user.total_unread_notifications).to eq(2)
-      expect(user.unread_private_messages).to eq(1)
+      expect(user.total_unread_notifications).to eq(3)
+      # NOTE: because of deprecation this will be equal to unread_high_priority_notifications,
+      #       to be remonved in 2.5
+      expect(user.unread_private_messages).to eq(2)
+      expect(user.unread_high_priority_notifications).to eq(2)
     end
   end
 
@@ -248,7 +276,7 @@ describe Notification do
     end
   end
 
-  describe 'ensure consistency' do
+  describe '#ensure_consistency!' do
     it 'deletes notifications if post is missing or deleted' do
 
       NotificationEmailer.disable
@@ -260,6 +288,8 @@ describe Notification do
                            notification_type: Notification.types[:private_message])
       Notification.create!(read: false, user_id: p2.user_id, topic_id: p2.topic_id, post_number: p2.post_number, data: '[]',
                            notification_type: Notification.types[:private_message])
+      Notification.create!(read: false, user_id: p2.user_id, topic_id: p2.topic_id, post_number: p2.post_number, data: '[]',
+                           notification_type: Notification.types[:bookmark_reminder])
 
       Notification.create!(read: false, user_id: p2.user_id, topic_id: p2.topic_id, post_number: p2.post_number, data: '[]',
                            notification_type: Notification.types[:liked])
@@ -321,6 +351,10 @@ describe Notification do
       fab(Notification.types[:private_message], false)
     end
 
+    def unread_bookmark_reminder
+      fab(Notification.types[:bookmark_reminder], false)
+    end
+
     def pm
       fab(Notification.types[:private_message], true)
     end
@@ -340,16 +374,17 @@ describe Notification do
       expect(Notification.visible.count).to eq(0)
     end
 
-    it 'orders stuff correctly' do
+    it 'orders stuff by creation descending, bumping unread high priority (pms, bookmark reminders) to top' do
+      # note we expect the final order to read bottom-up for this list of variables,
+      # with unread pm + bookmark reminder at the top of that list
       a = unread_pm
-          regular
+      regular
+      b = unread_bookmark_reminder
       c = pm
       d = regular
 
-      # bumps unread pms to front of list
-
-      notifications = Notification.recent_report(user, 3)
-      expect(notifications.map { |n| n.id }).to eq([a.id, d.id, c.id])
+      notifications = Notification.recent_report(user, 4)
+      expect(notifications.map { |n| n.id }).to eq([b.id, a.id, d.id, c.id])
 
     end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 995a532290..bb27aa4af0 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1779,7 +1779,7 @@ describe User do
   end
 
   describe '#publish_notifications_state' do
-    it 'should publish the right message' do
+    it 'should publish the right message sorted by ID desc' do
       notification = Fabricate(:notification, user: user)
       notification2 = Fabricate(:notification, user: user, read: true)
 
@@ -1788,8 +1788,41 @@ describe User do
       end.first
 
       expect(message.data[:recent]).to eq([
-                                            [notification2.id, true], [notification.id, false]
-                                          ])
+        [notification2.id, true], [notification.id, false]
+      ])
+    end
+
+    it 'floats the unread high priority notifications to the top' do
+      notification = Fabricate(:notification, user: user)
+      notification2 = Fabricate(:notification, user: user, read: true)
+      notification3 = Fabricate(:notification, user: user, notification_type: Notification.types[:private_message])
+      notification4 = Fabricate(:notification, user: user, notification_type: Notification.types[:bookmark_reminder])
+
+      message = MessageBus.track_publish("/notification/#{user.id}") do
+        user.publish_notifications_state
+      end.first
+
+      expect(message.data[:recent]).to eq([
+        [notification4.id, false], [notification3.id, false],
+        [notification2.id, true], [notification.id, false]
+      ])
+    end
+
+    it "has the correct counts" do
+      notification = Fabricate(:notification, user: user)
+      notification2 = Fabricate(:notification, user: user, read: true)
+      notification3 = Fabricate(:notification, user: user, notification_type: Notification.types[:private_message])
+      notification4 = Fabricate(:notification, user: user, notification_type: Notification.types[:bookmark_reminder])
+
+      message = MessageBus.track_publish("/notification/#{user.id}") do
+        user.publish_notifications_state
+      end.first
+
+      expect(message.data[:unread_notifications]).to eq(1)
+      # NOTE: because of deprecation this will be equal to unread_high_priority_notifications,
+      #       to be remonved in 2.5
+      expect(message.data[:unread_private_messages]).to eq(2)
+      expect(message.data[:unread_high_priority_notifications]).to eq(2)
     end
   end
 
@@ -1821,6 +1854,7 @@ describe User do
   end
 
   describe "#unread_notifications" do
+    fab!(:user) { Fabricate(:user) }
     before do
       User.max_unread_notifications = 3
     end
@@ -1830,14 +1864,32 @@ describe User do
     end
 
     it "limits to MAX_UNREAD_NOTIFICATIONS" do
-      user = Fabricate(:user)
-
       4.times do
         Notification.create!(user_id: user.id, notification_type: 1, read: false, data: '{}')
       end
 
       expect(user.unread_notifications).to eq(3)
     end
+
+    it "does not include high priority notifications" do
+      Notification.create!(user_id: user.id, notification_type: 1, read: false, data: '{}')
+      Notification.create!(user_id: user.id, notification_type: Notification.types[:private_message], read: false, data: '{}')
+      Notification.create!(user_id: user.id, notification_type: Notification.types[:bookmark_reminder], read: false, data: '{}')
+
+      expect(user.unread_notifications).to eq(1)
+    end
+  end
+
+  describe "#unread_high_priority_notifications" do
+    fab!(:user) { Fabricate(:user) }
+
+    it "only returns an unread count of PM and bookmark reminder notifications" do
+      Notification.create!(user_id: user.id, notification_type: 1, read: false, data: '{}')
+      Notification.create!(user_id: user.id, notification_type: Notification.types[:private_message], read: false, data: '{}')
+      Notification.create!(user_id: user.id, notification_type: Notification.types[:bookmark_reminder], read: false, data: '{}')
+
+      expect(user.unread_high_priority_notifications).to eq(2)
+    end
   end
 
   describe "#unstage!" do
diff --git a/test/javascripts/fixtures/session-fixtures.js b/test/javascripts/fixtures/session-fixtures.js
index 090bf09936..fe26b20cd6 100644
--- a/test/javascripts/fixtures/session-fixtures.js
+++ b/test/javascripts/fixtures/session-fixtures.js
@@ -8,6 +8,7 @@ export default {
       name: "Robin Ward",
       unread_notifications: 0,
       unread_private_messages: 0,
+      unread_high_priority_notifications: 0,
       admin: true,
       notification_channel_position: null,
       site_flagged_posts_count: 1,

From 8a527567d3da969bbacfcd1569b48a44a2c02e8c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 31 Mar 2020 20:55:11 -0400
Subject: [PATCH 367/633] UX: Break very long words in titles within menus

---
 app/assets/stylesheets/common/base/menu-panel.scss  | 2 +-
 app/assets/stylesheets/common/base/search-menu.scss | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index ca1f2b530f..08ecec45a8 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -186,7 +186,7 @@
         padding: 0;
         > div {
           overflow: hidden; // clears the text from wrapping below icons
-
+          overflow-wrap: anywhere;
           // Truncate items with more than 2 lines.
           display: -webkit-box;
           -webkit-line-clamp: 2;
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 04d4714463..64f44f7c6a 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -265,6 +265,7 @@
     }
 
     .topic-title {
+      overflow-wrap: anywhere;
       margin-right: 0.25em;
     }
   }

From 771dec9a449564797e73e472383c1988903d29da Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 1 Apr 2020 11:13:53 +1000
Subject: [PATCH 368/633] Fix currentUser not being loaded correctly in
 bookmark.js

* this caused errors because resolvedTimezone was no longer
  accessible
---
 app/assets/javascripts/discourse/models/bookmark.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/bookmark.js b/app/assets/javascripts/discourse/models/bookmark.js
index bb88e7da52..1997ab632c 100644
--- a/app/assets/javascripts/discourse/models/bookmark.js
+++ b/app/assets/javascripts/discourse/models/bookmark.js
@@ -4,7 +4,6 @@ import { censor } from "pretty-text/censored-words";
 import { emojiUnescape } from "discourse/lib/text";
 import Site from "discourse/models/site";
 import { longDate } from "discourse/lib/formatter";
-import PreloadStore from "preload-store";
 import { none } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
@@ -109,9 +108,8 @@ const Bookmark = RestModel.extend({
     return Category.findById(categoryId);
   },
 
-  @discourseComputed("reminder_at")
-  formattedReminder(bookmarkReminderAt) {
-    const currentUser = PreloadStore.get("currentUser");
+  @discourseComputed("reminder_at", "currentUser")
+  formattedReminder(bookmarkReminderAt, currentUser) {
     return moment
       .tz(bookmarkReminderAt, currentUser.resolvedTimezone())
       .format(I18n.t("dates.long_with_year"));
@@ -126,6 +124,7 @@ Bookmark.reopenClass({
   create(args) {
     args = args || {};
     args.siteSettings = args.siteSettings || Discourse.SiteSettings;
+    args.currentUser = args.currentUser || Discourse.currentUser;
     return this._super(args);
   }
 });

From 8bd693891a126063f7da45bf86e5e04fab67982d Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 31 Mar 2020 21:57:09 -0400
Subject: [PATCH 369/633] Follow-up to 8a52756 for safari

---
 app/assets/stylesheets/common/base/menu-panel.scss  | 4 ++++
 app/assets/stylesheets/common/base/search-menu.scss | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 08ecec45a8..24fa749aeb 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -187,6 +187,10 @@
         > div {
           overflow: hidden; // clears the text from wrapping below icons
           overflow-wrap: anywhere;
+          @supports not (overflow-wrap: anywhere) {
+            word-break: break-word;
+          }
+
           // Truncate items with more than 2 lines.
           display: -webkit-box;
           -webkit-line-clamp: 2;
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 64f44f7c6a..c3b6813e2c 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -266,6 +266,9 @@
 
     .topic-title {
       overflow-wrap: anywhere;
+      @supports not (overflow-wrap: anywhere) {
+        word-break: break-word;
+      }
       margin-right: 0.25em;
     }
   }

From 04b431b6a449648bb665ec50c6fab0abdd2fb521 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Tue, 31 Mar 2020 20:12:51 -0600
Subject: [PATCH 370/633] FIX: Staged users getting user_linked and user_quoted
 emails

This fix ensures that if a staged user is linked to or quoted they won't
be emailed about it.

A staged user could email into a category, and another user could quote
them inside of a completely different category and we don't want a
staged user to receive an email for this.

Bug report:

https://meta.discourse.org/t/-/145202/9
---
 app/services/notification_emailer.rb       |  1 +
 spec/services/notification_emailer_spec.rb | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/services/notification_emailer.rb b/app/services/notification_emailer.rb
index 40e044105d..db51246e3d 100644
--- a/app/services/notification_emailer.rb
+++ b/app/services/notification_emailer.rb
@@ -90,6 +90,7 @@ class NotificationEmailer
       user = notification.user
       return unless user.active? || user.staged?
       return if SiteSetting.must_approve_users? && !user.approved? && !user.staged?
+      return if user.staged? && (type == :user_linked || type == :user_quoted)
 
       return unless EMAILABLE_POST_TYPES.include?(post_type)
 
diff --git a/spec/services/notification_emailer_spec.rb b/spec/services/notification_emailer_spec.rb
index e28e17201d..9ca6d40957 100644
--- a/spec/services/notification_emailer_spec.rb
+++ b/spec/services/notification_emailer_spec.rb
@@ -36,17 +36,24 @@ describe NotificationEmailer do
         NotificationEmailer.process_notification(notification)
       end
 
-      it "enqueues a job if the user is staged" do
+      it "enqueues a job if the user is staged for non-linked and non-quoted types" do
         notification.user.staged = true
-        Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
+        if type == :user_linked || type == :user_quoted
+          Jobs.expects(:enqueue_in).with(delay, :user_email, has_entry(type: type)).never
+        else
+          Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
+        end
         NotificationEmailer.process_notification(notification)
       end
 
-      it "enqueues a job if the user is staged even if site requires user approval" do
-        SiteSetting.must_approve_users = true
-
+      it "enqueues a job if the user is staged even if site requires user approval for non-linked and non-quoted typed" do
         notification.user.staged = true
-        Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
+        SiteSetting.must_approve_users = true
+        if type == :user_linked || type == :user_quoted
+          Jobs.expects(:enqueue_in).with(delay, :user_email, has_entry(type: type)).never
+        else
+          Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
+        end
         NotificationEmailer.process_notification(notification)
       end
     end

From b8d2261db9f216414b86a27d83435f4ee99561cc Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 1 Apr 2020 14:23:26 +1100
Subject: [PATCH 371/633] FIX: correctly load drafts based of id

Previously we relied on race conditions to correctly open a draft, so this
broke.

New code is deliberate.

Also corrects missing observers on composer action
---
 .../javascripts/discourse/models/composer.js     | 13 +++++++++----
 .../components/composer-action-title.hbs         |  2 ++
 .../select-kit/components/composer-actions.js    | 16 ++++++----------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 9d0dcb8c45..1b1fd0ace3 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -744,9 +744,12 @@ const Composer = RestModel.extend({
 
     if (opts.postId) {
       promise = promise.then(() =>
-        this.store
-          .find("post", opts.postId)
-          .then(post => composer.setProperties({ post }))
+        this.store.find("post", opts.postId).then(post => {
+          composer.set("post", post);
+          if (post) {
+            composer.set("topic", post.topic);
+          }
+        })
       );
     }
 
@@ -765,7 +768,9 @@ const Composer = RestModel.extend({
         this.store.find("post", opts.post.id).then(post => {
           composer.setProperties({
             reply: post.raw,
-            originalText: post.raw
+            originalText: post.raw,
+            post: post,
+            topic: post.topic
           });
 
           composer.appEvents.trigger("composer:reply-reloaded", composer);
diff --git a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
index 3f26b6e3c5..5d3b2eef4d 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
@@ -9,6 +9,8 @@
     closeComposer=closeComposer
     action=model.action
     tabindex=tabindex
+    topic=model.topic
+    post=model.post
   }}
 {{/if}}
 
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 720dddd2ca..548a0ef701 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -39,21 +39,17 @@ export default DropdownSelectBoxComponent.extend({
 
     // if we change topic we want to change both snapshots
     if (
-      this.get("composerModel.topic") &&
-      (!_topicSnapshot ||
-        this.get("composerModel.topic.id") !== _topicSnapshot.id)
+      this.topic &&
+      (!_topicSnapshot || this.topic.id !== _topicSnapshot.id)
     ) {
-      _topicSnapshot = this.get("composerModel.topic");
-      _postSnapshot = this.get("composerModel.post");
+      _topicSnapshot = this.topic;
+      _postSnapshot = this.post;
       this.contentChanged();
     }
 
     // if we hit reply on a different post we want to change postSnapshot
-    if (
-      this.get("composerModel.post") &&
-      (!_postSnapshot || this.get("composerModel.post.id") !== _postSnapshot.id)
-    ) {
-      _postSnapshot = this.get("composerModel.post");
+    if (this.post && (!_postSnapshot || this.post.id !== _postSnapshot.id)) {
+      _postSnapshot = this.post;
       this.contentChanged();
     }
 

From c07dd0d22ab3afdf440f7dcb1e6f770334c1d0d5 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 1 Apr 2020 14:09:07 +1000
Subject: [PATCH 372/633] FEATURE: Add lazy loading to user bookmarks list
 (#9317)

This is so users with huge amount of bookmarks do not have to wait a long time to see results.

* Add a bookmark list and list serializer to server-side to be able to handle paging and load more URL
* Use load-more component to load more bookmark items, 20 at a time in user activity
* Change the way current user is loaded for bookmark ember models because it was breaking/losing resolvedTimezone when loading more items
---
 .../user-activity-bookmarks-with-reminders.js | 50 +++++++---
 .../javascripts/discourse/models/bookmark.js  | 16 ++++
 .../discourse/templates/user/bookmarks.hbs    | 91 ++++++++++---------
 .../widgets/quick-access-bookmarks.js         |  2 +
 app/controllers/users_controller.rb           |  9 +-
 app/models/user.rb                            |  1 +
 app/models/user_bookmark_list.rb              | 26 ++++++
 .../user_bookmark_list_serializer.rb          | 11 +++
 lib/bookmark_query.rb                         |  8 +-
 spec/requests/users_controller_spec.rb        |  2 +-
 10 files changed, 155 insertions(+), 61 deletions(-)
 create mode 100644 app/models/user_bookmark_list.rb
 create mode 100644 app/serializers/user_bookmark_list_serializer.rb

diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
index ad8ab35a6b..11cc0bb622 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
+++ b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { Promise } from "rsvp";
 import { inject } from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import Bookmark from "discourse/models/bookmark";
@@ -21,17 +22,7 @@ export default Controller.extend({
     return this.model
       .loadItems()
       .then(response => {
-        if (response && response.no_results_help) {
-          this.set("noResultsHelp", response.no_results_help);
-        }
-
-        if (response && response.bookmarks) {
-          let bookmarks = [];
-          response.bookmarks.forEach(bookmark => {
-            bookmarks.push(Bookmark.create(bookmark));
-          });
-          this.content.pushObjects(bookmarks);
-        }
+        this.processLoadResponse(response);
       })
       .catch(() => {
         this.set("noResultsHelp", I18n.t("bookmarks.list_permission_denied"));
@@ -49,9 +40,46 @@ export default Controller.extend({
     return loaded && contentLength === 0;
   },
 
+  processLoadResponse(response) {
+    response = response.user_bookmark_list;
+
+    if (response && response.no_results_help) {
+      this.set("noResultsHelp", response.no_results_help);
+    }
+
+    this.model.more_bookmarks_url = response.more_bookmarks_url;
+
+    if (response && response.bookmarks) {
+      let bookmarks = [];
+      response.bookmarks.forEach(bookmark => {
+        bookmarks.push(Bookmark.create(bookmark));
+      });
+      this.content.pushObjects(bookmarks);
+    }
+  },
+
   actions: {
     removeBookmark(bookmark) {
       return bookmark.destroy().then(() => this.loadItems());
+    },
+
+    loadMore() {
+      if (this.loadingMore) {
+        return Promise.resolve();
+      }
+      this.set("loadingMore", true);
+
+      return this.model
+        .loadMore()
+        .then(response => this.processLoadResponse(response))
+        .catch(() => {
+          this.set("noResultsHelp", I18n.t("bookmarks.list_permission_denied"));
+        })
+        .finally(() =>
+          this.setProperties({
+            loadingMore: false
+          })
+        );
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/models/bookmark.js b/app/assets/javascripts/discourse/models/bookmark.js
index 1997ab632c..8a8c09f35f 100644
--- a/app/assets/javascripts/discourse/models/bookmark.js
+++ b/app/assets/javascripts/discourse/models/bookmark.js
@@ -117,6 +117,22 @@ const Bookmark = RestModel.extend({
 
   loadItems() {
     return ajax(`/u/${this.user.username}/bookmarks.json`, { cache: "false" });
+  },
+
+  loadMore() {
+    if (!this.more_bookmarks_url) {
+      return Promise.resolve();
+    }
+
+    let moreUrl = this.more_bookmarks_url;
+    if (moreUrl) {
+      let [url, params] = moreUrl.split("?");
+      moreUrl = url;
+      if (params) {
+        moreUrl += "?" + params;
+      }
+    }
+    return ajax({ url: moreUrl });
   }
 });
 
diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
index 228490bfa4..92c9979b54 100644
--- a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
@@ -2,50 +2,53 @@
   <div class='alert alert-info'>{{noResultsHelp}}</div>
 {{else}}
   {{#conditional-loading-spinner condition=loading}}
-  <table class="topic-list">
-    <thead>
-      <th>{{i18n "topic.title"}}</th>
-      <th>{{i18n "post.bookmarks.created"}}</th>
-      <th>{{i18n "activity"}}</th>
-      <th>&nbsp;</th>
-    </thead>
-    <tbody>
-    {{#each content as |bookmark|}}
-      <tr class="topic-list-item bookmark-list-item">
-        <td class="main-link">
-          <span class="link-top-line">
-            <div class="bookmark-metadata">
-              {{#if bookmark.name}}
-                <span class="bookmark-metadata-item">
-                  {{d-icon "info-circle"}}{{bookmark.name}}
-                </span>
-              {{/if}}
-              {{#if bookmark.reminder_at}}
-                <span class="bookmark-metadata-item">
-                  {{d-icon "far-clock"}}{{bookmark.formattedReminder}}
-                </span>
-              {{/if}}
-            </div>
+    {{#load-more selector=".bookmark-list tr" action=(action "loadMore")}}
+      <table class="topic-list bookmark-list">
+        <thead>
+          <th>{{i18n "topic.title"}}</th>
+          <th>{{i18n "post.bookmarks.created"}}</th>
+          <th>{{i18n "activity"}}</th>
+          <th>&nbsp;</th>
+        </thead>
+        <tbody>
+        {{#each content as |bookmark|}}
+          <tr class="topic-list-item bookmark-list-item">
+            <td class="main-link">
+              <span class="link-top-line">
+                <div class="bookmark-metadata">
+                  {{#if bookmark.name}}
+                    <span class="bookmark-metadata-item">
+                      {{d-icon "info-circle"}}{{bookmark.name}}
+                    </span>
+                  {{/if}}
+                  {{#if bookmark.reminder_at}}
+                    <span class="bookmark-metadata-item">
+                      {{d-icon "far-clock"}}{{bookmark.formattedReminder}}
+                    </span>
+                  {{/if}}
+                </div>
 
-            {{topic-status topic=bookmark}}
-            {{topic-link bookmark}}
-          </span>
-          {{#if bookmark.excerpt}}
-          <p class="post-excerpt">{{html-safe bookmark.excerpt}}</p>
-          {{/if}}
-          <div class="link-bottom-line">
-            {{category-link bookmark.category}}
-            {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
-         </div>
-        </td>
-        <td>{{format-date bookmark.created_at format="tiny"}}</td>
-        {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
-        <td>
-          {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
-        </td>
-      </tr>
-    {{/each}}
-    </tbody>
-  </table>
+                {{topic-status topic=bookmark}}
+                {{topic-link bookmark}}
+              </span>
+              {{#if bookmark.excerpt}}
+              <p class="post-excerpt">{{html-safe bookmark.excerpt}}</p>
+              {{/if}}
+              <div class="link-bottom-line">
+                {{category-link bookmark.category}}
+                {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
+             </div>
+            </td>
+            <td>{{format-date bookmark.created_at format="tiny"}}</td>
+            {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
+            <td>
+              {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
+            </td>
+          </tr>
+        {{/each}}
+        </tbody>
+      </table>
+      {{conditional-loading-spinner condition=loadingMore}}
+    {{/load-more}}
   {{/conditional-loading-spinner}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
index b63c2b527b..7bbae63198 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
+++ b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
@@ -62,6 +62,8 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
         limit: this.estimateItemLimit()
       }
     }).then(result => {
+      result = result.user_bookmark_list;
+
       // The empty state help text for bookmarks page is localized on the
       // server.
       if (result.no_results_help) {
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 15e36dd9d1..81eeddab05 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1404,15 +1404,18 @@ class UsersController < ApplicationController
 
     respond_to do |format|
       format.json do
-        bookmarks = BookmarkQuery.new(user: user, guardian: guardian, params: params).list_all
+        bookmark_list = UserBookmarkList.new(user: user, guardian: guardian, params: params)
+        bookmark_list.load
 
-        if bookmarks.empty?
+        if bookmark_list.bookmarks.empty?
           render json: {
             bookmarks: [],
             no_results_help: I18n.t("user_activity.no_bookmarks.self")
           }
         else
-          render_serialized(bookmarks, UserBookmarkSerializer, root: 'bookmarks')
+          page = params[:page].to_i + 1
+          bookmark_list.more_bookmarks_url = "#{Discourse.base_path}/u/#{params[:username]}/bookmarks.json?page=#{page}"
+          render_serialized(bookmark_list, UserBookmarkListSerializer)
         end
       end
       format.ics do
diff --git a/app/models/user.rb b/app/models/user.rb
index 284f15c788..4ae0f86cc0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -14,6 +14,7 @@ class User < ActiveRecord::Base
   has_many :tag_users, dependent: :destroy
   has_many :user_api_keys, dependent: :destroy
   has_many :topics
+  has_many :bookmarks
 
   # dependent deleting handled via before_destroy
   has_many :user_actions
diff --git a/app/models/user_bookmark_list.rb b/app/models/user_bookmark_list.rb
new file mode 100644
index 0000000000..3c5a00280f
--- /dev/null
+++ b/app/models/user_bookmark_list.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class UserBookmarkList
+  include ActiveModel::Serialization
+
+  PER_PAGE = 20
+
+  attr_reader :bookmarks
+  attr_accessor :more_bookmarks_url
+
+  def initialize(user: user, guardian: guardian, params: params)
+    @user = user
+    @guardian = guardian
+    @params = params.merge(per_page: PER_PAGE)
+    @bookmarks = []
+  end
+
+  def load
+    @bookmarks = BookmarkQuery.new(user: @user, guardian: @guardian, params: @params).list_all
+    @bookmarks
+  end
+
+  def per_page
+    @per_page ||= PER_PAGE
+  end
+end
diff --git a/app/serializers/user_bookmark_list_serializer.rb b/app/serializers/user_bookmark_list_serializer.rb
new file mode 100644
index 0000000000..4e82e44b17
--- /dev/null
+++ b/app/serializers/user_bookmark_list_serializer.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class UserBookmarkListSerializer < ApplicationSerializer
+  attributes :more_bookmarks_url
+
+  has_many :bookmarks, serializer: UserBookmarkSerializer, embed: :objects
+
+  def include_more_bookmarks_url?
+    object.bookmarks.size == object.per_page
+  end
+end
diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
index b55e8eb8b6..45442c211f 100644
--- a/lib/bookmark_query.rb
+++ b/lib/bookmark_query.rb
@@ -22,6 +22,8 @@ class BookmarkQuery
     @user = user
     @params = params
     @guardian = guardian || Guardian.new(@user)
+    @page = @params[:page].to_i
+    @limit = @params[:limit].present? ? @params[:limit].to_i : @params[:per_page]
   end
 
   def list_all
@@ -34,10 +36,12 @@ class BookmarkQuery
 
     results = results.merge(Post.secured(@guardian))
 
-    if @params[:limit]
-      results = results.limit(@params[:limit])
+    if @page.positive?
+      results = results.offset(@page * @params[:per_page])
     end
 
+    results = results.limit(@limit)
+
     if BookmarkQuery.preloaded_custom_fields.any?
       Topic.preload_custom_fields(
         results.map(&:topic), BookmarkQuery.preloaded_custom_fields
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 561eaeb12d..59f705f8eb 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -4198,7 +4198,7 @@ describe UsersController do
       sign_in(user)
       get "/u/#{user.username}/bookmarks.json"
       expect(response.status).to eq(200)
-      expect(JSON.parse(response.body)['bookmarks'].map { |b| b['id'] }).to match_array([bookmark1.id, bookmark2.id])
+      expect(JSON.parse(response.body)['user_bookmark_list']['bookmarks'].map { |b| b['id'] }).to match_array([bookmark1.id, bookmark2.id])
     end
 
     it "does not show another user's bookmarks" do

From debed81022e84de634ae85a47ec78f0b0772a44b Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 1 Apr 2020 15:04:04 +1000
Subject: [PATCH 373/633] Get rid of named param double reference in
 UserBookmarkList

---
 app/models/user_bookmark_list.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user_bookmark_list.rb b/app/models/user_bookmark_list.rb
index 3c5a00280f..df885e609d 100644
--- a/app/models/user_bookmark_list.rb
+++ b/app/models/user_bookmark_list.rb
@@ -8,7 +8,7 @@ class UserBookmarkList
   attr_reader :bookmarks
   attr_accessor :more_bookmarks_url
 
-  def initialize(user: user, guardian: guardian, params: params)
+  def initialize(user:, guardian:, params:)
     @user = user
     @guardian = guardian
     @params = params.merge(per_page: PER_PAGE)

From a098464af3dcf60fa461071fc33a176203ef8227 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 1 Apr 2020 16:40:55 +1100
Subject: [PATCH 374/633] FIX: ninja edit for replies not working

There is an edge case, in some cases when pulling a post from the store
there is no topic, this ensures it is loaded correctly.
---
 .../javascripts/discourse/models/composer.js   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 1b1fd0ace3..0f6d9ae620 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -769,11 +769,23 @@ const Composer = RestModel.extend({
           composer.setProperties({
             reply: post.raw,
             originalText: post.raw,
-            post: post,
-            topic: post.topic
+            post: post
           });
 
-          composer.appEvents.trigger("composer:reply-reloaded", composer);
+          promise = Promise.resolve();
+          // edge case ... make a post then edit right away
+          // store does not have topic for the post
+          if (composer.topic && composer.topic.id === post.topic_id) {
+            // nothing to do ... we have the right topic
+          } else {
+            promise = this.store.find("topic", post.topic_id).then(topic => {
+              this.set("topic", topic);
+            });
+          }
+
+          return promise.then(() => {
+            composer.appEvents.trigger("composer:reply-reloaded", composer);
+          });
         })
       );
     } else if (opts.action === REPLY && opts.quote) {

From acc16dada3af735bd185c485bdd2a860e32f2911 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 1 Apr 2020 17:44:18 +1100
Subject: [PATCH 375/633] DEV: post fixture mismatching topic fixture

post 398 belongs to a non PM topic, use a unique id for this PM topic
---
 test/javascripts/fixtures/post.js  | 63 ++++++++++++++++++++++++++++++
 test/javascripts/fixtures/topic.js |  2 +-
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/test/javascripts/fixtures/post.js b/test/javascripts/fixtures/post.js
index 4cbed4acae..bed4d1b461 100644
--- a/test/javascripts/fixtures/post.js
+++ b/test/javascripts/fixtures/post.js
@@ -1,4 +1,67 @@
 export default {
+  "/posts/98737532": {
+    id: 98737532,
+    name: null,
+    username: "tim.lange",
+    avatar_template: "/images/avatar.png",
+    created_at: "2019-03-28T07:57:50.527Z",
+    cooked: "<p>I am writing this private message to you</p>",
+    ignored: false,
+    post_number: 1,
+    post_type: 1,
+    updated_at: "2019-03-28T07:57:50.527Z",
+    reply_count: 0,
+    reply_to_post_number: null,
+    quote_count: 0,
+    incoming_link_count: 0,
+    reads: 2,
+    score: 1.15,
+    yours: true,
+    topic_id: 34,
+    topic_slug: "test-pm",
+    display_username: null,
+    primary_group_name: null,
+    primary_group_flair_url: null,
+    primary_group_flair_bg_color: null,
+    primary_group_flair_color: null,
+    version: 1,
+    can_edit: true,
+    can_delete: false,
+    can_recover: null,
+    can_wiki: true,
+    read: true,
+    user_title: null,
+    actions_summary: [
+      {
+        id: 3,
+        can_act: true
+      },
+      {
+        id: 4,
+        can_act: true
+      },
+      {
+        id: 8,
+        can_act: true
+      },
+      {
+        id: 7,
+        can_act: true
+      }
+    ],
+    moderator: false,
+    admin: true,
+    staff: true,
+    user_id: 1,
+    hidden: false,
+    trust_level: 1,
+    deleted_at: null,
+    user_deleted: false,
+    edit_reason: null,
+    can_view_edit_history: true,
+    wiki: false
+  },
+
   "/posts/398": {
     id: 398,
     name: "Uwe Keim",
diff --git a/test/javascripts/fixtures/topic.js b/test/javascripts/fixtures/topic.js
index b4c79e2fd6..7c380de3a0 100644
--- a/test/javascripts/fixtures/topic.js
+++ b/test/javascripts/fixtures/topic.js
@@ -4749,7 +4749,7 @@ export default {
     post_stream: {
       posts: [
         {
-          id: 398,
+          id: 98737532,
           name: null,
           username: "tim.lange",
           avatar_template: "/images/avatar.png",

From b2f30aa0b5dee1b481f62d212819985930f6a851 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 1 Apr 2020 09:20:45 -0300
Subject: [PATCH 376/633] FIX: FlagSockpuppets should not flag a post if a post
 of that user was already rejected by staff (#9328)

* FIX: FlagSockpuppets should not flag a post if a post of that user was already rejected by staff

* Update spec/services/flag_sockpuppets_spec.rb

Co-Authored-By: Robin Ward <robin.ward@gmail.com>

Co-authored-by: Robin Ward <robin.ward@gmail.com>
---
 app/services/spam_rule/flag_sockpuppets.rb | 21 ++++++++++++++------
 spec/services/flag_sockpuppets_spec.rb     | 23 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/services/spam_rule/flag_sockpuppets.rb b/app/services/spam_rule/flag_sockpuppets.rb
index 26c53ff120..1bc930b48c 100644
--- a/app/services/spam_rule/flag_sockpuppets.rb
+++ b/app/services/spam_rule/flag_sockpuppets.rb
@@ -19,8 +19,6 @@ class SpamRule::FlagSockpuppets
 
   def reply_is_from_sockpuppet?
     return false if @post.try(:post_number) == 1
-
-    first_post = @post.topic.posts.by_post_number.first
     return false if first_post.user.nil?
 
     !first_post.user.staff? &&
@@ -41,11 +39,22 @@ class SpamRule::FlagSockpuppets
       locale: SiteSetting.default_locale
     )
 
-    PostActionCreator.create(Discourse.system_user, @post, :spam, message: message)
+    flag_post(@post, message)
 
-    if (first_post = @post.topic.posts.by_post_number.first).try(:user).try(:new_user?)
-      PostActionCreator.create(Discourse.system_user, first_post, :spam, message: message)
-    end
+    flag_post(first_post, message) if first_post&.user&.new_user?
+  end
+
+  private
+
+  def flag_post(post, message)
+    can_trust_user = ReviewableFlaggedPost.where(status: Reviewable.statuses[:rejected], target_created_by: post.user).exists?
+    return if can_trust_user
+
+    PostActionCreator.create(Discourse.system_user, post, :spam, message: message)
+  end
+
+  def first_post
+    @first_post ||= @post.topic.posts.by_post_number.first
   end
 
 end
diff --git a/spec/services/flag_sockpuppets_spec.rb b/spec/services/flag_sockpuppets_spec.rb
index 985d8fc5b9..cebb398a21 100644
--- a/spec/services/flag_sockpuppets_spec.rb
+++ b/spec/services/flag_sockpuppets_spec.rb
@@ -150,5 +150,28 @@ describe SpamRule::FlagSockpuppets do
       expect(PostAction.where(user: system, post: post2, post_action_type_id: spam).exists?).to eq(true)
       expect(PostAction.where(user: system, post: post1, post_action_type_id: spam).exists?).to eq(false)
     end
+
+    it "doesn't flag the first post if it was already rejected by staff before" do
+      flagged_post = Fabricate(
+        :reviewable_flagged_post,
+        target: post1, status: Reviewable.statuses[:rejected], target_created_by: post1.user
+      )
+
+      described_class.new(post2).perform
+
+      expect(flagged_post.reload.status).to eq(Reviewable.statuses[:rejected])
+    end
+
+    it "doesn't flag the post if another post of the same user was rejected by staff before" do
+      another_post = Fabricate(:post, user: user1)
+      flagged_post = Fabricate(
+        :reviewable_flagged_post,
+        target: another_post, status: Reviewable.statuses[:rejected], target_created_by: another_post.user
+      )
+
+      described_class.new(post2).perform
+
+      expect(ReviewableFlaggedPost.where(target_created_by: user1).count).to eq(1)
+    end
   end
 end

From 689c61b46205d670e8df03bce7a88f10f93b4ea2 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 1 Apr 2020 08:36:50 -0500
Subject: [PATCH 377/633] DEV: Allow plugins to add wizard steps after specific
 steps (#9315)

---
 .../wizard/components/wizard-step.js          |  5 ++
 .../templates/components/wizard-step.hbs      | 14 +++---
 lib/wizard.rb                                 | 21 ++++++--
 spec/components/wizard/wizard_spec.rb         | 50 +++++++++++++++++++
 4 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/wizard/components/wizard-step.js b/app/assets/javascripts/wizard/components/wizard-step.js
index 7884a27005..dd36c58891 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js
+++ b/app/assets/javascripts/wizard/components/wizard-step.js
@@ -61,6 +61,11 @@ export default Component.extend({
     return getUrl(`/images/wizard/${src}`);
   },
 
+  @discourseComputed("step.id")
+  bannerAndDescriptionClass(id) {
+    return `wizard-banner-and-description wizard-banner-and-description-${id}`;
+  },
+
   @observes("step.id")
   _stepChanged() {
     this.set("saving", false);
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 4f0686acf7..67f9b50e5f 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -3,13 +3,15 @@
     <h1 class='wizard-step-title'>{{step.title}}</h1>
   {{/if}}
 
-  {{#if bannerImage}}
-    <img src={{bannerImage}} class="wizard-step-banner">
-  {{/if}}
+  <div class={{bannerAndDescriptionClass}}>
+    {{#if bannerImage}}
+      <img src={{bannerImage}} class="wizard-step-banner">
+    {{/if}}
 
-  {{#if step.description}}
-    <p class='wizard-step-description'>{{html-safe step.description}}</p>
-  {{/if}}
+    {{#if step.description}}
+      <p class='wizard-step-description'>{{html-safe step.description}}</p>
+    {{/if}}
+  </div>
 
   {{#wizard-step-form step=step}}
     {{#each step.fields as |field|}}
diff --git a/lib/wizard.rb b/lib/wizard.rb
index f334081444..c58d652e48 100644
--- a/lib/wizard.rb
+++ b/lib/wizard.rb
@@ -18,15 +18,30 @@ class Wizard
     Step.new(step_name)
   end
 
-  def append_step(step)
+  def append_step(step, after: nil)
     return if @@excluded_steps.include?(step)
 
     step = create_step(step) if step.is_a?(String)
-
     yield step if block_given?
 
-    last_step = @steps.last
+    if after
+      before_step = @steps.detect { |s| s.id == after }
 
+      if before_step
+        step.previous = before_step
+        step.index = before_step.index + 1
+        if before_step.next
+          step.next = before_step.next
+          before_step.next.previous = step
+        end
+        before_step.next = step
+        @steps.insert(before_step.index + 1, step)
+        step.index += 1 while (step = step.next)
+        return
+      end
+    end
+
+    last_step = @steps.last
     @steps << step
 
     # If it's the first step
diff --git a/spec/components/wizard/wizard_spec.rb b/spec/components/wizard/wizard_spec.rb
index 0faef40829..74fddb113d 100644
--- a/spec/components/wizard/wizard_spec.rb
+++ b/spec/components/wizard/wizard_spec.rb
@@ -81,6 +81,56 @@ describe Wizard do
     end
   end
 
+  describe "#append_step with after specified" do
+    let(:user) { Fabricate.build(:moderator) }
+    let(:wizard) { Wizard.new(user) }
+
+    it 'inserts steps after the proper step' do
+      wizard.append_step('first') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('second') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('actually-second', after: 'first') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+
+      expect(wizard.steps.sort_by(&:index).map(&:id)).to eq(["first", "actually-second", "second"])
+      expect(wizard.steps.map(&:index).sort).to eq([0, 1, 2])
+    end
+
+    it 'inserts steps at the end if the after value does not match an existing step' do
+      wizard.append_step('first') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('second') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('should_be_last', after: 'abcdefghi') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+
+      expect(wizard.steps.sort_by(&:index).map(&:id)).to eq(["first", "second", "should_be_last"])
+      expect(wizard.steps.map(&:index).sort).to eq([0, 1, 2])
+    end
+
+    it 'inserts steps at the end' do
+      wizard.append_step('first') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('second') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('last', after: 'second') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+
+      expect(wizard.steps.sort_by(&:index).map(&:id)).to eq(["first", "second", "last"])
+      expect(wizard.steps.map(&:index).sort).to eq([0, 1, 2])
+    end
+  end
+
   describe "completed?" do
     let(:user) { Fabricate.build(:moderator) }
     let(:wizard) { Wizard.new(user) }

From 0d646d1a265179854dbf54fccc58639966b82050 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2020 11:31:14 -0400
Subject: [PATCH 378/633] Build(deps-dev): Bump rubocop from 0.80.1 to 0.81.0
 (#9330)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.80.1 to 0.81.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.80.1...v0.81.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 75aa846e21..b76e9ec387 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -340,14 +340,14 @@ GEM
       rspec-support (~> 3.8)
     rspec-support (3.9.2)
     rtlit (0.0.5)
-    rubocop (0.80.1)
+    rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-discourse (2.0.1)
       rubocop (>= 0.69.0)
     rubocop-rspec (1.38.1)
@@ -406,7 +406,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
     unicorn (5.5.4)
       kgio (~> 2.6)
       raindrops (~> 0.7)

From 13b4eb9ccef99779f76eca846cd0b493f61f4c59 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 31 Mar 2020 15:07:52 +0200
Subject: [PATCH 379/633] FIX: Restore failed if schema contained objects not
 owned by the current DB user

---
 lib/backup_restore.rb          | 10 ++++++----
 lib/backup_restore/backuper.rb |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/backup_restore.rb b/lib/backup_restore.rb
index 4775fdd612..4d75734c27 100644
--- a/lib/backup_restore.rb
+++ b/lib/backup_restore.rb
@@ -83,12 +83,14 @@ module BackupRestore
   end
 
   def self.move_tables_between_schemas(source, destination)
+    owner = database_configuration.username
+
     ActiveRecord::Base.transaction do
-      DB.exec(move_tables_between_schemas_sql(source, destination))
+      DB.exec(move_tables_between_schemas_sql(source, destination, owner))
     end
   end
 
-  def self.move_tables_between_schemas_sql(source, destination)
+  def self.move_tables_between_schemas_sql(source, destination, owner)
     <<~SQL
       DO $$DECLARE row record;
       BEGIN
@@ -97,13 +99,13 @@ module BackupRestore
         -- otherwise extensions (like hstore & pg_trgm) won't work anymore...
         CREATE SCHEMA IF NOT EXISTS #{destination};
         -- move all <source> tables to <destination> schema
-        FOR row IN SELECT tablename FROM pg_tables WHERE schemaname = '#{source}'
+        FOR row IN SELECT tablename FROM pg_tables WHERE schemaname = '#{source}'  AND tableowner = '#{owner}'
         LOOP
           EXECUTE 'DROP TABLE IF EXISTS #{destination}.' || quote_ident(row.tablename) || ' CASCADE;';
           EXECUTE 'ALTER TABLE #{source}.' || quote_ident(row.tablename) || ' SET SCHEMA #{destination};';
         END LOOP;
         -- move all <source> views to <destination> schema
-        FOR row IN SELECT viewname FROM pg_views WHERE schemaname = '#{source}'
+        FOR row IN SELECT viewname FROM pg_views WHERE schemaname = '#{source}' AND viewowner = '#{owner}'
         LOOP
           EXECUTE 'DROP VIEW IF EXISTS #{destination}.' || quote_ident(row.viewname) || ' CASCADE;';
           EXECUTE 'ALTER VIEW #{source}.' || quote_ident(row.viewname) || ' SET SCHEMA #{destination};';
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index ae7cee8696..dd4f81c72e 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -194,6 +194,7 @@ module BackupRestore
       [ password_argument,            # pass the password to pg_dump (if any)
         "pg_dump",                    # the pg_dump command
         "--schema=public",            # only public schema
+        "-T public.pg_*",             # exclude tables and views whose name starts with "pg_"
         "--file='#{@dump_filename}'", # output to the dump.sql file
         "--no-owner",                 # do not output commands to set ownership of objects
         "--no-privileges",            # prevent dumping of access privileges

From 32e14045c493dba8e9d4065a6add201a5993f626 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Wed, 1 Apr 2020 09:27:14 -0700
Subject: [PATCH 380/633] UX: use color variable for background of shortcut
 keys

---
 .../stylesheets/common/components/keyboard_shortcuts.scss       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index e74397664b..303acbdd65 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -51,7 +51,7 @@
     }
 
     span {
-      background: #f2f2f2;
+      background: $primary-very-low;
       border-radius: 3px;
       display: inline-flex;
       margin: 0 6px;

From 65d9a9c1ce56554a4af00552fbbfe8011bce5aee Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 1 Apr 2020 13:30:38 -0500
Subject: [PATCH 381/633] DEV: Create wizard-field-checkboxes component (#9333)

---
 .../components/wizard-field-checkboxes.js     | 33 +++++++++++++++++++
 .../components/wizard-field-checkboxes.hbs    | 11 +++++++
 2 files changed, 44 insertions(+)
 create mode 100644 app/assets/javascripts/wizard/components/wizard-field-checkboxes.js
 create mode 100644 app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs

diff --git a/app/assets/javascripts/wizard/components/wizard-field-checkboxes.js b/app/assets/javascripts/wizard/components/wizard-field-checkboxes.js
new file mode 100644
index 0000000000..8c814f5859
--- /dev/null
+++ b/app/assets/javascripts/wizard/components/wizard-field-checkboxes.js
@@ -0,0 +1,33 @@
+import Component from "@ember/component";
+import { set } from "@ember/object";
+
+export default Component.extend({
+  init(...args) {
+    this._super(...args);
+    this.set("field.value", this.field.value || []);
+
+    for (let choice of this.field.choices) {
+      if (this.field.value.includes(choice.id)) {
+        set(choice, "checked", true);
+      }
+    }
+  },
+  actions: {
+    changed(checkbox) {
+      let newFieldValue = this.field.value;
+      const checkboxValue = checkbox.parentElement
+        .getAttribute("value")
+        .toLowerCase();
+
+      if (checkbox.checked) {
+        newFieldValue.push(checkboxValue);
+      } else {
+        const index = newFieldValue.indexOf(checkboxValue);
+        if (index > -1) {
+          newFieldValue.splice(index, 1);
+        }
+      }
+      this.set("field.value", newFieldValue);
+    }
+  }
+});
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs
new file mode 100644
index 0000000000..25aeadbbde
--- /dev/null
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs
@@ -0,0 +1,11 @@
+{{#each field.choices as |c|}}
+  <div class="checkbox-field-choice {{fieldClass}}">
+    <label id={{c.id}} value={{c.label}}>
+      {{input type="checkbox"
+            class="wizard-checkbox"
+            click=(action "changed" value="target")
+            checked=c.checked}}
+      {{c.label}}
+    </label>
+  </div>
+{{/each}}

From b82f6098ce02720acfca93989eac000362ccb292 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 1 Apr 2020 15:18:30 -0400
Subject: [PATCH 382/633] UX: Remove share as link fallback on touch devices
 (#9332)

---
 .../discourse/components/share-panel.js       | 33 +++++--------------
 .../discourse/components/share-popup.js       | 26 ++++++---------
 .../templates/components/share-panel.hbs      |  1 -
 .../templates/components/share-popup.hbs      |  1 -
 .../stylesheets/common/base/share_link.scss   | 14 --------
 .../components/share-and-invite-modal.scss    |  8 -----
 6 files changed, 18 insertions(+), 65 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/share-panel.js b/app/assets/javascripts/discourse/components/share-panel.js
index 78bc76db23..00bfd41082 100644
--- a/app/assets/javascripts/discourse/components/share-panel.js
+++ b/app/assets/javascripts/discourse/components/share-panel.js
@@ -1,10 +1,10 @@
 import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { escapeExpression } from "discourse/lib/utilities";
 import discourseComputed from "discourse-common/utils/decorators";
 import Sharing from "discourse/lib/sharing";
+import { later } from "@ember/runloop";
 
 export default Component.extend({
   tagName: null,
@@ -43,31 +43,14 @@ export default Component.extend({
 
   didInsertElement() {
     this._super(...arguments);
-
-    const shareUrl = this.shareUrl;
-    const $linkInput = $(this.element.querySelector(".topic-share-url"));
-    const $linkForTouch = $(
-      this.element.querySelector(".topic-share-url-for-touch a")
-    );
-
-    schedule("afterRender", () => {
-      if (!this.capabilities.touch) {
-        $linkForTouch.parent().remove();
-
-        $linkInput
-          .val(shareUrl)
-          .select()
-          .focus();
-      } else {
-        $linkInput.remove();
-
-        $linkForTouch.attr("href", shareUrl).text(shareUrl);
-
-        const range = window.document.createRange();
-        range.selectNode($linkForTouch[0]);
-        window.getSelection().addRange(range);
+    later(() => {
+      if (this.element) {
+        const textArea = this.element.querySelector(".topic-share-url");
+        textArea.style.height = textArea.scrollHeight + "px";
+        textArea.focus();
+        textArea.setSelectionRange(0, this.shareUrl.length);
       }
-    });
+    }, 200);
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/share-popup.js b/app/assets/javascripts/discourse/components/share-popup.js
index ca86058b73..9a9db6a494 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js
+++ b/app/assets/javascripts/discourse/components/share-popup.js
@@ -1,5 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { bind, scheduleOnce } from "@ember/runloop";
+import { bind, scheduleOnce, later } from "@ember/runloop";
 import Component from "@ember/component";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { longDateNoYear } from "discourse/lib/formatter";
@@ -35,21 +35,15 @@ export default Component.extend({
   },
 
   _focusUrl() {
-    const link = this.link;
-    if (!this.capabilities.touch) {
-      const $linkInput = $("#share-link input");
-      $linkInput.val(link);
-
-      // Wait for the fade-in transition to finish before selecting the link:
-      window.setTimeout(() => $linkInput.select().focus(), 160);
-    } else {
-      const $linkForTouch = $("#share-link .share-for-touch a");
-      $linkForTouch.attr("href", link);
-      $linkForTouch.text(link);
-      const range = window.document.createRange();
-      range.selectNode($linkForTouch[0]);
-      window.getSelection().addRange(range);
-    }
+    // Wait for the fade-in transition to finish before selecting the link:
+    later(() => {
+      if (this.element) {
+        const linkInput = this.element.querySelector("#share-link input");
+        linkInput.value = this.link;
+        linkInput.setSelectionRange(0, this.link.length);
+        linkInput.focus();
+      }
+    }, 200);
   },
 
   _showUrl($target, url) {
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index 1808d6cc1f..1f33acbe3c 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -4,7 +4,6 @@
 
 <div class="body">
   {{textarea value=shareUrl class="topic-share-url"}}
-  <div class="topic-share-url-for-touch"><a></a></div>
 
   <div class="sources">
     {{#each sources as |source|}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index c61f43cf64..4a40880ebf 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -8,7 +8,6 @@
 
 <div>
   <input type="text">
-  <div class="share-for-touch"><div class="overflow-ellipsis"><a></a></div></div>
 </div>
 
 <div class="actions">
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index 6f5e4f69dc..20b15d756e 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -15,12 +15,6 @@
   input[type="text"] {
     width: 100%;
   }
-  .share-for-touch .overflow-ellipsis {
-    clear: both;
-  }
-  .share-for-touch {
-    margin: 14px 0;
-  }
 
   .title {
     margin-bottom: s(1);
@@ -107,11 +101,3 @@
     }
   }
 }
-
-.discourse-no-touch #share-link .share-for-touch {
-  display: none;
-}
-
-.discourse-touch #share-link input[type="text"] {
-  display: none;
-}
diff --git a/app/assets/stylesheets/common/components/share-and-invite-modal.scss b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
index 827448b45a..624109f9ba 100644
--- a/app/assets/stylesheets/common/components/share-and-invite-modal.scss
+++ b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
@@ -44,14 +44,6 @@
       box-sizing: border-box;
     }
 
-    .topic-share-url-for-touch {
-      a {
-        word-break: break-all;
-        font-size: $font-up-1;
-      }
-    }
-
-    .topic-share-url-for-touch,
     .topic-share-url {
       margin-bottom: s(2);
     }

From 90fcede832f04c3824c9bf3c50b5e16f75e8e5bb Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 1 Apr 2020 15:42:36 -0400
Subject: [PATCH 383/633] FIX: replace default welcome topic post with new
 value from wizard

Previously the text entered in the wizard would be prepended onto the
default first paragraph.
---
 lib/introduction_updater.rb           |  9 ++++---
 spec/lib/introduction_updater_spec.rb | 38 +++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/lib/introduction_updater.rb b/lib/introduction_updater.rb
index b6c1a45966..dc2ffbe3a5 100644
--- a/lib/introduction_updater.rb
+++ b/lib/introduction_updater.rb
@@ -18,9 +18,12 @@ class IntroductionUpdater
 
     if previous_value != new_value
       revisor = PostRevisor.new(post)
-
-      remaining = post.raw.split("\n")[1..-1]
-      revisor.revise!(@user, raw: "#{new_value}\n#{remaining.join("\n")}")
+      if post.raw.chomp == I18n.t('discourse_welcome_topic.body', base_path: Discourse.base_path).chomp
+        revisor.revise!(@user, raw: new_value)
+      else
+        remaining = post.raw[previous_value.length..-1]
+        revisor.revise!(@user, raw: "#{new_value}#{remaining}")
+      end
     end
   end
 
diff --git a/spec/lib/introduction_updater_spec.rb b/spec/lib/introduction_updater_spec.rb
index 66f91a6341..49698e56e0 100644
--- a/spec/lib/introduction_updater_spec.rb
+++ b/spec/lib/introduction_updater_spec.rb
@@ -55,4 +55,42 @@ describe IntroductionUpdater do
       end
     end
   end
+
+  describe "update_summary" do
+    let(:welcome_topic) do
+      topic = Fabricate(:topic, title: I18n.t("discourse_welcome_topic.title"))
+      Fabricate(
+        :post,
+        topic: topic,
+        raw: I18n.t("discourse_welcome_topic.body", base_path: Discourse.base_path),
+        post_number: 1
+      )
+      topic
+    end
+
+    let(:first_post) { welcome_topic.posts.first }
+
+    let(:new_summary) { "Welcome to my new site. It's gonna be good." }
+
+    subject { IntroductionUpdater.new(Fabricate(:admin)).update_summary(new_summary) }
+
+    before do
+      SiteSetting.welcome_topic_id = welcome_topic.id
+    end
+
+    it "completely replaces post if it has default value" do
+      subject
+      expect {
+        expect(first_post.reload.raw).to eq(new_summary)
+      }.to_not change { welcome_topic.reload.category_id }
+    end
+
+    it "only replaces first paragraph if it has custom content" do
+      paragraph1 = "This is the summary of my community"
+      paragraph2 = "And this is something I added later"
+      first_post.update!(raw: [paragraph1, paragraph2].join("\n\n"))
+      subject
+      expect(first_post.reload.raw).to eq([new_summary, paragraph2].join("\n\n"))
+    end
+  end
 end

From cdaa60b56bb285b3458a3f0054bcaffd23f300de Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 1 Apr 2020 13:10:17 -0700
Subject: [PATCH 384/633] FEATURE: Allow admins to disable self-service account
 deletion

https://meta.discourse.org/t/-/146276
---
 app/models/user.rb                            |  2 +-
 config/locales/server.en.yml                  |  1 +
 config/site_settings.yml                      |  3 +++
 lib/guardian/user_guardian.rb                 |  2 +-
 .../components/guardian/user_guardian_spec.rb | 24 +++++++++++++++++++
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 4ae0f86cc0..562291438f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -233,7 +233,6 @@ class User < ActiveRecord::Base
     LAST_VISIT = -2
   end
 
-  MAX_SELF_DELETE_POST_COUNT ||= 1
   MAX_STAFF_DELETE_POST_COUNT ||= 5
 
   def self.max_password_length
@@ -1286,6 +1285,7 @@ class User < ActiveRecord::Base
 
   def has_more_posts_than?(max_post_count)
     return true if user_stat && (user_stat.topic_count + user_stat.post_count) > max_post_count
+    return true if max_post_count < 0
 
     DB.query_single(<<~SQL, user_id: self.id).first > max_post_count
       SELECT COUNT(1)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e3b8271e5d..410f545eba 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1952,6 +1952,7 @@ en:
     relative_date_duration: "Number of days after posting where post dates will be shown as relative (7d) instead of absolute (20 Feb)."
     delete_user_max_post_age: "Don't allow deleting users whose first post is older than (x) days."
     delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
+    delete_user_self_max_post_count: "The maximum number of posts a user can have while allowing self-service account deletion. Set to -1 to disable self-service account deletion."
     username_change_period: "The maximum number of days after registration that accounts can change their username (0 to disallow username change)."
     email_editable: "Allow users to change their e-mail address after registration."
     logout_redirect: "Location to redirect browser to after logout (eg: https://example.com/logout)"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 33501a4df4..018d7390cc 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -542,6 +542,9 @@ users:
     client: true
     default: 15
     min: 1
+  delete_user_self_max_post_count:
+    default: 1
+    min: -1
   redirect_users_to_top_page: true
   prioritize_username_in_ux:
     client: true
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 26e726437b..ecdff65838 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -62,7 +62,7 @@ module UserGuardian
     return false if user.nil? || user.admin?
     if is_me?(user)
       !SiteSetting.enable_sso &&
-      !user.has_more_posts_than?(User::MAX_SELF_DELETE_POST_COUNT)
+      !user.has_more_posts_than?(SiteSetting.delete_user_self_max_post_count)
     else
       is_staff? && (
         user.first_post_created_at.nil? ||
diff --git a/spec/components/guardian/user_guardian_spec.rb b/spec/components/guardian/user_guardian_spec.rb
index 12fbdd02a2..e870843549 100644
--- a/spec/components/guardian/user_guardian_spec.rb
+++ b/spec/components/guardian/user_guardian_spec.rb
@@ -303,6 +303,30 @@ describe UserGuardian do
         Fabricate(:post, user: user, topic: topic)
         expect(guardian.can_delete_user?(user)).to eq(false)
       end
+
+      it "isn't allowed when site admin blocked self deletion" do
+        expect(user.first_post_created_at).to be_nil
+
+        SiteSetting.delete_user_self_max_post_count = -1
+        expect(guardian.can_delete_user?(user)).to eq(false)
+      end
+
+      it "correctly respects the delete_user_self_max_post_count setting" do
+        SiteSetting.delete_user_self_max_post_count = 0
+        expect(guardian.can_delete_user?(user)).to eq(true)
+
+        Fabricate(:post, user: user)
+
+        expect(guardian.can_delete_user?(user)).to eq(false)
+        SiteSetting.delete_user_self_max_post_count = 1
+        expect(guardian.can_delete_user?(user)).to eq(true)
+
+        Fabricate(:post, user: user)
+
+        expect(guardian.can_delete_user?(user)).to eq(false)
+        SiteSetting.delete_user_self_max_post_count = 2
+        expect(guardian.can_delete_user?(user)).to eq(true)
+      end
     end
 
     context "for moderators" do

From cade4957ae2b6839557ea3a5b13fd247315d46c0 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 2 Apr 2020 10:21:57 +1100
Subject: [PATCH 385/633] DEV: don't use _ cause property is observed

Followup on fcc5ef96
---
 .../javascripts/select-kit/components/composer-actions.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 548a0ef701..6b82d66f97 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -20,7 +20,7 @@ export function _clearSnapshots() {
 }
 
 export default DropdownSelectBoxComponent.extend({
-  _seq: 0,
+  seq: 0,
   pluginApiIdentifiers: ["composer-actions"],
   classNames: ["composer-actions"],
 
@@ -31,7 +31,7 @@ export default DropdownSelectBoxComponent.extend({
   },
 
   contentChanged() {
-    this.set("_seq", this._seq + 1);
+    this.set("seq", this.seq + 1);
   },
 
   didReceiveAttrs() {
@@ -62,7 +62,7 @@ export default DropdownSelectBoxComponent.extend({
     return {};
   },
 
-  content: computed("_seq", function() {
+  content: computed("seq", function() {
     let items = [];
 
     if (

From 393215266f17cee97706d43e68b6ee9e58549dc1 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 2 Apr 2020 09:32:39 +1000
Subject: [PATCH 386/633] FIX: Set null high_priority columns to false in high
 priority notification migration (#9335)

Some DBs failed on this migration, possibly due to new records being added, with the error

ActiveRecord::NotNullViolation: PG::NotNullViolation: ERROR:  column "high_priority" contains null values

Luckily, the migration is retryable as is.
---
 ...0200329222246_add_high_priority_column_to_notifications.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb b/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
index 4bb5f39d1e..caae9309aa 100644
--- a/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
+++ b/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
@@ -22,6 +22,10 @@ class AddHighPriorityColumnToNotifications < ActiveRecord::Migration[6.0]
         ALTER TABLE notifications ALTER COLUMN high_priority SET DEFAULT FALSE;
       SQL
 
+      execute <<~SQL
+        UPDATE notifications SET high_priority = FALSE WHERE high_priority IS NULL;
+      SQL
+
       execute <<~SQL
         ALTER TABLE notifications ALTER COLUMN high_priority SET NOT NULL;
       SQL

From d261a809e2b4d7c24a4a3fd2790dab948a315e09 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 2 Apr 2020 09:57:48 +1000
Subject: [PATCH 387/633] FEATURE: Bookmark reminder type changes and bugfixes
 (#9329)

New Reminder Types
-------------------------------------

* Add a "later this week" reminder which is today + 2 days, will not show if we are on the days Thu-Sun
* Add a "start of next business week" reminder which is 8am Monday

Bugfixes and Tweaks
--------------------------------------

* Move dates out of translation for reminder types and yield HTML for tap-tile for more customizable content and styling
* Make sure double clicking the bookmark icon in quick access takes users to the new bookmarks-with-reminders page
* Sane default to 8am (start of day) for custom reminder with no time
---
 .../discourse/controllers/bookmark.js         | 95 ++++++++-----------
 .../templates/components/tap-tile.hbs         |  2 +-
 .../discourse/templates/modal/bookmark.hbs    | 48 ++++++++--
 .../discourse/widgets/user-menu.js            |  5 +-
 app/models/bookmark.rb                        |  4 +-
 config/locales/client.en.yml                  | 14 +--
 test/javascripts/controllers/bookmark-test.js | 84 ++++++++--------
 7 files changed, 139 insertions(+), 113 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 18a6112a25..c14329d253 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -3,7 +3,6 @@ import { Promise } from "rsvp";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { htmlSafe } from "@ember/template";
 import { ajax } from "discourse/lib/ajax";
 
 const START_OF_DAY_HOUR = 8;
@@ -17,7 +16,9 @@ const REMINDER_TYPES = {
   NEXT_MONTH: "next_month",
   CUSTOM: "custom",
   LAST_CUSTOM: "last_custom",
-  NONE: "none"
+  NONE: "none",
+  START_OF_NEXT_BUSINESS_WEEK: "start_of_next_business_week",
+  LATER_THIS_WEEK: "later_this_week"
 };
 
 export default Controller.extend(ModalFunctionality, {
@@ -115,60 +116,48 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
+  @discourseComputed()
+  showLaterThisWeek() {
+    return this.now().day() < 4; // 4 is Thursday
+  },
+
   @discourseComputed("parsedLastCustomReminderDatetime")
   lastCustomFormatted(parsedLastCustomReminderDatetime) {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.last_custom", {
-        date: parsedLastCustomReminderDatetime.format(
-          I18n.t("dates.long_no_year")
-        )
-      })
+    return parsedLastCustomReminderDatetime.format(
+      I18n.t("dates.long_no_year")
     );
   },
 
+  @discourseComputed()
+  startNextBusinessWeekFormatted() {
+    return this.nextWeek()
+      .day("Monday")
+      .format(I18n.t("dates.long_no_year"));
+  },
+
   @discourseComputed()
   laterTodayFormatted() {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.later_today", {
-        date: this.laterToday().format(I18n.t("dates.time"))
-      })
-    );
+    return this.laterToday().format(I18n.t("dates.time"));
   },
 
   @discourseComputed()
   tomorrowFormatted() {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.tomorrow", {
-        date: this.tomorrow().format(I18n.t("dates.time_short_day"))
-      })
-    );
-  },
-
-  @discourseComputed()
-  nextBusinessDayFormatted() {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.next_business_day", {
-        date: this.nextBusinessDay().format(I18n.t("dates.time_short_day"))
-      })
-    );
+    return this.tomorrow().format(I18n.t("dates.time_short_day"));
   },
 
   @discourseComputed()
   nextWeekFormatted() {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.next_week", {
-        date: this.nextWeek().format(I18n.t("dates.long_no_year"))
-      })
-    );
+    return this.nextWeek().format(I18n.t("dates.long_no_year"));
+  },
+
+  @discourseComputed()
+  laterThisWeekFormatted() {
+    return this.laterThisWeek().format(I18n.t("dates.time_short_day"));
   },
 
   @discourseComputed()
   nextMonthFormatted() {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.next_month", {
-        date: this.nextMonth().format(I18n.t("dates.long_no_year"))
-      })
-    );
+    return this.nextMonth().format(I18n.t("dates.long_no_year"));
   },
 
   @discourseComputed()
@@ -237,9 +226,17 @@ export default Controller.extend(ModalFunctionality, {
         return this.tomorrow();
       case REMINDER_TYPES.NEXT_WEEK:
         return this.nextWeek();
+      case REMINDER_TYPES.START_OF_NEXT_BUSINESS_WEEK:
+        return this.nextWeek().day("Monday");
+      case REMINDER_TYPES.LATER_THIS_WEEK:
+        return this.laterThisWeek();
       case REMINDER_TYPES.NEXT_MONTH:
         return this.nextMonth();
       case REMINDER_TYPES.CUSTOM:
+        this.set(
+          "customReminderTime",
+          this.customReminderTime || `0${START_OF_DAY_HOUR}:00`
+        );
         const customDateTime = this.parseCustomDateTime(
           this.customReminderDate,
           this.customReminderTime
@@ -265,23 +262,6 @@ export default Controller.extend(ModalFunctionality, {
     return this.startOfDay(this.now().add(1, "month"));
   },
 
-  nextBusinessDay() {
-    const currentDay = this.now().isoWeekday(); // 1=Mon, 7=Sun
-    let next = null;
-
-    // friday
-    if (currentDay === 5) {
-      next = this.now().add(3, "days");
-      // saturday
-    } else if (currentDay === 6) {
-      next = this.now().add(2, "days");
-    } else {
-      next = this.now().add(1, "day");
-    }
-
-    return this.startOfDay(next);
-  },
-
   tomorrow() {
     return this.startOfDay(this.now().add(1, "day"));
   },
@@ -301,6 +281,13 @@ export default Controller.extend(ModalFunctionality, {
       : later.add(30, "minutes").startOf("hour");
   },
 
+  laterThisWeek() {
+    if (!this.showLaterThisWeek) {
+      return;
+    }
+    return this.startOfDay(this.now().add(2, "days"));
+  },
+
   handleSaveError(e) {
     this.isSavingBookmarkManually = false;
     if (typeof e === "string") {
diff --git a/app/assets/javascripts/discourse/templates/components/tap-tile.hbs b/app/assets/javascripts/discourse/templates/components/tap-tile.hbs
index 4e04200945..df17a2fd98 100644
--- a/app/assets/javascripts/discourse/templates/components/tap-tile.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tap-tile.hbs
@@ -1,2 +1,2 @@
 {{d-icon icon}}
-{{text}}
+{{ yield }}
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 2fa0345732..5a1082c711 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -21,21 +21,51 @@
       {{#if userHasTimezoneSet}}
         {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
           {{#if showAtDesktop}}
-            {{tap-tile icon="desktop" text=(i18n "bookmarks.reminders.at_desktop") tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              {{i18n "bookmarks.reminders.at_desktop"}}
+            {{/tap-tile}}
           {{/if}}
 
           {{#if showLaterToday}}
-            {{tap-tile icon="far-moon" text=laterTodayFormatted tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              {{i18n "bookmarks.reminders.later_today"}}<br>
+              {{laterTodayFormatted}}
+            {{/tap-tile}}
           {{/if}}
-          {{tap-tile icon="briefcase" text=nextBusinessDayFormatted tileId=reminderTypes.NEXT_BUSINESS_DAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-          {{tap-tile icon="far-sun" text=tomorrowFormatted tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-          {{tap-tile icon="far-clock" text=nextWeekFormatted tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-          {{tap-tile icon="far-calendar-plus" text=nextMonthFormatted tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-          {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+          {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.tomorrow"}}<br>
+            {{tomorrowFormatted}}
+          {{/tap-tile}}
+          {{#if showLaterThisWeek}}
+            {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              {{i18n "bookmarks.reminders.later_this_week"}}<br>
+              {{laterThisWeekFormatted}}
+            {{/tap-tile}}
+          {{/if}}
+          {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.start_of_next_business_week"}}<br>
+            {{startNextBusinessWeekFormatted}}
+          {{/tap-tile}}
+          {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.next_week"}}<br>
+            {{nextWeekFormatted}}
+          {{/tap-tile}}
+          {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.next_month"}}<br>
+            {{nextMonthFormatted}}
+          {{/tap-tile}}
+          {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.custom"}}
+          {{/tap-tile}}
           {{#if showLastCustom}}
-            {{tap-tile icon="undo" text=lastCustomFormatted tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              {{i18n "bookmarks.reminders.last_custom"}}<br>
+              {{lastCustomFormatted}}
+            {{/tap-tile}}
           {{/if}}
-          {{tap-tile icon="ban" text=(I18n "bookmarks.reminders.none") tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+          {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.none"}}
+          {{/tap-tile}}
         {{/tap-tile-grid}}
         {{#if customDateTimeSelected}}
           <div class="control-group custom-date-time-wrap">
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js b/app/assets/javascripts/discourse/widgets/user-menu.js
index 6f4b5c323c..1198729726 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js
@@ -56,13 +56,16 @@ createWidget("user-menu-links", {
   },
 
   bookmarksGlyph() {
+    let path = this.siteSettings.enable_bookmarks_with_reminders
+      ? "bookmarks-with-reminders"
+      : "bookmarks";
     return {
       action: UserMenuAction.QUICK_ACCESS,
       actionParam: QuickAccess.BOOKMARKS,
       label: "user.bookmarks",
       className: "user-bookmarks-link",
       icon: "bookmark",
-      href: `${this.attrs.path}/activity/bookmarks`
+      href: `${this.attrs.path}/activity/${path}`
     };
   },
 
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 198895fa5c..f34e58c695 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -67,7 +67,9 @@ class Bookmark < ActiveRecord::Base
       tomorrow: 3,
       next_week: 4,
       next_month: 5,
-      custom: 6
+      custom: 6,
+      start_of_next_business_week: 7,
+      later_this_week: 8
     )
   end
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e9bbb29609..289e14161b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -316,13 +316,15 @@ en:
       list_permission_denied: "You do not have permission to view this user's bookmarks."
       reminders:
         at_desktop: "Next time I'm at my desktop"
-        later_today: "Later today <br/>{{date}}"
-        next_business_day: "Next business day <br/>{{date}}"
-        tomorrow: "Tomorrow <br/>{{date}}"
-        next_week: "Next week <br/>{{date}}"
-        next_month: "Next month <br/>{{date}}"
+        later_today: "Later today"
+        next_business_day: "Next business day"
+        tomorrow: "Tomorrow"
+        next_week: "Next week"
+        later_this_week: "Later this week"
+        start_of_next_business_week: "Next Monday"
+        next_month: "Next month"
         custom: "Custom date and time"
-        last_custom: "Last <br/>{{date}}"
+        last_custom: "Last"
         none: "No reminder needed"
 
     drafts:
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js
index c517ad2a89..84d323d382 100644
--- a/test/javascripts/controllers/bookmark-test.js
+++ b/test/javascripts/controllers/bookmark-test.js
@@ -6,6 +6,7 @@ moduleFor("controller:bookmark", {
   beforeEach() {
     logIn();
     BookmarkController = this.subject({ currentUser: User.current() });
+    BookmarkController.onShow();
   },
 
   afterEach() {
@@ -58,54 +59,34 @@ QUnit.test("nextMonth gets next month correctly", function(assert) {
   );
 });
 
-QUnit.test(
-  "nextBusinessDay gets next business day of monday correctly if today is friday",
-  function(assert) {
-    mockMomentTz("2019-12-13T08:00:00");
+QUnit.test("laterThisWeek gets 2 days from now", function(assert) {
+  mockMomentTz("2019-12-10T08:00:00");
 
-    assert.equal(
-      BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
-      "2019-12-16"
-    );
-  }
-);
+  assert.equal(
+    BookmarkController.laterThisWeek().format("YYYY-MM-DD"),
+    "2019-12-12"
+  );
+});
 
-QUnit.test(
-  "nextBusinessDay gets next business day of monday correctly if today is saturday",
-  function(assert) {
-    mockMomentTz("2019-12-14T08:00:00");
+QUnit.test("laterThisWeek returns null if we are at Thursday already", function(
+  assert
+) {
+  mockMomentTz("2019-12-12T08:00:00");
 
-    assert.equal(
-      BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
-      "2019-12-16"
-    );
-  }
-);
+  assert.equal(BookmarkController.laterThisWeek(), null);
+});
 
-QUnit.test(
-  "nextBusinessDay gets next business day of monday correctly if today is sunday",
-  function(assert) {
-    mockMomentTz("2019-12-15T08:00:00");
+QUnit.test("showLaterThisWeek returns true if < Thursday", function(assert) {
+  mockMomentTz("2019-12-10T08:00:00");
 
-    assert.equal(
-      BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
-      "2019-12-16"
-    );
-  }
-);
+  assert.equal(BookmarkController.showLaterThisWeek, true);
+});
 
-QUnit.test(
-  "nextBusinessDay gets next business day of thursday correctly if today is wednesday",
-  function(assert) {
-    mockMomentTz("2019-12-11T08:00:00");
-
-    assert.equal(
-      BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
-      "2019-12-12"
-    );
-  }
-);
+QUnit.test("showLaterThisWeek returns false if > Thursday", function(assert) {
+  mockMomentTz("2019-12-12T08:00:00");
 
+  assert.equal(BookmarkController.showLaterThisWeek, false);
+});
 QUnit.test("tomorrow gets tomorrow correctly", function(assert) {
   mockMomentTz("2019-12-11T08:00:00");
 
@@ -154,6 +135,27 @@ QUnit.test(
   }
 );
 
+QUnit.test(
+  "reminderAt - custom - defaults to 8:00am if the time is not selected",
+  function(assert) {
+    BookmarkController.customReminderDate = "2028-12-12";
+    BookmarkController.selectedReminderType =
+      BookmarkController.reminderTypes.CUSTOM;
+    const reminderAt = BookmarkController.reminderAt();
+    assert.equal(BookmarkController.customReminderTime, "08:00");
+    assert.equal(
+      reminderAt.toString(),
+      moment
+        .tz(
+          "2028-12-12 08:00",
+          BookmarkController.currentUser.resolvedTimezone()
+        )
+        .toString(),
+      "the custom date and time are parsed correctly with default time"
+    );
+  }
+);
+
 QUnit.test(
   "loadLastUsedCustomReminderDatetime fills the custom reminder date + time if present in localStorage",
   function(assert) {

From 37bf38f801408035c53faeb8667c445d6f5e48e6 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 2 Apr 2020 05:59:35 +0530
Subject: [PATCH 388/633] FIX: removing a timer with `duration` doesn't work.

---
 .../discourse/controllers/edit-topic-timer.js          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
index 461fa3c64d..926c2492b9 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
@@ -76,15 +76,15 @@ export default Controller.extend(ModalFunctionality, {
     return "true" === isPublic ? publicTopicTimer : privateTopicTimer;
   },
 
-  _setTimer(time, duration, statusType) {
+  _setTimer(time, duration, statusType, basedOnLastPost, categoryId) {
     this.set("loading", true);
 
     TopicTimer.updateStatus(
       this.get("model.id"),
       time,
-      this.get("topicTimer.based_on_last_post"),
+      basedOnLastPost,
       statusType,
-      this.get("topicTimer.category_id"),
+      categoryId,
       duration
     )
       .then(result => {
@@ -155,7 +155,9 @@ export default Controller.extend(ModalFunctionality, {
       this._setTimer(
         this.get("topicTimer.updateTime"),
         this.get("topicTimer.duration"),
-        this.get("topicTimer.status_type")
+        this.get("topicTimer.status_type"),
+        this.get("topicTimer.based_on_last_post"),
+        this.get("topicTimer.category_id")
       );
     },
 

From 8a50ab45aaed7b7d52ec3735765e60b4cefd2e30 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 2 Apr 2020 16:01:38 +1100
Subject: [PATCH 389/633] DEV: use REPORT_REQUESTS=1 to find all requests

We can use this to profile our pretender and ensure nothing is superfluous
and nothing is missing
---
 lib/tasks/qunit.rake            |  8 ++++++--
 test/javascripts/test_helper.js | 10 ++++++++++
 test/run-qunit.js               |  7 +++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index a233c56dfd..2c4e965e1f 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -24,6 +24,8 @@ task "qunit:test", [:timeout, :qunit_path] do |_, args|
     abort "Yarn is not installed. Download from https://yarnpkg.com/lang/en/docs/install/"
   end
 
+  report_requests = ENV['REPORT_REQUESTS'] == "1"
+
   system("yarn install --dev")
 
   # ensure we have this port available
@@ -63,10 +65,12 @@ task "qunit:test", [:timeout, :qunit_path] do |_, args|
       options[arg] = ENV[arg.upcase] if ENV[arg.upcase].present?
     end
 
-    if options.present?
-      cmd += "?#{options.to_query.gsub('+', '%20').gsub("&", '\\\&')}"
+    if report_requests
+      options['report_requests'] = '1'
     end
 
+    cmd += "?#{options.to_query.gsub('+', '%20').gsub("&", '\\\&')}"
+
     if args[:timeout].present?
       cmd += " #{args[:timeout]}"
     end
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 77598e4712..0f2fd5ec0a 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -117,7 +117,17 @@ QUnit.testStart(function(ctx) {
     return body;
   };
 
+  if (QUnit.config.logAllRequests) {
+    server.handledRequest = function(verb, path, request) {
+      console.log("REQ: " + verb + " " + path);
+    };
+  }
+
   server.unhandledRequest = function(verb, path) {
+    if (QUnit.config.logAllRequests) {
+      console.log("REQ: " + verb + " " + path + " missing");
+    }
+
     const error =
       "Unhandled request in test environment: " + path + " (" + verb + ")";
     window.console.error(error);
diff --git a/test/run-qunit.js b/test/run-qunit.js
index 57a0676b47..905745b6b5 100644
--- a/test/run-qunit.js
+++ b/test/run-qunit.js
@@ -112,6 +112,13 @@ async function runAllTests() {
     await Runtime.evaluate({
       expression: `(${qunit_script})()`
     });
+
+    if (args[0].indexOf("report_requests=1") > -1) {
+      await Runtime.evaluate({
+        expression: "QUnit.config.logAllRequests = true"
+      });
+    }
+
     const timeout = parseInt(args[1] || 300000, 10);
     var start = Date.now();
 

From a91843f0dc7b97e700dc85505404eafd62b7f8c5 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Mon, 30 Mar 2020 12:01:06 +0100
Subject: [PATCH 390/633] REFACTOR: Move the multisite middleware to the front

Both request tracking and message bus rely on multisite before the
middleware has run which is not ideal.
---
 ...st_tracker.rb => 200-first_middlewares.rb} | 17 ++++++++++++++--
 .../freedom_patches/rails_multisite.rb        |  8 --------
 lib/middleware/request_tracker.rb             | 20 ++++++-------------
 3 files changed, 21 insertions(+), 24 deletions(-)
 rename config/initializers/{200-message_bus_request_tracker.rb => 200-first_middlewares.rb} (58%)
 rename config/initializers/004-rails_multisite.rb => lib/freedom_patches/rails_multisite.rb (77%)

diff --git a/config/initializers/200-message_bus_request_tracker.rb b/config/initializers/200-first_middlewares.rb
similarity index 58%
rename from config/initializers/200-message_bus_request_tracker.rb
rename to config/initializers/200-first_middlewares.rb
index c0ebcfcb1b..6ae5816fba 100644
--- a/config/initializers/200-message_bus_request_tracker.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
-# we want MesageBus in the absolute front
+# we want MesageBus to be close to the front
 # this is important cause the vast majority of web requests go to it
 # this allows us to avoid full middleware crawls each time
-# Pending https://github.com/rails/rails/pull/27936
+#
+# We aren't manipulating the middleware stack directly because of
+# https://github.com/rails/rails/pull/27936
 session_operations = Rails::Configuration::MiddlewareStackProxy.new([
    [:delete, MessageBus::Rack::Middleware],
    [:unshift, MessageBus::Rack::Middleware],
@@ -21,3 +23,14 @@ if Rails.env != 'development' || ENV['TRACK_REQUESTS']
     MethodProfiler.ensure_discourse_instrumentation!
   end
 end
+
+if Rails.configuration.multisite
+  # Multisite needs to be first, because the request tracker and message bus
+  # rely on it
+  session_operations = Rails::Configuration::MiddlewareStackProxy.new([
+     [:delete, RailsMultisite::Middleware],
+     [:unshift, RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config],
+  ])
+
+  Rails.configuration.middleware = Rails.configuration.middleware + session_operations
+end
diff --git a/config/initializers/004-rails_multisite.rb b/lib/freedom_patches/rails_multisite.rb
similarity index 77%
rename from config/initializers/004-rails_multisite.rb
rename to lib/freedom_patches/rails_multisite.rb
index 21543492ea..c4627daa2a 100644
--- a/config/initializers/004-rails_multisite.rb
+++ b/lib/freedom_patches/rails_multisite.rb
@@ -26,11 +26,3 @@ module RailsMultisite
     end
   end
 end
-
-if Rails.configuration.multisite
-  Rails.configuration.middleware.swap(
-    RailsMultisite::Middleware,
-    RailsMultisite::Middleware,
-    RailsMultisite::DiscoursePatches.config
-  )
-end
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 41ad8a60b4..4fbe3d1b2a 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -51,14 +51,6 @@ class Middleware::RequestTracker
     @app = app
   end
 
-  def self.log_request_on_site(data, host)
-    RailsMultisite::ConnectionManagement.with_hostname(host) do
-      unless Discourse.pg_readonly_mode?
-        log_request(data)
-      end
-    end
-  end
-
   def self.log_request(data)
     status = data[:status]
     track_view = data[:track_view]
@@ -135,7 +127,6 @@ class Middleware::RequestTracker
 
     # we got to skip this on error ... its just logging
     data = self.class.get_data(env, result, info) rescue nil
-    host = RailsMultisite::ConnectionManagement.host(env)
 
     if data
       if result && (headers = result[1])
@@ -146,7 +137,7 @@ class Middleware::RequestTracker
         @@detailed_request_loggers.each { |logger| logger.call(env, data) }
       end
 
-      log_later(data, host)
+      log_later(data)
     end
 
   end
@@ -296,10 +287,11 @@ class Middleware::RequestTracker
     end
   end
 
-  def log_later(data, host)
-    Scheduler::Defer.later("Track view", _db = nil) do
-      self.class.log_request_on_site(data, host)
+  def log_later(data)
+    Scheduler::Defer.later("Track view") do
+      unless Discourse.pg_readonly_mode?
+        self.class.log_request(data)
+      end
     end
   end
-
 end

From 41510d5b8410badbfca8928caed19bf403495169 Mon Sep 17 00:00:00 2001
From: Zdravko Curic <zcuric@users.noreply.github.com>
Date: Thu, 2 Apr 2020 15:54:51 +0200
Subject: [PATCH 391/633] FIX: jQuery deprecation warning (#9331)

---
 app/assets/javascripts/discourse-common/lib/icon-library.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js b/app/assets/javascripts/discourse-common/lib/icon-library.js
index dab500bbdf..047cbd854c 100644
--- a/app/assets/javascripts/discourse-common/lib/icon-library.js
+++ b/app/assets/javascripts/discourse-common/lib/icon-library.js
@@ -1,6 +1,7 @@
 import { h } from "virtual-dom";
 import attributeHook from "discourse-common/lib/attribute-hook";
 import deprecated from "discourse-common/lib/deprecated";
+import jQuery from "jquery";
 
 const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
 let _renderers = [];
@@ -594,7 +595,7 @@ function warnIfDeprecated(oldId, newId) {
       stacktrace: Error().stack
     };
 
-    Ember.$.ajax(`${Discourse.BaseUri}/logs/report_js_error`, {
+    jQuery.ajax(`${Discourse.BaseUri}/logs/report_js_error`, {
       data: errorData,
       type: "POST",
       cache: false

From ca1208a63669d4d4ad7452367008d40fa090f645 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Thu, 2 Apr 2020 15:19:42 +0100
Subject: [PATCH 392/633] Revert "REFACTOR: Move the multisite middleware to
 the front"

Looks like this is causing problems.

Follow-up-to: a91843f0dc7b97e700dc85505404eafd62b7f8c5
---
 .../initializers/004-rails_multisite.rb       |  8 ++++++++
 ....rb => 200-message_bus_request_tracker.rb} | 17 ++--------------
 lib/middleware/request_tracker.rb             | 20 +++++++++++++------
 3 files changed, 24 insertions(+), 21 deletions(-)
 rename lib/freedom_patches/rails_multisite.rb => config/initializers/004-rails_multisite.rb (77%)
 rename config/initializers/{200-first_middlewares.rb => 200-message_bus_request_tracker.rb} (58%)

diff --git a/lib/freedom_patches/rails_multisite.rb b/config/initializers/004-rails_multisite.rb
similarity index 77%
rename from lib/freedom_patches/rails_multisite.rb
rename to config/initializers/004-rails_multisite.rb
index c4627daa2a..21543492ea 100644
--- a/lib/freedom_patches/rails_multisite.rb
+++ b/config/initializers/004-rails_multisite.rb
@@ -26,3 +26,11 @@ module RailsMultisite
     end
   end
 end
+
+if Rails.configuration.multisite
+  Rails.configuration.middleware.swap(
+    RailsMultisite::Middleware,
+    RailsMultisite::Middleware,
+    RailsMultisite::DiscoursePatches.config
+  )
+end
diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-message_bus_request_tracker.rb
similarity index 58%
rename from config/initializers/200-first_middlewares.rb
rename to config/initializers/200-message_bus_request_tracker.rb
index 6ae5816fba..c0ebcfcb1b 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-message_bus_request_tracker.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-# we want MesageBus to be close to the front
+# we want MesageBus in the absolute front
 # this is important cause the vast majority of web requests go to it
 # this allows us to avoid full middleware crawls each time
-#
-# We aren't manipulating the middleware stack directly because of
-# https://github.com/rails/rails/pull/27936
+# Pending https://github.com/rails/rails/pull/27936
 session_operations = Rails::Configuration::MiddlewareStackProxy.new([
    [:delete, MessageBus::Rack::Middleware],
    [:unshift, MessageBus::Rack::Middleware],
@@ -23,14 +21,3 @@ if Rails.env != 'development' || ENV['TRACK_REQUESTS']
     MethodProfiler.ensure_discourse_instrumentation!
   end
 end
-
-if Rails.configuration.multisite
-  # Multisite needs to be first, because the request tracker and message bus
-  # rely on it
-  session_operations = Rails::Configuration::MiddlewareStackProxy.new([
-     [:delete, RailsMultisite::Middleware],
-     [:unshift, RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config],
-  ])
-
-  Rails.configuration.middleware = Rails.configuration.middleware + session_operations
-end
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 4fbe3d1b2a..41ad8a60b4 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -51,6 +51,14 @@ class Middleware::RequestTracker
     @app = app
   end
 
+  def self.log_request_on_site(data, host)
+    RailsMultisite::ConnectionManagement.with_hostname(host) do
+      unless Discourse.pg_readonly_mode?
+        log_request(data)
+      end
+    end
+  end
+
   def self.log_request(data)
     status = data[:status]
     track_view = data[:track_view]
@@ -127,6 +135,7 @@ class Middleware::RequestTracker
 
     # we got to skip this on error ... its just logging
     data = self.class.get_data(env, result, info) rescue nil
+    host = RailsMultisite::ConnectionManagement.host(env)
 
     if data
       if result && (headers = result[1])
@@ -137,7 +146,7 @@ class Middleware::RequestTracker
         @@detailed_request_loggers.each { |logger| logger.call(env, data) }
       end
 
-      log_later(data)
+      log_later(data, host)
     end
 
   end
@@ -287,11 +296,10 @@ class Middleware::RequestTracker
     end
   end
 
-  def log_later(data)
-    Scheduler::Defer.later("Track view") do
-      unless Discourse.pg_readonly_mode?
-        self.class.log_request(data)
-      end
+  def log_later(data, host)
+    Scheduler::Defer.later("Track view", _db = nil) do
+      self.class.log_request_on_site(data, host)
     end
   end
+
 end

From ef7753953d7def6b0a5ae00d6858f540d6334108 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 2 Apr 2020 20:35:35 +0530
Subject: [PATCH 393/633] FIX: show today's date on /top page period chooser

---
 app/assets/javascripts/discourse/templates/discovery/topics.hbs | 2 +-
 .../javascripts/discourse/templates/mobile/discovery/topics.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 5413f9d9bf..208de9a709 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -39,7 +39,7 @@
 {{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount as |discoveryTopicList|}}
   {{#if top}}
     <div class='top-lists'>
-      {{period-chooser period=period action=(action "changePeriod")}}
+      {{period-chooser period=period action=(action "changePeriod") fullDay=false}}
     </div>
   {{else}}
     {{#if topicTrackingState.hasIncoming}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index 01527f451b..394aea6d86 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -1,7 +1,7 @@
 {{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount as |discoveryTopicList|}}
   {{#if top}}
     <div class='top-lists'>
-      {{period-chooser period=period action=(action "changePeriod")}}
+      {{period-chooser period=period action=(action "changePeriod") fullDay=false}}
     </div>
   {{else}}
     {{#if topicTrackingState.hasIncoming}}

From 724d2e99de9ed0d5331eb67458e2ab3f0d978d98 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 2 Apr 2020 11:16:38 -0400
Subject: [PATCH 394/633] DEV: Only include "report-sample" CSP directive when
 reporting is enabled (#9337)

---
 app/controllers/csp_reports_controller.rb    | 2 +-
 lib/content_security_policy/default.rb       | 2 +-
 spec/lib/content_security_policy_spec.rb     | 7 ++++++-
 spec/requests/csp_reports_controller_spec.rb | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/controllers/csp_reports_controller.rb b/app/controllers/csp_reports_controller.rb
index b0b1091270..30824e3536 100644
--- a/app/controllers/csp_reports_controller.rb
+++ b/app/controllers/csp_reports_controller.rb
@@ -6,7 +6,7 @@ class CspReportsController < ApplicationController
     raise Discourse::NotFound unless report_collection_enabled?
 
     Logster.add_to_env(request.env, 'CSP Report', report)
-    Rails.logger.warn("CSP Violation: '#{report['blocked-uri']}'")
+    Rails.logger.warn("CSP Violation: '#{report['blocked-uri']}' \n\n#{report['script-sample']}")
 
     head :ok
   end
diff --git a/lib/content_security_policy/default.rb b/lib/content_security_policy/default.rb
index d2f92f20b5..78ca564815 100644
--- a/lib/content_security_policy/default.rb
+++ b/lib/content_security_policy/default.rb
@@ -48,12 +48,12 @@ class ContentSecurityPolicy
 
     def script_src
       [
-        :report_sample,
         "#{base_url}/logs/",
         "#{base_url}/sidekiq/",
         "#{base_url}/mini-profiler-resources/",
         *script_assets
       ].tap do |sources|
+        sources << :report_sample if SiteSetting.content_security_policy_collect_reports
         sources << :unsafe_eval if Rails.env.development? # TODO remove this once we have proper source maps in dev
         sources << 'https://www.google-analytics.com/analytics.js' if SiteSetting.ga_universal_tracking_code.present?
         sources << 'https://www.googletagmanager.com/gtm.js' if SiteSetting.gtm_container_id.present?
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index fcbf5ece2c..68a5dc2da2 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -46,7 +46,6 @@ describe ContentSecurityPolicy do
     it 'always has self, logster, sidekiq, and assets' do
       script_srcs = parse(policy)['script-src']
       expect(script_srcs).to include(*%w[
-        'report-sample'
         http://test.localhost/logs/
         http://test.localhost/sidekiq/
         http://test.localhost/mini-profiler-resources/
@@ -61,6 +60,12 @@ describe ContentSecurityPolicy do
       ])
     end
 
+    it 'includes "report-sample" when report collection is enabled' do
+      SiteSetting.content_security_policy_collect_reports = true
+      script_srcs = parse(policy)['script-src']
+      expect(script_srcs).to include("'report-sample'")
+    end
+
     it 'whitelists Google Analytics and Tag Manager when integrated' do
       SiteSetting.ga_universal_tracking_code = 'UA-12345678-9'
       SiteSetting.gtm_container_id = 'GTM-ABCDEF'
diff --git a/spec/requests/csp_reports_controller_spec.rb b/spec/requests/csp_reports_controller_spec.rb
index 2c3bfe521d..07e8aeafb4 100644
--- a/spec/requests/csp_reports_controller_spec.rb
+++ b/spec/requests/csp_reports_controller_spec.rb
@@ -29,7 +29,7 @@ describe CspReportsController do
           "line-number": 25,
           "source-file": "http://localhost:3000/",
           "status-code": 200,
-          "script-sample": ""
+          "script-sample": "console.log('unsafe')"
         }
       }.to_json, headers: { "Content-Type": "application/csp-report" }
     end
@@ -52,7 +52,7 @@ describe CspReportsController do
 
     it 'logs the violation report' do
       send_report
-      expect(Rails.logger.warnings).to include("CSP Violation: 'http://suspicio.us/assets.js'")
+      expect(Rails.logger.warnings).to include("CSP Violation: 'http://suspicio.us/assets.js' \n\nconsole.log('unsafe')")
     end
   end
 end

From bca126f3f523d5667fe0f92c2a29c68f438103bb Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Mon, 30 Mar 2020 12:01:06 +0100
Subject: [PATCH 395/633] REFACTOR: Move the multisite middleware to the front

Both request tracking and message bus rely on multisite before the
middleware has run which is not ideal.

Follow-up-to: ca1208a63669d4d4ad7452367008d40fa090f645
---
 ...st_tracker.rb => 200-first_middlewares.rb} | 17 ++++++++++++++--
 .../freedom_patches/rails_multisite.rb        |  8 --------
 lib/middleware/request_tracker.rb             | 20 ++++++-------------
 3 files changed, 21 insertions(+), 24 deletions(-)
 rename config/initializers/{200-message_bus_request_tracker.rb => 200-first_middlewares.rb} (58%)
 rename config/initializers/004-rails_multisite.rb => lib/freedom_patches/rails_multisite.rb (77%)

diff --git a/config/initializers/200-message_bus_request_tracker.rb b/config/initializers/200-first_middlewares.rb
similarity index 58%
rename from config/initializers/200-message_bus_request_tracker.rb
rename to config/initializers/200-first_middlewares.rb
index c0ebcfcb1b..2647fd039a 100644
--- a/config/initializers/200-message_bus_request_tracker.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
-# we want MesageBus in the absolute front
+# we want MesageBus to be close to the front
 # this is important cause the vast majority of web requests go to it
 # this allows us to avoid full middleware crawls each time
-# Pending https://github.com/rails/rails/pull/27936
+#
+# We aren't manipulating the middleware stack directly because of
+# https://github.com/rails/rails/pull/27936
 session_operations = Rails::Configuration::MiddlewareStackProxy.new([
    [:delete, MessageBus::Rack::Middleware],
    [:unshift, MessageBus::Rack::Middleware],
@@ -21,3 +23,14 @@ if Rails.env != 'development' || ENV['TRACK_REQUESTS']
     MethodProfiler.ensure_discourse_instrumentation!
   end
 end
+
+if Rails.configuration.multisite
+  # Multisite needs to be first, because the request tracker and message bus
+  # rely on it
+  session_operations = Rails::Configuration::MiddlewareStackProxy.new([
+     [:delete, RailsMultisite::Middleware],
+     [:unshift, [RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config]],
+  ])
+
+  Rails.configuration.middleware = Rails.configuration.middleware + session_operations
+end
diff --git a/config/initializers/004-rails_multisite.rb b/lib/freedom_patches/rails_multisite.rb
similarity index 77%
rename from config/initializers/004-rails_multisite.rb
rename to lib/freedom_patches/rails_multisite.rb
index 21543492ea..c4627daa2a 100644
--- a/config/initializers/004-rails_multisite.rb
+++ b/lib/freedom_patches/rails_multisite.rb
@@ -26,11 +26,3 @@ module RailsMultisite
     end
   end
 end
-
-if Rails.configuration.multisite
-  Rails.configuration.middleware.swap(
-    RailsMultisite::Middleware,
-    RailsMultisite::Middleware,
-    RailsMultisite::DiscoursePatches.config
-  )
-end
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 41ad8a60b4..4fbe3d1b2a 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -51,14 +51,6 @@ class Middleware::RequestTracker
     @app = app
   end
 
-  def self.log_request_on_site(data, host)
-    RailsMultisite::ConnectionManagement.with_hostname(host) do
-      unless Discourse.pg_readonly_mode?
-        log_request(data)
-      end
-    end
-  end
-
   def self.log_request(data)
     status = data[:status]
     track_view = data[:track_view]
@@ -135,7 +127,6 @@ class Middleware::RequestTracker
 
     # we got to skip this on error ... its just logging
     data = self.class.get_data(env, result, info) rescue nil
-    host = RailsMultisite::ConnectionManagement.host(env)
 
     if data
       if result && (headers = result[1])
@@ -146,7 +137,7 @@ class Middleware::RequestTracker
         @@detailed_request_loggers.each { |logger| logger.call(env, data) }
       end
 
-      log_later(data, host)
+      log_later(data)
     end
 
   end
@@ -296,10 +287,11 @@ class Middleware::RequestTracker
     end
   end
 
-  def log_later(data, host)
-    Scheduler::Defer.later("Track view", _db = nil) do
-      self.class.log_request_on_site(data, host)
+  def log_later(data)
+    Scheduler::Defer.later("Track view") do
+      unless Discourse.pg_readonly_mode?
+        self.class.log_request(data)
+      end
     end
   end
-
 end

From 76610acb6fec91fc8087bed670c9f3277227559f Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Thu, 2 Apr 2020 18:25:41 +0100
Subject: [PATCH 396/633] FIX: Default to light theme in wizard so that
 previews are displayed

Previously, without a theme selection, the previews wouldn't show.
---
 lib/wizard/builder.rb                         |  2 +-
 spec/components/wizard/wizard_builder_spec.rb | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index a8727bdde8..40318d8aa9 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -155,7 +155,7 @@ class Wizard
           id: 'theme_previews',
           type: 'component',
           required: !default_theme_override,
-          value: scheme_id
+          value: scheme_id || ColorScheme::LIGHT_THEME_ID
         )
 
         # fix for the case when base_scheme is nil
diff --git a/spec/components/wizard/wizard_builder_spec.rb b/spec/components/wizard/wizard_builder_spec.rb
index 88cb9512f6..b63ed9c94a 100644
--- a/spec/components/wizard/wizard_builder_spec.rb
+++ b/spec/components/wizard/wizard_builder_spec.rb
@@ -176,14 +176,26 @@ describe Wizard::Builder do
       end
     end
 
-    describe "when the default theme has been override" do
+    describe "when the default theme has been overridden by a theme without a color scheme" do
       before do
         theme.set_default!
       end
 
       it 'should set the right default values' do
         expect(field.required).to eq(false)
-        expect(field.value).to eq(nil)
+        expect(field.value).to eq("Light")
+      end
+    end
+
+    describe "when the default theme has been overridden by a theme with a color scheme" do
+      before do
+        theme.update(color_scheme_id: ColorScheme.find_by_name("Dark").id)
+        theme.set_default!
+      end
+
+      it 'should set the right default values' do
+        expect(field.required).to eq(false)
+        expect(field.value).to eq("Dark")
       end
     end
   end

From e7e931b70b5790a71d41893834d5e8c9945c92df Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 3 Apr 2020 00:08:29 +0530
Subject: [PATCH 397/633] FIX: track links in onebox body if it's same as
 header link.

---
 app/assets/javascripts/discourse/lib/click-track.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/assets/javascripts/discourse/lib/click-track.js b/app/assets/javascripts/discourse/lib/click-track.js
index 534c04a6c4..31bf961ab4 100644
--- a/app/assets/javascripts/discourse/lib/click-track.js
+++ b/app/assets/javascripts/discourse/lib/click-track.js
@@ -18,6 +18,13 @@ export function isValidLink($link) {
     return false;
   }
 
+  if ($link.closest(".onebox-result, .onebox-body").length) {
+    const $a = $link.closest(".onebox").find("header a");
+    if ($a[0] && $a[0].href === $link[0].href) {
+      return true;
+    }
+  }
+
   return (
     $link.hasClass("track-link") ||
     $link.closest(".hashtag, .badge-category, .onebox-result, .onebox-body")

From 9c43963ff3c4ba3c04764ddccf5dee0f4876ec61 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 2 Apr 2020 21:19:31 +0200
Subject: [PATCH 398/633] FIX: allows color-input to set hex and color names
 through input (#9339)

---
 app/assets/javascripts/admin/components/color-input.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/components/color-input.js b/app/assets/javascripts/admin/components/color-input.js
index 44fe738b43..d1b6102c61 100644
--- a/app/assets/javascripts/admin/components/color-input.js
+++ b/app/assets/javascripts/admin/components/color-input.js
@@ -24,8 +24,7 @@ export default Component.extend({
 
   @action
   onHexInput(color) {
-    this.attrs.onChangeColor &&
-      this.attrs.onChangeColor((color || "").replace(/^#/, ""));
+    this.attrs.onChangeColor && this.attrs.onChangeColor(color || "");
   },
 
   @observes("hexValue", "brightnessValue", "valid")

From 2f9879a9a134f3b9bf17489dce977e1655df5d37 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 3 Apr 2020 07:32:50 +0530
Subject: [PATCH 399/633] FIX: move total rows count & load more URL inside
 meta.

We're fetching "total rows count" from root attributes only if meta object not found. https://github.com/discourse/discourse/blob/2b78bd01ab2431aa90b642326d170df7c51e492b/app/assets/javascripts/discourse/models/store.js#L236
---
 app/controllers/directory_items_controller.rb    |  9 ++++++---
 spec/requests/directory_items_controller_spec.rb | 14 +++++++-------
 test/javascripts/fixtures/directory-fixtures.js  |  9 ++++++---
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 9acc1a24eb..d01d71b5d8 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -81,8 +81,11 @@ class DirectoryItemsController < ApplicationController
 
     last_updated_at = DirectoryItem.last_updated_at(period_type)
     render_json_dump(directory_items: serialize_data(result, DirectoryItemSerializer),
-                     meta: { last_updated_at: last_updated_at },
-                     total_rows_directory_items: result_count,
-                     load_more_directory_items: directory_items_path(more_params))
+                     meta: {
+                        last_updated_at: last_updated_at,
+                        total_rows_directory_items: result_count,
+                        load_more_directory_items: directory_items_path(more_params)
+                      }
+                    )
   end
 end
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index 8dc0ccabce..31f416f6d4 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -44,12 +44,12 @@ describe DirectoryItemsController do
 
       expect(json).to be_present
       expect(json['directory_items']).to be_present
-      expect(json['total_rows_directory_items']).to be_present
-      expect(json['load_more_directory_items']).to be_present
+      expect(json['meta']['total_rows_directory_items']).to be_present
+      expect(json['meta']['load_more_directory_items']).to be_present
       expect(json['meta']['last_updated_at']).to be_present
 
       expect(json['directory_items'].length).to eq(4)
-      expect(json['total_rows_directory_items']).to eq(4)
+      expect(json['meta']['total_rows_directory_items']).to eq(4)
     end
 
     it "fails when the directory is disabled" do
@@ -66,7 +66,7 @@ describe DirectoryItemsController do
       json = ::JSON.parse(response.body)
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(1)
-      expect(json['total_rows_directory_items']).to eq(1)
+      expect(json['meta']['total_rows_directory_items']).to eq(1)
       expect(json['directory_items'][0]['user']['username']).to eq('eviltrout')
     end
 
@@ -77,7 +77,7 @@ describe DirectoryItemsController do
       json = ::JSON.parse(response.body)
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(1)
-      expect(json['total_rows_directory_items']).to eq(1)
+      expect(json['meta']['total_rows_directory_items']).to eq(1)
       expect(json['directory_items'][0]['user']['username']).to eq('stage_user')
     end
 
@@ -88,7 +88,7 @@ describe DirectoryItemsController do
       json = ::JSON.parse(response.body)
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(2)
-      expect(json['total_rows_directory_items']).to eq(2)
+      expect(json['meta']['total_rows_directory_items']).to eq(2)
       expect(json['directory_items'][0]['user']['username']).to eq(walter_white.username) | eq(user.username)
       expect(json['directory_items'][1]['user']['username']).to eq(walter_white.username) | eq(user.username)
     end
@@ -100,7 +100,7 @@ describe DirectoryItemsController do
       json = ::JSON.parse(response.body)
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(2)
-      expect(json['total_rows_directory_items']).to eq(2)
+      expect(json['meta']['total_rows_directory_items']).to eq(2)
       expect(json['directory_items'][0]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
       expect(json['directory_items'][1]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
     end
diff --git a/test/javascripts/fixtures/directory-fixtures.js b/test/javascripts/fixtures/directory-fixtures.js
index ab1b647f4e..dab359e8b5 100644
--- a/test/javascripts/fixtures/directory-fixtures.js
+++ b/test/javascripts/fixtures/directory-fixtures.js
@@ -602,8 +602,11 @@ export default {
         post_count: 146
       }
     ],
-    total_rows_directory_items: 12546,
-    load_more_directory_items:
-      "/directory_items?id=all&order=likes_received&page=1"
+    meta: {
+      last_updated_at: "2020-04-02T02:19:20.000Z",
+      total_rows_directory_items: 12546,
+      load_more_directory_items:
+        "/directory_items?id=all&order=likes_received&page=1"
+    }
   }
 };

From 83f5f9176bf3ab2f2aa391ff03a7b78974cbaec5 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 3 Apr 2020 14:13:01 +1100
Subject: [PATCH 400/633] DEV: only load staff logs when page is visited

Previously we would load admin staff action logs unconditionally as soon
as the controller was instantiated, this is not desirable we only want to
run the query when you visit the route.
---
 .../admin/controllers/admin-logs-staff-action-logs.js        | 3 +--
 .../javascripts/admin/routes/admin-logs-staff-action-logs.js | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
index 849861c921..7ef84b45ad 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
@@ -4,7 +4,7 @@ import { scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
-import discourseComputed, { on } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   model: null,
@@ -17,7 +17,6 @@ export default Controller.extend({
     return name ? I18n.t("admin.logs.staff_actions.actions." + name) : null;
   },
 
-  @on("init")
   resetFilters() {
     this.setProperties({
       model: EmberObject.create({ loadingMore: true }),
diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
index 0ef8e6e232..b007ecafa7 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
@@ -9,6 +9,11 @@ export default DiscourseRoute.extend({
     });
   },
 
+  activate() {
+    let controller = this.controllerFor("admin-logs-staff-action-logs");
+    if (controller.filters === null) controller.resetFilters();
+  },
+
   actions: {
     showDetailsModal(model) {
       showModal("admin-staff-action-log-details", { model, admin: true });

From 20d8b49adddd9927af8cdf01104663d412bf33fc Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 3 Apr 2020 14:35:30 +1100
Subject: [PATCH 401/633] DEV: remove targetUsernames deprecation

Stable already has this rename, no need to carry the deprecation anymore.
---
 app/assets/javascripts/discourse/models/composer.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 0f6d9ae620..9c16503e68 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -77,8 +77,6 @@ const CLOSED = "closed",
     composerTime: "composerTime",
     typingTime: "typingTime",
     postId: "post.id",
-    // TODO remove together with 'targetUsername' deprecations
-    usernames: "targetUsernames",
     recipients: "targetRecipients"
   },
   _add_draft_fields = {},
@@ -342,14 +340,6 @@ const Composer = RestModel.extend({
     return options;
   },
 
-  @discourseComputed("targetRecipients")
-  targetUsernames(targetRecipients) {
-    deprecated(
-      "`targetUsernames` is deprecated, use `targetRecipients` instead."
-    );
-    return targetRecipients;
-  },
-
   @discourseComputed("targetRecipients")
   targetRecipientsArray(targetRecipients) {
     const recipients = targetRecipients ? targetRecipients.split(",") : [];

From 8d5cc8956d979a48140cf840585069e10207c2e6 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 3 Apr 2020 14:45:27 +1100
Subject: [PATCH 402/633] DEV: avoid leaked HTTP call in test

We were running a failed request on route transition, this avoids it by
faking it.
---
 test/javascripts/acceptance/composer-test.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/javascripts/acceptance/composer-test.js b/test/javascripts/acceptance/composer-test.js
index b9da96ee5e..5af2698555 100644
--- a/test/javascripts/acceptance/composer-test.js
+++ b/test/javascripts/acceptance/composer-test.js
@@ -841,6 +841,10 @@ QUnit.test("can reply to a private message", async assert => {
     return [200, { "Content-Type": "application/json" }, {}];
   });
 
+  // a bit messy but we need a fake here cause we issue a route transition
+  // to the new post
+  server.get("/t/34/4.json", () => server.get("/t/34.json"));
+
   await visit("/t/34");
   await click(".topic-post:eq(0) button.reply");
   await fillIn(".d-editor-input", "this is the *content* of the reply");

From 82201fa466bda0d620a65e1f143b5a41b900b81a Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 3 Apr 2020 09:23:40 +0530
Subject: [PATCH 403/633] FIX: jobs/delete_replies: Add Time+Duration, not
 Time+Time #9314

Co-authored-by: Kane York <kanepyork@gmail.com>
---
 app/jobs/regular/delete_replies.rb |  2 +-
 spec/jobs/delete_replies_spec.rb   | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 spec/jobs/delete_replies_spec.rb

diff --git a/app/jobs/regular/delete_replies.rb b/app/jobs/regular/delete_replies.rb
index b8228c7a04..bbc0bec8ff 100644
--- a/app/jobs/regular/delete_replies.rb
+++ b/app/jobs/regular/delete_replies.rb
@@ -22,7 +22,7 @@ module Jobs
         PostDestroyer.new(topic_timer.user, post, context: I18n.t("topic_statuses.auto_deleted_by_timer")).destroy
       end
 
-      topic_timer.execute_at = (replies.minimum(:created_at) || Time.zone.now) + topic_timer.duration.days.ago
+      topic_timer.execute_at = (replies.minimum(:created_at) || Time.zone.now) + topic_timer.duration.days
       topic_timer.save
     end
 
diff --git a/spec/jobs/delete_replies_spec.rb b/spec/jobs/delete_replies_spec.rb
new file mode 100644
index 0000000000..a1968bc671
--- /dev/null
+++ b/spec/jobs/delete_replies_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Jobs::DeleteReplies do
+  fab!(:admin) { Fabricate(:admin) }
+
+  fab!(:topic) { Fabricate(:topic) }
+  fab!(:topic_timer) do
+    Fabricate(:topic_timer, status_type: TopicTimer.types[:delete_replies], duration: 2, user: admin, topic: topic, execute_at: 2.days.from_now)
+  end
+
+  before do
+    3.times { create_post(topic: topic) }
+  end
+
+  it "can delete replies of a topic" do
+    freeze_time (2.days.from_now)
+
+    expect {
+      described_class.new.execute(topic_timer_id: topic_timer.id)
+    }.to change { topic.posts.count }.by(-2)
+
+    topic_timer.reload
+    expect(topic_timer.execute_at).to eq_time(2.day.from_now)
+  end
+end

From 624a9bf2344083ec65fa7866a733f2ad99921661 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 3 Apr 2020 14:56:03 +1100
Subject: [PATCH 404/633] DEV: allow for internal format change of Drafts

This follows up on 20d8b49adddd9927 we should no longer be testing with
usernames in the draft
---
 test/javascripts/acceptance/composer-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/acceptance/composer-test.js b/test/javascripts/acceptance/composer-test.js
index 5af2698555..48237ff552 100644
--- a/test/javascripts/acceptance/composer-test.js
+++ b/test/javascripts/acceptance/composer-test.js
@@ -683,7 +683,7 @@ QUnit.test("Loading draft also replaces the recipients", async assert => {
     sandbox.stub(Draft, "get").returns(
       Promise.resolve({
         draft:
-          '{"reply":"hello","action":"privateMessage","title":"hello","categoryId":null,"archetypeId":"private_message","metaData":null,"usernames":"codinghorror","composerTime":9159,"typingTime":2500}',
+          '{"reply":"hello","action":"privateMessage","title":"hello","categoryId":null,"archetypeId":"private_message","metaData":null,"recipients":"codinghorror","composerTime":9159,"typingTime":2500}',
         draft_sequence: 0
       })
     );

From 76bb01c31cde4c7d6ad59bf6ab536cbe5c4e2bb9 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Fri, 3 Apr 2020 13:29:42 +0100
Subject: [PATCH 405/633] DEV: Increase process_post lock timeout

The process_post job uses CookedPostProcessor which also uses a
DistributedMutex. There's no good reason for the timeout of the outer
lock to be smaller than the timeout of the inner lock.
---
 app/jobs/regular/process_post.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index 8dd7487f36..b13d69d61d 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -7,7 +7,7 @@ module Jobs
   class ProcessPost < ::Jobs::Base
 
     def execute(args)
-      DistributedMutex.synchronize("process_post_#{args[:post_id]}") do
+      DistributedMutex.synchronize("process_post_#{args[:post_id]}", validity: 10.minutes) do
         post = Post.find_by(id: args[:post_id])
         # two levels of deletion
         return unless post.present? && post.topic.present?

From 883901e4c0bc293463d15fdcacde1c80707ca2cb Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 3 Apr 2020 16:27:56 +0200
Subject: [PATCH 406/633] FIX: do not attempt to deselect tags if filter is not
 empty (#9345)

---
 .../javascripts/select-kit/components/mini-tag-chooser.js     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
index d8c63c9ae5..bf11e816dc 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
@@ -188,7 +188,9 @@ export default ComboBox.extend(TagsMixin, {
     const value = makeArray(this.value);
 
     if (event.keyCode === 8) {
-      this._onBackspace(this.value, this.highlightedTag);
+      if (!this.selectKit.filter) {
+        this._onBackspace(this.value, this.highlightedTag);
+      }
     } else if (event.keyCode === 37) {
       if (this.highlightedTag) {
         const index = value.indexOf(this.highlightedTag);

From 06de6f80f821c08691120fe030978b6f01129ba2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 3 Apr 2020 10:31:45 -0400
Subject: [PATCH 407/633] Build(deps): Bump tzinfo from 1.2.6 to 1.2.7 (#9340)

Bumps [tzinfo](https://github.com/tzinfo/tzinfo) from 1.2.6 to 1.2.7.
- [Release notes](https://github.com/tzinfo/tzinfo/releases)
- [Changelog](https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md)
- [Commits](https://github.com/tzinfo/tzinfo/compare/v1.2.6...v1.2.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b76e9ec387..8344446223 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -399,7 +399,7 @@ GEM
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)

From 4500928a39394dbc8d7d147babdda326790a4b5e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 3 Apr 2020 10:32:05 -0400
Subject: [PATCH 408/633] Build(deps-dev): Bump fabrication from 2.21.0 to
 2.21.1 (#9341)

Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.21.0 to 2.21.1.
- [Release notes](https://github.com/paulelliott/fabrication/releases)
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown)
- [Commits](https://github.com/paulelliott/fabrication/compare/2.21.0...2.21.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8344446223..a087e40104 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -124,7 +124,7 @@ GEM
     excon (0.72.0)
     execjs (2.7.0)
     exifr (1.3.6)
-    fabrication (2.21.0)
+    fabrication (2.21.1)
     fakeweb (1.3.0)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)

From 91fff746a476a9d77a8f8029c084d827536dae75 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 3 Apr 2020 15:50:13 +0100
Subject: [PATCH 409/633] FIX: Check active themes for all requests

Previously, the list of active themes was only used in html views. Now we have theme modifiers, themes can affect .json routes.
---
 app/controllers/application_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3ae29ee400..813af0c12f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -376,8 +376,7 @@ class ApplicationController < ActionController::Base
   end
 
   def handle_theme
-    return if request.xhr? || request.format == "json" || request.format == "js"
-    return if request.method != "GET"
+    return if request.format == "js"
 
     resolve_safe_mode
     return if request.env[NO_CUSTOM]

From 3cfe086a94a4d9c1cac2b8a7173c64c0df1baecd Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 3 Apr 2020 16:42:01 +0100
Subject: [PATCH 410/633] FIX: Limit personal message participants when
 converting from topic (#9343)

Previously all topic posters would be added which could lead to major performance issues. Now if there are too many posters, only the acting user will be added as a participant.
---
 app/jobs/regular/topic_action_converter.rb |  2 +-
 app/models/topic_converter.rb              |  4 ++++
 spec/models/topic_converter_spec.rb        | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/jobs/regular/topic_action_converter.rb b/app/jobs/regular/topic_action_converter.rb
index dff892d06a..370e8cbb02 100644
--- a/app/jobs/regular/topic_action_converter.rb
+++ b/app/jobs/regular/topic_action_converter.rb
@@ -13,7 +13,7 @@ class Jobs::TopicActionConverter < ::Jobs::Base
       action_type: [UserAction::GOT_PRIVATE_MESSAGE, UserAction::NEW_PRIVATE_MESSAGE]).find_each do |ua|
         UserAction.remove_action!(ua.attributes.symbolize_keys.slice(:action_type, :user_id, :acting_user_id, :target_topic_id, :target_post_id))
       end
-    topic.posts.each { |post| UserActionManager.post_created(post) }
+    topic.posts.find_each { |post| UserActionManager.post_created(post) }
     UserActionManager.topic_created(topic)
   end
 
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index 6b9e6ca92c..925c98c64b 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -82,6 +82,10 @@ class TopicConverter
     existing_allowed_users = @topic.topic_allowed_users.pluck(:user_id)
     users_to_allow = posters << @user.id
 
+    if (users_to_allow | existing_allowed_users).length > SiteSetting.max_allowed_message_recipients
+      users_to_allow = [@user.id]
+    end
+
     (users_to_allow - existing_allowed_users).uniq.each do |user_id|
       @topic.topic_allowed_users.build(user_id: user_id)
     end
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index 7d1c1602d0..9c888f8f41 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -152,6 +152,18 @@ describe TopicConverter do
         expect(Notification.exists?(user_notification.id)).to eq(false)
         expect(Notification.exists?(admin_notification.id)).to eq(true)
       end
+
+      it "limits PM participants" do
+        SiteSetting.max_allowed_message_recipients = 2
+        Fabricate(:post, topic: topic)
+        Fabricate(:post, topic: topic)
+
+        private_message = topic.convert_to_private_message(post.user)
+
+        # Skips posters and just adds the acting user
+        expect(private_message.topic_allowed_users.count).to eq(1)
+      end
+
     end
 
     context 'topic has replies' do

From 2b2584912a380813b2ab6b2601a57317cfa43203 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 3 Apr 2020 18:10:52 +0200
Subject: [PATCH 411/633] Improve Telligent import script

* Imports private messages
* Replaces internal links for topics and replies
* Allows incremental import of accepted answers
---
 script/import_scripts/telligent.rb | 164 +++++++++++++++++++++++++++--
 1 file changed, 158 insertions(+), 6 deletions(-)

diff --git a/script/import_scripts/telligent.rb b/script/import_scripts/telligent.rb
index d9b364fb15..a6b1218e41 100644
--- a/script/import_scripts/telligent.rb
+++ b/script/import_scripts/telligent.rb
@@ -50,6 +50,7 @@ class ImportScripts::Telligent < ImportScripts::Base
     /\[(?<tag>img|url)=[^\[]*?cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)\][^\[]*?\[\/\k<tag>\]/i
   ]
   PROPERTY_NAMES_REGEX ||= /(?<name>\w+):S:(?<start>\d+):(?<length>\d+):/
+  INTERNAL_LINK_REGEX ||= /\shref=".*?\/f\/\d+(?:(\/t\/(?<topic_id>\d+))|(?:\/p\/\d+\/(?<post_id>\d+))|(?:\/p\/(?<post_id>\d+)\/reply))\.aspx[^"]*?"/i
 
   CATEGORY_LINK_NORMALIZATION = '/.*?(f\/\d+)$/\1'
   TOPIC_LINK_NORMALIZATION = '/.*?(f\/\d+\/t\/\d+)$/\1'
@@ -109,6 +110,7 @@ class ImportScripts::Telligent < ImportScripts::Base
     import_users
     import_topics
     import_posts
+    import_messages
     mark_topics_as_solved
   end
 
@@ -127,7 +129,12 @@ class ImportScripts::Telligent < ImportScripts::Base
                WHERE t.UserId = u.UserID) OR
         EXISTS(SELECT 1
                FROM te_Forum_ThreadReplies r
-               WHERE r.UserId = u.UserID)
+               WHERE r.UserId = u.UserID) OR
+        EXISTS(SELECT 1
+               FROM cs_Messaging_ConversationParticipants p
+                 JOIN cs_Messaging_ConversationMessages cm ON p.ConversationId = cm.ConversationId
+                 JOIN cs_Messaging_Messages m ON m.MessageId = cm.MessageId
+               WHERE p.ParticipantId = u.UserID)
       )
     SQL
 
@@ -508,6 +515,116 @@ class ImportScripts::Telligent < ImportScripts::Base
     end
   end
 
+  def import_messages
+    puts "", "Importing messages..."
+
+    current_conversation_id = ""
+    current_topic_import_id = ""
+
+    last_conversation_id = ""
+
+    total_count = count(<<~SQL)
+      SELECT COUNT(1) AS count
+      FROM cs_Messaging_Messages m
+        JOIN cs_Messaging_ConversationMessages cm ON m.MessageId = cm.MessageId
+    SQL
+
+    batches do |offset|
+      if last_conversation_id.blank?
+        conditions = ""
+      else
+        conditions = <<~SQL
+          WHERE cm.ConversationId > '#{last_conversation_id}'
+        SQL
+      end
+
+      rows = query(<<~SQL)
+        SELECT TOP #{BATCH_SIZE}
+          cm.ConversationId, m.MessageId, m.AuthorId, m.Subject, m.Body, m.DateCreated,
+          STUFF((SELECT ';' + CONVERT(VARCHAR, p.ParticipantId)
+                 FROM cs_Messaging_ConversationParticipants p
+                 WHERE p.ConversationId = cm.ConversationId
+                 ORDER BY p.ParticipantId
+                 FOR XML PATH('')), 1, 1, '') AS ParticipantIds
+        FROM cs_Messaging_Messages m
+          JOIN cs_Messaging_ConversationMessages cm ON m.MessageId = cm.MessageId
+        #{conditions}
+        ORDER BY cm.ConversationId, m.DateCreated, m.MessageId
+      SQL
+
+      break if rows.blank?
+
+      last_row = rows[-1]
+      last_conversation_id = last_row["ConversationId"]
+      next if all_records_exist?(:post, rows.map { |row| row["MessageId"] })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        user_id = user_id_from_imported_user_id(row["AuthorId"]) || Discourse::SYSTEM_USER_ID
+
+        post = {
+          id: row["MessageId"],
+          raw: raw_with_attachment(row, user_id, :message),
+          user_id: user_id,
+          created_at: row["DateCreated"]
+        }
+
+        if current_conversation_id == row["ConversationId"]
+          parent_post = topic_lookup_from_imported_post_id(current_topic_import_id)
+
+          if parent_post
+            post[:topic_id] = parent_post[:topic_id]
+          else
+            puts "Failed to import message #{row['MessageId']}. Parent was not found."
+            post = nil
+          end
+        else
+          post[:title] = CGI.unescapeHTML(row["Subject"])
+          post[:archetype] = Archetype.private_message
+          post[:target_usernames] = get_recipient_usernames(row)
+
+          if post[:target_usernames].empty?
+            puts "Private message without recipients. Skipping #{row['MessageId']}"
+            post = nil
+          end
+
+          current_topic_import_id = row["MessageId"]
+        end
+
+        current_conversation_id = row["ConversationId"]
+        post
+      end
+    end
+
+    # Mark all imported messages as read
+    DB.exec(<<~SQL)
+      UPDATE topic_users tu
+      SET last_read_post_number = t.highest_post_number,
+          highest_seen_post_number = t.highest_post_number
+      FROM topics t
+        JOIN topic_custom_fields tcf ON t.id = tcf.topic_id
+      WHERE tu.topic_id = t.id
+        AND tu.user_id > 0
+        AND t.archetype = 'private_message'
+        AND tcf.name = 'import_id'
+    SQL
+  end
+
+  def get_recipient_user_ids(participant_ids)
+    return [] if participant_ids.blank?
+
+    user_ids = participant_ids.split(';')
+    user_ids.uniq!
+    user_ids.map!(&:strip)
+  end
+
+  def get_recipient_usernames(row)
+    import_user_ids = get_recipient_user_ids(row["ParticipantIds"])
+
+    import_user_ids.map! do |import_user_id|
+      find_user_by_import_id(import_user_id).try(:username)
+    end.compact
+  end
+
   def index_directory(root_directory)
     Dir.foreach(root_directory) do |directory_name|
       next if directory_name == "." || directory_name == ".."
@@ -524,7 +641,7 @@ class ImportScripts::Telligent < ImportScripts::Base
   end
 
   def raw_with_attachment(row, user_id, type)
-    raw, embedded_paths, upload_ids = replace_embedded_attachments(row["Body"], user_id)
+    raw, embedded_paths, upload_ids = replace_embedded_attachments(row, user_id, type)
     raw = html_to_markdown(raw) || ""
 
     filename = row["FileName"]
@@ -551,15 +668,28 @@ class ImportScripts::Telligent < ImportScripts::Base
           raw = "#{raw}\n#{@uploader.html_for_upload(upload, filename)}"
         end
       else
-        id = type == :topic ? row['ThreadId'] : row['ThreadReplyId']
-        STDERR.puts "Could not find file for #{type} #{id}: #{path}"
+        print_file_not_found_error(type, path, row)
       end
     end
 
     raw
   end
 
-  def replace_embedded_attachments(raw, user_id)
+  def print_file_not_found_error(type, path, row)
+    case type
+    when :topic
+      id = row['ThreadId']
+    when :post
+      id = row['ThreadReplyId']
+    when :message
+      id = row['MessageId']
+    end
+
+    STDERR.puts "Could not find file for #{type} #{id}: #{path}"
+  end
+
+  def replace_embedded_attachments(row, user_id, type)
+    raw = row["Body"]
     paths = []
     upload_ids = []
 
@@ -583,7 +713,7 @@ class ImportScripts::Telligent < ImportScripts::Base
           end
         else
           path = File.join(path, match_data[:filename])
-          STDERR.puts "Could not find file: #{path}"
+          print_file_not_found_error(type, path, row)
           match_data[0]
         end
       end
@@ -673,6 +803,8 @@ class ImportScripts::Telligent < ImportScripts::Base
   def html_to_markdown(html)
     return html if html.blank?
 
+    html = fix_internal_links(html)
+
     md = HtmlToMarkdown.new(html).to_markdown
     md.gsub!(/\[quote.*?\]/, "\n" + '\0' + "\n")
     md.gsub!(/(?<!^)\[\/quote\]/, "\n[/quote]\n")
@@ -682,6 +814,21 @@ class ImportScripts::Telligent < ImportScripts::Base
     md
   end
 
+  def fix_internal_links(html)
+    html.gsub(INTERNAL_LINK_REGEX) do
+      match_data = Regexp.last_match
+
+      if match_data[:topic_id].present?
+        imported_id = import_topic_id(match_data[:topic_id])
+      else
+        imported_id = match_data[:post_id]
+      end
+
+      post = topic_lookup_from_imported_post_id(imported_id) if imported_id
+      post ? %Q| href="#{Discourse.base_url}#{post[:url]}"| : match_data[0]
+    end
+  end
+
   def parse_properties(names, values)
     properties = {}
     return properties if names.blank? || values.blank?
@@ -706,6 +853,11 @@ class ImportScripts::Telligent < ImportScripts::Base
         FROM post_custom_fields pcf
         JOIN posts p ON p.id = pcf.post_id
        WHERE pcf.name = 'is_accepted_answer' AND pcf.value = 'true'
+         AND NOT EXISTS (
+           SELECT 1
+           FROM topic_custom_fields x
+           WHERE x.topic_id = p.topic_id AND x.name = 'accepted_answer_post_id'
+         )
     SQL
   end
 

From ad6709772a7838f4d1ed07c08b87616f9db248a4 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 3 Apr 2020 18:13:34 +0200
Subject: [PATCH 412/633] PERF: Backup with lots of uploads stored on S3 was
 slow

Creating the backup needs a lot more disk space after this change, but it is a lot faster.
---
 lib/backup_restore/backuper.rb | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index dd4f81c72e..80e45da59c 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -291,20 +291,17 @@ module BackupRestore
           log "Failed to download file with upload ID #{upload.id} from S3", ex
         end
 
-        if File.exists?(filename)
-          Discourse::Utils.execute_command(
-            'tar', '--append', '--file', tar_filename, upload_directory,
-            failure_message: "Failed to add #{upload.original_filename} to archive.", success_status_codes: [0, 1],
-            chdir: @tmp_directory
-          )
-
-          File.delete(filename)
-        end
-
         count += 1
         log "#{count} files have already been downloaded. Still downloading..." if count % 500 == 0
       end
 
+      log "Appending uploads to archive..."
+      Discourse::Utils.execute_command(
+        'tar', '--append', '--file', tar_filename, upload_directory,
+        failure_message: "Failed to append uploads to archive.", success_status_codes: [0, 1],
+        chdir: @tmp_directory
+      )
+
       log "No uploads found on S3. Skipping archiving of uploads stored on S3..." if count == 0
     end
 

From 751f229665ac0311bae13dc77b7afba9a17369a5 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Fri, 3 Apr 2020 15:09:01 -0500
Subject: [PATCH 413/633] UX: removes color on categories if no style chosen
 (#9346)

* UX: removes color on categories if no style chosen

* Update app/assets/javascripts/discourse/templates/components/categories-only.hbs

* Update messages.hbs

Co-authored-by: Robin Ward <robin.ward@gmail.com>
---
 .../javascripts/discourse/components/categories-only.js      | 5 ++++-
 .../discourse/templates/components/categories-only.hbs       | 2 +-
 app/assets/stylesheets/desktop/category-list.scss            | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/categories-only.js b/app/assets/javascripts/discourse/components/categories-only.js
index 89720fbbe8..d218d69643 100644
--- a/app/assets/javascripts/discourse/components/categories-only.js
+++ b/app/assets/javascripts/discourse/components/categories-only.js
@@ -1,4 +1,7 @@
 import Component from "@ember/component";
+import { equal } from "@ember/object/computed";
+
 export default Component.extend({
-  tagName: ""
+  tagName: "",
+  noCategoryStyle: equal("siteSettings.category_style", "none")
 });
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 24d02fea27..6c02050bbd 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -12,7 +12,7 @@
     <tbody aria-labelledby="categories-only-category">
       {{#each categories as |c|}}
         <tr data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
-          <td class="category {{if c.isMuted 'muted'}}" style={{border-color c.color}}>
+          <td class="category {{if c.isMuted 'muted'}} {{if noCategoryStyle "no-category-style"}}" style={{unless noCategoryStyle (border-color c.color)}}>
             {{category-title-link category=c}}
             {{#unless c.isMuted}}
             {{#if c.description_excerpt}}
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 50801d9d34..c5774106ab 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -94,6 +94,11 @@
 
   tbody {
     .category {
+      &.no-category-style {
+        border-color: transparent;
+        border-left: 0px;
+        padding-left: 0px;
+      }
       border-left: 6px solid;
       h3,
       h4 {

From a8002baaed2b7227e22fd1c9e9d47fc5015f0971 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 3 Apr 2020 20:49:09 -0400
Subject: [PATCH 414/633] UX: Restyle bookmark reminder modal

---
 .../discourse/templates/modal/bookmark.hbs    | 63 ++++++++++---------
 .../common/components/bookmark-modal.scss     | 37 +++++++----
 .../common/components/tap-tile.scss           | 43 +++++--------
 3 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 5a1082c711..538b30c74f 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -22,62 +22,69 @@
         {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
           {{#if showAtDesktop}}
             {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              {{i18n "bookmarks.reminders.at_desktop"}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.at_desktop"}}</div>
             {{/tap-tile}}
           {{/if}}
 
           {{#if showLaterToday}}
             {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              {{i18n "bookmarks.reminders.later_today"}}<br>
-              {{laterTodayFormatted}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_today"}}</div>
+              <div class="tap-tile-date">{{laterTodayFormatted}}</div>
             {{/tap-tile}}
           {{/if}}
           {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.tomorrow"}}<br>
-            {{tomorrowFormatted}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.tomorrow"}}</div>
+            <div class="tap-tile-date">{{tomorrowFormatted}}</div>
           {{/tap-tile}}
           {{#if showLaterThisWeek}}
             {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              {{i18n "bookmarks.reminders.later_this_week"}}<br>
-              {{laterThisWeekFormatted}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_this_week"}}</div>
+              <div class="tap-tile-date">{{laterThisWeekFormatted}}</div>
             {{/tap-tile}}
           {{/if}}
           {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.start_of_next_business_week"}}<br>
-            {{startNextBusinessWeekFormatted}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.start_of_next_business_week"}}</div>
+            <div class="tap-tile-date">{{startNextBusinessWeekFormatted}}</div>
           {{/tap-tile}}
           {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.next_week"}}<br>
-            {{nextWeekFormatted}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_week"}}</div>
+            <div class="tap-tile-date">{{nextWeekFormatted}}</div>
           {{/tap-tile}}
           {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.next_month"}}<br>
-            {{nextMonthFormatted}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_month"}}</div>
+            <div class="tap-tile-date">{{nextMonthFormatted}}</div>
           {{/tap-tile}}
           {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.custom"}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.custom"}}</div>
           {{/tap-tile}}
+
+          {{#if customDateTimeSelected}}
+            <div class="control-group custom-date-time-wrap">
+              <div class="tap-tile-date-input">
+                {{d-icon "calendar-alt"}}
+                {{date-picker-future
+                  value=customReminderDate
+                  onSelect=(action (mut customReminderDate))
+                }}
+              </div>
+              <div class="tap-tile-time-input">
+                {{d-icon "far-clock"}}
+                {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
+              </div>
+            </div>
+          {{/if}}
+
           {{#if showLastCustom}}
             {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              {{i18n "bookmarks.reminders.last_custom"}}<br>
-              {{lastCustomFormatted}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.last_custom"}}</div>
+              <div class="tap-tile-date">{{lastCustomFormatted}}</div>
             {{/tap-tile}}
           {{/if}}
+
           {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.none"}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.none"}}</div>
           {{/tap-tile}}
         {{/tap-tile-grid}}
-        {{#if customDateTimeSelected}}
-          <div class="control-group custom-date-time-wrap">
-            {{d-icon "calendar-alt"}}
-            {{date-picker-future
-              value=customReminderDate
-              onSelect=(action (mut customReminderDate))
-            }}
-            {{d-icon "far-clock"}}
-            {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
-          </div>
-        {{/if}}
 
       {{else}}
         <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index 14f91f70c3..0b08a4c8bd 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -1,9 +1,8 @@
 .bookmark-with-reminder.modal {
   .modal-inner-container {
-    max-width: 95%;
+    box-sizing: border-box;
   }
   .modal-body {
-    max-width: 410px;
     width: 100%;
     box-sizing: border-box;
 
@@ -17,24 +16,36 @@
   }
 
   .custom-date-time-wrap {
-    display: flex;
-    flex-direction: row;
-    align-items: baseline;
-
-    .svg-icon {
-      padding: 0 5px;
+    padding: 1em 1em 0.5em;
+    border: 1px solid $primary-low;
+    border-top: none;
+    margin-top: -0.667em;
+    background: $primary-very-low;
+    .d-icon {
+      padding: 0 0.75em 0 0;
+      color: $primary-high;
+      margin-top: -0.5em;
     }
 
-    .date-picker-wrapper {
-      flex: 1;
-
-      .date-picker {
+    .tap-tile-date-input,
+    .tap-tile-time-input {
+      display: flex;
+      align-items: center;
+      input {
         width: 100%;
+        min-width: unset;
       }
     }
 
+    .date-picker,
     .time-input {
-      flex: 1;
+      text-align: left;
+      padding-top: 5px;
+    }
+
+    .time-input,
+    .date-picker-wrapper {
+      flex: 1 1 auto;
     }
   }
 }
diff --git a/app/assets/stylesheets/common/components/tap-tile.scss b/app/assets/stylesheets/common/components/tap-tile.scss
index 6f71643cd1..e558b7adbf 100644
--- a/app/assets/stylesheets/common/components/tap-tile.scss
+++ b/app/assets/stylesheets/common/components/tap-tile.scss
@@ -1,28 +1,17 @@
 .tap-tile-grid {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
   justify-content: space-between;
-  $tile-width: 100px;
-  $horizontal-tile-padding: 5px;
+  margin: 0.5em 0 1em 0;
 
   .tap-tile {
     color: $primary-high;
-    padding: 10px $horizontal-tile-padding;
+    padding: 0.75em;
     display: flex;
-    flex-direction: column;
-    text-align: center;
+    flex-wrap: wrap;
     align-items: center;
-    border: 1px solid $primary-medium;
-    margin: 0 0 20px;
-    width: $tile-width;
-    font-size: $font-down-2;
+    border: 1px solid $primary-low;
+    margin: 0 0 0.5em;
     cursor: pointer;
 
-    @media screen and (max-width: 360px) {
-      width: $tile-width - 10;
-    }
-
     &:hover {
       background-color: $tertiary-low;
     }
@@ -31,16 +20,18 @@
       background-color: $highlight-medium;
     }
 
-    .svg-icon,
-    .svg-icon-title {
-      width: 2.5em;
-      height: 2.5em;
-      margin-bottom: 10px;
+    .d-icon {
+      color: $primary-medium;
+      margin: 0 0.5em 0 0;
+    }
+
+    .tap-tile-title {
+      font-weight: bold;
+      margin-right: auto;
+    }
+
+    .tap-tile-date {
+      margin-left: 1em;
     }
   }
-
-  &::after {
-    content: "";
-    width: $tile-width + ($horizontal-tile-padding * 3);
-  }
 }

From b9d411a4ebd0fa84855e9a68af9555a4c73c678a Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Sat, 4 Apr 2020 13:31:34 +0300
Subject: [PATCH 415/633] FIX: Topic.time_to_first_response should include
 sub-sub-categories (#9349)

---
 app/models/category.rb    | 19 +++++++++++++++++++
 app/models/topic.rb       | 11 +++--------
 lib/topic_query.rb        | 20 +-------------------
 spec/models/topic_spec.rb | 14 ++++++++++++++
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 6e0a073a6b..8a29f61250 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -153,6 +153,25 @@ class Category < ActiveRecord::Base
     Category.reset_topic_ids_cache
   end
 
+  def self.subcategory_ids(category_id)
+    sql = <<~SQL
+        WITH RECURSIVE subcategories AS (
+            SELECT :category_id id, 1 depth
+            UNION
+            SELECT categories.id, (subcategories.depth + 1) depth
+            FROM categories
+            JOIN subcategories ON subcategories.id = categories.parent_category_id
+            WHERE subcategories.depth < :max_category_nesting
+        )
+        SELECT id FROM subcategories
+      SQL
+    DB.query_single(
+      sql,
+      category_id: category_id,
+      max_category_nesting: SiteSetting.max_category_nesting
+    )
+  end
+
   def self.scoped_to_permissions(guardian, permission_types)
     if guardian.try(:is_admin?)
       all
diff --git a/app/models/topic.rb b/app/models/topic.rb
index a50c35dcb8..7a3a1a5b0b 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -189,11 +189,6 @@ class Topic < ActiveRecord::Base
     where("topics.category_id IS NULL OR topics.category_id IN (SELECT id FROM categories WHERE #{condition[0]})", condition[1])
   }
 
-  IN_CATEGORY_AND_SUBCATEGORIES_SQL = <<~SQL
-       t.category_id = :category_id
-    OR t.category_id IN (SELECT id FROM categories WHERE categories.parent_category_id = :category_id)
-  SQL
-
   scope :in_category_and_subcategories, lambda { |category_id|
     where("topics.category_id = ? OR topics.category_id IN (SELECT id FROM categories WHERE categories.parent_category_id = ?)",
         category_id,
@@ -1300,7 +1295,7 @@ class Topic < ActiveRecord::Base
     builder = DB.build(sql)
     builder.where("t.created_at >= :start_date", start_date: opts[:start_date]) if opts[:start_date]
     builder.where("t.created_at < :end_date", end_date: opts[:end_date]) if opts[:end_date]
-    builder.where(IN_CATEGORY_AND_SUBCATEGORIES_SQL, category_id: opts[:category_id]) if opts[:category_id]
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id])) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.where("p.deleted_at IS NULL")
@@ -1339,7 +1334,7 @@ class Topic < ActiveRecord::Base
     builder = DB.build(WITH_NO_RESPONSE_SQL)
     builder.where("t.created_at >= :start_date", start_date: start_date) if start_date
     builder.where("t.created_at < :end_date", end_date: end_date) if end_date
-    builder.where(IN_CATEGORY_AND_SUBCATEGORIES_SQL, category_id: category_id) if category_id
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(category_id)) if category_id
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_hash
@@ -1359,7 +1354,7 @@ class Topic < ActiveRecord::Base
 
   def self.with_no_response_total(opts = {})
     builder = DB.build(WITH_NO_RESPONSE_TOTAL_SQL)
-    builder.where(IN_CATEGORY_AND_SUBCATEGORIES_SQL, category_id: opts[:category_id]) if opts[:category_id]
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id])) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_single.first.to_i
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index f77d37e746..24a35b021e 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -1054,25 +1054,7 @@ class TopicQuery
 
   def subcategory_ids(category_id)
     @subcategory_ids ||= {}
-    @subcategory_ids[category_id] ||=
-      begin
-        sql = <<~SQL
-            WITH RECURSIVE subcategories AS (
-                SELECT :category_id id, 1 depth
-                UNION
-                SELECT categories.id, (subcategories.depth + 1) depth
-                FROM categories
-                JOIN subcategories ON subcategories.id = categories.parent_category_id
-                WHERE subcategories.depth < :max_category_nesting
-            )
-            SELECT id FROM subcategories
-          SQL
-        DB.query_single(
-          sql,
-          category_id: category_id,
-          max_category_nesting: SiteSetting.max_category_nesting
-        )
-      end
+    @subcategory_ids[category_id] ||= Category.subcategory_ids(category_id)
   end
 
   def sanitize_sql_array(input)
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 525541e414..84df06dd0d 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -2348,6 +2348,20 @@ describe Topic do
       expect(Topic.time_to_first_response_total).to eq(1)
     end
 
+    it "should have results if there's a topic with replies" do
+      SiteSetting.max_category_nesting = 3
+
+      category = Fabricate(:category_with_definition)
+      subcategory = Fabricate(:category_with_definition, parent_category_id: category.id)
+      subsubcategory = Fabricate(:category_with_definition, parent_category_id: subcategory.id)
+
+      topic = Fabricate(:topic, category: subsubcategory, created_at: 3.hours.ago)
+      Fabricate(:post, topic: topic, user: topic.user, post_number: 1, created_at: 3.hours.ago)
+      Fabricate(:post, topic: topic, post_number: 2, created_at: 2.hours.ago)
+
+      expect(Topic.time_to_first_response_total(category_id: category.id)).to eq(1)
+    end
+
     it "should only count regular posts as the first response" do
       topic = Fabricate(:topic, created_at: 5.hours.ago)
       Fabricate(:post, topic: topic, user: topic.user, post_number: 1, created_at: 5.hours.ago)

From f8ec5f309a80ef34776eacaac951c398693caa69 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Sat, 4 Apr 2020 14:20:01 +0300
Subject: [PATCH 416/633] FIX: Ensure category_id is an integer

---
 app/models/category.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 8a29f61250..5fb020c556 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -167,7 +167,7 @@ class Category < ActiveRecord::Base
       SQL
     DB.query_single(
       sql,
-      category_id: category_id,
+      category_id: category_id.to_i,
       max_category_nesting: SiteSetting.max_category_nesting
     )
   end

From ce00da3bcd29f1555dcfcfe241e968efbd249944 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Mon, 6 Apr 2020 09:56:47 +1000
Subject: [PATCH 417/633] FIX: guardian always got user but sometimes it is
 anonymous (#9342)

* FIX: guardian always got user but sometimes it is anonymous

```
  def initialize(user = nil, request = nil)
    @user = user.presence || AnonymousUser.new
    @request = request
  end
```

AnonymouseUser defines `blank?` method
```
  class AnonymousUser
    def blank?
      true
    end
    ...
  end
```
so if we would use @user.present? it would be correct, however, just @user is always true
---
 lib/guardian.rb                  | 4 ++--
 spec/components/guardian_spec.rb | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/guardian.rb b/lib/guardian.rb
index fae144f2b6..851dddf881 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -319,7 +319,7 @@ class Guardian
   # Support sites that have to approve users
   def can_access_forum?
     return true unless SiteSetting.must_approve_users?
-    return false unless @user
+    return false if anonymous?
 
     # Staff can't lock themselves out of a site
     return true if is_staff?
@@ -442,7 +442,7 @@ class Guardian
   end
 
   def can_export_entity?(entity)
-    return false unless @user
+    return false if anonymous?
     return true if is_admin?
     return entity != 'user_list' if is_moderator?
 
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 14d528fa7c..bea0404696 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -2743,6 +2743,7 @@ describe Guardian do
   end
 
   describe '#can_export_entity?' do
+    let(:anonymous_guardian) { Guardian.new }
     let(:user_guardian) { Guardian.new(user) }
     let(:moderator_guardian) { Guardian.new(moderator) }
     let(:admin_guardian) { Guardian.new(admin) }
@@ -2758,6 +2759,10 @@ describe Guardian do
       expect(moderator_guardian.can_export_entity?('staff_action')).to be_truthy
       expect(admin_guardian.can_export_entity?('staff_action')).to be_truthy
     end
+
+    it 'does not allow anonymous to export' do
+      expect(anonymous_guardian.can_export_entity?('user_archive')).to be_falsey
+    end
   end
 
   describe '#can_ignore_user?' do

From 40546af21746d469e39dfdcc9ca48987fef6cf3c Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 6 Apr 2020 13:14:46 +1000
Subject: [PATCH 418/633] FIX: Remove date from bookmark reminder non-English
 translations (#9354)

The {{date}} interpolated value was removed from the English translations in #9329 but not from the other translations, causing breakages.

Also adds a , inbetween date and time for reminders using long_no_year for readability.
---
 config/locales/client.ar.yml    |  2 +-
 config/locales/client.bg.yml    | 12 ++++++------
 config/locales/client.bs_BA.yml | 12 ++++++------
 config/locales/client.ca.yml    |  2 +-
 config/locales/client.cs.yml    |  2 +-
 config/locales/client.da.yml    |  8 ++++----
 config/locales/client.de.yml    | 12 ++++++------
 config/locales/client.el.yml    |  2 +-
 config/locales/client.en.yml    |  2 +-
 config/locales/client.en_US.yml |  2 +-
 config/locales/client.es.yml    | 12 ++++++------
 config/locales/client.et.yml    |  2 +-
 config/locales/client.fa_IR.yml | 12 ++++++------
 config/locales/client.fi.yml    | 12 ++++++------
 config/locales/client.fr.yml    |  2 +-
 config/locales/client.gl.yml    |  2 +-
 config/locales/client.he.yml    | 12 ++++++------
 config/locales/client.hu.yml    |  2 +-
 config/locales/client.hy.yml    |  2 +-
 config/locales/client.id.yml    |  2 +-
 config/locales/client.it.yml    |  2 +-
 config/locales/client.ja.yml    |  2 +-
 config/locales/client.ko.yml    |  2 +-
 config/locales/client.lt.yml    |  2 +-
 config/locales/client.lv.yml    |  2 +-
 config/locales/client.nb_NO.yml |  2 +-
 config/locales/client.nl.yml    | 12 ++++++------
 config/locales/client.pl_PL.yml |  2 +-
 config/locales/client.pt.yml    |  2 +-
 config/locales/client.pt_BR.yml | 12 ++++++------
 config/locales/client.ro.yml    |  2 +-
 config/locales/client.ru.yml    | 12 ++++++------
 config/locales/client.sk.yml    |  2 +-
 config/locales/client.sl.yml    |  2 +-
 config/locales/client.sq.yml    |  2 +-
 config/locales/client.sr.yml    |  2 +-
 config/locales/client.sv.yml    | 12 ++++++------
 config/locales/client.sw.yml    |  2 +-
 config/locales/client.te.yml    |  2 +-
 config/locales/client.th.yml    |  2 +-
 config/locales/client.tr_TR.yml |  2 +-
 config/locales/client.uk.yml    |  2 +-
 config/locales/client.ur.yml    |  2 +-
 config/locales/client.vi.yml    |  2 +-
 config/locales/client.zh_CN.yml |  8 ++++----
 config/locales/client.zh_TW.yml |  2 +-
 config/locales/server.bg.yml    | 10 +++++-----
 config/locales/server.bs_BA.yml | 10 +++++-----
 config/locales/server.da.yml    |  6 +++---
 config/locales/server.de.yml    | 10 +++++-----
 config/locales/server.en.yml    | 10 +++++-----
 config/locales/server.es.yml    | 10 +++++-----
 config/locales/server.fa_IR.yml | 10 +++++-----
 config/locales/server.fi.yml    | 10 +++++-----
 config/locales/server.fr.yml    |  8 ++++----
 config/locales/server.he.yml    | 10 +++++-----
 config/locales/server.nl.yml    | 10 +++++-----
 config/locales/server.pt_BR.yml | 10 +++++-----
 config/locales/server.ru.yml    | 10 +++++-----
 config/locales/server.sv.yml    | 10 +++++-----
 config/locales/server.zh_CN.yml |  8 ++++----
 61 files changed, 178 insertions(+), 178 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index bb88c38715..8b7e95c922 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -33,7 +33,7 @@ ar:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM h:mm a"
+      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY h:mm a"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 9dd640fb5b..9f1e68be00 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -28,7 +28,7 @@ bg:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM h:mm a"
+      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -260,11 +260,11 @@ bg:
       remove: "Премахнете отметката"
       save: "Запази"
       reminders:
-        later_today: "По-късно днес <br/>{{date}}"
-        next_business_day: "Следващият работен ден <br/>{{date}}"
-        tomorrow: "Утре <br/>{{date}}"
-        next_week: "Следващата седмица <br/>{{date}}"
-        next_month: "Следващият месец <br/>{{date}}"
+        later_today: "По-късно днес"
+        next_business_day: "Следващият работен ден"
+        tomorrow: "Утре"
+        next_week: "Следващата седмица"
+        next_month: "Следващият месец"
     drafts:
       resume: "Продължи"
       remove: "Премахване"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 99061a6922..a93fe0eb6b 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -29,7 +29,7 @@ bs_BA:
     dates:
       time: "HH: mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -294,11 +294,11 @@ bs_BA:
       no_timezone: 'Još uvijek niste postavili vremensku zonu, tako da nećete biti u mogućnosti koristiti podsjetnike. Postavite vremensku zonu <a href="%{basePath}/my/preferences/profile">na vašem profilu</a>.'
       reminders:
         at_desktop: "Sljedeći put sam za svojim desktop kompjuterom"
-        later_today: "Danas, malo kasnije <br/>{{date}}"
-        next_business_day: "Sljedeći radni dan <br/>{{date}}"
-        tomorrow: "Sutradan <br/>{{date}}"
-        next_week: "Sljedeće sedmice <br/>{{date}}"
-        next_month: "Sljedeći mjesec <br/>{{date}}"
+        later_today: "Danas, malo kasnije"
+        next_business_day: "Sljedeći radni dan"
+        tomorrow: "Sutradan"
+        next_week: "Sljedeće sedmice"
+        next_month: "Sljedeći mjesec"
         custom: "Precizno vrijeme i datum"
     drafts:
       resume: "Nastavi"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 74b0aab013..2eaf662830 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -28,7 +28,7 @@ ca:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY HH:mm"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 6040acb33b..6353c5eb02 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -30,7 +30,7 @@ cs:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM H:mm"
+      long_no_year: "D. MMMM, H:mm"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. M. YYYY, H:mm"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 87ac724689..e4435f7242 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -28,7 +28,7 @@ da:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM HH:mm"
+      long_no_year: "D. MMM, HH:mm"
       long_no_year_no_time: "D. MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY HH:mm"
@@ -265,9 +265,9 @@ da:
       confirm_clear: "Er du sikker på, at du vil rydde alle dine bogmærker fra dette emne?"
       save: "Gem"
       reminders:
-        tomorrow: "I morgen <br/>{{date}}"
-        next_week: "Næste uge <br/>{{date}}"
-        next_month: "Næste måned <br/>{{date}}"
+        tomorrow: "I morgen"
+        next_week: "Næste uge"
+        next_month: "Næste måned"
         custom: "Valgfri dato og tid"
     drafts:
       resume: "Genoptag"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index d39417f661..26b948f584 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -29,7 +29,7 @@ de:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM [um] HH:mm"
+      long_no_year: "D. MMM, [um] HH:mm"
       long_no_year_no_time: "D. MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY [um] HH:mm"
@@ -271,11 +271,11 @@ de:
       no_timezone: 'Du hast noch keine Zeitzone ausgewählt. Du wirst keine Erinnerungen erstellen können. Stelle eine <a href="%{basePath}/my/preferences/profile">in deinem Profil</a> ein.'
       reminders:
         at_desktop: "Nächstes mal wenn ich an meinem PC bin"
-        later_today: "Im Laufe des Tages <br/>{{date}}"
-        next_business_day: "Nächster Geschäftstag <br/>{{date}}"
-        tomorrow: "Morgen <br/>{{date}}"
-        next_week: "Nächste Woche <br/>{{date}}"
-        next_month: "Nächster Monat <br/>{{date}}"
+        later_today: "Im Laufe des Tages"
+        next_business_day: "Nächster Geschäftstag"
+        tomorrow: "Morgen"
+        next_week: "Nächste Woche"
+        next_month: "Nächster Monat"
         custom: "Eigenes Datum und Zeit"
     drafts:
       resume: "Fortsetzen"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 141223b830..810484e771 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -28,7 +28,7 @@ el:
     dates:
       time: "ΗΗ:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM HH:mm"
+      long_no_year: "DD MMM, HH:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 289e14161b..df0c07d641 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -44,7 +44,7 @@ en:
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       timeline_date: "MMM YYYY"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       long_no_year_no_time: "D MMM"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
diff --git a/config/locales/client.en_US.yml b/config/locales/client.en_US.yml
index 1f75f5f43e..96cf5c211d 100644
--- a/config/locales/client.en_US.yml
+++ b/config/locales/client.en_US.yml
@@ -8,7 +8,7 @@ en_US:
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       timeline_date: "MMM YYYY"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       long_no_year_no_time: "MMM D"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index f103b397ae..8a417d3868 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -29,7 +29,7 @@ es:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -271,11 +271,11 @@ es:
       no_timezone: 'No has establecido una zona horaria todavía. No podrás establecer recordatorios. Puedes elegir una <a href="%{basePath}/my/preferences/profile">en tu perfil</a>.'
       reminders:
         at_desktop: "La próxima vez que esté en mi ordenador"
-        later_today: "Más tarde hoy <br/>{{date}}"
-        next_business_day: "El próximo día hábil <br/>{{date}}"
-        tomorrow: "Mañana <br/>{{date}}"
-        next_week: "La próxima semana <br/>{{date}}"
-        next_month: "El mes que viene <br/>{{date}}"
+        later_today: "Más tarde hoy"
+        next_business_day: "El próximo día hábil"
+        tomorrow: "Mañana"
+        next_week: "La próxima semana"
+        next_month: "El mes que viene"
         custom: "Fecha y hora personalizadas"
     drafts:
       resume: "Reanudar"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index b2300de284..ab3c11c8dc 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -28,7 +28,7 @@ et:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM hh:mm"
+      long_no_year: "D. MMMM, hh:mm"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D. MMMM, YYYY hh:mm"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 2cae3f58ea..cc5a914031 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -29,7 +29,7 @@ fa_IR:
       time: "h:mm a"
       time_short_day: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -271,11 +271,11 @@ fa_IR:
       no_timezone: 'شما هنوز منطقه زمانی مشخص نکرده اید. شما قادر به تنظیم کردن یادآوری نیستید. یکی را در <a href="%{basePath}/my/preferences/profile"> پروفایل تان </a> تنظیم کنید.'
       reminders:
         at_desktop: "بار آینده من پشت میزم هستم"
-        later_today: "امروز کمی بعد <br/>{{date}}"
-        next_business_day: "روز کاری آینده <br/>{{date}}"
-        tomorrow: "فردا <br/>{{date}}"
-        next_week: "هفته ی آینده <br/>{{date}}"
-        next_month: "ماه آینده <br/>{{date}}"
+        later_today: "امروز کمی بعد"
+        next_business_day: "روز کاری آینده"
+        tomorrow: "فردا"
+        next_week: "هفته ی آینده"
+        next_month: "ماه آینده"
         custom: "درج تاریخ و ساعت"
     drafts:
       resume: "از سر گیری"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 7b4b32cd72..c64a976e1f 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -29,7 +29,7 @@ fi:
       time: "H:mm"
       time_short_day: "ddd HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM[ta] H:mm"
+      long_no_year: "D. MMMM[ta], H:mm"
       long_no_year_no_time: "D. MMMM[ta]"
       full_no_year_no_time: "Do MMMM[ta]"
       long_with_year: "D. MMMM[ta] YYYY H:mm"
@@ -271,11 +271,11 @@ fi:
       no_timezone: 'Et ole valinnut aikavyöhykettä, joten et voi asettaa muistutuksia. Aseta se  <a href="%{basePath}/my/preferences/profile">profiilisivullasi</a>.'
       reminders:
         at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
-        later_today: "Myöhemmin tänään  <br/>{{date}}"
-        next_business_day: "Seuraavana arkipäivänä <br/>{{date}}"
-        tomorrow: "Huomenna <br/>{{date}}"
-        next_week: "Ensi viikolla <br/>{{date}}"
-        next_month: "Ensi kuussa <br/>{{date}}"
+        later_today: "Myöhemmin tänään "
+        next_business_day: "Seuraavana arkipäivänä"
+        tomorrow: "Huomenna"
+        next_week: "Ensi viikolla"
+        next_month: "Ensi kuussa"
         custom: "Valitse päivämäärä ja kellonaika"
     drafts:
       resume: "Jatka"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index a4f35a7890..f5ff9f75b8 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -29,7 +29,7 @@ fr:
       time: "HH:mm"
       time_short_day: "ddd [à] HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM H:mm"
+      long_no_year: "DD MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "DD MMM YYYY H:mm"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 76119eb82c..7003482704 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -28,7 +28,7 @@ gl:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM h:mm a"
+      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMMM"
       long_with_year: "D MMM, YYYY h:mm a"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index c6c9b2b68e..d8390f7145 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -31,7 +31,7 @@ he:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D בMMM ‏HH:mm"
+      long_no_year: "D בMMM, ‏HH:mm"
       long_no_year_no_time: "D בMMM"
       full_no_year_no_time: "Do בMMMM"
       long_with_year: "D בMMM ‏YYYY ‏HH:mm"
@@ -319,11 +319,11 @@ he:
       no_timezone: 'עדיין לא הגדרת אזור זמן. לא תהיה לך אפשרות להגדיר תזכורות. ניתן להגדיר אותו <a href="%{basePath}/my/preferences/profile">בפרופיל שלך</a>.'
       reminders:
         at_desktop: "בשימוש הבא דרך שולחן העבודה"
-        later_today: "המשך היום <br/>{{date}}"
-        next_business_day: "ביום העסקים הבא <br/>{{date}}"
-        tomorrow: "מחר <br/>{{date}}"
-        next_week: "בשבוע הבא <br/>{{date}}"
-        next_month: "בחודש הבא <br/>{{date}}"
+        later_today: "המשך היום"
+        next_business_day: "ביום העסקים הבא"
+        tomorrow: "מחר"
+        next_week: "בשבוע הבא"
+        next_month: "בחודש הבא"
         custom: "תאריך ושעה מותאמים אישית"
     drafts:
       resume: "המשך"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 32a29333d0..d93084fe01 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -28,7 +28,7 @@ hu:
     dates:
       time: "h:mm a"
       timeline_date: "YYYY MMMM"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMM DD"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 64b3eaeea8..072bd750b9 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -28,7 +28,7 @@ hy:
     dates:
       time: "h:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm"
+      long_no_year: "MMM D, h:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index b209cd0d38..81216edbec 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -28,7 +28,7 @@ id:
       time: "h:mm a"
       time_short_day: "ddd, HH: mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "BBB D h:mm a"
+      long_no_year: "BBB D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index a58d8484b1..cc6521b9d7 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -29,7 +29,7 @@ it:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM h:mm a"
+      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY h:mm a"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 8ecc2938e0..cda1e3e757 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -27,7 +27,7 @@ ja:
     dates:
       time: "H:mm"
       timeline_date: "YYYY年M月"
-      long_no_year: "M月D日 H:mm"
+      long_no_year: "M月D日, H:mm"
       long_no_year_no_time: "M月D日"
       full_no_year_no_time: "M月D日"
       long_with_year: "YYYY年M月D日 H:mm"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index f158cd492e..ad53763b2a 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -27,7 +27,7 @@ ko:
     dates:
       time: "a h:mm"
       timeline_date: "YYYY MMM"
-      long_no_year: "M D a h:mm"
+      long_no_year: "M D a, h:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "YYYY MMM D a h:mm"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 10c0ee7acf..23861ae56e 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -30,7 +30,7 @@ lt:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMMM D H:mm"
+      long_no_year: "MMMM D, H:mm"
       long_no_year_no_time: "MMMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "YYYY MMMM D H:mm"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 4c85e26365..76235f9292 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -29,7 +29,7 @@ lv:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D hh:mm"
+      long_no_year: "MMM D, hh:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY hh:mm"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index c6c078ae0b..53162f8a7e 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -28,7 +28,7 @@ nb_NO:
     dates:
       time: "LT"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM LT"
+      long_no_year: "D MMM, LT"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D MMM YYYY LT"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 9cbacc231d..183ec2ebb6 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -29,7 +29,7 @@ nl:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -271,11 +271,11 @@ nl:
       no_timezone: 'U hebt nog geen tijdzone ingesteld. Hierdoor kunt u geen herinneringen instellen. Stel er een in <a href="%{basePath}/my/preferences/profile">in uw profiel</a>.'
       reminders:
         at_desktop: "De volgende keer vanaf mijn computer"
-        later_today: "Later vandaag <br/>{{date}}"
-        next_business_day: "Volgende werkdag <br/>{{date}}"
-        tomorrow: "Morgen <br/>{{date}}"
-        next_week: "Volgende week <br/>{{date}}"
-        next_month: "Volgende maand <br/>{{date}}"
+        later_today: "Later vandaag"
+        next_business_day: "Volgende werkdag"
+        tomorrow: "Morgen"
+        next_week: "Volgende week"
+        next_month: "Volgende maand"
         custom: "Aangepaste datum en tijd"
     drafts:
       resume: "Hervatten"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index a6bfdba8c2..0e170d8ca8 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -30,7 +30,7 @@ pl_PL:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM H:mm"
+      long_no_year: "D MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY H:mm"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index e90bc7df8e..7a8e4cb363 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -28,7 +28,7 @@ pt:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM hh:mm"
+      long_no_year: "DD MMM, hh:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "DD MMM YYYY hh:mm"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index a792d11c64..c2100cc36d 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -29,7 +29,7 @@ pt_BR:
       time: "H:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM H:mm"
+      long_no_year: "D MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D de MMMM"
       long_with_year: "D MMM, YYYY H:mm"
@@ -270,11 +270,11 @@ pt_BR:
       no_timezone: 'Você ainda não definiu um fuso horário. VOcê não poderá definir lembretes. Configure um <a href="%{basePath}/my/preferences/profile">no seu perfil</a>.'
       reminders:
         at_desktop: "Da próxima vez que estiver na minha área de trabalho"
-        later_today: "Hoje mais tarde <br/>{{date}}"
-        next_business_day: "Próximo dia comercial <br/>{{date}}"
-        tomorrow: "Amanhã <br/>{{date}}"
-        next_week: "Próxima semana <br/>{{date}}"
-        next_month: "Próximo mês <br/>{{date}}"
+        later_today: "Hoje mais tarde"
+        next_business_day: "Próximo dia comercial"
+        tomorrow: "Amanhã"
+        next_week: "Próxima semana"
+        next_month: "Próximo mês"
         custom: "Data e hora personalizadas"
     drafts:
       resume: "Resumir"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 3249c29358..b5352de22d 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -29,7 +29,7 @@ ro:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM HH:mm"
+      long_no_year: "DD MMM, HH:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM "
       long_with_year: "DD MMM YYYY HH:mm"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 72064bfd92..de1b818d13 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -31,7 +31,7 @@ ru:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMM"
       long_with_year: "D MMM YYYY, HH:mm"
@@ -319,11 +319,11 @@ ru:
       no_timezone: 'Укажите ваш часовой пояс <a href="%{basePath}/my/preferences/profile">в настройках своей учетной записи</a>, чтобы активировать функцию напоминаний.'
       reminders:
         at_desktop: "При следующем посещении форума"
-        later_today: "На сегодня, но чуть позже <br/>{{date}}"
-        next_business_day: "На следующий рабочий день <br/>{{date}}"
-        tomorrow: "На завтра <br/>{{date}}"
-        next_week: "На следующую неделю <br/>{{date}}"
-        next_month: "На следующий месяц <br/>{{date}}"
+        later_today: "На сегодня, но чуть позже"
+        next_business_day: "На следующий рабочий день"
+        tomorrow: "На завтра"
+        next_week: "На следующую неделю"
+        next_month: "На следующий месяц"
         custom: "Установить дату и время напоминания"
     drafts:
       resume: "Продолжить"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 80ca90c2e9..581b512a14 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -30,7 +30,7 @@ sk:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 3c84ec4ce6..1cb2bae4eb 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -30,7 +30,7 @@ sl:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM H:mm"
+      long_no_year: "D. MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY H:mm"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index e45a058273..2d814f9718 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -28,7 +28,7 @@ sq:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index e5ac7b8c51..20f594e376 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -29,7 +29,7 @@ sr:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY HH:mm"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 268b3d9cb1..d856489c4d 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -29,7 +29,7 @@ sv:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM, YYYY h:mm a"
@@ -271,11 +271,11 @@ sv:
       no_timezone: 'Du har ännu inte valt tidszon. Du kommer därför inte kunna sätta påminnelser. Ange en <a href="%{basePath}/my/preferences/profile">i din profil</a>.'
       reminders:
         at_desktop: "Nästa gång är jag vid datorn"
-        later_today: "Senare idag <br/>{{date}}"
-        next_business_day: "Nästa arbetsdag <br/>{{date}}"
-        tomorrow: "Imorgon <br/>{{date}}"
-        next_week: "Nästa vecka <br/>{{date}}"
-        next_month: "Nästa månad <br/>{{date}}"
+        later_today: "Senare idag"
+        next_business_day: "Nästa arbetsdag"
+        tomorrow: "Imorgon"
+        next_week: "Nästa vecka"
+        next_month: "Nästa månad"
         custom: "Anpassa datum och tid"
     drafts:
       resume: "Återuppta"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 37a5bbea3e..5f1e71b61e 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -28,7 +28,7 @@ sw:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index dd6bb45f82..3e792c170f 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -24,7 +24,7 @@ te:
             tb: టీబీ
     dates:
       time: "h:mm a"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       long_with_year: "MMM D, YYYY h:mm a"
       long_with_year_no_time: "MMM D, YYYY"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index bb31cf179d..3149fc5af8 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -27,7 +27,7 @@ th:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 90724174ad..65a225f7c8 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -29,7 +29,7 @@ tr_TR:
       time: "h:mm a"
       time_short_day: "ggg, SS:dd"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM h:mm a"
+      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM, YYYY h:mm a"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 2ffafbd745..be53040281 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -31,7 +31,7 @@ uk:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY, HH:mm"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 8187555885..99524b1b41 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -28,7 +28,7 @@ ur:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index f69a16b7d1..f71871ae86 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -28,7 +28,7 @@ vi:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 7ad3ead0be..ced1e8b9f5 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -28,7 +28,7 @@ zh_CN:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "YYYY[年]M[月]"
-      long_no_year: "M[月]D[日] HH:mm"
+      long_no_year: "M[月]D[日], HH:mm"
       long_no_year_no_time: "M月D日"
       full_no_year_no_time: "M月D日"
       long_with_year: "YYYY年M月D日 HH:mm"
@@ -248,9 +248,9 @@ zh_CN:
       reminders:
         at_desktop: "下次我使用桌面设备时"
         later_today: "今天晚些时候<br/> {{date}}"
-        next_business_day: "下个工作日<br/>{{date}}"
-        tomorrow: "明天<br/>{{date}}"
-        next_week: "下周<br/>{{date}}"
+        next_business_day: "下个工作日"
+        tomorrow: "明天"
+        next_week: "下周"
         next_month: "下个月<br/> {{date}}"
         custom: "自定义日期和时间"
     drafts:
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index eccce60986..80d0e7920c 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -27,7 +27,7 @@ zh_TW:
     dates:
       time: "h:mm a"
       timeline_date: "YYYY年 M月"
-      long_no_year: "M月 D日 h:mm a"
+      long_no_year: "M月 D日, h:mm a"
       long_no_year_no_time: "M月 D日"
       full_no_year_no_time: "M月 D日"
       long_with_year: "YYYY年 M月 D日 h:mm a"
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index c835d6fdc6..93a19cfefd 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -176,11 +176,11 @@ bg:
   excerpt_image: "изображение"
   bookmarks:
     reminders:
-      later_today: "По-късно днес <br/>{{date}}"
-      next_business_day: "Следващият работен ден <br/>{{date}}"
-      tomorrow: "Утре <br/>{{date}}"
-      next_week: "Следващата седмица <br/>{{date}}"
-      next_month: "Следващият месец <br/>{{date}}"
+      later_today: "По-късно днес"
+      next_business_day: "Следващият работен ден"
+      tomorrow: "Утре"
+      next_week: "Следващата седмица"
+      next_month: "Следващият месец"
   groups:
     errors:
       invalid_domain: "'%{domain}' е невалиден домейн."
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 1d8c0b4e2b..49473d134d 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -154,11 +154,11 @@ bs_BA:
   bookmarks:
     reminders:
       at_desktop: "Sljedeći put sam za svojim desktop kompjuterom"
-      later_today: "Danas, malo kasnije <br/>{{date}}"
-      next_business_day: "Sljedeći radni dan <br/>{{date}}"
-      tomorrow: "Sutradan <br/>{{date}}"
-      next_week: "Sljedeće sedmice <br/>{{date}}"
-      next_month: "Naredni mjesec <br/>{{date}}"
+      later_today: "Danas, malo kasnije"
+      next_business_day: "Sljedeći radni dan"
+      tomorrow: "Sutradan"
+      next_week: "Sljedeće sedmice"
+      next_month: "Naredni mjesec"
       custom: "Ciljano vrijeme i datum"
   groups:
     default_names:
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index f7f60829ff..05e49b2d2c 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -293,9 +293,9 @@ da:
   excerpt_image: "billede"
   bookmarks:
     reminders:
-      tomorrow: "I morgen <br/>{{date}}"
-      next_week: "Næste uge <br/>{{date}}"
-      next_month: "Næste måned <br/>{{date}}"
+      tomorrow: "I morgen"
+      next_week: "Næste uge"
+      next_month: "Næste måned"
       custom: "Valgfri dato og tid"
   groups:
     success:
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index e463bdcec1..e8570280b0 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -331,11 +331,11 @@ de:
       time_must_be_provided: "Zeit muss eingestellt werden für alle Erinnerungen ausser '%{reminder_type}'"
     reminders:
       at_desktop: "Nächstes mal wenn ich an meinem PC bin"
-      later_today: "Im Laufe des Tages <br/>{{date}}"
-      next_business_day: "Nächster Geschäftstag <br/>{{date}}"
-      tomorrow: "Morgen <br/>{{date}}"
-      next_week: "Nächste Woche <br/>{{date}}"
-      next_month: "Nächster Monat <br/>{{date}}"
+      later_today: "Im Laufe des Tages"
+      next_business_day: "Nächster Geschäftstag"
+      tomorrow: "Morgen"
+      next_week: "Nächste Woche"
+      next_month: "Nächster Monat"
       custom: "Eigenes Datum und Zeit"
   groups:
     success:
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 410f545eba..5574f69ae8 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -391,11 +391,11 @@ en:
 
     reminders:
       at_desktop: "Next time I'm at my desktop"
-      later_today: "Later today <br/>{{date}}"
-      next_business_day: "Next business day <br/>{{date}}"
-      tomorrow: "Tomorrow <br/>{{date}}"
-      next_week: "Next week <br/>{{date}}"
-      next_month: "Next month <br/>{{date}}"
+      later_today: "Later today"
+      next_business_day: "Next business day"
+      tomorrow: "Tomorrow"
+      next_week: "Next week"
+      next_month: "Next month"
       custom: "Custom date and time"
 
   groups:
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index a8d10b3571..9f545d92eb 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -331,11 +331,11 @@ es:
       time_must_be_provided: "se debe especificar la hora para todos los recordatorios excepto '%{reminder_type}'"
     reminders:
       at_desktop: "La próxima vez que esté en mi ordenador"
-      later_today: "Más tarde hoy <br/>{{date}}"
-      next_business_day: "El próximo día hábil <br/>{{date}}"
-      tomorrow: "Mañana <br/>{{date}}"
-      next_week: "La próxima semana <br/>{{date}}"
-      next_month: "El mes que viene <br/>{{date}}"
+      later_today: "Más tarde hoy"
+      next_business_day: "El próximo día hábil"
+      tomorrow: "Mañana"
+      next_week: "La próxima semana"
+      next_month: "El mes que viene"
       custom: "Fecha y hora personalizadas"
   groups:
     success:
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index fec91a39a9..d957ab034e 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -222,11 +222,11 @@ fa_IR:
   bookmarks:
     reminders:
       at_desktop: "بار آینده من پشت میزم هستم"
-      later_today: "امروز کمی بعد <br/>{{date}}"
-      next_business_day: "روز کاری آینده <br/>{{date}}"
-      tomorrow: "فردا <br/>{{date}}"
-      next_week: "هفته ی آینده <br/>{{date}}"
-      next_month: "ماه آینده <br/>{{date}}"
+      later_today: "امروز کمی بعد"
+      next_business_day: "روز کاری آینده"
+      tomorrow: "فردا"
+      next_week: "هفته ی آینده"
+      next_month: "ماه آینده"
       custom: "درج تاریخ و ساعت"
   groups:
     errors:
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index cc70ad1c0b..875c63ffc0 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -331,11 +331,11 @@ fi:
       time_must_be_provided: "kaikkiin muistutuksiin paitsi '%{reminder_type}' tarvitaan aika"
     reminders:
       at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
-      later_today: "Myöhemmin tänään  <br/>{{date}}"
-      next_business_day: "Seuraavana arkipäivänä <br/>{{date}}"
-      tomorrow: "Huomenna <br/>{{date}}"
-      next_week: "Ensi viikolla <br/>{{date}}"
-      next_month: "Ensi kuussa <br/>{{date}}"
+      later_today: "Myöhemmin tänään "
+      next_business_day: "Seuraavana arkipäivänä"
+      tomorrow: "Huomenna"
+      next_week: "Ensi viikolla"
+      next_month: "Ensi kuussa"
       custom: "Valitse päivämäärä ja kellonaika"
   groups:
     success:
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index ed4897d43e..8169754c58 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -328,10 +328,10 @@ fr:
     reminders:
       at_desktop: "La prochaine fois je suis à mon bureau"
       later_today: "Plus tard dans la journée\n{{date}}"
-      next_business_day: "Prochain jour ouvré<br/>{{date}}"
-      tomorrow: "Demain<br/>{{date}}"
-      next_week: "La semaine prochaine<br/>{{date}}"
-      next_month: "Le mois prochain<br/>{{date}}"
+      next_business_day: "Prochain jour ouvré"
+      tomorrow: "Demain"
+      next_week: "La semaine prochaine"
+      next_month: "Le mois prochain"
       custom: "Date et heure personnalisés"
   groups:
     success:
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 7d39b64201..2a4d0b5263 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -362,11 +362,11 @@ he:
       time_must_be_provided: "צריך לציין זמן לכל התזכורות למעט ‚%{reminder_type}’"
     reminders:
       at_desktop: "בשימוש הבא דרך שולחן העבודה"
-      later_today: "המשך היום <br/>{{date}}"
-      next_business_day: "ביום העסקים הבא <br/>{{date}}"
-      tomorrow: "מחר <br/>{{date}}"
-      next_week: "בשבוע הבא <br/>{{date}}"
-      next_month: "בחודש הבא <br/>{{date}}"
+      later_today: "המשך היום"
+      next_business_day: "ביום העסקים הבא"
+      tomorrow: "מחר"
+      next_week: "בשבוע הבא"
+      next_month: "בחודש הבא"
       custom: "תאריך ושעה מותאמים אישית"
   groups:
     success:
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index adebe50938..a0199c90ca 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -332,11 +332,11 @@ nl:
       time_must_be_provided: "tijd moet voor alle herinneringen behalve '%{reminder_type}' worden opgegeven"
     reminders:
       at_desktop: "De volgende keer vanaf mijn computer"
-      later_today: "Later vandaag <br/>{{date}}"
-      next_business_day: "Volgende werkdag <br/>{{date}}"
-      tomorrow: "Morgen <br/>{{date}}"
-      next_week: "Volgende week <br/>{{date}}"
-      next_month: "Volgende maand <br/>{{date}}"
+      later_today: "Later vandaag"
+      next_business_day: "Volgende werkdag"
+      tomorrow: "Morgen"
+      next_week: "Volgende week"
+      next_month: "Volgende maand"
       custom: "Aangepaste datum en tijd"
   groups:
     success:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 34f2e9b252..d2967f6158 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -316,11 +316,11 @@ pt_BR:
   bookmarks:
     reminders:
       at_desktop: "Da próxima vez que estiver na minha área de trabalho"
-      later_today: "Hoje mais tarde <br/>{{date}}"
-      next_business_day: "Próximo dia comercial <br/>{{date}}"
-      tomorrow: "Amanhã <br/>{{date}}"
-      next_week: "Próxima semana <br/>{{date}}"
-      next_month: "Próximo mês <br/>{{date}}"
+      later_today: "Hoje mais tarde"
+      next_business_day: "Próximo dia comercial"
+      tomorrow: "Amanhã"
+      next_week: "Próxima semana"
+      next_month: "Próximo mês"
       custom: "Data e hora personalizadas"
   groups:
     success:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 6699cf541d..df0609a743 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -353,11 +353,11 @@ ru:
       time_must_be_provided: "время должно быть установлено для всех напоминаний, кроме '%{reminder_type}'"
     reminders:
       at_desktop: "При следующем посещении форума"
-      later_today: "На сегодня, но чуть позже <br/>{{date}}"
-      next_business_day: "На следующий рабочий день <br/>{{date}}"
-      tomorrow: "На завтра <br/>{{date}}"
-      next_week: "На следующую неделю <br/>{{date}}"
-      next_month: "На следующий месяц <br/>{{date}}"
+      later_today: "На сегодня, но чуть позже"
+      next_business_day: "На следующий рабочий день"
+      tomorrow: "На завтра"
+      next_week: "На следующую неделю"
+      next_month: "На следующий месяц"
       custom: "Установить дату и время напоминания"
   groups:
     success:
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 68dc3866d4..94f6b6b931 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -332,11 +332,11 @@ sv:
       time_must_be_provided: "tid måste tillhandahållas för alla påminnelser utom '%{reminder_type}'"
     reminders:
       at_desktop: "Nästa gång är jag vid datorn"
-      later_today: "Senare idag <br/>{{date}}"
-      next_business_day: "Nästa arbetsdag <br/>{{date}}"
-      tomorrow: "Imorgon <br/>{{date}}"
-      next_week: "Nästa vecka <br/>{{date}}"
-      next_month: "Nästa månad <br/>{{date}}"
+      later_today: "Senare idag"
+      next_business_day: "Nästa arbetsdag"
+      tomorrow: "Imorgon"
+      next_week: "Nästa vecka"
+      next_month: "Nästa månad"
       custom: "Anpassa datum och tid"
   groups:
     success:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index af53b87eb5..09c3f2f18d 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -317,10 +317,10 @@ zh_CN:
       time_must_be_provided: "必须为除“ %{reminder_type}”以外的所有提醒提供时间"
     reminders:
       at_desktop: "下次我使用桌面设备时"
-      later_today: "晚于今天的<br/>{{date}}"
-      next_business_day: "下个工作日的<br/>{{date}}"
-      tomorrow: "明天<br/>{{date}}"
-      next_week: "下周<br/>{{date}}"
+      later_today: "晚于今天的"
+      next_business_day: "下个工作日的"
+      tomorrow: "明天"
+      next_week: "下周"
       next_month: "下个月<br/> {{date}}"
       custom: "自定义日期和时间"
   groups:

From 81c912bb003e7f7d97f2decee876b7581486de29 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 6 Apr 2020 16:29:14 +1000
Subject: [PATCH 419/633] FIX: when loading drafts set the topic

the behavior of loadDraft regressed and it no longer correctly set the topic
model leading to "undefined" when attempting to reply
---
 app/assets/javascripts/discourse/controllers/composer.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js b/app/assets/javascripts/discourse/controllers/composer.js
index 297d635fc0..c26be5f36a 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js
+++ b/app/assets/javascripts/discourse/controllers/composer.js
@@ -54,7 +54,8 @@ function loadDraft(store, opts) {
       draftKey,
       draftSequence,
       draft: true,
-      composerState: Composer.DRAFT
+      composerState: Composer.DRAFT,
+      topic: opts.topic
     };
 
     serializedFields.forEach(f => {

From a947b7b839cfdd7436d533752d4df3eee1ce8bec Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 6 Apr 2020 15:06:26 +0200
Subject: [PATCH 420/633] FIX: prevents registering multiple
 `topic-notifications-button:changed` (#9356)

A large topic page will always have the bottom tracking button, and will also have the timeline, meaning we already had 2 tracking events.

But it gets even worse when you know that the timeline button is a component connector which will trigger `didInsertElement` very frequently, meaning we were constantly adding more and more appEvents handlers.
---
 .../discourse/widgets/topic-timeline.js       |  3 ++-
 .../components/topic-notifications-button.js  | 24 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js b/app/assets/javascripts/discourse/widgets/topic-timeline.js
index 617a13bcd4..5f3cabfb8e 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js
@@ -388,7 +388,8 @@ createWidget("timeline-footer-controls", {
             topic,
             showFullTitle: false,
             appendReason: false,
-            placement: "bottom-end"
+            placement: "bottom-end",
+            mountedAsWidget: true
           },
           ["notificationLevel"]
         )
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/components/topic-notifications-button.js
index 747685c2ae..a0c16738b5 100644
--- a/app/assets/javascripts/select-kit/components/topic-notifications-button.js
+++ b/app/assets/javascripts/select-kit/components/topic-notifications-button.js
@@ -10,21 +10,25 @@ export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
 
-    this.appEvents.on(
-      "topic-notifications-button:changed",
-      this,
-      "_changeTopicNotificationLevel"
-    );
+    if (!this.mountedAsWidget) {
+      this.appEvents.on(
+        "topic-notifications-button:changed",
+        this,
+        "_changeTopicNotificationLevel"
+      );
+    }
   },
 
   willDestroyElement() {
     this._super(...arguments);
 
-    this.appEvents.off(
-      "topic-notifications-button:changed",
-      this,
-      "_changeTopicNotificationLevel"
-    );
+    if (!this.mountedAsWidget) {
+      this.appEvents.off(
+        "topic-notifications-button:changed",
+        this,
+        "_changeTopicNotificationLevel"
+      );
+    }
   },
 
   _changeTopicNotificationLevel(level) {

From fd39c85c1aea29bc396836ea7a9626a5b1793cb0 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 6 Apr 2020 20:43:38 +0530
Subject: [PATCH 421/633] FIX: add category hashtags support for sub-sub
 categories.

Hashtags will include last two levels only (ex: "parent:child").
---
 .../javascripts/discourse/lib/category-tag-search.js |  2 +-
 app/assets/javascripts/discourse/models/category.js  |  7 ++++---
 app/models/concerns/category_hashtag.rb              |  8 ++++----
 spec/components/concern/category_hashtag_spec.rb     | 12 ++++++++++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/category-tag-search.js b/app/assets/javascripts/discourse/lib/category-tag-search.js
index ca1ddcc85e..c258ddb6ae 100644
--- a/app/assets/javascripts/discourse/lib/category-tag-search.js
+++ b/app/assets/javascripts/discourse/lib/category-tag-search.js
@@ -76,7 +76,7 @@ export function search(term, siteSettings) {
   var numOfCategories = categories.length;
 
   categories = categories.map(category => {
-    return { model: category, text: Category.slugFor(category, SEPARATOR) };
+    return { model: category, text: Category.slugFor(category, SEPARATOR, 2) };
   });
 
   if (numOfCategories !== limit && siteSettings.tagging_enabled) {
diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/models/category.js
index bbbe590d0b..f264248f52 100644
--- a/app/assets/javascripts/discourse/models/category.js
+++ b/app/assets/javascripts/discourse/models/category.js
@@ -264,14 +264,15 @@ Category.reopenClass({
     return _uncategorized;
   },
 
-  slugFor(category, separator = "/") {
+  slugFor(category, separator = "/", depth = 3) {
     if (!category) return "";
 
     const parentCategory = get(category, "parentCategory");
     let result = "";
 
-    if (parentCategory) {
-      result = Category.slugFor(parentCategory) + separator;
+    if (parentCategory && depth > 1) {
+      result =
+        Category.slugFor(parentCategory, separator, depth - 1) + separator;
     }
 
     const id = get(category, "id"),
diff --git a/app/models/concerns/category_hashtag.rb b/app/models/concerns/category_hashtag.rb
index 5a8c92f92c..95b1521c25 100644
--- a/app/models/concerns/category_hashtag.rb
+++ b/app/models/concerns/category_hashtag.rb
@@ -9,17 +9,17 @@ module CategoryHashtag
     def query_from_hashtag_slug(category_slug)
       parent_slug, child_slug = category_slug.split(SEPARATOR, 2)
 
-      category = Category.where(slug: parent_slug, parent_category_id: nil)
+      categories = Category.where(slug: parent_slug)
 
       if child_slug
-        Category.where(slug: child_slug, parent_category_id: category.select(:id)).first
+        Category.where(slug: child_slug, parent_category_id: categories.select(:id)).first
       else
-        category.first
+        categories.where(parent_category_id: nil).first
       end
     end
   end
 
   def hashtag_slug
-    full_slug(SEPARATOR)
+    full_slug.split("-").last(2).join(SEPARATOR)
   end
 end
diff --git a/spec/components/concern/category_hashtag_spec.rb b/spec/components/concern/category_hashtag_spec.rb
index 3d59995bab..81f437efae 100644
--- a/spec/components/concern/category_hashtag_spec.rb
+++ b/spec/components/concern/category_hashtag_spec.rb
@@ -36,5 +36,17 @@ describe CategoryHashtag do
       expect(Category.query_from_hashtag_slug("apple")).to eq(nil)
       expect(Category.query_from_hashtag_slug("apple#{CategoryHashtag::SEPARATOR}orange")).to eq(nil)
     end
+
+    context "multi-level categories" do
+      before do
+        SiteSetting.max_category_nesting = 3
+      end
+
+      it "should return the right result for a grand child category slug" do
+        category = Fabricate(:category, parent_category: child_category)
+        expect(Category.query_from_hashtag_slug("#{child_category.slug}#{CategoryHashtag::SEPARATOR}#{category.slug}"))
+          .to eq(category)
+      end
+    end
   end
 end

From a00cfe853a438d57e23c570819e83e7e94f0d700 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:34:59 -0400
Subject: [PATCH 422/633] Build(deps): Bump parser from 2.7.0.5 to 2.7.1.0
 (#9347)

Bumps [parser](https://github.com/whitequark/parser) from 2.7.0.5 to 2.7.1.0.
- [Release notes](https://github.com/whitequark/parser/releases)
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitequark/parser/compare/v2.7.0.5...v2.7.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a087e40104..25b0c3c6b1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,7 +253,7 @@ GEM
     parallel (1.19.1)
     parallel_tests (2.32.0)
       parallel
-    parser (2.7.0.5)
+    parser (2.7.1.0)
       ast (~> 2.4.0)
     pg (1.2.3)
     progress (3.5.2)

From 8c06c64bfb663c6bbcb0cdfad53e5a44875b5795 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:35:29 -0400
Subject: [PATCH 423/633] Build(deps): Bump aws-sdk-s3 from 1.61.1 to 1.61.2
 (#9348)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.1 to 1.61.2.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 25b0c3c6b1..c471c491cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,8 +45,8 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.284.0)
-    aws-sdk-core (3.91.0)
+    aws-partitions (1.294.0)
+    aws-sdk-core (3.92.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -54,7 +54,7 @@ GEM
     aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.61.1)
+    aws-sdk-s3 (1.61.2)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)

From 24fbe3e7962bb7088884a5f25a4cce1a31697df5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:40:45 -0400
Subject: [PATCH 424/633] Build(deps): Bump oj from 3.10.5 to 3.10.6 (#9351)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.5 to 3.10.6.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.5...v3.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c471c491cd..0144fa498f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -216,7 +216,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.10.5)
+    oj (3.10.6)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)

From c72fb252a564904cd4d3f4d21e35f2fcc833493d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:41:47 -0400
Subject: [PATCH 425/633] Build(deps): Bump loofah from 2.4.0 to 2.5.0 (#9352)

Bumps [loofah](https://github.com/flavorjones/loofah) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.4.0...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0144fa498f..cffd95eeb1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
     logster (2.8.0)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)

From ed74a6c1264e0674caeb5bcf684da1e322e4dffc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:42:03 -0400
Subject: [PATCH 426/633] Build(deps): Bump public_suffix from 4.0.3 to 4.0.4
 (#9353)

Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/weppos/publicsuffix-ruby/releases)
- [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/weppos/publicsuffix-ruby/compare/4.0.3...v4.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cffd95eeb1..cb70d824a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -264,7 +264,7 @@ GEM
       pry (>= 0.9.10, < 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.3)
+    public_suffix (4.0.4)
     puma (4.3.3)
       nio4r (~> 2.0)
     r2 (0.2.7)

From 3814ca06a82e064222e8a46933acad734d5b97c4 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 6 Apr 2020 17:24:59 +0100
Subject: [PATCH 427/633] DEV: Allow using .js extension for javascript modules
 in themes (#9358)

---
 app/models/theme_field.rb       | 2 +-
 spec/models/theme_field_spec.rb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 085a0e649e..ed0966fb5c 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -134,7 +134,7 @@ class ThemeField < ActiveRecord::Base
     filename, extension = name.split(".", 2)
     begin
       case extension
-      when "js.es6"
+      when "js.es6", "js"
         js_compiler.append_module(content, filename)
       when "hbs"
         js_compiler.append_ember_template(filename.sub("discourse/templates/", ""), content)
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 28d2e3de14..306b3aeec3 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -173,7 +173,8 @@ HTML
 
   it "correctly handles extra JS fields" do
     theme = Fabricate(:theme)
-    js_field = theme.set_field(target: :extra_js, name: "discourse/controllers/discovery.js.es6", value: "import 'discourse/lib/ajax'; console.log('hello');")
+    js_field = theme.set_field(target: :extra_js, name: "discourse/controllers/discovery.js.es6", value: "import 'discourse/lib/ajax'; console.log('hello from .js.es6');")
+    js_2_field = theme.set_field(target: :extra_js, name: "discourse/controllers/discovery-2.js", value: "import 'discourse/lib/ajax'; console.log('hello from .js');")
     hbs_field = theme.set_field(target: :extra_js, name: "discourse/templates/discovery.hbs", value: "{{hello-world}}")
     raw_hbs_field = theme.set_field(target: :extra_js, name: "discourse/templates/discovery.hbr", value: "{{hello-world}}")
     hbr_field = theme.set_field(target: :extra_js, name: "discourse/templates/other_discovery.hbr", value: "{{hello-world}}")
@@ -189,7 +190,7 @@ HTML
         var themePrefix = function themePrefix(key) {
           return "theme_translations.#{theme.id}." + key;
         };
-        console.log('hello');
+        console.log('hello from .js.es6');
       });
     JS
     expect(js_field.reload.value_baked).to eq(expected_js.strip)
@@ -204,6 +205,7 @@ HTML
     expect(theme.javascript_cache.content).to include('Ember.TEMPLATES["discovery"]')
     expect(theme.javascript_cache.content).to include('Discourse.RAW_TEMPLATES["discovery"]')
     expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery"')
+    expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery-2"')
     expect(theme.javascript_cache.content).to include("var settings =")
   end
 

From 30983021e266489b65a12c1ad32d3e42806d2186 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Mon, 6 Apr 2020 12:02:33 -0500
Subject: [PATCH 428/633] No category styles (#9359)

* UI: "No category styles" apply to category boxes
---
 .../components/categories-boxes-with-topics.js   |  2 ++
 .../discourse/components/categories-boxes.js     |  2 ++
 .../components/categories-boxes-with-topics.hbs  |  2 +-
 .../templates/components/categories-boxes.hbs    |  2 +-
 .../discourse/templates/user/messages.hbs        |  4 ++--
 .../stylesheets/common/base/category-list.scss   | 16 ++++++++++++++++
 .../stylesheets/desktop/category-list.scss       |  5 -----
 7 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js b/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
index ffd3a77ca8..40fb4df22f 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
+++ b/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
@@ -1,6 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
+import { equal } from "@ember/object/computed";
 
 export default Component.extend({
   tagName: "section",
@@ -8,6 +9,7 @@ export default Component.extend({
     ":category-boxes-with-topics",
     "anyLogos:with-logos:no-logos"
   ],
+  noCategoryStyle: equal("siteSettings.category_style", "none"),
 
   @discourseComputed("categories.[].uploaded_logo.url")
   anyLogos() {
diff --git a/app/assets/javascripts/discourse/components/categories-boxes.js b/app/assets/javascripts/discourse/components/categories-boxes.js
index c3aadd638c..331d06c216 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes.js
+++ b/app/assets/javascripts/discourse/components/categories-boxes.js
@@ -1,6 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
+import { equal } from "@ember/object/computed";
 
 export default Component.extend({
   tagName: "section",
@@ -9,6 +10,7 @@ export default Component.extend({
     "anyLogos:with-logos:no-logos",
     "hasSubcategories:with-subcategories"
   ],
+  noCategoryStyle: equal("siteSettings.category_style", "none"),
 
   @discourseComputed("categories.[].uploaded_logo.url")
   anyLogos() {
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index d4a40fc5a9..fc71891854 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -1,5 +1,5 @@
 {{#each categories as |c|}}
-  <div data-notification-level={{c.notificationLevelString}} class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}}' style={{border-color c.color}}>
+  <div data-notification-level={{c.notificationLevelString}} class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}' style={{unless noCategoryStyle (border-color c.color)}}>
     <div class='category-box-inner'>
       <div class='category-box-heading'>
         <a href={{c.url}}>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index b629646a56..755eea2b72 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -1,5 +1,5 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}}' style={{border-color c.color}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
+  <div class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}' style={{unless noCategoryStyle (border-color c.color)}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
    data-url={{c.url}}>
     <div class='category-box-inner'>
       {{#unless c.isMuted}}
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 3dc34f67a1..643928faa1 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -1,7 +1,7 @@
 {{#d-section class="user-secondary-navigation" pageClass="user-messages"}}
   {{#unless site.mobileView}}
     {{#if showNewPM}}
-      {{d-button class="btn-primary new-private-message" action=(route-action "composePrivateMessage") icon="envelope" label="user.new_private_message"}}
+      {{d-button class="btn-primary new-" action=(route-action "composePrivateMessage") icon="envelope" label="user.new_private_message"}}
     {{/if}}
   {{/unless}}
 
@@ -72,7 +72,7 @@
     {{#if site.mobileView}}
       {{#if showNewPM}}
         {{d-button
-          class="btn-primary new-private-message"
+          class="btn-primary new-"
           action=(route-action "composePrivateMessage")
           icon="envelope"
           label="user.new_private_message"}}
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index b7cc6432a7..782415c5dc 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -324,3 +324,19 @@
     color: $primary-medium;
   }
 }
+
+.category-list {
+  tbody {
+    .category {
+      &.no-category-style {
+        border-color: transparent;
+        border-left: 0px;
+        padding-left: 0px;
+      }
+    }
+  }
+}
+
+.category-box.no-category-boxes-style {
+  border-left-width: 2px;
+}
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index c5774106ab..50801d9d34 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -94,11 +94,6 @@
 
   tbody {
     .category {
-      &.no-category-style {
-        border-color: transparent;
-        border-left: 0px;
-        padding-left: 0px;
-      }
       border-left: 6px solid;
       h3,
       h4 {

From 028915e4b9b0c72bfcb794aa52c57fb0d7abf5b1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 6 Apr 2020 19:22:29 +0200
Subject: [PATCH 429/633] FIX: revert inadvertently removed css class (#9360)

---
 app/assets/javascripts/discourse/templates/user/messages.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 643928faa1..3dc34f67a1 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -1,7 +1,7 @@
 {{#d-section class="user-secondary-navigation" pageClass="user-messages"}}
   {{#unless site.mobileView}}
     {{#if showNewPM}}
-      {{d-button class="btn-primary new-" action=(route-action "composePrivateMessage") icon="envelope" label="user.new_private_message"}}
+      {{d-button class="btn-primary new-private-message" action=(route-action "composePrivateMessage") icon="envelope" label="user.new_private_message"}}
     {{/if}}
   {{/unless}}
 
@@ -72,7 +72,7 @@
     {{#if site.mobileView}}
       {{#if showNewPM}}
         {{d-button
-          class="btn-primary new-"
+          class="btn-primary new-private-message"
           action=(route-action "composePrivateMessage")
           icon="envelope"
           label="user.new_private_message"}}

From b248c553c26ada437c5f1b81677a83d08b455fb2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 6 Apr 2020 19:41:59 +0200
Subject: [PATCH 430/633] DEV: ensures CustomEmoji cache is cleared after spec
 (#9361)

---
 spec/components/plugin/instance_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index 6453339706..26dd0d39c7 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -544,6 +544,10 @@ describe Plugin::Instance do
       Plugin::CustomEmoji.clear_cache
     end
 
+    after do
+      Plugin::CustomEmoji.clear_cache
+    end
+
     it 'allows to register an emoji' do
       Plugin::Instance.new.register_emoji("foo", "/foo/bar.png")
 

From 58bec3b20023797b8711b65423b61398f76150c1 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 6 Apr 2020 14:00:55 -0500
Subject: [PATCH 431/633] DEV: Option for adding an icon in
 wizard-field-checkboxes component (#9363)

---
 .../wizard/templates/components/wizard-field-checkboxes.hbs    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs
index 25aeadbbde..fa8427ac19 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs
@@ -5,6 +5,9 @@
             class="wizard-checkbox"
             click=(action "changed" value="target")
             checked=c.checked}}
+      {{#if c.icon}}
+        {{d-icon c.icon}}
+      {{/if}}
       {{c.label}}
     </label>
   </div>

From d04ba4b3b2e4c750d3f4bd32a2263cd6e405eb69 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 6 Apr 2020 16:55:44 -0600
Subject: [PATCH 432/633] DEPRECATION: Remove support for api creds in query
 params (#9106)

* DEPRECATION: Remove support for api creds in query params

This commit removes support for api credentials in query params except
for a few whitelisted routes like rss/json feeds and the handle_mail
route.

Several tests were written to valid these changes, but the bulk of the
spec changes are just switching them over to use header based auth so
that they will pass without changing what they were actually testing.

Original commit that notified admins this change was coming was created
over 3 months ago: 2db20031879dbafd1a90cbb1a43bca55d51c1b08

* fix tests

* Also allow iCalendar feeds

Co-authored-by: Rafael dos Santos Silva <xfalcox@gmail.com>
---
 lib/auth/default_current_user_provider.rb     |  11 +-
 .../default_current_user_provider_spec.rb     | 109 +++++++++++++----
 .../invite_only_registration_spec.rb          |  17 +--
 spec/integration/rate_limiting_spec.rb        |  12 +-
 spec/requests/admin/users_controller_spec.rb  |   5 +-
 spec/requests/embed_controller_spec.rb        |   6 +-
 spec/requests/posts_controller_spec.rb        | 113 ++++++------------
 spec/requests/uploads_controller_spec.rb      |   5 +-
 spec/requests/user_badges_controller_spec.rb  |  10 +-
 spec/requests/users_controller_spec.rb        |  25 ++--
 10 files changed, 170 insertions(+), 143 deletions(-)

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 3e293dcb77..c43580c042 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -286,12 +286,8 @@ class Auth::DefaultCurrentUserProvider
     if api_key = ApiKey.active.with_key(api_key_value).includes(:user).first
       api_username = header_api_key? ? @env[HEADER_API_USERNAME] : request[API_USERNAME]
 
-      # Check for deprecated api auth
       if !header_api_key?
-        unless is_whitelisted_query_param_auth_route?(request)
-          # Notify admins of deprecated auth method
-          AdminDashboardData.add_problem_message('dashboard.deprecated_api_usage', 1.day)
-        end
+        raise Discourse::InvalidAccess unless is_whitelisted_query_param_auth_route?(request)
       end
 
       if api_key.allowed_ips.present? && !api_key.allowed_ips.any? { |ip| ip.include?(request.ip) }
@@ -321,12 +317,13 @@ class Auth::DefaultCurrentUserProvider
   private
 
   def is_whitelisted_query_param_auth_route?(request)
-    (is_rss_feed?(request) || is_handle_mail?(request))
+    (is_user_feed?(request) || is_handle_mail?(request))
   end
 
-  def is_rss_feed?(request)
+  def is_user_feed?(request)
     return true if request.path.match?(/\/(c|t){1}\/\S*.(rss|json)/) && request.get? # topic or category route
     return true if request.path.match?(/\/(latest|top|categories).(rss|json)/) && request.get? # specific routes with rss
+    return true if request.path.match?(/\/u\/\S*\/bookmarks.(ics|json)/) && request.get? # specific routes with ics
   end
 
   def is_handle_mail?(request)
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index f0c6fbc90e..621ece61e0 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -33,7 +33,8 @@ describe Auth::DefaultCurrentUserProvider do
     it "finds a user for a correct per-user api key" do
       user = Fabricate(:user)
       api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
-      good_provider = provider("/?api_key=#{api_key.key}")
+      params = { "HTTP_API_KEY" => api_key.key }
+      good_provider = provider("/", params)
       expect(good_provider.current_user.id).to eq(user.id)
       expect(good_provider.is_api?).to eq(true)
       expect(good_provider.is_user_api?).to eq(false)
@@ -67,20 +68,22 @@ describe Auth::DefaultCurrentUserProvider do
 
     it "raises for a revoked key" do
       user = Fabricate(:user)
-      key = ApiKey.create!
+      api_key = ApiKey.create!
+      params = { "HTTP_API_USERNAME" => user.username.downcase, "HTTP_API_KEY" => api_key.key }
       expect(
-        provider("/?api_key=#{key.key}&api_username=#{user.username.downcase}").current_user.id
+        provider("/", params).current_user.id
       ).to eq(user.id)
 
-      key.reload.update(revoked_at: Time.zone.now, last_used_at: nil)
-      expect(key.reload.last_used_at).to eq(nil)
+      api_key.reload.update(revoked_at: Time.zone.now, last_used_at: nil)
+      expect(api_key.reload.last_used_at).to eq(nil)
+      params = { "HTTP_API_USERNAME" => user.username.downcase, "HTTP_API_KEY" => api_key.key }
 
       expect {
-        provider("/?api_key=#{key.key}&api_username=#{user.username.downcase}").current_user
+        provider("/", params).current_user
       }.to raise_error(Discourse::InvalidAccess)
 
-      key.reload
-      expect(key.last_used_at).to eq(nil)
+      api_key.reload
+      expect(api_key.last_used_at).to eq(nil)
     end
 
     it "raises for a user with a mismatching ip" do
@@ -97,25 +100,35 @@ describe Auth::DefaultCurrentUserProvider do
       freeze_time
 
       user = Fabricate(:user)
-      key = ApiKey.create!(user_id: user.id, created_by_id: -1, allowed_ips: ['100.0.0.0/24'])
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1, allowed_ips: ['100.0.0.0/24'])
+      params = {
+        "HTTP_API_USERNAME" => user.username.downcase,
+        "HTTP_API_KEY" => api_key.key,
+        "REMOTE_ADDR" => "100.0.0.22"
+      }
 
-      found_user = provider("/?api_key=#{key.key}&api_username=#{user.username.downcase}",
-                            "REMOTE_ADDR" => "100.0.0.22").current_user
+      found_user = provider("/", params).current_user
 
       expect(found_user.id).to eq(user.id)
 
-      found_user = provider("/?api_key=#{key.key}&api_username=#{user.username.downcase}",
-                            "HTTP_X_FORWARDED_FOR" => "10.1.1.1, 100.0.0.22").current_user
+      params = {
+        "HTTP_API_USERNAME" => user.username.downcase,
+        "HTTP_API_KEY" => api_key.key,
+        "HTTP_X_FORWARDED_FOR" => "10.1.1.1, 100.0.0.22"
+      }
+
+      found_user = provider("/", params).current_user
       expect(found_user.id).to eq(user.id)
 
-      key.reload
-      expect(key.last_used_at).to eq_time(Time.zone.now)
+      api_key.reload
+      expect(api_key.last_used_at).to eq_time(Time.zone.now)
     end
 
     it "finds a user for a correct system api key" do
       user = Fabricate(:user)
       api_key = ApiKey.create!(created_by_id: -1)
-      expect(provider("/?api_key=#{api_key.key}&api_username=#{user.username.downcase}").current_user.id).to eq(user.id)
+      params = { "HTTP_API_USERNAME" => user.username.downcase, "HTTP_API_KEY" => api_key.key }
+      expect(provider("/", params).current_user.id).to eq(user.id)
     end
 
     it "raises for a mismatched api_key param and header username" do
@@ -130,8 +143,9 @@ describe Auth::DefaultCurrentUserProvider do
     it "finds a user for a correct system api key with external id" do
       user = Fabricate(:user)
       api_key = ApiKey.create!(created_by_id: -1)
+      params = { "HTTP_API_KEY" => api_key.key, "HTTP_API_USER_EXTERNAL_ID" => "abc" }
       SingleSignOnRecord.create(user_id: user.id, external_id: "abc", last_payload: '')
-      expect(provider("/?api_key=#{api_key.key}&api_user_external_id=abc").current_user.id).to eq(user.id)
+      expect(provider("/", params).current_user.id).to eq(user.id)
     end
 
     it "raises for a mismatched api_key param and header external id" do
@@ -147,7 +161,8 @@ describe Auth::DefaultCurrentUserProvider do
     it "finds a user for a correct system api key with id" do
       user = Fabricate(:user)
       api_key = ApiKey.create!(created_by_id: -1)
-      expect(provider("/?api_key=#{api_key.key}&api_user_id=#{user.id}").current_user.id).to eq(user.id)
+      params = { "HTTP_API_USER_ID" => user.id, "HTTP_API_KEY" => api_key.key }
+      expect(provider("/", params).current_user.id).to eq(user.id)
     end
 
     it "raises for a mismatched api_key param and header user id" do
@@ -176,36 +191,80 @@ describe Auth::DefaultCurrentUserProvider do
         user = Fabricate(:user)
         api_key = ApiKey.create!(created_by_id: -1)
         key = api_key.key
+        user_params = { "HTTP_API_KEY" => key, "HTTP_API_USERNAME" => user.username.downcase }
+        system_params = { "HTTP_API_KEY" => key, "HTTP_API_USERNAME" => "system" }
 
-        provider("/?api_key=#{key}&api_username=#{user.username.downcase}").current_user
-        provider("/?api_key=#{key}&api_username=system").current_user
-        provider("/?api_key=#{key}&api_username=#{user.username.downcase}").current_user
+        provider("/", user_params).current_user
+        provider("/", system_params).current_user
+        provider("/", user_params).current_user
 
         expect do
-          provider("/?api_key=#{key}&api_username=system").current_user
+          provider("/", system_params).current_user
         end.to raise_error(RateLimiter::LimitExceeded)
 
         freeze_time 59.seconds.from_now
 
         expect do
-          provider("/?api_key=#{key}&api_username=system").current_user
+          provider("/", system_params).current_user
         end.to raise_error(RateLimiter::LimitExceeded)
 
         freeze_time 2.seconds.from_now
 
         # 1 minute elapsed
-        provider("/?api_key=#{key}&api_username=system").current_user
+        provider("/", system_params).current_user
 
         # should not rake limit a random key
         api_key.destroy
         api_key = ApiKey.create!(created_by_id: -1)
-        provider("/?api_key=#{api_key.key}&api_username=#{user.username.downcase}").current_user
+        user_params = { "HTTP_API_KEY" => api_key.key, "HTTP_API_USERNAME" => user.username.downcase }
+        provider("/", user_params).current_user
 
       end
     end
 
   end
 
+  context "whitelisted api auth query param routes" do
+
+    it "allows rss feeds" do
+      user = Fabricate(:user)
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
+      url = "/latest.rss?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+      expect(provider(url).current_user.id).to eq(user.id)
+    end
+
+    it "allows ics feeds" do
+      user = Fabricate(:user)
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
+      url = "/u/#{user.username}/bookmarks.ics?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+      expect(provider(url).current_user.id).to eq(user.id)
+    end
+
+    it "allows handle mail route" do
+      user = Fabricate(:user)
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
+      url = "/admin/email/handle_mail?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+      opts = { method: "POST" }
+      expect(provider(url, opts).current_user.id).to eq(user.id)
+    end
+
+    it "raises errors for non whitlisted routes" do
+      user = Fabricate(:user)
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
+      url = "/u?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+      expect {
+        provider(url).current_user
+      }.to raise_error(Discourse::InvalidAccess)
+    end
+
+    it "still allows header based auth" do
+      user = Fabricate(:user)
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
+      params = { "HTTP_API_KEY" => api_key.key, "HTTP_API_USERNAME" => user.username.downcase }
+      expect(provider("/", params).current_user.id).to eq(user.id)
+    end
+  end
+
   context "server header api" do
 
     it "raises errors for incorrect api_key" do
diff --git a/spec/integration/invite_only_registration_spec.rb b/spec/integration/invite_only_registration_spec.rb
index 6047bc054c..5f19efb60f 100644
--- a/spec/integration/invite_only_registration_spec.rb
+++ b/spec/integration/invite_only_registration_spec.rb
@@ -19,22 +19,23 @@ describe 'invite only' do
         username: 'bob',
         password: 'strongpassword',
         email: 'bob@bob.com',
-        api_key: api_key.key,
-        api_username: admin.username
+      }, headers: {
+        HTTP_API_KEY: api_key.key,
+        HTTP_API_USERNAME: admin.username
       }
 
       user_id = JSON.parse(response.body)["user_id"]
       expect(user_id).to be > 0
 
       # activate and approve
-      put "/admin/users/#{user_id}/activate.json", params: {
-        api_key: api_key.key,
-        api_username: admin.username
+      put "/admin/users/#{user_id}/activate.json", headers: {
+        HTTP_API_KEY: api_key.key,
+        HTTP_API_USERNAME: admin.username
       }
 
-      put "/admin/users/#{user_id}/approve.json", params: {
-        api_key: api_key.key,
-        api_username: admin.username
+      put "/admin/users/#{user_id}/approve.json", headers: {
+        HTTP_API_KEY: api_key.key,
+        HTTP_API_USERNAME: admin.username
       }
 
       u = User.find(user_id)
diff --git a/spec/integration/rate_limiting_spec.rb b/spec/integration/rate_limiting_spec.rb
index 13fe8f7359..9a41f9120f 100644
--- a/spec/integration/rate_limiting_spec.rb
+++ b/spec/integration/rate_limiting_spec.rb
@@ -60,16 +60,16 @@ describe 'rate limiter integration' do
 
     global_setting :max_admin_api_reqs_per_key_per_minute, 1
 
-    get '/admin/api/keys.json', params: {
-      api_key: api_key.key,
-      api_username: admin.username
+    get '/admin/api/keys.json', headers: {
+      HTTP_API_KEY: api_key.key,
+      HTTP_API_USERNAME: admin.username
     }
 
     expect(response.status).to eq(200)
 
-    get '/admin/api/keys.json', params: {
-      api_key: api_key.key,
-      api_username: admin.username
+    get '/admin/api/keys.json', headers: {
+      HTTP_API_KEY: api_key.key,
+      HTTP_API_USERNAME: admin.username
     }
 
     expect(response.status).to eq(429)
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index fd82b1d1d9..8d52b133f8 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -254,9 +254,8 @@ RSpec.describe Admin::UsersController do
       api_key = Fabricate(:api_key, user: user)
 
       put "/posts/#{Fabricate(:post).id}/bookmark.json", params: {
-        bookmarked: "true",
-        api_key: api_key.key
-      }
+        bookmarked: "true"
+      }, headers: { HTTP_API_KEY: api_key.key }
       expect(response.status).to eq(200)
 
       put "/admin/users/#{user.id}/suspend.json", params: suspend_params
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index 6969279502..71d6eef807 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -49,7 +49,8 @@ describe EmbedController do
 
         it "returns information about the topic" do
           get '/embed/info.json',
-            params: { embed_url: topic_embed.embed_url, api_key: api_key.key, api_username: "system" }
+            params: { embed_url: topic_embed.embed_url },
+            headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system" }
 
           json = JSON.parse(response.body)
           expect(json['topic_id']).to eq(topic_embed.topic.id)
@@ -61,7 +62,8 @@ describe EmbedController do
       context "without invalid embed url" do
         it "returns error response" do
           get '/embed/info.json',
-            params: { embed_url: "http://nope.com", api_key: api_key.key, api_username: "system" }
+            params: { embed_url: "http://nope.com" },
+            headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system" }
 
           json = JSON.parse(response.body)
           expect(json["error_type"]).to eq("not_found")
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index b90b7cd3e3..534bcdecd5 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -556,10 +556,9 @@ describe PostsController do
 
       # choosing an arbitrarily easy to mock trusted activity
       it 'allows users with api key to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json", params: {
-          bookmarked: "true",
-          api_key: api_key.key
-        }
+        put "/posts/#{post.id}/bookmark.json",
+          params: { bookmarked: "true" },
+          headers: { HTTP_API_KEY: api_key.key }
 
         expect(response.status).to eq(200)
         expect(PostAction.where(
@@ -570,21 +569,17 @@ describe PostsController do
       end
 
       it 'raises an error with a user key that does not match an optionally specified username' do
-        put "/posts/#{post.id}/bookmark.json", params: {
-          bookmarked: "true",
-          api_key: api_key.key,
-          api_username: 'made_up'
-        }
+        put "/posts/#{post.id}/bookmark.json",
+          params: { bookmarked: "true" },
+          headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: 'made_up' }
 
         expect(response.status).to eq(403)
       end
 
       it 'allows users with a master api key to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json", params: {
-          bookmarked: "true",
-          api_key: master_key.key,
-          api_username: user.username
-        }
+        put "/posts/#{post.id}/bookmark.json",
+          params: { bookmarked: "true" },
+          headers: { HTTP_API_KEY: master_key.key, HTTP_API_USERNAME: user.username }
 
         expect(response.status).to eq(200)
         expect(PostAction.where(
@@ -595,21 +590,17 @@ describe PostsController do
       end
 
       it 'disallows phonies to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json", params: {
-          bookmarked: "true",
-          api_key: SecureRandom.hex(32),
-          api_username: user.username
-        }
+        put "/posts/#{post.id}/bookmark.json",
+          params: { bookmarked: "true" },
+          headers: { HTTP_API_KEY: SecureRandom.hex(32), HTTP_API_USERNAME: user.username }
 
         expect(response.status).to eq(403)
       end
 
       it 'disallows blank api' do
-        put "/posts/#{post.id}/bookmark.json", params: {
-          bookmarked: "true",
-          api_key: "",
-          api_username: user.username
-        }
+        put "/posts/#{post.id}/bookmark.json",
+          params: { bookmarked: "true" },
+          headers: { HTTP_API_KEY: "", HTTP_API_USERNAME: user.username }
 
         expect(response.status).to eq(403)
       end
@@ -740,24 +731,16 @@ describe PostsController do
 
         master_key = Fabricate(:api_key).key
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: raw,
-          title: title,
-          wpid: 1
-        }
+        post "/posts.json",
+          params: { raw: raw, title: title, wpid: 1 },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(200)
         original = response.body
 
-        post "/posts.json", params: {
-          api_username: user.username_lower,
-          api_key: master_key,
-          raw: raw,
-          title: title,
-          wpid: 2
-        }
+        post "/posts.json",
+          params: { raw: raw, title: title, wpid: 2 },
+          headers: { HTTP_API_USERNAME: user.username_lower, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(200)
         expect(response.body).to eq(original)
@@ -769,38 +752,24 @@ describe PostsController do
         post_1 = Fabricate(:post)
         master_key = Fabricate(:api_key).key
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: 'this is test reply 1',
-          topic_id: post_1.topic.id,
-          reply_to_post_number: 1
-        }
+        post "/posts.json",
+          params: { raw: 'this is test reply 1', topic_id: post_1.topic.id, reply_to_post_number: 1 },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(200)
         expect(post_1.topic.user.notifications.count).to eq(1)
         post_1.topic.user.notifications.destroy_all
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: 'this is test reply 2',
-          topic_id: post_1.topic.id,
-          reply_to_post_number: 1,
-          import_mode: true
-        }
+        post "/posts.json",
+          params: { raw: 'this is test reply 2', topic_id: post_1.topic.id, reply_to_post_number: 1, import_mode: true },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(200)
         expect(post_1.topic.user.notifications.count).to eq(0)
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: 'this is test reply 3',
-          topic_id: post_1.topic.id,
-          reply_to_post_number: 1,
-          import_mode: false
-        }
+        post "/posts.json",
+          params: { raw: 'this is test reply 3', topic_id: post_1.topic.id, reply_to_post_number: 1, import_mode: false },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(200)
         expect(post_1.topic.user.notifications.count).to eq(1)
@@ -810,14 +779,10 @@ describe PostsController do
         post_1 = Fabricate(:post)
         user_key = ApiKey.create!(user: user).key
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: user_key,
-          raw: 'this is test whisper',
-          topic_id: post_1.topic.id,
-          reply_to_post_number: 1,
-          whisper: true
-        }
+        post "/posts.json",
+          params: { raw: 'this is test whisper', topic_id: post_1.topic.id, reply_to_post_number: 1, whisper: true },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: user_key }
+
         expect(response.status).to eq(403)
       end
 
@@ -825,13 +790,9 @@ describe PostsController do
         user = Fabricate(:admin)
         master_key = Fabricate(:api_key).key
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: master_key,
-          title: 'this is a test title',
-          raw: 'this is test body',
-          category: 'invalid'
-        }
+        post "/posts.json",
+          params: { title: 'this is a test title', raw: 'this is test body', category: 'invalid' },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(400)
 
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index baa2f54270..13298866c0 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -60,7 +60,10 @@ describe UploadsController do
 
         stub_request(:get, url).to_return(status: 200, body: png)
 
-        post "/uploads.json", params: { url: url, type: "avatar", api_key: api_key, api_username: user.username }
+        post "/uploads.json", params: { url: url, type: "avatar" }, headers: {
+          HTTP_API_KEY: api_key,
+          HTTP_API_USERNAME: user.username.downcase
+        }
 
         json = ::JSON.parse(response.body)
 
diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb
index 1034c36bde..bd0c8ca354 100644
--- a/spec/requests/user_badges_controller_spec.rb
+++ b/spec/requests/user_badges_controller_spec.rb
@@ -123,9 +123,13 @@ describe UserBadgesController do
     it 'grants badges from master api calls' do
       api_key = Fabricate(:api_key)
 
-      post "/user_badges.json", params: {
-        badge_id: badge.id, username: user.username, api_key: api_key.key, api_username: "system"
-      }
+      post "/user_badges.json",
+        params: {
+          badge_id: badge.id, username: user.username
+        },
+        headers: {
+          HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system"
+        }
 
       expect(response.status).to eq(200)
       user_badge = UserBadge.find_by(user: user, badge: badge)
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 59f705f8eb..d35e8f9727 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -743,7 +743,7 @@ describe UsersController do
 
         it "won't create the user as active with a regular key" do
           post "/u.json",
-            params: post_user_params.merge(active: true, api_key: api_key.key)
+            params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
           expect(JSON.parse(response.body)['active']).to be_falsey
@@ -759,7 +759,7 @@ describe UsersController do
           SiteSetting.must_approve_users = true
 
           #Sidekiq::Client.expects(:enqueue).never
-          post "/u.json", params: post_user_params.merge(approved: true, active: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(approved: true, active: true), headers: { HTTP_API_KEY: api_key.key }
 
           expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
           expect(Jobs::SendSystemMessage.jobs.size).to eq(0)
@@ -781,7 +781,7 @@ describe UsersController do
           Jobs.run_immediately!
           SiteSetting.must_approve_users = true
 
-          post "/u.json", params: post_user_params.merge(active: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
           json = JSON.parse(response.body)
@@ -796,7 +796,7 @@ describe UsersController do
           Jobs.run_immediately!
           SiteSetting.must_approve_users = true
 
-          post "/u.json", params: post_user_params.merge(api_key: api_key.key)
+          post "/u.json", params: post_user_params, headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
           json = JSON.parse(response.body)
@@ -810,7 +810,7 @@ describe UsersController do
         it "won't create the developer as active" do
           UsernameCheckerService.expects(:is_developer?).returns(true)
 
-          post "/u.json", params: post_user_params.merge(active: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
           expect(JSON.parse(response.body)['active']).to be_falsy
         end
@@ -819,7 +819,7 @@ describe UsersController do
           SiteSetting.allow_user_locale = true
           admin.update!(locale: :fr)
 
-          post "/u.json", params: post_user_params.merge(active: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
 
           json = JSON.parse(response.body)
@@ -832,7 +832,7 @@ describe UsersController do
           SiteSetting.must_approve_users = true
           SiteSetting.auto_approve_email_domains = "example.com"
 
-          post "/u.json", params: post_user_params.merge(active: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
           json = JSON.parse(response.body)
@@ -858,7 +858,7 @@ describe UsersController do
         fab!(:api_key, refind: false) { Fabricate(:api_key, user: user) }
 
         it "won't create the user as staged with a regular key" do
-          post "/u.json", params: post_user_params.merge(staged: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(staged: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
 
           new_user = User.where(username: post_user_params[:username]).first
@@ -871,7 +871,7 @@ describe UsersController do
         fab!(:api_key, refind: false) { Fabricate(:api_key, user: user) }
 
         it "creates the user as staged with a regular key" do
-          post "/u.json", params: post_user_params.merge(staged: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(staged: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
 
           new_user = User.where(username: post_user_params[:username]).first
@@ -880,7 +880,7 @@ describe UsersController do
 
         it "won't create the developer as staged" do
           UsernameCheckerService.expects(:is_developer?).returns(true)
-          post "/u.json", params: post_user_params.merge(staged: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(staged: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
 
           new_user = User.where(username: post_user_params[:username]).first
@@ -1850,8 +1850,9 @@ describe UsersController do
                 },
                 user_fields: {
                   user_field.id.to_s => 'user field value'
-                },
-                api_key: api_key.key
+                }
+              }, headers: {
+                HTTP_API_KEY: api_key.key
               }
               expect(response.status).to eq(200)
               u = User.find_by_email('user@mail.com')

From 93c38cc1756d409a3055628b14d61bd3d3c0c08c Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 7 Apr 2020 14:03:15 +1000
Subject: [PATCH 433/633] FEATURE: Bookmark keyboard shortcuts (#9318)

Adds keyboard bindings and associated help menu for selecting reminder type in bookmark modal, and pressing Enter to save.

Introduce the following APIs for `KeyboardShortcuts`:

* `pause` - Uses the provided array of combinations and unbinds them using `Mousetrap`.
* `unpause` - Uses the provided combinations and rebinds them to their default shortcuts listed in `KeyboardShortcuts`.
* `addBindings` - Adds the array of keyboard shortcut bindings and calls the provided callback when a binding is fired with Mousetrap.
* `unbind` - Takes an object literal of a binding map and unbinds all of them e.g. `{ enter: { handler: saveAndClose" } };`
---
 .../discourse/controllers/bookmark.js         | 76 +++++++++++++++--
 .../controllers/keyboard-shortcuts-help.js    | 38 +++++++++
 .../discourse/controllers/topic.js            |  3 +
 .../initializers/keyboard-shortcuts.js        |  3 +-
 .../discourse/lib/keyboard-shortcuts.js       | 82 ++++++++++++++-----
 .../discourse/templates/modal/bookmark.hbs    |  2 +-
 .../modal/keyboard-shortcuts-help.hbs         | 17 ++++
 config/locales/client.en.yml                  | 12 +++
 8 files changed, 205 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index c14329d253..140b6f8597 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -1,10 +1,22 @@
+import { and } from "@ember/object/computed";
+import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { Promise } from "rsvp";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { ajax } from "discourse/lib/ajax";
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
+// global shortcuts that interfere with these modal shortcuts, they are rebound when the
+// modal is closed
+//
+// c createTopic
+// r replyToPost
+// l toggle like
+// d deletePost
+// t replyAsNewTopic
+const GLOBAL_SHORTCUTS_TO_PAUSE = ["c", "r", "l", "d", "t"];
 const START_OF_DAY_HOUR = 8;
 const LATER_TODAY_CUTOFF_HOUR = 17;
 const REMINDER_TYPES = {
@@ -21,6 +33,28 @@ const REMINDER_TYPES = {
   LATER_THIS_WEEK: "later_this_week"
 };
 
+const BOOKMARK_BINDINGS = {
+  enter: { handler: "saveAndClose" },
+  "l t": { handler: "selectReminderType", args: [REMINDER_TYPES.LATER_TODAY] },
+  "l w": {
+    handler: "selectReminderType",
+    args: [REMINDER_TYPES.LATER_THIS_WEEK]
+  },
+  "n b d": {
+    handler: "selectReminderType",
+    args: [REMINDER_TYPES.NEXT_BUSINESS_DAY]
+  },
+  "n d": { handler: "selectReminderType", args: [REMINDER_TYPES.TOMORROW] },
+  "n w": { handler: "selectReminderType", args: [REMINDER_TYPES.NEXT_WEEK] },
+  "n b w": {
+    handler: "selectReminderType",
+    args: [REMINDER_TYPES.START_OF_NEXT_BUSINESS_WEEK]
+  },
+  "n m": { handler: "selectReminderType", args: [REMINDER_TYPES.NEXT_MONTH] },
+  "c r": { handler: "selectReminderType", args: [REMINDER_TYPES.CUSTOM] },
+  "n r": { handler: "selectReminderType", args: [REMINDER_TYPES.NONE] }
+};
+
 export default Controller.extend(ModalFunctionality, {
   loading: false,
   errorMessage: null,
@@ -33,6 +67,7 @@ export default Controller.extend(ModalFunctionality, {
   customReminderTime: null,
   lastCustomReminderDate: null,
   lastCustomReminderTime: null,
+  mouseTrap: null,
   userTimezone: null,
 
   onShow() {
@@ -49,7 +84,12 @@ export default Controller.extend(ModalFunctionality, {
       userTimezone: this.currentUser.resolvedTimezone()
     });
 
+    this.bindKeyboardShortcuts();
     this.loadLastUsedCustomReminderDatetime();
+
+    // make sure the input is cleared, otherwise the keyboard shortcut to toggle
+    // bookmark for post ends up in the input
+    next(() => this.set("name", null));
   },
 
   loadLastUsedCustomReminderDatetime() {
@@ -71,9 +111,29 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
+  bindKeyboardShortcuts() {
+    KeyboardShortcuts.pause(GLOBAL_SHORTCUTS_TO_PAUSE);
+    KeyboardShortcuts.addBindings(BOOKMARK_BINDINGS, binding => {
+      if (binding.args) {
+        return this.send(binding.handler, ...binding.args);
+      }
+      this.send(binding.handler);
+    });
+  },
+
+  unbindKeyboardShortcuts() {
+    KeyboardShortcuts.unbind(BOOKMARK_BINDINGS, this.mouseTrap);
+  },
+
+  restoreGlobalShortcuts() {
+    KeyboardShortcuts.unpause(...GLOBAL_SHORTCUTS_TO_PAUSE);
+  },
+
   // we always want to save the bookmark unless the user specifically
   // clicks the save or cancel button to mimic browser behaviour
   onClose() {
+    this.unbindKeyboardShortcuts();
+    this.restoreGlobalShortcuts();
     if (!this.closeWithoutSaving && !this.isSavingBookmarkManually) {
       this.saveBookmark().catch(e => this.handleSaveError(e));
     }
@@ -102,10 +162,7 @@ export default Controller.extend(ModalFunctionality, {
     return REMINDER_TYPES;
   },
 
-  @discourseComputed()
-  showLastCustom() {
-    return this.lastCustomReminderTime && this.lastCustomReminderDate;
-  },
+  showLastCustom: and("lastCustomReminderTime", "lastCustomReminderDate"),
 
   @discourseComputed()
   showLaterToday() {
@@ -299,10 +356,16 @@ export default Controller.extend(ModalFunctionality, {
 
   actions: {
     saveAndClose() {
+      if (this.saving) {
+        return;
+      }
+
+      this.saving = true;
       this.isSavingBookmarkManually = true;
       this.saveBookmark()
         .then(() => this.send("closeModal"))
-        .catch(e => this.handleSaveError(e));
+        .catch(e => this.handleSaveError(e))
+        .finally(() => (this.saving = false));
     },
 
     closeWithoutSavingBookmark() {
@@ -311,6 +374,9 @@ export default Controller.extend(ModalFunctionality, {
     },
 
     selectReminderType(type) {
+      if (type === REMINDER_TYPES.LATER_TODAY && !this.showLaterToday) {
+        return;
+      }
       this.set("selectedReminderType", type);
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
index 62feb5b404..0bc9fe3971 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
@@ -1,5 +1,6 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { setting } from "discourse/lib/computed";
 
 const KEY = "keyboard_shortcuts_help";
 
@@ -51,6 +52,8 @@ export default Controller.extend(ModalFunctionality, {
     this.set("modal.modalClass", "keyboard-shortcuts-modal");
   },
 
+  showBookmarkShortcuts: setting("enable_bookmarks_with_reminders"),
+
   shortcuts: {
     jump_to: {
       home: buildShortcut("jump_to.home", { keys1: ["g", "h"] }),
@@ -125,6 +128,41 @@ export default Controller.extend(ModalFunctionality, {
         keysDelimiter: PLUS
       })
     },
+    bookmarks: {
+      enter: buildShortcut("bookmarks.enter", { keys1: [ENTER] }),
+      later_today: buildShortcut("bookmarks.later_today", {
+        keys1: ["l", "t"],
+        shortcutsDelimiter: "space"
+      }),
+      later_this_week: buildShortcut("bookmarks.later_this_week", {
+        keys1: ["l", "w"],
+        shortcutsDelimiter: "space"
+      }),
+      tomorrow: buildShortcut("bookmarks.tomorrow", {
+        keys1: ["n", "d"],
+        shortcutsDelimiter: "space"
+      }),
+      next_week: buildShortcut("bookmarks.next_week", {
+        keys1: ["n", "w"],
+        shortcutsDelimiter: "space"
+      }),
+      next_business_week: buildShortcut("bookmarks.next_business_week", {
+        keys1: ["n", "b", "w"],
+        shortcutsDelimiter: "space"
+      }),
+      next_business_day: buildShortcut("bookmarks.next_business_day", {
+        keys1: ["n", "b", "d"],
+        shortcutsDelimiter: "space"
+      }),
+      custom: buildShortcut("bookmarks.custom", {
+        keys1: ["c", "r"],
+        shortcutsDelimiter: "space"
+      }),
+      none: buildShortcut("bookmarks.none", {
+        keys1: ["n", "r"],
+        shortcutsDelimiter: "space"
+      })
+    },
     actions: {
       bookmark_topic: buildShortcut("actions.bookmark_topic", { keys1: ["f"] }),
       reply_as_new_topic: buildShortcut("actions.reply_as_new_topic", {
diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/controllers/topic.js
index 80e6124f6d..01a84f7352 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js
+++ b/app/assets/javascripts/discourse/controllers/topic.js
@@ -662,6 +662,9 @@ export default Controller.extend(bufferedProperty("model"), {
       if (!this.currentUser) {
         return bootbox.alert(I18n.t("bookmarks.not_bookmarked"));
       } else if (post) {
+        if (this.siteSettings.enable_bookmarks_with_reminders) {
+          return post.toggleBookmarkWithReminder();
+        }
         return post.toggleBookmark().catch(popupAjaxError);
       } else {
         return this.model.toggleBookmark().then(changedIds => {
diff --git a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
index 8801d112d9..a0de2c5d2a 100644
--- a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
@@ -5,6 +5,7 @@ export default {
   name: "keyboard-shortcuts",
 
   initialize(container) {
-    KeyboardShortcuts.bindEvents(Mousetrap, container);
+    KeyboardShortcuts.init(Mousetrap, container);
+    KeyboardShortcuts.bindEvents();
   }
 };
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 064c2eeb58..c4a962ac68 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -6,7 +6,7 @@ import { ajax } from "discourse/lib/ajax";
 import { throttle } from "@ember/runloop";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 
-export let bindings = {
+export let DEFAULT_BINDINGS = {
   "!": { postAction: "showFlags" },
   "#": { handler: "goToPost", anonymous: true },
   "/": { handler: "toggleSearch", anonymous: true },
@@ -84,7 +84,7 @@ export let bindings = {
 const animationDuration = 100;
 
 export default {
-  bindEvents(keyTrapper, container) {
+  init(keyTrapper, container) {
     this.keyTrapper = keyTrapper;
     this.container = container;
     this._stopCallback();
@@ -96,32 +96,72 @@ export default {
 
     // Disable the shortcut if private messages are disabled
     if (!siteSettings.enable_personal_messages) {
-      delete bindings["g m"];
+      delete DEFAULT_BINDINGS["g m"];
+    }
+  },
+
+  bindEvents() {
+    Object.keys(DEFAULT_BINDINGS).forEach(key => {
+      this.bindKey(key);
+    });
+  },
+
+  bindKey(key) {
+    const binding = DEFAULT_BINDINGS[key];
+    if (!binding.anonymous && !this.currentUser) {
+      return;
     }
 
-    Object.keys(bindings).forEach(key => {
-      const binding = bindings[key];
-      if (!binding.anonymous && !this.currentUser) {
-        return;
+    if (binding.path) {
+      this._bindToPath(binding.path, key);
+    } else if (binding.handler) {
+      if (binding.global) {
+        // global shortcuts will trigger even while focusing on input/textarea
+        this._globalBindToFunction(binding.handler, key);
+      } else {
+        this._bindToFunction(binding.handler, key);
       }
+    } else if (binding.postAction) {
+      this._bindToSelectedPost(binding.postAction, key);
+    } else if (binding.click) {
+      this._bindToClick(binding.click, key);
+    }
+  },
 
-      if (binding.path) {
-        this._bindToPath(binding.path, key);
-      } else if (binding.handler) {
-        if (binding.global) {
-          // global shortcuts will trigger even while focusing on input/textarea
-          this._globalBindToFunction(binding.handler, key);
-        } else {
-          this._bindToFunction(binding.handler, key);
-        }
-      } else if (binding.postAction) {
-        this._bindToSelectedPost(binding.postAction, key);
-      } else if (binding.click) {
-        this._bindToClick(binding.click, key);
-      }
+  // for cases when you want to disable global keyboard shortcuts
+  // so that you can override them (e.g. inside a modal)
+  pause(combinations) {
+    combinations.forEach(combo => this.keyTrapper.unbind(combo));
+  },
+
+  // restore global shortcuts that you have paused
+  unpause(...combinations) {
+    combinations.forEach(combo => this.bindKey(combo));
+  },
+
+  // add bindings to the key trapper, if none is specified then
+  // the shortcuts will be bound globally.
+  addBindings(newBindings, callback) {
+    Object.keys(newBindings).forEach(key => {
+      let binding = newBindings[key];
+      this.keyTrapper.bind(key, event => {
+        // usually the caller that is adding the binding
+        // will want to decide what to do with it when the
+        // event is fired
+        callback(binding, event);
+        event.stopPropagation();
+      });
     });
   },
 
+  // unbinds all the shortcuts in a key binding object e.g.
+  // {
+  //   'c': createTopic
+  // }
+  unbind(bindings) {
+    this.pause(Object.keys(bindings));
+  },
+
   toggleBookmark() {
     this.sendToSelectedPost("toggleBookmark");
     this.sendToTopicListItemView("toggleBookmark");
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 538b30c74f..890a7dbdcc 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -9,7 +9,7 @@
     {{/if}}
 
     <div class="control-group">
-      {{input value=name name="name" class="bookmark-name" enter=(action "saveAndClose") placeholder=(i18n "post.bookmarks.name_placeholder")}}
+      {{input value=name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
     </div>
 
     {{#if showBookmarkReminderControls}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index cfa90cb67e..43f550d15e 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -55,6 +55,23 @@
         <li>{{html-safe shortcuts.actions.quote_post}}</li>
       </ul>
     </section>
+    {{#if showBookmarkShortcuts}}
+    <section class="keyboard-shortcuts-bookmark-section">
+      <h4>{{i18n "keyboard_shortcuts_help.bookmarks.title"}}</h4>
+      <ul>
+        <li>{{html-safe shortcuts.bookmarks.enter}}</li>
+        <li>{{html-safe shortcuts.bookmarks.later_today}}</li>
+        <li>{{html-safe shortcuts.bookmarks.later_this_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.tomorrow}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_month}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_business_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
+        <li>{{html-safe shortcuts.bookmarks.custom}}</li>
+        <li>{{html-safe shortcuts.bookmarks.none}}</li>
+      </ul>
+    </section>
+    {{/if}}
   </div>
   <div class="column">
     <section>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index df0c07d641..a05ced4e1e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3075,6 +3075,18 @@ en:
         title: "Composing"
         return: "%{shortcut} Return to composer"
         fullscreen: "%{shortcut} Fullscreen composer"
+      bookmarks:
+        title: "Bookmarking"
+        enter: "%{shortcut} Save and close"
+        later_today: "%{shortcut} Later today"
+        later_this_week: "%{shortcut} Later this week"
+        tomorrow: "%{shortcut} Tomorrow"
+        next_week: "%{shortcut} Next week"
+        next_month: "%{shortcut} Next month"
+        next_business_week: "%{shortcut} Start of next week"
+        next_business_day: "%{shortcut} Next business day"
+        custom: "%{shortcut} Custom date and time"
+        none: "%{shortcut} No reminder"
       actions:
         title: "Actions"
         bookmark_topic: "%{shortcut} Toggle bookmark topic"

From 7e429635909983001b0c5547f304a019766c7222 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 7 Apr 2020 14:40:03 +1000
Subject: [PATCH 434/633] DEV: Define keyboard shortcuts help onShow, and
 un-define onClose (#9355)

This is so we don't have a big hash just sitting in the controller definition, it is only created when it is needed. From comment here #9318 (comment)
---
 .../controllers/keyboard-shortcuts-help.js    | 346 +++++++++---------
 1 file changed, 179 insertions(+), 167 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
index 0bc9fe3971..85ee690151 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
@@ -50,176 +50,188 @@ function buildShortcut(
 export default Controller.extend(ModalFunctionality, {
   onShow() {
     this.set("modal.modalClass", "keyboard-shortcuts-modal");
+    this._defineShortcuts();
+  },
+
+  onClose() {
+    this.set("shortcuts", null);
   },
 
   showBookmarkShortcuts: setting("enable_bookmarks_with_reminders"),
 
-  shortcuts: {
-    jump_to: {
-      home: buildShortcut("jump_to.home", { keys1: ["g", "h"] }),
-      latest: buildShortcut("jump_to.latest", { keys1: ["g", "l"] }),
-      new: buildShortcut("jump_to.new", { keys1: ["g", "n"] }),
-      unread: buildShortcut("jump_to.unread", { keys1: ["g", "u"] }),
-      categories: buildShortcut("jump_to.categories", { keys1: ["g", "c"] }),
-      top: buildShortcut("jump_to.top", { keys1: ["g", "t"] }),
-      bookmarks: buildShortcut("jump_to.bookmarks", { keys1: ["g", "b"] }),
-      profile: buildShortcut("jump_to.profile", { keys1: ["g", "p"] }),
-      messages: buildShortcut("jump_to.messages", { keys1: ["g", "m"] }),
-      drafts: buildShortcut("jump_to.drafts", { keys1: ["g", "d"] })
-    },
-    navigation: {
-      back: buildShortcut("navigation.back", { keys1: ["u"] }),
-      jump: buildShortcut("navigation.jump", { keys1: ["#"] }),
-      up_down: buildShortcut("navigation.up_down", {
-        keys1: ["k"],
-        keys2: ["j"],
-        shortcutsDelimiter: "slash"
-      }),
-      open: buildShortcut("navigation.open", { keys1: ["o"], keys2: [ENTER] }),
-      next_prev: buildShortcut("navigation.next_prev", {
-        keys1: [SHIFT, "j"],
-        keys2: [SHIFT, "k"],
-        keysDelimiter: PLUS,
-        shortcutsDelimiter: "slash"
-      }),
-      go_to_unread_post: buildShortcut("navigation.go_to_unread_post", {
-        keys1: [SHIFT, "l"],
-        keysDelimiter: PLUS
-      })
-    },
-    application: {
-      hamburger_menu: buildShortcut("application.hamburger_menu", {
-        keys1: ["="]
-      }),
-      user_profile_menu: buildShortcut("application.user_profile_menu", {
-        keys1: ["p"]
-      }),
-      create: buildShortcut("application.create", { keys1: ["c"] }),
-      show_incoming_updated_topics: buildShortcut(
-        "application.show_incoming_updated_topics",
-        { keys1: ["."] }
-      ),
-      search: buildShortcut("application.search", {
-        keys1: ["/"],
-        keys2: [CTRL, ALT, "f"],
-        keysDelimiter: PLUS
-      }),
-      help: buildShortcut("application.help", { keys1: ["?"] }),
-      dismiss_new_posts: buildShortcut("application.dismiss_new_posts", {
-        keys1: ["x", "r"]
-      }),
-      dismiss_topics: buildShortcut("application.dismiss_topics", {
-        keys1: ["x", "t"]
-      }),
-      log_out: buildShortcut("application.log_out", {
-        keys1: [SHIFT, "z"],
-        keys2: [SHIFT, "z"],
-        keysDelimiter: PLUS,
-        shortcutsDelimiter: "space"
-      })
-    },
-    composing: {
-      return: buildShortcut("composing.return", {
-        keys1: [SHIFT, "c"],
-        keysDelimiter: PLUS
-      }),
-      fullscreen: buildShortcut("composing.fullscreen", {
-        keys1: [SHIFT, "F11"],
-        keysDelimiter: PLUS
-      })
-    },
-    bookmarks: {
-      enter: buildShortcut("bookmarks.enter", { keys1: [ENTER] }),
-      later_today: buildShortcut("bookmarks.later_today", {
-        keys1: ["l", "t"],
-        shortcutsDelimiter: "space"
-      }),
-      later_this_week: buildShortcut("bookmarks.later_this_week", {
-        keys1: ["l", "w"],
-        shortcutsDelimiter: "space"
-      }),
-      tomorrow: buildShortcut("bookmarks.tomorrow", {
-        keys1: ["n", "d"],
-        shortcutsDelimiter: "space"
-      }),
-      next_week: buildShortcut("bookmarks.next_week", {
-        keys1: ["n", "w"],
-        shortcutsDelimiter: "space"
-      }),
-      next_business_week: buildShortcut("bookmarks.next_business_week", {
-        keys1: ["n", "b", "w"],
-        shortcutsDelimiter: "space"
-      }),
-      next_business_day: buildShortcut("bookmarks.next_business_day", {
-        keys1: ["n", "b", "d"],
-        shortcutsDelimiter: "space"
-      }),
-      custom: buildShortcut("bookmarks.custom", {
-        keys1: ["c", "r"],
-        shortcutsDelimiter: "space"
-      }),
-      none: buildShortcut("bookmarks.none", {
-        keys1: ["n", "r"],
-        shortcutsDelimiter: "space"
-      })
-    },
-    actions: {
-      bookmark_topic: buildShortcut("actions.bookmark_topic", { keys1: ["f"] }),
-      reply_as_new_topic: buildShortcut("actions.reply_as_new_topic", {
-        keys1: ["t"]
-      }),
-      reply_topic: buildShortcut("actions.reply_topic", {
-        keys1: [SHIFT, "r"],
-        keysDelimiter: PLUS
-      }),
-      reply_post: buildShortcut("actions.reply_post", { keys1: ["r"] }),
-      quote_post: buildShortcut("actions.quote_post", { keys1: ["q"] }),
-      pin_unpin_topic: buildShortcut("actions.pin_unpin_topic", {
-        keys1: [SHIFT, "p"],
-        keysDelimiter: PLUS
-      }),
-      share_topic: buildShortcut("actions.share_topic", {
-        keys1: [SHIFT, "s"],
-        keysDelimiter: PLUS
-      }),
-      share_post: buildShortcut("actions.share_post", { keys1: ["s"] }),
-      like: buildShortcut("actions.like", { keys1: ["l"] }),
-      flag: buildShortcut("actions.flag", { keys1: ["!"] }),
-      bookmark: buildShortcut("actions.bookmark", { keys1: ["b"] }),
-      edit: buildShortcut("actions.edit", { keys1: ["e"] }),
-      delete: buildShortcut("actions.delete", { keys1: ["d"] }),
-      mark_muted: buildShortcut("actions.mark_muted", { keys1: ["m", "m"] }),
-      mark_regular: buildShortcut("actions.mark_regular", {
-        keys1: ["m", "r"]
-      }),
-      mark_tracking: buildShortcut("actions.mark_tracking", {
-        keys1: ["m", "t"]
-      }),
-      mark_watching: buildShortcut("actions.mark_watching", {
-        keys1: ["m", "w"]
-      }),
-      print: buildShortcut("actions.print", {
-        keys1: [CTRL, "p"],
-        keysDelimiter: PLUS
-      }),
-      defer: buildShortcut("actions.defer", {
-        keys1: [SHIFT, "u"],
-        keysDelimiter: PLUS
-      }),
-      topic_admin_actions: buildShortcut("actions.topic_admin_actions", {
-        keys1: [SHIFT, "a"],
-        keysDelimiter: PLUS
-      })
-    },
-    search_menu: {
-      prev_next: buildShortcut("search_menu.prev_next", {
-        keys1: ["&uarr;"],
-        keys2: ["&darr;"],
-        shortcutsDelimiter: "slash"
-      }),
-      insert_url: buildShortcut("search_menu.insert_url", {
-        keys1: ["a"]
-      })
-    }
+  _defineShortcuts() {
+    this.set("shortcuts", {
+      jump_to: {
+        home: buildShortcut("jump_to.home", { keys1: ["g", "h"] }),
+        latest: buildShortcut("jump_to.latest", { keys1: ["g", "l"] }),
+        new: buildShortcut("jump_to.new", { keys1: ["g", "n"] }),
+        unread: buildShortcut("jump_to.unread", { keys1: ["g", "u"] }),
+        categories: buildShortcut("jump_to.categories", { keys1: ["g", "c"] }),
+        top: buildShortcut("jump_to.top", { keys1: ["g", "t"] }),
+        bookmarks: buildShortcut("jump_to.bookmarks", { keys1: ["g", "b"] }),
+        profile: buildShortcut("jump_to.profile", { keys1: ["g", "p"] }),
+        messages: buildShortcut("jump_to.messages", { keys1: ["g", "m"] }),
+        drafts: buildShortcut("jump_to.drafts", { keys1: ["g", "d"] })
+      },
+      navigation: {
+        back: buildShortcut("navigation.back", { keys1: ["u"] }),
+        jump: buildShortcut("navigation.jump", { keys1: ["#"] }),
+        up_down: buildShortcut("navigation.up_down", {
+          keys1: ["k"],
+          keys2: ["j"],
+          shortcutsDelimiter: "slash"
+        }),
+        open: buildShortcut("navigation.open", {
+          keys1: ["o"],
+          keys2: [ENTER]
+        }),
+        next_prev: buildShortcut("navigation.next_prev", {
+          keys1: [SHIFT, "j"],
+          keys2: [SHIFT, "k"],
+          keysDelimiter: PLUS,
+          shortcutsDelimiter: "slash"
+        }),
+        go_to_unread_post: buildShortcut("navigation.go_to_unread_post", {
+          keys1: [SHIFT, "l"],
+          keysDelimiter: PLUS
+        })
+      },
+      application: {
+        hamburger_menu: buildShortcut("application.hamburger_menu", {
+          keys1: ["="]
+        }),
+        user_profile_menu: buildShortcut("application.user_profile_menu", {
+          keys1: ["p"]
+        }),
+        create: buildShortcut("application.create", { keys1: ["c"] }),
+        show_incoming_updated_topics: buildShortcut(
+          "application.show_incoming_updated_topics",
+          { keys1: ["."] }
+        ),
+        search: buildShortcut("application.search", {
+          keys1: ["/"],
+          keys2: [CTRL, ALT, "f"],
+          keysDelimiter: PLUS
+        }),
+        help: buildShortcut("application.help", { keys1: ["?"] }),
+        dismiss_new_posts: buildShortcut("application.dismiss_new_posts", {
+          keys1: ["x", "r"]
+        }),
+        dismiss_topics: buildShortcut("application.dismiss_topics", {
+          keys1: ["x", "t"]
+        }),
+        log_out: buildShortcut("application.log_out", {
+          keys1: [SHIFT, "z"],
+          keys2: [SHIFT, "z"],
+          keysDelimiter: PLUS,
+          shortcutsDelimiter: "space"
+        })
+      },
+      composing: {
+        return: buildShortcut("composing.return", {
+          keys1: [SHIFT, "c"],
+          keysDelimiter: PLUS
+        }),
+        fullscreen: buildShortcut("composing.fullscreen", {
+          keys1: [SHIFT, "F11"],
+          keysDelimiter: PLUS
+        })
+      },
+      bookmarks: {
+        enter: buildShortcut("bookmarks.enter", { keys1: [ENTER] }),
+        later_today: buildShortcut("bookmarks.later_today", {
+          keys1: ["l", "t"],
+          shortcutsDelimiter: "space"
+        }),
+        later_this_week: buildShortcut("bookmarks.later_this_week", {
+          keys1: ["l", "w"],
+          shortcutsDelimiter: "space"
+        }),
+        tomorrow: buildShortcut("bookmarks.tomorrow", {
+          keys1: ["n", "d"],
+          shortcutsDelimiter: "space"
+        }),
+        next_week: buildShortcut("bookmarks.next_week", {
+          keys1: ["n", "w"],
+          shortcutsDelimiter: "space"
+        }),
+        next_business_week: buildShortcut("bookmarks.next_business_week", {
+          keys1: ["n", "b", "w"],
+          shortcutsDelimiter: "space"
+        }),
+        next_business_day: buildShortcut("bookmarks.next_business_day", {
+          keys1: ["n", "b", "d"],
+          shortcutsDelimiter: "space"
+        }),
+        custom: buildShortcut("bookmarks.custom", {
+          keys1: ["c", "r"],
+          shortcutsDelimiter: "space"
+        }),
+        none: buildShortcut("bookmarks.none", {
+          keys1: ["n", "r"],
+          shortcutsDelimiter: "space"
+        })
+      },
+      actions: {
+        bookmark_topic: buildShortcut("actions.bookmark_topic", {
+          keys1: ["f"]
+        }),
+        reply_as_new_topic: buildShortcut("actions.reply_as_new_topic", {
+          keys1: ["t"]
+        }),
+        reply_topic: buildShortcut("actions.reply_topic", {
+          keys1: [SHIFT, "r"],
+          keysDelimiter: PLUS
+        }),
+        reply_post: buildShortcut("actions.reply_post", { keys1: ["r"] }),
+        quote_post: buildShortcut("actions.quote_post", { keys1: ["q"] }),
+        pin_unpin_topic: buildShortcut("actions.pin_unpin_topic", {
+          keys1: [SHIFT, "p"],
+          keysDelimiter: PLUS
+        }),
+        share_topic: buildShortcut("actions.share_topic", {
+          keys1: [SHIFT, "s"],
+          keysDelimiter: PLUS
+        }),
+        share_post: buildShortcut("actions.share_post", { keys1: ["s"] }),
+        like: buildShortcut("actions.like", { keys1: ["l"] }),
+        flag: buildShortcut("actions.flag", { keys1: ["!"] }),
+        bookmark: buildShortcut("actions.bookmark", { keys1: ["b"] }),
+        edit: buildShortcut("actions.edit", { keys1: ["e"] }),
+        delete: buildShortcut("actions.delete", { keys1: ["d"] }),
+        mark_muted: buildShortcut("actions.mark_muted", { keys1: ["m", "m"] }),
+        mark_regular: buildShortcut("actions.mark_regular", {
+          keys1: ["m", "r"]
+        }),
+        mark_tracking: buildShortcut("actions.mark_tracking", {
+          keys1: ["m", "t"]
+        }),
+        mark_watching: buildShortcut("actions.mark_watching", {
+          keys1: ["m", "w"]
+        }),
+        print: buildShortcut("actions.print", {
+          keys1: [CTRL, "p"],
+          keysDelimiter: PLUS
+        }),
+        defer: buildShortcut("actions.defer", {
+          keys1: [SHIFT, "u"],
+          keysDelimiter: PLUS
+        }),
+        topic_admin_actions: buildShortcut("actions.topic_admin_actions", {
+          keys1: [SHIFT, "a"],
+          keysDelimiter: PLUS
+        })
+      },
+      search_menu: {
+        prev_next: buildShortcut("search_menu.prev_next", {
+          keys1: ["&uarr;"],
+          keys2: ["&darr;"],
+          shortcutsDelimiter: "slash"
+        }),
+        insert_url: buildShortcut("search_menu.insert_url", {
+          keys1: ["a"]
+        })
+      }
+    });
   }
 });

From 42c2678d8f4b46490a7794effaefbf2e5c13434c Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 7 Apr 2020 15:43:00 +1000
Subject: [PATCH 435/633] FIX: Show topic level bookmark with reminder modal
 (#9336)

* When using the topic-level bookmark button or shortcut, we now show the bookmark with reminder modal for consistency.
* When hovering on a bookmark reminder notification where the bookmark has a name, show the name of the bookmark on hover.
---
 .../javascripts/discourse/models/post.js      | 44 +++++-----
 .../javascripts/discourse/models/topic.js     | 81 +++++++++++--------
 .../bookmark-reminder-notification-item.js    | 13 +++
 config/locales/client.en.yml                  |  1 +
 4 files changed, 87 insertions(+), 52 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js
index 2629afcb33..535ac4b419 100644
--- a/app/assets/javascripts/discourse/models/post.js
+++ b/app/assets/javascripts/discourse/models/post.js
@@ -339,26 +339,30 @@ const Post = RestModel.extend({
   toggleBookmarkWithReminder() {
     this.toggleProperty("bookmarked_with_reminder");
     if (this.bookmarked_with_reminder) {
-      let controller = showModal("bookmark", {
-        model: {
-          postId: this.id
-        },
-        title: "post.bookmarks.create",
-        modalClass: "bookmark-with-reminder"
-      });
-      controller.setProperties({
-        onCloseWithoutSaving: () => {
-          this.toggleProperty("bookmarked_with_reminder");
-          this.appEvents.trigger("post-stream:refresh", { id: this.id });
-        },
-        afterSave: (reminderAtISO, reminderType) => {
-          this.setProperties({
-            "topic.bookmarked": true,
-            bookmark_reminder_at: reminderAtISO,
-            bookmark_reminder_type: reminderType
-          });
-          this.appEvents.trigger("post-stream:refresh", { id: this.id });
-        }
+      return new Promise(resolve => {
+        let controller = showModal("bookmark", {
+          model: {
+            postId: this.id
+          },
+          title: "post.bookmarks.create",
+          modalClass: "bookmark-with-reminder"
+        });
+        controller.setProperties({
+          onCloseWithoutSaving: () => {
+            this.toggleProperty("bookmarked_with_reminder");
+            this.appEvents.trigger("post-stream:refresh", { id: this.id });
+            resolve();
+          },
+          afterSave: (reminderAtISO, reminderType) => {
+            this.setProperties({
+              "topic.bookmarked": true,
+              bookmark_reminder_at: reminderAtISO,
+              bookmark_reminder_type: reminderType
+            });
+            this.appEvents.trigger("post-stream:refresh", { id: this.id });
+            resolve();
+          }
+        });
       });
     } else {
       this.setProperties({
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 26afbd4ba2..045f31123d 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -397,6 +397,16 @@ const Topic = RestModel.extend({
     }).then(() => this.set("archetype", "regular"));
   },
 
+  afterTopicBookmarked(firstPost) {
+    if (firstPost) {
+      firstPost.set("bookmarked", true);
+      if (this.siteSettings.enable_bookmarks_with_reminders) {
+        firstPost.set("bookmarked_with_reminder", true);
+      }
+      return [firstPost.id];
+    }
+  },
+
   toggleBookmark() {
     if (this.bookmarking) {
       return Promise.resolve();
@@ -408,41 +418,48 @@ const Topic = RestModel.extend({
     const firstPost =
       posts && posts[0] && posts[0].get("post_number") === 1 && posts[0];
     const bookmark = !this.bookmarked;
-    const path = bookmark ? "/bookmark" : "/remove_bookmarks";
 
     const toggleBookmarkOnServer = () => {
-      return ajax(`/t/${this.id}${path}`, { type: "PUT" })
-        .then(() => {
-          this.toggleProperty("bookmarked");
-          if (bookmark && firstPost) {
-            firstPost.set("bookmarked", true);
-            if (this.siteSettings.enable_bookmarks_with_reminders) {
-              firstPost.set("bookmarked_with_reminder", true);
+      if (bookmark) {
+        if (this.siteSettings.enable_bookmarks_with_reminders) {
+          return firstPost.toggleBookmarkWithReminder().then(() => {
+            this.set("bookmarking", false);
+            return this.afterTopicBookmarked(firstPost);
+          });
+        } else {
+          return ajax(`/t/${this.id}/bookmark`, { type: "PUT" })
+            .then(() => {
+              this.toggleProperty("bookmarked");
+              return this.afterTopicBookmarked(firstPost);
+            })
+            .catch(popupAjaxError)
+            .finally(() => this.set("bookmarking", false));
+        }
+      } else {
+        return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
+          .then(() => {
+            this.toggleProperty("bookmarked");
+            if (posts) {
+              const updated = [];
+              posts.forEach(post => {
+                if (post.get("bookmarked")) {
+                  post.set("bookmarked", false);
+                  updated.push(post.id);
+                }
+                if (
+                  this.siteSettings.enable_bookmarks_with_reminders &&
+                  post.get("bookmarked_with_reminder")
+                ) {
+                  post.set("bookmarked_with_reminder", false);
+                  updated.push(post.id);
+                }
+              });
+              return updated;
             }
-            return [firstPost.id];
-          }
-          if (!bookmark && posts) {
-            const updated = [];
-            posts.forEach(post => {
-              if (post.get("bookmarked")) {
-                post.set("bookmarked", false);
-                updated.push(post.id);
-              }
-              if (
-                this.siteSettings.enable_bookmarks_with_reminders &&
-                post.get("bookmarked_with_reminder")
-              ) {
-                post.set("bookmarked_with_reminder", false);
-                updated.push(post.id);
-              }
-            });
-            return updated;
-          }
-
-          return [];
-        })
-        .catch(popupAjaxError)
-        .finally(() => this.set("bookmarking", false));
+          })
+          .catch(popupAjaxError)
+          .finally(() => this.set("bookmarking", false));
+      }
     };
 
     const unbookmarkedPosts = [];
diff --git a/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js b/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
index f02bc7a223..1a6691dda8 100644
--- a/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
+++ b/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
@@ -14,6 +14,19 @@ createWidgetFrom(
         description,
         username
       });
+    },
+    notificationTitle(notificationName, data) {
+      if (notificationName) {
+        if (data.bookmark_name) {
+          return I18n.t(`notifications.titles.${notificationName}_with_name`, {
+            name: data.bookmark_name
+          });
+        } else {
+          return I18n.t(`notifications.titles.${notificationName}`);
+        }
+      } else {
+        return "";
+      }
     }
   }
 );
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a05ced4e1e..62cfd14763 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1880,6 +1880,7 @@ en:
         moved_post: "post moved"
         linked: "linked"
         bookmark_reminder: "bookmark reminder"
+        bookmark_reminder_with_name: "bookmark reminder - %{name}"
         granted_badge: "badge granted"
         invited_to_topic: "invited to topic"
         group_mentioned: "group mentioned"

From 34df9f790846b1127a69e1d263a8ed299736f64b Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 7 Apr 2020 16:27:13 +1000
Subject: [PATCH 436/633] Revert DEFAULT_SHORTCUTS plugin API-breaking change

* this was done in previous commit
93c38cc1756d409a3055628b14d61bd3d3c0c08c,
  unaware that addKeyboardShortcut in plugin-api.js imports
  bindings from KeyboardShortcuts
---
 .../javascripts/discourse/lib/keyboard-shortcuts.js  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index c4a962ac68..37fe28618c 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -6,7 +6,7 @@ import { ajax } from "discourse/lib/ajax";
 import { throttle } from "@ember/runloop";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 
-export let DEFAULT_BINDINGS = {
+export let bindings = {
   "!": { postAction: "showFlags" },
   "#": { handler: "goToPost", anonymous: true },
   "/": { handler: "toggleSearch", anonymous: true },
@@ -96,18 +96,18 @@ export default {
 
     // Disable the shortcut if private messages are disabled
     if (!siteSettings.enable_personal_messages) {
-      delete DEFAULT_BINDINGS["g m"];
+      delete bindings["g m"];
     }
   },
 
   bindEvents() {
-    Object.keys(DEFAULT_BINDINGS).forEach(key => {
+    Object.keys(bindings).forEach(key => {
       this.bindKey(key);
     });
   },
 
   bindKey(key) {
-    const binding = DEFAULT_BINDINGS[key];
+    const binding = bindings[key];
     if (!binding.anonymous && !this.currentUser) {
       return;
     }
@@ -158,8 +158,8 @@ export default {
   // {
   //   'c': createTopic
   // }
-  unbind(bindings) {
-    this.pause(Object.keys(bindings));
+  unbind(combinations) {
+    this.pause(Object.keys(combinations));
   },
 
   toggleBookmark() {

From 0653750fbf7d690f96ef064932b3dd44550bcb45 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Tue, 7 Apr 2020 16:42:52 +0300
Subject: [PATCH 437/633] FEATURE: Hash user API keys in the database (#9344)

The 'key' column will be dropped in a future commit.
---
 app/controllers/user_api_keys_controller.rb   |  3 +-
 app/models/user_api_key.rb                    | 23 +++++++++++++
 ...0403100259_add_key_hash_to_user_api_key.rb | 32 +++++++++++++++++++
 lib/auth/default_current_user_provider.rb     |  2 +-
 spec/integration/user_api_keys_spec.rb        |  4 +--
 .../requests/user_api_keys_controller_spec.rb |  6 ++--
 6 files changed, 62 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20200403100259_add_key_hash_to_user_api_key.rb

diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rb
index d4f2ae3d2b..6de32f04af 100644
--- a/app/controllers/user_api_keys_controller.rb
+++ b/app/controllers/user_api_keys_controller.rb
@@ -71,7 +71,6 @@ class UserApiKeysController < ApplicationController
       client_id: params[:client_id],
       user_id: current_user.id,
       push_url: params[:push_url],
-      key: SecureRandom.hex,
       scopes: scopes
     )
 
@@ -146,7 +145,7 @@ class UserApiKeysController < ApplicationController
     revoke_key = find_key if params[:id]
 
     if current_key = request.env['HTTP_USER_API_KEY']
-      request_key = UserApiKey.find_by(key: current_key)
+      request_key = UserApiKey.with_key(current_key).first
       revoke_key ||= request_key
       if request_key && request_key.id != revoke_key.id && !request_key.scopes.include?("write")
         raise Discourse::InvalidAccess
diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index 7d696246ca..e937c44a8e 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -20,6 +20,28 @@ class UserApiKey < ActiveRecord::Base
 
   belongs_to :user
 
+  scope :active, -> { where(revoked_at: nil) }
+  scope :with_key, ->(key) { where(key_hash: ApiKey.hash_key(key)) }
+
+  after_initialize :generate_key
+
+  def generate_key
+    if !self.key_hash
+      @key ||= SecureRandom.hex
+      self.key = @key
+      self.key_hash = ApiKey.hash_key(@key)
+    end
+  end
+
+  def key
+    raise ApiKey::KeyAccessError.new "API key is only accessible immediately after creation" unless key_available?
+    @key
+  end
+
+  def key_available?
+    @key.present?
+  end
+
   def self.allowed_scopes
     Set.new(SiteSetting.allow_user_api_key_scopes.split("|"))
   end
@@ -88,6 +110,7 @@ end
 #  revoked_at       :datetime
 #  scopes           :text             default([]), not null, is an Array
 #  last_used_at     :datetime         not null
+#  key_hash         :string           not null
 #
 # Indexes
 #
diff --git a/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb b/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb
new file mode 100644
index 0000000000..2e998fc255
--- /dev/null
+++ b/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class AddKeyHashToUserApiKey < ActiveRecord::Migration[6.0]
+  def up
+    add_column :user_api_keys, :key_hash, :string
+
+    batch_size = 500
+    loop do
+      rows = DB
+        .query("SELECT id, key FROM user_api_keys WHERE key_hash IS NULL LIMIT #{batch_size}")
+        .map { |row| { id: row.id, key_hash: Digest::SHA256.hexdigest(key) } }
+
+      break if rows.size == 0
+
+      data_string = rows.map { |r| "(#{r[:id]}, '#{r[:key_hash]}')" }.join(",")
+      execute <<~SQL
+        UPDATE user_api_keys
+        SET key_hash = data.key_hash
+        FROM (VALUES #{data_string}) AS data(id, key_hash)
+        WHERE user_api_keys.id = data.id
+      SQL
+
+      break if rows.size < batch_size
+    end
+
+    change_column_null :user_api_keys, :key_hash, false
+  end
+
+  def down
+    drop_column :user_api_keys, :key_hash, :string
+  end
+end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index c43580c042..fc7f850026 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -260,7 +260,7 @@ class Auth::DefaultCurrentUserProvider
   protected
 
   def lookup_user_api_user_and_update_key(user_api_key, client_id)
-    if api_key = UserApiKey.where(key: user_api_key, revoked_at: nil).includes(:user).first
+    if api_key = UserApiKey.active.with_key(user_api_key).includes(:user).first
       unless api_key.allow?(@env)
         raise Discourse::InvalidAccess
       end
diff --git a/spec/integration/user_api_keys_spec.rb b/spec/integration/user_api_keys_spec.rb
index 8cd4edcd7a..5bbdff319e 100644
--- a/spec/integration/user_api_keys_spec.rb
+++ b/spec/integration/user_api_keys_spec.rb
@@ -3,12 +3,12 @@
 require 'rails_helper'
 
 describe 'user api keys integration' do
-  fab!(:user_api_key) { Fabricate(:readonly_user_api_key) }
-
   it 'updates last used time on use' do
     freeze_time
 
+    user_api_key = Fabricate(:readonly_user_api_key)
     user_api_key.update_columns(last_used_at: 7.days.ago)
+
     get '/session/current.json', headers: {
       HTTP_USER_API_KEY: user_api_key.key,
     }
diff --git a/spec/requests/user_api_keys_controller_spec.rb b/spec/requests/user_api_keys_controller_spec.rb
index aa965b9a11..8148bef88a 100644
--- a/spec/requests/user_api_keys_controller_spec.rb
+++ b/spec/requests/user_api_keys_controller_spec.rb
@@ -205,7 +205,7 @@ describe UserApiKeysController do
       expect(parsed["nonce"]).to eq(args[:nonce])
       expect(parsed["push"]).to eq(true)
 
-      api_key = UserApiKey.find_by(key: parsed["key"])
+      api_key = UserApiKey.with_key(parsed["key"]).first
 
       expect(api_key.user_id).to eq(user.id)
       expect(api_key.scopes.sort).to eq(["push", "message_bus", "notifications", "session_info", "one_time_password"].sort)
@@ -242,7 +242,7 @@ describe UserApiKeysController do
       encrypted = Base64.decode64(payload)
       key = OpenSSL::PKey::RSA.new(private_key)
       parsed = JSON.parse(key.private_decrypt(encrypted))
-      api_key = UserApiKey.find_by(key: parsed["key"])
+      api_key = UserApiKey.with_key(parsed["key"]).first
       expect(api_key.user_id).to eq(user.id)
     end
 
@@ -259,7 +259,7 @@ describe UserApiKeysController do
       encrypted = Base64.decode64(payload)
       key = OpenSSL::PKey::RSA.new(private_key)
       parsed = JSON.parse(key.private_decrypt(encrypted))
-      api_key = UserApiKey.find_by(key: parsed["key"])
+      api_key = UserApiKey.with_key(parsed["key"]).first
       expect(api_key.user_id).to eq(user.id)
 
     end

From 2e8f54e9ee727a271b366edcae91fb579ee1069c Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Tue, 7 Apr 2020 17:10:05 +0300
Subject: [PATCH 438/633] DEV: Fix build

Follow up to 0653750fbf7d690f96ef064932b3dd44550bcb45.
---
 db/migrate/20200403100259_add_key_hash_to_user_api_key.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb b/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb
index 2e998fc255..138cf28b55 100644
--- a/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb
+++ b/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb
@@ -8,7 +8,7 @@ class AddKeyHashToUserApiKey < ActiveRecord::Migration[6.0]
     loop do
       rows = DB
         .query("SELECT id, key FROM user_api_keys WHERE key_hash IS NULL LIMIT #{batch_size}")
-        .map { |row| { id: row.id, key_hash: Digest::SHA256.hexdigest(key) } }
+        .map { |row| { id: row.id, key_hash: Digest::SHA256.hexdigest(row.key) } }
 
       break if rows.size == 0
 

From 3e176f9bf49e99bbb6a1aa1c4faa28357d5f3949 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 7 Apr 2020 10:29:49 -0400
Subject: [PATCH 439/633] Build(deps): Bump mini_sql from 0.2.4 to 0.2.5
 (#9368)

Bumps [mini_sql](https://github.com/discourse/mini_sql) from 0.2.4 to 0.2.5.
- [Release notes](https://github.com/discourse/mini_sql/releases)
- [Changelog](https://github.com/discourse/mini_sql/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_sql/compare/v0.2.4...v0.2.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cb70d824a3..e668ecd8cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -192,7 +192,7 @@ GEM
       libv8 (>= 6.9.411)
     mini_scheduler (0.12.2)
       sidekiq
-    mini_sql (0.2.4)
+    mini_sql (0.2.5)
     mini_suffix (0.3.0)
       ffi (~> 1.9)
     minitest (5.14.0)

From e52e7f6e75f247fcf0e0d4369ca81edb7d93e5a5 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Tue, 7 Apr 2020 11:42:12 -0300
Subject: [PATCH 440/633] FIX: Include pending queued users regardless of their
 score (#9372)

---
 app/models/reviewable.rb       | 5 ++++-
 spec/models/reviewable_spec.rb | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 78d4b98e65..771b37f4ee 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -476,7 +476,10 @@ class Reviewable < ActiveRecord::Base
     result = result.where("created_at <= ?", to_date) if to_date
 
     if min_score > 0 && status == :pending && type.nil?
-      result = result.where("score >= ? OR type = ?", min_score, ReviewableQueuedPost.name)
+      result = result.where(
+        "score >= ? OR type IN (?)",
+        min_score, [ReviewableQueuedPost.name, ReviewableUser.name]
+      )
     elsif min_score > 0
       result = result.where("score >= ?", min_score)
     end
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 9b46eb7c52..5fd051fc0c 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -181,10 +181,11 @@ RSpec.describe Reviewable, type: :model do
             SiteSetting.reviewable_default_visibility = :high
             Reviewable.set_priorities(high: 10)
             @queued_post = Fabricate(:reviewable_queued_post, score: 0, target: post)
+            @queued_user = Fabricate(:reviewable_user, score: 0)
           end
 
           it 'includes queued posts when searching for pending reviewables' do
-            expect(Reviewable.list_for(user)).to contain_exactly(@queued_post)
+            expect(Reviewable.list_for(user)).to contain_exactly(@queued_post, @queued_user)
           end
 
           it 'excludes pending queued posts when applying a different status filter' do

From 09145e68cd5ce274c919b30e818bb3cd83cce17c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 7 Apr 2020 17:01:02 +0200
Subject: [PATCH 441/633] DEV: upgrades vendored handlebars to 4.7.6 (#9371)

---
 package.json                                  |   2 +-
 vendor/assets/javascripts/handlebars.js       | 400 +++++++++++++-----
 .../assets/javascripts/handlebars.runtime.js  | 286 +++++++++++--
 yarn.lock                                     |  38 +-
 4 files changed, 570 insertions(+), 156 deletions(-)

diff --git a/package.json b/package.json
index 7c327e06eb..fa7ea12185 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "chart.js": "2.9.3",
     "eslint-plugin-lodash": "^6.0.0",
     "favcount": "https://github.com/chrishunt/favcount",
-    "handlebars": "^4.3.0",
+    "handlebars": "^4.7.0",
     "highlight.js": "https://github.com/highlightjs/highlight.js",
     "htmlparser": "https://github.com/tautologistics/node-htmlparser",
     "intersection-observer": "^0.5.1",
diff --git a/vendor/assets/javascripts/handlebars.js b/vendor/assets/javascripts/handlebars.js
index 646b3c3b46..05d9f6141a 100644
--- a/vendor/assets/javascripts/handlebars.js
+++ b/vendor/assets/javascripts/handlebars.js
@@ -1,9 +1,9 @@
 /**!
 
  @license
- handlebars v4.5.3
+ handlebars v4.7.6
 
-Copyright (C) 2011-2017 by Yehuda Katz
+Copyright (C) 2011-2019 by Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -92,23 +92,23 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	// Compiler imports
 
-	var _handlebarsCompilerAst = __webpack_require__(40);
+	var _handlebarsCompilerAst = __webpack_require__(45);
 
 	var _handlebarsCompilerAst2 = _interopRequireDefault(_handlebarsCompilerAst);
 
-	var _handlebarsCompilerBase = __webpack_require__(41);
+	var _handlebarsCompilerBase = __webpack_require__(46);
 
-	var _handlebarsCompilerCompiler = __webpack_require__(46);
+	var _handlebarsCompilerCompiler = __webpack_require__(51);
 
-	var _handlebarsCompilerJavascriptCompiler = __webpack_require__(49);
+	var _handlebarsCompilerJavascriptCompiler = __webpack_require__(52);
 
 	var _handlebarsCompilerJavascriptCompiler2 = _interopRequireDefault(_handlebarsCompilerJavascriptCompiler);
 
-	var _handlebarsCompilerVisitor = __webpack_require__(44);
+	var _handlebarsCompilerVisitor = __webpack_require__(49);
 
 	var _handlebarsCompilerVisitor2 = _interopRequireDefault(_handlebarsCompilerVisitor);
 
-	var _handlebarsNoConflict = __webpack_require__(39);
+	var _handlebarsNoConflict = __webpack_require__(44);
 
 	var _handlebarsNoConflict2 = _interopRequireDefault(_handlebarsNoConflict);
 
@@ -178,7 +178,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	// Each of these augment the Handlebars object. No need to setup here.
 	// (This is done to easily share code between commonjs and browse envs)
 
-	var _handlebarsSafeString = __webpack_require__(33);
+	var _handlebarsSafeString = __webpack_require__(37);
 
 	var _handlebarsSafeString2 = _interopRequireDefault(_handlebarsSafeString);
 
@@ -190,11 +190,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var Utils = _interopRequireWildcard(_handlebarsUtils);
 
-	var _handlebarsRuntime = __webpack_require__(34);
+	var _handlebarsRuntime = __webpack_require__(38);
 
 	var runtime = _interopRequireWildcard(_handlebarsRuntime);
 
-	var _handlebarsNoConflict = __webpack_require__(39);
+	var _handlebarsNoConflict = __webpack_require__(44);
 
 	var _handlebarsNoConflict2 = _interopRequireDefault(_handlebarsNoConflict);
 
@@ -276,7 +276,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _logger2 = _interopRequireDefault(_logger);
 
-	var VERSION = '4.5.3';
+	var _internalProtoAccess = __webpack_require__(33);
+
+	var VERSION = '4.7.6';
 	exports.VERSION = VERSION;
 	var COMPILER_REVISION = 8;
 	exports.COMPILER_REVISION = COMPILER_REVISION;
@@ -352,6 +354,13 @@ return /******/ (function(modules) { // webpackBootstrap
 	  },
 	  unregisterDecorator: function unregisterDecorator(name) {
 	    delete this.decorators[name];
+	  },
+	  /**
+	   * Reset the memory of illegal property accesses that have already been logged.
+	   * @deprecated should only be used in handlebars test-cases
+	   */
+	  resetLoggedPropertyAccesses: function resetLoggedPropertyAccesses() {
+	    _internalProtoAccess.resetLoggedProperties();
 	  }
 	};
 
@@ -375,7 +384,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.createFrame = createFrame;
 	exports.blockParams = blockParams;
 	exports.appendContextPath = appendContextPath;
-
 	var escape = {
 	  '&': '&amp;',
 	  '<': '&lt;',
@@ -499,7 +507,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	var _Object$defineProperty = __webpack_require__(7)['default'];
 
 	exports.__esModule = true;
-
 	var errorProps = ['description', 'fileName', 'lineNumber', 'endLineNumber', 'message', 'name', 'number', 'stack'];
 
 	function Exception(message, node) {
@@ -1047,7 +1054,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    if (arguments.length != 2) {
 	      throw new _exception2['default']('#unless requires exactly one argument');
 	    }
-	    return instance.helpers['if'].call(this, conditional, { fn: options.inverse, inverse: options.fn, hash: options.hash });
+	    return instance.helpers['if'].call(this, conditional, {
+	      fn: options.inverse,
+	      inverse: options.fn,
+	      hash: options.hash
+	    });
 	  });
 	};
 
@@ -1090,22 +1101,19 @@ return /******/ (function(modules) { // webpackBootstrap
 	'use strict';
 
 	exports.__esModule = true;
-	var dangerousPropertyRegex = /^(constructor|__defineGetter__|__defineSetter__|__lookupGetter__|__proto__)$/;
-
-	exports.dangerousPropertyRegex = dangerousPropertyRegex;
 
 	exports['default'] = function (instance) {
-	  instance.registerHelper('lookup', function (obj, field) {
+	  instance.registerHelper('lookup', function (obj, field, options) {
 	    if (!obj) {
+	      // Note for 5.0: Change to "obj == null" in 5.0
 	      return obj;
 	    }
-	    if (dangerousPropertyRegex.test(String(field)) && !Object.prototype.propertyIsEnumerable.call(obj, field)) {
-	      return undefined;
-	    }
-	    return obj[field];
+	    return options.lookupProperty(obj, field);
 	  });
 	};
 
+	module.exports = exports['default'];
+
 /***/ }),
 /* 29 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1238,8 +1246,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    if (typeof console !== 'undefined' && logger.lookupLevel(logger.level) <= level) {
 	      var method = logger.methodMap[level];
+	      // eslint-disable-next-line no-console
 	      if (!console[method]) {
-	        // eslint-disable-line no-console
 	        method = 'log';
 	      }
 
@@ -1257,6 +1265,129 @@ return /******/ (function(modules) { // webpackBootstrap
 
 /***/ }),
 /* 33 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Object$create = __webpack_require__(34)['default'];
+
+	var _Object$keys = __webpack_require__(13)['default'];
+
+	var _interopRequireWildcard = __webpack_require__(3)['default'];
+
+	exports.__esModule = true;
+	exports.createProtoAccessControl = createProtoAccessControl;
+	exports.resultIsAllowed = resultIsAllowed;
+	exports.resetLoggedProperties = resetLoggedProperties;
+
+	var _createNewLookupObject = __webpack_require__(36);
+
+	var _logger = __webpack_require__(32);
+
+	var logger = _interopRequireWildcard(_logger);
+
+	var loggedProperties = _Object$create(null);
+
+	function createProtoAccessControl(runtimeOptions) {
+	  var defaultMethodWhiteList = _Object$create(null);
+	  defaultMethodWhiteList['constructor'] = false;
+	  defaultMethodWhiteList['__defineGetter__'] = false;
+	  defaultMethodWhiteList['__defineSetter__'] = false;
+	  defaultMethodWhiteList['__lookupGetter__'] = false;
+
+	  var defaultPropertyWhiteList = _Object$create(null);
+	  // eslint-disable-next-line no-proto
+	  defaultPropertyWhiteList['__proto__'] = false;
+
+	  return {
+	    properties: {
+	      whitelist: _createNewLookupObject.createNewLookupObject(defaultPropertyWhiteList, runtimeOptions.allowedProtoProperties),
+	      defaultValue: runtimeOptions.allowProtoPropertiesByDefault
+	    },
+	    methods: {
+	      whitelist: _createNewLookupObject.createNewLookupObject(defaultMethodWhiteList, runtimeOptions.allowedProtoMethods),
+	      defaultValue: runtimeOptions.allowProtoMethodsByDefault
+	    }
+	  };
+	}
+
+	function resultIsAllowed(result, protoAccessControl, propertyName) {
+	  if (typeof result === 'function') {
+	    return checkWhiteList(protoAccessControl.methods, propertyName);
+	  } else {
+	    return checkWhiteList(protoAccessControl.properties, propertyName);
+	  }
+	}
+
+	function checkWhiteList(protoAccessControlForType, propertyName) {
+	  if (protoAccessControlForType.whitelist[propertyName] !== undefined) {
+	    return protoAccessControlForType.whitelist[propertyName] === true;
+	  }
+	  if (protoAccessControlForType.defaultValue !== undefined) {
+	    return protoAccessControlForType.defaultValue;
+	  }
+	  logUnexpecedPropertyAccessOnce(propertyName);
+	  return false;
+	}
+
+	function logUnexpecedPropertyAccessOnce(propertyName) {
+	  if (loggedProperties[propertyName] !== true) {
+	    loggedProperties[propertyName] = true;
+	    logger.log('error', 'Handlebars: Access has been denied to resolve the property "' + propertyName + '" because it is not an "own property" of its parent.\n' + 'You can add a runtime option to disable the check or this warning:\n' + 'See https://handlebarsjs.com/api-reference/runtime-options.html#options-to-control-prototype-access for details');
+	  }
+	}
+
+	function resetLoggedProperties() {
+	  _Object$keys(loggedProperties).forEach(function (propertyName) {
+	    delete loggedProperties[propertyName];
+	  });
+	}
+
+/***/ }),
+/* 34 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	module.exports = { "default": __webpack_require__(35), __esModule: true };
+
+/***/ }),
+/* 35 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var $ = __webpack_require__(9);
+	module.exports = function create(P, D){
+	  return $.create(P, D);
+	};
+
+/***/ }),
+/* 36 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Object$create = __webpack_require__(34)['default'];
+
+	exports.__esModule = true;
+	exports.createNewLookupObject = createNewLookupObject;
+
+	var _utils = __webpack_require__(5);
+
+	/**
+	 * Create a new object with "null"-prototype to avoid truthy results on prototype properties.
+	 * The resulting object can be used with "object[property]" to check if a property exists
+	 * @param {...object} sources a varargs parameter of source objects that will be merged
+	 * @returns {object}
+	 */
+
+	function createNewLookupObject() {
+	  for (var _len = arguments.length, sources = Array(_len), _key = 0; _key < _len; _key++) {
+	    sources[_key] = arguments[_key];
+	  }
+
+	  return _utils.extend.apply(undefined, [_Object$create(null)].concat(sources));
+	}
+
+/***/ }),
+/* 37 */
 /***/ (function(module, exports) {
 
 	// Build out our basic SafeString type
@@ -1275,12 +1406,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 34 */
+/* 38 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var _Object$seal = __webpack_require__(35)['default'];
+	var _Object$seal = __webpack_require__(39)['default'];
+
+	var _Object$keys = __webpack_require__(13)['default'];
 
 	var _interopRequireWildcard = __webpack_require__(3)['default'];
 
@@ -1306,6 +1439,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _helpers = __webpack_require__(10);
 
+	var _internalWrapHelper = __webpack_require__(43);
+
+	var _internalProtoAccess = __webpack_require__(33);
+
 	function checkRevision(compilerInfo) {
 	  var compilerRevision = compilerInfo && compilerInfo[0] || 1,
 	      currentRevision = _base.COMPILER_REVISION;
@@ -1325,7 +1462,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function template(templateSpec, env) {
-
 	  /* istanbul ignore next */
 	  if (!env) {
 	    throw new _exception2['default']('No environment passed to template');
@@ -1352,13 +1488,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 	    partial = env.VM.resolvePartial.call(this, partial, context, options);
 
-	    var optionsWithHooks = Utils.extend({}, options, { hooks: this.hooks });
+	    var extendedOptions = Utils.extend({}, options, {
+	      hooks: this.hooks,
+	      protoAccessControl: this.protoAccessControl
+	    });
 
-	    var result = env.VM.invokePartial.call(this, partial, context, optionsWithHooks);
+	    var result = env.VM.invokePartial.call(this, partial, context, extendedOptions);
 
 	    if (result == null && env.compile) {
 	      options.partials[options.name] = env.compile(partial, templateSpec.compilerOptions, env);
-	      result = options.partials[options.name](context, optionsWithHooks);
+	      result = options.partials[options.name](context, extendedOptions);
 	    }
 	    if (result != null) {
 	      if (options.indent) {
@@ -1382,14 +1521,31 @@ return /******/ (function(modules) { // webpackBootstrap
 	  var container = {
 	    strict: function strict(obj, name, loc) {
 	      if (!obj || !(name in obj)) {
-	        throw new _exception2['default']('"' + name + '" not defined in ' + obj, { loc: loc });
+	        throw new _exception2['default']('"' + name + '" not defined in ' + obj, {
+	          loc: loc
+	        });
 	      }
 	      return obj[name];
 	    },
+	    lookupProperty: function lookupProperty(parent, propertyName) {
+	      var result = parent[propertyName];
+	      if (result == null) {
+	        return result;
+	      }
+	      if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+	        return result;
+	      }
+
+	      if (_internalProtoAccess.resultIsAllowed(result, container.protoAccessControl, propertyName)) {
+	        return result;
+	      }
+	      return undefined;
+	    },
 	    lookup: function lookup(depths, name) {
 	      var len = depths.length;
 	      for (var i = 0; i < len; i++) {
-	        if (depths[i] && depths[i][name] != null) {
+	        var result = depths[i] && container.lookupProperty(depths[i], name);
+	        if (result != null) {
 	          return depths[i][name];
 	        }
 	      }
@@ -1425,6 +1581,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	      }
 	      return value;
 	    },
+	    mergeIfNeeded: function mergeIfNeeded(param, common) {
+	      var obj = param || common;
+
+	      if (param && common && param !== common) {
+	        obj = Utils.extend({}, common, param);
+	      }
+
+	      return obj;
+	    },
 	    // An empty object to use as replacement for null-contexts
 	    nullContext: _Object$seal({}),
 
@@ -1454,28 +1619,35 @@ return /******/ (function(modules) { // webpackBootstrap
 	    function main(context /*, options*/) {
 	      return '' + templateSpec.main(container, context, container.helpers, container.partials, data, blockParams, depths);
 	    }
+
 	    main = executeDecorators(templateSpec.main, main, container, options.depths || [], data, blockParams);
 	    return main(context, options);
 	  }
+
 	  ret.isTop = true;
 
 	  ret._setup = function (options) {
 	    if (!options.partial) {
-	      container.helpers = Utils.extend({}, env.helpers, options.helpers);
+	      var mergedHelpers = Utils.extend({}, env.helpers, options.helpers);
+	      wrapHelpersToPassLookupProperty(mergedHelpers, container);
+	      container.helpers = mergedHelpers;
 
 	      if (templateSpec.usePartial) {
-	        container.partials = Utils.extend({}, env.partials, options.partials);
+	        // Use mergeIfNeeded here to prevent compiling global partials multiple times
+	        container.partials = container.mergeIfNeeded(options.partials, env.partials);
 	      }
 	      if (templateSpec.usePartial || templateSpec.useDecorators) {
 	        container.decorators = Utils.extend({}, env.decorators, options.decorators);
 	      }
 
 	      container.hooks = {};
+	      container.protoAccessControl = _internalProtoAccess.createProtoAccessControl(options);
 
 	      var keepHelperInHelpers = options.allowCallsToHelperMissing || templateWasPrecompiledWithCompilerV7;
 	      _helpers.moveHelperToHooks(container, 'helperMissing', keepHelperInHelpers);
 	      _helpers.moveHelperToHooks(container, 'blockHelperMissing', keepHelperInHelpers);
 	    } else {
+	      container.protoAccessControl = options.protoAccessControl; // internal option
 	      container.helpers = options.helpers;
 	      container.partials = options.partials;
 	      container.decorators = options.decorators;
@@ -1596,25 +1768,39 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return prog;
 	}
 
-/***/ }),
-/* 35 */
-/***/ (function(module, exports, __webpack_require__) {
+	function wrapHelpersToPassLookupProperty(mergedHelpers, container) {
+	  _Object$keys(mergedHelpers).forEach(function (helperName) {
+	    var helper = mergedHelpers[helperName];
+	    mergedHelpers[helperName] = passLookupPropertyOption(helper, container);
+	  });
+	}
 
-	module.exports = { "default": __webpack_require__(36), __esModule: true };
+	function passLookupPropertyOption(helper, container) {
+	  var lookupProperty = container.lookupProperty;
+	  return _internalWrapHelper.wrapHelper(helper, function (options) {
+	    return Utils.extend({ lookupProperty: lookupProperty }, options);
+	  });
+	}
 
 /***/ }),
-/* 36 */
+/* 39 */
 /***/ (function(module, exports, __webpack_require__) {
 
-	__webpack_require__(37);
+	module.exports = { "default": __webpack_require__(40), __esModule: true };
+
+/***/ }),
+/* 40 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	__webpack_require__(41);
 	module.exports = __webpack_require__(21).Object.seal;
 
 /***/ }),
-/* 37 */
+/* 41 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	// 19.1.2.17 Object.seal(O)
-	var isObject = __webpack_require__(38);
+	var isObject = __webpack_require__(42);
 
 	__webpack_require__(18)('seal', function($seal){
 	  return function seal(it){
@@ -1623,7 +1809,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	});
 
 /***/ }),
-/* 38 */
+/* 42 */
 /***/ (function(module, exports) {
 
 	module.exports = function(it){
@@ -1631,12 +1817,34 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 
 /***/ }),
-/* 39 */
+/* 43 */
 /***/ (function(module, exports) {
 
-	/* WEBPACK VAR INJECTION */(function(global) {/* global window */
 	'use strict';
 
+	exports.__esModule = true;
+	exports.wrapHelper = wrapHelper;
+
+	function wrapHelper(helper, transformOptionsFn) {
+	  if (typeof helper !== 'function') {
+	    // This should not happen, but apparently it does in https://github.com/wycats/handlebars.js/issues/1639
+	    // We try to make the wrapper least-invasive by not wrapping it, if the helper is not a function.
+	    return helper;
+	  }
+	  var wrapper = function wrapper() /* dynamic arguments */{
+	    var options = arguments[arguments.length - 1];
+	    arguments[arguments.length - 1] = transformOptionsFn(options);
+	    return helper.apply(this, arguments);
+	  };
+	  return wrapper;
+	}
+
+/***/ }),
+/* 44 */
+/***/ (function(module, exports) {
+
+	/* WEBPACK VAR INJECTION */(function(global) {'use strict';
+
 	exports.__esModule = true;
 
 	exports['default'] = function (Handlebars) {
@@ -1656,7 +1864,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
 
 /***/ }),
-/* 40 */
+/* 45 */
 /***/ (function(module, exports) {
 
 	'use strict';
@@ -1691,7 +1899,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 41 */
+/* 46 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -1704,15 +1912,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.parseWithoutProcessing = parseWithoutProcessing;
 	exports.parse = parse;
 
-	var _parser = __webpack_require__(42);
+	var _parser = __webpack_require__(47);
 
 	var _parser2 = _interopRequireDefault(_parser);
 
-	var _whitespaceControl = __webpack_require__(43);
+	var _whitespaceControl = __webpack_require__(48);
 
 	var _whitespaceControl2 = _interopRequireDefault(_whitespaceControl);
 
-	var _helpers = __webpack_require__(45);
+	var _helpers = __webpack_require__(50);
 
 	var Helpers = _interopRequireWildcard(_helpers);
 
@@ -1749,7 +1957,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 /***/ }),
-/* 42 */
+/* 47 */
 /***/ (function(module, exports) {
 
 	// File ignored in coverage tests via setting in .istanbul.yml
@@ -2490,7 +2698,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports["default"];
 
 /***/ }),
-/* 43 */
+/* 48 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -2499,7 +2707,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	exports.__esModule = true;
 
-	var _visitor = __webpack_require__(44);
+	var _visitor = __webpack_require__(49);
 
 	var _visitor2 = _interopRequireDefault(_visitor);
 
@@ -2714,7 +2922,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 44 */
+/* 49 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -2857,7 +3065,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 45 */
+/* 50 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -3088,14 +3296,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 /***/ }),
-/* 46 */
+/* 51 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	/* eslint-disable new-cap */
 
 	'use strict';
 
-	var _Object$create = __webpack_require__(47)['default'];
+	var _Object$create = __webpack_require__(34)['default'];
 
 	var _interopRequireDefault = __webpack_require__(1)['default'];
 
@@ -3110,7 +3318,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _utils = __webpack_require__(5);
 
-	var _ast = __webpack_require__(40);
+	var _ast = __webpack_require__(45);
 
 	var _ast2 = _interopRequireDefault(_ast);
 
@@ -3165,14 +3373,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	    options.blockParams = options.blockParams || [];
 
 	    options.knownHelpers = _utils.extend(_Object$create(null), {
-	      'helperMissing': true,
-	      'blockHelperMissing': true,
-	      'each': true,
+	      helperMissing: true,
+	      blockHelperMissing: true,
+	      each: true,
 	      'if': true,
-	      'unless': true,
+	      unless: true,
 	      'with': true,
-	      'log': true,
-	      'lookup': true
+	      log: true,
+	      lookup: true
 	    }, options.knownHelpers);
 
 	    return this.accept(program);
@@ -3439,7 +3647,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  // HELPERS
 	  opcode: function opcode(name) {
-	    this.opcodes.push({ opcode: name, args: slice.call(arguments, 1), loc: this.sourceNode[0].loc });
+	    this.opcodes.push({
+	      opcode: name,
+	      args: slice.call(arguments, 1),
+	      loc: this.sourceNode[0].loc
+	    });
 	  },
 
 	  addDepth: function addDepth(depth) {
@@ -3655,22 +3867,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 /***/ }),
-/* 47 */
-/***/ (function(module, exports, __webpack_require__) {
-
-	module.exports = { "default": __webpack_require__(48), __esModule: true };
-
-/***/ }),
-/* 48 */
-/***/ (function(module, exports, __webpack_require__) {
-
-	var $ = __webpack_require__(9);
-	module.exports = function create(P, D){
-	  return $.create(P, D);
-	};
-
-/***/ }),
-/* 49 */
+/* 52 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -3689,12 +3886,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _utils = __webpack_require__(5);
 
-	var _codeGen = __webpack_require__(50);
+	var _codeGen = __webpack_require__(53);
 
 	var _codeGen2 = _interopRequireDefault(_codeGen);
 
-	var _helpersLookup = __webpack_require__(28);
-
 	function Literal(value) {
 	  this.value = value;
 	}
@@ -3704,20 +3899,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	JavaScriptCompiler.prototype = {
 	  // PUBLIC API: You can override these methods in a subclass to provide
 	  // alternative compiled forms for name lookup and buffering semantics
-	  nameLookup: function nameLookup(parent, name /* , type*/) {
-	    if (_helpersLookup.dangerousPropertyRegex.test(name)) {
-	      var isEnumerable = [this.aliasable('container.propertyIsEnumerable'), '.call(', parent, ',', JSON.stringify(name), ')'];
-	      return ['(', isEnumerable, '?', _actualLookup(), ' : undefined)'];
-	    }
-	    return _actualLookup();
-
-	    function _actualLookup() {
-	      if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
-	        return [parent, '.', name];
-	      } else {
-	        return [parent, '[', JSON.stringify(name), ']'];
-	      }
-	    }
+	  nameLookup: function nameLookup(parent, name /*,  type */) {
+	    return this.internalNameLookup(parent, name);
 	  },
 	  depthedLookup: function depthedLookup(name) {
 	    return [this.aliasable('container.lookup'), '(depths, "', name, '")'];
@@ -3753,6 +3936,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return this.quotedString('');
 	  },
 	  // END PUBLIC API
+	  internalNameLookup: function internalNameLookup(parent, name) {
+	    this.lookupPropertyFunctionIsUsed = true;
+	    return ['lookupProperty(', parent, ',', JSON.stringify(name), ')'];
+	  },
+
+	  lookupPropertyFunctionIsUsed: false,
 
 	  compile: function compile(environment, options, context, asObject) {
 	    this.environment = environment;
@@ -3811,7 +4000,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    if (!this.decorators.isEmpty()) {
 	      this.useDecorators = true;
 
-	      this.decorators.prepend('var decorators = container.decorators;\n');
+	      this.decorators.prepend(['var decorators = container.decorators, ', this.lookupPropertyFunctionVarDeclaration(), ';\n']);
 	      this.decorators.push('return fn;');
 
 	      if (asObject) {
@@ -3924,6 +4113,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	      }
 	    });
 
+	    if (this.lookupPropertyFunctionIsUsed) {
+	      varDeclarations += ', ' + this.lookupPropertyFunctionVarDeclaration();
+	    }
+
 	    var params = ['container', 'depth0', 'helpers', 'partials', 'data'];
 
 	    if (this.useBlockParams || this.useDepths) {
@@ -4002,6 +4195,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return this.source.merge();
 	  },
 
+	  lookupPropertyFunctionVarDeclaration: function lookupPropertyFunctionVarDeclaration() {
+	    return '\n      lookupProperty = container.lookupProperty || function(parent, propertyName) {\n        if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {\n          return parent[propertyName];\n        }\n        return undefined\n    }\n    '.trim();
+	  },
+
 	  // [blockValue]
 	  //
 	  // On stack, before: hash, inverse, program, value
@@ -4804,6 +5001,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 	})();
 
+	/**
+	 * @deprecated May be removed in the next major version
+	 */
 	JavaScriptCompiler.isValidJavaScriptVariableName = function (name) {
 	  return !JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name);
 	};
@@ -4831,7 +5031,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 50 */
+/* 53 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	/* global define */
diff --git a/vendor/assets/javascripts/handlebars.runtime.js b/vendor/assets/javascripts/handlebars.runtime.js
index f2255e7830..ac3976acbd 100644
--- a/vendor/assets/javascripts/handlebars.runtime.js
+++ b/vendor/assets/javascripts/handlebars.runtime.js
@@ -1,9 +1,9 @@
 /**!
 
  @license
- handlebars v4.5.3
+ handlebars v4.7.6
 
-Copyright (C) 2011-2017 by Yehuda Katz
+Copyright (C) 2011-2019 by Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -95,7 +95,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	// Each of these augment the Handlebars object. No need to setup here.
 	// (This is done to easily share code between commonjs and browse envs)
 
-	var _handlebarsSafeString = __webpack_require__(32);
+	var _handlebarsSafeString = __webpack_require__(36);
 
 	var _handlebarsSafeString2 = _interopRequireDefault(_handlebarsSafeString);
 
@@ -107,11 +107,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var Utils = _interopRequireWildcard(_handlebarsUtils);
 
-	var _handlebarsRuntime = __webpack_require__(33);
+	var _handlebarsRuntime = __webpack_require__(37);
 
 	var runtime = _interopRequireWildcard(_handlebarsRuntime);
 
-	var _handlebarsNoConflict = __webpack_require__(38);
+	var _handlebarsNoConflict = __webpack_require__(43);
 
 	var _handlebarsNoConflict2 = _interopRequireDefault(_handlebarsNoConflict);
 
@@ -207,7 +207,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _logger2 = _interopRequireDefault(_logger);
 
-	var VERSION = '4.5.3';
+	var _internalProtoAccess = __webpack_require__(32);
+
+	var VERSION = '4.7.6';
 	exports.VERSION = VERSION;
 	var COMPILER_REVISION = 8;
 	exports.COMPILER_REVISION = COMPILER_REVISION;
@@ -283,6 +285,13 @@ return /******/ (function(modules) { // webpackBootstrap
 	  },
 	  unregisterDecorator: function unregisterDecorator(name) {
 	    delete this.decorators[name];
+	  },
+	  /**
+	   * Reset the memory of illegal property accesses that have already been logged.
+	   * @deprecated should only be used in handlebars test-cases
+	   */
+	  resetLoggedPropertyAccesses: function resetLoggedPropertyAccesses() {
+	    _internalProtoAccess.resetLoggedProperties();
 	  }
 	};
 
@@ -306,7 +315,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.createFrame = createFrame;
 	exports.blockParams = blockParams;
 	exports.appendContextPath = appendContextPath;
-
 	var escape = {
 	  '&': '&amp;',
 	  '<': '&lt;',
@@ -430,7 +438,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	var _Object$defineProperty = __webpack_require__(6)['default'];
 
 	exports.__esModule = true;
-
 	var errorProps = ['description', 'fileName', 'lineNumber', 'endLineNumber', 'message', 'name', 'number', 'stack'];
 
 	function Exception(message, node) {
@@ -978,7 +985,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    if (arguments.length != 2) {
 	      throw new _exception2['default']('#unless requires exactly one argument');
 	    }
-	    return instance.helpers['if'].call(this, conditional, { fn: options.inverse, inverse: options.fn, hash: options.hash });
+	    return instance.helpers['if'].call(this, conditional, {
+	      fn: options.inverse,
+	      inverse: options.fn,
+	      hash: options.hash
+	    });
 	  });
 	};
 
@@ -1021,22 +1032,19 @@ return /******/ (function(modules) { // webpackBootstrap
 	'use strict';
 
 	exports.__esModule = true;
-	var dangerousPropertyRegex = /^(constructor|__defineGetter__|__defineSetter__|__lookupGetter__|__proto__)$/;
-
-	exports.dangerousPropertyRegex = dangerousPropertyRegex;
 
 	exports['default'] = function (instance) {
-	  instance.registerHelper('lookup', function (obj, field) {
+	  instance.registerHelper('lookup', function (obj, field, options) {
 	    if (!obj) {
+	      // Note for 5.0: Change to "obj == null" in 5.0
 	      return obj;
 	    }
-	    if (dangerousPropertyRegex.test(String(field)) && !Object.prototype.propertyIsEnumerable.call(obj, field)) {
-	      return undefined;
-	    }
-	    return obj[field];
+	    return options.lookupProperty(obj, field);
 	  });
 	};
 
+	module.exports = exports['default'];
+
 /***/ }),
 /* 28 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1169,8 +1177,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    if (typeof console !== 'undefined' && logger.lookupLevel(logger.level) <= level) {
 	      var method = logger.methodMap[level];
+	      // eslint-disable-next-line no-console
 	      if (!console[method]) {
-	        // eslint-disable-line no-console
 	        method = 'log';
 	      }
 
@@ -1188,6 +1196,129 @@ return /******/ (function(modules) { // webpackBootstrap
 
 /***/ }),
 /* 32 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Object$create = __webpack_require__(33)['default'];
+
+	var _Object$keys = __webpack_require__(12)['default'];
+
+	var _interopRequireWildcard = __webpack_require__(1)['default'];
+
+	exports.__esModule = true;
+	exports.createProtoAccessControl = createProtoAccessControl;
+	exports.resultIsAllowed = resultIsAllowed;
+	exports.resetLoggedProperties = resetLoggedProperties;
+
+	var _createNewLookupObject = __webpack_require__(35);
+
+	var _logger = __webpack_require__(31);
+
+	var logger = _interopRequireWildcard(_logger);
+
+	var loggedProperties = _Object$create(null);
+
+	function createProtoAccessControl(runtimeOptions) {
+	  var defaultMethodWhiteList = _Object$create(null);
+	  defaultMethodWhiteList['constructor'] = false;
+	  defaultMethodWhiteList['__defineGetter__'] = false;
+	  defaultMethodWhiteList['__defineSetter__'] = false;
+	  defaultMethodWhiteList['__lookupGetter__'] = false;
+
+	  var defaultPropertyWhiteList = _Object$create(null);
+	  // eslint-disable-next-line no-proto
+	  defaultPropertyWhiteList['__proto__'] = false;
+
+	  return {
+	    properties: {
+	      whitelist: _createNewLookupObject.createNewLookupObject(defaultPropertyWhiteList, runtimeOptions.allowedProtoProperties),
+	      defaultValue: runtimeOptions.allowProtoPropertiesByDefault
+	    },
+	    methods: {
+	      whitelist: _createNewLookupObject.createNewLookupObject(defaultMethodWhiteList, runtimeOptions.allowedProtoMethods),
+	      defaultValue: runtimeOptions.allowProtoMethodsByDefault
+	    }
+	  };
+	}
+
+	function resultIsAllowed(result, protoAccessControl, propertyName) {
+	  if (typeof result === 'function') {
+	    return checkWhiteList(protoAccessControl.methods, propertyName);
+	  } else {
+	    return checkWhiteList(protoAccessControl.properties, propertyName);
+	  }
+	}
+
+	function checkWhiteList(protoAccessControlForType, propertyName) {
+	  if (protoAccessControlForType.whitelist[propertyName] !== undefined) {
+	    return protoAccessControlForType.whitelist[propertyName] === true;
+	  }
+	  if (protoAccessControlForType.defaultValue !== undefined) {
+	    return protoAccessControlForType.defaultValue;
+	  }
+	  logUnexpecedPropertyAccessOnce(propertyName);
+	  return false;
+	}
+
+	function logUnexpecedPropertyAccessOnce(propertyName) {
+	  if (loggedProperties[propertyName] !== true) {
+	    loggedProperties[propertyName] = true;
+	    logger.log('error', 'Handlebars: Access has been denied to resolve the property "' + propertyName + '" because it is not an "own property" of its parent.\n' + 'You can add a runtime option to disable the check or this warning:\n' + 'See https://handlebarsjs.com/api-reference/runtime-options.html#options-to-control-prototype-access for details');
+	  }
+	}
+
+	function resetLoggedProperties() {
+	  _Object$keys(loggedProperties).forEach(function (propertyName) {
+	    delete loggedProperties[propertyName];
+	  });
+	}
+
+/***/ }),
+/* 33 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	module.exports = { "default": __webpack_require__(34), __esModule: true };
+
+/***/ }),
+/* 34 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var $ = __webpack_require__(8);
+	module.exports = function create(P, D){
+	  return $.create(P, D);
+	};
+
+/***/ }),
+/* 35 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Object$create = __webpack_require__(33)['default'];
+
+	exports.__esModule = true;
+	exports.createNewLookupObject = createNewLookupObject;
+
+	var _utils = __webpack_require__(4);
+
+	/**
+	 * Create a new object with "null"-prototype to avoid truthy results on prototype properties.
+	 * The resulting object can be used with "object[property]" to check if a property exists
+	 * @param {...object} sources a varargs parameter of source objects that will be merged
+	 * @returns {object}
+	 */
+
+	function createNewLookupObject() {
+	  for (var _len = arguments.length, sources = Array(_len), _key = 0; _key < _len; _key++) {
+	    sources[_key] = arguments[_key];
+	  }
+
+	  return _utils.extend.apply(undefined, [_Object$create(null)].concat(sources));
+	}
+
+/***/ }),
+/* 36 */
 /***/ (function(module, exports) {
 
 	// Build out our basic SafeString type
@@ -1206,12 +1337,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 33 */
+/* 37 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var _Object$seal = __webpack_require__(34)['default'];
+	var _Object$seal = __webpack_require__(38)['default'];
+
+	var _Object$keys = __webpack_require__(12)['default'];
 
 	var _interopRequireWildcard = __webpack_require__(1)['default'];
 
@@ -1237,6 +1370,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _helpers = __webpack_require__(9);
 
+	var _internalWrapHelper = __webpack_require__(42);
+
+	var _internalProtoAccess = __webpack_require__(32);
+
 	function checkRevision(compilerInfo) {
 	  var compilerRevision = compilerInfo && compilerInfo[0] || 1,
 	      currentRevision = _base.COMPILER_REVISION;
@@ -1256,7 +1393,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function template(templateSpec, env) {
-
 	  /* istanbul ignore next */
 	  if (!env) {
 	    throw new _exception2['default']('No environment passed to template');
@@ -1283,13 +1419,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 	    partial = env.VM.resolvePartial.call(this, partial, context, options);
 
-	    var optionsWithHooks = Utils.extend({}, options, { hooks: this.hooks });
+	    var extendedOptions = Utils.extend({}, options, {
+	      hooks: this.hooks,
+	      protoAccessControl: this.protoAccessControl
+	    });
 
-	    var result = env.VM.invokePartial.call(this, partial, context, optionsWithHooks);
+	    var result = env.VM.invokePartial.call(this, partial, context, extendedOptions);
 
 	    if (result == null && env.compile) {
 	      options.partials[options.name] = env.compile(partial, templateSpec.compilerOptions, env);
-	      result = options.partials[options.name](context, optionsWithHooks);
+	      result = options.partials[options.name](context, extendedOptions);
 	    }
 	    if (result != null) {
 	      if (options.indent) {
@@ -1313,14 +1452,31 @@ return /******/ (function(modules) { // webpackBootstrap
 	  var container = {
 	    strict: function strict(obj, name, loc) {
 	      if (!obj || !(name in obj)) {
-	        throw new _exception2['default']('"' + name + '" not defined in ' + obj, { loc: loc });
+	        throw new _exception2['default']('"' + name + '" not defined in ' + obj, {
+	          loc: loc
+	        });
 	      }
 	      return obj[name];
 	    },
+	    lookupProperty: function lookupProperty(parent, propertyName) {
+	      var result = parent[propertyName];
+	      if (result == null) {
+	        return result;
+	      }
+	      if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+	        return result;
+	      }
+
+	      if (_internalProtoAccess.resultIsAllowed(result, container.protoAccessControl, propertyName)) {
+	        return result;
+	      }
+	      return undefined;
+	    },
 	    lookup: function lookup(depths, name) {
 	      var len = depths.length;
 	      for (var i = 0; i < len; i++) {
-	        if (depths[i] && depths[i][name] != null) {
+	        var result = depths[i] && container.lookupProperty(depths[i], name);
+	        if (result != null) {
 	          return depths[i][name];
 	        }
 	      }
@@ -1356,6 +1512,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	      }
 	      return value;
 	    },
+	    mergeIfNeeded: function mergeIfNeeded(param, common) {
+	      var obj = param || common;
+
+	      if (param && common && param !== common) {
+	        obj = Utils.extend({}, common, param);
+	      }
+
+	      return obj;
+	    },
 	    // An empty object to use as replacement for null-contexts
 	    nullContext: _Object$seal({}),
 
@@ -1385,28 +1550,35 @@ return /******/ (function(modules) { // webpackBootstrap
 	    function main(context /*, options*/) {
 	      return '' + templateSpec.main(container, context, container.helpers, container.partials, data, blockParams, depths);
 	    }
+
 	    main = executeDecorators(templateSpec.main, main, container, options.depths || [], data, blockParams);
 	    return main(context, options);
 	  }
+
 	  ret.isTop = true;
 
 	  ret._setup = function (options) {
 	    if (!options.partial) {
-	      container.helpers = Utils.extend({}, env.helpers, options.helpers);
+	      var mergedHelpers = Utils.extend({}, env.helpers, options.helpers);
+	      wrapHelpersToPassLookupProperty(mergedHelpers, container);
+	      container.helpers = mergedHelpers;
 
 	      if (templateSpec.usePartial) {
-	        container.partials = Utils.extend({}, env.partials, options.partials);
+	        // Use mergeIfNeeded here to prevent compiling global partials multiple times
+	        container.partials = container.mergeIfNeeded(options.partials, env.partials);
 	      }
 	      if (templateSpec.usePartial || templateSpec.useDecorators) {
 	        container.decorators = Utils.extend({}, env.decorators, options.decorators);
 	      }
 
 	      container.hooks = {};
+	      container.protoAccessControl = _internalProtoAccess.createProtoAccessControl(options);
 
 	      var keepHelperInHelpers = options.allowCallsToHelperMissing || templateWasPrecompiledWithCompilerV7;
 	      _helpers.moveHelperToHooks(container, 'helperMissing', keepHelperInHelpers);
 	      _helpers.moveHelperToHooks(container, 'blockHelperMissing', keepHelperInHelpers);
 	    } else {
+	      container.protoAccessControl = options.protoAccessControl; // internal option
 	      container.helpers = options.helpers;
 	      container.partials = options.partials;
 	      container.decorators = options.decorators;
@@ -1527,25 +1699,39 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return prog;
 	}
 
-/***/ }),
-/* 34 */
-/***/ (function(module, exports, __webpack_require__) {
+	function wrapHelpersToPassLookupProperty(mergedHelpers, container) {
+	  _Object$keys(mergedHelpers).forEach(function (helperName) {
+	    var helper = mergedHelpers[helperName];
+	    mergedHelpers[helperName] = passLookupPropertyOption(helper, container);
+	  });
+	}
 
-	module.exports = { "default": __webpack_require__(35), __esModule: true };
+	function passLookupPropertyOption(helper, container) {
+	  var lookupProperty = container.lookupProperty;
+	  return _internalWrapHelper.wrapHelper(helper, function (options) {
+	    return Utils.extend({ lookupProperty: lookupProperty }, options);
+	  });
+	}
 
 /***/ }),
-/* 35 */
+/* 38 */
 /***/ (function(module, exports, __webpack_require__) {
 
-	__webpack_require__(36);
+	module.exports = { "default": __webpack_require__(39), __esModule: true };
+
+/***/ }),
+/* 39 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	__webpack_require__(40);
 	module.exports = __webpack_require__(20).Object.seal;
 
 /***/ }),
-/* 36 */
+/* 40 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	// 19.1.2.17 Object.seal(O)
-	var isObject = __webpack_require__(37);
+	var isObject = __webpack_require__(41);
 
 	__webpack_require__(17)('seal', function($seal){
 	  return function seal(it){
@@ -1554,7 +1740,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	});
 
 /***/ }),
-/* 37 */
+/* 41 */
 /***/ (function(module, exports) {
 
 	module.exports = function(it){
@@ -1562,12 +1748,34 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 
 /***/ }),
-/* 38 */
+/* 42 */
 /***/ (function(module, exports) {
 
-	/* WEBPACK VAR INJECTION */(function(global) {/* global window */
 	'use strict';
 
+	exports.__esModule = true;
+	exports.wrapHelper = wrapHelper;
+
+	function wrapHelper(helper, transformOptionsFn) {
+	  if (typeof helper !== 'function') {
+	    // This should not happen, but apparently it does in https://github.com/wycats/handlebars.js/issues/1639
+	    // We try to make the wrapper least-invasive by not wrapping it, if the helper is not a function.
+	    return helper;
+	  }
+	  var wrapper = function wrapper() /* dynamic arguments */{
+	    var options = arguments[arguments.length - 1];
+	    arguments[arguments.length - 1] = transformOptionsFn(options);
+	    return helper.apply(this, arguments);
+	  };
+	  return wrapper;
+	}
+
+/***/ }),
+/* 43 */
+/***/ (function(module, exports) {
+
+	/* WEBPACK VAR INJECTION */(function(global) {'use strict';
+
 	exports.__esModule = true;
 
 	exports['default'] = function (Handlebars) {
diff --git a/yarn.lock b/yarn.lock
index 94d8af25c3..7bb2c64415 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1279,17 +1279,6 @@ graceful-fs@^4.1.2:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
   integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
 
-handlebars@^4.3.0:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
-  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
-  dependencies:
-    neo-async "^2.6.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
 handlebars@^4.5.1:
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee"
@@ -1301,6 +1290,18 @@ handlebars@^4.5.1:
   optionalDependencies:
     uglify-js "^3.1.4"
 
+handlebars@^4.7.0:
+  version "4.7.6"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
+  integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -1873,6 +1874,11 @@ minimist@^1.1.1, minimist@^1.2.0:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
@@ -2816,16 +2822,16 @@ wordwrap@0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
   integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
+wordwrap@^1.0.0, wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
-
 workbox-core@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-4.3.1.tgz#005d2c6a06a171437afd6ca2904a5727ecd73be6"

From 4f42bb1fd2519463d977c33155ef6f03a2bcd243 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 7 Apr 2020 11:41:21 -0400
Subject: [PATCH 442/633] DEV: Support for `onChange` on `{{text-field}}`
 (#9362)

* DEV: Support for `onChange` on `{{text-field}}`

This will automatically be debounced and only fired when the value
changes.

There is also `onChangeImmediate` which is not debounced in case you
need that, but in almost all cases when observing text in an element you
should debounce.

* Add cancel for timer
---
 .../discourse/components/text-field.js        | 33 +++++++++++++++
 .../javascripts/components/text-field-test.js | 40 +++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/app/assets/javascripts/discourse/components/text-field.js b/app/assets/javascripts/discourse/components/text-field.js
index 23440b291d..bb57f25309 100644
--- a/app/assets/javascripts/discourse/components/text-field.js
+++ b/app/assets/javascripts/discourse/components/text-field.js
@@ -1,8 +1,14 @@
 import { TextField } from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction";
+import { next, debounce, cancel } from "@ember/runloop";
+
+const DEBOUNCE_MS = 500;
 
 export default TextField.extend({
+  _prevValue: null,
+  _timer: null,
+
   attributeBindings: [
     "autocorrect",
     "autocapitalize",
@@ -11,6 +17,28 @@ export default TextField.extend({
     "dir"
   ],
 
+  didReceiveAttrs() {
+    this._super(...arguments);
+    this._prevValue = this.value;
+  },
+
+  didUpdateAttrs() {
+    this._super(...arguments);
+    if (this._prevValue !== this.value) {
+      if (this.onChangeImmediate) {
+        next(() => this.onChangeImmediate(this.value));
+      }
+      if (this.onChange) {
+        cancel(this._timer);
+        this._timer = debounce(this, this._debouncedChange, DEBOUNCE_MS);
+      }
+    }
+  },
+
+  _debouncedChange() {
+    next(() => this.onChange(this.value));
+  },
+
   @discourseComputed
   dir() {
     if (this.siteSettings.support_mixed_text_direction) {
@@ -23,6 +51,11 @@ export default TextField.extend({
     }
   },
 
+  willDestroyElement() {
+    this._super(...arguments);
+    cancel(this._timer);
+  },
+
   keyUp(event) {
     this._super(event);
 
diff --git a/test/javascripts/components/text-field-test.js b/test/javascripts/components/text-field-test.js
index dae51393b1..7b26dddb10 100644
--- a/test/javascripts/components/text-field-test.js
+++ b/test/javascripts/components/text-field-test.js
@@ -44,3 +44,43 @@ componentTest("sets the dir attribute to ltr for English text", {
     assert.equal(find("input").attr("dir"), "ltr");
   }
 });
+
+componentTest("supports onChange", {
+  template: `{{text-field class="tf-test" value=value onChange=changed}}`,
+  beforeEach() {
+    this.called = false;
+    this.newValue = null;
+    this.set("value", "hello");
+    this.set("changed", v => {
+      this.newValue = v;
+      this.called = true;
+    });
+  },
+  async test(assert) {
+    await fillIn(".tf-test", "hello");
+    assert.ok(!this.called);
+    await fillIn(".tf-test", "new text");
+    assert.ok(this.called);
+    assert.equal(this.newValue, "new text");
+  }
+});
+
+componentTest("supports onChangeImmediate", {
+  template: `{{text-field class="tf-test" value=value onChangeImmediate=changed}}`,
+  beforeEach() {
+    this.called = false;
+    this.newValue = null;
+    this.set("value", "old");
+    this.set("changed", v => {
+      this.newValue = v;
+      this.called = true;
+    });
+  },
+  async test(assert) {
+    await fillIn(".tf-test", "old");
+    assert.ok(!this.called);
+    await fillIn(".tf-test", "no longer old");
+    assert.ok(this.called);
+    assert.equal(this.newValue, "no longer old");
+  }
+});

From e8fad7a69eee1149bb0a6201b2ccdfe73d8b86c9 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 7 Apr 2020 11:58:49 -0400
Subject: [PATCH 443/633] DEV: changes so plugins can customize invites UI
 (#9365)

* DEV: changes so plugins can customize invites UI

Co-Authored-By: Robin Ward <robin.ward@gmail.com>
---
 .../discourse/controllers/share-and-invite.js |  4 ++++
 app/controllers/users_controller.rb           |  8 +++++--
 app/serializers/invited_serializer.rb         | 22 +++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/controllers/share-and-invite.js
 create mode 100644 app/serializers/invited_serializer.rb

diff --git a/app/assets/javascripts/discourse/controllers/share-and-invite.js b/app/assets/javascripts/discourse/controllers/share-and-invite.js
new file mode 100644
index 0000000000..06110e0113
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/share-and-invite.js
@@ -0,0 +1,4 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+
+export default Controller.extend(ModalFunctionality);
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 81eeddab05..b3acc1f74c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -317,8 +317,12 @@ class UsersController < ApplicationController
       filter_sql = '(LOWER(invites.email) LIKE :filter) or (LOWER(users.username) LIKE :filter)' if show_emails
       invites = invites.where(filter_sql, filter: "%#{params[:search].downcase}%")
     end
-    render_json_dump invites: serialize_data(invites.to_a, InviteSerializer, show_emails: show_emails),
-                     can_see_invite_details: guardian.can_see_invite_details?(inviter)
+
+    render json: MultiJson.dump(InvitedSerializer.new(
+      OpenStruct.new(invite_list: invites.to_a, show_emails: show_emails, inviter: inviter),
+      scope: guardian,
+      root: false
+    ))
   end
 
   def invited_count
diff --git a/app/serializers/invited_serializer.rb b/app/serializers/invited_serializer.rb
new file mode 100644
index 0000000000..c0b07faa86
--- /dev/null
+++ b/app/serializers/invited_serializer.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class InvitedSerializer < ApplicationSerializer
+  attributes :invites, :can_see_invite_details
+
+  def invites
+    ActiveModel::ArraySerializer.new(
+      object.invite_list,
+      scope: scope,
+      root: false,
+      show_emails: object.show_emails
+    ).as_json
+  end
+
+  def can_see_invite_details
+    scope.can_see_invite_details?(object.inviter)
+  end
+
+  def read_attribute_for_serialization(attr)
+    object.respond_to?(attr) ? object.public_send(attr) : public_send(attr)
+  end
+end

From ce663d67e1e659519e484633eb36295a5929a240 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 7 Apr 2020 14:05:27 -0400
Subject: [PATCH 444/633] FIX: CSV Exports were throwing errors with invalid
 dates

This fix will consider any invalid dates to be non-existant.
---
 app/jobs/regular/export_csv_file.rb | 10 ++++++++--
 spec/jobs/export_csv_file_spec.rb   |  8 ++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 39f9c565b1..6092fb1a65 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -182,8 +182,14 @@ module Jobs
     def report_export
       return enum_for(:report_export) unless block_given?
 
-      @extra[:start_date] = @extra[:start_date].to_date.beginning_of_day if @extra[:start_date].is_a?(String)
-      @extra[:end_date] = @extra[:end_date].to_date.end_of_day if @extra[:end_date].is_a?(String)
+      # If dates are invalid consider then `nil`
+      if @extra[:start_date].is_a?(String)
+        @extra[:start_date] = @extra[:start_date].to_date.beginning_of_day rescue nil
+      end
+      if @extra[:end_date].is_a?(String)
+        @extra[:end_date] = @extra[:end_date].to_date.end_of_day rescue nil
+      end
+
       @extra[:filters] = {}
       if @extra[:category_id].present?
         @extra[:filters][:category] = @extra[:category_id].to_i
diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb
index 62ffb151ba..8322265a72 100644
--- a/spec/jobs/export_csv_file_spec.rb
+++ b/spec/jobs/export_csv_file_spec.rb
@@ -85,6 +85,14 @@ describe Jobs::ExportCsvFile do
       exporter
     end
 
+    it "does not throw an error when the dates are invalid" do
+      Jobs::ExportCsvFile.new.execute(
+        entity: 'report',
+        user_id: user.id,
+        args: { start_date: 'asdfasdf', end_date: 'not-a-date', name: 'dau_by_mau' }
+      )
+    end
+
     it 'works with single-column reports' do
       user.user_visits.create!(visited_at: '2010-01-01', posts_read: 42)
       Fabricate(:user).user_visits.create!(visited_at: '2010-01-03', posts_read: 420)

From 3f49b13e5fd146a04290f0dff7e476407752dd39 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Tue, 7 Apr 2020 13:46:40 -0500
Subject: [PATCH 445/633] FIX: Fix untitled/long links extending out box

---
 app/assets/stylesheets/common/base/topic-post.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 1f4e99171c..f4d20080d1 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -365,6 +365,7 @@ blockquote {
   td {
     vertical-align: top;
     padding: 1px;
+    word-wrap: anywhere;
   }
 
   .topic-links {

From 3053c6d95ef3a4f39ec604c408a07accd634e070 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 7 Apr 2020 16:58:21 -0300
Subject: [PATCH 446/633] FEATURE: Enable offline browsing and fullscreen PWA
 in iOS by default

---
 config/site_settings.yml                  |  2 +-
 spec/requests/metadata_controller_spec.rb | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 018d7390cc..ea69ebe702 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1975,7 +1975,7 @@ uncategorized:
     hidden: true
 
   pwa_display_browser_regex:
-    default: "iPad|iPhone"
+    default: "a^"
     hidden: true
 
   app_association_android:
diff --git a/spec/requests/metadata_controller_spec.rb b/spec/requests/metadata_controller_spec.rb
index 3089bc3163..4e00f5a1c6 100644
--- a/spec/requests/metadata_controller_spec.rb
+++ b/spec/requests/metadata_controller_spec.rb
@@ -55,20 +55,20 @@ RSpec.describe MetadataController do
       expect(manifest["display"]).to eq("standalone")
     end
 
-    it 'defaults to display browser for iPhone' do
-      get "/manifest.webmanifest", params: {}, headers: { 'USER-AGENT' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1' }
-      manifest = JSON.parse(response.body)
-      expect(manifest["display"]).to eq("browser")
-    end
-
-    it 'can be changed to display standalone for iPhones using a site setting' do
-      SiteSetting.pwa_display_browser_regex = "a^" # this never matches
-
+    it 'defaults to display standalone for iPhone' do
       get "/manifest.webmanifest", params: {}, headers: { 'USER-AGENT' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1' }
       manifest = JSON.parse(response.body)
       expect(manifest["display"]).to eq("standalone")
     end
 
+    it 'can be changed to display browser for iPhones using a site setting' do
+      SiteSetting.pwa_display_browser_regex = "iPhone"
+
+      get "/manifest.webmanifest", params: {}, headers: { 'USER-AGENT' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1' }
+      manifest = JSON.parse(response.body)
+      expect(manifest["display"]).to eq("browser")
+    end
+
     it 'uses the short_title if it is set' do
       title = 'FooBarBaz Forum'
       SiteSetting.title = title

From a81197602304f209c75c83d03efccc476f64eefc Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 8 Apr 2020 07:35:42 +1000
Subject: [PATCH 447/633] FIX: reset gravatar cache by adding random param to
 URL (#9370)

Users noticed that sometimes, avatar from Gravatar is not correctly updated - https://meta.discourse.org/t/updated-image-on-gravatar-not-seeing-it-update-on-site/54357

A potential reason for that is that even if you update your avatar in Gravatar, URL stays the same and if the cache is involved, service is still receiving the old photo.

For example. In my case, when I click the button to refresh avatar the
new Upload record is created with `origin` URL to new avatar, and `url` to
old one

I made some tests in the rails console and adding random param to Gravatar URL is deceiving cache and correct, the newest avatar is downloaded
---
 app/models/user_avatar.rb       | 2 +-
 spec/models/user_avatar_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index c3df573c32..f6dbf13312 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -20,7 +20,7 @@ class UserAvatar < ActiveRecord::Base
         return if user.blank? || user.primary_email.blank?
 
         email_hash = user_id == Discourse::SYSTEM_USER_ID ? User.email_hash("info@discourse.org") : user.email_hash
-        gravatar_url = "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404"
+        gravatar_url = "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404&reset_cache=#{SecureRandom.urlsafe_base64(5)}"
 
         # follow redirects in case gravatar change rules on us
         tempfile = FileHelper.download(
diff --git a/spec/models/user_avatar_spec.rb b/spec/models/user_avatar_spec.rb
index b4e6a5468b..c2434f1d09 100644
--- a/spec/models/user_avatar_spec.rb
+++ b/spec/models/user_avatar_spec.rb
@@ -99,10 +99,10 @@ describe UserAvatar do
     describe "404 should be silent, nothing to do really" do
 
       it "does nothing when avatar is 404" do
-
+        SecureRandom.stubs(:urlsafe_base64).returns("5555")
         freeze_time Time.now
 
-        stub_request(:get, "https://www.gravatar.com/avatar/#{avatar.user.email_hash}.png?d=404&s=360").
+        stub_request(:get, "https://www.gravatar.com/avatar/#{avatar.user.email_hash}.png?d=404&reset_cache=5555&s=360").
           to_return(status: 404, body: "", headers: {})
 
         expect do

From c45574c9e72ad0235bbdd0cada5933df8c9f306d Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 7 Apr 2020 17:32:18 -0400
Subject: [PATCH 448/633] FIX: exclude private messages from TL3 requirements

It wasn't intended that people should be able to earn trust level
3 without participating in public topics. When counting topic
views and likes given/received, don't count private topics.
---
 app/models/topic_view_item.rb                 |  1 +
 app/models/trust_level3_requirements.rb       | 24 ++++-
 spec/models/trust_level3_requirements_spec.rb | 98 ++++++++++++++++---
 3 files changed, 105 insertions(+), 18 deletions(-)

diff --git a/app/models/topic_view_item.rb b/app/models/topic_view_item.rb
index ff8ff957c2..d37e8ec7a6 100644
--- a/app/models/topic_view_item.rb
+++ b/app/models/topic_view_item.rb
@@ -6,6 +6,7 @@ require 'ipaddr'
 class TopicViewItem < ActiveRecord::Base
   self.table_name = 'topic_views'
   belongs_to :user
+  belongs_to :topic
   validates_presence_of :topic_id, :ip_address, :viewed_at
 
   def self.add(topic_id, ip, user_id = nil, at = nil, skip_redis = false)
diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb
index d40283dbf8..b01da6c10e 100644
--- a/app/models/trust_level3_requirements.rb
+++ b/app/models/trust_level3_requirements.rb
@@ -142,7 +142,11 @@ class TrustLevel3Requirements
   end
 
   def num_topics_replied_to
-    @user.posts.select('distinct topic_id').where('created_at > ? AND post_number > 1', time_period.days.ago).count
+    @user.posts
+      .public_posts
+      .where("posts.created_at > ? AND posts.post_number > 1", time_period.days.ago)
+      .select("distinct topic_id")
+      .count
   end
 
   def min_topics_replied_to
@@ -150,7 +154,10 @@ class TrustLevel3Requirements
   end
 
   def topics_viewed_query
-    TopicViewItem.where(user_id: @user.id).select('topic_id')
+    TopicViewItem.where(user_id: @user.id)
+      .joins(:topic)
+      .where("topics.archetype <> ?", Archetype.private_message)
+      .select("topic_id")
   end
 
   def topics_viewed
@@ -218,7 +225,11 @@ class TrustLevel3Requirements
   end
 
   def num_likes_given
-    UserAction.where(user_id: @user.id, action_type: UserAction::LIKE).where('created_at > ?', time_period.days.ago).count
+    UserAction.where(user_id: @user.id, action_type: UserAction::LIKE)
+      .where("user_actions.created_at > ?", time_period.days.ago)
+      .joins(:target_topic)
+      .where("topics.archetype <> ?", Archetype.private_message)
+      .count
   end
 
   def min_likes_given
@@ -226,7 +237,10 @@ class TrustLevel3Requirements
   end
 
   def num_likes_received_query
-    UserAction.where(user_id: @user.id, action_type: UserAction::WAS_LIKED).where('created_at > ?', time_period.days.ago)
+    UserAction.where(user_id: @user.id, action_type: UserAction::WAS_LIKED)
+      .where("user_actions.created_at > ?", time_period.days.ago)
+      .joins(:target_topic)
+      .where("topics.archetype <> ?", Archetype.private_message)
   end
 
   def num_likes_received
@@ -239,7 +253,7 @@ class TrustLevel3Requirements
 
   def num_likes_received_days
     # don't do a COUNT(DISTINCT date(created_at)) here!
-    num_likes_received_query.pluck('date(created_at)').uniq.size
+    num_likes_received_query.pluck('date(user_actions.created_at)').uniq.size
   end
 
   def min_likes_received_days
diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index ede04a1c7b..ef36c18728 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -13,6 +13,7 @@ describe TrustLevel3Requirements do
   end
 
   def make_view(id, at, user_id)
+    Fabricate(:topic, id: id) unless Topic.where(id: id).exists?
     TopicViewItem.add(id, '11.22.33.44', user_id, at, _skip_redis = true)
   end
 
@@ -250,6 +251,20 @@ describe TrustLevel3Requirements do
 
       expect(tl3_requirements.num_topics_replied_to).to eq(1)
     end
+
+    it "excludes private messages" do
+      user.save!
+
+      private_topic = create_post(
+        user: moderator,
+        archetype: Archetype.private_message,
+        target_usernames: [user.username, moderator.username]
+      ).topic
+
+      _reply1 = create_post(topic: private_topic, user: user)
+
+      expect(tl3_requirements.num_topics_replied_to).to eq(0)
+    end
   end
 
   describe "topics_viewed" do
@@ -272,6 +287,19 @@ describe TrustLevel3Requirements do
       make_view(4, 201.days.ago, user.id) # too long ago
       expect(tl3_requirements.topics_viewed).to eq(3)
     end
+
+    it "excludes private messages" do
+      user.save
+      private_topic = create_post(
+        user: moderator,
+        archetype: Archetype.private_message,
+        target_usernames: [user.username, moderator.username]
+      ).topic
+
+      make_view(9, 1.day.ago, user.id)
+      make_view(private_topic.id, 1.day.ago, user.id)
+      expect(tl3_requirements.topics_viewed).to eq(1)
+    end
   end
 
   describe "posts_read" do
@@ -293,6 +321,22 @@ describe TrustLevel3Requirements do
       make_view(8,  101.days.ago, user.id)
       expect(tl3_requirements.topics_viewed_all_time).to eq(3)
     end
+
+    it "excludes private messages" do
+      user.save
+      private_topic = create_post(
+        user: moderator,
+        archetype: Archetype.private_message,
+        target_usernames: [user.username, moderator.username]
+      ).topic
+
+      make_view(10, 1.day.ago,    user.id)
+      make_view(9,  100.days.ago, user.id)
+      make_view(8,  101.days.ago, user.id)
+      make_view(private_topic.id, 1.day.ago, user.id)
+      make_view(private_topic.id, 100.days.ago, user.id)
+      expect(tl3_requirements.topics_viewed_all_time).to eq(3)
+    end
   end
 
   describe "posts_read_all_time" do
@@ -336,37 +380,65 @@ describe TrustLevel3Requirements do
   end
 
   describe "num_likes_given" do
-    it "counts likes given in the last 100 days" do
+    before do
       UserActionManager.enable
-
-      recent_post1 = create_post(created_at: 1.hour.ago)
-      recent_post2 = create_post(created_at: 10.days.ago)
-      old_post     = create_post(created_at: 102.days.ago)
-
       user.save
+    end
+
+    let(:recent_post1) { create_post(created_at: 1.hour.ago) }
+    let(:recent_post2) { create_post(created_at: 10.days.ago) }
+    let(:old_post) { create_post(created_at: 102.days.ago) }
+    let(:private_post) do
+      create_post(
+        user: moderator,
+        archetype: Archetype.private_message,
+        target_usernames: [user.username, moderator.username]
+      )
+    end
+
+    it "counts likes given in the last 100 days" do
       like_at(user, recent_post1, 2.hours.ago)
       like_at(user, recent_post2, 5.days.ago)
       like_at(user, old_post, 101.days.ago)
 
       expect(tl3_requirements.num_likes_given).to eq(2)
     end
+
+    it "excludes private messages" do
+      like_at(user, recent_post1, 2.hours.ago)
+      like_at(user, private_post, 2.hours.ago)
+
+      expect(tl3_requirements.num_likes_given).to eq(1)
+    end
   end
 
   describe "num_likes_received" do
-    it "counts likes received in the last 100 days" do
+    before do
       UserActionManager.enable
+    end
 
-      t = Fabricate(:topic, user: user, created_at: 102.days.ago)
-      old_post = create_post(topic: t, user: user, created_at: 102.days.ago)
-      recent_post2 = create_post(topic: t, user: user, created_at: 10.days.ago)
-      recent_post1 = create_post(topic: t, user: user, created_at: 1.hour.ago)
+    let(:topic) { Fabricate(:topic, user: user, created_at: 102.days.ago) }
+    let(:old_post) { create_post(topic: topic, user: user, created_at: 102.days.ago) }
+    let(:recent_post1) { create_post(topic: topic, user: user, created_at: 1.hour.ago) }
+    let(:recent_post2) { create_post(topic: topic, user: user, created_at: 10.days.ago) }
+    let(:private_post) do
+      create_post(
+        user: user,
+        archetype: Archetype.private_message,
+        target_usernames: [liker.username, liker2.username]
+      )
+    end
 
-      liker = Fabricate(:user)
-      liker2 = Fabricate(:user)
+    let(:liker) { Fabricate(:user) }
+    let(:liker2) { Fabricate(:user) }
+
+    it "counts likes received in the last 100 days" do
       like_at(liker, recent_post1, 2.hours.ago)
       like_at(liker2, recent_post1, 2.hours.ago)
       like_at(liker, recent_post2, 5.days.ago)
       like_at(liker, old_post, 101.days.ago)
+      like_at(liker, private_post, 2.hours.ago)
+      like_at(liker2, private_post, 5.days.ago)
 
       expect(tl3_requirements.num_likes_received).to eq(3)
       expect(tl3_requirements.num_likes_received_days).to eq(2)

From ed95a6005bae108f8f6b1d571215fe4e5193de6a Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 7 Apr 2020 11:39:50 -0700
Subject: [PATCH 449/633] FEATURE: screenreader landmarks for main, suggested
 topics

In order to avoid a boatload of attributeBindings, I moved the root
element of the suggested-topics component into the template. Also,
autoformat their hbs files.

Testing info: https://www.scottohara.me/blog/2018/03/03/landmarks.html#using-screen-readers-to-navigate-landmarks

Additionally, flag modals with aria-modal=true to avoid the screenreader
accidentally escaping the modal. There's no need to ever toggle the
attribute to false, because we display:none the modal root when it's
closed.
---
 .../discourse/components/d-modal.js           |  4 ++-
 .../discourse/components/related-messages.js  |  3 +-
 .../discourse/components/suggested-topics.js  |  3 +-
 .../discourse/templates/application.hbs       |  2 +-
 .../templates/components/related-messages.hbs | 35 ++++++++++++-------
 .../templates/components/suggested-topics.hbs | 34 ++++++++++--------
 app/views/layouts/application.html.erb        |  2 +-
 7 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/d-modal.js b/app/assets/javascripts/discourse/components/d-modal.js
index eeae7edc3f..a2372013bc 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js
+++ b/app/assets/javascripts/discourse/components/d-modal.js
@@ -10,7 +10,7 @@ export default Component.extend({
     "modalStyle",
     "hasPanels"
   ],
-  attributeBindings: ["data-keyboard"],
+  attributeBindings: ["data-keyboard", "aria-modal"],
   dismissable: true,
   title: null,
   subtitle: null,
@@ -28,6 +28,8 @@ export default Component.extend({
 
   // We handle ESC ourselves
   "data-keyboard": "false",
+  // Inform screenreaders of the modal
+  "aria-modal": "true",
 
   @on("didInsertElement")
   setUp() {
diff --git a/app/assets/javascripts/discourse/components/related-messages.js b/app/assets/javascripts/discourse/components/related-messages.js
index 46732424f8..1e1457db7d 100644
--- a/app/assets/javascripts/discourse/components/related-messages.js
+++ b/app/assets/javascripts/discourse/components/related-messages.js
@@ -2,8 +2,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
 export default Component.extend({
-  elementId: "related-messages",
-  classNames: ["suggested-topics"],
+  tagName: "",
 
   @discourseComputed("topic")
   targetUser(topic) {
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js b/app/assets/javascripts/discourse/components/suggested-topics.js
index 9d5b83839a..11dc410ab0 100644
--- a/app/assets/javascripts/discourse/components/suggested-topics.js
+++ b/app/assets/javascripts/discourse/components/suggested-topics.js
@@ -5,8 +5,7 @@ import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import Site from "discourse/models/site";
 
 export default Component.extend({
-  elementId: "suggested-topics",
-  classNames: ["suggested-topics"],
+  tagName: "",
 
   suggestedTitleLabel: computed("topic", function() {
     const href = this.currentUser && this.currentUser.pmPath(this.topic);
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index 437754ce7b..aeb8c91232 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -9,7 +9,7 @@
 
 {{plugin-outlet name="below-site-header" args=(hash currentPath=router._router.currentPath)}}
 
-<div id="main-outlet" class="wrap">
+<div id="main-outlet" class="wrap" role="main">
   {{plugin-outlet name="above-main-container"}}
   <div class="container">
     {{#if showTop}}
diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
index d4443bd2c3..c16f2b6b79 100644
--- a/app/assets/javascripts/discourse/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
@@ -1,14 +1,25 @@
-<h3 class="suggested-topics-title">
-  {{i18n "related_messages.title"}}
-</h3>
+<div id="related-messages" class="suggested-topics" role="complementary" aria-labelledby="related-messages-title">
+  <h3 class="suggested-topics-title" id="related-messages-title">
+    {{i18n "related_messages.title"}}
+  </h3>
 
-<div class="topics">
-  {{basic-topic-list
-    hideCategory="true"
-    showPosters="true"
-    topics=topic.relatedMessages}}
+  <div class="topics">
+    {{basic-topic-list
+      hideCategory="true"
+      showPosters="true"
+      topics=topic.relatedMessages
+    }}
+  </div>
+
+  {{#if targetUser}}
+    <h3 class="see-all-pms-message">
+      {{html-safe
+        (i18n
+          "related_messages.see_all"
+          path=searchLink
+          username=targetUser.username
+        )
+      }}
+    </h3>
+  {{/if}}
 </div>
-
-{{#if targetUser}}
-  <h3 class="see-all-pms-message">{{html-safe (i18n "related_messages.see_all" path=searchLink username=targetUser.username)}}</h3>
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
index ae7db1c907..0ec8ec2b05 100644
--- a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
@@ -1,16 +1,22 @@
-<h3 class="suggested-topics-title">
-  {{i18n suggestedTitleLabel}}
-</h3>
+<div id="suggested-topics" class="suggested-topics"
+    role="complementary" aria-labelledby="suggested-topics-title">
+  <h3 id="suggested-topics-title" class="suggested-topics-title">
+    {{i18n suggestedTitleLabel}}
+  </h3>
 
-<div class="topics">
-  {{#if topic.isPrivateMessage}}
-    {{basic-topic-list
-      hideCategory="true"
-      showPosters="true"
-      topics=topic.suggestedTopics}}
-  {{else}}
-    {{basic-topic-list topics=topic.suggestedTopics}}
-  {{/if}}
+  <div class="topics">
+    {{#if topic.isPrivateMessage}}
+      {{basic-topic-list
+        hideCategory="true"
+        showPosters="true"
+        topics=topic.suggestedTopics
+      }}
+    {{else}}
+      {{basic-topic-list topics=topic.suggestedTopics}}
+    {{/if}}
+  </div>
+
+  <h3 class="suggested-topics-message">
+    {{html-safe browseMoreMessage}}
+  </h3>
 </div>
-
-<h3 class="suggested-topics-message">{{html-safe browseMoreMessage}}</h3>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0b037d521f..7340c45a46 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -67,7 +67,7 @@
     <%= render_google_tag_manager_body_code %>
     <noscript data-path="<%= request.env['PATH_INFO'] %>">
       <%= render partial: 'header' %>
-      <div id="main-outlet" class="wrap">
+      <div id="main-outlet" class="wrap" role="main">
         <!-- preload-content: -->
         <%= yield %>
         <!-- :preload-content -->

From 0991c4ae7e20f22551de0126cc5dd46875807e1d Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Tue, 7 Apr 2020 17:44:57 -0500
Subject: [PATCH 450/633] FIX: Widen modal on desktop

---
 .../stylesheets/common/components/bookmark-modal.scss       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index 0b08a4c8bd..2c15181cf6 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -3,9 +3,13 @@
     box-sizing: border-box;
   }
   .modal-body {
-    width: 100%;
+    width: 375px;
     box-sizing: border-box;
 
+    @media (max-width: 600px) {
+      width: 100%;
+    }
+
     .control-label {
       font-weight: 700;
     }

From 236833ed5de64d50ab87ac943ce8fb880a6c4eb1 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 8 Apr 2020 07:10:58 +0530
Subject: [PATCH 451/633] FIX: redirect `/my/*path` to `/login-preferences` on
 client side

---
 app/assets/javascripts/discourse/lib/url.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/url.js b/app/assets/javascripts/discourse/lib/url.js
index ed46452529..4ee7e5a097 100644
--- a/app/assets/javascripts/discourse/lib/url.js
+++ b/app/assets/javascripts/discourse/lib/url.js
@@ -249,7 +249,7 @@ const DiscourseURL = EmberObject.extend({
           userPath(currentUser.get("username_lower") + "/")
         );
       } else {
-        return redirectTo("/404");
+        return redirectTo("/login-preferences");
       }
     }
 

From 0375a5ac0b5b06fc54b2236641d3b19d28291e38 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 8 Apr 2020 12:42:28 +1000
Subject: [PATCH 452/633] DEV: reduce logging when no external id is specified

Previously we were returning an unknown sso error and logging a message
when external id was blank. This noise is not needed.
---
 app/controllers/session_controller.rb    |  4 ++++
 spec/components/scheduler/defer_spec.rb  | 20 --------------------
 spec/rails_helper.rb                     | 23 +++++++++++++++++++++++
 spec/requests/session_controller_spec.rb | 15 ++++++++-------
 4 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index c8696e0581..5f8b1c3430 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -254,6 +254,10 @@ class SessionController < ApplicationController
 
       render_sso_error(text: text || I18n.t("sso.unknown_error"), status: 500)
 
+    rescue DiscourseSingleSignOn::BlankExternalId
+
+      render_sso_error(text: I18n.t("sso.blank_id_error"), status: 500)
+
     rescue => e
       message = +"Failed to create or lookup user: #{e}."
       message << "  "
diff --git a/spec/components/scheduler/defer_spec.rb b/spec/components/scheduler/defer_spec.rb
index 533e2ff380..ab1aa06f60 100644
--- a/spec/components/scheduler/defer_spec.rb
+++ b/spec/components/scheduler/defer_spec.rb
@@ -15,26 +15,6 @@ describe Scheduler::Defer do
     end
   end
 
-  class TrackingLogger < ::Logger
-    attr_reader :messages
-    def initialize
-      super(nil)
-      @messages = []
-    end
-    def add(*args, &block)
-      @messages << args
-    end
-  end
-
-  def track_log_messages
-    old_logger = Rails.logger
-    logger = Rails.logger = TrackingLogger.new
-    yield logger.messages
-    logger.messages
-  ensure
-    Rails.logger = old_logger
-  end
-
   before do
     @defer = DeferInstance.new
     @defer.async = true
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index dc649a9b91..011dc0309e 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -385,3 +385,26 @@ def silence_stdout
 ensure
   STDOUT.unstub(:write)
 end
+
+class TrackingLogger < ::Logger
+  attr_reader :messages
+  def initialize(level: nil)
+    super(nil)
+    @messages = []
+    @level = level
+  end
+  def add(*args, &block)
+    if !level || args[0].to_i >= level
+      @messages << args
+    end
+  end
+end
+
+def track_log_messages(level: nil)
+  old_logger = Rails.logger
+  logger = Rails.logger = TrackingLogger.new(level: level)
+  yield logger.messages
+  logger.messages
+ensure
+  Rails.logger = old_logger
+end
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 068230b272..316bc719d6 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -563,9 +563,13 @@ RSpec.describe SessionController do
       sso.external_id = '   '
       sso.username = 'sam'
 
-      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+      messages = track_log_messages(level: Logger::WARN) do
+        get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+      end
 
+      expect(messages.length).to eq(0)
       expect(response.status).to eq(500)
+      expect(response.body).to include(I18n.t('sso.blank_id_error'))
     end
 
     it 'can handle invalid sso external ids due to banned word' do
@@ -1165,12 +1169,9 @@ RSpec.describe SessionController do
         SiteSetting.enable_local_logins_via_email = false
       end
       it 'doesnt matter, logs in correctly' do
-        events = DiscourseEvent.track_events do
-          post "/session.json", params: {
-            login: user.username, password: 'myawesomepassword'
-          }
-        end
-
+        post "/session.json", params: {
+          login: user.username, password: 'myawesomepassword'
+        }
         expect(response.status).to eq(200)
       end
     end

From b824898f614d21c43a78fec30481757341106d5a Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 8 Apr 2020 16:33:50 +1000
Subject: [PATCH 453/633] FIX: respect automatic group membership when sso
 changes email

Previously we were only updating group membership when a user record was
first created in an SSO setting.

This corrects it so we also update it if SSO changes the email
---
 app/models/discourse_single_sign_on.rb   |  7 +++++++
 spec/requests/session_controller_spec.rb | 26 +++++++++++++++++++++++-
 spec/support/integration_helpers.rb      |  4 ++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index bc0916078f..085946cf84 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -100,6 +100,10 @@ class DiscourseSingleSignOn < SingleSignOn
     user.user_avatar.save! if user.user_avatar
     user.save!
 
+    if @email_changed && user.active
+      user.set_automatic_groups
+    end
+
     # The user might require approval
     user.create_reviewable
 
@@ -251,9 +255,12 @@ class DiscourseSingleSignOn < SingleSignOn
   end
 
   def change_external_attributes_and_override(sso_record, user)
+    @email_changed = false
+
     if SiteSetting.sso_overrides_email && user.email != Email.downcase(email)
       user.email = email
       user.active = false if require_activation
+      @email_changed = true
     end
 
     if SiteSetting.sso_overrides_username? && username.present?
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 316bc719d6..50c4eb7ea0 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -584,8 +584,9 @@ RSpec.describe SessionController do
     end
 
     it 'can take over an account' do
+      user = Fabricate(:user, email: 'bill@bill.com')
+
       sso = get_sso("/")
-      user = Fabricate(:user)
       sso.email = user.email
       sso.external_id = 'abc'
       sso.username = 'sam'
@@ -597,6 +598,25 @@ RSpec.describe SessionController do
       expect(logged_on_user.email).to eq(user.email)
       expect(logged_on_user.single_sign_on_record.external_id).to eq("abc")
       expect(logged_on_user.single_sign_on_record.external_username).to eq('sam')
+
+      # we are updating the email ... ensure auto group membership works
+
+      sign_out
+
+      SiteSetting.email_editable = false
+      SiteSetting.sso_overrides_email = true
+
+      group = Fabricate(:group, name: :bob, automatic_membership_email_domains: 'jane.com')
+      sso = get_sso("/")
+      sso.email = "hello@jane.com"
+      sso.external_id = 'abc'
+
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+
+      logged_on_user = Discourse.current_user_provider.new(request.env).current_user
+
+      expect(logged_on_user.email).to eq('hello@jane.com')
+      expect(group.users.count).to eq(1)
     end
 
     def sso_for_ip_specs
@@ -722,6 +742,8 @@ RSpec.describe SessionController do
     end
 
     it 'allows you to create an account' do
+      group = Fabricate(:group, name: :bob, automatic_membership_email_domains: 'bob.com')
+
       sso = get_sso('/a/')
       sso.external_id = '666' # the number of the beast
       sso.email = 'bob@bob.com'
@@ -742,6 +764,8 @@ RSpec.describe SessionController do
 
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
 
+      expect(group.users.where(id: logged_on_user.id).count).to eq(1)
+
       # ensure nothing is transient
       logged_on_user = User.find(logged_on_user.id)
 
diff --git a/spec/support/integration_helpers.rb b/spec/support/integration_helpers.rb
index d44adc333b..b306814aea 100644
--- a/spec/support/integration_helpers.rb
+++ b/spec/support/integration_helpers.rb
@@ -30,6 +30,10 @@ module IntegrationHelpers
     user
   end
 
+  def sign_out
+    delete "/session"
+  end
+
   def read_secure_session
     SecureSession.new(session[:secure_session_id])
   end

From 25f95af418d5c3d3425066b0e10276e292cba403 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 8 Apr 2020 08:53:21 +0200
Subject: [PATCH 454/633] REFACTOR: local dates to improve reliability with DST
 and recurrence (#9379)

This commit improves testing and separates local-date generation from dates with zone manipulations.
---
 .../javascripts/discourse-local-dates.js.es6  | 357 --------------
 .../initializers/discourse-local-dates.js.es6 |  77 ++-
 .../lib/date-with-zone-helper.js.es6          |  89 ++++
 .../javascripts/lib/local-date-builder.js.es6 | 243 +++++++++
 plugins/discourse-local-dates/plugin.rb       |   1 -
 .../acceptance/local-dates-test.js.es6        | 463 ------------------
 .../lib/date-with-zone-helper-test.js.es6     | 168 +++++++
 .../lib/local-date-builder-test.js.es6        | 420 ++++++++++++++++
 8 files changed, 994 insertions(+), 824 deletions(-)
 delete mode 100644 plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
 create mode 100644 plugins/discourse-local-dates/assets/javascripts/lib/date-with-zone-helper.js.es6
 create mode 100644 plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
 delete mode 100644 plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6
 create mode 100644 plugins/discourse-local-dates/test/javascripts/lib/date-with-zone-helper-test.js.es6
 create mode 100644 plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6

diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
deleted file mode 100644
index aba41b68ce..0000000000
--- a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
+++ /dev/null
@@ -1,357 +0,0 @@
-// discourse-skip-module
-(function($) {
-  const DATE_TEMPLATE = `
-    <span>
-      <svg class="fa d-icon d-icon-globe-americas svg-icon" xmlns="http://www.w3.org/2000/svg">
-        <use xlink:href="#globe-americas"></use>
-      </svg>
-      <span class="relative-time"></span>
-    </span>
-  `;
-
-  const PREVIEW_TEMPLATE = `
-    <div class='preview'>
-      <span class='timezone'></span>
-      <span class='date-time'></span>
-    </div>
-  `;
-
-  function processElement($element, options = {}) {
-    clearTimeout(this.timeout);
-
-    const utc = moment().utc();
-    const dateTime = options.time
-      ? `${options.date} ${options.time}`
-      : options.date;
-
-    let displayedTimezone;
-    if (options.time) {
-      displayedTimezone = options.displayedTimezone || moment.tz.guess();
-    } else {
-      displayedTimezone =
-        options.displayedTimezone || options.timezone || moment.tz.guess();
-    }
-
-    // if timezone given we convert date and time from given zone to Etc/UTC
-    let utcDateTime;
-    if (options.timezone) {
-      utcDateTime = _applyZoneToDateTime(dateTime, options.timezone);
-    } else {
-      utcDateTime = moment.utc(dateTime);
-    }
-
-    if (utcDateTime < utc) {
-      // if event is in the past we want to bump it no next occurrence when
-      // recurring is set
-      if (options.recurring) {
-        utcDateTime = _applyRecurrence(utcDateTime, options);
-      } else {
-        $element.addClass("past");
-      }
-    }
-
-    // once we have the correct UTC date we want
-    // we adjust it to watching user timezone
-    const adjustedDateTime = utcDateTime.tz(displayedTimezone);
-
-    const previews = _generatePreviews(
-      adjustedDateTime.clone(),
-      displayedTimezone,
-      options
-    );
-    const textPreview = _generateTextPreview(previews);
-    const htmlPreview = _generateHtmlPreview(previews);
-
-    const formatedDateTime = _applyFormatting(
-      adjustedDateTime,
-      displayedTimezone,
-      options
-    );
-
-    $element
-      .html(DATE_TEMPLATE)
-      .attr("aria-label", textPreview)
-      .attr(
-        "data-html-tooltip",
-        `<div class="locale-dates-previews">${htmlPreview}</div>`
-      )
-      .addClass("cooked-date")
-      .find(".relative-time")
-      .text(formatedDateTime);
-
-    this.timeout = setTimeout(
-      () => processElement($element, options),
-      60 * 1000
-    );
-  }
-
-  function _formatTimezone(timezone) {
-    return timezone
-      .replace("_", " ")
-      .replace("Etc/", "")
-      .split("/");
-  }
-
-  function _zoneWithoutPrefix(timezone) {
-    const parts = _formatTimezone(timezone);
-    return parts[1] || parts[0];
-  }
-
-  function _applyZoneToDateTime(dateTime, timezone) {
-    return moment.tz(dateTime, timezone).utc();
-  }
-
-  function _translateCalendarKey(time, key) {
-    const translated = I18n.t(`discourse_local_dates.relative_dates.${key}`, {
-      time: "LT"
-    });
-
-    if (time) {
-      return translated
-        .split("LT")
-        .map(w => `[${w}]`)
-        .join("LT");
-    } else {
-      return `[${translated.replace(" LT", "")}]`;
-    }
-  }
-
-  function _calendarFormats(time) {
-    return {
-      sameDay: _translateCalendarKey(time, "today"),
-      nextDay: _translateCalendarKey(time, "tomorrow"),
-      lastDay: _translateCalendarKey(time, "yesterday"),
-      sameElse: "L"
-    };
-  }
-
-  function _isEqualZones(timezoneA, timezoneB) {
-    if ((timezoneA || timezoneB) && (!timezoneA || !timezoneB)) {
-      return false;
-    }
-
-    if (timezoneA.includes(timezoneB) || timezoneB.includes(timezoneA)) {
-      return true;
-    }
-
-    return (
-      moment.tz(timezoneA).utcOffset() === moment.tz(timezoneB).utcOffset()
-    );
-  }
-
-  function _applyFormatting(dateTime, displayedTimezone, options) {
-    if (options.countdown) {
-      const diffTime = dateTime.diff(moment());
-      if (diffTime < 0) {
-        return I18n.t("discourse_local_dates.relative_dates.countdown.passed");
-      } else {
-        return moment.duration(diffTime).humanize();
-      }
-    }
-
-    const sameTimezone = _isEqualZones(displayedTimezone, moment.tz.guess());
-    const inCalendarRange = dateTime.isBetween(
-      moment().subtract(2, "days"),
-      moment()
-        .add(1, "days")
-        .endOf("day")
-    );
-
-    if (options.calendar && inCalendarRange) {
-      if (sameTimezone) {
-        if (options.time) {
-          dateTime = dateTime.calendar(null, _calendarFormats(options.time));
-        } else {
-          dateTime = dateTime.calendar(null, _calendarFormats(null));
-        }
-      } else {
-        dateTime = dateTime.format(options.format);
-        dateTime = dateTime.replace("TZ", "");
-        dateTime = `${dateTime} (${_zoneWithoutPrefix(displayedTimezone)})`;
-      }
-    } else {
-      if (options.time) {
-        dateTime = dateTime.format(options.format);
-
-        if (options.displayedTimezone && !sameTimezone) {
-          dateTime = dateTime.replace("TZ", "");
-          dateTime = `${dateTime} (${_zoneWithoutPrefix(displayedTimezone)})`;
-        } else {
-          dateTime = dateTime.replace(
-            "TZ",
-            _formatTimezone(displayedTimezone).join(": ")
-          );
-        }
-      } else {
-        dateTime = dateTime.format(options.format);
-
-        if (!sameTimezone) {
-          dateTime = dateTime.replace("TZ", "");
-          dateTime = `${dateTime} (${_zoneWithoutPrefix(displayedTimezone)})`;
-        } else {
-          dateTime = dateTime.replace(
-            "TZ",
-            _zoneWithoutPrefix(displayedTimezone)
-          );
-        }
-      }
-    }
-
-    return dateTime;
-  }
-
-  function _applyRecurrence(dateTime, { recurring, timezone }) {
-    const parts = recurring.split(".");
-    const count = parseInt(parts[0], 10);
-    const type = parts[1];
-    const diff = moment().diff(dateTime, type);
-    const add = Math.ceil(diff + count);
-
-    // we create new moment object from format
-    // to ensure it's created in user context
-    const wasDST = moment(dateTime.format()).isDST();
-    let dateTimeWithRecurrence = moment(dateTime).add(add, type);
-    const isDST = moment(dateTimeWithRecurrence.format()).isDST();
-
-    // these dates are more or less DST "certain"
-    const noDSTOffset = moment
-      .tz({ month: 0, day: 1 }, timezone || "Etc/UTC")
-      .utcOffset();
-    const withDSTOffset = moment
-      .tz({ month: 5, day: 1 }, timezone || "Etc/UTC")
-      .utcOffset();
-
-    // we remove the DST offset present when the date was created,
-    // and add current DST offset
-    if (!wasDST && isDST) {
-      dateTimeWithRecurrence.add(-withDSTOffset + noDSTOffset, "minutes");
-    }
-
-    // we add the DST offset present when the date was created,
-    // and remove current DST offset
-    if (wasDST && !isDST) {
-      dateTimeWithRecurrence.add(withDSTOffset - noDSTOffset, "minutes");
-    }
-
-    return dateTimeWithRecurrence;
-  }
-
-  function _createDateTimeRange(dateTime, timezone) {
-    const dt = moment(dateTime).tz(timezone);
-
-    return [dt.format("LLL"), "→", dt.add(24, "hours").format("LLL")].join(" ");
-  }
-
-  function _generatePreviews(dateTime, displayedTimezone, options) {
-    const previewedTimezones = [];
-    const watchingUserTimezone = moment.tz.guess();
-    const timezones = options.timezones.filter(
-      timezone =>
-        !_isEqualZones(timezone, watchingUserTimezone) &&
-        !_isEqualZones(timezone, options.timezone)
-    );
-
-    previewedTimezones.push({
-      timezone: watchingUserTimezone,
-      current: true,
-      dateTime: options.time
-        ? moment(dateTime)
-            .tz(watchingUserTimezone)
-            .format("LLL")
-        : _createDateTimeRange(dateTime, watchingUserTimezone)
-    });
-
-    if (
-      options.timezone &&
-      displayedTimezone === watchingUserTimezone &&
-      options.timezone !== displayedTimezone &&
-      !_isEqualZones(displayedTimezone, options.timezone)
-    ) {
-      timezones.unshift(options.timezone);
-    }
-
-    Array.from(new Set(timezones.filter(Boolean))).forEach(timezone => {
-      if (_isEqualZones(timezone, displayedTimezone)) {
-        return;
-      }
-
-      if (_isEqualZones(timezone, watchingUserTimezone)) {
-        timezone = watchingUserTimezone;
-      }
-
-      previewedTimezones.push({
-        timezone,
-        dateTime: options.time
-          ? moment(dateTime)
-              .tz(timezone)
-              .format("LLL")
-          : _createDateTimeRange(dateTime, timezone)
-      });
-    });
-
-    if (!previewedTimezones.length) {
-      previewedTimezones.push({
-        timezone: "Etc/UTC",
-        dateTime: options.time
-          ? moment(dateTime)
-              .tz("Etc/UTC")
-              .format("LLL")
-          : _createDateTimeRange(dateTime, "Etc/UTC")
-      });
-    }
-
-    return _.uniq(previewedTimezones, "timezone");
-  }
-
-  function _generateTextPreview(previews) {
-    return previews
-      .map(preview => {
-        const formatedZone = _zoneWithoutPrefix(preview.timezone);
-
-        if (preview.dateTime.match(/TZ/)) {
-          return preview.dateTime.replace(/TZ/, formatedZone);
-        } else {
-          return `${formatedZone} ${preview.dateTime}`;
-        }
-      })
-      .join(", ");
-  }
-
-  function _generateHtmlPreview(previews) {
-    return previews
-      .map(preview => {
-        const $template = $(PREVIEW_TEMPLATE);
-
-        if (preview.current) $template.addClass("current");
-
-        $template.find(".timezone").text(_zoneWithoutPrefix(preview.timezone));
-        $template.find(".date-time").text(preview.dateTime);
-        return $template[0].outerHTML;
-      })
-      .join("");
-  }
-
-  $.fn.applyLocalDates = function() {
-    return this.each(function() {
-      const $element = $(this);
-
-      const options = {};
-      options.time = $element.attr("data-time");
-      options.date = $element.attr("data-date");
-      options.recurring = $element.attr("data-recurring");
-      options.timezones = (
-        $element.attr("data-timezones") ||
-        Discourse.SiteSettings.discourse_local_dates_default_timezones ||
-        "Etc/UTC"
-      ).split("|");
-      options.timezone = $element.attr("data-timezone");
-      options.calendar = ($element.attr("data-calendar") || "on") === "on";
-      options.displayedTimezone = $element.attr("data-displayed-timezone");
-      options.format =
-        $element.attr("data-format") || (options.time ? "LLL" : "LL");
-      options.countdown = $element.attr("data-countdown");
-
-      processElement($element, options);
-    });
-  };
-})(jQuery);
diff --git a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6 b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
index 352ea1159e..7b3faee0c3 100644
--- a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
@@ -1,11 +1,19 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
 import showModal from "discourse/lib/show-modal";
+import LocalDateBuilder from "../lib/local-date-builder";
+
+const DATE_TEMPLATE = `
+  <span>
+    <svg class="fa d-icon d-icon-globe-americas svg-icon" xmlns="http://www.w3.org/2000/svg">
+      <use xlink:href="#globe-americas"></use>
+    </svg>
+    <span class="relative-time"></span>
+  </span>
+`;
 
 function initializeDiscourseLocalDates(api) {
   api.decorateCooked(
-    $elem => {
-      $(".discourse-local-date", $elem).applyLocalDates();
-    },
+    $elem => $(".discourse-local-date", $elem).applyLocalDates(),
     { id: "discourse-local-date" }
   );
 
@@ -37,6 +45,69 @@ export default {
   initialize(container) {
     const siteSettings = container.lookup("site-settings:main");
     if (siteSettings.discourse_local_dates_enabled) {
+      $.fn.applyLocalDates = function() {
+        return this.each(function() {
+          const opts = {};
+          const dataset = this.dataset;
+          opts.time = dataset.time;
+          opts.date = dataset.date;
+          opts.recurring = dataset.recurring;
+          opts.timezones = (
+            dataset.timezones ||
+            siteSettings.discourse_local_dates_default_timezones ||
+            "Etc/UTC"
+          )
+            .split("|")
+            .filter(Boolean);
+          opts.timezone = dataset.timezone;
+          opts.calendar = (dataset.calendar || "on") === "on";
+          opts.displayedTimezone = dataset.displayedTimezone;
+          opts.format = dataset.format || (opts.time ? "LLL" : "LL");
+          opts.countdown = dataset.countdown;
+
+          const localDateBuilder = new LocalDateBuilder(
+            opts,
+            moment.tz.guess()
+          ).build();
+
+          const htmlPreviews = localDateBuilder.previews.map(preview => {
+            const previewNode = document.createElement("div");
+            previewNode.classList.add("preview");
+            if (preview.current) {
+              previewNode.classList.add("current");
+            }
+
+            const timezoneNode = document.createElement("span");
+            timezoneNode.classList.add("timezone");
+            timezoneNode.innerText = preview.timezone;
+            previewNode.appendChild(timezoneNode);
+
+            const dateTimeNode = document.createElement("span");
+            dateTimeNode.classList.add("date-time");
+            dateTimeNode.innerText = preview.formated;
+            previewNode.appendChild(dateTimeNode);
+
+            return previewNode;
+          });
+
+          const previewsNode = document.createElement("div");
+          previewsNode.classList.add("locale-dates-previews");
+          htmlPreviews.forEach(htmlPreview =>
+            previewsNode.appendChild(htmlPreview)
+          );
+
+          this.innerHTML = DATE_TEMPLATE;
+          this.setAttribute("aria-label", localDateBuilder.textPreview);
+          this.dataset.htmlTooltip = previewsNode.outerHTML;
+          this.classList.add("cooked-date");
+          if (localDateBuilder.pastEvent) {
+            this.classList.add("past");
+          }
+          const relativeTime = this.querySelector(".relative-time");
+          relativeTime.innerText = localDateBuilder.formated;
+        });
+      };
+
       withPluginApi("0.8.8", initializeDiscourseLocalDates);
     }
   }
diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/date-with-zone-helper.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/date-with-zone-helper.js.es6
new file mode 100644
index 0000000000..9ffc6edb17
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/date-with-zone-helper.js.es6
@@ -0,0 +1,89 @@
+const { getProperties } = Ember;
+
+/*
+  DateWithZoneHelper provides a limited list of helpers
+  to manipulate a moment object with timezones
+
+  - add(count unit) adds a COUNT of UNITS to a date
+  - subtract(count unit) subtracts a COUNT of UNITS to a date
+  - format(format) formats a date with zone in a consitent way, optional moment format
+  - isDST() allows to know if a date in a specified timezone is currently under DST
+  - datetimeWithZone(timezone) returns a new moment object with timezone applied
+  - datetime returns the moment object
+  - repetitionsBetweenDates(duration, date) return the number of repertitions of
+  duration between two dates, eg for duration: "1.weeks", "2.months"...
+*/
+export default class DateWithZoneHelper {
+  constructor(params = {}) {
+    this.timezone = params.timezone || "UTC";
+    this.localTimezone = params.localTimezone || moment.tz.guess();
+
+    this.datetime = moment.tz(
+      getProperties(params, [
+        "year",
+        "month",
+        "day",
+        "hour",
+        "minute",
+        "second"
+      ]),
+      this.timezone
+    );
+  }
+
+  isDST() {
+    return this.datetime.tz(this.localTimezone).isDST();
+  }
+
+  repetitionsBetweenDates(duration, date) {
+    const [count, unit] = duration.split(".");
+    const diff = this.datetime.diff(date, unit);
+    const repetitions = diff / parseInt(count, 10);
+    return Math.abs((Math.round(repetitions * 10) / 10).toFixed(1));
+  }
+
+  add(count, unit) {
+    return this._fromDatetime(
+      this.datetime.clone().add(count, unit),
+      this.timezone,
+      this.localTimezone
+    );
+  }
+
+  subtract(count, unit) {
+    return this._fromDatetime(
+      this.datetime.clone().subtract(count, unit),
+      this.timezone,
+      this.localTimezone
+    );
+  }
+
+  datetimeWithZone(timezone) {
+    return this.datetime.clone().tz(timezone);
+  }
+
+  format(format) {
+    if (format) {
+      return this.datetime.tz(this.localTimezone).format(format);
+    }
+
+    return this.datetime.tz(this.localTimezone).toISOString(true);
+  }
+
+  static fromDatetime(datetime, timezone, localTimezone) {
+    return new DateWithZoneHelper({
+      year: datetime.year(),
+      month: datetime.month(),
+      day: datetime.date(),
+      hour: datetime.hour(),
+      minute: datetime.minute(),
+      second: datetime.second(),
+      timezone,
+      localTimezone
+    });
+  }
+
+  _fromDatetime(datetime, timezone, localTimezone) {
+    return DateWithZoneHelper.fromDatetime(datetime, timezone, localTimezone);
+  }
+}
diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
new file mode 100644
index 0000000000..3f81303cbf
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -0,0 +1,243 @@
+import DateWithZoneHelper from "./date-with-zone-helper";
+
+const TIME_FORMAT = "LLL";
+const DATE_FORMAT = "LL";
+const RANGE_SEPARATOR = "→";
+
+export default class LocalDateBuilder {
+  constructor(params = {}, localTimezone) {
+    this.time = params.time;
+    this.date = params.date;
+    this.recurring = params.recurring;
+    this.timezones = Array.from(
+      new Set((params.timezones || []).filter(Boolean))
+    );
+    this.timezone = params.timezone || "UTC";
+    this.calendar =
+      typeof params.calendar === "undefined" ? true : params.calendar;
+    this.displayedTimezone = params.displayedTimezone;
+    this.format = params.format || (this.time ? TIME_FORMAT : DATE_FORMAT);
+    this.countdown = params.countdown;
+    this.localTimezone = localTimezone;
+  }
+
+  build() {
+    const [year, month, day] = this.date.split("-").map(x => parseInt(x, 10));
+    const [hour, minute] = (this.time || "")
+      .split(":")
+      .map(x => (x ? parseInt(x, 10) : undefined));
+
+    let displayedTimezone;
+    if (this.time) {
+      displayedTimezone = this.displayedTimezone || this.localTimezone;
+    } else {
+      displayedTimezone =
+        this.displayedTimezone || this.localTimezone || this.timezone;
+    }
+
+    let localDate = new DateWithZoneHelper({
+      year,
+      month: month ? month - 1 : null,
+      day,
+      hour,
+      minute,
+      timezone: this.timezone,
+      localTimezone: this.localTimezone
+    });
+
+    if (this.recurring) {
+      const [count, type] = this.recurring.split(".");
+
+      const repetitionsForType = localDate.repetitionsBetweenDates(
+        this.recurring,
+        moment.tz(this.localTimezone)
+      );
+
+      localDate = localDate.add(repetitionsForType + parseInt(count, 10), type);
+    }
+
+    const previews = this._generatePreviews(localDate, displayedTimezone);
+
+    return {
+      pastEvent:
+        !this.recurring &&
+        moment.tz(this.localTimezone).isAfter(localDate.datetime),
+      formated: this._applyFormatting(localDate, displayedTimezone),
+      previews,
+      textPreview: this._generateTextPreviews(previews)
+    };
+  }
+
+  _generateTextPreviews(previews) {
+    return previews
+      .map(preview => {
+        const formatedZone = this._zoneWithoutPrefix(preview.timezone);
+        return `${formatedZone} ${preview.formated}`;
+      })
+      .join(", ");
+  }
+
+  _generatePreviews(localDate, displayedTimezone) {
+    const previewedTimezones = [];
+
+    const timezones = this.timezones.filter(
+      timezone =>
+        !this._isEqualZones(timezone, this.localTimezone) &&
+        !this._isEqualZones(timezone, this.timezone)
+    );
+
+    previewedTimezones.push({
+      timezone: this.localTimezone,
+      current: true,
+      formated: this._createDateTimeRange(localDate, this.time)
+    });
+
+    if (
+      this.timezone &&
+      displayedTimezone === this.localTimezone &&
+      this.timezone !== displayedTimezone &&
+      !this._isEqualZones(displayedTimezone, this.timezone)
+    ) {
+      timezones.unshift(this.timezone);
+    }
+
+    timezones.forEach(timezone => {
+      if (this._isEqualZones(timezone, displayedTimezone)) {
+        return;
+      }
+
+      if (this._isEqualZones(timezone, this.localTimezone)) {
+        timezone = this.localTimezone;
+      }
+
+      previewedTimezones.push({
+        timezone,
+        formated: this._createDateTimeRange(
+          localDate.datetimeWithZone(timezone),
+          this.time
+        )
+      });
+    });
+
+    if (!previewedTimezones.length) {
+      previewedTimezones.push({
+        timezone: "Etc/UTC",
+        formated: this._createDateTimeRange(
+          localDate.datetimeWithZone("Etc/UTC"),
+          this.time
+        )
+      });
+    }
+
+    return previewedTimezones.uniqBy("timezone");
+  }
+
+  _isEqualZones(timezoneA, timezoneB) {
+    if ((timezoneA || timezoneB) && (!timezoneA || !timezoneB)) {
+      return false;
+    }
+
+    if (timezoneA.includes(timezoneB) || timezoneB.includes(timezoneA)) {
+      return true;
+    }
+
+    return (
+      moment.tz(timezoneA).utcOffset() === moment.tz(timezoneB).utcOffset()
+    );
+  }
+
+  _createDateTimeRange(startRange, time) {
+    // if a time has been given we do not attempt to automatically create a range
+    // instead we show only one date with a format showing the time
+    if (time) {
+      return startRange.format(TIME_FORMAT);
+    } else {
+      const endRange = startRange.add(24, "hours");
+      return [
+        startRange.format(this.format || "LLLL"),
+        RANGE_SEPARATOR,
+        endRange.format(this.format || "LLLL")
+      ].join(" ");
+    }
+  }
+
+  _applyFormatting(localDate, displayedTimezone) {
+    if (this.countdown) {
+      const diffTime = moment.tz(this.localTimezone).diff(localDate.datetime);
+
+      if (diffTime < 0) {
+        return moment.duration(diffTime).humanize();
+      } else {
+        return I18n.t("discourse_local_dates.relative_dates.countdown.passed");
+      }
+    }
+
+    const sameTimezone = this._isEqualZones(
+      displayedTimezone,
+      this.localTimezone
+    );
+
+    if (this.calendar) {
+      const inCalendarRange = moment
+        .tz(this.localTimezone)
+        .isBetween(
+          localDate.subtract(2, "day").datetime,
+          localDate.add(1, "day").datetime.endOf("day")
+        );
+
+      if (inCalendarRange && sameTimezone) {
+        return localDate.datetime.calendar(
+          moment.tz(this.localTimezone),
+          this._calendarFormats(this.time ? this.time : null)
+        );
+      }
+    }
+
+    if (!sameTimezone) {
+      return this._formatWithZone(localDate, displayedTimezone, this.format);
+    }
+
+    return localDate.format(this.format);
+  }
+
+  _calendarFormats(time) {
+    return {
+      sameDay: this._translateCalendarKey(time, "today"),
+      nextDay: this._translateCalendarKey(time, "tomorrow"),
+      lastDay: this._translateCalendarKey(time, "yesterday"),
+      sameElse: "L"
+    };
+  }
+
+  _translateCalendarKey(time, key) {
+    const translated = I18n.t(`discourse_local_dates.relative_dates.${key}`, {
+      time: "LT"
+    });
+
+    if (time) {
+      return translated
+        .split("LT")
+        .map(w => `[${w}]`)
+        .join("LT");
+    } else {
+      return `[${translated.replace(" LT", "")}]`;
+    }
+  }
+
+  _formatTimezone(timezone) {
+    return timezone
+      .replace("_", " ")
+      .replace("Etc/", "")
+      .split("/");
+  }
+
+  _zoneWithoutPrefix(timezone) {
+    const [part1, part2] = this._formatTimezone(timezone);
+    return part2 || part1;
+  }
+
+  _formatWithZone(localDate, displayedTimezone, format) {
+    let formated = localDate.datetimeWithZone(displayedTimezone).format(format);
+    return `${formated} (${this._zoneWithoutPrefix(displayedTimezone)})`;
+  }
+}
diff --git a/plugins/discourse-local-dates/plugin.rb b/plugins/discourse-local-dates/plugin.rb
index d4ac0160df..b4fdae639f 100644
--- a/plugins/discourse-local-dates/plugin.rb
+++ b/plugins/discourse-local-dates/plugin.rb
@@ -6,7 +6,6 @@
 # author: Joffrey Jaffeux
 hide_plugin if self.respond_to?(:hide_plugin)
 
-register_asset 'javascripts/discourse-local-dates.js.es6'
 register_asset 'stylesheets/common/discourse-local-dates.scss'
 register_asset 'moment.js', :vendored_core_pretty_text
 register_asset 'moment-timezone.js', :vendored_core_pretty_text
diff --git a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6
deleted file mode 100644
index 6d2a17f2a3..0000000000
--- a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6
+++ /dev/null
@@ -1,463 +0,0 @@
-import { acceptance } from "helpers/qunit-helpers";
-
-const sandbox = sinon.createSandbox();
-
-acceptance("Local Dates", {
-  loggedIn: true,
-  settings: {
-    discourse_local_dates_enabled: true,
-    discourse_local_dates_default_timezones: "Europe/Paris|America/Los_Angeles"
-  },
-  beforeEach() {
-    freezeDateAndZone();
-  },
-  afterEach() {
-    sandbox.restore();
-    moment.tz.setDefault();
-  }
-});
-
-const DEFAULT_DATE = "2018-06-20";
-const DEFAULT_ZONE = "Europe/Paris";
-const DEFAULT_ZONE_FORMATED = DEFAULT_ZONE.split("/")[1];
-
-function advance(count, unit = "days") {
-  return moment(DEFAULT_DATE)
-    .add(count, unit)
-    .format("YYYY-MM-DD");
-}
-
-function rewind(count, unit = "days") {
-  return moment(DEFAULT_DATE)
-    .subtract(count, unit)
-    .format("YYYY-MM-DD");
-}
-
-function freezeDateAndZone(date, zone, cb) {
-  date = date || DEFAULT_DATE;
-  zone = zone || DEFAULT_ZONE;
-
-  sandbox.restore();
-  sandbox.stub(moment.tz, "guess");
-  moment.tz.guess.returns(zone);
-  moment.tz.setDefault(zone);
-
-  const now = moment(date).valueOf();
-  sandbox.useFakeTimers(now);
-
-  if (cb) {
-    cb();
-
-    moment.tz.guess.returns(DEFAULT_ZONE);
-    moment.tz.setDefault(DEFAULT_ZONE);
-    sandbox.useFakeTimers(moment(DEFAULT_DATE).valueOf());
-  }
-}
-
-function generateHTML(options = {}) {
-  let output = `<span class="discourse-local-date past cooked-date"`;
-
-  output += ` data-date="${options.date || DEFAULT_DATE}"`;
-  if (options.format) output += ` data-format="${options.format}"`;
-  if (options.timezones) output += ` data-timezones="${options.timezones}"`;
-  if (options.time) output += ` data-time="${options.time}"`;
-  output += ` data-timezone="${options.timezone || DEFAULT_ZONE}"`;
-  if (options.calendar) output += ` data-calendar="${options.calendar}"`;
-  if (options.recurring) output += ` data-recurring="${options.recurring}"`;
-  if (options.displayedTimezone)
-    output += ` data-displayed-timezone="${options.displayedTimezone}"`;
-
-  return (output += "></span>");
-}
-
-test("default format - time specified", assert => {
-  const html = generateHTML({ date: advance(3), time: "02:00" });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 23, 2018 2:00 AM",
-    "it uses moment LLL format"
-  );
-});
-
-test("default format - no time specified", assert => {
-  let html = generateHTML({ date: advance(3) });
-  let transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 23, 2018",
-    "it uses moment LL format as default if not time is specified"
-  );
-
-  freezeDateAndZone(advance(1), "Pacific/Auckland", () => {
-    html = generateHTML({ date: advance(3) });
-    transformed = $(html).applyLocalDates();
-
-    assert.equal(
-      transformed.text().trim(),
-      `June 23, 2018 (${DEFAULT_ZONE_FORMATED})`,
-      "it appends creator timezone if watching user timezone is different"
-    );
-  });
-
-  freezeDateAndZone(advance(1), "Europe/Vienna", () => {
-    html = generateHTML({ date: advance(3) });
-    transformed = $(html).applyLocalDates();
-
-    assert.equal(
-      transformed.text().trim(),
-      "June 23, 2018",
-      "it doesn’t append timezone if different but with the same utc offset"
-    );
-  });
-});
-
-test("today", assert => {
-  const html = generateHTML({ time: "16:00" });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(transformed.text().trim(), "Today 4:00 PM", "it display Today");
-});
-
-test("today - no time", assert => {
-  const html = generateHTML();
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Today",
-    "it display Today without time"
-  );
-});
-
-test("yesterday", assert => {
-  const html = generateHTML({ date: rewind(1), time: "16:00" });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Yesterday 4:00 PM",
-    "it displays yesterday"
-  );
-});
-
-test("yesterday - no time", assert => {
-  const html = generateHTML({ date: rewind(1) });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Yesterday",
-    "it displays yesterday without time"
-  );
-});
-
-test("tomorrow", assert => {
-  const html = generateHTML({ date: advance(1), time: "16:00" });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Tomorrow 4:00 PM",
-    "it displays tomorrow"
-  );
-});
-
-test("tomorrow - no time", assert => {
-  const html = generateHTML({ date: advance(1) });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Tomorrow",
-    "it displays tomorrow without time"
-  );
-});
-
-test("today - no time with different zones", assert => {
-  const html = generateHTML();
-  let transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Today",
-    "it displays today without time"
-  );
-
-  freezeDateAndZone(rewind(12, "hours"), "Pacific/Auckland", () => {
-    transformed = $(html).applyLocalDates();
-    assert.equal(
-      transformed.text().trim(),
-      `June 20, 2018 (${DEFAULT_ZONE_FORMATED})`,
-      "it displays the date without calendar and creator timezone"
-    );
-  });
-});
-
-test("calendar off", assert => {
-  const html = generateHTML({ calendar: "off", time: "16:00" });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 20, 2018 4:00 PM",
-    "it displays the date without Today"
-  );
-});
-
-test("recurring", assert => {
-  const html = generateHTML({ recurring: "1.week", time: "16:00" });
-  let transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Today 4:00 PM",
-    "it displays the next occurrence"
-  );
-
-  freezeDateAndZone(advance(1), null, () => {
-    transformed = $(html).applyLocalDates();
-
-    assert.equal(
-      transformed.text().trim(),
-      "June 27, 2018 4:00 PM",
-      "it displays the next occurrence"
-    );
-  });
-});
-
-test("format", assert => {
-  const html = generateHTML({
-    date: advance(3),
-    format: "YYYY | MM - DD"
-  });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "2018 | 06 - 23",
-    "it uses the given format"
-  );
-});
-
-test("displayedTimezone", assert => {
-  let html = generateHTML({
-    date: advance(3),
-    displayedTimezone: "America/Chicago",
-    time: "16:00"
-  });
-  let transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 23, 2018 9:00 AM (Chicago)",
-    "it displays timezone when different from watching user"
-  );
-
-  html = generateHTML({
-    date: advance(3),
-    displayedTimezone: DEFAULT_ZONE,
-    time: "16:00"
-  });
-
-  transformed = $(html).applyLocalDates();
-  assert.equal(
-    transformed.text().trim(),
-    "June 23, 2018 4:00 PM",
-    "it doesn’t display timezone when same from watching user"
-  );
-
-  html = generateHTML({ displayedTimezone: "Etc/UTC" });
-  transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 19, 2018 (UTC)",
-    "it displays timezone and drops calendar mode when timezone is different from watching user"
-  );
-
-  html = generateHTML({ displayedTimezone: DEFAULT_ZONE });
-  transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Today",
-    "it doesn’t display timezone and doesn’t drop calendar mode when timezone is same from watching user"
-  );
-
-  html = generateHTML({
-    timezone: "America/Chicago"
-  });
-  transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 20, 2018 (Chicago)",
-    "it uses timezone when displayedTimezone is not set"
-  );
-
-  html = generateHTML();
-  transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Today",
-    "it uses user’s timezone when displayedTimezone and timezone are not set"
-  );
-
-  html = generateHTML({
-    timezone: "America/Chicago",
-    displayedTimezone: "Pacific/Auckland"
-  });
-  transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 20, 2018 (Auckland)",
-    "it uses displayedTimezone over timezone"
-  );
-});
-
-test("tooltip", assert => {
-  let html = generateHTML({ timezone: "America/Chicago" });
-  let transformed = $(html).applyLocalDates();
-  let htmlToolip = transformed.attr("data-html-tooltip");
-  let currentUserPreview = $(htmlToolip).find(".preview.current");
-  let timezone = currentUserPreview.find(".timezone").text();
-  let dateTime = currentUserPreview.find(".date-time").text();
-
-  assert.equal(
-    timezone,
-    DEFAULT_ZONE_FORMATED,
-    "it adds watching user timezone as preview"
-  );
-  assert.equal(
-    dateTime,
-    "June 20, 2018 7:00 AM → June 21, 2018 7:00 AM",
-    "it creates a range adjusted to watching user timezone"
-  );
-
-  freezeDateAndZone(DEFAULT_DATE, "Pacific/Auckland", () => {
-    html = generateHTML({ timezone: "Pacific/Auckland" });
-    transformed = $(html).applyLocalDates();
-    htmlToolip = transformed.attr("data-html-tooltip");
-    currentUserPreview = $(htmlToolip).find(".preview.current");
-
-    assert.ok(
-      exists(currentUserPreview),
-      "it creates an entry if watching user has the same timezone than creator"
-    );
-  });
-
-  html = generateHTML({
-    timezones: "Etc/UTC",
-    timezone: "America/Chicago",
-    time: "14:00:00"
-  });
-  transformed = $(html).applyLocalDates();
-  htmlToolip = transformed.attr("data-html-tooltip");
-
-  assert.ok(
-    exists($(htmlToolip).find(".preview.current")),
-    "doesn’t create current timezone when displayed timezone equals watching user timezone"
-  );
-
-  let $firstPreview = $(htmlToolip).find(".preview:nth-child(2)");
-  dateTime = $firstPreview.find(".date-time").text();
-  timezone = $firstPreview.find(".timezone").text();
-  assert.equal(
-    dateTime,
-    "June 20, 2018 2:00 PM",
-    "it doesn’t create range if time has been set"
-  );
-  assert.equal(timezone, "Chicago", "it adds the timezone of the creator");
-
-  let $secondPreview = $(htmlToolip).find(".preview:nth-child(3)");
-  dateTime = $secondPreview.find(".date-time").text();
-  timezone = $secondPreview.find(".timezone").text();
-  assert.equal(timezone, "UTC", "Etc/UTC is rewritten to UTC");
-
-  freezeDateAndZone(moment("2018-11-26 21:00:00"), "Europe/Vienna", () => {
-    html = generateHTML({
-      date: "2018-11-22",
-      timezone: "America/Chicago",
-      time: "14:00"
-    });
-    transformed = $(html).applyLocalDates();
-    htmlToolip = transformed.attr("data-html-tooltip");
-
-    $firstPreview = $(htmlToolip).find(".preview:nth-child(2)");
-
-    assert.equal(
-      $firstPreview.find(".timezone").text(),
-      "Chicago",
-      "it adds the creator timezone to the previews"
-    );
-    assert.equal(
-      $firstPreview.find(".date-time").text(),
-      "November 22, 2018 2:00 PM",
-      "it adds the creator timezone to the previews"
-    );
-  });
-
-  freezeDateAndZone(DEFAULT_DATE, "Europe/Vienna", () => {
-    html = generateHTML({
-      date: "2018-11-22",
-      timezone: "America/Chicago",
-      timezones: "Europe/Paris"
-    });
-    transformed = $(html).applyLocalDates();
-    htmlToolip = transformed.attr("data-html-tooltip");
-
-    $firstPreview = $(htmlToolip)
-      .find(".preview")
-      .first();
-
-    assert.equal(
-      $firstPreview.find(".timezone").text(),
-      "Vienna",
-      "it rewrites timezone with same offset and different name than watching user"
-    );
-  });
-});
-
-test("test utils", assert => {
-  assert.equal(
-    moment().format("LLLL"),
-    moment(DEFAULT_DATE).format("LLLL"),
-    "it has defaults"
-  );
-
-  assert.equal(moment.tz.guess(), DEFAULT_ZONE, "it has defaults");
-
-  freezeDateAndZone(advance(1), DEFAULT_ZONE, () => {
-    assert.equal(
-      moment().format("LLLL"),
-      moment(DEFAULT_DATE)
-        .add(1, "days")
-        .format("LLLL"),
-      "it applies new time"
-    );
-    assert.equal(moment.tz.guess(), DEFAULT_ZONE);
-  });
-
-  assert.equal(
-    moment().format("LLLL"),
-    moment(DEFAULT_DATE).format("LLLL"),
-    "it restores time"
-  );
-
-  freezeDateAndZone(advance(1), "Pacific/Auckland", () => {
-    assert.equal(
-      moment().format("LLLL"),
-      moment(DEFAULT_DATE)
-        .add(1, "days")
-        .format("LLLL")
-    );
-    assert.equal(moment.tz.guess(), "Pacific/Auckland", "it applies new zone");
-  });
-
-  assert.equal(moment.tz.guess(), DEFAULT_ZONE, "it restores zone");
-});
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/date-with-zone-helper-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/date-with-zone-helper-test.js.es6
new file mode 100644
index 0000000000..4f3351935a
--- /dev/null
+++ b/plugins/discourse-local-dates/test/javascripts/lib/date-with-zone-helper-test.js.es6
@@ -0,0 +1,168 @@
+import DateWithZoneHelper from "./date-with-zone-helper";
+
+const PARIS = "Europe/Paris";
+const SYDNEY = "Australia/Sydney";
+
+QUnit.module("lib:date-with-zone-helper");
+
+function buildDateHelper(params = {}) {
+  return new DateWithZoneHelper({
+    year: params.year || 2020,
+    day: params.day || 22,
+    month: params.month || 2,
+    hour: params.hour || 10,
+    minute: params.minute || 5,
+    timezone: params.timezone,
+    localTimezone: PARIS
+  });
+}
+
+QUnit.test("#format", assert => {
+  let date = buildDateHelper({
+    day: 15,
+    month: 2,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.equal(date.format(), "2020-03-15T15:36:00.000+01:00");
+});
+
+QUnit.test("#repetitionsBetweenDates", assert => {
+  let date;
+
+  date = buildDateHelper({
+    day: 15,
+    month: 1,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.equal(
+    date.repetitionsBetweenDates(
+      "1.hour",
+      moment.tz("2020-02-15 15:36", SYDNEY)
+    ),
+    10,
+    "it correctly finds difference between timezones"
+  );
+
+  date = buildDateHelper({
+    day: 15,
+    month: 1,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.equal(
+    date.repetitionsBetweenDates(
+      "1.minute",
+      moment.tz("2020-02-15 15:36", PARIS)
+    ),
+    0,
+    "it correctly finds no difference"
+  );
+
+  date = buildDateHelper({
+    day: 15,
+    month: 1,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.equal(
+    date.repetitionsBetweenDates(
+      "1.minute",
+      moment.tz("2020-02-15 15:37", PARIS)
+    ),
+    1,
+    "it correctly finds no difference"
+  );
+
+  date = buildDateHelper({
+    day: 15,
+    month: 1,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.equal(
+    date.repetitionsBetweenDates(
+      "2.minute",
+      moment.tz("2020-02-15 15:41", PARIS)
+    ),
+    2.5,
+    "it correctly finds difference with a multiplicator"
+  );
+});
+
+QUnit.test("#add", assert => {
+  let date;
+  let futureLocalDate;
+
+  date = buildDateHelper({
+    day: 19,
+    month: 2,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+
+  assert.notOk(date.isDST());
+  futureLocalDate = date.add(8, "months");
+  assert.notOk(futureLocalDate.isDST());
+  assert.equal(
+    futureLocalDate.format(),
+    "2020-11-19T15:36:00.000+01:00",
+    "it correctly adds from a !isDST date to a !isDST date"
+  );
+
+  date = buildDateHelper({
+    day: 25,
+    month: 3,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.ok(date.isDST());
+  futureLocalDate = date.add(1, "year");
+  assert.ok(futureLocalDate.isDST());
+  assert.equal(
+    futureLocalDate.format(),
+    "2021-04-25T15:36:00.000+02:00",
+    "it correctly adds from a isDST date to a isDST date"
+  );
+
+  date = buildDateHelper({
+    day: 25,
+    month: 2,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.notOk(date.isDST());
+  futureLocalDate = date.add(1, "week");
+  assert.ok(futureLocalDate.isDST());
+  assert.equal(
+    futureLocalDate.format(),
+    "2020-04-01T15:36:00.000+02:00",
+    "it correctly adds from a !isDST date to a isDST date"
+  );
+
+  date = buildDateHelper({
+    day: 1,
+    month: 3,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+
+  assert.ok(date.isDST());
+  futureLocalDate = date.add(8, "months");
+  assert.notOk(futureLocalDate.isDST());
+  assert.equal(
+    futureLocalDate.format(),
+    "2020-12-01T15:36:00.000+01:00",
+    "it correctly adds from a isDST date to a !isDST date"
+  );
+});
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
new file mode 100644
index 0000000000..7895ca01cd
--- /dev/null
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
@@ -0,0 +1,420 @@
+import LocalDateBuilder from "./local-date-builder";
+
+const UTC = "Etc/UTC";
+const SYDNEY = "Australia/Sydney";
+const LOS_ANGELES = "America/Los_Angeles";
+const PARIS = "Europe/Paris";
+const LAGOS = "Africa/Lagos";
+const LONDON = "Europe/London";
+
+QUnit.module("lib:local-date-builder");
+
+const sandbox = sinon.createSandbox();
+
+function freezeTime({ date, timezone }, cb) {
+  date = date || "2020-01-22 10:34";
+  const newTimezone = timezone || PARIS;
+  const previousZone = moment.tz.guess();
+  const now = moment.tz(date, newTimezone).valueOf();
+
+  sandbox.useFakeTimers(now);
+  sandbox.stub(moment.tz, "guess");
+  moment.tz.guess.returns(newTimezone);
+  moment.tz.setDefault(newTimezone);
+
+  cb();
+
+  moment.tz.guess.returns(previousZone);
+  moment.tz.setDefault(previousZone);
+  sandbox.restore();
+}
+
+QUnit.assert.buildsCorrectDate = function(options, expected, message) {
+  const localTimezone = options.localTimezone || PARIS;
+  delete options.localTimezone;
+
+  const localDateBuilder = new LocalDateBuilder(
+    Object.assign(
+      {},
+      {
+        date: "2020-03-22"
+      },
+      options
+    ),
+    localTimezone
+  );
+
+  if (expected.formated) {
+    this.test.assert.equal(
+      localDateBuilder.build().formated,
+      expected.formated,
+      message || "it formates the date correctly"
+    );
+  }
+
+  if (expected.previews) {
+    this.test.assert.deepEqual(
+      localDateBuilder.build().previews,
+      expected.previews,
+      message || "it formates the previews correctly"
+    );
+  }
+};
+
+QUnit.test("date", assert => {
+  freezeTime({ date: "2020-03-11" }, () => {
+    assert.buildsCorrectDate(
+      { date: "2020-03-22", timezone: PARIS },
+      { formated: "March 22, 2020" },
+      "it displays the date without time"
+    );
+
+    assert.buildsCorrectDate(
+      { date: "2020-04-11", time: "11:00" },
+      { formated: "April 11, 2020 1:00 PM" },
+      "it displays the date with time"
+    );
+  });
+});
+
+QUnit.test("option[format]", assert => {
+  freezeTime({ date: "2020-03-11" }, () => {
+    assert.buildsCorrectDate(
+      { format: "YYYY" },
+      { formated: "2020" },
+      "it uses custom format"
+    );
+  });
+});
+
+QUnit.test("option[displayedTimezone]", assert => {
+  freezeTime({}, () => {
+    assert.buildsCorrectDate(
+      { displayedTimezone: SYDNEY },
+      { formated: "March 22, 2020 (Sydney)" },
+      "it displays the timezone if the timezone is different from the date"
+    );
+  });
+
+  freezeTime({}, () => {
+    assert.buildsCorrectDate(
+      { displayedTimezone: PARIS, timezone: PARIS },
+      { formated: "March 22, 2020" },
+      "it doesn't display the timezone if the timezone is the same than the date"
+    );
+  });
+
+  freezeTime({}, () => {
+    assert.buildsCorrectDate(
+      { timezone: UTC, displayedTimezone: UTC },
+      { formated: "March 22, 2020 (UTC)" },
+      "it replaces `Etc/`"
+    );
+  });
+
+  freezeTime({}, () => {
+    assert.buildsCorrectDate(
+      { timezone: LOS_ANGELES, displayedTimezone: LOS_ANGELES },
+      { formated: "March 22, 2020 (Los Angeles)" },
+      "it removes prefix and replaces `_`"
+    );
+  });
+});
+
+QUnit.test("option[timezone]", assert => {
+  freezeTime({}, () => {
+    assert.buildsCorrectDate(
+      { timezone: SYDNEY, displayedTimezone: PARIS },
+      { formated: "March 21, 2020" },
+      "it correctly parses a date with the given timezone context"
+    );
+  });
+});
+
+QUnit.test("option[recurring]", assert => {
+  freezeTime({ date: "2020-04-06 06:00", timezone: LAGOS }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2019-11-25",
+        time: "11:00",
+        timezone: PARIS,
+        displayedTimezone: LAGOS,
+        recurring: "1.weeks"
+      },
+      {
+        formated: "April 6, 2020 10:00 AM (Lagos)"
+      },
+      "it correctly formats a recurring date starting from a !isDST timezone to a isDST timezone date when displayed to a user using a timezone with no DST"
+    );
+  });
+
+  freezeTime({ date: "2020-04-06 01:00", timezone: SYDNEY }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2020-03-09",
+        time: "02:00",
+        timezone: UTC,
+        recurring: "1.weeks",
+        calendar: false,
+        displayedTimezone: SYDNEY
+      },
+      {
+        formated: "April 6, 2020 12:00 PM (Sydney)"
+      },
+      "it correctly formats a recurring date spanning over weeks"
+    );
+  });
+
+  freezeTime({ date: "2020-04-07 22:00" }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2019-11-25",
+        time: "11:00",
+        recurring: "1.weeks",
+        timezone: PARIS
+      },
+      {
+        formated: "April 13, 2020 11:00 AM"
+      },
+      "it correctly adds from a !isDST date to a isDST date"
+    );
+  });
+
+  freezeTime({ date: "2020-04-06 10:59" }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2020-03-30",
+        time: "11:00",
+        recurring: "1.weeks",
+        timezone: PARIS
+      },
+      {
+        formated: "Today 11:00 AM"
+      },
+      "it works to the minute"
+    );
+  });
+
+  freezeTime({ date: "2020-04-06 11:01" }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2020-03-30",
+        time: "11:00",
+        recurring: "1.weeks",
+        timezone: PARIS
+      },
+      {
+        formated: "April 13, 2020 11:00 AM"
+      },
+      "it works to the minute"
+    );
+  });
+});
+
+QUnit.test("option[countown]", assert => {
+  freezeTime({ date: "2020-03-21 23:59" }, () => {
+    assert.buildsCorrectDate(
+      {
+        countdown: true,
+        timezone: PARIS
+      },
+      { formated: "a minute" },
+      "it shows the time remaining"
+    );
+  });
+
+  freezeTime({ date: "2020-03-22 00:01" }, () => {
+    assert.buildsCorrectDate(
+      {
+        countdown: true,
+        timezone: PARIS
+      },
+      {
+        formated: I18n.t(
+          "discourse_local_dates.relative_dates.countdown.passed"
+        )
+      },
+      "it shows the date has passed"
+    );
+  });
+});
+
+QUnit.test("option[calendar]", assert => {
+  freezeTime({ date: "2020-03-23 23:00" }, () => {
+    assert.buildsCorrectDate(
+      { date: "2020-03-22", time: "23:59", timezone: PARIS },
+      { formated: "Yesterday 11:59 PM" },
+      "it drops calendar mode when event date is more than one day before current date"
+    );
+  });
+
+  freezeTime({ date: "2020-03-20 23:59" }, () =>
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", time: "00:00", timezone: PARIS },
+      { formated: "Tomorrow 12:00 AM" }
+    )
+  );
+
+  freezeTime({ date: "2020-03-20 23:59" }, () => {
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", time: "23:59", timezone: PARIS },
+      { formated: "Tomorrow 11:59 PM" }
+    );
+  });
+
+  freezeTime({ date: "2020-03-21 00:00" }, () =>
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", time: "23:00", timezone: PARIS },
+      { formated: "Today 11:00 PM" }
+    )
+  );
+
+  freezeTime({ date: "2020-03-22 23:59" }, () =>
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", time: "23:59", timezone: PARIS },
+      { formated: "Yesterday 11:59 PM" }
+    )
+  );
+
+  freezeTime({ date: "2020-03-22 23:59" }, () =>
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", time: "23:59", timezone: PARIS },
+      { formated: "Yesterday 11:59 PM" }
+    )
+  );
+
+  freezeTime({ date: "2020-03-22 23:59" }, () =>
+    assert.buildsCorrectDate(
+      { calendar: false, date: "2020-03-21", time: "23:59", timezone: PARIS },
+      { formated: "March 21, 2020 11:59 PM" },
+      "it doesn't use calendar when disabled"
+    )
+  );
+
+  freezeTime({ date: "2020-03-24 01:00" }, () =>
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", timezone: PARIS },
+      { formated: "March 21, 2020" },
+      "it stops formating out of calendar range"
+    )
+  );
+});
+
+QUnit.test("previews", assert => {
+  freezeTime({ date: "2020-03-22" }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 → March 23, 2020",
+            timezone: "Europe/Paris"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-03-22", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS, timezones: [SYDNEY] },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 → March 23, 2020",
+            timezone: "Europe/Paris"
+          },
+          {
+            formated: "March 23, 2020 → March 23, 2020",
+            timezone: "Australia/Sydney"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-03-22", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS, displayedTimezone: LOS_ANGELES },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 → March 23, 2020",
+            timezone: "Europe/Paris"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-03-22", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS, isplayedTimezone: PARIS },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 → March 23, 2020",
+            timezone: "Europe/Paris"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-03-22", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS, timezones: [PARIS] },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 → March 23, 2020",
+            timezone: "Europe/Paris"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-03-22", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { time: "11:34", timezone: PARIS, timezones: [PARIS] },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 11:34 AM",
+            timezone: "Europe/Paris"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-04-06", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS, date: "2020-04-07", timezones: [LONDON, LAGOS] },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "April 7, 2020 → April 8, 2020",
+            timezone: "Europe/Paris"
+          },
+          {
+            formated: "April 7, 2020 → April 7, 2020",
+            timezone: "Europe/London"
+          },
+          {
+            formated: "April 7, 2020 → April 7, 2020",
+            timezone: "Africa/Lagos"
+          }
+        ]
+      }
+    );
+  });
+});

From 66d375cb1d6b9881c6f320c541b5f7fe456e9ff1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 8 Apr 2020 11:02:00 +0200
Subject: [PATCH 455/633] UX: display zones without prefix to reduce noise
 (#9383)

---
 .../javascripts/lib/local-date-builder.js.es6 |  6 +++---
 .../lib/local-date-builder-test.js.es6        | 20 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
index 3f81303cbf..578bd7a330 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -87,7 +87,7 @@ export default class LocalDateBuilder {
     );
 
     previewedTimezones.push({
-      timezone: this.localTimezone,
+      timezone: this._zoneWithoutPrefix(this.localTimezone),
       current: true,
       formated: this._createDateTimeRange(localDate, this.time)
     });
@@ -111,7 +111,7 @@ export default class LocalDateBuilder {
       }
 
       previewedTimezones.push({
-        timezone,
+        timezone: this._zoneWithoutPrefix(timezone),
         formated: this._createDateTimeRange(
           localDate.datetimeWithZone(timezone),
           this.time
@@ -121,7 +121,7 @@ export default class LocalDateBuilder {
 
     if (!previewedTimezones.length) {
       previewedTimezones.push({
-        timezone: "Etc/UTC",
+        timezone: "UTC",
         formated: this._createDateTimeRange(
           localDate.datetimeWithZone("Etc/UTC"),
           this.time
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
index 7895ca01cd..a27d319eef 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
@@ -309,7 +309,7 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 → March 23, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           }
         ]
       }
@@ -324,11 +324,11 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 → March 23, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           },
           {
             formated: "March 23, 2020 → March 23, 2020",
-            timezone: "Australia/Sydney"
+            timezone: "Sydney"
           }
         ]
       }
@@ -343,7 +343,7 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 → March 23, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           }
         ]
       }
@@ -358,7 +358,7 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 → March 23, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           }
         ]
       }
@@ -373,7 +373,7 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 → March 23, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           }
         ]
       }
@@ -388,7 +388,7 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 11:34 AM",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           }
         ]
       }
@@ -403,15 +403,15 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "April 7, 2020 → April 8, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           },
           {
             formated: "April 7, 2020 → April 7, 2020",
-            timezone: "Europe/London"
+            timezone: "London"
           },
           {
             formated: "April 7, 2020 → April 7, 2020",
-            timezone: "Africa/Lagos"
+            timezone: "Lagos"
           }
         ]
       }

From 94c02286818214fa48a064503496698849a7f237 Mon Sep 17 00:00:00 2001
From: dave0688 <d.kreutzer@pulsdrei.de>
Date: Wed, 8 Apr 2020 11:03:50 +0200
Subject: [PATCH 456/633] FEATURE: Add same site cookie 'None' option to make
 cross domain systems possible (#9374)

---
 config/site_settings.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index ea69ebe702..ccbcc8150a 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1377,7 +1377,8 @@ security:
       - Lax
       - Strict
       - Disabled
-    regex: "^(Lax|Strict|Disabled)$"
+      - None
+    regex: "^(Lax|Strict|Disabled|None)$"
   enable_escaped_fragments: true
   allow_index_in_robots_txt: true
   moderators_create_categories: false

From 6d0ba74b9808c2b5cf5e4a64e9d5e8907627172d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 8 Apr 2020 11:43:47 +0200
Subject: [PATCH 457/633] UX: Ensures timezone is used over localTimezone when
 displaying dates

---
 .../assets/javascripts/lib/local-date-builder.js.es6            | 2 +-
 .../test/javascripts/lib/local-date-builder-test.js.es6         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
index 578bd7a330..b424d38590 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -32,7 +32,7 @@ export default class LocalDateBuilder {
       displayedTimezone = this.displayedTimezone || this.localTimezone;
     } else {
       displayedTimezone =
-        this.displayedTimezone || this.localTimezone || this.timezone;
+        this.displayedTimezone || this.timezone || this.localTimezone;
     }
 
     let localDate = new DateWithZoneHelper({
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
index a27d319eef..b18e63632f 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
@@ -81,7 +81,7 @@ QUnit.test("option[format]", assert => {
   freezeTime({ date: "2020-03-11" }, () => {
     assert.buildsCorrectDate(
       { format: "YYYY" },
-      { formated: "2020" },
+      { formated: "2020 (UTC)" },
       "it uses custom format"
     );
   });

From 6171141211b29d59a4b047b9503fecd385e5a9e6 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 8 Apr 2020 11:44:06 +0200
Subject: [PATCH 458/633] UX: displays full date time when displaying ranges
 (#9386)

---
 .../javascripts/lib/local-date-builder.js.es6 |  4 +--
 .../lib/local-date-builder-test.js.es6        | 27 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
index b424d38590..827ba74ad5 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -154,9 +154,9 @@ export default class LocalDateBuilder {
     } else {
       const endRange = startRange.add(24, "hours");
       return [
-        startRange.format(this.format || "LLLL"),
+        startRange.format("LLLL"),
         RANGE_SEPARATOR,
-        endRange.format(this.format || "LLLL")
+        endRange.format("LLLL")
       ].join(" ");
     }
   }
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
index b18e63632f..34499440d6 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
@@ -308,7 +308,8 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "March 22, 2020 → March 23, 2020",
+            formated:
+              "Sunday, March 22, 2020 12:00 AM → Monday, March 23, 2020 12:00 AM",
             timezone: "Paris"
           }
         ]
@@ -323,11 +324,13 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "March 22, 2020 → March 23, 2020",
+            formated:
+              "Sunday, March 22, 2020 12:00 AM → Monday, March 23, 2020 12:00 AM",
             timezone: "Paris"
           },
           {
-            formated: "March 23, 2020 → March 23, 2020",
+            formated:
+              "Monday, March 23, 2020 10:00 AM → Monday, March 23, 2020 10:00 AM",
             timezone: "Sydney"
           }
         ]
@@ -342,7 +345,8 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "March 22, 2020 → March 23, 2020",
+            formated:
+              "Sunday, March 22, 2020 12:00 AM → Monday, March 23, 2020 12:00 AM",
             timezone: "Paris"
           }
         ]
@@ -357,7 +361,8 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "March 22, 2020 → March 23, 2020",
+            formated:
+              "Sunday, March 22, 2020 12:00 AM → Monday, March 23, 2020 12:00 AM",
             timezone: "Paris"
           }
         ]
@@ -372,7 +377,8 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "March 22, 2020 → March 23, 2020",
+            formated:
+              "Sunday, March 22, 2020 12:00 AM → Monday, March 23, 2020 12:00 AM",
             timezone: "Paris"
           }
         ]
@@ -402,15 +408,18 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "April 7, 2020 → April 8, 2020",
+            formated:
+              "Tuesday, April 7, 2020 12:00 AM → Wednesday, April 8, 2020 12:00 AM",
             timezone: "Paris"
           },
           {
-            formated: "April 7, 2020 → April 7, 2020",
+            formated:
+              "Tuesday, April 7, 2020 11:00 PM → Tuesday, April 7, 2020 11:00 PM",
             timezone: "London"
           },
           {
-            formated: "April 7, 2020 → April 7, 2020",
+            formated:
+              "Tuesday, April 7, 2020 11:00 PM → Tuesday, April 7, 2020 11:00 PM",
             timezone: "Lagos"
           }
         ]

From 874999941a848ea7edeb3813e7dd5feeca843822 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 8 Apr 2020 12:46:43 +0200
Subject: [PATCH 459/633] DEV: Fix some more flaky tests (#9384)

Includes:
* DEV: Don't overwrite a computed property in test
---
 spec/helpers/emoji_helper_spec.rb                     | 10 +++++++---
 test/javascripts/acceptance/emoji-picker-test.js      |  4 ++++
 .../controllers/preferences-account-test.js           | 11 +++++------
 test/javascripts/lib/emoji-store-test.js              |  4 ++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/spec/helpers/emoji_helper_spec.rb b/spec/helpers/emoji_helper_spec.rb
index 7dec3b3c55..a8b13a9ccb 100644
--- a/spec/helpers/emoji_helper_spec.rb
+++ b/spec/helpers/emoji_helper_spec.rb
@@ -4,6 +4,13 @@
 require 'rails_helper'
 
 describe EmojiHelper do
+  before do
+    Plugin::CustomEmoji.clear_cache
+  end
+
+  after do
+    Plugin::CustomEmoji.clear_cache
+  end
 
   describe "emoji_codes_to_img" do
     it "replaces emoji codes by images" do
@@ -13,8 +20,6 @@ describe EmojiHelper do
       replaced_str = helper.emoji_codes_to_img(str)
 
       expect(replaced_str).to eq("This is a good day <img src=\"/public/xxxxxx.png\" title=\"xxxxxx\" class=\"emoji\" alt=\"xxxxxx\"> <img src=\"/images/emoji/twitter/woman.png?v=#{Emoji::EMOJI_VERSION}\" title=\"woman\" class=\"emoji\" alt=\"woman\"> <img src=\"/images/emoji/twitter/man/4.png?v=#{Emoji::EMOJI_VERSION}\" title=\"man:t4\" class=\"emoji\" alt=\"man:t4\">")
-
-      Plugin::CustomEmoji.unregister("xxxxxx")
     end
 
     it "doesn't replace if code doesn't exist" do
@@ -24,5 +29,4 @@ describe EmojiHelper do
       expect(replaced_str).to eq("This is a good day <img src=\"/images/emoji/twitter/woman.png?v=#{Emoji::EMOJI_VERSION}\" title=\"woman\" class=\"emoji\" alt=\"woman\"> :foo: :bar:t4: :man:t8:")
     end
   end
-
 end
diff --git a/test/javascripts/acceptance/emoji-picker-test.js b/test/javascripts/acceptance/emoji-picker-test.js
index 71e06e1321..fac37414a6 100644
--- a/test/javascripts/acceptance/emoji-picker-test.js
+++ b/test/javascripts/acceptance/emoji-picker-test.js
@@ -3,6 +3,10 @@ import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
 
 acceptance("EmojiPicker", {
   loggedIn: true,
+  beforeEach() {
+    const store = Discourse.__container__.lookup("service:emoji-store");
+    store.reset();
+  },
   afterEach() {
     const store = Discourse.__container__.lookup("service:emoji-store");
     store.reset();
diff --git a/test/javascripts/controllers/preferences-account-test.js b/test/javascripts/controllers/preferences-account-test.js
index a0a8ae3840..f953fb0332 100644
--- a/test/javascripts/controllers/preferences-account-test.js
+++ b/test/javascripts/controllers/preferences-account-test.js
@@ -7,27 +7,26 @@ QUnit.test("updating of associated accounts", function(assert) {
       enable_google_oauth2_logins: true
     },
     model: EmberObject.create({
+      id: 70,
       second_factor_enabled: true,
       is_anonymous: true
     }),
+    currentUser: EmberObject.create({
+      id: 1234,
+    }),
     site: EmberObject.create({
       isMobileDevice: false
     })
   });
 
-  controller.set("canCheckEmails", false);
-
   assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
 
   controller.set("model.second_factor_enabled", false);
-
   assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
 
   controller.set("model.is_anonymous", false);
-
   assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
 
-  controller.set("canCheckEmails", true);
-
+  controller.set("model.id", 1234);
   assert.equal(controller.get("canUpdateAssociatedAccounts"), true);
 });
diff --git a/test/javascripts/lib/emoji-store-test.js b/test/javascripts/lib/emoji-store-test.js
index f0c521a58f..3a137ed4c9 100644
--- a/test/javascripts/lib/emoji-store-test.js
+++ b/test/javascripts/lib/emoji-store-test.js
@@ -1,4 +1,8 @@
 QUnit.module("lib:emoji-store", {
+  beforeEach() {
+    const store = Discourse.__container__.lookup("service:emoji-store");
+    store.reset();
+  },
   afterEach() {
     const store = Discourse.__container__.lookup("service:emoji-store");
     store.reset();

From 8e1bdc9458c7e3c0a5a60f799b57434260111929 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 8 Apr 2020 10:44:31 -0300
Subject: [PATCH 460/633] FIX: Prevent low score flags from auto-closing a
 topic if the reviewable default visibility is higher than low (#9375)

---
 app/models/topic.rb       |  5 +++--
 spec/models/topic_spec.rb | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index 7a3a1a5b0b..4f69e3055d 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1423,8 +1423,9 @@ class Topic < ActiveRecord::Base
 
     scores = ReviewableScore.pending
       .joins(:reviewable)
-      .where("reviewables.topic_id = ?", self.id)
-      .pluck("COUNT(DISTINCT reviewable_scores.user_id), COALESCE(SUM(reviewable_scores.score), 0.0)")
+      .where('reviewable_scores.score >= ?', Reviewable.min_score_for_priority)
+      .where('reviewables.topic_id = ?', self.id)
+      .pluck('COUNT(DISTINCT reviewable_scores.user_id), COALESCE(SUM(reviewable_scores.score), 0.0)')
       .first
 
     scores[0] >= SiteSetting.num_flaggers_to_close_topic && scores[1] >= Reviewable.score_to_auto_close_topic
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 84df06dd0d..e4db2d1d00 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -2574,4 +2574,40 @@ describe Topic do
       expect(user.user_profile.reload.featured_topic).to eq(nil)
     end
   end
+
+  describe '#auto_close_threshold_reached?' do
+    before do
+      Reviewable.set_priorities(low: 2.0, medium: 6.0, high: 9.0)
+      SiteSetting.num_flaggers_to_close_topic = 2
+      SiteSetting.reviewable_default_visibility = 'medium'
+      SiteSetting.auto_close_topic_sensitivity = Reviewable.sensitivity[:high]
+      post = Fabricate(:post)
+      @topic = post.topic
+      @reviewable = Fabricate(:reviewable_flagged_post, target: post, topic: @topic)
+    end
+
+    it 'ignores flags with a low score' do
+      5.times do
+        @reviewable.add_score(
+          Fabricate(:user, trust_level: TrustLevel[0]),
+          PostActionType.types[:spam],
+          created_at: 1.minute.ago
+        )
+      end
+
+      expect(@topic.auto_close_threshold_reached?).to eq(false)
+    end
+
+    it 'returns true when the flags have a high score' do
+      5.times do
+        @reviewable.add_score(
+          Fabricate(:user, admin: true),
+          PostActionType.types[:spam],
+          created_at: 1.minute.ago
+        )
+      end
+
+      expect(@topic.auto_close_threshold_reached?).to eq(true)
+    end
+  end
 end

From ae1a391377860bf1ab6d434de7458cc1b7c5dd31 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 8 Apr 2020 16:28:23 +0200
Subject: [PATCH 461/633] FIX: Quoting posts (#9378)

Fixes to the quote feature. Most important changes listed below:

* FIX: Correctly attribute quotes when using Reply button
* FIX: Correctly attribute quotes when using replyAsNewTopic
* FIX: Allow quoting a quote
* FIX: Correctly mark quotes as "full"
* FIX: Don't try to create a quote if it's empty
* DEV: Remove an obsolete method `loadQuote`
  It isn't used in core anymore, the only use in core has been removed over 4 years ago in 3251bcb. It's not used in any plugins in all-the-plugins and all references to it on GitHub are from outdated forks (https://github.com/search?q=%22Post.loadQuote%22&type=Code)
---
 .../discourse/components/quote-button.js      | 30 +++++++---
 .../discourse/controllers/composer.js         |  9 ++-
 .../discourse/controllers/topic.js            | 53 ++++++++---------
 app/assets/javascripts/discourse/lib/quote.js | 57 +++++-------------
 .../javascripts/discourse/lib/utilities.js    |  2 +-
 .../javascripts/discourse/models/composer.js  |  6 +-
 .../javascripts/discourse/models/post.js      |  8 ---
 .../templates/components/d-editor.hbs         |  2 +-
 .../javascripts/discourse/templates/topic.hbs |  1 -
 test/javascripts/acceptance/topic-test.js     | 58 +++++++++++++++++--
 test/javascripts/lib/pretty-text-test.js      | 33 +++++++++--
 11 files changed, 153 insertions(+), 106 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/quote-button.js b/app/assets/javascripts/discourse/components/quote-button.js
index 3a9ec42fe0..3a35269153 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js
+++ b/app/assets/javascripts/discourse/components/quote-button.js
@@ -1,6 +1,7 @@
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseDebounce from "discourse/lib/debounce";
+import toMarkdown from "discourse/lib/to-markdown";
 import { selectedText, selectedElement } from "discourse/lib/utilities";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 
@@ -38,12 +39,13 @@ export default Component.extend({
     let firstRange, postId;
     for (let r = 0; r < selection.rangeCount; r++) {
       const range = selection.getRangeAt(r);
-
-      if ($(range.startContainer.parentNode).closest(".cooked").length === 0)
-        return;
-
+      const $selectionStart = $(range.startContainer);
       const $ancestor = $(range.commonAncestorContainer);
 
+      if ($selectionStart.closest(".cooked").length === 0) {
+        return;
+      }
+
       firstRange = firstRange || range;
       postId = postId || $ancestor.closest(".boxed, .reply").data("post-id");
 
@@ -55,9 +57,21 @@ export default Component.extend({
       }
     }
 
-    let opts = { raw: true };
+    const _selectedElement = selectedElement();
+    const _selectedText = selectedText();
+
+    const $selectedElement = $(_selectedElement);
+    const cooked =
+      $selectedElement.find(".cooked")[0] ||
+      $selectedElement.closest(".cooked")[0];
+    const postBody = toMarkdown(cooked.innerHTML);
+
+    let opts = {
+      full: _selectedText === postBody
+    };
+
     for (
-      let element = selectedElement();
+      let element = _selectedElement;
       element && element.tagName !== "ARTICLE";
       element = element.parentElement
     ) {
@@ -69,7 +83,6 @@ export default Component.extend({
       }
     }
 
-    const _selectedText = selectedText();
     quoteState.selected(postId, _selectedText, opts);
     this.set("visible", quoteState.buffer.length > 0);
 
@@ -186,8 +199,7 @@ export default Component.extend({
   },
 
   click() {
-    const { postId, buffer, opts } = this.quoteState;
-    this.attrs.selectText(postId, buffer, opts).then(() => this._hideButton());
+    this.attrs.selectText().then(() => this._hideButton());
     return false;
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/composer.js b/app/assets/javascripts/discourse/controllers/composer.js
index c26be5f36a..1706c82dd9 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js
+++ b/app/assets/javascripts/discourse/controllers/composer.js
@@ -5,7 +5,7 @@ import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
-import Quote from "discourse/lib/quote";
+import { buildQuote } from "discourse/lib/quote";
 import Draft from "discourse/models/draft";
 import Composer from "discourse/models/composer";
 import discourseComputed, {
@@ -501,15 +501,14 @@ export default Controller.extend({
 
       if (postId) {
         this.set("model.loading", true);
-        const composer = this;
 
         return this.store.find("post", postId).then(post => {
-          const quote = Quote.build(post, post.raw, {
-            raw: true,
+          const quote = buildQuote(post, post.raw, {
             full: true
           });
+
           toolbarEvent.addText(quote);
-          composer.set("model.loading", false);
+          this.set("model.loading", false);
         });
       }
     },
diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/controllers/topic.js
index 01a84f7352..c273591100 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js
+++ b/app/assets/javascripts/discourse/controllers/topic.js
@@ -8,7 +8,7 @@ import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
 import DiscourseURL from "discourse/lib/url";
 import Post from "discourse/models/post";
-import Quote from "discourse/lib/quote";
+import { buildQuote } from "discourse/lib/quote";
 import QuoteState from "discourse/lib/quote-state";
 import Topic from "discourse/models/topic";
 import discourseDebounce from "discourse/lib/debounce";
@@ -265,7 +265,8 @@ export default Controller.extend(bufferedProperty("model"), {
       this.send("showFeatureTopic");
     },
 
-    selectText(postId, buffer, opts) {
+    selectText() {
+      const { postId, buffer, opts } = this.quoteState;
       const loadedPost = this.get("model.postStream").findLoadedPost(postId);
       const promise = loadedPost
         ? Promise.resolve(loadedPost)
@@ -274,11 +275,10 @@ export default Controller.extend(bufferedProperty("model"), {
       return promise.then(post => {
         const composer = this.composer;
         const viewOpen = composer.get("model.viewOpen");
-        const quotedText = Quote.build(post, buffer, opts);
 
         // If we can't create a post, delegate to reply as new topic
         if (!viewOpen && !this.get("model.details.can_create_post")) {
-          this.send("replyAsNewTopic", post, quotedText);
+          this.send("replyAsNewTopic", post);
           return;
         }
 
@@ -300,7 +300,9 @@ export default Controller.extend(bufferedProperty("model"), {
           composerOpts.post = composerPost;
         }
 
+        const quotedText = buildQuote(post, buffer, opts);
         composerOpts.quote = quotedText;
+
         if (composer.get("model.viewOpen")) {
           this.appEvents.trigger("composer:insert-block", quotedText);
         } else if (composer.get("model.viewDraft")) {
@@ -483,7 +485,11 @@ export default Controller.extend(bufferedProperty("model"), {
       }
 
       const quotedPost = postStream.findLoadedPost(quoteState.postId);
-      const quotedText = Quote.build(quotedPost, quoteState.buffer);
+      const quotedText = buildQuote(
+        quotedPost,
+        quoteState.buffer,
+        quoteState.opts
+      );
 
       quoteState.clear();
 
@@ -967,14 +973,14 @@ export default Controller.extend(bufferedProperty("model"), {
       }
     },
 
-    replyAsNewTopic(post, quotedText) {
+    replyAsNewTopic(post) {
       const composerController = this.composer;
-
       const { quoteState } = this;
-      quotedText = quotedText || Quote.build(post, quoteState.buffer);
+      const quotedText = buildQuote(post, quoteState.buffer, quoteState.opts);
+
       quoteState.clear();
 
-      var options;
+      let options;
       if (this.get("model.isPrivateMessage")) {
         let users = this.get("model.details.allowed_users");
         let groups = this.get("model.details.allowed_groups");
@@ -998,25 +1004,16 @@ export default Controller.extend(bufferedProperty("model"), {
         };
       }
 
-      composerController
-        .open(options)
-        .then(() => {
-          return isEmpty(quotedText) ? "" : quotedText;
-        })
-        .then(q => {
-          const postUrl = `${location.protocol}//${location.host}${post.get(
-            "url"
-          )}`;
-          const postLink = `[${Handlebars.escapeExpression(
-            this.get("model.title")
-          )}](${postUrl})`;
-          composerController
-            .get("model")
-            .prependText(
-              `${I18n.t("post.continue_discussion", { postLink })}\n\n${q}`,
-              { new_line: true }
-            );
-        });
+      composerController.open(options).then(() => {
+        const title = Handlebars.escapeExpression(this.model.title);
+        const postUrl = `${location.protocol}//${location.host}${post.url}`;
+        const postLink = `[${title}](${postUrl})`;
+        const text = `${I18n.t("post.continue_discussion", {
+          postLink
+        })}\n\n${quotedText}`;
+
+        composerController.model.prependText(text, { new_line: true });
+      });
     },
 
     retryLoading() {
diff --git a/app/assets/javascripts/discourse/lib/quote.js b/app/assets/javascripts/discourse/lib/quote.js
index 7a39c6da30..35870d06ca 100644
--- a/app/assets/javascripts/discourse/lib/quote.js
+++ b/app/assets/javascripts/discourse/lib/quote.js
@@ -1,43 +1,18 @@
-export default {
-  REGEXP: /\[quote=([^\]]*)\]((?:[\s\S](?!\[quote=[^\]]*\]))*?)\[\/quote\]/im,
+export const QUOTE_REGEXP = /\[quote=([^\]]*)\]((?:[\s\S](?!\[quote=[^\]]*\]))*?)\[\/quote\]/im;
 
-  // Build the BBCode quote around the selected text
-  build(post, contents, opts) {
-    if (!post) {
-      return "";
-    }
-
-    if (!contents) contents = "";
-    if (!opts) opts = {};
-
-    const sansQuotes = contents.replace(this.REGEXP, "").trim();
-    if (sansQuotes.length === 0) {
-      return "";
-    }
-
-    // Strip the HTML from cooked
-    const stripped = $("<div/>")
-      .html(post.get("cooked"))
-      .text();
-
-    // Let's remove any non-word characters as a kind of hash.
-    // Yes it's not accurate but it should work almost every time we need it to.
-    // It would be unlikely that the user would quote another post that matches in exactly this way.
-    const sameContent =
-      stripped.replace(/\W/g, "") === contents.replace(/\W/g, "");
-
-    const params = [
-      opts.username || post.username,
-      `post:${opts.post || post.post_number}`,
-      `topic:${opts.topic || post.topic_id}`
-    ];
-
-    opts = opts || {};
-
-    if (opts["full"] || sameContent) params.push("full:true");
-
-    return `[quote="${params.join(", ")}"]\n${
-      opts["raw"] ? contents : sansQuotes
-    }\n[/quote]\n\n`;
+// Build the BBCode quote around the selected text
+export function buildQuote(post, contents, opts = {}) {
+  if (!post || !contents) {
+    return "";
   }
-};
+
+  const params = [
+    opts.username || post.username,
+    `post:${opts.post || post.post_number}`,
+    `topic:${opts.topic || post.topic_id}`
+  ];
+
+  if (opts.full) params.push("full:true");
+
+  return `[quote="${params.join(", ")}"]\n${contents.trim()}\n[/quote]\n\n`;
+}
diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index 87aeb9a821..03ef200016 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -149,7 +149,7 @@ export function selectedText() {
 export function selectedElement() {
   const selection = window.getSelection();
   if (selection.rangeCount > 0) {
-    return selection.getRangeAt(0).commonAncestorContainer.parentElement;
+    return selection.getRangeAt(0).commonAncestorContainer;
   }
 }
 
diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 9c16503e68..56e4d1ac80 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -5,7 +5,7 @@ import { cancel, later, next, throttle } from "@ember/runloop";
 import RestModel from "discourse/models/rest";
 import Topic from "discourse/models/topic";
 import { throwAjaxError } from "discourse/lib/ajax-error";
-import Quote from "discourse/lib/quote";
+import { QUOTE_REGEXP } from "discourse/lib/quote";
 import Draft from "discourse/models/draft";
 import discourseComputed, {
   observes,
@@ -517,10 +517,10 @@ const Composer = RestModel.extend({
       return reply.length;
     }
 
-    while (Quote.REGEXP.test(reply)) {
+    while (QUOTE_REGEXP.test(reply)) {
       // make it global so we can strip as many quotes at once
       // keep in mind nested quotes mean we still need a loop here
-      const regex = new RegExp(Quote.REGEXP.source, "img");
+      const regex = new RegExp(QUOTE_REGEXP.source, "img");
       reply = reply.replace(regex, "");
     }
 
diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js
index 535ac4b419..9b2dac96cd 100644
--- a/app/assets/javascripts/discourse/models/post.js
+++ b/app/assets/javascripts/discourse/models/post.js
@@ -7,7 +7,6 @@ import RestModel from "discourse/models/rest";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import ActionSummary from "discourse/models/action-summary";
 import { propertyEqual } from "discourse/lib/computed";
-import Quote from "discourse/lib/quote";
 import { postUrl } from "discourse/lib/utilities";
 import { cookAsync } from "discourse/lib/text";
 import { userPath } from "discourse/lib/url";
@@ -468,13 +467,6 @@ Post.reopenClass({
     });
   },
 
-  loadQuote(postId) {
-    return ajax(`/posts/${postId}.json`).then(result => {
-      const post = Post.create(result);
-      return Quote.build(post, post.raw, { raw: true, full: true });
-    });
-  },
-
   loadRawEmail(postId) {
     return ajax(`/posts/${postId}/raw-email.json`);
   }
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 97effd78d4..955ef53a71 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -7,7 +7,7 @@
             {{toolbar-popup-menu-options
               content=popupMenuOptions
               onChange=onPopupMenuAction
-              onExpand=(action b.action b)
+              onOpen=(action b.action b)
               class=b.className
               options=(hash
                 popupTitle=b.title
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index c6297b021d..138c39b892 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -205,7 +205,6 @@
                 deletePost=(action "deletePost")
                 recoverPost=(action "recoverPost")
                 expandHidden=(action "expandHidden")
-                newTopicAction=(action "replyAsNewTopic")
                 toggleBookmark=(action "toggleBookmark")
                 toggleBookmarkWithReminder=(action "toggleBookmarkWithReminder")
                 togglePostType=(action "togglePostType")
diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js
index 68e6ab2c8a..b5e2684e6f 100644
--- a/test/javascripts/acceptance/topic-test.js
+++ b/test/javascripts/acceptance/topic-test.js
@@ -328,15 +328,19 @@ QUnit.test("View Hidden Replies", async assert => {
   assert.equal(find(".gap").length, 0, "it hides gap");
 });
 
-QUnit.test("Quoting a quote keeps the original poster name", async assert => {
-  await visit("/t/internationalization-localization/280");
+function selectText(selector) {
+  const range = document.createRange();
+  const node = document.querySelector(selector);
+  range.selectNodeContents(node);
 
   const selection = window.getSelection();
-  const range = document.createRange();
-  range.selectNodeContents($("#post_5 blockquote")[0]);
   selection.removeAllRanges();
   selection.addRange(range);
+}
 
+QUnit.test("Quoting a quote keeps the original poster name", async assert => {
+  await visit("/t/internationalization-localization/280");
+  selectText("#post_5 blockquote");
   await click(".quote-button");
 
   assert.ok(
@@ -346,6 +350,52 @@ QUnit.test("Quoting a quote keeps the original poster name", async assert => {
   );
 });
 
+QUnit.test(
+  "Quoting a quote with the Reply button keeps the original poster name",
+  async assert => {
+    await visit("/t/internationalization-localization/280");
+    selectText("#post_5 blockquote");
+    await click(".reply");
+
+    assert.ok(
+      find(".d-editor-input")
+        .val()
+        .indexOf('quote="codinghorror said, post:3, topic:280"') !== -1
+    );
+  }
+);
+
+QUnit.test(
+  "Quoting a quote with replyAsNewTopic keeps the original poster name",
+  async assert => {
+    await visit("/t/internationalization-localization/280");
+    selectText("#post_5 blockquote");
+    await keyEvent(document, "keypress", "j".charCodeAt(0));
+    await keyEvent(document, "keypress", "t".charCodeAt(0));
+
+    assert.ok(
+      find(".d-editor-input")
+        .val()
+        .indexOf('quote="codinghorror said, post:3, topic:280"') !== -1
+    );
+  }
+);
+
+QUnit.test(
+  "Quoting by selecting text can mark the quote as full",
+  async assert => {
+    await visit("/t/internationalization-localization/280");
+    selectText("#post_5 .cooked");
+    await click(".quote-button");
+
+    assert.ok(
+      find(".d-editor-input")
+        .val()
+        .indexOf('quote="pekka, post:5, topic:280, full:true"') !== -1
+    );
+  }
+);
+
 acceptance("Topic + Post Bookmarks with Reminders", {
   loggedIn: true,
   settings: {
diff --git a/test/javascripts/lib/pretty-text-test.js b/test/javascripts/lib/pretty-text-test.js
index 522356e6de..8443cccdb6 100644
--- a/test/javascripts/lib/pretty-text-test.js
+++ b/test/javascripts/lib/pretty-text-test.js
@@ -1,4 +1,4 @@
-import Quote from "discourse/lib/quote";
+import { buildQuote } from "discourse/lib/quote";
 import Post from "discourse/models/post";
 import PrettyText, { buildOptions } from "pretty-text/pretty-text";
 import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
@@ -1289,8 +1289,8 @@ QUnit.test("quotes", assert => {
     topic_id: 2
   });
 
-  function formatQuote(val, expected, text) {
-    assert.equal(Quote.build(post, val), expected, text);
+  function formatQuote(val, expected, text, opts) {
+    assert.equal(buildQuote(post, val, opts), expected, text);
   }
 
   formatQuote(undefined, "", "empty string for undefined content");
@@ -1312,12 +1312,13 @@ QUnit.test("quotes", assert => {
   formatQuote(
     "lorem ipsum",
     '[quote="eviltrout, post:1, topic:2, full:true"]\nlorem ipsum\n[/quote]\n\n',
-    "marks quotes as full when the quote is the full message"
+    "marks quotes as full if the `full` option is passed",
+    { full: true }
   );
 
   formatQuote(
     "**lorem** ipsum",
-    '[quote="eviltrout, post:1, topic:2, full:true"]\n**lorem** ipsum\n[/quote]\n\n',
+    '[quote="eviltrout, post:1, topic:2"]\n**lorem** ipsum\n[/quote]\n\n',
     "keeps BBCode formatting"
   );
 
@@ -1340,6 +1341,28 @@ QUnit.test("quotes", assert => {
   );
 });
 
+QUnit.test("quoting a quote", assert => {
+  const post = Post.create({
+    cooked: new PrettyText(defaultOpts).cook(
+      '[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]\n*Test*'
+    ),
+    username: "eviltrout",
+    post_number: 1,
+    topic_id: 2
+  });
+
+  const quote = buildQuote(
+    post,
+    '[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]'
+  );
+
+  assert.equal(
+    quote,
+    '[quote="eviltrout, post:1, topic:2"]\n[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]\n[/quote]\n\n',
+    "allows quoting a quote"
+  );
+});
+
 QUnit.test("quote formatting", assert => {
   assert.cooked(
     '[quote="EvilTrout, post:123, topic:456, full:true"]\n[sam]\n[/quote]',

From 84f344c5d1f72e5a5d026f5d26422f8d4602cb53 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 8 Apr 2020 11:38:25 -0400
Subject: [PATCH 462/633] FIX: ensure .gap width does not exceed window width

Fixes an issue where the viewport was horizontally scrollable on iPad.
---
 app/assets/stylesheets/desktop/topic-post.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index d404169fd8..1b60137985 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -633,6 +633,7 @@ blockquote {
   width: calc(
     #{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding}
   );
+  box-sizing: border-box;
 }
 
 /* hide the reply border above the time gap notices */

From b64b590cfb42b2d8b8129d2bee44e6407f11d284 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 8 Apr 2020 19:49:18 +0300
Subject: [PATCH 463/633] FIX: Add index on user_api_keys.key_hash (#9387)

---
 app/models/user_api_key.rb                                 | 1 +
 ...20200408121834_add_index_to_user_api_key_on_key_hash.rb | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 db/migrate/20200408121834_add_index_to_user_api_key_on_key_hash.rb

diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index e937c44a8e..4fac1230bc 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -116,5 +116,6 @@ end
 #
 #  index_user_api_keys_on_client_id  (client_id) UNIQUE
 #  index_user_api_keys_on_key        (key) UNIQUE
+#  index_user_api_keys_on_key_hash   (key_hash) UNIQUE
 #  index_user_api_keys_on_user_id    (user_id)
 #
diff --git a/db/migrate/20200408121834_add_index_to_user_api_key_on_key_hash.rb b/db/migrate/20200408121834_add_index_to_user_api_key_on_key_hash.rb
new file mode 100644
index 0000000000..9d6c67f651
--- /dev/null
+++ b/db/migrate/20200408121834_add_index_to_user_api_key_on_key_hash.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIndexToUserApiKeyOnKeyHash < ActiveRecord::Migration[6.0]
+  def change
+    add_index :user_api_keys, :key_hash, unique: true
+  end
+end

From e1f8014acd2877cda539b14b4694d9c077f6b36d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 8 Apr 2020 12:52:36 -0400
Subject: [PATCH 464/633] FEATURE: Support for publishing topics as pages
 (#9364)

If the feature is enabled, staff members can construct a URL and publish a
topic for others to browse without the regular Discourse chrome.

This is useful if you want to use Discourse like a CMS and publish
topics as articles, which can then be embedded into other systems.
---
 .../discourse/adapters/published-page.js      |   9 +
 .../discourse/components/text-field.js        |  21 +++
 .../discourse/controllers/publish-page.js     | 121 +++++++++++++
 .../discourse/lib/transform-post.js           |   5 +-
 .../discourse/models/published-page.js        |   8 +
 .../javascripts/discourse/models/topic.js     |   7 +
 .../javascripts/discourse/routes/topic.js     |   8 +
 .../templates/modal/publish-page.hbs          |  62 +++++++
 .../javascripts/discourse/templates/topic.hbs |  22 ++-
 .../discourse/widgets/post-admin-menu.js      |   9 +
 app/assets/stylesheets/common/base/modal.scss |  21 +++
 app/assets/stylesheets/common/base/topic.scss |  11 ++
 app/assets/stylesheets/publish.scss           |  32 ++++
 app/controllers/published_pages_controller.rb |  59 ++++++
 app/models/published_page.rb                  |  46 +++++
 app/models/topic.rb                           |   1 +
 app/models/user_history.rb                    |   8 +-
 app/serializers/published_page_serializer.rb  |   9 +
 .../topic_view_details_serializer.rb          |   7 +-
 app/serializers/topic_view_serializer.rb      |   8 +-
 app/services/staff_action_logger.rb           |  16 ++
 app/views/layouts/publish.html.erb            |  15 ++
 app/views/published_pages/show.html.erb       |  19 ++
 config/locales/client.en.yml                  |  16 ++
 config/locales/server.en.yml                  |   7 +
 config/routes.rb                              |   6 +
 config/site_settings.yml                      |   2 +
 .../20200401172023_create_published_pages.rb  |  13 ++
 lib/guardian.rb                               |   8 +
 lib/stylesheet/watcher.rb                     |   2 +-
 lib/topic_view.rb                             |   4 +
 spec/components/guardian_spec.rb              |  32 ++++
 spec/fabricators/published_page_fabricator.rb |   6 +
 spec/models/published_page_spec.rb            |  27 +++
 .../published_pages_controller_spec.rb        | 170 ++++++++++++++++++
 .../serializers/topic_view_serializer_spec.rb |  32 ++++
 .../acceptance/page-publishing-test.js        |  40 +++++
 test/javascripts/fixtures/topic.js            |   1 +
 38 files changed, 883 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/adapters/published-page.js
 create mode 100644 app/assets/javascripts/discourse/controllers/publish-page.js
 create mode 100644 app/assets/javascripts/discourse/models/published-page.js
 create mode 100644 app/assets/javascripts/discourse/templates/modal/publish-page.hbs
 create mode 100644 app/assets/stylesheets/publish.scss
 create mode 100644 app/controllers/published_pages_controller.rb
 create mode 100644 app/models/published_page.rb
 create mode 100644 app/serializers/published_page_serializer.rb
 create mode 100644 app/views/layouts/publish.html.erb
 create mode 100644 app/views/published_pages/show.html.erb
 create mode 100644 db/migrate/20200401172023_create_published_pages.rb
 create mode 100644 spec/fabricators/published_page_fabricator.rb
 create mode 100644 spec/models/published_page_spec.rb
 create mode 100644 spec/requests/published_pages_controller_spec.rb
 create mode 100644 test/javascripts/acceptance/page-publishing-test.js

diff --git a/app/assets/javascripts/discourse/adapters/published-page.js b/app/assets/javascripts/discourse/adapters/published-page.js
new file mode 100644
index 0000000000..1922673935
--- /dev/null
+++ b/app/assets/javascripts/discourse/adapters/published-page.js
@@ -0,0 +1,9 @@
+import RestAdapter from "discourse/adapters/rest";
+
+export default RestAdapter.extend({
+  jsonMode: true,
+
+  pathFor(store, type, id) {
+    return `/pub/by-topic/${id}`;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/text-field.js b/app/assets/javascripts/discourse/components/text-field.js
index bb57f25309..3477520d0b 100644
--- a/app/assets/javascripts/discourse/components/text-field.js
+++ b/app/assets/javascripts/discourse/components/text-field.js
@@ -71,6 +71,27 @@ export default TextField.extend({
     }
   },
 
+  didReceiveAttrs() {
+    this._super(...arguments);
+    this._prevValue = this.value;
+  },
+
+  didUpdateAttrs() {
+    this._super(...arguments);
+    if (this._prevValue !== this.value) {
+      if (this.onChangeImmediate) {
+        next(() => this.onChangeImmediate(this.value));
+      }
+      if (this.onChange) {
+        debounce(this, this._debouncedChange, DEBOUNCE_MS);
+      }
+    }
+  },
+
+  _debouncedChange() {
+    next(() => this.onChange(this.value));
+  },
+
   @discourseComputed("placeholderKey")
   placeholder: {
     get() {
diff --git a/app/assets/javascripts/discourse/controllers/publish-page.js b/app/assets/javascripts/discourse/controllers/publish-page.js
new file mode 100644
index 0000000000..37462fce38
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/publish-page.js
@@ -0,0 +1,121 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { computed, action } from "@ember/object";
+import { equal, not } from "@ember/object/computed";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+
+const States = {
+  initializing: "initializing",
+  checking: "checking",
+  valid: "valid",
+  invalid: "invalid",
+  saving: "saving",
+  new: "new",
+  existing: "existing",
+  unpublishing: "unpublishing",
+  unpublished: "unpublished"
+};
+
+const StateHelpers = {};
+Object.keys(States).forEach(name => {
+  StateHelpers[name] = equal("state", name);
+});
+
+export default Controller.extend(ModalFunctionality, StateHelpers, {
+  state: null,
+  reason: null,
+  publishedPage: null,
+  disabled: not("valid"),
+  publishedPage: null,
+
+  showUrl: computed("state", function() {
+    return (
+      this.state === States.valid ||
+      this.state === States.saving ||
+      this.state === States.existing
+    );
+  }),
+  showUnpublish: computed("state", function() {
+    return this.state === States.existing || this.state === States.unpublishing;
+  }),
+
+  onShow() {
+    this.set("state", States.initializing);
+
+    this.store
+      .find("published_page", this.model.id)
+      .then(page => {
+        this.setProperties({ state: States.existing, publishedPage: page });
+      })
+      .catch(this.startNew);
+  },
+
+  @action
+  startCheckSlug() {
+    if (this.state === States.existing) {
+      return;
+    }
+
+    this.set("state", States.checking);
+  },
+
+  @action
+  checkSlug() {
+    if (this.state === States.existing) {
+      return;
+    }
+    return ajax("/pub/check-slug", {
+      data: { slug: this.publishedPage.slug }
+    }).then(result => {
+      if (result.valid_slug) {
+        this.set("state", States.valid);
+      } else {
+        this.setProperties({ state: States.invalid, reason: result.reason });
+      }
+    });
+  },
+
+  @action
+  unpublish() {
+    this.set("state", States.unpublishing);
+    return this.publishedPage
+      .destroyRecord()
+      .then(() => {
+        this.set("state", States.unpublished);
+        this.model.set("publishedPage", null);
+      })
+      .catch(result => {
+        this.set("state", States.existing);
+        popupAjaxError(result);
+      });
+  },
+
+  @action
+  publish() {
+    this.set("state", States.saving);
+
+    return this.publishedPage
+      .update({ slug: this.publishedPage.slug })
+      .then(() => {
+        this.set("state", States.existing);
+        this.model.set("publishedPage", this.publishedPage);
+      })
+      .catch(errResult => {
+        popupAjaxError(errResult);
+        this.set("state", States.existing);
+      });
+  },
+
+  @action
+  startNew() {
+    this.setProperties({
+      state: States.new,
+      publishedPage: this.store.createRecord("published_page", {
+        id: this.model.id,
+        slug: this.model.slug
+      })
+    });
+    this.checkSlug();
+  }
+});
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js b/app/assets/javascripts/discourse/lib/transform-post.js
index 585bb02af3..986dc46c3c 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js
+++ b/app/assets/javascripts/discourse/lib/transform-post.js
@@ -76,7 +76,8 @@ export function transformBasicPost(post) {
     replyCount: post.reply_count,
     locked: post.locked,
     userCustomFields: post.user_custom_fields,
-    readCount: post.readers_count
+    readCount: post.readers_count,
+    canPublishPage: false
   };
 
   _additionalAttributes.forEach(a => (postAtts[a] = post[a]));
@@ -118,6 +119,8 @@ export default function transformPost(
     currentUser && (currentUser.id === post.user_id || currentUser.staff);
   postAtts.canReplyAsNewTopic = details.can_reply_as_new_topic;
   postAtts.canReviewTopic = !!details.can_review_topic;
+  postAtts.canPublishPage =
+    !!details.can_publish_page && post.post_number === 1;
   postAtts.isWarning = topic.is_warning;
   postAtts.links = post.get("internalLinks");
   postAtts.replyDirectlyBelow =
diff --git a/app/assets/javascripts/discourse/models/published-page.js b/app/assets/javascripts/discourse/models/published-page.js
new file mode 100644
index 0000000000..7f0c12ddf5
--- /dev/null
+++ b/app/assets/javascripts/discourse/models/published-page.js
@@ -0,0 +1,8 @@
+import RestModel from "discourse/models/rest";
+import { computed } from "@ember/object";
+
+export default RestModel.extend({
+  url: computed("slug", function() {
+    return `${Discourse.BaseUrl}/pub/${this.slug}`;
+  })
+});
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 045f31123d..41734e6e8f 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -545,6 +545,13 @@ const Topic = RestModel.extend({
       this.details.updateFromJson(json.details);
 
       keys.removeObjects(["details", "post_stream"]);
+
+      if (json.published_page) {
+        this.set(
+          "publishedPage",
+          this.store.createRecord("published-page", json.published_page)
+        );
+      }
     }
     keys.forEach(key => this.set(key, json[key]));
   },
diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/routes/topic.js
index 33e60412c6..5aebefe6a4 100644
--- a/app/assets/javascripts/discourse/routes/topic.js
+++ b/app/assets/javascripts/discourse/routes/topic.js
@@ -89,6 +89,14 @@ const TopicRoute = DiscourseRoute.extend({
       controller.setProperties({ flagTopic: true });
     },
 
+    showPagePublish() {
+      const model = this.modelFor("topic");
+      showModal("publish-page", {
+        model,
+        title: "topic.publish_page.title"
+      });
+    },
+
     showTopicStatusUpdate() {
       const model = this.modelFor("topic");
 
diff --git a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
new file mode 100644
index 0000000000..027f3ee764
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
@@ -0,0 +1,62 @@
+{{#d-modal-body}}
+  {{#if unpublished}}
+    <p>{{i18n "topic.publish_page.unpublished"}}</p>
+  {{else}}
+    {{#conditional-loading-spinner condition=initializing}}
+      <p class="publish-description">{{i18n "topic.publish_page.description"}}</p>
+
+      <form>
+        <label>{{i18n "topic.publish_page.slug"}}</label>
+        {{text-field value=publishedPage.slug onChange=(action "checkSlug") onChangeImmediate=(action "startCheckSlug") disabled=existing class="publish-slug"}}
+      </form>
+
+      <div class="publish-url">
+        {{conditional-loading-spinner condition=checking}}
+
+        {{#if existing}}
+          <div class='current-url'>
+            {{i18n "topic.publish_page.publish_url"}}
+            <div>
+              <a href={{publishedPage.url}} target="_blank" rel="noopener">{{publishedPage.url}}</a>
+            </div>
+          </div>
+        {{else}}
+          {{#if showUrl}}
+            <div class="valid-slug">
+              {{i18n "topic.publish_page.preview_url"}}
+              <div class='example-url'>{{publishedPage.url}}</div>
+            </div>
+          {{/if}}
+
+          {{#if invalid}}
+            {{i18n "topic.publish_page.invalid_slug"}} <span class="invalid-slug">{{reason}}.</span>
+          {{/if}}
+        {{/if}}
+
+      </div>
+    {{/conditional-loading-spinner}}
+  {{/if}}
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{#if showUnpublish}}
+    {{d-button icon="times" label="close" action=(action "closeModal")}}
+
+    {{d-button
+      label="topic.publish_page.unpublish"
+      icon="trash"
+      class="btn-danger"
+      isLoading=unpublishing
+      action=(action "unpublish") }}
+  {{else if unpublished}}
+    {{d-button label="topic.publish_page.publishing_settings" action=(action "startNew")}}
+  {{else}}
+    {{d-button
+      label="topic.publish_page.publish"
+      class="btn-primary publish-page"
+      icon="file"
+      disabled=disabled
+      isLoading=saving
+      action=(action "publish") }}
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 138c39b892..ed26ae62ba 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -85,6 +85,25 @@
           {{topic-category topic=model class="topic-category"}}
         {{/if}}
       {{/topic-title}}
+
+      {{#if model.publishedPage}}
+        <div class='published-page'>
+          <div class="details">
+            {{i18n "topic.publish_page.topic_published"}}
+            <div>
+              <a href={{model.publishedPage.url}} target="_blank" rel="noopener">{{model.publishedPage.url}}</a>
+            </div>
+          </div>
+          <div class="controls">
+            {{d-button
+              icon="file"
+              label="topic.publish_page.publishing_settings"
+              action=(route-action "showPagePublish")
+            }}
+          </div>
+        </div>
+      {{/if}}
+
     {{/if}}
 
     <div class="container posts">
@@ -230,7 +249,8 @@
                 selectBelow=(action "selectBelow")
                 fillGapBefore=(action "fillGapBefore")
                 fillGapAfter=(action "fillGapAfter")
-                showInvite=(route-action "showInvite")}}
+                showInvite=(route-action "showInvite")
+                showPagePublish=(route-action "showPagePublish")}}
             {{/unless}}
 
             {{conditional-loading-spinner condition=model.postStream.loadingBelow}}
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js b/app/assets/javascripts/discourse/widgets/post-admin-menu.js
index 40dc1d3c85..2b94b8a85c 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js
@@ -120,6 +120,15 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
     }
   }
 
+  if (attrs.canPublishPage) {
+    contents.push({
+      icon: "file",
+      label: "post.controls.publish_page",
+      action: "showPagePublish",
+      className: "btn-default publish-page"
+    });
+  }
+
   if (attrs.canManage) {
     contents.push({
       icon: "cog",
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 90a20854fd..cb7e0a4c35 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -684,6 +684,27 @@
   }
 }
 
+.publish-page-modal .modal-body {
+  p.publish-description {
+    margin-top: 0;
+  }
+  input.publish-slug {
+    width: 100%;
+  }
+
+  .publish-url {
+    margin-bottom: 1em;
+    .example-url,
+    .invalid-slug {
+      font-weight: bold;
+    }
+  }
+
+  .publish-slug:disabled {
+    cursor: not-allowed;
+  }
+}
+
 .modal:not(.has-tabs) {
   .modal-tab {
     position: absolute;
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 927ee0e250..cd7c7d70cc 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -295,3 +295,14 @@ a.topic-featured-link {
     }
   }
 }
+
+.published-page {
+  display: flex;
+  justify-content: space-between;
+  padding-bottom: 1em;
+  max-width: calc(
+    #{$topic-body-width} + #{$topic-avatar-width} + #{$topic-body-width-padding *
+      2}
+  );
+  align-items: center;
+}
diff --git a/app/assets/stylesheets/publish.scss b/app/assets/stylesheets/publish.scss
new file mode 100644
index 0000000000..b59a480ef0
--- /dev/null
+++ b/app/assets/stylesheets/publish.scss
@@ -0,0 +1,32 @@
+@import "common";
+
+body {
+  background-color: $secondary;
+  color: $primary;
+}
+
+.published-page {
+  margin: 2em auto;
+  max-width: 800px;
+
+  h1 {
+    color: $header_primary;
+  }
+
+  .published-page-author {
+    margin-top: 1em;
+    margin-bottom: 2em;
+    display: flex;
+
+    .avatar {
+      margin-right: 1em;
+    }
+    .topic-created-at {
+      color: $primary-medium;
+    }
+  }
+
+  .published-page-body {
+    font-size: 1.25em;
+  }
+}
diff --git a/app/controllers/published_pages_controller.rb b/app/controllers/published_pages_controller.rb
new file mode 100644
index 0000000000..a133732867
--- /dev/null
+++ b/app/controllers/published_pages_controller.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class PublishedPagesController < ApplicationController
+
+  skip_before_action :preload_json
+  skip_before_action :check_xhr, :verify_authenticity_token, only: [:show]
+  before_action :ensure_publish_enabled
+
+  def show
+    params.require(:slug)
+
+    pp = PublishedPage.find_by(slug: params[:slug])
+    raise Discourse::NotFound unless pp
+
+    guardian.ensure_can_see!(pp.topic)
+    @topic = pp.topic
+    @canonical_url = @topic.url
+    render layout: 'publish'
+  end
+
+  def details
+    pp = PublishedPage.find_by(topic: fetch_topic)
+    raise Discourse::NotFound if pp.blank?
+    render_serialized(pp, PublishedPageSerializer)
+  end
+
+  def upsert
+    result, pp = PublishedPage.publish!(current_user, fetch_topic, params[:published_page][:slug].strip)
+    json_result(pp, serializer: PublishedPageSerializer) { result }
+  end
+
+  def destroy
+    PublishedPage.unpublish!(current_user, fetch_topic)
+    render json: success_json
+  end
+
+  def check_slug
+    pp = PublishedPage.new(topic: Topic.new, slug: params[:slug].strip)
+
+    if pp.valid?
+      render json: { valid_slug: true }
+    else
+      render json: { valid_slug: false, reason: pp.errors.full_messages.first }
+    end
+  end
+
+private
+
+  def fetch_topic
+    topic = Topic.find_by(id: params[:topic_id])
+    guardian.ensure_can_publish_page!(topic)
+    topic
+  end
+
+  def ensure_publish_enabled
+    raise Discourse::NotFound unless SiteSetting.enable_page_publishing?
+  end
+
+end
diff --git a/app/models/published_page.rb b/app/models/published_page.rb
new file mode 100644
index 0000000000..da89df53bc
--- /dev/null
+++ b/app/models/published_page.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class PublishedPage < ActiveRecord::Base
+  belongs_to :topic
+
+  validates_presence_of :slug
+  validates_uniqueness_of :slug, :topic_id
+
+  validate :slug_format
+  def slug_format
+    if slug !~ /^[a-zA-Z\-\_0-9]+$/
+      errors.add(:slug, I18n.t("publish_page.slug_errors.invalid"))
+    elsif ["check-slug", "by-topic"].include?(slug)
+      errors.add(:slug, I18n.t("publish_page.slug_errors.unavailable"))
+    end
+  end
+
+  def path
+    "/pub/#{slug}"
+  end
+
+  def url
+    "#{Discourse.base_url}#{path}"
+  end
+
+  def self.publish!(publisher, topic, slug)
+    transaction do
+      pp = find_or_initialize_by(topic: topic)
+      pp.slug = slug.strip
+
+      if pp.save
+        StaffActionLogger.new(publisher).log_published_page(topic.id, slug)
+        return [true, pp]
+      end
+    end
+
+    [false, pp]
+  end
+
+  def self.unpublish!(publisher, topic)
+    if pp = PublishedPage.find_by(topic_id: topic.id)
+      pp.destroy!
+      StaffActionLogger.new(publisher).log_unpublished_page(topic.id, pp.slug)
+    end
+  end
+end
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 4f69e3055d..dd9460ce3a 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -114,6 +114,7 @@ class Topic < ActiveRecord::Base
 
   has_one :top_topic
   has_one :shared_draft, dependent: :destroy
+  has_one :published_page
 
   belongs_to :user
   belongs_to :last_poster, class_name: 'User', foreign_key: :last_post_user_id
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index 3adbb62eb1..49a545b815 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -103,7 +103,9 @@ class UserHistory < ActiveRecord::Base
       api_key_destroy: 82,
       revoke_title: 83,
       change_title: 84,
-      override_upload_secure_status: 85
+      override_upload_secure_status: 85,
+      page_published: 86,
+      page_unpublished: 87
     )
   end
 
@@ -183,7 +185,9 @@ class UserHistory < ActiveRecord::Base
       :api_key_create,
       :api_key_update,
       :api_key_destroy,
-      :override_upload_secure_status
+      :override_upload_secure_status,
+      :page_published,
+      :page_unpublished
     ]
   end
 
diff --git a/app/serializers/published_page_serializer.rb b/app/serializers/published_page_serializer.rb
new file mode 100644
index 0000000000..bdee8d14f7
--- /dev/null
+++ b/app/serializers/published_page_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class PublishedPageSerializer < ApplicationSerializer
+  attributes :id, :slug
+
+  def id
+    object.topic_id
+  end
+end
diff --git a/app/serializers/topic_view_details_serializer.rb b/app/serializers/topic_view_details_serializer.rb
index d21b1a778b..32a1737527 100644
--- a/app/serializers/topic_view_details_serializer.rb
+++ b/app/serializers/topic_view_details_serializer.rb
@@ -15,7 +15,8 @@ class TopicViewDetailsSerializer < ApplicationSerializer
      :can_flag_topic,
      :can_convert_topic,
      :can_review_topic,
-     :can_edit_tags]
+     :can_edit_tags,
+     :can_publish_page]
   end
 
   attributes(
@@ -133,6 +134,10 @@ class TopicViewDetailsSerializer < ApplicationSerializer
     !scope.can_edit?(object.topic) && scope.can_edit_tags?(object.topic)
   end
 
+  def include_can_publish_page?
+    scope.can_publish_page?(object.topic)
+  end
+
   def allowed_users
     object.topic.allowed_users.reject { |user| object.group_allowed_user_ids.include?(user.id) }
   end
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 824dfcb068..1aec5f442d 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -71,12 +71,14 @@ class TopicViewSerializer < ApplicationSerializer
     :pm_with_non_human_user,
     :queued_posts_count,
     :show_read_indicator,
-    :requested_group_name
+    :requested_group_name,
   )
 
   has_one :details, serializer: TopicViewDetailsSerializer, root: false, embed: :objects
   has_many :pending_posts, serializer: TopicPendingPostSerializer, root: false, embed: :objects
 
+  has_one :published_page, embed: :objects
+
   def details
     object
   end
@@ -273,4 +275,8 @@ class TopicViewSerializer < ApplicationSerializer
   def include_requested_group_name?
     object.personal_message
   end
+
+  def include_published_page?
+    SiteSetting.enable_page_publishing? && scope.is_staff? && object.published_page.present?
+  end
 end
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 9130f34692..117353cb17 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -728,6 +728,22 @@ class StaffActionLogger
     ))
   end
 
+  def log_published_page(topic_id, slug)
+    UserHistory.create!(params.merge(
+      subject: slug,
+      topic_id: topic_id,
+      action: UserHistory.actions[:page_published]
+    ))
+  end
+
+  def log_unpublished_page(topic_id, slug)
+    UserHistory.create!(params.merge(
+      subject: slug,
+      topic_id: topic_id,
+      action: UserHistory.actions[:page_unpublished]
+    ))
+  end
+
   private
 
   def get_changes(changes)
diff --git a/app/views/layouts/publish.html.erb b/app/views/layouts/publish.html.erb
new file mode 100644
index 0000000000..2b3d727dc7
--- /dev/null
+++ b/app/views/layouts/publish.html.erb
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, user-scalable=yes, viewport-fit=cover">
+    <%= discourse_stylesheet_link_tag 'publish', theme_ids: nil %>
+
+    <%- if @canonical_url -%>
+      <link rel="canonical" href="<%= @canonical_url %>" />
+    <%- end -%>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/published_pages/show.html.erb b/app/views/published_pages/show.html.erb
new file mode 100644
index 0000000000..08f5474b81
--- /dev/null
+++ b/app/views/published_pages/show.html.erb
@@ -0,0 +1,19 @@
+<div class="published-page">
+  <div class="published-page-header">
+    <h1 class="published-page-title"><%= @topic.title %></h1>
+
+    <div class="published-page-author">
+      <img src="<%= @topic.user.small_avatar_url %>" class="avatar">
+      <div class="published-page-author-details">
+        <div class="username"><%= @topic.user.username %></div>
+        <div class="topic-created-at"><%= short_date(@topic.created_at) %></div>
+      </div>
+    </div>
+
+    <%- if @topic.first_post.present? %>
+      <div class="published-page-body">
+        <%= @topic.first_post.cooked.html_safe %>
+      </div>
+    <%- end -%>
+  </div>
+</div>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 62cfd14763..7e28c6620d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2439,6 +2439,19 @@ en:
         action: "merge selected posts"
         error: "There was an error merging the selected posts."
 
+      publish_page:
+        title: "Page Publishing"
+        publish: "Publish"
+        description: "When a topic is published as a page, its URL can be shared and it will displayed with custom styling."
+        slug: "Slug"
+        publish_url: "Your page has been published at:"
+        topic_published: "Your topic has been published at:"
+        preview_url: "Your page will be published at:"
+        invalid_slug: "Sorry, you can't publish this page."
+        unpublish: "Unpublish"
+        unpublished: "Your page has been unpublished and is no longer accessible."
+        publishing_settings: "Publishing Settings"
+
       change_owner:
         title: "Change Owner"
         action: "change ownership"
@@ -2591,6 +2604,7 @@ en:
         convert_to_moderator: "Add Staff Color"
         revert_to_regular: "Remove Staff Color"
         rebake: "Rebuild HTML"
+        publish_page: "Page Publishing"
         unhide: "Unhide"
         change_owner: "Change Ownership"
         grant_badge: "Grant Badge"
@@ -4083,6 +4097,8 @@ en:
             api_key_update: "api key update"
             api_key_destroy: "api key destroy"
             override_upload_secure_status: "override upload secure status"
+            page_published: "page published"
+            page_unpublished: "page unpublished"
         screened_emails:
           title: "Screened Emails"
           description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 5574f69ae8..f5f03a1b9d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2107,6 +2107,7 @@ en:
     new_user_notice_tl: "Minimum trust level required to see new user post notices."
     returning_user_notice_tl: "Minimum trust level required to see returning user post notices."
     returning_users_days: "How many days should pass before a user is considered to be returning."
+    enable_page_publishing: "Allow staff members to publish topics to new URLs with their own styling."
 
     default_email_digest_frequency: "How often users receive summary emails by default."
     default_include_tl0_in_digests: "Include posts from new users in summary emails by default. Users can change this in their preferences."
@@ -2299,6 +2300,12 @@ en:
   change_owner:
     post_revision_text: "Ownership transferred"
 
+  publish_page:
+    slug_errors:
+      blank: "can't be blank"
+      unavailable: "is unavailable"
+      invalid: "contains invalid characters"
+
   topic_statuses:
     autoclosed_message_max_posts:
       one: "This message was automatically closed after reaching the maximum limit of %{count} reply."
diff --git a/config/routes.rb b/config/routes.rb
index 8306dcc40a..1a92a5440d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -45,6 +45,12 @@ Discourse::Application.routes.draw do
   get "finish-installation/confirm-email" => "finish_installation#confirm_email"
   put "finish-installation/resend-email" => "finish_installation#resend_email"
 
+  get "pub/check-slug" => "published_pages#check_slug"
+  get "pub/by-topic/:topic_id" => "published_pages#details"
+  put "pub/by-topic/:topic_id" => "published_pages#upsert"
+  delete "pub/by-topic/:topic_id" => "published_pages#destroy"
+  get "pub/:slug" => "published_pages#show"
+
   resources :directory_items
 
   get "site" => "site#site"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index ccbcc8150a..e2fc35aac4 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -933,6 +933,8 @@ posting:
     enum: "TrustLevelSetting"
   returning_users_days:
     default: 120
+  enable_page_publishing:
+    default: false
 
 email:
   email_time_window_mins:
diff --git a/db/migrate/20200401172023_create_published_pages.rb b/db/migrate/20200401172023_create_published_pages.rb
new file mode 100644
index 0000000000..201b08c9d6
--- /dev/null
+++ b/db/migrate/20200401172023_create_published_pages.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreatePublishedPages < ActiveRecord::Migration[6.0]
+  def change
+    create_table :published_pages do |t|
+      t.references :topic, null: false, index: { unique: true }
+      t.string :slug, null: false
+      t.timestamps
+    end
+
+    add_index :published_pages, :slug, unique: true
+  end
+end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 851dddf881..00d496e46e 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -485,6 +485,14 @@ class Guardian
       (components - Theme.components_for(parent)).empty?
   end
 
+  def can_publish_page?(topic)
+    return false unless SiteSetting.enable_page_publishing?
+    return false if topic.blank?
+    return false if topic.private_message?
+    return false unless can_see_topic?(topic)
+    is_staff?
+  end
+
   def auth_token
     if cookie = request&.cookies[Auth::DefaultCurrentUserProvider::TOKEN_COOKIE]
       UserAuthToken.hash_token(cookie)
diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rb
index 384f7515d1..d2d49c2ab9 100644
--- a/lib/stylesheet/watcher.rb
+++ b/lib/stylesheet/watcher.rb
@@ -78,7 +78,7 @@ module Stylesheet
 
                 target = nil
                 if !plugin_name
-                  target_match = long.match(/admin|desktop|mobile/)
+                  target_match = long.match(/admin|desktop|mobile|publish/)
                   if target_match&.length
                     target = target_match[0]
                   end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 94f31f44b1..82ae26c573 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -596,6 +596,10 @@ class TopicView
     ReviewableQueuedPost.viewable_by(@user).where(topic_id: @topic.id).pending.count
   end
 
+  def published_page
+    @topic.published_page
+  end
+
   protected
 
   def read_posts_set
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index bea0404696..97a1b0c2e0 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -3476,4 +3476,36 @@ describe Guardian do
       expect(guardian.auth_token).to eq(token.auth_token)
     end
   end
+
+  describe "can_publish_page?" do
+    context "when disabled" do
+      it "is false for staff" do
+        expect(Guardian.new(admin).can_publish_page?(topic)).to eq(false)
+      end
+    end
+
+    context "when enabled" do
+      before do
+        SiteSetting.enable_page_publishing = true
+      end
+
+      it "is false for anonymous users" do
+        expect(Guardian.new.can_publish_page?(topic)).to eq(false)
+      end
+
+      it "is false for regular users" do
+        expect(Guardian.new(user).can_publish_page?(topic)).to eq(false)
+      end
+
+      it "is true for staff" do
+        expect(Guardian.new(moderator).can_publish_page?(topic)).to eq(true)
+        expect(Guardian.new(admin).can_publish_page?(topic)).to eq(true)
+      end
+
+      it "is false if the topic is a private message" do
+        post = Fabricate(:private_message_post, user: admin)
+        expect(Guardian.new(admin).can_publish_page?(post.topic)).to eq(false)
+      end
+    end
+  end
 end
diff --git a/spec/fabricators/published_page_fabricator.rb b/spec/fabricators/published_page_fabricator.rb
new file mode 100644
index 0000000000..44f8da98da
--- /dev/null
+++ b/spec/fabricators/published_page_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:published_page) do
+  topic
+  slug "published-page-test"
+end
diff --git a/spec/models/published_page_spec.rb b/spec/models/published_page_spec.rb
new file mode 100644
index 0000000000..e863cdb473
--- /dev/null
+++ b/spec/models/published_page_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe PublishedPage, type: :model do
+
+  fab!(:topic) { Fabricate(:topic) }
+
+  it "has path and url helpers" do
+    pp = PublishedPage.create!(topic: topic, slug: 'hello-world')
+    expect(pp.path).to eq("/pub/hello-world")
+    expect(pp.url).to eq(Discourse.base_url + "/pub/hello-world")
+  end
+
+  it "validates the slug" do
+    expect(PublishedPage.new(topic: topic, slug: "this-is-valid")).to be_valid
+    expect(PublishedPage.new(topic: topic, slug: "10_things_i_hate_about_slugs")).to be_valid
+    expect(PublishedPage.new(topic: topic, slug: "YELLING")).to be_valid
+
+    expect(PublishedPage.new(topic: topic, slug: "how about some space")).not_to be_valid
+    expect(PublishedPage.new(topic: topic, slug: "slugs are %%%%")).not_to be_valid
+
+    expect(PublishedPage.new(topic: topic, slug: "check-slug")).not_to be_valid
+    expect(PublishedPage.new(topic: topic, slug: "by-topic")).not_to be_valid
+  end
+
+end
diff --git a/spec/requests/published_pages_controller_spec.rb b/spec/requests/published_pages_controller_spec.rb
new file mode 100644
index 0000000000..6b3a6894f4
--- /dev/null
+++ b/spec/requests/published_pages_controller_spec.rb
@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe PublishedPagesController do
+  fab!(:published_page) { Fabricate(:published_page) }
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:user) { Fabricate(:user) }
+
+  context "when enabled" do
+    before do
+      SiteSetting.enable_page_publishing = true
+    end
+
+    context "check slug availability" do
+      it "returns true for a new slug" do
+        get "/pub/check-slug.json?slug=cool-slug-man"
+        expect(response).to be_successful
+        expect(response.parsed_body["valid_slug"]).to eq(true)
+      end
+
+      it "returns true for a new slug with whitespace" do
+        get "/pub/check-slug.json?slug=cool-slug-man%20"
+        expect(response).to be_successful
+        expect(response.parsed_body["valid_slug"]).to eq(true)
+      end
+
+      it "returns false for an empty value" do
+        get "/pub/check-slug.json?slug="
+        expect(response).to be_successful
+        expect(response.parsed_body["valid_slug"]).to eq(false)
+        expect(response.parsed_body["reason"]).to be_present
+      end
+
+      it "returns false for a reserved value" do
+        get "/pub/check-slug.json", params: { slug: "check-slug" }
+        expect(response).to be_successful
+        expect(response.parsed_body["valid_slug"]).to eq(false)
+        expect(response.parsed_body["reason"]).to be_present
+      end
+    end
+
+    context "show" do
+      it "returns 404 for a missing article" do
+        get "/pub/no-article-here-no-thx"
+        expect(response.status).to eq(404)
+      end
+
+      context "private topic" do
+        fab!(:group) { Fabricate(:group) }
+        fab!(:private_category) { Fabricate(:private_category, group: group) }
+
+        before do
+          published_page.topic.update!(category: private_category)
+        end
+
+        it "returns 403 for a topic you can't see" do
+          get published_page.path
+          expect(response.status).to eq(403)
+        end
+
+        context "as an admin" do
+          before do
+            sign_in(admin)
+          end
+
+          it "returns 200" do
+            get published_page.path
+            expect(response.status).to eq(200)
+          end
+        end
+      end
+
+      it "returns an error for an article you can't see" do
+        get "/pub/no-article-here-no-thx"
+        expect(response.status).to eq(404)
+      end
+
+      it "returns 200 for a valid article" do
+        get published_page.path
+        expect(response.status).to eq(200)
+      end
+    end
+
+    context "publishing" do
+      fab!(:topic) { Fabricate(:topic) }
+
+      it "returns invalid access for non-staff" do
+        sign_in(user)
+        put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'cant-do-this' } }
+        expect(response.status).to eq(403)
+      end
+
+      context "with a valid staff account" do
+        before do
+          sign_in(admin)
+        end
+
+        it "creates the published page record" do
+          put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }
+          expect(response).to be_successful
+          expect(response.parsed_body['published_page']).to be_present
+          expect(response.parsed_body['published_page']['slug']).to eq("i-hate-salt")
+
+          expect(PublishedPage.exists?(topic_id: response.parsed_body['published_page']['id'])).to eq(true)
+          expect(UserHistory.exists?(
+            acting_user_id: admin.id,
+            action: UserHistory.actions[:page_published],
+            topic_id: topic.id
+          )).to be(true)
+        end
+
+        it "returns an error if the slug is already taken" do
+          PublishedPage.create!(slug: 'i-hate-salt', topic: Fabricate(:topic))
+          put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }
+          expect(response).not_to be_successful
+        end
+
+        it "returns an error if the topic already has been published" do
+          PublishedPage.create!(slug: 'already-done-pal', topic: topic)
+          put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }
+          expect(response).to be_successful
+          expect(PublishedPage.exists?(topic_id: topic.id)).to eq(true)
+        end
+
+      end
+    end
+
+    context "destroy" do
+
+      it "returns invalid access for non-staff" do
+        sign_in(user)
+        delete "/pub/by-topic/#{published_page.topic_id}.json"
+        expect(response.status).to eq(403)
+      end
+
+      context "with a valid staff account" do
+        before do
+          sign_in(admin)
+        end
+
+        it "deletes the record" do
+          topic_id = published_page.topic_id
+
+          delete "/pub/by-topic/#{topic_id}.json"
+          expect(response).to be_successful
+          expect(PublishedPage.exists?(slug: published_page.slug)).to eq(false)
+
+          expect(UserHistory.exists?(
+            acting_user_id: admin.id,
+            action: UserHistory.actions[:page_unpublished],
+            topic_id: topic_id
+          )).to be(true)
+        end
+      end
+    end
+  end
+
+  context "when disabled" do
+    before do
+      SiteSetting.enable_page_publishing = false
+    end
+
+    it "returns 404 for any article" do
+      get published_page.path
+      expect(response.status).to eq(404)
+    end
+  end
+
+end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index b0627ab05f..a80f884812 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -258,6 +258,16 @@ describe TopicViewSerializer do
       expect(details[:allowed_groups].find { |ag| ag[:id] == group.id }).to be_present
     end
 
+    it "has can_publish_page if possible" do
+      SiteSetting.enable_page_publishing = true
+
+      json = serialize_topic(topic, user)
+      expect(json[:details][:can_publish_page]).to be_blank
+
+      json = serialize_topic(topic, admin)
+      expect(json[:details][:can_publish_page]).to eq(true)
+    end
+
     context "can_edit_tags" do
       before do
         SiteSetting.tagging_enabled = true
@@ -279,4 +289,26 @@ describe TopicViewSerializer do
     end
   end
 
+  context "published_page" do
+    fab!(:published_page) { Fabricate(:published_page, topic: topic) }
+
+    it "doesn't return the published page if not enabled" do
+      json = serialize_topic(topic, admin)
+      expect(json[:published_page]).to be_blank
+    end
+
+    it "doesn't return the published page unless staff" do
+      SiteSetting.enable_page_publishing = true
+      json = serialize_topic(topic, user)
+      expect(json[:published_page]).to be_blank
+    end
+
+    it "returns the published page if enabled and staff" do
+      SiteSetting.enable_page_publishing = true
+      json = serialize_topic(topic, admin)
+      expect(json[:published_page]).to be_present
+      expect(json[:published_page][:slug]).to eq("published-page-test")
+    end
+  end
+
 end
diff --git a/test/javascripts/acceptance/page-publishing-test.js b/test/javascripts/acceptance/page-publishing-test.js
new file mode 100644
index 0000000000..2b51229bb2
--- /dev/null
+++ b/test/javascripts/acceptance/page-publishing-test.js
@@ -0,0 +1,40 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Page Publishing", {
+  loggedIn: true,
+  pretend(server, helper) {
+    const validSlug = helper.response({ valid_slug: true });
+
+    server.put("/pub/by-topic/280", () => {
+      return helper.response({});
+    });
+    server.get("/pub/by-topic/280", () => {
+      return helper.response({});
+    });
+    server.get("/pub/check-slug", req => {
+      if (req.queryParams.slug === "internationalization-localization") {
+        return validSlug;
+      }
+      return helper.response({
+        valid_slug: false,
+        reason: "i don't need a reason"
+      });
+    });
+  }
+});
+QUnit.test("can publish a page via modal", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click(".topic-post:eq(0) button.show-more-actions");
+  await click(".topic-post:eq(0) button.show-post-admin-menu");
+  await click(".topic-post:eq(0) .publish-page");
+
+  await fillIn(".publish-slug", "bad-slug");
+  assert.ok(!exists(".valid-slug"));
+  assert.ok(exists(".invalid-slug"));
+  await fillIn(".publish-slug", "internationalization-localization");
+  assert.ok(exists(".valid-slug"));
+  assert.ok(!exists(".invalid-slug"));
+
+  await click(".publish-page");
+  assert.ok(exists(".current-url"));
+});
diff --git a/test/javascripts/fixtures/topic.js b/test/javascripts/fixtures/topic.js
index 7c380de3a0..dedf9814b8 100644
--- a/test/javascripts/fixtures/topic.js
+++ b/test/javascripts/fixtures/topic.js
@@ -1977,6 +1977,7 @@ export default {
     pinned: false,
     pinned_at: null,
     details: {
+      can_publish_page: true,
       can_invite_via_email: true,
       auto_close_at: null,
       auto_close_hours: null,

From 73d71e3feed0923f17673f5e7ddf0bd29ce8120e Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 8 Apr 2020 20:24:18 +0300
Subject: [PATCH 465/633] FEATURE: Show noscript view to unsupported browsers
 (#9373)

---
 app/assets/javascripts/browser-detect.js      |  3 +++
 app/assets/javascripts/discourse.js           |  4 ++++
 app/views/layouts/application.html.erb        |  2 ++
 config/application.rb                         |  1 +
 .../config/locales/server.en.yml              |  2 +-
 .../public/js/ie.js                           |  3 +++
 .../assets/javascripts/browser-update.js.erb  | 23 ++++++++++---------
 7 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 app/assets/javascripts/browser-detect.js

diff --git a/app/assets/javascripts/browser-detect.js b/app/assets/javascripts/browser-detect.js
new file mode 100644
index 0000000000..bdbbc27b3e
--- /dev/null
+++ b/app/assets/javascripts/browser-detect.js
@@ -0,0 +1,3 @@
+if (!window.WeakMap || !window.Promise) {
+  window.unsupportedBrowser = true;
+}
diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index 10fb7dd407..eea5c75640 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -6,6 +6,10 @@ import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import FocusEvent from "discourse-common/mixins/focus-event";
 import deprecated from "discourse-common/lib/deprecated";
 
+if (window.unsupportedBrowser) {
+  throw "Unsupported browser detected";
+}
+
 const _pluginCallbacks = [];
 
 const Discourse = Application.extend(FocusEvent, {
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7340c45a46..22a29e19e4 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -19,6 +19,8 @@
 
     <%= build_plugin_html 'server:before-script-load' %>
 
+    <%= preload_script 'browser-detect' %>
+
     <%= preload_script "locales/#{I18n.locale}" %>
     <%- if ExtraLocalesController.client_overrides_exist? %>
       <%= preload_script_url ExtraLocalesController.url('overrides') %>
diff --git a/config/application.rb b/config/application.rb
index cf820c39dc..bad76c94f6 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -135,6 +135,7 @@ module Discourse
       vendor.js
       admin.js
       preload-store.js
+      browser-detect.js
       browser-update.js
       break_string.js
       ember_jquery.js
diff --git a/plugins/discourse-internet-explorer/config/locales/server.en.yml b/plugins/discourse-internet-explorer/config/locales/server.en.yml
index 6e1292efeb..03100823db 100644
--- a/plugins/discourse-internet-explorer/config/locales/server.en.yml
+++ b/plugins/discourse-internet-explorer/config/locales/server.en.yml
@@ -1,4 +1,4 @@
 en:
   site_settings:
-    discourse_internet_explorer_enabled: "Internet Explorer support"
+    discourse_internet_explorer_enabled: "Enable temporary Internet Explorer support. This plugin is an effort to maintain compatibility with older browsers and will be completely removed in the near future."
     discourse_internet_explorer_deprecation_warning: "Show an Internet Explorer deprecation warning"
diff --git a/plugins/discourse-internet-explorer/public/js/ie.js b/plugins/discourse-internet-explorer/public/js/ie.js
index 6c998e402a..168731d5ff 100644
--- a/plugins/discourse-internet-explorer/public/js/ie.js
+++ b/plugins/discourse-internet-explorer/public/js/ie.js
@@ -972,6 +972,9 @@ if (!String.prototype.startsWith) {
 /* eslint-enable */
 
 // Polyfill Promise - used by popper.js
+if (!window.Promise) {
+  window.Promise = true;
+}
 window.addEventListener(
   "load",
   function() {
diff --git a/vendor/assets/javascripts/browser-update.js.erb b/vendor/assets/javascripts/browser-update.js.erb
index 7309e8fdcf..b32410b8e6 100644
--- a/vendor/assets/javascripts/browser-update.js.erb
+++ b/vendor/assets/javascripts/browser-update.js.erb
@@ -4,24 +4,25 @@
 (function() {
 
 var $buo = function() {
-
-  var badAndroid = false, ua = null;
-
   // Sometimes we have to resort to parsing the user agent string. :(
   if (navigator && navigator.userAgent) {
-    ua = navigator.userAgent;
+    var ua = navigator.userAgent;
+
+    // we don't ask Googlebot to update their browser
+    if (ua.indexOf('Googlebot') >= 0 || ua.indexOf('Mediapartners') >= 0 || ua.indexOf('AdsBot') >= 0) {
+      return;
+    }
   }
 
-  // sam: we require WeakMap, this allows us to easily feature detect IE10 that does not support it
-  // This also catches ancient android phones that never had that feature (2.2 and below)
-  if (window.WeakMap) {
+  if (!window.unsupportedBrowser) {
     return;
   }
 
-  // we don't ask Googlebot to update their browser
-  if (ua.indexOf('Googlebot') >= 0 || ua.indexOf('Mediapartners') >= 0 || ua.indexOf('AdsBot') >= 0) {
-    return;
-  }
+  var mainElement = document.getElementById("main");
+  var noscriptElements = document.getElementsByTagName("noscript");
+  // noscriptElements[0].innerHTML contains encoded HTML
+  var innerHTML = noscriptElements[0].childNodes[0].nodeValue;
+  mainElement.innerHTML = innerHTML;
 
   // retrieve localized browser upgrade text
   var t = <%= "'" + I18n.t('js.browser_update') + "'" %>;

From abdc10ae7062a26233b26ce1fff69ba9a175e909 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 7 Apr 2020 12:10:39 -0700
Subject: [PATCH 466/633] FIX: Labels for modal close and dismiss-error buttons

---
 .../javascripts/discourse/templates/components/d-modal.hbs    | 4 ++--
 config/locales/client.en.yml                                  | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
index 6c6106bbad..9df8af3a17 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -3,7 +3,7 @@
     <div class="modal-inner-container">
       <div class="modal-header">
         {{#if dismissable}}
-          {{d-button icon="times" action=(route-action "closeModal") class="btn btn-flat modal-close close" }}
+          {{d-button icon="times" action=(route-action "closeModal") class="btn btn-flat modal-close close" title="modal.close"}}
         {{/if}}
 
         {{#if panels}}
@@ -33,7 +33,7 @@
 
       {{#each errors as |error|}}
         <div class="alert alert-error">
-          <button class="close" data-dismiss="alert">×</button>
+          <button class="close" data-dismiss="alert" aria-label={{i18n "modal.dismiss_error"}}>×</button>
           {{error}}
         </div>
       {{/each}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7e28c6620d..9345ba5272 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1381,6 +1381,9 @@ en:
         back: "Go Back"
         again: "Try Again"
         fixed: "Load Page"
+    modal:
+      close: "close"
+      dismiss_error: "Dismiss error"
     close: "Close"
     assets_changed_confirm: "This site was just updated. Refresh now for the latest version?"
     logout: "You were logged out."

From 3b7ba8ec9987e740d08413a26518af6167eb23ae Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 7 Apr 2020 18:32:18 -0700
Subject: [PATCH 467/633] FIX: WCAG-AA compliant topic list heatmap colors

Color #ec7213: 3.0, Bold - AA Large Pass
Color #b06318: 4.50, Normal - AA Pass
Color #93704a: 4.51, Normal - AA Pass

Used the Chrome Inspector color picker curves to preserve the hue and make minimally invasive changes to the coloring.
---
 app/assets/stylesheets/common/base/_topic-list.scss | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 2ac61a4487..4250650446 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -212,15 +212,16 @@
 
 .heatmap-high,
 .heatmap-high a {
-  color: #fe7a15 !important;
+  color: #ec7213 !important;
+  font-weight: bold;
 }
 .heatmap-med,
 .heatmap-med a {
-  color: #cf7721 !important;
+  color: #b06318 !important;
 }
 .heatmap-low,
 .heatmap-low a {
-  color: #9b764f !important;
+  color: #93704a !important;
 }
 
 .loading .topic-list {

From c3593dd9e2125763832489b05715e42049e5e86a Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 8 Apr 2020 16:13:02 -0400
Subject: [PATCH 468/633] DEV: Replace jquery.putCursorAtEnd (#9390)

---
 .../discourse/components/composer-editor.js   |  7 ++--
 .../discourse/components/composer-title.js    | 12 ++----
 .../components/composer-user-selector.js      |  3 +-
 .../javascripts/discourse/lib/utilities.js    |  6 +++
 app/assets/javascripts/vendor.js              |  1 -
 .../javascripts/jquery.putcursoratend.js      | 38 -------------------
 6 files changed, 16 insertions(+), 51 deletions(-)
 delete mode 100644 vendor/assets/javascripts/jquery.putcursoratend.js

diff --git a/app/assets/javascripts/discourse/components/composer-editor.js b/app/assets/javascripts/discourse/components/composer-editor.js
index 4ff3b961b1..b14b0af74a 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/components/composer-editor.js
@@ -30,7 +30,8 @@ import {
   clipboardData,
   safariHacksDisabled,
   caretPosition,
-  inCodeBlock
+  inCodeBlock,
+  putCursorAtEnd
 } from "discourse/lib/utilities";
 import {
   validateUploadedFiles,
@@ -123,7 +124,7 @@ export default Component.extend({
   @observes("focusTarget")
   setFocus() {
     if (this.focusTarget === "editor") {
-      $(this.element.querySelector("textarea")).putCursorAtEnd();
+      putCursorAtEnd(this.element.querySelector("textarea"));
     }
   },
 
@@ -213,7 +214,7 @@ export default Component.extend({
       !this.get("composer.canEditTitle") &&
       (!this.capabilities.isIOS || safariHacksDisabled())
     ) {
-      $(this.element.querySelector(".d-editor-input")).putCursorAtEnd();
+      putCursorAtEnd(this.element.querySelector(".d-editor-input"));
     }
 
     this._bindUploadTarget();
diff --git a/app/assets/javascripts/discourse/components/composer-title.js b/app/assets/javascripts/discourse/components/composer-title.js
index 9ba4f501bf..e036beef1a 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js
+++ b/app/assets/javascripts/discourse/components/composer-title.js
@@ -5,9 +5,9 @@ import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { load } from "pretty-text/oneboxer";
 import { lookupCache } from "pretty-text/oneboxer-cache";
 import { ajax } from "discourse/lib/ajax";
-import afterTransition from "discourse/lib/after-transition";
 import ENV from "discourse-common/config/environment";
 import EmberObject from "@ember/object";
+import { putCursorAtEnd } from "discourse/lib/utilities";
 
 export default Component.extend({
   classNames: ["title-input"],
@@ -17,11 +17,7 @@ export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
     if (this.focusTarget === "title") {
-      const $input = $(this.element.querySelector("input"));
-
-      afterTransition($(this.element).closest("#reply-control"), () => {
-        $input.putCursorAtEnd();
-      });
+      putCursorAtEnd(this.element.querySelector("input"));
     }
 
     if (this.get("composer.titleLength") > 0) {
@@ -136,14 +132,14 @@ export default Component.extend({
           .finally(() => {
             this.set("composer.loading", false);
             schedule("afterRender", () => {
-              $(this.element.querySelector("input")).putCursorAtEnd();
+              putCursorAtEnd(this.element.querySelector("input"));
             });
           });
       } else {
         this._updatePost(loadOnebox);
         this.set("composer.loading", false);
         schedule("afterRender", () => {
-          $(this.element.querySelector("input")).putCursorAtEnd();
+          putCursorAtEnd(this.element.querySelector("input"));
         });
       }
     }
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js b/app/assets/javascripts/discourse/components/composer-user-selector.js
index 913a9356f7..3418697207 100644
--- a/app/assets/javascripts/discourse/components/composer-user-selector.js
+++ b/app/assets/javascripts/discourse/components/composer-user-selector.js
@@ -1,6 +1,7 @@
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { putCursorAtEnd } from "discourse/lib/utilities";
 
 export default Component.extend({
   showSelector: true,
@@ -11,7 +12,7 @@ export default Component.extend({
     this._super(...arguments);
 
     if (this.focusTarget === "usernames") {
-      $(this.element.querySelector("input")).putCursorAtEnd();
+      putCursorAtEnd(this.element.querySelector("input"));
     }
   },
 
diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index 03ef200016..c753f4b0cf 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -444,5 +444,11 @@ export function inCodeBlock(text, pos) {
   return result;
 }
 
+export function putCursorAtEnd(element) {
+  element.focus();
+  const len = element.value.length;
+  element.setSelectionRange(len, len);
+}
+
 // This prevents a mini racer crash
 export default {};
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 3b36c27ea1..adc682eba5 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -17,7 +17,6 @@
 //= require jquery.cookie.js
 //= require jquery.fileupload.js
 //= require jquery.iframe-transport.js
-//= require jquery.putcursoratend.js
 //= require jquery.tagsinput.js
 //= require jquery.sortable.js
 //= require lodash.js
diff --git a/vendor/assets/javascripts/jquery.putcursoratend.js b/vendor/assets/javascripts/jquery.putcursoratend.js
deleted file mode 100644
index d957d03f74..0000000000
--- a/vendor/assets/javascripts/jquery.putcursoratend.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// jQuery plugin: PutCursorAtEnd 1.0
-// http://plugins.jquery.com/project/PutCursorAtEnd
-// by teedyay
-//
-// Puts the cursor at the end of a textbox/ textarea
-
-// codesnippet: 691e18b1-f4f9-41b4-8fe8-bc8ee51b48d4
-(function($)
-{
-    jQuery.fn.putCursorAtEnd = function()
-    {
-    return this.each(function()
-    {
-        $(this).focus()
-
-        // If this function exists...
-        if (this.setSelectionRange)
-        {
-        // ... then use it
-        // (Doesn't work in IE)
-
-        // Double the length because Opera is inconsistent about whether a carriage return is one character or two. Sigh.
-        var len = $(this).val().length * 2;
-        this.setSelectionRange(len, len);
-        }
-        else
-        {
-        // ... otherwise replace the contents with itself
-        // (Doesn't work in Google Chrome)
-        $(this).val($(this).val());
-        }
-
-        // Scroll to the bottom, in case we're in a tall textarea
-        // (Necessary for Firefox and Google Chrome)
-        this.scrollTop = 999999;
-    });
-    };
-})(jQuery);
\ No newline at end of file

From 14467757df40d1b80808cd6d41d60a92683599c8 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 8 Apr 2020 17:29:13 -0400
Subject: [PATCH 469/633] UX: Adjust noscript footer nav

---
 .../stylesheets/common/base/crawler_layout.scss  | 16 ++++++++++++++--
 app/views/layouts/application.html.erb           |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index 61c12d2dbe..8f42f9ae0b 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -32,11 +32,23 @@ body.crawler {
   }
 
   footer {
-    margin-top: 3em;
-    border-top: 1px solid $primary-low-mid;
+    margin-top: 4em;
   }
 }
 
+.noscript-footer-nav {
+  clear: both;
+  margin-top: 4em;
+  a {
+    margin-right: 0.25em;
+    white-space: nowrap;
+  }
+}
+
+#noscript-footer {
+  padding: 0 10px;
+}
+
 .crawler-topic-title {
   margin-top: 0.5em;
 }
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 22a29e19e4..f1984038e7 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -73,7 +73,7 @@
         <!-- preload-content: -->
         <%= yield %>
         <!-- :preload-content -->
-        <footer>
+        <footer class="noscript-footer-nav">
           <nav itemscope itemtype='http://schema.org/SiteNavigationElement'>
             <a href='<%= path "/" %>'><%= t 'home_title' %></a>
             <%= link_to t('js.filters.categories.title'), path("/categories") %>
@@ -85,7 +85,7 @@
       </div>
 
       <footer id='noscript-footer'>
-        <p style="text-align:center;"><%= t 'powered_by_html' %></p>
+        <p><%= t 'powered_by_html' %></p>
       </footer>
     </noscript>
 

From 138d4aebde37f2f4cd2bb3efe8828f38680098da Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 8 Apr 2020 11:34:35 -0700
Subject: [PATCH 470/633] FEATURE: Webhooks and Event for user being granted a
 badge

Adding a webhook for badge revocation is left for future work as it's relatively rare.
---
 app/models/web_hook_event_type.rb          |  1 +
 app/services/badge_granter.rb              |  6 +++++-
 config/initializers/012-web_hook_events.rb | 10 +++++++++
 config/locales/client.en.yml               |  3 +++
 db/fixtures/007_web_hook_event_types.rb    |  5 +++++
 spec/fabricators/web_hook_fabricator.rb    |  8 +++++++
 spec/models/web_hook_spec.rb               | 25 ++++++++++++++++++++++
 7 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index d3822d1ede..952c1c2062 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -13,6 +13,7 @@ class WebHookEventType < ActiveRecord::Base
   NOTIFICATION = 10
   SOLVED = 11
   ASSIGN = 12
+  USER_BADGE = 13
 
   has_and_belongs_to_many :web_hooks
 
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 2249b33692..c6dfd82170 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -410,7 +410,7 @@ class BadgeGranter
   end
 
   def self.send_notification(user_id, username, locale, badge)
-    I18n.with_locale(notification_locale(locale)) do
+    notification = I18n.with_locale(notification_locale(locale)) do
       Notification.create!(
         user_id: user_id,
         notification_type: Notification.types[:granted_badge],
@@ -423,6 +423,10 @@ class BadgeGranter
         }.to_json
       )
     end
+
+    DiscourseEvent.trigger(:user_badge_granted, badge, user_id)
+
+    notification
   end
 
 end
diff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb
index 6ce6501ff3..727119a627 100644
--- a/config/initializers/012-web_hook_events.rb
+++ b/config/initializers/012-web_hook_events.rb
@@ -74,6 +74,16 @@ end
   end
 end
 
+%i(
+  user_badge_granted
+).each do |event|
+  # user_badge_revoked
+  DiscourseEvent.on(event) do |badge, user_id|
+    ub = UserBadge.find_by(badge: badge, user_id: user_id)
+    WebHook.enqueue_object_hooks(:user_badge, ub, event, UserBadgeSerializer)
+  end
+end
+
 DiscourseEvent.on(:reviewable_created) do |reviewable|
   WebHook.enqueue_object_hooks(:reviewable, reviewable, :reviewable_created, reviewable.serializer)
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9345ba5272..f395e62717 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3562,6 +3562,9 @@ en:
         notification_event:
           name: "Notification Event"
           details: "When a user receives a notification in their feed."
+        user_badge_event:
+          name: "Badge Grant Event"
+          details: "When a user receives a badge."
         delivery_status:
           title: "Delivery Status"
           inactive: "Inactive"
diff --git a/db/fixtures/007_web_hook_event_types.rb b/db/fixtures/007_web_hook_event_types.rb
index 5cbcd3edc2..8bf8e93805 100644
--- a/db/fixtures/007_web_hook_event_types.rb
+++ b/db/fixtures/007_web_hook_event_types.rb
@@ -59,3 +59,8 @@ WebHookEventType.seed do |b|
   b.id = WebHookEventType::ASSIGN
   b.name = "assign"
 end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::USER_BADGE
+  b.name = "user_badge"
+end
diff --git a/spec/fabricators/web_hook_fabricator.rb b/spec/fabricators/web_hook_fabricator.rb
index 6d03c7b47f..4647251080 100644
--- a/spec/fabricators/web_hook_fabricator.rb
+++ b/spec/fabricators/web_hook_fabricator.rb
@@ -102,3 +102,11 @@ Fabricator(:notification_web_hook, from: :web_hook) do
     web_hook.web_hook_event_types = [transients[:notification_hook]]
   end
 end
+
+Fabricator(:user_badge_web_hook, from: :web_hook) do
+  transient user_badge_hook: WebHookEventType.find_by(name: 'user_badge')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:user_badge_hook]]
+  end
+end
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 47b4c20bb7..586458a614 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -486,5 +486,30 @@ describe WebHook do
       payload = JSON.parse(job_args["payload"])
       expect(payload["id"]).to eq(reviewable.id)
     end
+
+    it 'should enqueue the right hooks for badge grants' do
+      Fabricate(:user_badge_web_hook)
+      badge = Fabricate(:badge)
+      badge.multiple_grant = true
+      badge.show_posts = true
+      badge.save
+
+      now = Time.now
+      freeze_time now
+
+      BadgeGranter.grant(badge, user, granted_by: admin, post_id: post.id)
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      expect(job_args["event_name"]).to eq("user_badge_granted")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["badge_id"]).to eq(badge.id)
+      expect(payload["user_id"]).to eq(user.id)
+      expect(payload["granted_by_id"]).to eq(admin.id)
+      # be_within required because rounding occurs
+      expect(Time.zone.parse(payload["granted_at"]).to_f).to be_within(0.001).of(now.to_f)
+      expect(payload["post_id"]).to eq(post.id)
+
+      # Future work: revoke badge hook
+    end
   end
 end

From 452d0c868f30a8d4bcfcb6e254e0cb94d7325ee1 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 9 Apr 2020 09:42:03 +1000
Subject: [PATCH 471/633] FIX: Ensure first post is loaded before trying to
 bookmark topic (#9382)

Load first post if not loaded when trying to bookmark topic

* if the first post was not loaded we could not bookmark it because
  now we call the toggleBookmarkReminder function on an actual post
  to open the modal window
* add a firstPost function to the topic model to get the first post
  from the stream if it is loaded and if not do a GET request to load
  it
* use the firstPost promise when bookmarking topic
---
 .../discourse/controllers/topic.js            |  19 +--
 .../javascripts/discourse/models/topic.js     | 137 ++++++++++--------
 2 files changed, 80 insertions(+), 76 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/controllers/topic.js
index c273591100..49da4ed9f4 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js
+++ b/app/assets/javascripts/discourse/controllers/topic.js
@@ -453,22 +453,9 @@ export default Controller.extend(bufferedProperty("model"), {
     },
 
     editFirstPost() {
-      const postStream = this.get("model.postStream");
-      let firstPost = postStream.get("posts.firstObject");
-
-      if (firstPost.get("post_number") !== 1) {
-        const postId = postStream.findPostIdForPostNumber(1);
-        // try loading from identity map first
-        firstPost = postStream.findLoadedPost(postId);
-        if (firstPost === undefined) {
-          return this.get("model.postStream")
-            .loadPost(postId)
-            .then(post => {
-              this.send("editPost", post);
-            });
-        }
-      }
-      this.send("editPost", firstPost);
+      this.model
+        .firstPost()
+        .then(firstPost => this.send("editPost", firstPost));
     },
 
     // Post related methods
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 41734e6e8f..5da7217819 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -1,4 +1,4 @@
-import EmberObject, { get } from "@ember/object";
+import EmberObject from "@ember/object";
 import { not, notEmpty, equal, and, or } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import { flushMap } from "discourse/models/store";
@@ -407,82 +407,99 @@ const Topic = RestModel.extend({
     }
   },
 
+  firstPost() {
+    const postStream = this.postStream;
+    let firstPost = postStream.get("posts.firstObject");
+
+    if (firstPost.post_number === 1) {
+      return Promise.resolve(firstPost);
+    }
+
+    const postId = postStream.findPostIdForPostNumber(1);
+
+    // try loading from identity map first
+    firstPost = postStream.findLoadedPost(postId);
+    if (firstPost) {
+      return Promise.resolve(firstPost);
+    }
+
+    return this.postStream.loadPost(postId);
+  },
+
   toggleBookmark() {
     if (this.bookmarking) {
       return Promise.resolve();
     }
     this.set("bookmarking", true);
-
-    const stream = this.postStream;
-    const posts = get(stream, "posts");
-    const firstPost =
-      posts && posts[0] && posts[0].get("post_number") === 1 && posts[0];
     const bookmark = !this.bookmarked;
+    let posts = this.postStream.posts;
 
-    const toggleBookmarkOnServer = () => {
-      if (bookmark) {
-        if (this.siteSettings.enable_bookmarks_with_reminders) {
-          return firstPost.toggleBookmarkWithReminder().then(() => {
-            this.set("bookmarking", false);
-            return this.afterTopicBookmarked(firstPost);
-          });
+    return this.firstPost().then(firstPost => {
+      const toggleBookmarkOnServer = () => {
+        if (bookmark) {
+          if (this.siteSettings.enable_bookmarks_with_reminders) {
+            return firstPost.toggleBookmarkWithReminder().then(() => {
+              this.set("bookmarking", false);
+              return this.afterTopicBookmarked(firstPost);
+            });
+          } else {
+            return ajax(`/t/${this.id}/bookmark`, { type: "PUT" })
+              .then(() => {
+                this.toggleProperty("bookmarked");
+                return this.afterTopicBookmarked(firstPost);
+              })
+              .catch(popupAjaxError)
+              .finally(() => this.set("bookmarking", false));
+          }
         } else {
-          return ajax(`/t/${this.id}/bookmark`, { type: "PUT" })
+          return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
             .then(() => {
               this.toggleProperty("bookmarked");
-              return this.afterTopicBookmarked(firstPost);
+              if (posts) {
+                const updated = [];
+                posts.forEach(post => {
+                  if (post.bookmarked) {
+                    post.set("bookmarked", false);
+                    updated.push(post.id);
+                  }
+                  if (
+                    this.siteSettings.enable_bookmarks_with_reminders &&
+                    post.bookmarked_with_reminder
+                  ) {
+                    post.set("bookmarked_with_reminder", false);
+                    updated.push(post.id);
+                  }
+                });
+                return updated;
+              }
             })
             .catch(popupAjaxError)
             .finally(() => this.set("bookmarking", false));
         }
-      } else {
-        return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
-          .then(() => {
-            this.toggleProperty("bookmarked");
-            if (posts) {
-              const updated = [];
-              posts.forEach(post => {
-                if (post.get("bookmarked")) {
-                  post.set("bookmarked", false);
-                  updated.push(post.id);
-                }
-                if (
-                  this.siteSettings.enable_bookmarks_with_reminders &&
-                  post.get("bookmarked_with_reminder")
-                ) {
-                  post.set("bookmarked_with_reminder", false);
-                  updated.push(post.id);
-                }
-              });
-              return updated;
-            }
-          })
-          .catch(popupAjaxError)
-          .finally(() => this.set("bookmarking", false));
-      }
-    };
+      };
 
-    const unbookmarkedPosts = [];
-    if (!bookmark && posts) {
-      posts.forEach(
-        post =>
-          (post.get("bookmarked") || post.get("bookmarked_with_reminder")) &&
-          unbookmarkedPosts.push(post)
-      );
-    }
-
-    return new Promise(resolve => {
-      if (unbookmarkedPosts.length > 1) {
-        bootbox.confirm(
-          I18n.t("bookmarks.confirm_clear"),
-          I18n.t("no_value"),
-          I18n.t("yes_value"),
-          confirmed =>
-            confirmed ? toggleBookmarkOnServer().then(resolve) : resolve()
+      const unbookmarkedPosts = [];
+      if (!bookmark && posts) {
+        posts.forEach(
+          post =>
+            (post.bookmarked || post.bookmarked_with_reminder) &&
+            unbookmarkedPosts.push(post)
         );
-      } else {
-        toggleBookmarkOnServer().then(resolve);
       }
+
+      return new Promise(resolve => {
+        if (unbookmarkedPosts.length > 1) {
+          bootbox.confirm(
+            I18n.t("bookmarks.confirm_clear"),
+            I18n.t("no_value"),
+            I18n.t("yes_value"),
+            confirmed =>
+              confirmed ? toggleBookmarkOnServer().then(resolve) : resolve()
+          );
+        } else {
+          toggleBookmarkOnServer().then(resolve);
+        }
+      });
     });
   },
 

From f062ebf27473afe1adc26256650fa95d71bcc946 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 10:05:22 +1000
Subject: [PATCH 472/633] DEV: reduce noise in logs regarding migration

If a migration performs no changes it should not output stuff.

Previously we would output information about seeds which was very noisy.

On multisite this was particularly bad
---
 lib/tasks/db.rake | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index df830da6ac..14b2eb4e20 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -75,13 +75,11 @@ task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
     Rake::Task['db:_dump'].invoke
   end
 
+  SeedFu.quiet = true
   SeedFu.seed(DiscoursePluginRegistry.seed_paths)
 
   if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
-    puts
-    print "Optimizing site icons... "
     SiteIconManager.ensure_optimized!
-    puts "Done"
   end
 
   if !Discourse.is_parallel_test? && MultisiteTestHelpers.load_multisite?

From befaf39aca3af22756a988134245bf1a88a7481d Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 9 Apr 2020 10:30:26 +1000
Subject: [PATCH 473/633] DEV: Refactor and test plugin addKeyboardShortcut
 (#9381)

Refactor plugin-api `addKeyboardShortcut` to point to `KeyboardShortcuts`.
* Do not add shortcuts to the default object directly.
* Create an addShortcut function in keyboard-shortcuts to add shortcuts safely and call to bindKey to be able to use opts.
* Refactor controllers/bookmark.js to use new addShortcut func and emove unnecessary addBindings.
* No longer export keyboard shortcut bindings, rename to DEFAULT_BINDINGS and remove export, these do not need to be accessed by anything else.
---
 .../discourse/controllers/bookmark.js         | 17 +++---
 .../discourse/lib/keyboard-shortcuts.js       | 46 +++++++++-------
 .../javascripts/discourse/lib/plugin-api.js   | 12 ++---
 .../plugin-keyboard-shortcut-test.js          | 54 +++++++++++++++++++
 .../components/keyboard-shortcuts-test.js     |  6 +--
 5 files changed, 99 insertions(+), 36 deletions(-)
 create mode 100644 test/javascripts/acceptance/plugin-keyboard-shortcut-test.js

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 140b6f8597..22218715b3 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -113,20 +113,23 @@ export default Controller.extend(ModalFunctionality, {
 
   bindKeyboardShortcuts() {
     KeyboardShortcuts.pause(GLOBAL_SHORTCUTS_TO_PAUSE);
-    KeyboardShortcuts.addBindings(BOOKMARK_BINDINGS, binding => {
-      if (binding.args) {
-        return this.send(binding.handler, ...binding.args);
-      }
-      this.send(binding.handler);
+    Object.keys(BOOKMARK_BINDINGS).forEach(shortcut => {
+      KeyboardShortcuts.addShortcut(shortcut, () => {
+        let binding = BOOKMARK_BINDINGS[shortcut];
+        if (binding.args) {
+          return this.send(binding.handler, ...binding.args);
+        }
+        this.send(binding.handler);
+      });
     });
   },
 
   unbindKeyboardShortcuts() {
-    KeyboardShortcuts.unbind(BOOKMARK_BINDINGS, this.mouseTrap);
+    KeyboardShortcuts.unbind(BOOKMARK_BINDINGS);
   },
 
   restoreGlobalShortcuts() {
-    KeyboardShortcuts.unpause(...GLOBAL_SHORTCUTS_TO_PAUSE);
+    KeyboardShortcuts.unpause(GLOBAL_SHORTCUTS_TO_PAUSE);
   },
 
   // we always want to save the bookmark unless the user specifically
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 37fe28618c..db3400cabd 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -6,7 +6,7 @@ import { ajax } from "discourse/lib/ajax";
 import { throttle } from "@ember/runloop";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 
-export let bindings = {
+const DEFAULT_BINDINGS = {
   "!": { postAction: "showFlags" },
   "#": { handler: "goToPost", anonymous: true },
   "/": { handler: "toggleSearch", anonymous: true },
@@ -96,18 +96,21 @@ export default {
 
     // Disable the shortcut if private messages are disabled
     if (!siteSettings.enable_personal_messages) {
-      delete bindings["g m"];
+      delete DEFAULT_BINDINGS["g m"];
     }
   },
 
   bindEvents() {
-    Object.keys(bindings).forEach(key => {
+    Object.keys(DEFAULT_BINDINGS).forEach(key => {
       this.bindKey(key);
     });
   },
 
-  bindKey(key) {
-    const binding = bindings[key];
+  bindKey(key, binding = null) {
+    if (!binding) {
+      binding = DEFAULT_BINDINGS[key];
+    }
+
     if (!binding.anonymous && !this.currentUser) {
       return;
     }
@@ -135,23 +138,28 @@ export default {
   },
 
   // restore global shortcuts that you have paused
-  unpause(...combinations) {
+  unpause(combinations) {
     combinations.forEach(combo => this.bindKey(combo));
   },
 
-  // add bindings to the key trapper, if none is specified then
-  // the shortcuts will be bound globally.
-  addBindings(newBindings, callback) {
-    Object.keys(newBindings).forEach(key => {
-      let binding = newBindings[key];
-      this.keyTrapper.bind(key, event => {
-        // usually the caller that is adding the binding
-        // will want to decide what to do with it when the
-        // event is fired
-        callback(binding, event);
-        event.stopPropagation();
-      });
-    });
+  /**
+   * addShortcut(shortcut, callback, opts)
+   *
+   * Used to bind a keyboard shortcut, which will fire the provided
+   * callback when pressed. Valid options are:
+   *
+   * - global     - makes the shortcut work anywhere, including when an input is focused
+   * - anonymous  - makes the shortcut work even if a user is not logged in
+   * - path       - a specific path to limit the shortcut to .e.g /latest
+   * - postAction - binds the shortcut to fire the specified post action when a
+   *                post is selected
+   **/
+  addShortcut(shortcut, callback, opts = {}) {
+    // we trim but leave whitespace between characters, as shortcuts
+    // like `z z` are valid for Mousetrap
+    shortcut = shortcut.trim();
+    let newBinding = Object.assign({ handler: callback }, opts);
+    this.bindKey(shortcut, newBinding);
   },
 
   // unbinds all the shortcuts in a key binding object e.g.
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js b/app/assets/javascripts/discourse/lib/plugin-api.js
index b0594f7b8d..6df49e453d 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js
@@ -1,4 +1,3 @@
-/*global Mousetrap:true*/
 import deprecated from "discourse-common/lib/deprecated";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { addDecorator } from "discourse/widgets/post-cooked";
@@ -52,7 +51,7 @@ import { addCategorySortCriteria } from "discourse/components/edit-category-sett
 import { queryRegistry } from "discourse/widgets/widget";
 import Composer from "discourse/models/composer";
 import { on } from "@ember/object/evented";
-import KeyboardShortcuts, { bindings } from "discourse/lib/keyboard-shortcuts";
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
 const PLUGIN_API_VERSION = "0.8.40";
@@ -230,12 +229,11 @@ class PluginApi {
     }
   }
 
+  /**
+   * See KeyboardShortcuts.addShortcut documentation.
+   **/
   addKeyboardShortcut(shortcut, callback, opts = {}) {
-    shortcut = shortcut.trim().replace(/\s/g, ""); // Strip all whitespace
-    let newBinding = {};
-    newBinding[shortcut] = Object.assign({ handler: callback }, opts);
-    Object.assign(bindings, newBinding);
-    KeyboardShortcuts.bindEvents(Mousetrap, this.container);
+    KeyboardShortcuts.addShortcut(shortcut, callback, opts);
   }
 
   /**
diff --git a/test/javascripts/acceptance/plugin-keyboard-shortcut-test.js b/test/javascripts/acceptance/plugin-keyboard-shortcut-test.js
new file mode 100644
index 0000000000..3541bb26b0
--- /dev/null
+++ b/test/javascripts/acceptance/plugin-keyboard-shortcut-test.js
@@ -0,0 +1,54 @@
+import { acceptance } from "helpers/qunit-helpers";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
+import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";
+
+function initKeyboardShortcuts() {
+  // this is here because initializers/keyboard-shortcuts is not
+  // firing for this acceptance test, and it needs to be fired before
+  // more keyboard shortcuts can be added
+  KeyboardShortcutInitializer.initialize(Discourse.__container__);
+}
+
+acceptance("Plugin Keyboard Shortcuts - Logged In", {
+  loggedIn: true
+});
+
+test("a plugin can add a keyboard shortcut", async assert => {
+  initKeyboardShortcuts();
+  withPluginApi("0.8.38", api => {
+    api.addKeyboardShortcut("]", () => {
+      $("#qunit-fixture").html(
+        "<div id='added-element'>Test adding plugin shortcut</div>"
+      );
+    });
+  });
+
+  await visit("/t/this-is-a-test-topic/9");
+  await keyEvent(document, "keypress", "]".charCodeAt(0));
+  assert.equal(
+    $("#added-element").length,
+    1,
+    "the keyboard shortcut callback fires successfully"
+  );
+});
+
+acceptance("Plugin Keyboard Shortcuts - Anonymous", {
+  loggedIn: false
+});
+
+test("a plugin can add a keyboard shortcut with an option", async assert => {
+  var spy = sandbox.spy(KeyboardShortcuts, "_bindToPath");
+  initKeyboardShortcuts();
+  withPluginApi("0.8.38", api => {
+    api.addKeyboardShortcut("]", () => {}, {
+      anonymous: true,
+      path: "test-path"
+    });
+  });
+
+  assert.ok(
+    spy.calledWith("test-path", "]"),
+    "bindToPath is called due to options provided"
+  );
+});
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js b/test/javascripts/components/keyboard-shortcuts-test.js
index d7f60a85c0..025bec5ecf 100644
--- a/test/javascripts/components/keyboard-shortcuts-test.js
+++ b/test/javascripts/components/keyboard-shortcuts-test.js
@@ -74,7 +74,7 @@ Object.keys(pathBindings).forEach(path => {
   var testName = binding + " goes to " + path;
 
   test(testName, function(assert) {
-    KeyboardShortcuts.bindEvents(testMouseTrap, Discourse.__container__);
+    KeyboardShortcuts.bindEvents();
     testMouseTrap.trigger(binding);
 
     assert.ok(DiscourseURL.routeTo.calledWith(path));
@@ -89,7 +89,7 @@ Object.keys(clickBindings).forEach(selector => {
   var testName = binding + " clicks on " + selector;
 
   test(testName, function(assert) {
-    KeyboardShortcuts.bindEvents(testMouseTrap, Discourse.__container__);
+    KeyboardShortcuts.bindEvents();
     $(selector).on("click", function() {
       assert.ok(true, selector + " was clicked");
     });
@@ -109,7 +109,7 @@ Object.keys(functionBindings).forEach(func => {
     sandbox.stub(KeyboardShortcuts, func, function() {
       assert.ok(true, func + " is called when " + binding + " is triggered");
     });
-    KeyboardShortcuts.bindEvents(testMouseTrap, Discourse.__container__);
+    KeyboardShortcuts.bindEvents();
 
     testMouseTrap.trigger(binding);
   });

From 708dd97dfd0380c703678a0ee070dc62880e57f1 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 11:58:02 +1000
Subject: [PATCH 474/633] PERF: speed up migrations on multisite

Previously we were migrating multisites serially, this is extremely slow
especially when 200 dbs are involved.

The new implementation defaults to running 20 migrations concurrently, leading
to a 20x speedup.

We also amended it so errors are printed out last, something that makes
debugging failures easier.

This is code specific to Discourse cause we integrate SeedFu with our
migrations and can not include this in the multisite gem.
---
 lib/tasks/db.rake | 65 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 14b2eb4e20..027483f39d 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -66,6 +66,71 @@ task 'db:rollback' => ['environment', 'set_locale'] do |_, args|
   Rake::Task['db:_dump'].invoke
 end
 
+# our optimized version of multisite migrate, we have many sites and we have seeds
+# this ensures we can run migrations concurrently to save huge amounts of time
+Rake::Task['multisite:migrate'].clear
+
+task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |_, args|
+  if ENV["RAILS_ENV"] != "production"
+    raise "Multisite migrate is only supported in production"
+  end
+
+  concurrency = (ENV['MIGRATE_CONCURRENCY'].presence || "20").to_i
+
+  puts "Multisite migrator is running using #{concurrency} threads"
+  puts
+
+  queue = Queue.new
+  exceptions = Queue.new
+
+  RailsMultisite::ConnectionManagement.each_connection do |db|
+    queue << db
+  end
+
+  concurrency.times { queue << :done }
+
+  SeedFu.quiet = true
+
+  (1..concurrency).map do
+    Thread.new {
+      while true
+        db = queue.pop
+        break if db == :done
+
+        RailsMultisite::ConnectionManagement.with_connection(db) do
+          begin
+            puts "Migrating #{db}"
+            ActiveRecord::Tasks::DatabaseTasks.migrate
+            SeedFu.seed(DiscoursePluginRegistry.seed_paths)
+            if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
+              SiteIconManager.ensure_optimized!
+            end
+          rescue => e
+            exceptions << [db, e]
+          end
+        end
+      end
+    }
+  end.each(&:join)
+
+  if exceptions.length > 0
+    STDERR.puts
+    STDERR.puts "-" * 80
+    STDERR.puts "#{exceptions.length} migrations failed!"
+    while !exceptions.empty?
+      db, e = exceptions.pop
+      STDERR.puts
+      STDERR.puts "Failed to migrate #{db}"
+      STDERR.puts e.inspect
+      STDERR.puts e.backtrace
+      STDERR.puts
+    end
+    exit 1
+  end
+
+  Rake::Task['db:_dump'].invoke
+end
+
 # we need to run seed_fu every time we run rake db:migrate
 task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
 

From a5b582f686c0a8427aad3f6caf9f3a8105e66ee9 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 12:50:14 +1000
Subject: [PATCH 475/633] DEV: demux stdout when running multisite migrate

This avoids mixing up output in such a way that we can not tell which
site ran which migrations

Avoids threads all fighting for output
---
 lib/tasks/db.rake | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 027483f39d..6b1a8b657b 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -70,6 +70,25 @@ end
 # this ensures we can run migrations concurrently to save huge amounts of time
 Rake::Task['multisite:migrate'].clear
 
+class StdOutDemux
+  def initialize(stdout)
+    @stdout = stdout
+    @data = {}
+  end
+
+  def write(data)
+    (@data[Thread.current] ||= +"") << data
+  end
+
+  def finish_chunk
+    data = @data[Thread.current]
+    if data
+      @stdout.write(data)
+      @data.delete Thread.current
+    end
+  end
+end
+
 task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |_, args|
   if ENV["RAILS_ENV"] != "production"
     raise "Multisite migrate is only supported in production"
@@ -83,6 +102,9 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |
   queue = Queue.new
   exceptions = Queue.new
 
+  old_stdout = $stdout
+  $stdout = StdOutDemux.new($stdout)
+
   RailsMultisite::ConnectionManagement.each_connection do |db|
     queue << db
   end
@@ -107,12 +129,21 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |
             end
           rescue => e
             exceptions << [db, e]
+          ensure
+            begin
+              $stdout.finish_chunk
+            rescue => ex
+              STDERR.puts ex.inspect
+              STDERR.puts ex.backtrace
+            end
           end
         end
       end
     }
   end.each(&:join)
 
+  $stdout = old_stdout
+
   if exceptions.length > 0
     STDERR.puts
     STDERR.puts "-" * 80

From 6b192d29fa095e91cb40b71e76dfc811f4aa205c Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 13:41:03 +1000
Subject: [PATCH 476/633] DEV: only enable SafeMigrate in development and test

SafeMigrate outputs text when we detect attempts to unsafely drop tables
and columns

It is unfortunately not thread safe

This is not needed in production as we would have already caught it by then
in our test suite.
---
 lib/freedom_patches/safe_migrations.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/freedom_patches/safe_migrations.rb b/lib/freedom_patches/safe_migrations.rb
index 718ffffb89..161d9fa8a7 100644
--- a/lib/freedom_patches/safe_migrations.rb
+++ b/lib/freedom_patches/safe_migrations.rb
@@ -2,4 +2,11 @@
 
 require_dependency 'migration/safe_migrate'
 
-Migration::SafeMigrate.patch_active_record!
+# We do not run this in production cause it is intrusive and has
+# potential to break stuff, it also breaks under concurrent use
+# which rake:multisite_migrate uses
+#
+# The protection is only needed in Dev and Test
+if ENV['RAILS_ENV'] != "production"
+  Migration::SafeMigrate.patch_active_record!
+end

From de5f2d33087c8e9c12f83d573015d275098bd68f Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 13:54:18 +1000
Subject: [PATCH 477/633] DEV: avoid loading module in production

---
 lib/freedom_patches/safe_migrations.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/freedom_patches/safe_migrations.rb b/lib/freedom_patches/safe_migrations.rb
index 161d9fa8a7..cdf989fdd5 100644
--- a/lib/freedom_patches/safe_migrations.rb
+++ b/lib/freedom_patches/safe_migrations.rb
@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require_dependency 'migration/safe_migrate'
-
 # We do not run this in production cause it is intrusive and has
 # potential to break stuff, it also breaks under concurrent use
 # which rake:multisite_migrate uses
 #
 # The protection is only needed in Dev and Test
 if ENV['RAILS_ENV'] != "production"
+  require_dependency 'migration/safe_migrate'
   Migration::SafeMigrate.patch_active_record!
 end

From 80e832662b719425872e7ac3736fb9fc56d85aca Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 14:36:01 +1000
Subject: [PATCH 478/633] DEV: fake stdout must respond to close

If it does not respond to close Logger will refuse to use it
---
 lib/tasks/db.rake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 6b1a8b657b..81087473a0 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -80,6 +80,10 @@ class StdOutDemux
     (@data[Thread.current] ||= +"") << data
   end
 
+  def close
+    finish_chunk
+  end
+
   def finish_chunk
     data = @data[Thread.current]
     if data

From bedefd2e8aa45a86b8d6ae5d417232044000456b Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 9 Apr 2020 14:51:57 +1000
Subject: [PATCH 479/633] Fix broken bookmark translations for French

---
 config/locales/client.fr.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index f5ff9f75b8..dec75c46b7 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -271,11 +271,11 @@ fr:
       no_timezone: 'Vous n&#39;avez pas encore défini de fuseau horaire. Vous ne pourrez pas définir de rappels. Configurez-en un <a href="%{basePath}/my/preferences/profile">dans votre profil</a>.'
       reminders:
         at_desktop: "La prochaine fois je suis à mon bureau"
-        later_today: "Plus tard dans la journée<br/>{{date}}"
-        next_business_day: "Prochain jour ouvré<br/>{{date}}"
-        tomorrow: "Demain<br/>{{date}}"
-        next_week: "La semaine prochaine<br/>{{date}}"
-        next_month: "Le mois prochain<br/>{{date}}"
+        later_today: "Plus tard dans la journée"
+        next_business_day: "Prochain jour ouvré"
+        tomorrow: "Demain"
+        next_week: "La semaine prochaine"
+        next_month: "Le mois prochain"
         custom: "Date et heure personnalisés"
     drafts:
       resume: "Reprendre"

From 1cd8c6ce4caf15c4d0bd27077dcfc2592f7d1974 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 9 Apr 2020 11:47:59 +0300
Subject: [PATCH 480/633] FIX: Detect more unsupported browsers

---
 app/assets/javascripts/browser-detect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/browser-detect.js b/app/assets/javascripts/browser-detect.js
index bdbbc27b3e..57fb1e7f6c 100644
--- a/app/assets/javascripts/browser-detect.js
+++ b/app/assets/javascripts/browser-detect.js
@@ -1,3 +1,3 @@
-if (!window.WeakMap || !window.Promise) {
+if (!window.WeakMap || !window.WeakSet || !window.Promise) {
   window.unsupportedBrowser = true;
 }

From 3d9c320aabd54c3cce1bb4e9f29769f0d7c4c9ab Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 9 Apr 2020 15:42:24 +0300
Subject: [PATCH 481/633] PERF: Cache Category.subcategory_ids (#9350)

Also reset category cache after backup restore.
---
 app/models/category.rb                        | 44 ++++++++++++-------
 app/models/topic.rb                           | 10 ++---
 .../initializers/014-track-setting-changes.rb |  2 +
 lib/backup_restore/restorer.rb                |  7 +++
 lib/topic_query.rb                            |  7 +--
 5 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 5fb020c556..44d115cad0 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -74,6 +74,7 @@ class Category < ActiveRecord::Base
   after_save :publish_discourse_stylesheet
   after_save :publish_category
   after_save :reset_topic_ids_cache
+  after_save :clear_subcategory_ids
   after_save :clear_url_cache
   after_save :index_search
   after_save :update_reviewables
@@ -153,23 +154,36 @@ class Category < ActiveRecord::Base
     Category.reset_topic_ids_cache
   end
 
+  @@subcategory_ids = DistributedCache.new('subcategory_ids')
+
   def self.subcategory_ids(category_id)
-    sql = <<~SQL
-        WITH RECURSIVE subcategories AS (
-            SELECT :category_id id, 1 depth
-            UNION
-            SELECT categories.id, (subcategories.depth + 1) depth
-            FROM categories
-            JOIN subcategories ON subcategories.id = categories.parent_category_id
-            WHERE subcategories.depth < :max_category_nesting
+    @@subcategory_ids[category_id] ||=
+      begin
+        sql = <<~SQL
+            WITH RECURSIVE subcategories AS (
+                SELECT :category_id id, 1 depth
+                UNION
+                SELECT categories.id, (subcategories.depth + 1) depth
+                FROM categories
+                JOIN subcategories ON subcategories.id = categories.parent_category_id
+                WHERE subcategories.depth < :max_category_nesting
+            )
+            SELECT id FROM subcategories
+          SQL
+        DB.query_single(
+          sql,
+          category_id: category_id,
+          max_category_nesting: SiteSetting.max_category_nesting
         )
-        SELECT id FROM subcategories
-      SQL
-    DB.query_single(
-      sql,
-      category_id: category_id.to_i,
-      max_category_nesting: SiteSetting.max_category_nesting
-    )
+      end
+  end
+
+  def self.clear_subcategory_ids
+    @@subcategory_ids.clear
+  end
+
+  def clear_subcategory_ids
+    Category.clear_subcategory_ids
   end
 
   def self.scoped_to_permissions(guardian, permission_types)
diff --git a/app/models/topic.rb b/app/models/topic.rb
index dd9460ce3a..d080fbee32 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -191,9 +191,7 @@ class Topic < ActiveRecord::Base
   }
 
   scope :in_category_and_subcategories, lambda { |category_id|
-    where("topics.category_id = ? OR topics.category_id IN (SELECT id FROM categories WHERE categories.parent_category_id = ?)",
-        category_id,
-        category_id) if category_id
+    where("topics.category_id IN (?)", Category.subcategory_ids(category_id.to_i)) if category_id
   }
 
   scope :with_subtype, ->(subtype) { where('topics.subtype = ?', subtype) }
@@ -1296,7 +1294,7 @@ class Topic < ActiveRecord::Base
     builder = DB.build(sql)
     builder.where("t.created_at >= :start_date", start_date: opts[:start_date]) if opts[:start_date]
     builder.where("t.created_at < :end_date", end_date: opts[:end_date]) if opts[:end_date]
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id])) if opts[:category_id]
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id].to_i)) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.where("p.deleted_at IS NULL")
@@ -1335,7 +1333,7 @@ class Topic < ActiveRecord::Base
     builder = DB.build(WITH_NO_RESPONSE_SQL)
     builder.where("t.created_at >= :start_date", start_date: start_date) if start_date
     builder.where("t.created_at < :end_date", end_date: end_date) if end_date
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(category_id)) if category_id
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(category_id.to_i)) if category_id
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_hash
@@ -1355,7 +1353,7 @@ class Topic < ActiveRecord::Base
 
   def self.with_no_response_total(opts = {})
     builder = DB.build(WITH_NO_RESPONSE_TOTAL_SQL)
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id])) if opts[:category_id]
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id].to_i)) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_single.first.to_i
diff --git a/config/initializers/014-track-setting-changes.rb b/config/initializers/014-track-setting-changes.rb
index d3156d46d9..c469af48fc 100644
--- a/config/initializers/014-track-setting-changes.rb
+++ b/config/initializers/014-track-setting-changes.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 DiscourseEvent.on(:site_setting_changed) do |name, old_value, new_value|
+  Category.clear_subcategory_ids if name === :max_category_nesting
+
   # Enabling `must_approve_users` on an existing site is odd, so we assume that the
   # existing users are approved.
   if name == :must_approve_users && new_value == true
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index eaf3ee4083..7a2b37d01a 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -52,6 +52,7 @@ module BackupRestore
 
       @system.disable_readonly_mode
 
+      clear_category_cache
       clear_emoji_cache
       clear_theme_cache
 
@@ -119,6 +120,12 @@ module BackupRestore
       end
     end
 
+    def clear_category_cache
+      log "Clearing category cache..."
+      Category.reset_topic_ids_cache
+      Category.clear_subcategory_ids
+    end
+
     def clear_emoji_cache
       log "Clearing emoji cache..."
       Emoji.clear_cache
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 24a35b021e..fa851e916a 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -669,7 +669,7 @@ class TopicQuery
       if options[:no_subcategories]
         result = result.where('categories.id = ?', category_id)
       else
-        result = result.where(<<~SQL, subcategory_ids: subcategory_ids(category_id), category_id: category_id)
+        result = result.where(<<~SQL, subcategory_ids: Category.subcategory_ids(category_id), category_id: category_id)
           categories.id in (:subcategory_ids) AND (
             categories.topic_id <> topics.id OR categories.id = :category_id
           )
@@ -1052,11 +1052,6 @@ class TopicQuery
 
   private
 
-  def subcategory_ids(category_id)
-    @subcategory_ids ||= {}
-    @subcategory_ids[category_id] ||= Category.subcategory_ids(category_id)
-  end
-
   def sanitize_sql_array(input)
     ActiveRecord::Base.public_send(:sanitize_sql_array, input.join(','))
   end

From 81c7f369ebddbc788e8d8724616e122cedf504d4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2020 09:57:50 -0400
Subject: [PATCH 482/633] Build(deps): Bump aws-eventstream from 1.0.3 to 1.1.0
 (#9395)

Bumps [aws-eventstream](https://github.com/aws/aws-sdk-ruby) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-eventstream/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.0.3...1.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e668ecd8cc..020705664b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,7 +44,7 @@ GEM
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
-    aws-eventstream (1.0.3)
+    aws-eventstream (1.1.0)
     aws-partitions (1.294.0)
     aws-sdk-core (3.92.0)
       aws-eventstream (~> 1.0, >= 1.0.2)

From 64ec771dc63eea5fb503481b590d656cfa885733 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Thu, 9 Apr 2020 12:13:15 -0300
Subject: [PATCH 483/633] REFACTOR: Resize controls (#9393)

---
 .../discourse-markdown/resize-controls.js     | 150 +++++++-----------
 1 file changed, 56 insertions(+), 94 deletions(-)

diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
index 5a863bb212..16e5a17aab 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
@@ -1,3 +1,5 @@
+const SCALES = ["100", "75", "50"];
+
 function isUpload(token) {
   return token.content.includes("upload://");
 }
@@ -6,16 +8,8 @@ function hasMetadata(token) {
   return token.content.match(/(\d{1,4}x\d{1,4})/);
 }
 
-function buildToken(state, type, tag, klass, nesting) {
-  const token = new state.Token(type, tag, nesting);
-  token.block = true;
-  token.attrs = [["class", klass]];
-  return token;
-}
-
-function wrapImage(tokens, index, state, imgNumber) {
-  const imgToken = tokens[index];
-  const sizePart = imgToken.content
+function appendMetaData(index, token) {
+  const sizePart = token.content
     .split("|")
     .find(x => x.match(/\d{1,4}x\d{1,4}(,\s*\d{1,3}%)?/));
   let selectedScale =
@@ -23,114 +17,53 @@ function wrapImage(tokens, index, state, imgNumber) {
     sizePart
       .split(",")
       .pop()
-      .trim();
-  tokens.splice(
-    index,
-    0,
-    buildToken(state, "wrap_image_open", "span", "image-wrapper", 1)
-  );
+      .trim()
+      .replace("%", "");
 
-  const newElements = [];
-  const btnWrapper = buildToken(
-    state,
-    "wrap_button_open",
-    "span",
-    "button-wrapper",
-    1
-  );
-  btnWrapper.attrs.push(["data-image-index", imgNumber]);
-  newElements.push(btnWrapper);
+  const overwriteScale = !SCALES.find(scale => scale === selectedScale);
+  if (overwriteScale) selectedScale = "100";
 
-  const minimumScale = 50;
-  const scales = [100, 75, minimumScale];
-  const overwriteScale = !scales.find(scale => `${scale}%` === selectedScale);
-  if (overwriteScale) selectedScale = "100%";
-
-  scales.forEach(scale => {
-    const scaleText = `${scale}%`;
-
-    const btnClass =
-      scaleText === selectedScale ? "scale-btn active" : "scale-btn";
-    const scaleBtn = buildToken(
-      state,
-      "scale_button_open",
-      "span",
-      btnClass,
-      1
-    );
-    scaleBtn.attrs.push(["data-scale", scale]);
-    newElements.push(scaleBtn);
-
-    let textToken = buildToken(state, "text", "", "", 0);
-    textToken.content = scaleText;
-    newElements.push(textToken);
-
-    newElements.push(buildToken(state, "scale_button_close", "span", "", -1));
-
-    if (scale !== minimumScale) {
-      newElements.push(buildToken(state, "separator", "span", "separator", 1));
-      let separatorToken = buildToken(state, "text", "", "", 0);
-      separatorToken.content = " • ";
-      newElements.push(separatorToken);
-      newElements.push(buildToken(state, "separator_close", "span", "", -1));
-    }
-  });
-  newElements.push(buildToken(state, "wrap_button_close", "span", "", -1));
-
-  newElements.push(buildToken(state, "wrap_image_close", "span", "", -1));
-
-  const afterImageIndex = index + 2;
-  tokens.splice(afterImageIndex, 0, ...newElements);
-}
-
-function updateIndexes(indexes, name) {
-  indexes[name].push(indexes.current);
-  indexes.current++;
-}
-
-function wrapImages(tokens, tokenIndexes, state, imgNumberIndexes) {
-  //We do this in reverse order because it's easier for #wrapImage to manipulate the tokens array.
-  for (let j = tokenIndexes.length - 1; j >= 0; j--) {
-    let index = tokenIndexes[j];
-    wrapImage(tokens, index, state, imgNumberIndexes.pop());
-  }
+  token.attrs.push(["index-image", index]);
+  token.attrs.push(["scale", selectedScale]);
 }
 
 function rule(state) {
-  let blockIndexes = [];
-  const indexNumbers = { current: 0, blocks: [], childrens: [] };
+  let currentIndex = 0;
 
   for (let i = 0; i < state.tokens.length; i++) {
     let blockToken = state.tokens[i];
     const blockTokenImage = blockToken.tag === "img";
 
     if (blockTokenImage && isUpload(blockToken) && hasMetadata(blockToken)) {
-      blockIndexes.push(i);
-      updateIndexes(indexNumbers, "blocks");
+      appendMetaData(currentIndex, blockToken);
+      currentIndex++;
     }
 
     if (!blockToken.children) continue;
 
-    const childrenIndexes = [];
     for (let j = 0; j < blockToken.children.length; j++) {
       let token = blockToken.children[j];
       const childrenImage = token.tag === "img";
 
       if (childrenImage && isUpload(blockToken) && hasMetadata(token)) {
-        childrenIndexes.push(j);
-        updateIndexes(indexNumbers, "childrens");
+        appendMetaData(currentIndex, token);
+        currentIndex++;
       }
     }
-
-    wrapImages(
-      blockToken.children,
-      childrenIndexes,
-      state,
-      indexNumbers.childrens
-    );
   }
+}
 
-  wrapImages(state.tokens, blockIndexes, state, indexNumbers.blocks);
+function buildScaleButton(selectedScale, scale) {
+  const activeScaleClass = selectedScale === scale ? "active" : "";
+  return (
+    "<span class='scale-btn" +
+    activeScaleClass +
+    "' data-scale='" +
+    scale +
+    "'>" +
+    scale +
+    "%</span>"
+  );
 }
 
 export function setup(helper) {
@@ -147,6 +80,35 @@ export function setup(helper) {
     ]);
 
     helper.registerPlugin(md => {
+      const oldRule = md.renderer.rules.image;
+
+      md.renderer.rules.image = function(tokens, idx, options, env, slf) {
+        const token = tokens[idx];
+        const scaleIndex = token.attrIndex("scale");
+        const imageIndex = token.attrIndex("index-image");
+
+        if (scaleIndex !== -1) {
+          var selectedScale = token.attrs[scaleIndex][1];
+          var index = token.attrs[imageIndex][1];
+
+          let result = "<span class='image-wrapper'>";
+          result += oldRule(tokens, idx, options, env, slf);
+
+          result +=
+            "<span class='button-wrapper' data-image-index='" + index + "'>";
+
+          result += SCALES.map(scale =>
+            buildScaleButton(selectedScale, scale)
+          ).join("<span class='separator'>&nbsp;•&nbsp;</span>");
+
+          result += "</span></span>";
+
+          return result;
+        } else {
+          return oldRule(tokens, idx, options, env, slf);
+        }
+      };
+
       md.core.ruler.after("upload-protocol", "resize-controls", rule);
     });
   }

From 8b46f14744d4bab9339d075825914d86da6bd5eb Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 9 Apr 2020 14:17:43 -0400
Subject: [PATCH 484/633] We have had errors reported due to migrations
 breaking and are reverting these series of commits.

See:
https://meta.discourse.org/t/new-installation-fails-on-migration/147425

This reverts commit 80e832662b719425872e7ac3736fb9fc56d85aca.
This reverts commit de5f2d33087c8e9c12f83d573015d275098bd68f.
This reverts commit 6b192d29fa095e91cb40b71e76dfc811f4aa205c.
This reverts commit a5b582f686c0a8427aad3f6caf9f3a8105e66ee9.
This reverts commit 708dd97dfd0380c703678a0ee070dc62880e57f1.
---
 lib/freedom_patches/safe_migrations.rb |  12 +--
 lib/tasks/db.rake                      | 100 -------------------------
 2 files changed, 3 insertions(+), 109 deletions(-)

diff --git a/lib/freedom_patches/safe_migrations.rb b/lib/freedom_patches/safe_migrations.rb
index cdf989fdd5..718ffffb89 100644
--- a/lib/freedom_patches/safe_migrations.rb
+++ b/lib/freedom_patches/safe_migrations.rb
@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-# We do not run this in production cause it is intrusive and has
-# potential to break stuff, it also breaks under concurrent use
-# which rake:multisite_migrate uses
-#
-# The protection is only needed in Dev and Test
-if ENV['RAILS_ENV'] != "production"
-  require_dependency 'migration/safe_migrate'
-  Migration::SafeMigrate.patch_active_record!
-end
+require_dependency 'migration/safe_migrate'
+
+Migration::SafeMigrate.patch_active_record!
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 81087473a0..14b2eb4e20 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -66,106 +66,6 @@ task 'db:rollback' => ['environment', 'set_locale'] do |_, args|
   Rake::Task['db:_dump'].invoke
 end
 
-# our optimized version of multisite migrate, we have many sites and we have seeds
-# this ensures we can run migrations concurrently to save huge amounts of time
-Rake::Task['multisite:migrate'].clear
-
-class StdOutDemux
-  def initialize(stdout)
-    @stdout = stdout
-    @data = {}
-  end
-
-  def write(data)
-    (@data[Thread.current] ||= +"") << data
-  end
-
-  def close
-    finish_chunk
-  end
-
-  def finish_chunk
-    data = @data[Thread.current]
-    if data
-      @stdout.write(data)
-      @data.delete Thread.current
-    end
-  end
-end
-
-task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |_, args|
-  if ENV["RAILS_ENV"] != "production"
-    raise "Multisite migrate is only supported in production"
-  end
-
-  concurrency = (ENV['MIGRATE_CONCURRENCY'].presence || "20").to_i
-
-  puts "Multisite migrator is running using #{concurrency} threads"
-  puts
-
-  queue = Queue.new
-  exceptions = Queue.new
-
-  old_stdout = $stdout
-  $stdout = StdOutDemux.new($stdout)
-
-  RailsMultisite::ConnectionManagement.each_connection do |db|
-    queue << db
-  end
-
-  concurrency.times { queue << :done }
-
-  SeedFu.quiet = true
-
-  (1..concurrency).map do
-    Thread.new {
-      while true
-        db = queue.pop
-        break if db == :done
-
-        RailsMultisite::ConnectionManagement.with_connection(db) do
-          begin
-            puts "Migrating #{db}"
-            ActiveRecord::Tasks::DatabaseTasks.migrate
-            SeedFu.seed(DiscoursePluginRegistry.seed_paths)
-            if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
-              SiteIconManager.ensure_optimized!
-            end
-          rescue => e
-            exceptions << [db, e]
-          ensure
-            begin
-              $stdout.finish_chunk
-            rescue => ex
-              STDERR.puts ex.inspect
-              STDERR.puts ex.backtrace
-            end
-          end
-        end
-      end
-    }
-  end.each(&:join)
-
-  $stdout = old_stdout
-
-  if exceptions.length > 0
-    STDERR.puts
-    STDERR.puts "-" * 80
-    STDERR.puts "#{exceptions.length} migrations failed!"
-    while !exceptions.empty?
-      db, e = exceptions.pop
-      STDERR.puts
-      STDERR.puts "Failed to migrate #{db}"
-      STDERR.puts e.inspect
-      STDERR.puts e.backtrace
-      STDERR.puts
-    end
-    exit 1
-  end
-
-  Rake::Task['db:_dump'].invoke
-end
-
 # we need to run seed_fu every time we run rake db:migrate
 task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
 

From 5ccbc5f3ee8508927ee715fe59e6da9d08ef427b Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Thu, 9 Apr 2020 08:32:39 -1000
Subject: [PATCH 485/633] FEATURE: add after-reviewable-post-user plugin outlet
 (#9397)

FEATURE: add after-reviewable-post-user plugin outlet

Add a plugin outlet after reviewable post user

Add a basic user serializer that includes custom fields.
Allows review queue serializer to include custom fields for its users
---
 .../components/reviewable-created-by-name.hbs |  3 +++
 app/serializers/reviewable_serializer.rb      |  6 ++---
 .../user_with_custom_fields_serializer.rb     | 27 +++++++++++++++++++
 spec/requests/reviewables_controller_spec.rb  | 26 ++++++++++++++++++
 4 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 app/serializers/user_with_custom_fields_serializer.rb

diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
index e2f2afd097..f45506550f 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
@@ -9,4 +9,7 @@
       {{i18n "review.deleted_user"}}
     {{/if}}
   </span>
+  {{plugin-outlet name="after-reviewable-post-user"
+      tagName=""
+      args=(hash user=user)}}
 </div>
diff --git a/app/serializers/reviewable_serializer.rb b/app/serializers/reviewable_serializer.rb
index af03419d2a..bd7f69d462 100644
--- a/app/serializers/reviewable_serializer.rb
+++ b/app/serializers/reviewable_serializer.rb
@@ -19,13 +19,13 @@ class ReviewableSerializer < ApplicationSerializer
     :version,
   )
 
-  has_one :created_by, serializer: BasicUserSerializer, root: 'users'
-  has_one :target_created_by, serializer: BasicUserSerializer, root: 'users'
+  has_one :created_by, serializer: UserWithCustomFieldsSerializer, root: 'users'
+  has_one :target_created_by, serializer: UserWithCustomFieldsSerializer, root: 'users'
   has_one :topic, serializer: ListableTopicSerializer
   has_many :editable_fields, serializer: ReviewableEditableFieldSerializer, embed: :objects
   has_many :reviewable_scores, serializer: ReviewableScoreSerializer
   has_many :bundled_actions, serializer: ReviewableBundledActionSerializer
-  has_one :claimed_by, serializer: BasicUserSerializer, root: 'users'
+  has_one :claimed_by, serializer: UserWithCustomFieldsSerializer, root: 'users'
 
   # Used to keep track of our payload attributes
   class_attribute :_payload_for_serialization
diff --git a/app/serializers/user_with_custom_fields_serializer.rb b/app/serializers/user_with_custom_fields_serializer.rb
new file mode 100644
index 0000000000..6492d2f695
--- /dev/null
+++ b/app/serializers/user_with_custom_fields_serializer.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# A basic user serializer, with custom fields
+class UserWithCustomFieldsSerializer < BasicUserSerializer
+  attributes :custom_fields
+
+  def custom_fields
+    fields = custom_field_keys
+
+    if fields.present?
+      if object.custom_fields_preloaded?
+        {}.tap { |h| fields.each { |f| h[f] = object.custom_fields[f] } }
+      else
+        User.custom_fields_for_ids([object.id], fields)[object.id] || {}
+      end
+    else
+      {}
+    end
+  end
+
+  private
+
+  def custom_field_keys
+    # Can be extended by other serializers
+    User.whitelisted_user_custom_fields(scope)
+  end
+end
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index 6ae6dfae8a..e42d67ae40 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -192,6 +192,32 @@ describe ReviewablesController do
           expect(json_review['id']).to eq(reviewable.id)
         end
       end
+
+      context "with user custom field" do
+        before do
+          plugin = Plugin::Instance.new
+          plugin.whitelist_public_user_custom_field :public_field
+        end
+
+        after do
+          User.plugin_public_user_custom_fields.clear
+        end
+
+        it "returns user data with custom fields" do
+          user = Fabricate(:user)
+          user.custom_fields["public_field"] = "public"
+          user.custom_fields["private_field"] = "private"
+          user.save!
+
+          reviewable = Fabricate(:reviewable, target_created_by: user)
+
+          get "/review.json"
+          json = response.parsed_body
+          expect(json['users']).to be_present
+          expect(json['users'].any? { |u| u['id'] == reviewable.target_created_by_id && u['custom_fields']['public_field'] == 'public' }).to eq(true)
+          expect(json['users'].any? { |u| u['id'] == reviewable.target_created_by_id && u['custom_fields']['private_field'] == 'private' }).to eq(false)
+        end
+      end
     end
 
     context "#show" do

From d891665ac519efac6b648b454c275e88c70baa6a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 9 Apr 2020 21:57:06 +0200
Subject: [PATCH 486/633] DEV: allows groups-selector to have an
 onChangeCallback (#9399)

---
 .../javascripts/discourse/components/group-selector.js     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/group-selector.js b/app/assets/javascripts/discourse/components/group-selector.js
index 74c1c4b16f..3fe2e505f8 100644
--- a/app/assets/javascripts/discourse/components/group-selector.js
+++ b/app/assets/javascripts/discourse/components/group-selector.js
@@ -35,7 +35,12 @@ export default Component.extend({
       updateData: opts && opts.updateData ? opts.updateData : false,
       onChangeItems: items => {
         selectedGroups = items;
-        this.set("groupNames", items.join(","));
+
+        if (this.onChangeCallback) {
+          this.onChangeCallback(this.groupNames, selectedGroups);
+        } else {
+          this.set("groupNames", items.join(","));
+        }
       },
       transformComplete: g => {
         return g.name;

From 3cac60f07c29c14ebe816d1136b1360f607c314f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 9 Apr 2020 22:00:44 +0200
Subject: [PATCH 487/633] DEV: enforce no-quoteless-attributes
 ember-template-lint (#9400)

---
 .template-lintrc.js                                             | 2 +-
 .../javascripts/discourse/templates/preferences/account.hbs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 1f377ea0f1..232c2549ca 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -35,7 +35,7 @@ module.exports = {
     "no-outlet-outside-routes": true,
     "no-partial": true,
     "no-positive-tabindex": false,
-    "no-quoteless-attributes": false,
+    "no-quoteless-attributes": true,
     "no-shadowed-elements": true,
     "no-trailing-spaces": true,
     "no-triple-curlies": true,
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 70b8d20cd8..40802f66df 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -119,7 +119,7 @@
             {{else}}
               <tr class={{dasherize authProvider.method.name}}>
                 <td>{{authProvider.method.prettyName}}</td>
-                  <td colspan=2>
+                  <td colspan="2">
                     {{#if authProvider.method.can_connect}}
                       {{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" class="btn-default" icon="plug" disabled=disableConnectButtons}}
                     {{else}}

From 80a80ef2bd028c2292bed0ef491de6ccba93f8f2 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Thu, 9 Apr 2020 20:46:51 -0600
Subject: [PATCH 488/633] DEV: Use method instead of constant for discobot
 badge names

This change refactors the code a bit so that a plugin could easily
replace which badge is awarded when completing the discobot new user
tutorial and advanced tutorial.

By adding a static method and putting the BADGE_NAME constant inside of
that method we can simply call that method now instead of the constant.
A plugin could then `class_eval` that method and replace it with
whatever badge name they choose. This is way cleaner than having the
plugin change the frozen constant! eeek.
---
 .../autoload/jobs/onceoff/grant_badges.rb                     | 4 ++--
 .../lib/discourse_narrative_bot/advanced_user_narrative.rb    | 4 ++++
 .../lib/discourse_narrative_bot/base.rb                       | 2 +-
 .../lib/discourse_narrative_bot/new_user_narrative.rb         | 4 ++++
 .../discourse_narrative_bot/advanced_user_narrative_spec.rb   | 2 +-
 .../spec/discourse_narrative_bot/new_user_narrative_spec.rb   | 2 +-
 .../spec/discourse_narrative_bot/track_selector_spec.rb       | 2 +-
 .../spec/jobs/onceoff/grant_badges_spec.rb                    | 4 ++--
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb b/plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb
index 373b3b7a4f..c723d176e9 100644
--- a/plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb
+++ b/plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb
@@ -5,11 +5,11 @@ module Jobs
     class GrantBadges < ::Jobs::Onceoff
       def execute_onceoff(args)
         new_user_track_badge = Badge.find_by(
-          name: ::DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME
+          name: ::DiscourseNarrativeBot::NewUserNarrative.badge_name
         )
 
         advanced_user_track_badge = Badge.find_by(
-          name: ::DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME
+          name: ::DiscourseNarrativeBot::AdvancedUserNarrative.badge_name
         )
 
         PluginStoreRow.where(
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
index 185d472ea6..aa66cb1802 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
@@ -98,6 +98,10 @@ module DiscourseNarrativeBot
       }
     }
 
+    def self.badge_name
+      BADGE_NAME
+    end
+
     def self.reset_trigger
       I18n.t('discourse_narrative_bot.advanced_user_narrative.reset_trigger')
     end
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
index 2cccd93ac8..404dd084b4 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
@@ -74,7 +74,7 @@ module DiscourseNarrativeBot
               cancel_timeout_job(user)
 
               BadgeGranter.grant(
-                Badge.find_by(name: self.class::BADGE_NAME),
+                Badge.find_by(name: self.class.badge_name),
                 user
               )
 
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index 0acd31d5bb..89afd4eb87 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -117,6 +117,10 @@ module DiscourseNarrativeBot
       }
     }
 
+    def self.badge_name
+      BADGE_NAME
+    end
+
     def self.search_answer
       ':herb:'
     end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
index 28fec30417..da97a7df58 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
@@ -725,7 +725,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
                                                "topic_id" => topic.id,
                                                "track" => described_class.to_s)
 
-        expect(user.badges.where(name: DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME).exists?)
+        expect(user.badges.where(name: DiscourseNarrativeBot::AdvancedUserNarrative.badge_name).exists?)
           .to eq(true)
       end
     end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
index 6648337caf..43ff1ac52a 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -1007,7 +1007,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
           )
 
           expect(user.badges.where(
-            name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME).exists?
+            name: DiscourseNarrativeBot::NewUserNarrative.badge_name).exists?
           ).to eq(true)
         end
       end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
index c957cfe627..4e24b9feae 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
@@ -319,7 +319,7 @@ describe DiscourseNarrativeBot::TrackSelector do
                 )
 
                 BadgeGranter.grant(
-                  Badge.find_by(name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME),
+                  Badge.find_by(name: DiscourseNarrativeBot::NewUserNarrative.badge_name),
                   user
                 )
 
diff --git a/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb b/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb
index 5a0b3a98c1..35950b6d42 100644
--- a/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb
@@ -19,8 +19,8 @@ RSpec.describe Jobs::DiscourseNarrativeBot::GrantBadges do
     expect(user.badges.count).to eq(2)
 
     expect(user.badges.map(&:name)).to contain_exactly(
-      DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME,
-      DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME,
+      DiscourseNarrativeBot::NewUserNarrative.badge_name,
+      DiscourseNarrativeBot::AdvancedUserNarrative.badge_name,
     )
 
     expect(other_user.badges.count).to eq(0)

From 3e10d4133dd9d75a9905297881c2e59145e7859c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 10 Apr 2020 13:52:33 +0200
Subject: [PATCH 489/633] FIX: adds values/entries/NodeList.forEach/before
 polyfills for iOS 9.3 (#9401)

---
 app/assets/javascripts/polyfills.js | 65 +++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/app/assets/javascripts/polyfills.js b/app/assets/javascripts/polyfills.js
index 0129823fc8..358a213467 100644
--- a/app/assets/javascripts/polyfills.js
+++ b/app/assets/javascripts/polyfills.js
@@ -49,4 +49,69 @@ if (!String.prototype.padEnd) {
   };
 }
 
+// Needed for iOS 9.3
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries
+if (!Object.entries) {
+  Object.entries = function(obj) {
+    var ownProps = Object.keys(obj),
+      i = ownProps.length,
+      resArray = new Array(i); // preallocate the Array
+    while (i--) resArray[i] = [ownProps[i], obj[ownProps[i]]];
+
+    return resArray;
+  };
+}
+
+// Needed for iOS 9.3
+// adapted from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries
+if (!Object.values) {
+  Object.values = function(obj) {
+    var ownProps = Object.keys(obj),
+      i = ownProps.length,
+      resArray = new Array(i); // preallocate the Array
+    while (i--) resArray[i] = obj[ownProps[i]];
+
+    return resArray;
+  };
+}
+
+// Needed for iOS 9.3
+// https://developer.mozilla.org/fr/docs/Web/API/NodeList/forEach
+if (window.NodeList && !NodeList.prototype.forEach) {
+  NodeList.prototype.forEach = function(callback, thisArg) {
+    thisArg = thisArg || window;
+    for (var i = 0; i < this.length; i++) {
+      callback.call(thisArg, this[i], i, this);
+    }
+  };
+}
+
+// Needed for iOS 9.3
+// from: https://github.com/jserz/js_piece/blob/master/DOM/ChildNode/before()/before().md
+(function(arr) {
+  arr.forEach(function(item) {
+    if (item.hasOwnProperty("before")) {
+      return;
+    }
+    Object.defineProperty(item, "before", {
+      configurable: true,
+      enumerable: true,
+      writable: true,
+      value: function before() {
+        var argArr = Array.prototype.slice.call(arguments),
+          docFrag = document.createDocumentFragment();
+
+        argArr.forEach(function(argItem) {
+          var isNode = argItem instanceof Node;
+          docFrag.appendChild(
+            isNode ? argItem : document.createTextNode(String(argItem))
+          );
+        });
+
+        this.parentNode.insertBefore(docFrag, this);
+      }
+    });
+  });
+})([Element.prototype, CharacterData.prototype, DocumentType.prototype]);
+
 /* eslint-enable */

From b57d4586d713102ce939fd8d17f2ce200f290171 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 10 Apr 2020 18:16:47 +0530
Subject: [PATCH 490/633] FIX: use correct command line attribute for
 `gifsicle` while scale down the gif.

---
 app/models/optimized_image.rb | 3 ++-
 lib/upload_creator.rb         | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index 3f5614a084..e5783532c8 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -236,11 +236,12 @@ class OptimizedImage < ActiveRecord::Base
 
   def self.resize_instructions_animated(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
+    resize_method = opts[:scale_image] ? "scale" : "resize-fit"
 
     %W{
       gifsicle
       --colors=#{opts[:colors] || 256}
-      --resize-fit #{dimensions}
+      --#{resize_method} #{dimensions}
       --optimize=3
       --output #{to}
       #{from}
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index d9c21f1920..b806e2fc52 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -245,14 +245,16 @@ class UploadCreator
 
       from = @file.path
       to = down_tempfile.path
+      scale = (from =~ /\.GIF$/i) ? "0.5" : "50%"
 
       OptimizedImage.ensure_safe_paths!(from, to)
 
       OptimizedImage.downsize(
         from,
         to,
-        "50%",
+        scale,
         allow_animation: allow_animation,
+        scale_image: true,
         raise_on_error: true
       )
 

From 058506bb77680537f377cef0cad90711c2e578a5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 10 Apr 2020 16:47:27 +0200
Subject: [PATCH 491/633] DEV: prevents toolbar callbacks to leak between tests
 (#9403)

---
 app/assets/javascripts/discourse/components/d-editor.js | 5 ++++-
 test/javascripts/components/d-editor-test.js            | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/d-editor.js b/app/assets/javascripts/discourse/components/d-editor.js
index b83b667bca..199266c2a8 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js
+++ b/app/assets/javascripts/discourse/components/d-editor.js
@@ -52,7 +52,7 @@ const OP = {
 
 const FOUR_SPACES_INDENT = "4-spaces-indent";
 
-const _createCallbacks = [];
+let _createCallbacks = [];
 
 const isInside = (text, regex) => {
   const matches = text.match(regex);
@@ -212,6 +212,9 @@ class Toolbar {
 export function addToolbarCallback(func) {
   _createCallbacks.push(func);
 }
+export function clearToolbarCallbacks() {
+  _createCallbacks = [];
+}
 
 export function onToolbarCreate(func) {
   deprecated("`onToolbarCreate` is deprecated, use the plugin api instead.");
diff --git a/test/javascripts/components/d-editor-test.js b/test/javascripts/components/d-editor-test.js
index 131de74e68..6582979c1f 100644
--- a/test/javascripts/components/d-editor-test.js
+++ b/test/javascripts/components/d-editor-test.js
@@ -1,4 +1,5 @@
 import { next } from "@ember/runloop";
+import { clearToolbarCallbacks } from "discourse/components/d-editor";
 import componentTest from "helpers/component-test";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import formatTextWithSelection from "helpers/d-editor-helper";
@@ -633,6 +634,11 @@ componentTest("emoji", {
     });
     this.set("value", "hello world.");
   },
+
+  afterEach() {
+    clearToolbarCallbacks();
+  },
+
   async test(assert) {
     jumpEnd(find("textarea.d-editor-input")[0]);
     await click("button.emoji");

From 617692a6c43a21b0c158f3cea53f1142b4a35195 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Fri, 10 Apr 2020 09:46:36 -0700
Subject: [PATCH 492/633] UX: Note "Summarize This Topic" settings behavior

We use the `periodical_updates` and `weekly` background jobs to retroactively add/remove the "Summarize This Topic" button for topics according to the `summary_posts_required` or `summary_likes_required` site settings.
---
 config/locales/server.en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f5f03a1b9d..4fd326065f 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1490,8 +1490,8 @@ en:
     force_https: "Force your site to use HTTPS only. WARNING: do NOT enable this until you verify HTTPS is fully set up and working absolutely everywhere! Did you check your CDN, all social logins, and any external logos / dependencies to make sure they are all HTTPS compatible, too?"
     same_site_cookies: "Use same site cookies, they eliminate all vectors Cross Site Request Forgery on supported browsers (Lax or Strict). Warning: Strict will only work on sites that force login and use SSO."
     summary_score_threshold: "The minimum score required for a post to be included in 'Summarize This Topic'"
-    summary_posts_required: "Minimum posts in a topic before 'Summarize This Topic' is enabled"
-    summary_likes_required: "Minimum likes in a topic before 'Summarize This Topic' is enabled"
+    summary_posts_required: "Minimum posts in a topic before 'Summarize This Topic' is enabled. Changes to this setting will be applied retroactively within a week."
+    summary_likes_required: "Minimum likes in a topic before 'Summarize This Topic' is enabled. Changes to this setting will be applied retroactively within a week."
     summary_percent_filter: "When a user clicks 'Summarize This Topic', show the top % of posts"
     summary_max_results: "Maximum posts returned by 'Summarize This Topic'"
 

From 5471c065cdb97f2aad2de552014eaa23bb50c5df Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Fri, 10 Apr 2020 13:19:39 -0500
Subject: [PATCH 493/633] FIX: Missing timezone guess on email session login
 (#9404)

Timezone is guessed by moment.js if unset upon a normal login, but was not when
logging in via an email link. This adds logic to update a guessed
timezone upon email login so timezones don't end up blank.
---
 .../javascripts/discourse/controllers/email-login.js      | 5 ++++-
 app/controllers/session_controller.rb                     | 1 +
 spec/requests/session_controller_spec.rb                  | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/email-login.js b/app/assets/javascripts/discourse/controllers/email-login.js
index 4eab7fc1ba..4000618587 100644
--- a/app/assets/javascripts/discourse/controllers/email-login.js
+++ b/app/assets/javascripts/discourse/controllers/email-login.js
@@ -23,7 +23,10 @@ export default Controller.extend({
 
   actions: {
     finishLogin() {
-      let data = { second_factor_method: this.secondFactorMethod };
+      let data = {
+        second_factor_method: this.secondFactorMethod,
+        timezone: moment.tz.guess()
+      };
       if (this.securityKeyCredential) {
         data.second_factor_token = this.securityKeyCredential;
       } else {
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 5f8b1c3430..aa46f2dba2 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -368,6 +368,7 @@ class SessionController < ApplicationController
       elsif payload = login_error_check(user)
         return render json: payload
       else
+        user.update_timezone_if_missing(params[:timezone])
         log_on_user(user)
         return render json: success_json
       end
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 50c4eb7ea0..70f88f8e2a 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -252,6 +252,14 @@ RSpec.describe SessionController do
         end
       end
 
+      context "when timezone param is provided" do
+        it "sets the user_option timezone for the user" do
+          post "/session/email-login/#{email_token.token}.json", params: { timezone: "Australia/Melbourne" }
+          expect(response.status).to eq(200)
+          expect(user.reload.user_option.timezone).to eq("Australia/Melbourne")
+        end
+      end
+
       it "fails when user is suspended" do
         user.update!(
           suspended_till: 2.days.from_now,

From d984848aa94971c8fcab10b43bd596107fdbe9c5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 10 Apr 2020 22:39:19 +0200
Subject: [PATCH 494/633] FIX: ensures toolbar is updated on composer action
 change (#9402)

---
 .../discourse/components/d-editor.js            |  2 +-
 test/javascripts/components/d-editor-test.js    | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/d-editor.js b/app/assets/javascripts/discourse/components/d-editor.js
index 199266c2a8..4dd2c72700 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js
+++ b/app/assets/javascripts/discourse/components/d-editor.js
@@ -328,7 +328,7 @@ export default Component.extend({
     $(this.element.querySelector(".d-editor-preview")).off("click.preview");
   },
 
-  @discourseComputed
+  @discourseComputed("attrs.outletArgs.composer.action")
   toolbar() {
     const toolbar = new Toolbar(
       this.getProperties("site", "siteSettings", "showLink")
diff --git a/test/javascripts/components/d-editor-test.js b/test/javascripts/components/d-editor-test.js
index 6582979c1f..222ddeea76 100644
--- a/test/javascripts/components/d-editor-test.js
+++ b/test/javascripts/components/d-editor-test.js
@@ -584,7 +584,7 @@ testCase(`list button with line sequence`, async function(assert, textarea) {
   assert.equal(textarea.selectionEnd, 18);
 });
 
-componentTest("clicking the toggle-direction button toggles the direction", {
+componentTest("clicking the toggle-direction changes dir from ltr to rtl", {
   template: "{{d-editor value=value}}",
   beforeEach() {
     this.siteSettings.support_mixed_text_direction = true;
@@ -595,8 +595,21 @@ componentTest("clicking the toggle-direction button toggles the direction", {
     const textarea = find("textarea.d-editor-input");
     await click("button.toggle-direction");
     assert.equal(textarea.attr("dir"), "rtl");
+  }
+});
+
+componentTest("clicking the toggle-direction changes dir from ltr to rtl", {
+  template: "{{d-editor value=value}}",
+  beforeEach() {
+    this.siteSettings.support_mixed_text_direction = true;
+    this.siteSettings.default_locale = "en_US";
+  },
+
+  async test(assert) {
+    const textarea = find("textarea.d-editor-input");
+    textarea.attr("dir", "ltr");
     await click("button.toggle-direction");
-    assert.equal(textarea.attr("dir"), "ltr");
+    assert.equal(textarea.attr("dir"), "rtl");
   }
 });
 

From 600cb2130da405718c69c38effe39a64979f3023 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Sat, 11 Apr 2020 06:34:13 +0530
Subject: [PATCH 495/633] FIX: show today's date on /users page period chooser

---
 app/assets/javascripts/discourse/templates/mobile/users.hbs | 2 +-
 app/assets/javascripts/discourse/templates/users.hbs        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs
index 808458bbcb..a24f118619 100644
--- a/app/assets/javascripts/discourse/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs
@@ -4,7 +4,7 @@
       {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
 
       <div class='directory-controls'>
-        {{period-chooser period=period onChange=(action (mut period))}}
+        {{period-chooser period=period onChange=(action (mut period)) fullDay=false}}
         {{#if lastUpdatedAt}}
           <div class='directory-last-updated'>
             {{i18n "directory.last_updated"}}
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index af5d17f15b..35e1f5d19b 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -5,7 +5,7 @@
         {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
         <div class='directory-controls'>
           <div class='period-controls'>
-            {{period-chooser period=period onChange=(action (mut period))}}
+            {{period-chooser period=period onChange=(action (mut period)) fullDay=false}}
             {{#if lastUpdatedAt}}
               <div class='directory-last-updated'>
                 {{i18n "directory.last_updated"}}

From 0cef409d498f3aa3f714f3f05924f933b4a610e5 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Sun, 12 Apr 2020 21:05:23 +0530
Subject: [PATCH 496/633] UX: strip base64 image URLs when converting HTML to
 markdown.

---
 app/assets/javascripts/discourse/lib/to-markdown.js | 4 ++++
 test/javascripts/lib/to-markdown-test.js            | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/app/assets/javascripts/discourse/lib/to-markdown.js b/app/assets/javascripts/discourse/lib/to-markdown.js
index 83d7b28d04..25e49bfc85 100644
--- a/app/assets/javascripts/discourse/lib/to-markdown.js
+++ b/app/assets/javascripts/discourse/lib/to-markdown.js
@@ -291,6 +291,10 @@ export class Tag {
         }
 
         if (src) {
+          if (src.match(/^data:image\/([a-zA-Z]*);base64,([^\"]*)$/)) {
+            return "[image]";
+          }
+
           let alt = attr.alt || pAttr.alt || "";
           const width = attr.width || pAttr.width;
           const height = attr.height || pAttr.height;
diff --git a/test/javascripts/lib/to-markdown-test.js b/test/javascripts/lib/to-markdown-test.js
index bcda89c9f2..3ae081d0fb 100644
--- a/test/javascripts/lib/to-markdown-test.js
+++ b/test/javascripts/lib/to-markdown-test.js
@@ -413,3 +413,9 @@ there is a quote above
 
   assert.equal(toMarkdown(html), markdown.trim());
 });
+
+QUnit.test("strips base64 image URLs", assert => {
+  const html =
+    '<img src="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAPAAA/+4AJkFkb2JlAGTAAAAAAQMAFQQDBgoNAAABywAAAgsAAAJpAAACyf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoKDBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8IAEQgAEAAQAwERAAIRAQMRAf/EAJQAAQEBAAAAAAAAAAAAAAAAAAMFBwEAAwEAAAAAAAAAAAAAAAAAAAEDAhAAAQUBAQAAAAAAAAAAAAAAAgABAwQFESARAAIBAwIHAAAAAAAAAAAAAAERAgAhMRIDQWGRocEiIxIBAAAAAAAAAAAAAAAAAAAAIBMBAAMAAQQDAQAAAAAAAAAAAQARITHwQVGBYXGR4f/aAAwDAQACEQMRAAAB0UlMciEJn//aAAgBAQABBQK5bGtFn6pWi2K12wWTRkjb/9oACAECAAEFAvH/2gAIAQMAAQUCIuIJOqRndRiv/9oACAECAgY/Ah//2gAIAQMCBj8CH//aAAgBAQEGPwLWQzwHepfNbcUNfM4tUIbA9QL4AvnxTlAxacpWJReOlf/aAAgBAQMBPyHZDveuCyu4B4lz2lDKto2ca5uclPK0aoq32x8xgTSLeSgbyzT65n//2gAIAQIDAT8hlQjP/9oACAEDAwE/IaE9GcZFJ//aAAwDAQACEQMRAAAQ5F//2gAIAQEDAT8Q1oowKccI3KTdAWkPLw2ssIrwKYUzuJoUJsIHOCoG23ISlja+rU9QvCx//9oACAECAwE/EAuNIiKf/9oACAEDAwE/ECujJzHf7iwHOv5NhK+8efH50z//2Q==" />';
+  assert.equal(toMarkdown(html), "[image]");
+});

From 0f14bce79990f34669eaf8cfc50fff07ceb7b90c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 12 Apr 2020 21:14:58 +0200
Subject: [PATCH 497/633] FIX: remove invalid background (#9406)

---
 .../stylesheets/common/components/date-time-input-range.scss     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/date-time-input-range.scss b/app/assets/stylesheets/common/components/date-time-input-range.scss
index 438de7742e..e46dd6f0b6 100644
--- a/app/assets/stylesheets/common/components/date-time-input-range.scss
+++ b/app/assets/stylesheets/common/components/date-time-input-range.scss
@@ -1,6 +1,5 @@
 .d-date-time-input-range {
   padding: 0.5em;
-  background: whitesmole;
   border: 1px solid $primary-low;
   width: 300px;
   display: flex;

From a863d8eecba22f45599f8fc7b3f7ea83bfb58b32 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 12 Apr 2020 21:21:21 +0200
Subject: [PATCH 498/633] UX: applies default background color to onebox
 (#9407)

---
 app/assets/stylesheets/common/base/onebox.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 694ea8214a..4c0a9f357b 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -98,6 +98,7 @@ aside.onebox {
   margin-bottom: 1em;
   padding: 12px 25px 12px 12px;
   font-size: $font-0;
+  background: $secondary;
 
   header {
     margin-bottom: 8px;

From b66b277dc44bcd2122dc21965dab209c30636214 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 13 Apr 2020 17:17:20 +0200
Subject: [PATCH 499/633] DEV: enforces block-indentation of
 ember-template-lint rules (#9408)

---
 .template-lintrc.js                           |   2 +-
 .../javascripts/admin/templates/admin.hbs     |  55 ++-
 .../admin/templates/api-keys-index.hbs        | 118 +++---
 .../admin/templates/api-keys-show.hbs         |   8 +-
 .../admin/templates/backups-index.hbs         | 104 ++---
 .../components/admin-report-inline-table.hbs  |   2 +-
 .../templates/components/admin-report.hbs     | 372 +++++++++---------
 .../components/admin-theme-editor.hbs         |  94 +++--
 .../templates/components/embeddable-host.hbs  |   4 +-
 .../templates/components/silence-details.hbs  |  11 +-
 .../templates/components/site-setting.hbs     |   8 +-
 .../admin/templates/customize-colors-show.hbs |  98 ++---
 .../templates/customize-themes-index.hbs      |   2 +-
 .../admin/templates/dashboard_reports.hbs     |  18 +-
 .../admin/templates/email-advanced-test.hbs   |  30 +-
 .../admin/templates/email-preview-digest.hbs  |   7 +-
 .../javascripts/admin/templates/embedding.hbs |   6 +-
 .../admin/templates/logs/screened-emails.hbs  |  30 +-
 .../templates/logs/screened-ip-addresses.hbs  | 138 +++----
 .../admin/templates/logs/screened-urls.hbs    |  22 +-
 .../templates/logs/staff-action-logs.hbs      |  59 ++-
 .../templates/modal/admin-add-upload.hbs      |  20 +-
 .../modal/admin-watched-word-test.hbs         |  28 +-
 .../modal/site-setting-default-categories.hbs |   2 +-
 .../admin/templates/plugins-index.hbs         |   6 +-
 .../javascripts/admin/templates/plugins.hbs   |  20 +-
 .../admin/templates/search-logs-index.hbs     |  22 +-
 .../admin/templates/search-logs-term.hbs      |  72 ++--
 .../admin/templates/user-badges.hbs           |  42 +-
 .../admin/templates/user-index.hbs            | 112 +++---
 .../admin/templates/user-tl3-requirements.hbs |  39 +-
 .../admin/templates/web-hooks-show-events.hbs |  52 +--
 .../javascripts/admin/templates/web-hooks.hbs |  56 +--
 .../javascripts/discourse/templates/about.hbs |   4 +-
 .../discourse/templates/badges/show.hbs       |  24 +-
 .../templates/components/avatar-uploader.hbs  |   5 +-
 .../templates/components/basic-topic-list.hbs |  41 +-
 .../categories-boxes-with-topics.hbs          |  29 +-
 .../templates/components/categories-boxes.hbs |  89 ++---
 .../templates/components/categories-only.hbs  | 108 ++---
 .../templates/components/choose-message.hbs   |   2 +-
 .../components/composer-user-selector.hbs     |  24 +-
 .../components/edit-category-settings.hbs     | 141 ++++---
 .../components/future-date-input.hbs          |  34 +-
 .../components/group-card-contents.hbs        |  25 +-
 .../components/group-manage-save-button.hbs   |   8 +-
 .../templates/components/group-post.hbs       |  33 +-
 .../templates/components/invite-panel.hbs     |   9 +-
 .../templates/components/navigation-bar.hbs   |   2 +-
 .../templates/components/navigation-item.hbs  |   8 +-
 .../components/reviewable-flagged-post.hbs    |   2 +-
 .../components/reviewable-histories.hbs       |  40 +-
 .../components/reviewable-scores.hbs          |   8 +-
 .../components/search-advanced-options.hbs    |   4 +-
 .../templates/components/topic-progress.hbs   |   8 +-
 .../components/user-card-contents.hbs         |   6 +-
 .../components/user-fields/dropdown.hbs       |   7 +-
 .../templates/components/user-stream-item.hbs |  10 +-
 .../discourse/templates/full-page-search.hbs  |   4 +-
 .../discourse/templates/group-index.hbs       | 147 +++----
 .../discourse/templates/group-requests.hbs    |  98 ++---
 .../javascripts/discourse/templates/group.hbs |  17 +-
 .../discourse/templates/group/activity.hbs    |   4 +-
 .../discourse/templates/group/manage.hbs      |   2 +-
 .../discourse/templates/group/messages.hbs    |   5 +-
 .../discourse/templates/groups/index.hbs      |  16 +-
 .../discourse/templates/invites/show.hbs      |  20 +-
 .../mobile/components/basic-topic-list.hbs    |  96 ++---
 .../mobile/components/categories-only.hbs     | 109 ++---
 .../templates/mobile/group-index.hbs          | 103 ++---
 .../discourse/templates/modal/bookmark.hbs    | 144 +++----
 .../templates/modal/create-account.hbs        | 196 ++++-----
 .../discourse/templates/modal/flag.hbs        |  30 +-
 .../templates/modal/insert-hyperlink.hbs      |  70 ++--
 .../modal/keyboard-shortcuts-help.hbs         |  30 +-
 .../templates/modal/reorder-categories.hbs    |  32 +-
 .../modal/second-factor-add-totp.hbs          |   8 +-
 .../modal/second-factor-backup-edit.hbs       |  82 ++--
 .../modal/second-factor-edit-security-key.hbs |  15 +-
 .../templates/modal/second-factor-edit.hbs    |  15 +-
 .../discourse/templates/password-reset.hbs    |   3 +-
 .../templates/preferences-second-factor.hbs   | 293 +++++++-------
 .../templates/preferences/account.hbs         |  81 ++--
 .../discourse/templates/preferences/apps.hbs  |  44 +--
 .../templates/preferences/emails.hbs          |   2 +-
 .../templates/preferences/interface.hbs       |  26 +-
 .../templates/preferences/notifications.hbs   |   2 +-
 .../templates/preferences/profile.hbs         |  14 +-
 .../discourse/templates/preferences/tags.hbs  | 113 +++---
 .../discourse/templates/review-topics.hbs     |  46 +--
 .../discourse/templates/tags/show.hbs         |  96 ++---
 .../discourse/templates/user-invited-show.hbs |   4 +-
 .../javascripts/discourse/templates/user.hbs  | 276 +++++++------
 .../discourse/templates/user/activity.hbs     |  33 +-
 .../discourse/templates/user/bookmarks.hbs    |  68 ++--
 .../discourse/templates/user/messages.hbs     |   9 +-
 .../templates/user/notifications.hbs          |  20 +-
 .../discourse/templates/user/summary.hbs      | 298 +++++++-------
 .../templates/components/multi-select.hbs     |  10 +-
 .../templates/components/single-select.hbs    |  10 +-
 .../components/wizard-field-checkbox.hbs      |  11 +-
 101 files changed, 2543 insertions(+), 2489 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 232c2549ca..f5ff55a03d 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -6,7 +6,7 @@ module.exports = {
   // "eol-last": "always",
 
   rules: {
-    "block-indentation": false,
+    "block-indentation": true,
     "deprecated-render-helper": true,
     "img-alt-attributes": false,
     "linebreak-style": true,
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index 2396114db6..dacf526c53 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -1,35 +1,33 @@
 {{#admin-wrapper class="container"}}
   <div class="row">
     <div class="full-width">
-    <div class="admin-main-nav">
-
-      <ul class="nav nav-pills">
-
-        {{nav-item route='admin.dashboard' label='admin.dashboard.title'}}
-        {{#if currentUser.admin}}
-          {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}}
-        {{/if}}
-        {{nav-item route='adminUsersList' label='admin.users.title'}}
-        {{#if showGroups}}
-          {{nav-item route='groups' label='admin.groups.title'}}
-        {{/if}}
-        {{#if showBadges}}
-          {{nav-item route='adminBadges' label='admin.badges.title'}}
-        {{/if}}
-        {{#if currentUser.admin}}
-          {{nav-item route='adminEmail' label='admin.email.title'}}
-        {{/if}}
-        {{nav-item route='adminLogs' label='admin.logs.title'}}
-        {{#if currentUser.admin}}
-          {{nav-item route='adminCustomize' label='admin.customize.title'}}
-          {{nav-item route='adminApi' label='admin.api.title'}}
-          {{#if siteSettings.enable_backups}}
-            {{nav-item route='admin.backups' label='admin.backups.title'}}
+      <div class="admin-main-nav">
+        <ul class="nav nav-pills">
+          {{nav-item route='admin.dashboard' label='admin.dashboard.title'}}
+          {{#if currentUser.admin}}
+            {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}}
           {{/if}}
-        {{/if}}
-        {{nav-item route='adminPlugins' label='admin.plugins.title'}}
-        {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}}
-      </ul>
+          {{nav-item route='adminUsersList' label='admin.users.title'}}
+          {{#if showGroups}}
+            {{nav-item route='groups' label='admin.groups.title'}}
+          {{/if}}
+          {{#if showBadges}}
+            {{nav-item route='adminBadges' label='admin.badges.title'}}
+          {{/if}}
+          {{#if currentUser.admin}}
+            {{nav-item route='adminEmail' label='admin.email.title'}}
+          {{/if}}
+          {{nav-item route='adminLogs' label='admin.logs.title'}}
+          {{#if currentUser.admin}}
+            {{nav-item route='adminCustomize' label='admin.customize.title'}}
+            {{nav-item route='adminApi' label='admin.api.title'}}
+            {{#if siteSettings.enable_backups}}
+              {{nav-item route='admin.backups' label='admin.backups.title'}}
+            {{/if}}
+          {{/if}}
+          {{nav-item route='adminPlugins' label='admin.plugins.title'}}
+          {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}}
+        </ul>
       </div>
 
       <div class='boxed white admin-content'>
@@ -37,7 +35,6 @@
           {{outlet}}
         </div>
       </div>
-
     </div>
   </div>
 {{/admin-wrapper}}
diff --git a/app/assets/javascripts/admin/templates/api-keys-index.hbs b/app/assets/javascripts/admin/templates/api-keys-index.hbs
index bd91228055..0672b99f4f 100644
--- a/app/assets/javascripts/admin/templates/api-keys-index.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-index.hbs
@@ -6,65 +6,65 @@
 
 {{#if model}}
   <table class="api-keys grid">
-  <thead>
-    <th>{{i18n "admin.api.key"}}</th>
-    <th>{{i18n "admin.api.description"}}</th>
-    <th>{{i18n "admin.api.user"}}</th>
-    <th>{{i18n "admin.api.created"}}</th>
-    <th>{{i18n "admin.api.last_used"}}</th>
-    <th>&nbsp;</th>
-  </thead>
-  <tbody>
-    {{#each model as |k|}}
-      <tr class={{if k.revoked_at "revoked"}}>
-        <td class="key">
-          {{#if k.revoked_at}}{{d-icon 'times-circle'}}{{/if}}
-          {{k.truncatedKey}}
-        </td>
-        <td class="key-description">
-          {{k.shortDescription}}
-        </td>
-        <td class="key-user">
-          <div class="label">{{i18n 'admin.api.user'}}</div>
-          {{#if k.user}}
-            {{#link-to "adminUser" k.user}}
-              {{avatar k.user imageSize="small"}}
-            {{/link-to}}
-          {{else}}
-            {{i18n "admin.api.all_users"}}
-          {{/if}}
-        </td>
-        <td class="key-created">
-          <div class="label">{{i18n 'admin.api.created'}}</div>
-          {{format-date k.created_at}}
-        </td>
-        <td class="key-last-used">
-          <div class="label">{{i18n 'admin.api.last_used'}}</div>
-          {{#if k.last_used_at}}
-            {{format-date k.last_used_at}}
-          {{else}}
-            {{i18n "admin.api.never_used"}}
-          {{/if}}
-        </td>
-        <td class="key-controls">
-          {{d-button action=(route-action "show" k) icon="far-eye" title="admin.api.show_details"}}
-          {{#if k.revoked_at}}
-            {{d-button
-              action=(action "undoRevokeKey")
-              actionParam=k icon="undo"
-              title="admin.api.undo_revoke"}}
-          {{else}}
-            {{d-button
-              class="btn-danger"
-              action=(action "revokeKey")
-              actionParam=k
-              icon="times"
-              title="admin.api.revoke"}}
-          {{/if}}
-        </td>
-      </tr>
-    {{/each}}
-  </tbody>
+    <thead>
+      <th>{{i18n "admin.api.key"}}</th>
+      <th>{{i18n "admin.api.description"}}</th>
+      <th>{{i18n "admin.api.user"}}</th>
+      <th>{{i18n "admin.api.created"}}</th>
+      <th>{{i18n "admin.api.last_used"}}</th>
+      <th>&nbsp;</th>
+    </thead>
+    <tbody>
+      {{#each model as |k|}}
+        <tr class={{if k.revoked_at "revoked"}}>
+          <td class="key">
+            {{#if k.revoked_at}}{{d-icon 'times-circle'}}{{/if}}
+            {{k.truncatedKey}}
+          </td>
+          <td class="key-description">
+            {{k.shortDescription}}
+          </td>
+          <td class="key-user">
+            <div class="label">{{i18n 'admin.api.user'}}</div>
+            {{#if k.user}}
+              {{#link-to "adminUser" k.user}}
+                {{avatar k.user imageSize="small"}}
+              {{/link-to}}
+            {{else}}
+              {{i18n "admin.api.all_users"}}
+            {{/if}}
+          </td>
+          <td class="key-created">
+            <div class="label">{{i18n 'admin.api.created'}}</div>
+            {{format-date k.created_at}}
+          </td>
+          <td class="key-last-used">
+            <div class="label">{{i18n 'admin.api.last_used'}}</div>
+            {{#if k.last_used_at}}
+              {{format-date k.last_used_at}}
+            {{else}}
+              {{i18n "admin.api.never_used"}}
+            {{/if}}
+          </td>
+          <td class="key-controls">
+            {{d-button action=(route-action "show" k) icon="far-eye" title="admin.api.show_details"}}
+            {{#if k.revoked_at}}
+              {{d-button
+                action=(action "undoRevokeKey")
+                actionParam=k icon="undo"
+                title="admin.api.undo_revoke"}}
+            {{else}}
+              {{d-button
+                class="btn-danger"
+                action=(action "revokeKey")
+                actionParam=k
+                icon="times"
+                title="admin.api.revoke"}}
+            {{/if}}
+          </td>
+        </tr>
+      {{/each}}
+    </tbody>
   </table>
 {{else}}
   <p>{{i18n "admin.api.none"}}</p>
diff --git a/app/assets/javascripts/admin/templates/api-keys-show.hbs b/app/assets/javascripts/admin/templates/api-keys-show.hbs
index b96bc109b3..736a4ef777 100644
--- a/app/assets/javascripts/admin/templates/api-keys-show.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-show.hbs
@@ -30,11 +30,11 @@
 
   {{#admin-form-row label="admin.api.user"}}
     {{#if model.user}}
-        {{#link-to "adminUser" model.user}}
-            {{avatar model.user imageSize="small"}} {{model.user.username}}
-        {{/link-to}}
+      {{#link-to "adminUser" model.user}}
+        {{avatar model.user imageSize="small"}} {{model.user.username}}
+      {{/link-to}}
     {{else}}
-        {{i18n "admin.api.all_users"}}
+      {{i18n "admin.api.all_users"}}
     {{/if}}
   {{/admin-form-row}}
 
diff --git a/app/assets/javascripts/admin/templates/backups-index.hbs b/app/assets/javascripts/admin/templates/backups-index.hbs
index 9bfbfc2181..8c5e593a63 100644
--- a/app/assets/javascripts/admin/templates/backups-index.hbs
+++ b/app/assets/javascripts/admin/templates/backups-index.hbs
@@ -41,57 +41,57 @@
     <th></th>
   </thead>
   <tbody>
-  {{#each model as |backup|}}
-    <tr>
-      <td class="backup-filename">{{backup.filename}}</td>
-      <td class="backup-size">{{human-size backup.size}}</td>
-      <td class="backup-controls">
-        <div>
-          {{d-button class="btn-default download"
-             action=(action "download")
-             actionParam=backup
-             icon="download"
-             title="admin.backups.operations.download.title"
-             label="admin.backups.operations.download.label"}}
-          {{#if status.isOperationRunning}}
-            {{d-button
-              icon="far-trash-alt"
-              action=(route-action "destroyBackup")
-              actionParam=backup class="btn-danger"
-              disabled="true"
-              title="admin.backups.operations.is_running"}}
-            {{d-button
-              icon="play"
-              action=(route-action "startRestore")
-              actionParam=backup disabled=status.restoreDisabled
-              class="btn-default"
-              title=restoreTitle
-              label="admin.backups.operations.restore.label"}}
-          {{else}}
-            {{d-button
-              icon="far-trash-alt"
-              action=(route-action "destroyBackup")
-              actionParam=backup
-              class="btn-danger"
-              title="admin.backups.operations.destroy.title"}}
-            {{d-button
-              icon="play"
-              action=(route-action "startRestore")
-              actionParam=backup
-              disabled=status.restoreDisabled
-              class="btn-default btn-restore"
-              title=restoreTitle
-              label="admin.backups.operations.restore.label"}}
-          {{/if}}
-        </div>
-      </td>
-    </tr>
-  {{else}}
-    <tr>
-      <td>{{i18n "admin.backups.none"}}</td>
-      <td></td>
-      <td></td>
-    </tr>
-  {{/each}}
+    {{#each model as |backup|}}
+      <tr>
+        <td class="backup-filename">{{backup.filename}}</td>
+        <td class="backup-size">{{human-size backup.size}}</td>
+        <td class="backup-controls">
+          <div>
+            {{d-button class="btn-default download"
+               action=(action "download")
+               actionParam=backup
+               icon="download"
+               title="admin.backups.operations.download.title"
+               label="admin.backups.operations.download.label"}}
+            {{#if status.isOperationRunning}}
+              {{d-button
+                icon="far-trash-alt"
+                action=(route-action "destroyBackup")
+                actionParam=backup class="btn-danger"
+                disabled="true"
+                title="admin.backups.operations.is_running"}}
+              {{d-button
+                icon="play"
+                action=(route-action "startRestore")
+                actionParam=backup disabled=status.restoreDisabled
+                class="btn-default"
+                title=restoreTitle
+                label="admin.backups.operations.restore.label"}}
+            {{else}}
+              {{d-button
+                icon="far-trash-alt"
+                action=(route-action "destroyBackup")
+                actionParam=backup
+                class="btn-danger"
+                title="admin.backups.operations.destroy.title"}}
+              {{d-button
+                icon="play"
+                action=(route-action "startRestore")
+                actionParam=backup
+                disabled=status.restoreDisabled
+                class="btn-default btn-restore"
+                title=restoreTitle
+                label="admin.backups.operations.restore.label"}}
+            {{/if}}
+          </div>
+        </td>
+      </tr>
+    {{else}}
+      <tr>
+        <td>{{i18n "admin.backups.none"}}</td>
+        <td></td>
+        <td></td>
+      </tr>
+    {{/each}}
   </tbody>
 </table>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
index 76c8eacb0b..9b7f797d03 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
@@ -8,7 +8,7 @@
         {{data.x}}
       </span>
       <span class="value">
-          {{number data.y}}
+        {{number data.y}}
       </span>
     </a>
   {{/each}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 48bd58cab9..15d7314622 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -1,202 +1,202 @@
 {{#if isEnabled}}
-{{#conditional-loading-section isLoading=isLoading}}
-  {{#if showHeader}}
-    <div class="header">
-      {{#if showTitle}}
-        <ul class="breadcrumb">
-          {{#if showAllReportsLink}}
-            <li class="item all-reports">
-              {{#link-to "admin.dashboardReports" class="report-url"}}
-                {{i18n "admin.dashboard.all_reports"}}
-              {{/link-to}}
-            </li>
+  {{#conditional-loading-section isLoading=isLoading}}
+    {{#if showHeader}}
+      <div class="header">
+        {{#if showTitle}}
+          <ul class="breadcrumb">
+            {{#if showAllReportsLink}}
+              <li class="item all-reports">
+                {{#link-to "admin.dashboardReports" class="report-url"}}
+                  {{i18n "admin.dashboard.all_reports"}}
+                {{/link-to}}
+              </li>
+
+              {{#unless showNotFoundError}}
+                <li class="item separator">|</li>
+              {{/unless}}
+            {{/if}}
 
             {{#unless showNotFoundError}}
-              <li class="item separator">|</li>
-            {{/unless}}
-          {{/if}}
-
-          {{#unless showNotFoundError}}
-          <li class="item report">
-            <a href={{model.reportUrl}} class="report-url">
-              {{model.title}}
-            </a>
-
-            {{#if model.description}}
-              {{#if model.description_link}}
-                <a target="_blank" rel="noopener" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
-                  {{d-icon "question-circle"}}
-                </a>
-              {{else}}
-                <span class="info" data-tooltip={{model.description}}>
-                  {{d-icon "question-circle"}}
-                </span>
-              {{/if}}
-            {{/if}}
-          </li>
-          {{/unless}}
-        </ul>
-      {{/if}}
-
-      {{#if shouldDisplayTrend}}
-        <div class="trend {{model.trend}}">
-          <span class="value" title={{model.trendTitle}}>
-            {{#if model.average}}
-              {{number model.currentAverage}}{{#if model.percent}}%{{/if}}
-            {{else}}
-              {{number model.currentTotal noTitle="true"}}{{#if model.percent}}%{{/if}}
-            {{/if}}
-
-            {{#if model.trendIcon}}
-              {{d-icon model.trendIcon class="icon"}}
-            {{/if}}
-          </span>
-        </div>
-      {{/if}}
-    </div>
-  {{/if}}
-
-  <div class="body">
-    <div class="main">
-      {{#if showError}}
-        {{#if showTimeoutError}}
-          <div class="alert alert-error report-alert timeout">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.timeout_error"}}</span>
-          </div>
-        {{/if}}
-
-        {{#if showExceptionError}}
-          <div class="alert alert-error report-alert exception">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.exception_error"}}</span>
-          </div>
-        {{/if}}
-
-        {{#if showNotFoundError}}
-          <div class="alert alert-error report-alert not-found">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.not_found_error"}}</span>
-          </div>
-        {{/if}}
-      {{else}}
-        {{#if hasData}}
-          {{#if currentMode}}
-            {{component modeComponent model=model options=options}}
-
-            {{#if model.relatedReport}}
-              {{admin-report showFilteringUI=false dataSourceName=model.relatedReport.type}}
-            {{/if}}
-          {{/if}}
-        {{else}}
-          {{#if rateLimitationString}}
-            <div class="alert alert-error report-alert rate-limited">
-              {{d-icon "thermometer-three-quarters"}}
-              <span>{{rateLimitationString}}</span>
-            </div>
-          {{else}}
-            <div class="alert alert-info report-alert no-data">
-              {{d-icon "chart-pie"}}
-              {{#if model.reportUrl}}
+              <li class="item report">
                 <a href={{model.reportUrl}} class="report-url">
-                  <span>
-                    {{#if model.title}}
-                      {{model.title}} —
-                    {{/if}}
-                    {{i18n "admin.dashboard.reports.no_data"}}
-                  </span>
+                  {{model.title}}
                 </a>
+
+                {{#if model.description}}
+                  {{#if model.description_link}}
+                    <a target="_blank" rel="noopener" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
+                      {{d-icon "question-circle"}}
+                    </a>
+                  {{else}}
+                    <span class="info" data-tooltip={{model.description}}>
+                      {{d-icon "question-circle"}}
+                    </span>
+                  {{/if}}
+                {{/if}}
+              </li>
+            {{/unless}}
+          </ul>
+        {{/if}}
+
+        {{#if shouldDisplayTrend}}
+          <div class="trend {{model.trend}}">
+            <span class="value" title={{model.trendTitle}}>
+              {{#if model.average}}
+                {{number model.currentAverage}}{{#if model.percent}}%{{/if}}
               {{else}}
-                <span>{{i18n "admin.dashboard.reports.no_data"}}</span>
+                {{number model.currentTotal noTitle="true"}}{{#if model.percent}}%{{/if}}
               {{/if}}
-            </div>
-          {{/if}}
-        {{/if}}
-      {{/if}}
-    </div>
 
-    {{#if showFilteringUI}}
-      <div class="filters">
-        {{#if showModes}}
-          <div class="modes">
-            {{#each displayedModes as |displayedMode|}}
-              {{d-button
-                action=(action "changeMode")
-                actionParam=displayedMode.mode
-                class=displayedMode.cssClass
-                icon=displayedMode.icon}}
-            {{/each}}
-          </div>
-        {{/if}}
-
-        {{#if showDatesOptions}}
-          <div class="control">
-            <span class="label">
-              {{i18n 'admin.dashboard.reports.start_date'}}
+              {{#if model.trendIcon}}
+                {{d-icon model.trendIcon class="icon"}}
+              {{/if}}
             </span>
-
-            <div class="input">
-              {{date-input
-                date=startDate
-                onChange=(action "onChangeStartDate")
-              }}
-            </div>
-          </div>
-
-          <div class="control">
-            <span class="label">
-              {{i18n 'admin.dashboard.reports.end_date'}}
-            </span>
-
-            <div class="input">
-              {{date-input
-                date=endDate
-                onChange=(action "onChangeEndDate")
-              }}
-            </div>
-          </div>
-        {{/if}}
-
-        {{#each model.available_filters as |filter|}}
-          <div class="control">
-            <span class="label">
-              {{i18n (concat "admin.dashboard.reports.filters." filter.id ".label")}}
-            </span>
-
-            <div class="input">
-              {{component
-                (concat "report-filters/" filter.id)
-                filter=filter
-                applyFilter=(action "applyFilter")}}
-            </div>
-          </div>
-        {{/each}}
-
-        <div class="control">
-          <div class="input">
-            {{d-button
-              class="btn-default export-csv-btn"
-              action=(action "exportCsv")
-              label="admin.export_csv.button_text"
-              icon="download"}}
-          </div>
-        </div>
-
-        {{#if showRefresh}}
-          <div class="control">
-            <div class="input">
-              {{d-button
-                class="refresh-report-btn btn-primary"
-                action=(action "refreshReport")
-                label="admin.dashboard.reports.refresh_report"
-                icon="sync"}}
-            </div>
           </div>
         {{/if}}
       </div>
     {{/if}}
-  </div>
-{{/conditional-loading-section}}
+
+    <div class="body">
+      <div class="main">
+        {{#if showError}}
+          {{#if showTimeoutError}}
+            <div class="alert alert-error report-alert timeout">
+              {{d-icon "exclamation-triangle"}}
+              <span>{{i18n "admin.dashboard.timeout_error"}}</span>
+            </div>
+          {{/if}}
+
+          {{#if showExceptionError}}
+            <div class="alert alert-error report-alert exception">
+              {{d-icon "exclamation-triangle"}}
+              <span>{{i18n "admin.dashboard.exception_error"}}</span>
+            </div>
+          {{/if}}
+
+          {{#if showNotFoundError}}
+            <div class="alert alert-error report-alert not-found">
+              {{d-icon "exclamation-triangle"}}
+              <span>{{i18n "admin.dashboard.not_found_error"}}</span>
+            </div>
+          {{/if}}
+        {{else}}
+          {{#if hasData}}
+            {{#if currentMode}}
+              {{component modeComponent model=model options=options}}
+
+              {{#if model.relatedReport}}
+                {{admin-report showFilteringUI=false dataSourceName=model.relatedReport.type}}
+              {{/if}}
+            {{/if}}
+          {{else}}
+            {{#if rateLimitationString}}
+              <div class="alert alert-error report-alert rate-limited">
+                {{d-icon "thermometer-three-quarters"}}
+                <span>{{rateLimitationString}}</span>
+              </div>
+            {{else}}
+              <div class="alert alert-info report-alert no-data">
+                {{d-icon "chart-pie"}}
+                {{#if model.reportUrl}}
+                  <a href={{model.reportUrl}} class="report-url">
+                    <span>
+                      {{#if model.title}}
+                        {{model.title}} —
+                      {{/if}}
+                      {{i18n "admin.dashboard.reports.no_data"}}
+                    </span>
+                  </a>
+                {{else}}
+                  <span>{{i18n "admin.dashboard.reports.no_data"}}</span>
+                {{/if}}
+              </div>
+            {{/if}}
+          {{/if}}
+        {{/if}}
+      </div>
+
+      {{#if showFilteringUI}}
+        <div class="filters">
+          {{#if showModes}}
+            <div class="modes">
+              {{#each displayedModes as |displayedMode|}}
+                {{d-button
+                  action=(action "changeMode")
+                  actionParam=displayedMode.mode
+                  class=displayedMode.cssClass
+                  icon=displayedMode.icon}}
+              {{/each}}
+            </div>
+          {{/if}}
+
+          {{#if showDatesOptions}}
+            <div class="control">
+              <span class="label">
+                {{i18n 'admin.dashboard.reports.start_date'}}
+              </span>
+
+              <div class="input">
+                {{date-input
+                  date=startDate
+                  onChange=(action "onChangeStartDate")
+                }}
+              </div>
+            </div>
+
+            <div class="control">
+              <span class="label">
+                {{i18n 'admin.dashboard.reports.end_date'}}
+              </span>
+
+              <div class="input">
+                {{date-input
+                  date=endDate
+                  onChange=(action "onChangeEndDate")
+                }}
+              </div>
+            </div>
+          {{/if}}
+
+          {{#each model.available_filters as |filter|}}
+            <div class="control">
+              <span class="label">
+                {{i18n (concat "admin.dashboard.reports.filters." filter.id ".label")}}
+              </span>
+
+              <div class="input">
+                {{component
+                  (concat "report-filters/" filter.id)
+                  filter=filter
+                  applyFilter=(action "applyFilter")}}
+              </div>
+            </div>
+          {{/each}}
+
+          <div class="control">
+            <div class="input">
+              {{d-button
+                class="btn-default export-csv-btn"
+                action=(action "exportCsv")
+                label="admin.export_csv.button_text"
+                icon="download"}}
+            </div>
+          </div>
+
+          {{#if showRefresh}}
+            <div class="control">
+              <div class="input">
+                {{d-button
+                  class="refresh-report-btn btn-primary"
+                  action=(action "refreshReport")
+                  label="admin.dashboard.reports.refresh_report"
+                  icon="sync"}}
+              </div>
+            </div>
+          {{/if}}
+        </div>
+      {{/if}}
+    </div>
+  {{/conditional-loading-section}}
 {{else}}
   <div class="alert alert-info">
     {{html-safe disabledLabel}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
index ba31c888c3..3f9e09eec8 100644
--- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
@@ -1,94 +1,90 @@
 <div class='edit-main-nav admin-controls'>
-    <nav>
+  <nav>
     <ul class='nav nav-pills target'>
-        {{#each visibleTargets as |target|}}
+      {{#each visibleTargets as |target|}}
         <li>
-            {{#link-to editRouteName
-                theme.id
-                target.name
-                fieldName
-                replace=true
-                title=field.title
-                class=(if target.edited 'edited' 'blank')
-            }}
+          {{#link-to editRouteName
+            theme.id
+            target.name
+            fieldName
+            replace=true
+            title=field.title
+            class=(if target.edited 'edited' 'blank')
+          }}
             {{#if target.error}}{{d-icon 'exclamation-triangle'}}{{/if}}
-            {{#if target.icon}}
-                {{d-icon target.icon}}
-            {{/if}}
+            {{#if target.icon}}{{d-icon target.icon}}{{/if}}
             {{i18n (concat 'admin.customize.theme.' target.name)}}
-            {{/link-to}}
+          {{/link-to}}
         </li>
-        {{/each}}
+      {{/each}}
 
-        {{#if allowAdvanced}}
+      {{#if allowAdvanced}}
         <li>
-            <a {{action "toggleShowAdvanced"}}
-                class='no-text'
-                href
-                title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}
-            >
-                {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
-            </a>
+          <a {{action "toggleShowAdvanced"}}
+            class='no-text'
+            href
+            title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}>
+            {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
+          </a>
         </li>
-        {{/if}}
-
-        <li class="spacer"></li>
-        <li>
+      {{/if}}
+      <li class="spacer"></li>
+      <li>
         <label>
-            {{input type="checkbox" checked=onlyOverridden click=(action "onlyOverriddenChanged" value="target.checked")}}
-            {{i18n 'admin.customize.theme.hide_unused_fields'}}
+          {{input type="checkbox" checked=onlyOverridden click=(action "onlyOverriddenChanged" value="target.checked")}}
+          {{i18n 'admin.customize.theme.hide_unused_fields'}}
         </label>
-        </li>
+      </li>
     </ul>
-    </nav>
+  </nav>
 </div>
 
 <div class='admin-controls'>
-    <nav>
+  <nav>
     <ul class='nav nav-pills fields'>
-        {{#each visibleFields as |field|}}
+      {{#each visibleFields as |field|}}
         <li>
-            {{#link-to editRouteName
+          {{#link-to editRouteName
             theme.id
             currentTargetName
             field.name
             replace=true
             title=field.title
             class=(if field.edited 'edited' 'blank')
-            }}
+          }}
             {{#if field.error}}{{d-icon 'exclamation-triangle'}}{{/if}}
             {{#if field.icon}}{{d-icon field.icon}}{{/if}}
             {{field.translatedName}}
-
-            {{/link-to}}
+          {{/link-to}}
         </li>
-        {{/each}}
+      {{/each}}
 
-        {{#if showAddField}}
+      {{#if showAddField}}
         <li>
-            {{#if addingField}}
+          {{#if addingField}}
             {{input type=text value=newFieldName enter=(action 'addField') escape-press=(action "cancelAddField")}}
             {{d-button class="ok" action=(action "addField" newFieldName) icon="check"}}
             {{d-button class="cancel" action=(action "cancelAddField") icon="times"}}
-            {{else}}
+          {{else}}
             <a href {{action "toggleAddField" currentTargetName}} class="no-text">
-            {{d-icon "plus"}}
+              {{d-icon "plus"}}
             </a>
-            {{/if}}
+          {{/if}}
         </li>
-        {{/if}}
-        <li class='spacer'></li>
-        <li>
+      {{/if}}
+
+      <li class='spacer'></li>
+      <li>
         <a href {{action "toggleMaximize"}} class="no-text">
           {{d-icon maximizeIcon}}
         </a>
-        </li>
+      </li>
     </ul>
-    </nav>
+  </nav>
 </div>
 
 {{#if error}}
-    <pre class='field-error'>{{error}}</pre>
+  <pre class='field-error'>{{error}}</pre>
 {{/if}}
 
 {{ace-editor content=activeSection editorId=editorId mode=activeSectionMode autofocus="true"}}
diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
index b7833d621d..393cf15165 100644
--- a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
@@ -3,10 +3,10 @@
     <div class="label">{{i18n "admin.embedding.host"}}</div>
     {{input value=buffered.host placeholder="example.com" enter=(action "save") class="host-name"}}
   </td>
-	<td class="editing-input">
+  <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.class_name"}}</div>
     {{input value=buffered.class_name placeholder="class" enter=(action "save") class="class-name"}}
-	</td>
+  </td>
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.path_whitelist"}}</div>
     {{input value=buffered.path_whitelist placeholder="/blog/.*" enter=(action "save") class="path-whitelist"}}
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index bdcb21cbc5..f34559ec3d 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -3,11 +3,12 @@
     <div class='silence-reason-label'>
       {{html-safe (i18n 'admin.user.silence_reason_label')}}
     </div>
-    </label>
-    {{text-field
-      value=reason
-      class="silence-reason"
-      placeholderKey="admin.user.silence_reason_placeholder"}}
+  </label>
+  {{text-field
+    value=reason
+    class="silence-reason"
+    placeholderKey="admin.user.silence_reason_placeholder"
+  }}
 </div>
 
 <label>
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 23eee45b6d..6984723cd6 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -1,8 +1,8 @@
 <div class='setting-label'>
-   <h3>{{settingName}}</h3>
-   {{#if defaultIsAvailable}}
-     <a href onClick={{action 'setDefaultValues'}}>{{setting.setDefaultValuesLabel}}</a>
-   {{/if}}
+  <h3>{{settingName}}</h3>
+  {{#if defaultIsAvailable}}
+    <a href onClick={{action 'setDefaultValues'}}>{{setting.setDefaultValuesLabel}}</a>
+  {{/if}}
 </div>
 <div class="setting-value">
   {{component componentName setting=setting value=buffered.value validationMessage=validationMessage preview=preview isSecret=isSecret allowAny=allowAny}}
diff --git a/app/assets/javascripts/admin/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
index ca912cfc33..825095909e 100644
--- a/app/assets/javascripts/admin/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
@@ -3,31 +3,35 @@
     <h1>{{#if model.theme_id}}{{model.name}}{{else}}{{text-field class="style-name" value=model.name}}{{/if}}</h1>
     <div class="controls">
       {{#unless model.theme_id}}
-      {{d-button
-        class="btn-primary"
-        action=(action "save")
-        disabled=model.disableSave
-        label="admin.customize.save"}}
+        {{d-button
+          class="btn-primary"
+          action=(action "save")
+          disabled=model.disableSave
+          label="admin.customize.save"
+        }}
       {{/unless}}
       {{d-button
         class="btn-default"
         action=(action "copy" model)
         icon="copy"
-        label="admin.customize.copy"}}
+        label="admin.customize.copy"
+      }}
       {{d-button
         class="btn-default"
         action=(action "copyToClipboard" model)
         icon="far-clipboard"
-        label="admin.customize.copy_to_clipboard"}}
+        label="admin.customize.copy_to_clipboard"
+      }}
       {{#if model.theme_id}}
-      {{i18n "admin.customize.theme_owner"}}
-      {{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}}
+        {{i18n "admin.customize.theme_owner"}}
+        {{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}}
       {{else}}
-      {{d-button
-        action=(action "destroy")
-        class="btn-danger"
-        icon="far-trash-alt"
-        label="admin.customize.delete"}}
+        {{d-button
+          action=(action "destroy")
+          class="btn-danger"
+          icon="far-trash-alt"
+          label="admin.customize.delete"
+        }}
       {{/if}}
       <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
     </div>
@@ -44,40 +48,40 @@
     </div>
 
     {{#if colors.length}}
-    <table class="table colors">
-      <thead>
-        <tr>
-          <th></th>
-          <th class="hex">{{i18n 'admin.customize.color'}}</th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-        {{#each colors as |c|}}
-          <tr class="{{if c.changed 'changed'}} {{if c.valid 'valid' 'invalid'}}">
-            <td class="name" title={{c.name}}>
-              <h3>{{c.translatedName}}</h3>
-              <p class="description">{{c.description}}</p>
-            </td>
-            <td class="hex">{{color-input hexValue=c.hex brightnessValue=c.brightness valid=c.valid}}</td>
-            <td class="actions">
-            {{#unless model.theme_id}}
-              {{d-button
-                class=(concat "btn-default revert " (unless c.savedIsOverriden "invisible"))
-                action=(action "revert" c)
-                title="admin.customize.colors.revert_title"
-                label="revert"}}
-              {{d-button
-                class=(concat "btn-default undo " (unless c.changed "invisible"))
-                action=(action "undo" c)
-                title="admin.customize.colors.undo_title"
-                label="undo"}}
-            {{/unless}}
-            </td>
+      <table class="table colors">
+        <thead>
+          <tr>
+            <th></th>
+            <th class="hex">{{i18n 'admin.customize.color'}}</th>
+            <th></th>
           </tr>
-        {{/each}}
-      </tbody>
-    </table>
+        </thead>
+        <tbody>
+          {{#each colors as |c|}}
+            <tr class="{{if c.changed 'changed'}} {{if c.valid 'valid' 'invalid'}}">
+              <td class="name" title={{c.name}}>
+                <h3>{{c.translatedName}}</h3>
+                <p class="description">{{c.description}}</p>
+              </td>
+              <td class="hex">{{color-input hexValue=c.hex brightnessValue=c.brightness valid=c.valid}}</td>
+              <td class="actions">
+                {{#unless model.theme_id}}
+                  {{d-button
+                    class=(concat "btn-default revert " (unless c.savedIsOverriden "invisible"))
+                    action=(action "revert" c)
+                    title="admin.customize.colors.revert_title"
+                    label="revert"}}
+                  {{d-button
+                    class=(concat "btn-default undo " (unless c.changed "invisible"))
+                    action=(action "undo" c)
+                    title="admin.customize.colors.undo_title"
+                    label="undo"}}
+                {{/unless}}
+              </td>
+            </tr>
+          {{/each}}
+        </tbody>
+      </table>
     {{else}}
       <p>{{i18n 'search.no_results'}}</p>
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 32ad33db10..1c17f0b99b 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -2,7 +2,7 @@
   <img src={{womanArtistEmojiURL}}>
   <div class="content-wrapper">
     <h1>{{i18n "admin.customize.theme.themes_intro"}}</h1>
-     <div class="create-actions">
+    <div class="create-actions">
       {{d-button action=(route-action "installModal") icon="upload" label="admin.customize.install" class="btn-primary"}}
     </div>
     <div class="external-resources">
diff --git a/app/assets/javascripts/admin/templates/dashboard_reports.hbs b/app/assets/javascripts/admin/templates/dashboard_reports.hbs
index d6666cee71..e5660e9c50 100644
--- a/app/assets/javascripts/admin/templates/dashboard_reports.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_reports.hbs
@@ -1,12 +1,13 @@
 {{#conditional-loading-spinner condition=isLoading}}
-   <div class="reports-index section">
-     <div class="section-title">
-       <h2>{{i18n "admin.reports.title"}}</h2>
+  <div class="reports-index section">
+    <div class="section-title">
+      <h2>{{i18n "admin.reports.title"}}</h2>
       {{input
         class="filter-reports-input"
         input=(action "filterReports" value="target.value")
         placeholder=(i18n "admin.dashboard.filter_reports")
-        autofocus=true}}
+        autofocus=true
+      }}
     </div>
 
     <ul class="reports-list">
@@ -14,12 +15,11 @@
         <li class="report">
           {{#link-to 'adminReports.show' report.type}}
             <h3 class="report-title">{{report.title}}</h3>
-
             {{#if report.description}}
-            <p class="report-description">
-              {{report.description}}
-            </p>
-          {{/if}}
+              <p class="report-description">
+                {{report.description}}
+              </p>
+            {{/if}}
           {{/link-to}}
         </li>
       {{/each}}
diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
index f0dcaa5c6a..fe55b11009 100644
--- a/app/assets/javascripts/admin/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
@@ -5,23 +5,21 @@
   {{textarea name="email" value=email class="email-body"}}
   {{d-button
     action=(action "run")
-    label="admin.email.advanced_test.run"}}
+    label="admin.email.advanced_test.run"
+  }}
 </div>
 
 {{#conditional-loading-spinner condition=loading}}
-
-{{#if format}}
-  <hr>
-  <div class="text">
-    <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
-    <pre class="full-reason">{{html-safe text}}</pre>
-  </div>
-
-  <hr>
-  <div class="elided">
-    <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
-    <pre class="full-reason">{{html-safe elided}}</pre>
-  </div>
-{{/if}}
-
+  {{#if format}}
+    <hr>
+    <div class="text">
+      <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
+      <pre class="full-reason">{{html-safe text}}</pre>
+    </div>
+    <hr>
+    <div class="elided">
+      <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
+      <pre class="full-reason">{{html-safe elided}}</pre>
+    </div>
+  {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 0dfcb04531..82217bacfb 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -13,8 +13,11 @@
     <div class="toggle">
       <label>{{i18n 'admin.email.format'}}</label>
       {{#if showHtml}}
-        <span>{{i18n 'admin.email.html'}}</span> | <a href
-         {{action "toggleShowHtml"}}>{{i18n 'admin.email.text'}}</a>
+        <span>{{i18n 'admin.email.html'}}</span>
+         |
+        <a href {{action "toggleShowHtml"}}>
+          {{i18n 'admin.email.text'}}
+        </a>
       {{else}}
         <a href {{action "toggleShowHtml"}}>{{i18n 'admin.email.html'}}</a> |
         <span>{{i18n 'admin.email.text'}}</span>
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index 2a5d39f12c..b9422bbb11 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -9,9 +9,9 @@
         <th style='width: 10%'>&nbsp;</th>
       </thead>
       <tbody>
-      {{#each embedding.embeddable_hosts as |host|}}
-        {{embeddable-host host=host deleteHost=(action "deleteHost")}}
-      {{/each}}
+        {{#each embedding.embeddable_hosts as |host|}}
+          {{embeddable-host host=host deleteHost=(action "deleteHost")}}
+        {{/each}}
       </tbody>
     </table>
   {{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
index e8cb30140c..6cc1239783 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
@@ -25,21 +25,21 @@
         <th class="action"></th>
       </thead>
       <tbody>
-      {{#each model as |item|}}
-        <tr class="admin-list-item">
-          <td class="col first email">
-            <div class="overflow-ellipsis" title={{item.email}}>{{item.email}}</div>
-          </td>
-          <td class="action">{{item.actionName}}</td>
-          <td class="match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{item.match_count}}</td>
-          <td class="last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip item.last_match_at}}</td>
-          <td class="created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip item.created_at}}</td>
-          <td class="ip_address">{{item.ip_address}}</td>
-          <td class="action">
-            {{d-button action=(action "clearBlock") actionParam=item icon="check" label="admin.logs.screened_emails.actions.allow"}}
-          </td>
-        </tr>
-      {{/each}}
+        {{#each model as |item|}}
+          <tr class="admin-list-item">
+            <td class="col first email">
+              <div class="overflow-ellipsis" title={{item.email}}>{{item.email}}</div>
+            </td>
+            <td class="action">{{item.actionName}}</td>
+            <td class="match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{item.match_count}}</td>
+            <td class="last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip item.last_match_at}}</td>
+            <td class="created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip item.created_at}}</td>
+            <td class="ip_address">{{item.ip_address}}</td>
+            <td class="action">
+              {{d-button action=(action "clearBlock") actionParam=item icon="check" label="admin.logs.screened_emails.actions.allow"}}
+            </td>
+          </tr>
+        {{/each}}
       </tbody>
     </table>
 
diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
index 96a185fb17..2d256ce151 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
@@ -36,83 +36,83 @@
         <th class="col heading actions"></th>
       </thead>
       <tbody>
-      {{#each model as |item|}}
-        <tr class="admin-list-item">
-          <td class="col first ip_address">
-            {{#if item.editing}}
-              {{text-field value=item.ip_address autofocus="autofocus"}}
-            {{else}}
-              <a href {{action "edit" item}} class="inline-editable-field">
-                {{#if item.isRange}}
-                  <strong>{{item.ip_address}}</strong>
-                {{else}}
-                  {{item.ip_address}}
-                {{/if}}
-              </a>
-            {{/if}}
-          </td>
-          <td class="col action">
-            {{#if item.isBlocked}}
-              {{d-icon "ban"}}
-            {{else}}
-              {{d-icon "check"}}
-            {{/if}}
-            {{item.actionName}}
-          </td>
-          <td class="col match_count">
-            <div class="label">{{i18n "admin.logs.match_count"}}</div>
-            {{item.match_count}}
-          </td>
-          <td class="col created_at">
-            <div class="label">{{i18n "admin.logs.created_at"}}</div>
-            {{age-with-tooltip item.created_at}}
-          </td>
-          <td class="col last_match_at">
-            {{#if item.last_match_at}}
-              <div class="label">
-                {{i18n "admin.logs.last_match_at"}}
-                {{age-with-tooltip item.last_match_at}}
-              </div>
-            {{/if}}
-          </td>
-          <td class="col actions">
-            {{#if item.editing}}
-              {{d-button
-                class="btn-default"
-                action=(action "save")
-                actionParam=item
-                label="admin.logs.save"}}
-              <a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
-            {{else}}
-              {{d-button
-                class="btn-default btn-danger"
-                action=(action "destroy")
-                actionParam=item
-                icon="far-trash-alt"}}
-              {{d-button
-                class="btn-default"
-                action=(action "edit")
-                actionParam=item
-                icon="pencil-alt"}}
+        {{#each model as |item|}}
+          <tr class="admin-list-item">
+            <td class="col first ip_address">
+              {{#if item.editing}}
+                {{text-field value=item.ip_address autofocus="autofocus"}}
+              {{else}}
+                <a href {{action "edit" item}} class="inline-editable-field">
+                  {{#if item.isRange}}
+                    <strong>{{item.ip_address}}</strong>
+                  {{else}}
+                    {{item.ip_address}}
+                  {{/if}}
+                </a>
+              {{/if}}
+            </td>
+            <td class="col action">
               {{#if item.isBlocked}}
+                {{d-icon "ban"}}
+              {{else}}
+                {{d-icon "check"}}
+              {{/if}}
+              {{item.actionName}}
+            </td>
+            <td class="col match_count">
+              <div class="label">{{i18n "admin.logs.match_count"}}</div>
+              {{item.match_count}}
+            </td>
+            <td class="col created_at">
+              <div class="label">{{i18n "admin.logs.created_at"}}</div>
+              {{age-with-tooltip item.created_at}}
+            </td>
+            <td class="col last_match_at">
+              {{#if item.last_match_at}}
+                <div class="label">
+                  {{i18n "admin.logs.last_match_at"}}
+                  {{age-with-tooltip item.last_match_at}}
+                </div>
+              {{/if}}
+            </td>
+            <td class="col actions">
+              {{#if item.editing}}
                 {{d-button
                   class="btn-default"
-                  action=(action "allow")
+                  action=(action "save")
                   actionParam=item
-                  icon="check"
-                  label="admin.logs.screened_ips.actions.do_nothing"}}
+                  label="admin.logs.save"}}
+                <a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
               {{else}}
                 {{d-button
-                  class="btn-default"
-                  action=(action "block")
+                  class="btn-default btn-danger"
+                  action=(action "destroy")
                   actionParam=item
-                  icon="ban"
-                  label="admin.logs.screened_ips.actions.block"}}
+                  icon="far-trash-alt"}}
+                {{d-button
+                  class="btn-default"
+                  action=(action "edit")
+                  actionParam=item
+                  icon="pencil-alt"}}
+                {{#if item.isBlocked}}
+                  {{d-button
+                    class="btn-default"
+                    action=(action "allow")
+                    actionParam=item
+                    icon="check"
+                    label="admin.logs.screened_ips.actions.do_nothing"}}
+                {{else}}
+                  {{d-button
+                    class="btn-default"
+                    action=(action "block")
+                    actionParam=item
+                    icon="ban"
+                    label="admin.logs.screened_ips.actions.block"}}
+                {{/if}}
               {{/if}}
-            {{/if}}
-          </td>
-        </tr>
-      {{/each}}
+            </td>
+          </tr>
+        {{/each}}
       </tbody>
     </table>
   {{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
index 1ee4274368..ab3fcf1883 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
@@ -20,17 +20,17 @@
         <th class="created_at">{{i18n 'admin.logs.created_at'}}</th>
       </thead>
       <tbody>
-      {{#each model as |url|}}
-        <tr class="admin-list-item">
-          <td class="col first domain">
-            <div class="overflow-ellipsis" title={{url.domain}}>{{url.domain}}</div>
-          </td>
-          <td class="col action">{{url.actionName}}</td>
-          <td class="col match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{url.match_count}}</td>
-          <td class="col last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip url.last_match_at}}</td>
-          <td class="col created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip url.created_at}}</td>
-        </tr>
-      {{/each}}
+        {{#each model as |url|}}
+          <tr class="admin-list-item">
+            <td class="col first domain">
+              <div class="overflow-ellipsis" title={{url.domain}}>{{url.domain}}</div>
+            </td>
+            <td class="col action">{{url.actionName}}</td>
+            <td class="col match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{url.match_count}}</td>
+            <td class="col last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip url.last_match_at}}</td>
+            <td class="col created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip url.created_at}}</td>
+          </tr>
+        {{/each}}
       </tbody>
     </table>
   {{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index ab4c70d39e..5a81de8f1d 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -1,34 +1,34 @@
 <div class="staff-action-logs-controls">
   {{#if filtersExists}}
-  <div class='staff-action-logs-filters'>
-    <a href {{action "clearAllFilters"}} class="clear-filters filter">
-      <span class="label">{{i18n 'admin.logs.staff_actions.clear_filters'}}</span>
-    </a>
-    {{#if actionFilter}}
-      <a href {{action "clearFilter" "actionFilter"}} class="filter">
-        <span class="label">{{i18n 'admin.logs.action'}}</span>: {{actionFilter}}
-        {{d-icon "times-circle"}}
+    <div class='staff-action-logs-filters'>
+      <a href {{action "clearAllFilters"}} class="clear-filters filter">
+        <span class="label">{{i18n 'admin.logs.staff_actions.clear_filters'}}</span>
       </a>
-    {{/if}}
-    {{#if filters.acting_user}}
-      <a href {{action "clearFilter" "acting_user"}} class="filter">
-        <span class="label">{{i18n 'admin.logs.staff_actions.staff_user'}}</span>: {{filters.acting_user}}
-        {{d-icon "times-circle"}}
-      </a>
-    {{/if}}
-    {{#if filters.target_user}}
-      <a href {{action "clearFilter" "target_user"}} class="filter">
-        <span class="label">{{i18n 'admin.logs.staff_actions.target_user'}}</span>: {{filters.target_user}}
-        {{d-icon "times-circle"}}
-      </a>
-    {{/if}}
-    {{#if filters.subject}}
-      <a href {{action "clearFilter" "subject"}} class="filter">
-        <span class="label">{{i18n 'admin.logs.staff_actions.subject'}}</span>: {{filters.subject}}
-        {{d-icon "times-circle"}}
-      </a>
-    {{/if}}
-  </div>
+      {{#if actionFilter}}
+        <a href {{action "clearFilter" "actionFilter"}} class="filter">
+          <span class="label">{{i18n 'admin.logs.action'}}</span>: {{actionFilter}}
+          {{d-icon "times-circle"}}
+        </a>
+      {{/if}}
+      {{#if filters.acting_user}}
+        <a href {{action "clearFilter" "acting_user"}} class="filter">
+          <span class="label">{{i18n 'admin.logs.staff_actions.staff_user'}}</span>: {{filters.acting_user}}
+          {{d-icon "times-circle"}}
+        </a>
+      {{/if}}
+      {{#if filters.target_user}}
+        <a href {{action "clearFilter" "target_user"}} class="filter">
+          <span class="label">{{i18n 'admin.logs.staff_actions.target_user'}}</span>: {{filters.target_user}}
+          {{d-icon "times-circle"}}
+        </a>
+      {{/if}}
+      {{#if filters.subject}}
+        <a href {{action "clearFilter" "subject"}} class="filter">
+          <span class="label">{{i18n 'admin.logs.staff_actions.subject'}}</span>: {{filters.subject}}
+          {{d-icon "times-circle"}}
+        </a>
+      {{/if}}
+    </div>
   {{else}}
     {{i18n "admin.logs.staff_actions.filter"}}
     {{combo-box
@@ -41,10 +41,10 @@
 
   {{d-button class="btn-default" action=(action "exportStaffActionLogs") label="admin.export_csv.button_text" icon="download"}}
 </div>
+
 <div class="clearfix"></div>
 
 {{#staff-actions}}
-
   {{#load-more selector=".staff-logs tr" action=(action "loadMore")}}
     {{#if model.content}}
       <table class='table staff-logs grid'>
@@ -108,5 +108,4 @@
       {{i18n 'search.no_results'}}
     {{/if}}
   {{/load-more}}
-
 {{/staff-actions}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
index f59c73b89e..160ca685ad 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
@@ -1,19 +1,19 @@
 {{#d-modal-body class='add-upload-modal' title="admin.customize.theme.add_upload"}}
-    <div class="inputs">
-      <section class="field">
+  <div class="inputs">
+    <section class="field">
       <input onchange={{action "updateName"}} type="file" id="file-input" accept='*'>
       <label for="file-input">{{i18n 'admin.customize.theme.upload_file_tip'}}</label>
-      </section>
-      <section class="field">
+    </section>
+    <section class="field">
       <label for="theme-variable-name">{{i18n 'admin.customize.theme.variable_name'}}</label>
       {{input id="theme-variable-name" value=name}}
-      </section>
-      {{#if fileSelected}}
-        {{#if errorMessage}}
-          <span class="alert alert-error">{{errorMessage}}</span>
-        {{/if}}
+    </section>
+    {{#if fileSelected}}
+      {{#if errorMessage}}
+        <span class="alert alert-error">{{errorMessage}}</span>
       {{/if}}
-    </div>
+    {{/if}}
+  </div>
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/admin/templates/modal/admin-watched-word-test.hbs b/app/assets/javascripts/admin/templates/modal/admin-watched-word-test.hbs
index a46f4ddb7b..ef56567cdd 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-watched-word-test.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-watched-word-test.hbs
@@ -1,16 +1,16 @@
 {{#d-modal-body rawTitle=(i18n "admin.watched_words.test.modal_title" action=model.name) class="watched-words-test-modal"}}
-    <p>{{i18n "admin.watched_words.test.description"}}</p>
-    {{textarea name="test_value" value=value autofocus="autofocus"}}
-    {{#if matches}}
-        <p>
-            {{i18n "admin.watched_words.test.found_matches"}}
-            <ul>
-                {{#each matches as |match|}}
-                    <li>{{match}}</li>
-                {{/each}}
-            </ul>
-        </p>
-    {{else}}
-        <p>{{i18n "admin.watched_words.test.no_matches"}}</p>
-    {{/if}}
+  <p>{{i18n "admin.watched_words.test.description"}}</p>
+  {{textarea name="test_value" value=value autofocus="autofocus"}}
+  {{#if matches}}
+    <p>
+      {{i18n "admin.watched_words.test.found_matches"}}
+      <ul>
+        {{#each matches as |match|}}
+          <li>{{match}}</li>
+        {{/each}}
+      </ul>
+    </p>
+  {{else}}
+    <p>{{i18n "admin.watched_words.test.no_matches"}}</p>
+  {{/if}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs b/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
index 0bd05c2ba8..38a08b7627 100644
--- a/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
+++ b/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body class="incoming-emails" rawTitle=model.key}}
-{{i18n "admin.site_settings.default_categories.modal_description" count=model.count}}
+  {{i18n "admin.site_settings.default_categories.modal_description" count=model.count}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index d3d7c23785..e17804d7ff 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -29,8 +29,10 @@
               {{plugin.name}}
             {{/if}}
           </td>
-          <td class="version">              <div class="label">{{i18n "admin.plugins.version"}}</div>
-{{plugin.version}}</td>
+          <td class="version">
+            <div class="label">{{i18n "admin.plugins.version"}}</div>
+            {{plugin.version}}
+          </td>
           <td class="col-enabled">
             <div class="label">{{i18n "admin.plugins.enabled"}}</div>
             {{#if plugin.enabled_setting}}
diff --git a/app/assets/javascripts/admin/templates/plugins.hbs b/app/assets/javascripts/admin/templates/plugins.hbs
index 9b41e0976d..dbe648daef 100644
--- a/app/assets/javascripts/admin/templates/plugins.hbs
+++ b/app/assets/javascripts/admin/templates/plugins.hbs
@@ -1,17 +1,17 @@
-  <div class='admin-controls'>
-
+<div class='admin-controls'>
   <div class='controls'>
     {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
 
-  {{#if currentUser.admin}}
-    {{d-button label="admin.plugins.change_settings"
-               icon="cog"
-               class="btn-default settings-button"
-               action=(route-action "showSettings")}}
-  {{/if}}
-  </div>
-
+    {{#if currentUser.admin}}
+      {{d-button
+        label="admin.plugins.change_settings"
+        icon="cog"
+        class="btn-default settings-button"
+        action=(route-action "showSettings")
+      }}
+    {{/if}}
   </div>
+</div>
 
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
diff --git a/app/assets/javascripts/admin/templates/search-logs-index.hbs b/app/assets/javascripts/admin/templates/search-logs-index.hbs
index b56a1400fb..a0cb23a89b 100644
--- a/app/assets/javascripts/admin/templates/search-logs-index.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-index.hbs
@@ -18,17 +18,17 @@
         <th class="col heading">{{i18n 'admin.logs.search_logs.click_through_rate'}}</th>
       </thead>
       <tbody>
-      {{#each model as |item|}}
-        <tr class="admin-list-item">
-          <td class="col term">
-            {{#link-to 'adminSearchLogs.term' (query-params term=item.term period=period) class="test"}}
-              {{item.term}}
-            {{/link-to}}
-          </td>
-          <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.searches'}}</div>{{item.searches}}</td>
-          <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.click_through_rate'}}</div>{{item.ctr}}%</td>
-        </tr>
-      {{/each}}
+        {{#each model as |item|}}
+          <tr class="admin-list-item">
+            <td class="col term">
+              {{#link-to 'adminSearchLogs.term' (query-params term=item.term period=period) class="test"}}
+                {{item.term}}
+              {{/link-to}}
+            </td>
+            <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.searches'}}</div>{{item.searches}}</td>
+            <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.click_through_rate'}}</div>{{item.ctr}}%</td>
+          </tr>
+        {{/each}}
       </tbody>
     </table>
 
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 27f61f2940..c38b4c9e59 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -20,47 +20,47 @@
   <br>
 
   <div class='header-search-results'>
-  {{#each model.search_result.posts as |result|}}
-    <div class='fps-result'>
-      <div class='author'>
-        <a href={{result.userPath}} data-user-card={{result.username}}>
-          {{avatar result imageSize="large"}}
-        </a>
-      </div>
-
-      <div class='fps-topic'>
-        <div class='topic'>
-          <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+    {{#each model.search_result.posts as |result|}}
+      <div class='fps-result'>
+        <div class='author'>
+          <a href={{result.userPath}} data-user-card={{result.username}}>
+            {{avatar result imageSize="large"}}
           </a>
+        </div>
 
-          <div class='search-category'>
-            {{#if result.topic.category.parentCategory}}
-              {{category-link result.topic.category.parentCategory}}
+        <div class='fps-topic'>
+          <div class='topic'>
+            <a class='search-link' href={{result.url}}>
+              {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+            </a>
+
+            <div class='search-category'>
+              {{#if result.topic.category.parentCategory}}
+                {{category-link result.topic.category.parentCategory}}
+              {{/if}}
+              {{category-link result.topic.category hideParent=true}}
+              {{#each result.topic.tags as |tag|}}
+                {{discourse-tag tag}}
+              {{/each}}
+            </div>
+          </div>
+
+          <div class='blurb container'>
+            <span class='date'>
+              {{format-age result.created_at}}
+              {{#if result.blurb}}
+                -
+              {{/if}}
+            </span>
+
+            {{#if result.blurb}}
+              {{#highlight-text highlight=term}}
+                {{html-safe result.blurb}}
+              {{/highlight-text}}
             {{/if}}
-            {{category-link result.topic.category hideParent=true}}
-            {{#each result.topic.tags as |tag|}}
-              {{discourse-tag tag}}
-            {{/each}}
           </div>
         </div>
-
-        <div class='blurb container'>
-          <span class='date'>
-            {{format-age result.created_at}}
-            {{#if result.blurb}}
-              -
-            {{/if}}
-          </span>
-
-          {{#if result.blurb}}
-            {{#highlight-text highlight=term}}
-              {{html-safe result.blurb}}
-            {{/highlight-text}}
-          {{/if}}
-        </div>
       </div>
-    </div>
-  {{/each}}
+    {{/each}}
   </div>
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index 39d227bcf8..f85db56737 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -13,26 +13,26 @@
     {{#if noGrantableBadges}}
       <p>{{i18n 'admin.badges.no_badges'}}</p>
     {{else}}
-    <form class="form-horizontal">
-      <div>
-        <label>{{i18n 'admin.badges.badge'}}</label>
-        {{combo-box
-          filterable=true
-          value=selectedBadgeId
-          content=grantableBadges
-          onChange=(action (mut selectedBadgeId))
-        }}
-      </div>
-      <div>
-      <label>{{i18n 'admin.badges.reason'}}</label>
-      {{input type="text" value=badgeReason}}<br><small>{{i18n 'admin.badges.reason_help'}}</small>
-      </div>
-      {{d-button
-        class="btn-primary"
-        action=(action "grantBadge")
-        type="submit"
-        label="admin.badges.grant"}}
-    </form>
+      <form class="form-horizontal">
+        <div>
+          <label>{{i18n 'admin.badges.badge'}}</label>
+          {{combo-box
+            filterable=true
+            value=selectedBadgeId
+            content=grantableBadges
+            onChange=(action (mut selectedBadgeId))
+          }}
+        </div>
+        <div>
+          <label>{{i18n 'admin.badges.reason'}}</label>
+          {{input type="text" value=badgeReason}}<br><small>{{i18n 'admin.badges.reason_help'}}</small>
+        </div>
+        {{d-button
+          class="btn-primary"
+          action=(action "grantBadge")
+          type="submit"
+          label="admin.badges.grant"}}
+      </form>
     {{/if}}
 
     <table id='user-badges'>
@@ -55,7 +55,7 @@
             </td>
             <td class='reason'>
               {{#if userBadge.postUrl}}
-              <a href={{userBadge.postUrl}}>{{userBadge.topic_title}}</a>
+                <a href={{userBadge.postUrl}}>{{userBadge.topic_title}}</a>
               {{/if}}
             </td>
             <td>{{age-with-tooltip userBadge.granted_at}}</td>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index f5abf9f8dd..6cabbb87ad 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -474,7 +474,7 @@
       <div class="value">
         {{#link-to "adminUser" model.silencedBy}}
           {{avatar model.silencedBy imageSize="tiny"}}
-          {{/link-to}}
+        {{/link-to}}
         {{#link-to "adminUser" model.silencedBy}}
           {{model.silencedBy.username}}
         {{/link-to}}
@@ -507,45 +507,45 @@
 {{#if currentUser.admin}}
   <section class="details">
     <h1>{{i18n "admin.groups.title"}}</h1>
-      <div class="display-row">
-        <div class="field">{{i18n "admin.groups.automatic"}}</div>
-        <div class="value">{{html-safe automaticGroups}}</div>
+    <div class="display-row">
+      <div class="field">{{i18n "admin.groups.automatic"}}</div>
+      <div class="value">{{html-safe automaticGroups}}</div>
+    </div>
+    <div class="display-row">
+      <div class="field">{{i18n "admin.groups.custom"}}</div>
+      <div class="value">
+        {{admin-group-selector
+          content=availableGroups
+          value=customGroupIdsBuffer
+          onChange=(action (mut customGroupIdsBuffer))
+        }}
       </div>
+      {{#if customGroupsDirty}}
+        <div class="controls">
+          {{d-button icon="check" class="ok" action=(action "saveCustomGroups")}}
+          {{d-button icon="times" class="cancel" action=(action "resetCustomGroups")}}
+        </div>
+      {{/if}}
+    </div>
+    {{#if model.customGroups}}
       <div class="display-row">
-        <div class="field">{{i18n "admin.groups.custom"}}</div>
+        <div class="field">{{i18n "admin.groups.primary"}}</div>
         <div class="value">
-          {{admin-group-selector
-            content=availableGroups
-            value=customGroupIdsBuffer
-            onChange=(action (mut customGroupIdsBuffer))
+          {{combo-box
+            content=model.customGroups
+            value=model.primary_group_id
+            none="admin.groups.no_primary"
+            onChange=(action (mut model.primary_group_id))
           }}
         </div>
-        {{#if customGroupsDirty}}
+        {{#if primaryGroupDirty}}
           <div class="controls">
-            {{d-button icon="check" class="ok" action=(action "saveCustomGroups")}}
-            {{d-button icon="times" class="cancel" action=(action "resetCustomGroups")}}
+            {{d-button icon="check" class="ok" action=(action "savePrimaryGroup")}}
+            {{d-button icon="times" class="cancel" action=(action "resetPrimaryGroup")}}
           </div>
         {{/if}}
       </div>
-      {{#if model.customGroups}}
-        <div class="display-row">
-          <div class="field">{{i18n "admin.groups.primary"}}</div>
-          <div class="value">
-            {{combo-box
-              content=model.customGroups
-              value=model.primary_group_id
-              none="admin.groups.no_primary"
-              onChange=(action (mut model.primary_group_id))
-            }}
-          </div>
-          {{#if primaryGroupDirty}}
-            <div class="controls">
-              {{d-button icon="check" class="ok" action=(action "savePrimaryGroup")}}
-              {{d-button icon="times" class="cancel" action=(action "resetPrimaryGroup")}}
-            </div>
-          {{/if}}
-        </div>
-      {{/if}}
+    {{/if}}
   </section>
 {{/if}}
 
@@ -625,34 +625,34 @@
 </section>
 
 {{#if model.single_sign_on_record}}
-<section class="details">
-  <h1>{{i18n "admin.user.sso.title"}}</h1>
+  <section class="details">
+    <h1>{{i18n "admin.user.sso.title"}}</h1>
 
-  {{#with model.single_sign_on_record as |sso|}}
-    <div class="display-row">
-      <div class="field">{{i18n "admin.user.sso.external_id"}}</div>
-      <div class="value">{{sso.external_id}}</div>
-    </div>
-    <div class="display-row">
-      <div class="field">{{i18n "admin.user.sso.external_username"}}</div>
-      <div class="value">{{sso.external_username}}</div>
-    </div>
-    <div class="display-row">
-      <div class="field">{{i18n "admin.user.sso.external_name"}}</div>
-      <div class="value">{{sso.external_name}}</div>
-    </div>
-    {{#if sso.external_email}}
+    {{#with model.single_sign_on_record as |sso|}}
       <div class="display-row">
-        <div class="field">{{i18n "admin.user.sso.external_email"}}</div>
-        <div class="value">{{sso.external_email}}</div>
+        <div class="field">{{i18n "admin.user.sso.external_id"}}</div>
+        <div class="value">{{sso.external_id}}</div>
       </div>
-    {{/if}}
-    <div class="display-row">
-      <div class="field">{{i18n "admin.user.sso.external_avatar_url"}}</div>
-      <div class="value">{{sso.external_avatar_url}}</div>
-    </div>
-  {{/with}}
-</section>
+      <div class="display-row">
+        <div class="field">{{i18n "admin.user.sso.external_username"}}</div>
+        <div class="value">{{sso.external_username}}</div>
+      </div>
+      <div class="display-row">
+        <div class="field">{{i18n "admin.user.sso.external_name"}}</div>
+        <div class="value">{{sso.external_name}}</div>
+      </div>
+      {{#if sso.external_email}}
+        <div class="display-row">
+          <div class="field">{{i18n "admin.user.sso.external_email"}}</div>
+          <div class="value">{{sso.external_email}}</div>
+        </div>
+      {{/if}}
+      <div class="display-row">
+        <div class="field">{{i18n "admin.user.sso.external_avatar_url"}}</div>
+        <div class="value">{{sso.external_avatar_url}}</div>
+      </div>
+    {{/with}}
+  </section>
 {{/if}}
 
 {{plugin-outlet name="after-user-details" args=(hash model=model)}}
diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index 8dc98a948a..8fcc81a7ce 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -117,31 +117,42 @@
       {{#if model.tl3Requirements.requirements_lost}}
         {{! tl implicitly not locked }}
         {{#if model.tl3Requirements.on_grace_period}}
-          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
-        {{else}} {{! not on grace period }}
-          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
-                                      {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
+          {{d-icon "times"}}
+          {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
+        {{else}}
+          {{! not on grace period }}
+          {{d-icon "times"}}
+          {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
+          {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
         {{/if}}
-      {{else}} {{! requirements not lost - remains tl3 }}
+      {{else}}
+        {{! requirements not lost - remains tl3 }}
         {{#if model.tl3Requirements.trust_level_locked}}
-          {{d-icon "lock"}} {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
-        {{else}} {{! tl not locked }}
-          {{d-icon "check"}} {{i18n 'admin.user.tl3_requirements.qualifies'}}
+          {{d-icon "lock"}}
+          {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
+        {{else}}
+          {{! tl not locked }}
+          {{d-icon "check"}}
+          {{i18n 'admin.user.tl3_requirements.qualifies'}}
           {{#if model.tl3Requirements.on_grace_period}}
             {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
           {{/if}}
         {{/if}}
       {{/if}}
-    {{else}} {{! is not tl3 }}
+    {{else}}
+      {{! is not tl3 }}
       {{#if model.tl3Requirements.requirements_met}}
         {{! met & not tl3 - will be promoted}}
-        {{d-icon "check"}} {{i18n 'admin.user.tl3_requirements.qualifies'}}
-                                    {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
-      {{else}} {{! requirements not met - remains regular }}
+        {{d-icon "check"}}
+        {{i18n 'admin.user.tl3_requirements.qualifies'}}
+        {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
+      {{else}}
+        {{! requirements not met - remains regular }}
         {{#if model.tl3Requirements.trust_level_locked}}
-          {{d-icon "lock"}} {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
+          {{d-icon "lock"}}
+          {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
         {{else}}
-          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
+          {{d-icon "times"}}
         {{/if}}
       {{/if}}
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
index 38e4d2215f..7161ff0a0a 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
@@ -9,31 +9,31 @@
 </div>
 
 <div class='web-hook-events-listing'>
-{{#if model}}
-  {{#load-more selector=".web-hook-events li" action=(action "loadMore")}}
-    <div class='web-hook-events content-list'>
-      <div class='heading-container'>
-        <div class='col heading first status'>{{i18n 'admin.web_hooks.events.status'}}</div>
-        <div class='col heading event-id'>{{i18n 'admin.web_hooks.events.event_id'}}</div>
-        <div class='col heading timestamp'>{{i18n 'admin.web_hooks.events.timestamp'}}</div>
-        <div class='col heading completion'>{{i18n 'admin.web_hooks.events.completion'}}</div>
-        <div class='col heading actions'>{{i18n 'admin.web_hooks.events.actions'}}</div>
-        <div class='clearfix'></div>
+  {{#if model}}
+    {{#load-more selector=".web-hook-events li" action=(action "loadMore")}}
+      <div class='web-hook-events content-list'>
+        <div class='heading-container'>
+          <div class='col heading first status'>{{i18n 'admin.web_hooks.events.status'}}</div>
+          <div class='col heading event-id'>{{i18n 'admin.web_hooks.events.event_id'}}</div>
+          <div class='col heading timestamp'>{{i18n 'admin.web_hooks.events.timestamp'}}</div>
+          <div class='col heading completion'>{{i18n 'admin.web_hooks.events.completion'}}</div>
+          <div class='col heading actions'>{{i18n 'admin.web_hooks.events.actions'}}</div>
+          <div class='clearfix'></div>
+        </div>
+        {{#if hasIncoming}}
+          <a href class='alert alert-info clickable' tabindex="0" {{action "showInserted"}}>
+            {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}}
+          </a>
+        {{/if}}
+        <ul>
+          {{#each model as |webHookEvent|}}
+            {{admin-web-hook-event model=webHookEvent}}
+          {{/each}}
+        </ul>
       </div>
-      {{#if hasIncoming}}
-        <a href class='alert alert-info clickable' tabindex="0" {{action "showInserted"}}>
-          {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}}
-        </a>
-      {{/if}}
-      <ul>
-        {{#each model as |webHookEvent|}}
-          {{admin-web-hook-event model=webHookEvent}}
-        {{/each}}
-      </ul>
-    </div>
-    {{conditional-loading-spinner condition=model.loadingMore}}
-  {{/load-more}}
-{{else}}
-  <p>{{i18n 'admin.web_hooks.events.none'}}</p>
-{{/if}}
+      {{conditional-loading-spinner condition=model.loadingMore}}
+    {{/load-more}}
+  {{else}}
+    <p>{{i18n 'admin.web_hooks.events.none'}}</p>
+  {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks.hbs b/app/assets/javascripts/admin/templates/web-hooks.hbs
index e63dac0828..c65964d41f 100644
--- a/app/assets/javascripts/admin/templates/web-hooks.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks.hbs
@@ -5,34 +5,34 @@
       {{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
     {{/link-to}}
   </div>
-{{#if model}}
-  {{#load-more selector=".web-hooks tr" action=(action "loadMore")}}
-    <table class='web-hooks grid'>
-      <thead>
-        <tr>
-          <th>{{i18n 'admin.web_hooks.delivery_status.title'}}</th>
-          <th>{{i18n 'admin.web_hooks.payload_url'}}</th>
-          <th>{{i18n 'admin.web_hooks.description'}}</th>
-          <th>{{i18n 'admin.web_hooks.controls'}}</th>
-        </tr>
-      </thead>
-      <tbody>
-        {{#each model as |webHook|}}
+  {{#if model}}
+    {{#load-more selector=".web-hooks tr" action=(action "loadMore")}}
+      <table class='web-hooks grid'>
+        <thead>
           <tr>
-            <td class='delivery-status'>{{#link-to 'adminWebHooks.showEvents' webHook.id}}{{admin-web-hook-status deliveryStatuses=deliveryStatuses model=webHook}}{{/link-to}}</td>
-            <td class='payload-url'>{{#link-to 'adminWebHooks.show' webHook}}{{webHook.payload_url}}{{/link-to}}</td>
-            <td class='description'>{{webHook.description}}</td>
-            <td class='controls'>
-              {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{d-icon 'far-edit'}}{{/link-to}}
-              {{d-button class="destroy btn-danger" action=(action "destroy") actionParam=webHook icon="times"}}
-            </td>
+            <th>{{i18n 'admin.web_hooks.delivery_status.title'}}</th>
+            <th>{{i18n 'admin.web_hooks.payload_url'}}</th>
+            <th>{{i18n 'admin.web_hooks.description'}}</th>
+            <th>{{i18n 'admin.web_hooks.controls'}}</th>
           </tr>
-        {{/each}}
-      </tbody>
-    </table>
-    {{conditional-loading-spinner condition=model.loadingMore}}
-  {{/load-more}}
-{{else}}
-  <p>{{i18n 'admin.web_hooks.none'}}</p>
-{{/if}}
+        </thead>
+        <tbody>
+          {{#each model as |webHook|}}
+            <tr>
+              <td class='delivery-status'>{{#link-to 'adminWebHooks.showEvents' webHook.id}}{{admin-web-hook-status deliveryStatuses=deliveryStatuses model=webHook}}{{/link-to}}</td>
+              <td class='payload-url'>{{#link-to 'adminWebHooks.show' webHook}}{{webHook.payload_url}}{{/link-to}}</td>
+              <td class='description'>{{webHook.description}}</td>
+              <td class='controls'>
+                {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{d-icon 'far-edit'}}{{/link-to}}
+                {{d-button class="destroy btn-danger" action=(action "destroy") actionParam=webHook icon="times"}}
+              </td>
+            </tr>
+          {{/each}}
+        </tbody>
+      </table>
+      {{conditional-loading-spinner condition=model.loadingMore}}
+    {{/load-more}}
+  {{else}}
+    <p>{{i18n 'admin.web_hooks.none'}}</p>
+  {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index ad65dbb57e..11c0471480 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -111,8 +111,8 @@
 
       {{#if contactInfo}}
         <section class='about contact'>
-            <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
-            <p>{{html-safe contactInfo}}</p>
+          <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
+          <p>{{html-safe contactInfo}}</p>
         </section>
       {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index fe7b489159..38869b6f0d 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -37,23 +37,23 @@
   {{#if userBadges}}
     <div class="user-badges {{model.slug}}">
       {{#load-more selector=".badge-info" action=(action "loadMore")}}
-      <div class="badges-granted">
-        {{#each userBadges as |ub|}}
-          {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
-            <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
-            {{#if ub.post_number}}
-              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
-            {{/if}}
-          {{/user-info}}
-        {{/each}}
+        <div class="badges-granted">
+          {{#each userBadges as |ub|}}
+            {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
+              <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
+              {{#if ub.post_number}}
+                <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
+              {{/if}}
+            {{/user-info}}
+          {{/each}}
         </div>
       {{/load-more}}
 
       {{#unless canLoadMore}}
         {{#if canShowOthers}}
-        <div class='clearfix'>
-          <a class='btn' href={{model.url}}>{{i18n 'badges.others_count' count=othersCount}}</a>
-        </div>
+          <div class='clearfix'>
+            <a class='btn' href={{model.url}}>{{i18n 'badges.others_count' count=othersCount}}</a>
+          </div>
         {{/if}}
       {{/unless}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index 6545208bb7..80bbae0936 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,11 +1,10 @@
 <label class="btn btn-default btn-icon-text" disabled={{uploading}} title={{i18n 'user.change_avatar.upload_title'}}>
   {{d-icon "far-image"}}
   {{#if uploading}}
-  {{i18n 'uploading'}} {{uploadProgress}}%
+    {{i18n 'uploading'}} {{uploadProgress}}%
   {{else}}
-  {{i18n 'upload'}}
+    {{i18n 'upload'}}
   {{/if}}
-
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
 </label>
 
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index b047846db5..39a6b0112d 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -1,30 +1,31 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if hasIncoming}}
-  <div class="show-mores">
-    <a tabindex="0" href {{action showInserted}} class='alert alert-info clickable'>
-      {{count-i18n key="topic_count_" suffix="latest" count=2}}
-    </a>
-  </div>
+    <div class="show-mores">
+      <a tabindex="0" href {{action showInserted}} class='alert alert-info clickable'>
+        {{count-i18n key="topic_count_" suffix="latest" count=2}}
+      </a>
+    </div>
   {{/if}}
 
   {{#if topics}}
-    {{topic-list showPosters=showPosters
-                 hideCategory=hideCategory
-                 topics=topics
-                 expandExcerpts=expandExcerpts
-                 bulkSelectEnabled=bulkSelectEnabled
-                 canBulkSelect=canBulkSelect
-                 selected=selected
-                 skipHeader=skipHeader
-                 tagsForUser=tagsForUser
-                 onScroll=onScroll
-                 scrollOnLoad=scrollOnLoad}}
-
+    {{topic-list
+      showPosters=showPosters
+      hideCategory=hideCategory
+      topics=topics
+      expandExcerpts=expandExcerpts
+      bulkSelectEnabled=bulkSelectEnabled
+      canBulkSelect=canBulkSelect
+      selected=selected
+      skipHeader=skipHeader
+      tagsForUser=tagsForUser
+      onScroll=onScroll
+      scrollOnLoad=scrollOnLoad
+    }}
   {{else}}
     {{#unless loadingMore}}
-    <div class='alert alert-info'>
-      {{i18n 'choose_topic.none_found'}}
-    </div>
+      <div class='alert alert-info'>
+        {{i18n 'choose_topic.none_found'}}
+      </div>
     {{/unless}}
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index fc71891854..ea6853b37d 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -4,14 +4,15 @@
       <div class='category-box-heading'>
         <a href={{c.url}}>
           {{#unless c.isMuted}}
-          {{#if c.uploaded_logo.url}}
-            {{cdn-img src=c.uploaded_logo.url
+            {{#if c.uploaded_logo.url}}
+              {{cdn-img
+                src=c.uploaded_logo.url
                 class="logo"
                 width=c.uploaded_logo.width
-                height=c.uploaded_logo.height}}
-          {{/if}}
+                height=c.uploaded_logo.height
+              }}
+            {{/if}}
           {{/unless}}
-
           <h3>
             {{category-title-before category=c}}
             {{#if c.read_restricted}}
@@ -23,15 +24,15 @@
       </div>
 
       {{#unless c.isMuted}}
-      <div class='featured-topics'>
-        {{#if c.topics}}
-          <ul>
-            {{#each c.topics as |topic|}}
-              {{categories-boxes-topic topic=topic}}
-            {{/each}}
-          </ul>
-        {{/if}}
-      </div>
+        <div class='featured-topics'>
+          {{#if c.topics}}
+            <ul>
+              {{#each c.topics as |topic|}}
+                {{categories-boxes-topic topic=topic}}
+              {{/each}}
+            </ul>
+          {{/if}}
+        </div>
       {{/unless}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 755eea2b72..40b256d283 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -3,15 +3,16 @@
    data-url={{c.url}}>
     <div class='category-box-inner'>
       {{#unless c.isMuted}}
-      <div class="category-logo">
-        {{#if c.uploaded_logo.url}}
-          {{cdn-img
+        <div class="category-logo">
+          {{#if c.uploaded_logo.url}}
+            {{cdn-img
               src=c.uploaded_logo.url
               class="logo"
               width=c.uploaded_logo.width
-              height=c.uploaded_logo.height}}
-        {{/if}}
-      </div>
+              height=c.uploaded_logo.height
+            }}
+          {{/if}}
+        </div>
       {{/unless}}
       <div class="category-details">
         <div class='category-box-heading'>
@@ -26,45 +27,45 @@
         </div>
 
         {{#unless c.isMuted}}
-        <div class='description'>
-          {{text-overflow class="overflow" text=c.description_excerpt}}
-        </div>
-        {{#if c.isGrandParent}}
-          {{#each c.subcategories as |subcategory|}}
-            <div data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}}  style={{border-color subcategory.color}} class="subcategory with-subcategories {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
-              <div class="subcategory-box-inner">
-                {{category-title-link tagName="h4" category=subcategory}}
-                {{#if subcategory.subcategories}}
-                  <div class='subcategories'>
-                    {{#each subcategory.subcategories as |subsubcategory|}}
-                      {{#unless subsubcategory.isMuted}}
-                        <span class='subcategory'>
-                          {{category-title-before category=subsubcategory}}
-                          {{category-link subsubcategory hideParent="true"}}
-                        </span>
-                      {{/unless}}
-                    {{/each}}
-                  </div>
-                {{/if}}
-            </div>
-           </div>
-          {{/each}}
-        {{else if c.subcategories}}
-          <div class='subcategories'>
-            {{#each c.subcategories as |sc|}}
-              <a class="subcategory" href={{sc.url}}>
-                <span class="subcategory-image-placeholder">
-                  {{cdn-img
-                      src=sc.uploaded_logo.url
-                      class="logo"
-                      width=sc.uploaded_logo.width
-                      height=sc.uploaded_logo.height}}
-                </span>
-                {{category-link sc hideParent="true"}}
-              </a>
-            {{/each}}
+          <div class='description'>
+            {{text-overflow class="overflow" text=c.description_excerpt}}
           </div>
-        {{/if}}
+          {{#if c.isGrandParent}}
+            {{#each c.subcategories as |subcategory|}}
+              <div data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}}  style={{border-color subcategory.color}} class="subcategory with-subcategories {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
+                <div class="subcategory-box-inner">
+                  {{category-title-link tagName="h4" category=subcategory}}
+                  {{#if subcategory.subcategories}}
+                    <div class='subcategories'>
+                      {{#each subcategory.subcategories as |subsubcategory|}}
+                        {{#unless subsubcategory.isMuted}}
+                          <span class='subcategory'>
+                            {{category-title-before category=subsubcategory}}
+                            {{category-link subsubcategory hideParent="true"}}
+                          </span>
+                        {{/unless}}
+                      {{/each}}
+                    </div>
+                  {{/if}}
+                </div>
+              </div>
+            {{/each}}
+          {{else if c.subcategories}}
+            <div class='subcategories'>
+              {{#each c.subcategories as |sc|}}
+                <a class="subcategory" href={{sc.url}}>
+                  <span class="subcategory-image-placeholder">
+                    {{cdn-img
+                        src=sc.uploaded_logo.url
+                        class="logo"
+                        width=sc.uploaded_logo.width
+                        height=sc.uploaded_logo.height}}
+                  </span>
+                  {{category-link sc hideParent="true"}}
+                </a>
+              {{/each}}
+            </div>
+          {{/if}}
         {{/unless}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 6c02050bbd..495a40ec9f 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -15,59 +15,59 @@
           <td class="category {{if c.isMuted 'muted'}} {{if noCategoryStyle "no-category-style"}}" style={{unless noCategoryStyle (border-color c.color)}}>
             {{category-title-link category=c}}
             {{#unless c.isMuted}}
-            {{#if c.description_excerpt}}
-              <div class="category-description">
-                {{dir-span c.description_excerpt}}
-              </div>
-            {{/if}}
-            {{#if c.isGrandParent}}
-              <table class="category-list subcategories-with-subcategories">
-                <tbody>
-                  {{#each c.subcategories as |subcategory|}}
-                    <tr data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}} class="{{if subcategory.description_excerpt 'has-description' 'no-description'}} {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
-                      <td class="category" style={{border-color subcategory.color}}>
-                        {{category-title-link tagName="h4" category=subcategory}}
-                        {{#if subcategory.description_excerpt}}
-                          <div class="category-description subcategory-description">
-                            {{dir-span subcategory.description_excerpt}}
-                          </div>
-                        {{/if}}
-                        {{#if subcategory.subcategories}}
-                          <div class='subcategories'>
-                            {{#each subcategory.subcategories as |subsubcategory|}}
-                              {{#unless subsubcategory.isMuted}}
-                                <span class='subcategory'>
-                                  {{category-title-before category=subsubcategory}}
-                                  {{category-link subsubcategory hideParent="true"}}
-                                </span>
-                              {{/unless}}
-                            {{/each}}
-                          </div>
-                        {{else}}
+              {{#if c.description_excerpt}}
+                <div class="category-description">
+                  {{dir-span c.description_excerpt}}
+                </div>
+              {{/if}}
+              {{#if c.isGrandParent}}
+                <table class="category-list subcategories-with-subcategories">
+                  <tbody>
+                    {{#each c.subcategories as |subcategory|}}
+                      <tr data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}} class="{{if subcategory.description_excerpt 'has-description' 'no-description'}} {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
+                        <td class="category" style={{border-color subcategory.color}}>
+                          {{category-title-link tagName="h4" category=subcategory}}
                           {{#if subcategory.description_excerpt}}
                             <div class="category-description subcategory-description">
                               {{dir-span subcategory.description_excerpt}}
                             </div>
                           {{/if}}
-                        {{/if}}
-                      </td>
-                    </tr>
+                          {{#if subcategory.subcategories}}
+                            <div class='subcategories'>
+                              {{#each subcategory.subcategories as |subsubcategory|}}
+                                {{#unless subsubcategory.isMuted}}
+                                  <span class='subcategory'>
+                                    {{category-title-before category=subsubcategory}}
+                                    {{category-link subsubcategory hideParent="true"}}
+                                  </span>
+                                {{/unless}}
+                              {{/each}}
+                            </div>
+                          {{else}}
+                            {{#if subcategory.description_excerpt}}
+                              <div class="category-description subcategory-description">
+                                {{dir-span subcategory.description_excerpt}}
+                              </div>
+                            {{/if}}
+                          {{/if}}
+                        </td>
+                      </tr>
+                    {{/each}}
+                  </tbody>
+                </table>
+              {{else if c.subcategories}}
+                <div class='subcategories'>
+                  {{#each c.subcategories as |subcategory|}}
+                    {{#unless subcategory.isMuted}}
+                      <span class='subcategory'>
+                        {{category-title-before category=subcategory}}
+                        {{category-link subcategory hideParent="true"}}
+                        {{category-unread category=subcategory}}
+                      </span>
+                    {{/unless}}
                   {{/each}}
-                </tbody>
-              </table>
-            {{else if c.subcategories}}
-              <div class='subcategories'>
-                {{#each c.subcategories as |subcategory|}}
-                  {{#unless subcategory.isMuted}}
-                    <span class='subcategory'>
-                      {{category-title-before category=subcategory}}
-                      {{category-link subcategory hideParent="true"}}
-                      {{category-unread category=subcategory}}
-                    </span>
-                  {{/unless}}
-                {{/each}}
-              </div>
-            {{/if}}
+                </div>
+              {{/if}}
             {{/unless}}
           </td>
           <td class="topics">
@@ -75,13 +75,13 @@
             {{category-unread category=c tagName="div" class="unread-new"}}
           </td>
           {{#unless c.isMuted}}
-          {{#if showTopics}}
-            <td class="latest">
-              {{#each c.featuredTopics as |t|}}
-                {{featured-topic topic=t latestTopicOnly=latestTopicOnly}}
-              {{/each}}
-            </td>
-          {{/if}}
+            {{#if showTopics}}
+              <td class="latest">
+                {{#each c.featuredTopics as |t|}}
+                  {{featured-topic topic=t latestTopicOnly=latestTopicOnly}}
+                {{/each}}
+              </td>
+            {{/if}}
           {{/unless}}
         </tr>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
index 6c21242484..b602627f0f 100644
--- a/app/assets/javascripts/discourse/templates/components/choose-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
@@ -15,7 +15,7 @@
           <span class="message-title">
             {{m.title}}
           </span>
-       </label>
+        </label>
       </div>
     {{/each}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
index bf89487741..dd7ad30ff6 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
@@ -1,16 +1,18 @@
 {{#if showSelector}}
-  {{user-selector topicId=topicId
-                  onChangeCallback=(action "triggerResize")
-                  id="private-message-users"
-                  includeMessageableGroups='true'
-                  placeholderKey="composer.users_placeholder"
-                  tabindex="1"
-                  usernames=usernames
-                  hasGroups=hasGroups
-                  allowEmails='true'
-                  autocomplete="discourse"}}
+  {{user-selector
+    topicId=topicId
+    onChangeCallback=(action "triggerResize")
+    id="private-message-users"
+    includeMessageableGroups='true'
+    placeholderKey="composer.users_placeholder"
+    tabindex="1"
+    usernames=usernames
+    hasGroups=hasGroups
+    allowEmails='true'
+    autocomplete="discourse"
+  }}
 {{else}}
-    <a href {{action "toggleSelector"}}>
+  <a href {{action "toggleSelector"}}>
     <div class='ac-wrap composer-user-selector-limited'>
       <span>{{limitedUsernames}}</span>
       <span class='btn btn-primary'>{{hiddenUsersCount}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index 73ca697a71..401f4ebcb7 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -6,7 +6,7 @@
       <label for="category-position">
         {{i18n 'category.position'}}
       </label>
-            {{text-field value=category.position id="category-position" class="position-input" type="number"}}
+      {{text-field value=category.position id="category-position" class="position-input" type="number"}}
     </section>
   {{/if}}
 
@@ -33,16 +33,16 @@
       {{i18n "category.search_priority.label"}}
     </label>
     <div class="controls">
-    {{combo-box
-      valueProperty="value"
-      id="category-search-priority"
-      content=searchPrioritiesOptions
-      value=category.search_priority
-      onChange=(action (mut category.search_priority))
-      options=(hash
-        placementStrategy="absolute"
-      )
-    }}
+      {{combo-box
+        valueProperty="value"
+        id="category-search-priority"
+        content=searchPrioritiesOptions
+        value=category.search_priority
+        onChange=(action (mut category.search_priority))
+        options=(hash
+          placementStrategy="absolute"
+        )
+      }}
     </div>
   </section>
 
@@ -77,13 +77,10 @@
       {{i18n "category.all_topics_wiki"}}
     </label>
   </section>
-
 </section>
 
 <section>
-
   <h3>{{i18n 'category.settings_sections.moderation'}}</h3>
-
   {{#if siteSettings.enable_category_group_review}}
     <section class="field">
       <label for="reviewable-by-group">
@@ -93,7 +90,8 @@
         groupFinder=groupFinder
         single="true"
         groupNames=category.reviewable_by_group_name
-        placeholderKey="category.review_group_name"}}
+        placeholderKey="category.review_group_name"
+      }}
     </section>
   {{/if}}
 
@@ -139,12 +137,10 @@
     </label>
     {{text-field value=category.custom_fields.num_auto_bump_daily id="category-number-daily-bump" type="number"}}
   </section>
-
 </section>
 
 <section>
-
-  <h3> {{i18n "category.settings_sections.appearance"}}</h3>
+  <h3>{{i18n "category.settings_sections.appearance"}}</h3>
 
   <section class="field default-view-field">
     <label for="category-default-view">
@@ -185,75 +181,73 @@
       {{i18n "category.sort_order"}}
     </label>
     <div class="controls">
-    {{combo-box valueProperty="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
-    {{#unless isDefaultSortOrder}}
-      {{combo-box
-        castBoolean=true
-        valueProperty="value"
-        content=sortAscendingOptions
-        value=category.sort_ascending
-        none="category.sort_options.default"
-        options=(hash
-          placementStrategy="absolute"
-        )
-      }}
-    {{/unless}}
-      </div>
-  </section>
-
-    {{#if isParentCategory}}
-      <section class="field show-subcategory-list-field">
-        <label>
-          {{input type="checkbox" checked=category.show_subcategory_list}}
-          {{i18n "category.show_subcategory_list"}}
-        </label>
-      </section>
-    {{/if}}
-
-    {{#if showSubcategoryListStyle}}
-      <section class="field subcategory-list-style-field">
-        <label for="subcategory-list-style">
-          {{i18n "category.subcategory_list_style"}}
-        </label>
+      {{combo-box valueProperty="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
+      {{#unless isDefaultSortOrder}}
         {{combo-box
+          castBoolean=true
           valueProperty="value"
-          id="subcategory-list-style"
-          content=availableSubcategoryListStyles
-          value=category.subcategory_list_style
+          content=sortAscendingOptions
+          value=category.sort_ascending
+          none="category.sort_options.default"
           options=(hash
             placementStrategy="absolute"
           )
         }}
-      </section>
-    {{/if}}
+      {{/unless}}
+    </div>
+  </section>
+  {{#if isParentCategory}}
+    <section class="field show-subcategory-list-field">
+      <label>
+        {{input type="checkbox" checked=category.show_subcategory_list}}
+        {{i18n "category.show_subcategory_list"}}
+      </label>
+    </section>
+  {{/if}}
 
+  {{#if showSubcategoryListStyle}}
+    <section class="field subcategory-list-style-field">
+      <label for="subcategory-list-style">
+        {{i18n "category.subcategory_list_style"}}
+      </label>
+      {{combo-box
+        valueProperty="value"
+        id="subcategory-list-style"
+        content=availableSubcategoryListStyles
+        value=category.subcategory_list_style
+        options=(hash
+          placementStrategy="absolute"
+        )
+      }}
+    </section>
+  {{/if}}
 </section>
 
 <section>
-  <h3> {{i18n "category.settings_sections.email"}}</h3>
+  <h3>{{i18n "category.settings_sections.email"}}</h3>
 
   {{#if emailInEnabled}}
-      <section class='field'>
-        <label for="category-email-in">
-          {{d-icon "far-envelope"}}
-          {{i18n 'category.email_in'}}
-        </label>
-                {{text-field id="category-email-in" class="email-in" value=category.email_in}}
-      </section>
+    <section class='field'>
+      <label for="category-email-in">
+        {{d-icon "far-envelope"}}
+        {{i18n 'category.email_in'}}
+      </label>
+      {{text-field id="category-email-in" class="email-in" value=category.email_in}}
+    </section>
 
-      <section class='field'>
-        <label>
-          {{input type="checkbox" checked=category.email_in_allow_strangers}}
-          {{i18n 'category.email_in_allow_strangers'}}
-        </label>
-      </section>
+    <section class='field'>
+      <label>
+        {{input type="checkbox" checked=category.email_in_allow_strangers}}
+        {{i18n 'category.email_in_allow_strangers'}}
+      </label>
+    </section>
 
-      <section class='field'>
-          <label>
-            {{input type="checkbox" checked=category.mailinglist_mirror}}
-            {{i18n 'category.mailinglist_mirror'}}
-          </label>
-      </section>
+    <section class='field'>
+      <label>
+        {{input type="checkbox" checked=category.mailinglist_mirror}}
+        {{i18n 'category.mailinglist_mirror'}}
+      </label>
+    </section>
 
     {{plugin-outlet name="category-email-in" args=(hash category=category)}}
   {{/if}}
@@ -264,7 +258,6 @@
       <a href={{get-url '/admin/site_settings/category/email'}}>{{i18n 'category.email_in_disabled_click'}}</a>
     </section>
   {{/unless}}
-
 </section>
 
 {{plugin-outlet name="category-custom-settings" args=(hash category=category) connectorTagName="" tagName="section"}}
diff --git a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
index 38451bea90..14da87147f 100644
--- a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
@@ -1,22 +1,22 @@
 <div class="future-date-input">
   {{#unless isBasedOnDuration}}
-  <div class="control-group">
-    <label>{{displayLabel}}</label>
-    {{future-date-input-selector
-      minimumResultsForSearch=-1
-      statusType=statusType
-      value=(readonly selection)
-      input=(readonly input)
-      includeDateTime=includeDateTime
-      includeWeekend=includeWeekend
-      includeFarFuture=includeFarFuture
-      includeMidFuture=includeMidFuture
-      clearable=clearable
-      none="topic.auto_update_input.none"
-      onChangeInput=onChangeInput
-      onChange=(action (mut selection))
-    }}
-  </div>
+    <div class="control-group">
+      <label>{{displayLabel}}</label>
+      {{future-date-input-selector
+        minimumResultsForSearch=-1
+        statusType=statusType
+        value=(readonly selection)
+        input=(readonly input)
+        includeDateTime=includeDateTime
+        includeWeekend=includeWeekend
+        includeFarFuture=includeFarFuture
+        includeMidFuture=includeMidFuture
+        clearable=clearable
+        none="topic.auto_update_input.none"
+        onChangeInput=onChangeInput
+        onChange=(action (mut selection))
+      }}
+    </div>
   {{/unless}}
 
   {{#if displayDateAndTimePicker}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index 7f6104b836..cc819f07a9 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -1,14 +1,14 @@
 {{#if visible}}
   <div class="card-content">
-
     <div class="card-row first-row">
       <div class="group-card-avatar">
         <a href={{groupPath}} {{action "showGroup" group}} class="card-huge-avatar">
           {{avatar-flair
-          flairURL=group.flair_url
-          flairBgColor=group.flair_bg_color
-          flairColor=group.flair_color
-          groupName=group.name}}
+            flairURL=group.flair_url
+            flairBgColor=group.flair_bg_color
+            flairColor=group.flair_color
+            groupName=group.name
+          }}
         </a>
       </div>
       <div class="names">
@@ -26,8 +26,9 @@
       <ul class="usercard-controls group-details-button">
         <li>
           {{group-membership-button
-           model=group
-           showLogin=(route-action "showLogin")}}
+             model=group
+             showLogin=(route-action "showLogin")
+           }}
         </li>
         {{#if group.messageable}}
           <li>
@@ -35,7 +36,8 @@
               action=(action "messageGroup")
               class="btn-primary group-message-button inline"
               icon="envelope"
-              label="groups.message"}}
+              label="groups.message"
+            }}
           </li>
         {{/if}}
       </ul>
@@ -74,13 +76,12 @@
             <a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
           {{/each}}
           {{#if showMoreMembers}}
-            <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link"><span
-               class="more-members-count">+{{moreMembersCount}}
-                {{i18n "more"}}</span></a>
+            <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link">
+              <span class="more-members-count">+{{moreMembersCount}}{{i18n "more"}}</span>
+            </a>
           {{/if}}
         </div>
       </div>
     {{/if}}
-
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
index 6c7afbab65..3efeac10ac 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
@@ -1,9 +1,9 @@
 <div class='control-group buttons'>
   {{#d-button action=(action "save")
-      disabled=saving
-      class='btn btn-primary group-manage-save'}}
-
-      {{savingText}}
+    disabled=saving
+    class='btn btn-primary group-manage-save'
+  }}
+    {{savingText}}
   {{/d-button}}
 
   {{#if saved}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index d4a9673708..451904c542 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -1,25 +1,24 @@
 <div class='clearfix info'>
-    <a href={{post.user.userUrl}} data-user-card={{post.user.username}} class='avatar-link'>
-      {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
-    </a>
-    <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
-    {{expand-post item=post}}
+  <a href={{post.user.userUrl}} data-user-card={{post.user.username}} class='avatar-link'>
+    {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
+  </a>
+  <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
+  {{expand-post item=post}}
 
   <div class='stream-topic-details'>
-      <div class='stream-topic-title'>
-        <span class='title'>
-          <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
-        </span>
+    <div class='stream-topic-title'>
+      <span class='title'>
+        <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
+      </span>
+    </div>
+    <div class="group-post-category">{{category-link post.category}}</div>
+    {{#if post.user.name}}
+      <div class="group-member-info">
+        <span class="name">{{post.user.name}}</span>
+        {{#if post.user.title}}<span class="title">, {{post.user.title}}</span>{{/if}}
       </div>
-      <div class="group-post-category">{{category-link post.category}}</div>
-      {{#if post.user.name}}
-        <div class="group-member-info">
-          <span class="name">{{post.user.name}}</span>
-          {{#if post.user.title}}<span class="title">, {{post.user.title}}</span>{{/if}}
-        </div>
-      {{/if}}
+    {{/if}}
   </div>
-
 </div>
 
 <div class='excerpt'>
diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
index a7a7875219..ad366bfc1f 100644
--- a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
@@ -38,12 +38,13 @@
             value=emailOrUsername
             placeholderKey="topic.invite_reply.email_placeholder"}}
         {{/if}}
-          {{#if showContactPicker}}
-            {{d-button
+        {{#if showContactPicker}}
+          {{d-button
             icon="address-book"
             action=(action "searchContact")
-            class="btn-primary open-contact-picker"}}
-          {{/if}}
+            class="btn-primary open-contact-picker"
+          }}
+        {{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
index 0808efcc6d..25a520642a 100644
--- a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
@@ -4,5 +4,5 @@
 {{custom-html name="extraNavItem" tagName="li"}}
 {{!- this is done to avoid DIV in the UL, originally {{plugin-outlet name="extra-nav-item"}}
 {{#each connectors as |c|}}
-{{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
+  {{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/navigation-item.hbs b/app/assets/javascripts/discourse/templates/components/navigation-item.hbs
index f6ebd1b786..7cd996da0c 100644
--- a/app/assets/javascripts/discourse/templates/components/navigation-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/navigation-item.hbs
@@ -1,6 +1,6 @@
 <a href={{hrefLink}} class={{activeClass}}>
-{{#if hasIcon}}
-<span class={{content.name}}></span>
-{{/if}}
-{{content.displayName}}
+  {{#if hasIcon}}
+    <span class={{content.name}}></span>
+  {{/if}}
+  {{content.displayName}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
index 2ac3b61ff7..6cbad0ec06 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
@@ -4,7 +4,7 @@
     <a href {{action "showEditHistory"}}
       class="has-edits {{historyClass}}"
       title="{{i18n "post.last_edited_on"}} {{editedDate}}">
-        {{d-icon "pencil-alt"}}
+      {{d-icon "pencil-alt"}}
     </a>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
index 33c3e016ac..6b1f327638 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
@@ -2,28 +2,26 @@
   <table class='reviewable-histories'>
     <thead>
       <tr>
-      <th colspan="3">{{i18n "review.history.title"}}</th>
-    </tr>
+        <th colspan="3">{{i18n "review.history.title"}}</th>
+      </tr>
     </thead>
     <tbody>
-    {{#each filteredHistories as |rh|}}
-      {{#unless rh.created}}
-        <tr>
-          <td>
-            {{reviewable-history-description rh}}
-          </td>
-          <td>
-            {{#user-link user=rs.user}}
-              {{avatar rh.created_by imageSize="tiny"}}
-              {{rh.created_by.username}}
-            {{/user-link}}
-          </td>
-          <td>{{format-date rh.created_at format="medium"}}</td>
-
-        </tr>
-      {{/unless}}
-    {{/each}}
-  </tbody>
-
+      {{#each filteredHistories as |rh|}}
+        {{#unless rh.created}}
+          <tr>
+            <td>
+              {{reviewable-history-description rh}}
+            </td>
+            <td>
+              {{#user-link user=rs.user}}
+                {{avatar rh.created_by imageSize="tiny"}}
+                {{rh.created_by.username}}
+              {{/user-link}}
+            </td>
+            <td>{{format-date rh.created_at format="medium"}}</td>
+          </tr>
+        {{/unless}}
+      {{/each}}
+    </tbody>
   </table>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
index e811554285..f15b9e4ace 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
@@ -1,9 +1,9 @@
 {{#if reviewable.reviewable_scores}}
   <table class='reviewable-scores'>
     <tbody>
-    {{#each reviewable.reviewable_scores as |rs|}}
-      {{reviewable-score rs=rs reviewable=reviewable}}
-    {{/each}}
-  </tbody>
+      {{#each reviewable.reviewable_scores as |rs|}}
+        {{reviewable-score rs=rs reviewable=reviewable}}
+      {{/each}}
+    </tbody>
   </table>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
index 89df8f94e3..c3548b7c58 100644
--- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -53,9 +53,9 @@
           unlimitedTagCount=true
           onChange=(action (mut searchedTerms.tags))
         }}
-      <section class="field">
+        <section class="field">
           <label>{{ input type="checkbox" class="all-tags" checked=searchedTerms.special.all_tags}} {{i18n "search.advanced.filters.all_tags"}} </label>
-      </section>
+        </section>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index d9c0ff5802..4bfcbdc6fd 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
@@ -10,8 +10,10 @@
 
 <nav id='topic-progress' title={{i18n 'topic.progress.title'}} class={{if hideProgress 'hidden'}}>
   <div class='nums'>
-    <h4>{{progressPosition}}</h4><span class={{if hugeNumberOfPosts 'hidden'}}>
-    <span>/</span>
-    <h4>{{postStream.filteredPostsCount}}</h4></span>
+    <h4>{{progressPosition}}</h4>
+    <span class={{if hugeNumberOfPosts 'hidden'}}>
+      <span>/</span>
+      <h4>{{postStream.filteredPostsCount}}</h4>
+    </span>
   </div>
 </nav>
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 4bc61d7a7c..60bf8008b9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -153,8 +153,10 @@
         <div class="card-row">
           <div class="location-and-website">
             {{#if user.location}}
-              <span class='location'>{{d-icon "map-marker-alt"}}
-                <span>{{user.location}}</span></span>
+              <span class='location'>
+                {{d-icon "map-marker-alt"}}
+                <span>{{user.location}}</span>
+              </span>
             {{/if}}
             {{#if user.website_name}}
               <span class='website-name'>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index fd3cb91917..5583c96f89 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,5 +1,10 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>
+  {{html-safe field.name}}
+  {{#if field.required}}
+    <span class='required'>*</span>
+  {{/if}}
 </label>
+
 <div class='controls'>
   {{combo-box
     id=(concat 'user-' elementId)
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index f6da96aa0c..50d4f6ee86 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -46,7 +46,8 @@
 </p>
 
 {{#each item.children as |child|}}
-  <div class='user-stream-item-actions child-actions'>{{!-- DEPRECATED: 'child-actions' class --}}
+  {{!-- DEPRECATED: 'child-actions' class --}}
+  <div class='user-stream-item-actions child-actions'>
     {{d-icon child.icon class="icon"}}
     {{#each child.items as |grandChild|}}
       {{#if grandChild.removableBookmark}}
@@ -54,10 +55,11 @@
           class="btn-default remove-bookmark"
           action=(action removeBookmark grandChild)
           icon="times"
-          label="bookmarks.remove"}}
+          label="bookmarks.remove"
+        }}
       {{else}}
-          <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
-          {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{grandChild.edit_reason}}</span>{{/if}}
+        <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
+        {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{grandChild.edit_reason}}</span>{{/if}}
       {{/if}}
     {{/each}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 9394f35486..649c3af0e4 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -93,7 +93,7 @@
 
                   <div class='search-category'>
                     {{#if result.topic.category.parentCategory}}
-                    {{category-link result.topic.category.parentCategory}}
+                      {{category-link result.topic.category.parentCategory}}
                     {{/if}}
                     {{category-link result.topic.category hideParent=true}}
                     {{#each result.topic.tags as |tag|}}
@@ -107,7 +107,7 @@
                   <span class='date'>
                     {{format-age result.created_at}}
                     {{#if result.blurb}}
-                    -
+                      -
                     {{/if}}
                   </span>
 
diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index 36d9acfe88..cd2608f2c2 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -1,88 +1,89 @@
 <section class="user-content">
-
-<div class="group-members-actions">
+  <div class="group-members-actions">
     {{#if model.can_see_members}}
-      {{text-field value=filterInput
-          placeholderKey=filterPlaceholder
-          autocomplete="discourse"
-          class="group-username-filter no-blur"}}
+      {{text-field
+        value=filterInput
+        placeholderKey=filterPlaceholder
+        autocomplete="discourse"
+        class="group-username-filter no-blur"
+      }}
     {{/if}}
 
-  <div class="group-members-manage">
-    {{#if canManageGroup}}
-      {{d-button icon="plus"
-      action=(route-action "showAddMembersModal")
-      label="groups.add_members.title"
-      class="group-members-add"}}
-      {{#if currentUser.admin}}
+    <div class="group-members-manage">
+      {{#if canManageGroup}}
         {{d-button icon="plus"
-        action=(route-action "showBulkAddModal")
-        label="admin.groups.bulk_add.title"
-        class="group-bulk-add"}}
+        action=(route-action "showAddMembersModal")
+        label="groups.add_members.title"
+        class="group-members-add"}}
+        {{#if currentUser.admin}}
+          {{d-button icon="plus"
+          action=(route-action "showBulkAddModal")
+          label="admin.groups.bulk_add.title"
+          class="group-bulk-add"}}
+        {{/if}}
       {{/if}}
-    {{/if}}
+    </div>
   </div>
-</div>
 
-{{#if hasMembers}}
-  {{#load-more selector=".group-members tr" action=(action "loadMore")}}
-    <table class='group-members'>
-      <thead>
-        {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
-        <th class='group-owner'>{{i18n "groups.members.owner"}}</th>
-        {{group-index-toggle order=order desc=desc field='added_at' i18nKey='groups.member_added'}}
-        {{group-index-toggle order=order desc=desc field='last_posted_at' i18nKey='last_post'}}
-        {{group-index-toggle order=order desc=desc field='last_seen_at'  i18nKey='last_seen'}}
-        <th></th>
-      </thead>
+  {{#if hasMembers}}
+    {{#load-more selector=".group-members tr" action=(action "loadMore")}}
+      <table class='group-members'>
+        <thead>
+          {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
+          <th class='group-owner'>{{i18n "groups.members.owner"}}</th>
+          {{group-index-toggle order=order desc=desc field='added_at' i18nKey='groups.member_added'}}
+          {{group-index-toggle order=order desc=desc field='last_posted_at' i18nKey='last_post'}}
+          {{group-index-toggle order=order desc=desc field='last_seen_at'  i18nKey='last_seen'}}
+          <th></th>
+        </thead>
 
-      <tbody>
-        {{#each model.members as |m|}}
-          <tr>
-            <td class='avatar'>
-              {{user-info user=m skipName=skipName}}
-            </td>
+        <tbody>
+          {{#each model.members as |m|}}
+            <tr>
+              <td class='avatar'>
+                {{user-info user=m skipName=skipName}}
+              </td>
 
-            <td class='group-owner'>
-              {{#if m.owner}}
-                <strong class="group-owner-label">
-                  {{d-icon "shield-alt"}}
-                </strong>
-              {{/if}}
-            </td>
-            <td>
-              <span class="text">{{bound-date m.added_at}}</span>
-            </td>
-            <td>
-              <span class="text">{{bound-date m.last_posted_at}}</span>
-            </td>
-            <td>
-              <span class="text">{{bound-date m.last_seen_at}}</span>
-            </td>
+              <td class='group-owner'>
+                {{#if m.owner}}
+                  <strong class="group-owner-label">
+                    {{d-icon "shield-alt"}}
+                  </strong>
+                {{/if}}
+              </td>
+              <td>
+                <span class="text">{{bound-date m.added_at}}</span>
+              </td>
+              <td>
+                <span class="text">{{bound-date m.last_posted_at}}</span>
+              </td>
+              <td>
+                <span class="text">{{bound-date m.last_seen_at}}</span>
+              </td>
 
-            <td>
-              {{#if canManageGroup}}
-                {{group-member-dropdown
-                  member=m
-                  onChange=(action "actOnGroup" m)
-                }}
-              {{/if}}
-              {{!-- group parameter is used by plugins --}}
-            </td>
-          </tr>
-        {{/each}}
-      </tbody>
-    </table>
-  {{/load-more}}
+              <td>
+                {{#if canManageGroup}}
+                  {{group-member-dropdown
+                    member=m
+                    onChange=(action "actOnGroup" m)
+                  }}
+                {{/if}}
+                {{!-- group parameter is used by plugins --}}
+              </td>
+            </tr>
+          {{/each}}
+        </tbody>
+      </table>
+    {{/load-more}}
 
-  {{conditional-loading-spinner condition=loading}}
-{{else if model.can_see_members}}
-  <br>
+    {{conditional-loading-spinner condition=loading}}
+  {{else if model.can_see_members}}
+    <br>
 
-  <div>{{i18n "groups.empty.members"}}</div>
-{{else}}
-  <br>
+    <div>{{i18n "groups.empty.members"}}</div>
+  {{else}}
+    <br>
 
-  <div>{{i18n "groups.members.forbidden"}}</div>
-{{/if}}
+    <div>{{i18n "groups.members.forbidden"}}</div>
+  {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/group-requests.hbs b/app/assets/javascripts/discourse/templates/group-requests.hbs
index d018c23d7c..7b8b793315 100644
--- a/app/assets/javascripts/discourse/templates/group-requests.hbs
+++ b/app/assets/javascripts/discourse/templates/group-requests.hbs
@@ -1,55 +1,57 @@
 <section class="user-content">
 
-<div class="group-members-actions">
-    {{text-field value=filterInput
-        placeholderKey=filterPlaceholder
-        class="group-username-filter no-blur"}}
-</div>
+  <div class="group-members-actions">
+    {{text-field
+      value=filterInput
+      placeholderKey=filterPlaceholder
+      class="group-username-filter no-blur"
+    }}
+  </div>
 
-{{#if hasRequesters}}
-  {{#load-more selector=".group-members tr" action=(action "loadMore")}}
-    <table class='group-members'>
-      <thead>
-        {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
-        {{group-index-toggle order=order desc=desc field='requested_at' i18nKey='groups.member_requested'}}
-        <th>{{i18n "groups.requests.reason"}}</th>
-        <th></th>
-        <th></th>
-      </thead>
+  {{#if hasRequesters}}
+    {{#load-more selector=".group-members tr" action=(action "loadMore")}}
+      <table class='group-members'>
+        <thead>
+          {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
+          {{group-index-toggle order=order desc=desc field='requested_at' i18nKey='groups.member_requested'}}
+          <th>{{i18n "groups.requests.reason"}}</th>
+          <th></th>
+          <th></th>
+        </thead>
 
-      <tbody>
-        {{#each model.requesters as |m|}}
-          <tr>
-            <td class='avatar'>
-              {{user-info user=m skipName=skipName}}
-            </td>
-            <td>
-              <span class="text">{{bound-date m.requested_at}}</span>
-            </td>
-            <td>{{m.reason}}</td>
-            <td>
-              {{#if m.request_undone}}
-                {{i18n "groups.requests.undone"}}
-              {{else if m.request_accepted}}
-                {{i18n "groups.requests.accepted"}}
-                {{d-button action=(action "undoAcceptRequest") actionParam=m label="undo"}}
-              {{else if m.request_denied}}
-                {{i18n "groups.requests.denied"}}
-              {{else}}
-                {{d-button action=(action "acceptRequest") actionParam=m label="groups.requests.accept" class="btn-primary"}}
-                {{d-button action=(action "denyRequest") actionParam=m label="groups.requests.deny" class="btn-danger"}}
-              {{/if}}
-            </td>
-            <td></td>
-          </tr>
-        {{/each}}
-      </tbody>
-    </table>
-  {{/load-more}}
+        <tbody>
+          {{#each model.requesters as |m|}}
+            <tr>
+              <td class='avatar'>
+                {{user-info user=m skipName=skipName}}
+              </td>
+              <td>
+                <span class="text">{{bound-date m.requested_at}}</span>
+              </td>
+              <td>{{m.reason}}</td>
+              <td>
+                {{#if m.request_undone}}
+                  {{i18n "groups.requests.undone"}}
+                {{else if m.request_accepted}}
+                  {{i18n "groups.requests.accepted"}}
+                  {{d-button action=(action "undoAcceptRequest") actionParam=m label="undo"}}
+                {{else if m.request_denied}}
+                  {{i18n "groups.requests.denied"}}
+                {{else}}
+                  {{d-button action=(action "acceptRequest") actionParam=m label="groups.requests.accept" class="btn-primary"}}
+                  {{d-button action=(action "denyRequest") actionParam=m label="groups.requests.deny" class="btn-danger"}}
+                {{/if}}
+              </td>
+              <td></td>
+            </tr>
+          {{/each}}
+        </tbody>
+      </table>
+    {{/load-more}}
 
-  {{conditional-loading-spinner condition=loading}}
-{{else}}
-  <div>{{i18n "groups.empty.requests"}}</div>
-{{/if}}
+    {{conditional-loading-spinner condition=loading}}
+  {{else}}
+    <div>{{i18n "groups.empty.requests"}}</div>
+  {{/if}}
 
 </section>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 1bc9734c13..4cb1033389 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -53,13 +53,12 @@
       {{/if}}
     </div>
   </div>
-<div class="user-content-wrapper">
-  <section class="user-primary-navigation">
-    <div class="container">
-      {{group-navigation group=model currentPath=currentPath tabs=tabs}}
-    </div>
-  </section>
-
-        {{outlet}}
-</div>
+  <div class="user-content-wrapper">
+    <section class="user-primary-navigation">
+      <div class="container">
+        {{group-navigation group=model currentPath=currentPath tabs=tabs}}
+      </div>
+    </section>
+    {{outlet}}
+  </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/templates/group/activity.hbs
index 896228f959..5d94db7b56 100644
--- a/app/assets/javascripts/discourse/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/group/activity.hbs
@@ -1,4 +1,4 @@
-  <section class="user-secondary-navigation">
+<section class="user-secondary-navigation">
   {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router._router.currentPath}}
     {{#if model.can_see_members}}
       {{group-activity-filter filter="posts" categoryId=category_id}}
@@ -12,4 +12,4 @@
 </section>
 <section class="user-content">
   {{outlet}}
-  </section>
+</section>
diff --git a/app/assets/javascripts/discourse/templates/group/manage.hbs b/app/assets/javascripts/discourse/templates/group/manage.hbs
index 5ee0f8591f..459cdd7a18 100644
--- a/app/assets/javascripts/discourse/templates/group/manage.hbs
+++ b/app/assets/javascripts/discourse/templates/group/manage.hbs
@@ -11,4 +11,4 @@
 </section>
 <section class="user-content">
   {{outlet}}
-  </section>
+</section>
diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/templates/group/messages.hbs
index 1d3edaa440..f923416abb 100644
--- a/app/assets/javascripts/discourse/templates/group/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/group/messages.hbs
@@ -1,6 +1,5 @@
-  <section class="user-secondary-navigation">
+<section class="user-secondary-navigation">
   {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=router._router.currentPath}}
-
     <li>
       {{#link-to 'group.messages.inbox' model.name}}
         {{i18n 'user.messages.inbox'}}
@@ -14,5 +13,5 @@
   {{/mobile-nav}}
 </section>
 <section class="user-content">
-    {{outlet}}
+  {{outlet}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index bf610c81ac..a3f46e47db 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -61,15 +61,15 @@
                   <div class="group-membership">
                     {{#group-membership-button tagName='' model=group showLogin=(route-action "showLogin")}}
                       {{#if group.is_group_owner}}
-                      <span class="is-group-owner">
-                        {{d-icon "shield-alt"}}
-                        {{i18n "groups.index.is_group_owner"}}
-                      </span>
+                        <span class="is-group-owner">
+                          {{d-icon "shield-alt"}}
+                          {{i18n "groups.index.is_group_owner"}}
+                        </span>
                       {{else if group.is_group_user}}
-                      <span class="is-group-member">
-                        {{d-icon "check"}}
-                        {{i18n "groups.index.is_group_user"}}
-                      </span>
+                        <span class="is-group-member">
+                          {{d-icon "check"}}
+                          {{i18n "groups.index.is_group_user"}}
+                        </span>
                       {{else if group.public_admission}}
                         {{i18n 'groups.index.public'}}
                       {{else if group.isPrivate}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index f2f1e73678..ce3f115efa 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -1,5 +1,4 @@
 <div class="container invites-show clearfix">
-
   <h2>{{welcomeTitle}}</h2>
 
   <div class="two-col">
@@ -10,15 +9,18 @@
     <div class="col-form">
       {{#if successMessage}}
         <br><br>
-        <div class='alert alert-info'><p>{{html-safe successMessage}}</p></div>
+        <div class='alert alert-info'>
+          <p>{{html-safe successMessage}}</p>
+        </div>
       {{else}}
         <p>{{i18n 'invites.invited_by'}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
-        <p>{{html-safe yourEmailMessage}}
-        {{#if externalAuthsEnabled}}
-             {{i18n 'invites.social_login_available'}}
-        {{/if}}
+        <p>
+          {{html-safe yourEmailMessage}}
+          {{#if externalAuthsEnabled}}
+            {{i18n 'invites.social_login_available'}}
+          {{/if}}
         </p>
 
         <form>
@@ -44,7 +46,8 @@
             <div class="instructions">
               {{passwordInstructions}} {{i18n 'invites.optional_description'}}
               <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
-                {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
+                {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+              </div>
             </div>
           </div>
 
@@ -61,7 +64,8 @@
             action=(action "submit")
             type="submit"
             disabled=submitDisabled
-            label="invites.accept_invite"}}
+            label="invites.accept_invite"
+          }}
 
           {{#if errorMessage}}
             <br><br>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 72ed944b94..f9fa81455a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -2,7 +2,7 @@
   {{#if hasIncoming}}
     <div class="show-mores">
       <a href class='alert alert-info clickable' {{action showInserted}}>
-	{{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
+        {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
       </a>
     </div>
   {{/if}}
@@ -10,50 +10,56 @@
   {{#if topics}}
     <table class="topic-list">
       <tbody>
-	{{#each topics as |t|}}
-	  <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
-	    <td>
-	      <div class='main-link'>
-		{{topic-status topic=t}}
-		{{topic-link t}}
-		{{raw "list/unread-indicator" includeUnreadIndicator=showUnreadIndicator
-					      topicId=t.id
-					      unreadClass=(if t.unread_by_group_member "" "read")}}
-		{{#if t.unseen}}
-		  <span class="badge-notification new-topic"></span>
-		{{/if}}
-		{{#if t.hasExcerpt}}
-		  <div class="topic-excerpt">
-		    {{html-safe t.excerpt}}
-		    {{#if t.excerptTruncated}}
-		      {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
-		    {{/if}}
-		    {{#if t.canClearPin}}
-		      <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
-		    {{/if}}
-		  </div>
-		{{/if}}
-	      </div>
-	      <div class='pull-right'>
-		{{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
-	      </div>
-	      <div class='clearfix'></div>
-	      <div class="topic-item-stats clearfix">
-		{{discourse-tags t mode="list" tagsForUser=tagsForUser}}
-		<div class="pull-right">
-		  {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-		  <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
-		</div>
-		{{#unless hideCategory}}
-		  <div class='category'>
-		    {{category-link t.category}}
-		  </div>
-		{{/unless}}
-		<div class="clearfix"></div>
-	      </div>
-	    </td>
-	  </tr>
-	{{/each}}
+        {{#each topics as |t|}}
+          <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
+            <td>
+              <div class='main-link'>
+                {{topic-status topic=t}}
+                {{topic-link t}}
+                {{raw "list/unread-indicator"
+                  includeUnreadIndicator=showUnreadIndicator
+                  topicId=t.id
+                  unreadClass=(if t.unread_by_group_member "" "read")
+                }}
+                {{#if t.unseen}}
+                  <span class="badge-notification new-topic"></span>
+                {{/if}}
+                {{#if t.hasExcerpt}}
+                  <div class="topic-excerpt">
+                    {{html-safe t.excerpt}}
+                    {{#if t.excerptTruncated}}
+                      {{#unless t.canClearPin}}
+                        <a href={{t.url}}>{{i18n 'read_more'}}</a>
+                      {{/unless}}
+                    {{/if}}
+                    {{#if t.canClearPin}}
+                      <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>
+                        {{i18n 'topic.clear_pin.title'}}
+                      </a>
+                    {{/if}}
+                  </div>
+                {{/if}}
+              </div>
+              <div class='pull-right'>
+                {{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
+              </div>
+              <div class='clearfix'></div>
+              <div class="topic-item-stats clearfix">
+                {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
+                <div class="pull-right">
+                  {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
+                  <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
+                </div>
+                {{#unless hideCategory}}
+                  <div class='category'>
+                    {{category-link t.category}}
+                  </div>
+                {{/unless}}
+                <div class="clearfix"></div>
+              </div>
+            </td>
+          </tr>
+        {{/each}}
       </tbody>
     </table>
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index b57dfeb001..148c009254 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -9,68 +9,71 @@
                 {{category-title-link category=c}}
               </th>
             </tr>
-
             {{#unless c.isMuted}}
-	      {{#if c.description_excerpt}}
-		<tr class="category-description">
-		  <td colspan="3">
-		    {{html-safe c.description_excerpt}}
-		  </td>
-		</tr>
-	      {{/if}}
-
-	      {{#if showTopics}}
-		{{#each c.topics as |t|}}
-		  {{mobile-category-topic topic=t}}
-		{{/each}}
-	      {{/if}}
-
-	      {{#if c.isGrandParent}}
-		{{#each c.subcategories as |subcategory|}}
-		  <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
-		    <td>
-		      {{category-title-link tagName="h4" category=subcategory}}
-		      <div class="subcategories-list">
-			{{#if subcategory.subcategories}}
-			  <div class='subcategories'>
-			    {{#each subcategory.subcategories as |subsubcategory|}}
-			      {{#unless subsubcategory.isMuted}}
-				{{category-link subsubcategory}}
-			      {{/unless}}
-			    {{/each}}
-			  </div>
-			{{/if}}
-		      </div>
-		    </td>
-		  </tr>
-		{{/each}}
-	      {{else if c.subcategories}}
-		<tr class="subcategories-list">
-		  <td>
-		    <div class='subcategories'>
-		      {{#each c.subcategories as |subcategory|}}
-			{{#unless subcategory.isMuted}}
-			  {{category-link subcategory}}
-			{{/unless}}
-		      {{/each}}
-		    </div>
-		  </td>
-		</tr>
-	      {{/if}}
+              {{#if c.description_excerpt}}
+                <tr class="category-description">
+                  <td colspan="3">
+                    {{html-safe c.description_excerpt}}
+                  </td>
+                </tr>
+              {{/if}}
+              {{#if showTopics}}
+                {{#each c.topics as |t|}}
+                  {{mobile-category-topic topic=t}}
+                {{/each}}
+              {{/if}}
+              {{#if c.isGrandParent}}
+                {{#each c.subcategories as |subcategory|}}
+                  <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
+                    <td>
+                      {{category-title-link tagName="h4" category=subcategory}}
+                      <div class="subcategories-list">
+                        {{#if subcategory.subcategories}}
+                          <div class='subcategories'>
+                            {{#each subcategory.subcategories as |subsubcategory|}}
+                              {{#unless subsubcategory.isMuted}}
+                                {{category-link subsubcategory}}
+                              {{/unless}}
+                            {{/each}}
+                          </div>
+                        {{/if}}
+                      </div>
+                    </td>
+                  </tr>
+                {{/each}}
+              {{else if c.subcategories}}
+                <tr class="subcategories-list">
+                  <td>
+                    <div class='subcategories'>
+                      {{#each c.subcategories as |subcategory|}}
+                        {{#unless subcategory.isMuted}}
+                          {{category-link subcategory}}
+                        {{/unless}}
+                      {{/each}}
+                    </div>
+                  </td>
+                </tr>
+              {{/if}}
             {{/unless}}
           </tbody>
         </table>
         <footer class="clearfix">
-          <figure title={{i18n 'all_time_desc'}}>{{number c.topics_all_time}} <figcaption>{{i18n 'all_time'}}</figcaption></figure>
-
+          <figure title={{i18n 'all_time_desc'}}>
+            {{number c.topics_all_time}}
+            <figcaption>{{i18n 'all_time'}}</figcaption>
+          </figure>
           {{#if c.pickMonth}}
-          <figure title={{i18n 'month_desc'}}>{{number c.topics_month}} <figcaption>/ {{i18n 'month'}}</figcaption></figure>
+            <figure title={{i18n 'month_desc'}}>
+              {{number c.topics_month}}
+              <figcaption>/ {{i18n 'month'}}</figcaption>
+            </figure>
           {{/if}}
-
           {{#if c.pickWeek}}
-            <figure title={{i18n 'week_desc'}}>{{number c.topics_week}} <figcaption>/ {{i18n 'week'}}</figcaption></figure>
+            <figure title={{i18n 'week_desc'}}>
+              {{number c.topics_week}}
+              <figcaption>/ {{i18n 'week'}}</figcaption>
+            </figure>
           {{/if}}
-
         </footer>
       </div>
     {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
index e95a8cb20f..7ec577917c 100644
--- a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
@@ -1,60 +1,63 @@
 <section class="user-content">
-{{text-field value=filterInput
+  {{text-field
+    value=filterInput
     placeholderKey=filterPlaceholder
     autocomplete="discourse"
-    class="group-username-filter no-blur"}}
+    class="group-username-filter no-blur"
+  }}
 
-<div class="group-members-manage">
-  {{#if canManageGroup}}
-    {{#if currentUser.admin}}
-      {{group-members-dropdown
-        showAddMembersModal=(route-action "showAddMembersModal")
-        showBulkAddModal=(route-action "showBulkAddModal")
-      }}
-    {{else}}
-      {{d-button
+  <div class="group-members-manage">
+    {{#if canManageGroup}}
+      {{#if currentUser.admin}}
+        {{group-members-dropdown
+          showAddMembersModal=(route-action "showAddMembersModal")
+          showBulkAddModal=(route-action "showBulkAddModal")
+        }}
+      {{else}}
+        {{d-button
           icon="plus"
           label="groups.add_members.title"
           class="group-members-add"
-          action=(route-action "showAddMembersModal")}}
+          action=(route-action "showAddMembersModal")
+        }}
+      {{/if}}
     {{/if}}
+  </div>
+
+  {{#if hasMembers}}
+    {{#load-more selector=".group-members .user-info" action=(action "loadMore")}}
+      <div class="group-members">
+        {{#each model.members as |user|}}
+          <div class="group-member">
+            {{#user-info user=user skipName=skipName}}
+              {{#if user.owner}}<strong class="group-owner-label">{{i18n "groups.owner"}}</strong>{{/if}}
+
+              <div class="group-member-info">
+                <label>{{i18n "last_post"}}</label>
+                <span class="text">{{bound-date user.last_posted_at}}</span>
+              </div>
+
+              <div class="group-member-info">
+                <label>{{i18n "last_seen"}}</label>
+                <span class="text">{{bound-date user.last_seen_at}}</span>
+              </div>
+
+              {{#if canManageGroup}}
+                {{group-member-dropdown
+                  member=user
+                  onChange=(action "actOnGroup" user)
+                }}
+              {{/if}}
+            {{/user-info}}
+          </div>
+        {{/each}}
+      </div>
+    {{/load-more}}
+
+    {{conditional-loading-spinner condition=loading}}
+  {{else}}
+    <br>
+
+    <div>{{i18n "groups.empty.members"}}</div>
   {{/if}}
-</div>
-
-{{#if hasMembers}}
-  {{#load-more selector=".group-members .user-info" action=(action "loadMore")}}
-    <div class="group-members">
-      {{#each model.members as |user|}}
-        <div class="group-member">
-          {{#user-info user=user skipName=skipName}}
-            {{#if user.owner}}<strong class="group-owner-label">{{i18n "groups.owner"}}</strong>{{/if}}
-
-            <div class="group-member-info">
-              <label>{{i18n "last_post"}}</label>
-              <span class="text">{{bound-date user.last_posted_at}}</span>
-            </div>
-
-            <div class="group-member-info">
-              <label>{{i18n "last_seen"}}</label>
-              <span class="text">{{bound-date user.last_seen_at}}</span>
-            </div>
-
-            {{#if canManageGroup}}
-              {{group-member-dropdown
-                member=user
-                onChange=(action "actOnGroup" user)
-              }}
-            {{/if}}
-          {{/user-info}}
-        </div>
-      {{/each}}
-    </div>
-  {{/load-more}}
-
-  {{conditional-loading-spinner condition=loading}}
-{{else}}
-  <br>
-
-  <div>{{i18n "groups.empty.members"}}</div>
-{{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 890a7dbdcc..553705c7a5 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -1,11 +1,11 @@
 {{#d-modal-body id="bookmark-reminder-modal"}}
   {{#conditional-loading-spinner condition=loading}}
     {{#if errorMessage}}
-    <div class="control-group">
-      <div class="controls">
-        <div class='alert alert-error'>{{errorMessage}}</div>
+      <div class="control-group">
+        <div class="controls">
+          <div class='alert alert-error'>{{errorMessage}}</div>
+        </div>
       </div>
-    </div>
     {{/if}}
 
     <div class="control-group">
@@ -13,83 +13,83 @@
     </div>
 
     {{#if showBookmarkReminderControls}}
-    <div class="control-group">
-      <label class="control-label" for="set_reminder">
-        {{i18n 'post.bookmarks.set_reminder'}}
-      </label>
+      <div class="control-group">
+        <label class="control-label" for="set_reminder">
+          {{i18n 'post.bookmarks.set_reminder'}}
+        </label>
 
-      {{#if userHasTimezoneSet}}
-        {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
-          {{#if showAtDesktop}}
-            {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.at_desktop"}}</div>
-            {{/tap-tile}}
-          {{/if}}
+        {{#if userHasTimezoneSet}}
+          {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
+            {{#if showAtDesktop}}
+              {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+                <div class="tap-tile-title">{{i18n "bookmarks.reminders.at_desktop"}}</div>
+              {{/tap-tile}}
+            {{/if}}
 
-          {{#if showLaterToday}}
-            {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_today"}}</div>
-              <div class="tap-tile-date">{{laterTodayFormatted}}</div>
+            {{#if showLaterToday}}
+              {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+                <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_today"}}</div>
+                <div class="tap-tile-date">{{laterTodayFormatted}}</div>
+              {{/tap-tile}}
+            {{/if}}
+            {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.tomorrow"}}</div>
+              <div class="tap-tile-date">{{tomorrowFormatted}}</div>
             {{/tap-tile}}
-          {{/if}}
-          {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.tomorrow"}}</div>
-            <div class="tap-tile-date">{{tomorrowFormatted}}</div>
-          {{/tap-tile}}
-          {{#if showLaterThisWeek}}
-            {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_this_week"}}</div>
-              <div class="tap-tile-date">{{laterThisWeekFormatted}}</div>
+            {{#if showLaterThisWeek}}
+              {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+                <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_this_week"}}</div>
+                <div class="tap-tile-date">{{laterThisWeekFormatted}}</div>
+              {{/tap-tile}}
+            {{/if}}
+            {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.start_of_next_business_week"}}</div>
+              <div class="tap-tile-date">{{startNextBusinessWeekFormatted}}</div>
+            {{/tap-tile}}
+            {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_week"}}</div>
+              <div class="tap-tile-date">{{nextWeekFormatted}}</div>
+            {{/tap-tile}}
+            {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_month"}}</div>
+              <div class="tap-tile-date">{{nextMonthFormatted}}</div>
+            {{/tap-tile}}
+            {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.custom"}}</div>
             {{/tap-tile}}
-          {{/if}}
-          {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.start_of_next_business_week"}}</div>
-            <div class="tap-tile-date">{{startNextBusinessWeekFormatted}}</div>
-          {{/tap-tile}}
-          {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_week"}}</div>
-            <div class="tap-tile-date">{{nextWeekFormatted}}</div>
-          {{/tap-tile}}
-          {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_month"}}</div>
-            <div class="tap-tile-date">{{nextMonthFormatted}}</div>
-          {{/tap-tile}}
-          {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.custom"}}</div>
-          {{/tap-tile}}
 
-          {{#if customDateTimeSelected}}
-            <div class="control-group custom-date-time-wrap">
-              <div class="tap-tile-date-input">
-                {{d-icon "calendar-alt"}}
-                {{date-picker-future
-                  value=customReminderDate
-                  onSelect=(action (mut customReminderDate))
-                }}
+            {{#if customDateTimeSelected}}
+              <div class="control-group custom-date-time-wrap">
+                <div class="tap-tile-date-input">
+                  {{d-icon "calendar-alt"}}
+                  {{date-picker-future
+                    value=customReminderDate
+                    onSelect=(action (mut customReminderDate))
+                  }}
+                </div>
+                <div class="tap-tile-time-input">
+                  {{d-icon "far-clock"}}
+                  {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
+                </div>
               </div>
-              <div class="tap-tile-time-input">
-                {{d-icon "far-clock"}}
-                {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
-              </div>
-            </div>
-          {{/if}}
+            {{/if}}
 
-          {{#if showLastCustom}}
-            {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.last_custom"}}</div>
-              <div class="tap-tile-date">{{lastCustomFormatted}}</div>
+            {{#if showLastCustom}}
+              {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+                <div class="tap-tile-title">{{i18n "bookmarks.reminders.last_custom"}}</div>
+                <div class="tap-tile-date">{{lastCustomFormatted}}</div>
+              {{/tap-tile}}
+            {{/if}}
+
+            {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.none"}}</div>
             {{/tap-tile}}
-          {{/if}}
+          {{/tap-tile-grid}}
 
-          {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.none"}}</div>
-          {{/tap-tile}}
-        {{/tap-tile-grid}}
-
-      {{else}}
-        <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
-      {{/if}}
-    </div>
+        {{else}}
+          <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
+        {{/if}}
+      </div>
     {{/if}}
 
     <div class="control-group">
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index bd03f39f24..c5b493a8a1 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -10,117 +10,123 @@
       {{#if showCreateForm}}
         <div class="login-form">
           <form>
-          <table>
-            <tbody>
-              <tr class="input create-account-email">
-                    <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
-                    <td>
-                    {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
-                    </td>
-              </tr>
-
-              <tr class="instructions create-account-email">
-                <td></td>
-                    {{input-tip validation=emailValidation id="account-email-validation"}}
-                    <td><label>{{i18n 'user.email.instructions'}}</label></td>
-              </tr>
-
-              {{#if usernameRequired}}
-                <tr class="input">
-                      <td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td>
-                      <td>
-                      {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
-                      </td>
-                </tr>
-                <tr class="instructions">
-                  <td></td>
-                  {{input-tip validation=usernameValidation id="username-validation"}}
-                  <td><label>{{i18n 'user.username.instructions'}}</label></td>
-                </tr>
-              {{/if}}
-
-              {{#if fullnameRequired}}
-                <tr class="input">
-                  <td class="label">
-                    <label for='new-account-name'>{{i18n 'user.name.title'}}</label>
-                  </td>
+            <table>
+              <tbody>
+                <tr class="input create-account-email">
+                  <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
                   <td>
-                    {{text-field value=accountName id="new-account-name"}}
+                    {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
                   </td>
                 </tr>
-                <tr class="instructions">
+
+                <tr class="instructions create-account-email">
                   <td></td>
-                  {{input-tip validation=nameValidation}}
-                  <td><label>{{nameInstructions}}</label></td>
+                  {{input-tip validation=emailValidation id="account-email-validation"}}
+                  <td><label>{{i18n 'user.email.instructions'}}</label></td>
                 </tr>
-              {{/if}}
 
-              {{plugin-outlet name="create-account-before-password"
-                              noTags=true
-                              args=(hash accountName=accountName
-                                         accountUsername=accountUsername
-                                         accountPassword=accountPassword
-                                         userFields=userFields
-                                         authOptions=authOptions)}}
+                {{#if usernameRequired}}
+                  <tr class="input">
+                    <td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td>
+                    <td>
+                      {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
+                    </td>
+                  </tr>
+                  <tr class="instructions">
+                    <td></td>
+                    {{input-tip validation=usernameValidation id="username-validation"}}
+                    <td><label>{{i18n 'user.username.instructions'}}</label></td>
+                  </tr>
+                {{/if}}
 
-              {{#if passwordRequired}}
-                <tr class="input">
+                {{#if fullnameRequired}}
+                  <tr class="input">
+                    <td class="label">
+                      <label for='new-account-name'>{{i18n 'user.name.title'}}</label>
+                    </td>
+                    <td>
+                      {{text-field value=accountName id="new-account-name"}}
+                    </td>
+                  </tr>
+                  <tr class="instructions">
+                    <td></td>
+                    {{input-tip validation=nameValidation}}
+                    <td><label>{{nameInstructions}}</label></td>
+                  </tr>
+                {{/if}}
+
+                {{plugin-outlet
+                  name="create-account-before-password"
+                  noTags=true
+                  args=(hash
+                    accountName=accountName
+                    accountUsername=accountUsername
+                    accountPassword=accountPassword
+                    userFields=userFields
+                    authOptions=authOptions
+                  )
+                }}
+
+                {{#if passwordRequired}}
+                  <tr class="input">
                     <td class="label"><label for='new-account-password'>{{i18n 'user.password.title'}}</label></td>
                     <td>
-                    {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
+                      {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
                     </td>
-                </tr>
-                <tr class="instructions">
-                  <td></td>
-                  {{input-tip validation=passwordValidation}}
+                  </tr>
+                  <tr class="instructions">
+                    <td></td>
+                    {{input-tip validation=passwordValidation}}
+                    <td>
+                      <label>{{passwordInstructions}}</label>
+                      <div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">
+                        {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+                      </div>
+                    </td>
+                  </tr>
+                {{/if}}
+
+                <tr class="password-confirmation">
+                  <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
                   <td>
-                    <label>{{passwordInstructions}}</label>
-                    <div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">
-                      {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
+                    {{honeypot-input id="new-account-confirmation" autocomplete="new-password" value=accountHoneypot}}
+                    {{input value=accountChallenge id="new-account-challenge"}}
                   </td>
                 </tr>
-              {{/if}}
 
-              <tr class="password-confirmation">
-                <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
-                <td>
-                  {{honeypot-input id="new-account-confirmation" autocomplete="new-password" value=accountHoneypot}}
-                  {{input value=accountChallenge id="new-account-challenge"}}
-                </td>
-              </tr>
+                {{#if requireInviteCode }}
+                  <tr class="invite-code">
+                    <td><label for='invite-code'>{{i18n 'user.invite_code.title'}}</label></td>
+                    <td>
+                      {{input value=inviteCode id="inviteCode"}}
+                    </td>
+                    <td><label>{{i18n 'user.invite_code.instructions'}}</label></td>
+                  </tr>
+                {{/if}}
 
-              {{#if requireInviteCode }}
-                <tr class="invite-code">
-                  <td><label for='invite-code'>{{i18n 'user.invite_code.title'}}</label></td>
-                  <td>
-                    {{input value=inviteCode id="inviteCode"}}
-                  </td>
-
-                  <td><label>{{i18n 'user.invite_code.instructions'}}</label></td>
-                </tr>
-              {{/if}}
-
-              {{plugin-outlet name="create-account-after-password"
-                              noTags=true
-                              args=(hash accountName=accountName
-                                         accountUsername=accountUsername
-                                         accountPassword=accountPassword
-                                         userFields=userFields)}}
-            </tbody>
-          </table>
-
-          {{#if userFields}}
-            <div class='user-fields'>
-              {{#each userFields as |f|}}
-                {{user-field field=f.field value=f.value}}
-              {{/each}}
-            </div>
-          {{/if}}
+                {{plugin-outlet
+                  name="create-account-after-password"
+                  noTags=true
+                  args=(hash
+                    accountName=accountName
+                    accountUsername=accountUsername
+                    accountPassword=accountPassword
+                    userFields=userFields
+                  )
+                }}
+              </tbody>
+            </table>
 
+            {{#if userFields}}
+              <div class='user-fields'>
+                {{#each userFields as |f|}}
+                  {{user-field field=f.field value=f.value}}
+                {{/each}}
+              </div>
+            {{/if}}
           </form>
         </div>
       {{/if}}
-
     {{/d-modal-body}}
 
     {{#if showCreateForm}}
@@ -129,7 +135,8 @@
           class="btn-large btn-primary"
           action=(action "createAccount")
           disabled=submitDisabled
-          label="create_account.title"}}
+          label="create_account.title"
+        }}
 
         {{#conditional-loading-spinner condition=formSubmitted size="small"}}
           {{#d-button class="btn-large" id="login-link" action=(route-action "showLogin")}}
@@ -137,11 +144,10 @@
           {{/d-button}}
         {{/conditional-loading-spinner}}
 
-      <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
+        <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
       </div>
 
       {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
-
     {{/if}}
   {{/unless}}
 {{/create-account}}
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs
index 056f2bc9a3..4a37ee0337 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs
@@ -1,14 +1,16 @@
 {{#d-modal-body class="flag-modal-body" title=title}}
   <form>
     {{#flag-selection nameKey=selected.name_key flags=flagsAvailable as |f|}}
-      {{flag-action-type flag=f
-                         message=message
-                         isWarning=isWarning
-                         selectedFlag=selected
-                         username=model.username
-                         staffFlagsAvailable=staffFlagsAvailable
-                         changePostActionType=(action "changePostActionType")}}
-   {{/flag-selection}}
+      {{flag-action-type
+        flag=f
+        message=message
+        isWarning=isWarning
+        selectedFlag=selected
+        username=model.username
+        staffFlagsAvailable=staffFlagsAvailable
+        changePostActionType=(action "changePostActionType")
+      }}
+    {{/flag-selection}}
   </form>
 {{/d-modal-body}}
 
@@ -19,7 +21,8 @@
     disabled=submitDisabled
     title="flagging.submit_tooltip"
     icon=submitIcon
-    label=submitLabel}}
+    label=submitLabel
+  }}
 
   {{#if canSendWarning}}
     {{d-button
@@ -27,7 +30,8 @@
       action=(action "createFlagAsWarning")
       disabled=submitDisabled
       icon="exclamation-triangle"
-      label="flagging.official_warning"}}
+      label="flagging.official_warning"
+    }}
   {{/if}}
 
   {{#if canTakeAction}}
@@ -37,7 +41,8 @@
       disabled=submitDisabled
       title="flagging.take_action_tooltip"
       icon="gavel"
-      label="flagging.take_action"}}
+      label="flagging.take_action"
+    }}
   {{/if}}
 
   {{#if showDeleteSpammer}}
@@ -46,6 +51,7 @@
       action=(action "deleteSpammer")
       disabled=submitDisabled
       icon="exclamation-triangle"
-      label="flagging.delete_spammer"}}
+      label="flagging.delete_spammer"
+    }}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
index 4f3149b7b6..331b08587e 100644
--- a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
@@ -1,40 +1,40 @@
 <form {{action "ok" on="submit"}}>
   {{#d-modal-body title="composer.link_dialog_title" class="insert-link"}}
-      <div class="inputs">
-        {{text-field
-          value=linkUrl
-          placeholderKey="composer.link_url_placeholder"
-          class="link-url"
-          key-up=(action "search")
-        }}
-        {{#if searchLoading}}
-          {{loading-spinner}}
-        {{/if}}
-        {{#if searchResults}}
-          <div class="internal-link-results">
-            {{#each searchResults as |result|}}
-              <a
-                class="search-link"
-                href={{result.url}}
-                onclick={{action "linkClick"}}
-                data-title={{result.title}}>
-                {{topic-status topic=result disableActions=true}}
-                {{replace-emoji result.fancy_title}}
-                <div class="search-category">
-                  {{#if result.category.parentCategory}}
-                    {{category-link result.category.parentCategory}}
-                  {{/if}}
-                  {{category-link result.category hideParent=true}}
-                  {{discourse-tags result}}
-                </div>
-              </a>
-            {{/each}}
-          </div>
-        {{/if}}
-      </div>
-      <div class="inputs">
-        {{text-field value=linkText placeholderKey="composer.link_optional_text" class="link-text"}}
-      </div>
+    <div class="inputs">
+      {{text-field
+        value=linkUrl
+        placeholderKey="composer.link_url_placeholder"
+        class="link-url"
+        key-up=(action "search")
+      }}
+      {{#if searchLoading}}
+        {{loading-spinner}}
+      {{/if}}
+      {{#if searchResults}}
+        <div class="internal-link-results">
+          {{#each searchResults as |result|}}
+            <a
+              class="search-link"
+              href={{result.url}}
+              onclick={{action "linkClick"}}
+              data-title={{result.title}}>
+              {{topic-status topic=result disableActions=true}}
+              {{replace-emoji result.fancy_title}}
+              <div class="search-category">
+                {{#if result.category.parentCategory}}
+                  {{category-link result.category.parentCategory}}
+                {{/if}}
+                {{category-link result.category hideParent=true}}
+                {{discourse-tags result}}
+              </div>
+            </a>
+          {{/each}}
+        </div>
+      {{/if}}
+    </div>
+    <div class="inputs">
+      {{text-field value=linkText placeholderKey="composer.link_optional_text" class="link-text"}}
+    </div>
   {{/d-modal-body}}
 
   <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 43f550d15e..f2d6b022e9 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -56,21 +56,21 @@
       </ul>
     </section>
     {{#if showBookmarkShortcuts}}
-    <section class="keyboard-shortcuts-bookmark-section">
-      <h4>{{i18n "keyboard_shortcuts_help.bookmarks.title"}}</h4>
-      <ul>
-        <li>{{html-safe shortcuts.bookmarks.enter}}</li>
-        <li>{{html-safe shortcuts.bookmarks.later_today}}</li>
-        <li>{{html-safe shortcuts.bookmarks.later_this_week}}</li>
-        <li>{{html-safe shortcuts.bookmarks.tomorrow}}</li>
-        <li>{{html-safe shortcuts.bookmarks.next_week}}</li>
-        <li>{{html-safe shortcuts.bookmarks.next_month}}</li>
-        <li>{{html-safe shortcuts.bookmarks.next_business_week}}</li>
-        <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
-        <li>{{html-safe shortcuts.bookmarks.custom}}</li>
-        <li>{{html-safe shortcuts.bookmarks.none}}</li>
-      </ul>
-    </section>
+      <section class="keyboard-shortcuts-bookmark-section">
+        <h4>{{i18n "keyboard_shortcuts_help.bookmarks.title"}}</h4>
+        <ul>
+          <li>{{html-safe shortcuts.bookmarks.enter}}</li>
+          <li>{{html-safe shortcuts.bookmarks.later_today}}</li>
+          <li>{{html-safe shortcuts.bookmarks.later_this_week}}</li>
+          <li>{{html-safe shortcuts.bookmarks.tomorrow}}</li>
+          <li>{{html-safe shortcuts.bookmarks.next_week}}</li>
+          <li>{{html-safe shortcuts.bookmarks.next_month}}</li>
+          <li>{{html-safe shortcuts.bookmarks.next_business_week}}</li>
+          <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
+          <li>{{html-safe shortcuts.bookmarks.custom}}</li>
+          <li>{{html-safe shortcuts.bookmarks.none}}</li>
+        </ul>
+      </section>
     {{/if}}
   </div>
   <div class="column">
diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
index 9461b5d3c4..df4dd14513 100644
--- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
@@ -2,25 +2,25 @@
   <div id="rc-scroll-anchor"></div>
   <table>
     <thead>
-    <th class="th-cat">{{i18n "categories.category"}}</th>
-    <th class="th-pos">{{i18n "categories.reorder.position"}}</th>
+      <th class="th-cat">{{i18n "categories.category"}}</th>
+      <th class="th-pos">{{i18n "categories.reorder.position"}}</th>
     </thead>
     <tbody>
-    {{#each categoriesOrdered as |cat|}}
-      <tr data-category-id={{cat.id}}>
-        <td>
-          <div class={{concat 'reorder-categories-depth-' cat.depth}}>
-            {{category-badge cat allowUncategorized="true"}}
-          </div>
-        </td>
+      {{#each categoriesOrdered as |cat|}}
+        <tr data-category-id={{cat.id}}>
+          <td>
+            <div class={{concat 'reorder-categories-depth-' cat.depth}}>
+              {{category-badge cat allowUncategorized="true"}}
+            </div>
+          </td>
 
-        <td>
-          {{number-field number=(readonly cat.position) change=(action 'change' cat)}}
-          {{d-button class="btn-default no-text" action=(action "moveUp") actionParam=cat icon="arrow-up"}}
-          {{d-button class="btn-default no-text" action=(action "moveDown") actionParam=cat icon="arrow-down"}}
-        </td>
-      </tr>
-    {{/each}}
+          <td>
+            {{number-field number=(readonly cat.position) change=(action 'change' cat)}}
+            {{d-button class="btn-default no-text" action=(action "moveUp") actionParam=cat icon="arrow-up"}}
+            {{d-button class="btn-default no-text" action=(action "moveDown") actionParam=cat icon="arrow-down"}}
+          </td>
+        </tr>
+      {{/each}}
     </tbody>
   </table>
   <div id="rc-scroll-bottom"></div>
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index dd37835554..c993a811a2 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -1,11 +1,11 @@
 {{#d-modal-body}}
   {{#conditional-loading-spinner condition=loading}}
     {{#if errorMessage}}
-    <div class="control-group">
-      <div class="controls">
-        <div class='alert alert-error'>{{errorMessage}}</div>
+      <div class="control-group">
+        <div class="controls">
+          <div class='alert alert-error'>{{errorMessage}}</div>
+        </div>
       </div>
-    </div>
     {{/if}}
 
     <div class="control-group">
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
index e9988b486f..8a9e433672 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
@@ -1,51 +1,51 @@
 {{#d-modal-body}}
-<section class="user-preferences solo-preference  second-factor-backup-preferences">
-  <form class="form-horizontal">
-    {{#if successMessage}}
-      <div class="alert alert-success">
-        {{successMessage}}
-      </div>
-    {{/if}}
+  <section class="user-preferences solo-preference  second-factor-backup-preferences">
+    <form class="form-horizontal">
+      {{#if successMessage}}
+        <div class="alert alert-success">
+          {{successMessage}}
+        </div>
+      {{/if}}
 
-    {{#if errorMessage}}
-      <div class="alert alert-error">
-        {{errorMessage}}
-      </div>
-    {{/if}}
+      {{#if errorMessage}}
+        <div class="alert alert-error">
+          {{errorMessage}}
+        </div>
+      {{/if}}
 
-    {{#if backupEnabled}}
-      {{html-safe (i18n "user.second_factor_backup.remaining_codes" count=remainingCodes)}}
-    {{/if}}
-
-    <div class="actions">
-      {{d-button
-        class="btn-primary"
-        action=(action "generateSecondFactorCodes")
-        type="submit"
-        disabled=loading
-        label=generateBackupCodeBtnLabel}}
       {{#if backupEnabled}}
+        {{html-safe (i18n "user.second_factor_backup.remaining_codes" count=remainingCodes)}}
+      {{/if}}
+
+      <div class="actions">
         {{d-button
-          class="btn-danger"
-          action=(action "disableSecondFactorBackup")
+          class="btn-primary"
+          action=(action "generateSecondFactorCodes")
+          type="submit"
           disabled=loading
-          label="user.second_factor_backup.disable"}}
-      {{/if}}
-    </div>
+          label=generateBackupCodeBtnLabel}}
+        {{#if backupEnabled}}
+          {{d-button
+            class="btn-danger"
+            action=(action "disableSecondFactorBackup")
+            disabled=loading
+            label="user.second_factor_backup.disable"}}
+        {{/if}}
+      </div>
 
-    {{#conditional-loading-section isLoading=loading}}
-      {{#if backupCodes}}
-        <h3>{{i18n "user.second_factor_backup.codes.title"}}</h3>
+      {{#conditional-loading-section isLoading=loading}}
+        {{#if backupCodes}}
+          <h3>{{i18n "user.second_factor_backup.codes.title"}}</h3>
 
-        <p>
-          {{i18n "user.second_factor_backup.codes.description"}}
-        </p>
+          <p>
+            {{i18n "user.second_factor_backup.codes.description"}}
+          </p>
 
-        {{backup-codes
-          copyBackupCode=(action "copyBackupCode")
-          backupCodes=backupCodes}}
-      {{/if}}
-    {{/conditional-loading-section}}
-  </form>
-</section>
+          {{backup-codes
+            copyBackupCode=(action "copyBackupCode")
+            backupCodes=backupCodes}}
+        {{/if}}
+      {{/conditional-loading-section}}
+    </form>
+  </section>
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
index 7de9e5a2ad..b7e9bb651d 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
@@ -1,15 +1,18 @@
 {{#d-modal-body}}
   <div class="form-horizontal">
-  {{input type="text" value=model.name}}
+    {{input type="text" value=model.name}}
   </div>
   <div class='second-factor instructions'>
     {{i18n 'user.second_factor.security_key.edit_description'}}
   </div>
-  {{d-button action=(action "editSecurityKey")
+  {{d-button
+    action=(action "editSecurityKey")
     class="btn-primary"
-    label="user.second_factor.security_key.edit"}}
-
-  {{d-button action=(action "disableSecurityKey")
+    label="user.second_factor.security_key.edit"
+  }}
+  {{d-button
+    action=(action "disableSecurityKey")
     class="btn-danger"
-    label="user.second_factor.security_key.delete"}}
+    label="user.second_factor.security_key.delete"
+  }}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
index 48a4670230..4155ce69f6 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
@@ -1,15 +1,18 @@
 {{#d-modal-body}}
   <div class="form-horizontal">
-  {{input type="text" value=model.name}}
+    {{input type="text" value=model.name}}
   </div>
   <div class='second-factor instructions'>
     {{i18n 'user.second_factor.edit_description'}}
   </div>
-  {{d-button action=(action "editSecondFactor")
+  {{d-button
+    action=(action "editSecondFactor")
     class="btn-primary"
-    label="user.second_factor.edit"}}
-
-  {{d-button action=(action "disableSecondFactor")
+    label="user.second_factor.edit"
+  }}
+  {{d-button
+    action=(action "disableSecondFactor")
     class="btn-danger"
-    label="user.second_factor.disable"}}
+    label="user.second_factor.disable"
+  }}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index f641f8b0e0..0d3e5b8818 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -53,7 +53,8 @@
 
           <div class="instructions">
             <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
-              {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
+              {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+            </div>
           </div>
 
           {{d-button action=(action "submit") class='btn-primary' label='user.change_password.set_password' type='submit'}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index e146d073ca..0d3d8f48c8 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -1,162 +1,161 @@
 <section class='user-preferences solo-preference second-factor'>
   {{#conditional-loading-spinner condition=loading}}
-  <form class="form-horizontal">
-
-    {{#if showEnforcedNotice}}
-      <div class="control-group">
-        <div class="controls">
-          <div class='alert alert-error'>{{i18n 'user.second_factor.enforced_notice'}}</div>
-        </div>
-      </div>
-    {{/if}}
-
-    {{#if displayOAuthWarning}}
-      <div class="control-group">
-        <div class="controls">
-          {{i18n 'user.second_factor.oauth_enabled_warning'}}
-        </div>
-      </div>
-    {{/if}}
-
-    {{#if errorMessage}}
-      <div class="control-group">
-        <div class="controls">
-          <div class='alert alert-error'>{{errorMessage}}</div>
-        </div>
-      </div>
-    {{/if}}
-
-    {{#if loaded}}
-      <div class="control-group totp">
-        <div class="controls">
-          <h2>{{i18n "user.second_factor.totp.title"}}</h2>
-          {{d-button action=(action "createTotp")
-            class="btn-primary new-totp"
-            disabled=loading
-            label="user.second_factor.totp.add"}}
-          {{#each totps as |totp|}}
-            <div class="second-factor-item">
-              {{#if totp.name}}
-                {{totp.name}}
-              {{else}}
-                {{i18n "user.second_factor.totp.default_name"}}
-              {{/if}}
-
-              {{#if isCurrentUser}}
-                {{d-button action=(action "editSecondFactor" totp)
-                  class="btn-default btn-small btn-icon pad-left no-text edit"
-                  disabled=loading
-                  icon="pencil-alt"
-                }}
-              {{/if}}
-            </div>
-          {{/each}}
-        </div>
-      </div>
-
-      <div class="control-group security-key">
-        <div class="controls">
-          <h2>{{i18n "user.second_factor.security_key.title"}}</h2>
-          {{d-button action=(action "createSecurityKey")
-            class="btn-primary new-security-key"
-            disabled=loading
-            label="user.second_factor.security_key.add"}}
-          {{#each security_keys as |security_key|}}
-            <div class="second-factor-item">
-              {{#if security_key.name}}
-                {{security_key.name}}
-              {{else}}
-                {{i18n "user.second_factor.security_key.default_name"}}
-              {{/if}}
-
-              {{#if isCurrentUser}}
-                {{d-button action=(action "editSecurityKey" security_key)
-                  class="btn-default btn-small btn-icon pad-left no-text edit"
-                  disabled=loading
-                  icon="pencil-alt"
-                }}
-              {{/if}}
-            </div>
-          {{/each}}
-        </div>
-      </div>
-
-      <div class="control-group pref-second-factor-backup">
-        <div class="controls pref-second-factor-backup">
-          <h2>{{i18n "user.second_factor_backup.title"}}</h2>
-          {{#if model.second_factor_enabled}}
-            {{#if model.second_factor_backup_enabled}}
-              {{html-safe (i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes)}}
-            {{else}}
-              {{i18n 'user.second_factor_backup.enable_long'}}
-            {{/if}}
-
-            {{#if isCurrentUser}}
-              {{d-button action=(action "editSecondFactorBackup")
-                class="btn-default btn-small btn-icon pad-left no-text edit edit-2fa-backup"
-                disabled=loading
-                icon="pencil-alt"
-              }}
-            {{/if}}
-          {{else}}
-            {{i18n "user.second_factor_backup.enable_prerequisites"}}
-          {{/if}}
-        </div>
-      </div>
-
-      {{#if model.second_factor_enabled}}
-        {{#unless showEnforcedNotice}}
-          <div class="control-group">
-            <div class="controls">
-              <h2>{{i18n "user.second_factor.disable_title"}}</h2>
-              {{d-button
-                class="btn-danger"
-                action=(action "disableAllSecondFactors")
-                disabled=loading
-                label="disable"}}
-            </div>
+    <form class="form-horizontal">
+      {{#if showEnforcedNotice}}
+        <div class="control-group">
+          <div class="controls">
+            <div class='alert alert-error'>{{i18n 'user.second_factor.enforced_notice'}}</div>
           </div>
-        {{/unless}}
+        </div>
       {{/if}}
-    {{else}}
-      <div class="control-group">
-        <label class='control-label'>{{i18n 'user.password.title'}}</label>
 
-        <div class="controls">
-          <div>
-            {{text-field value=password
-              id="password"
-              type="password"
-              classNames="input-large"
-              autofocus="autofocus"}}
-          </div>
-          <div class='instructions'>
-            {{i18n 'user.second_factor.confirm_password_description'}}
+      {{#if displayOAuthWarning}}
+        <div class="control-group">
+          <div class="controls">
+            {{i18n 'user.second_factor.oauth_enabled_warning'}}
           </div>
         </div>
-      </div>
+      {{/if}}
 
-      <div class="control-group">
-        <div class="controls">
-          {{d-button
-            class="btn-primary"
-            type="submit"
-            action=(action "confirmPassword")
-            disabled=loading
-            label="continue"}}
+      {{#if errorMessage}}
+        <div class="control-group">
+          <div class="controls">
+            <div class='alert alert-error'>{{errorMessage}}</div>
+          </div>
+        </div>
+      {{/if}}
 
+      {{#if loaded}}
+        <div class="control-group totp">
+          <div class="controls">
+            <h2>{{i18n "user.second_factor.totp.title"}}</h2>
+            {{d-button action=(action "createTotp")
+              class="btn-primary new-totp"
+              disabled=loading
+              label="user.second_factor.totp.add"}}
+            {{#each totps as |totp|}}
+              <div class="second-factor-item">
+                {{#if totp.name}}
+                  {{totp.name}}
+                {{else}}
+                  {{i18n "user.second_factor.totp.default_name"}}
+                {{/if}}
+
+                {{#if isCurrentUser}}
+                  {{d-button action=(action "editSecondFactor" totp)
+                    class="btn-default btn-small btn-icon pad-left no-text edit"
+                    disabled=loading
+                    icon="pencil-alt"
+                  }}
+                {{/if}}
+              </div>
+            {{/each}}
+          </div>
+        </div>
+
+        <div class="control-group security-key">
+          <div class="controls">
+            <h2>{{i18n "user.second_factor.security_key.title"}}</h2>
+            {{d-button action=(action "createSecurityKey")
+              class="btn-primary new-security-key"
+              disabled=loading
+              label="user.second_factor.security_key.add"}}
+            {{#each security_keys as |security_key|}}
+              <div class="second-factor-item">
+                {{#if security_key.name}}
+                  {{security_key.name}}
+                {{else}}
+                  {{i18n "user.second_factor.security_key.default_name"}}
+                {{/if}}
+
+                {{#if isCurrentUser}}
+                  {{d-button action=(action "editSecurityKey" security_key)
+                    class="btn-default btn-small btn-icon pad-left no-text edit"
+                    disabled=loading
+                    icon="pencil-alt"
+                  }}
+                {{/if}}
+              </div>
+            {{/each}}
+          </div>
+        </div>
+
+        <div class="control-group pref-second-factor-backup">
+          <div class="controls pref-second-factor-backup">
+            <h2>{{i18n "user.second_factor_backup.title"}}</h2>
+            {{#if model.second_factor_enabled}}
+              {{#if model.second_factor_backup_enabled}}
+                {{html-safe (i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes)}}
+              {{else}}
+                {{i18n 'user.second_factor_backup.enable_long'}}
+              {{/if}}
+
+              {{#if isCurrentUser}}
+                {{d-button action=(action "editSecondFactorBackup")
+                  class="btn-default btn-small btn-icon pad-left no-text edit edit-2fa-backup"
+                  disabled=loading
+                  icon="pencil-alt"
+                }}
+              {{/if}}
+            {{else}}
+              {{i18n "user.second_factor_backup.enable_prerequisites"}}
+            {{/if}}
+          </div>
+        </div>
+
+        {{#if model.second_factor_enabled}}
           {{#unless showEnforcedNotice}}
-            {{cancel-link route="preferences.account" args=model.username}}
+            <div class="control-group">
+              <div class="controls">
+                <h2>{{i18n "user.second_factor.disable_title"}}</h2>
+                {{d-button
+                  class="btn-danger"
+                  action=(action "disableAllSecondFactors")
+                  disabled=loading
+                  label="disable"}}
+              </div>
+            </div>
           {{/unless}}
+        {{/if}}
+      {{else}}
+        <div class="control-group">
+          <label class='control-label'>{{i18n 'user.password.title'}}</label>
+
+          <div class="controls">
+            <div>
+              {{text-field value=password
+                id="password"
+                type="password"
+                classNames="input-large"
+                autofocus="autofocus"}}
+            </div>
+            <div class='instructions'>
+              {{i18n 'user.second_factor.confirm_password_description'}}
+            </div>
+          </div>
         </div>
-        <div class="controls" style="margin-top: 5px">
-          {{resetPasswordProgress}}
-          {{#unless resetPasswordLoading}}
-            <a href class="instructions" {{action "resetPassword"}}>{{ i18n 'user.second_factor.forgot_password' }}</a>
-          {{/unless}}
+
+        <div class="control-group">
+          <div class="controls">
+            {{d-button
+              class="btn-primary"
+              type="submit"
+              action=(action "confirmPassword")
+              disabled=loading
+              label="continue"}}
+
+            {{#unless showEnforcedNotice}}
+              {{cancel-link route="preferences.account" args=model.username}}
+            {{/unless}}
+          </div>
+          <div class="controls" style="margin-top: 5px">
+            {{resetPasswordProgress}}
+            {{#unless resetPasswordLoading}}
+              <a href class="instructions" {{action "resetPassword"}}>{{ i18n 'user.second_factor.forgot_password' }}</a>
+            {{/unless}}
+          </div>
         </div>
-      </div>
-    {{/if}}
-  </form>
+      {{/if}}
+    </form>
   {{/conditional-loading-spinner}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 40802f66df..9c1483e50e 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -4,7 +4,8 @@
     <span class='static'>{{model.username}}</span>
     {{#if model.can_edit_username}}
       {{#link-to "preferences.username" class="btn btn-default btn-small btn-icon pad-left no-text"}}
-      {{d-icon "pencil-alt"}} {{/link-to}}
+        {{d-icon "pencil-alt"}}
+      {{/link-to}}
     {{/if}}
   </div>
   {{#if siteSettings.enable_mentions}}
@@ -66,37 +67,37 @@
 {{/if}}
 
 {{#if canChangePassword}}
-<div class="control-group pref-password">
-  <label class="control-label">{{i18n 'user.password.title'}}</label>
-  <div class="controls">
-    <a href {{action "changePassword"}} class='btn btn-default'>
-      {{d-icon "envelope"}}
-      {{#if model.no_password}}
-        {{i18n 'user.change_password.set_password'}}
-      {{else}}
-        {{i18n 'user.change_password.action'}}
-      {{/if}}
-    </a>
+  <div class="control-group pref-password">
+    <label class="control-label">{{i18n 'user.password.title'}}</label>
+    <div class="controls">
+      <a href {{action "changePassword"}} class='btn btn-default'>
+        {{d-icon "envelope"}}
+        {{#if model.no_password}}
+          {{i18n 'user.change_password.set_password'}}
+        {{else}}
+          {{i18n 'user.change_password.action'}}
+        {{/if}}
+      </a>
 
-    {{passwordProgress}}
+      {{passwordProgress}}
+    </div>
   </div>
-</div>
 
-<div class="control-group pref-second-factor">
-  <label class="control-label">{{i18n 'user.second_factor.title'}}</label>
-  {{#unless model.second_factor_enabled}}
-    <label>
+  <div class="control-group pref-second-factor">
+    <label class="control-label">{{i18n 'user.second_factor.title'}}</label>
+    {{#unless model.second_factor_enabled}}
+      <label>
         {{i18n 'user.second_factor.short_description'}}
-    </label>
-  {{/unless}}
-  <div class="controls pref-second-factor">
-    {{#if isCurrentUser}}
-      {{#link-to "preferences.second-factor" class="btn btn-default"}}
-        {{d-icon "lock"}} <span>{{i18n 'user.second_factor.enable'}}</span>
-      {{/link-to}}
-    {{/if}}
+      </label>
+    {{/unless}}
+    <div class="controls pref-second-factor">
+      {{#if isCurrentUser}}
+        {{#link-to "preferences.second-factor" class="btn btn-default"}}
+          {{d-icon "lock"}} <span>{{i18n 'user.second_factor.enable'}}</span>
+        {{/link-to}}
+      {{/if}}
+    </div>
   </div>
-</div>
 {{/if}}
 
 {{#if canUpdateAssociatedAccounts}}
@@ -109,23 +110,23 @@
             {{#if authProvider.account}}
               <tr class="{{dasherize authProvider.method.name}} account-connected">
                 <td>{{authProvider.method.prettyName}}</td>
-                  <td>{{authProvider.account.description}}</td>
-                  <td>
-                    {{#if authProvider.method.can_revoke}}
-                      {{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash-alt" disabled=(get revoking authProvider.method.name) }}
-                    {{/if}}
-                  </td>
+                <td>{{authProvider.account.description}}</td>
+                <td>
+                  {{#if authProvider.method.can_revoke}}
+                    {{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash-alt" disabled=(get revoking authProvider.method.name) }}
+                  {{/if}}
+                </td>
               </tr>
             {{else}}
               <tr class={{dasherize authProvider.method.name}}>
                 <td>{{authProvider.method.prettyName}}</td>
-                  <td colspan="2">
-                    {{#if authProvider.method.can_connect}}
-                      {{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" class="btn-default" icon="plug" disabled=disableConnectButtons}}
-                    {{else}}
-                      {{i18n 'user.associated_accounts.not_connected'}}
-                    {{/if}}
-                  </td>
+                <td colspan="2">
+                  {{#if authProvider.method.can_connect}}
+                    {{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" class="btn-default" icon="plug" disabled=disableConnectButtons}}
+                  {{else}}
+                    {{i18n 'user.associated_accounts.not_connected'}}
+                  {{/if}}
+                </td>
               </tr>
             {{/if}}
           {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/apps.hbs b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
index 2add47b39c..bb9216086c 100644
--- a/app/assets/javascripts/discourse/templates/preferences/apps.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
@@ -1,28 +1,28 @@
 {{#if model.userApiKeys}}
-<div class="control-group apps">
-  <label class="control-label">{{i18n 'user.apps'}}</label>
-  <div class="controls">
-    {{#each model.userApiKeys as |key|}}
-    <div>
-      <span>{{key.application_name}}</span>
-      {{#if key.revoked}}
-        {{d-button action=(route-action "undoRevokeApiKey") actionParam=key class="btn" label="user.undo_revoke_access"}}
-      {{else}}
-        {{d-button action=(route-action "revokeApiKey") actionParam=key class="btn" label="user.revoke_access"}}
-      {{/if}}
-      <p>
-        <ul>
-          {{#each key.scopes as |scope|}}
-          <li>{{scope}}</li>
-          {{/each}}
-        </ul>
-      </p>
-      <p><span>{{i18n "user.api_approved"}}</span> {{bound-date key.created_at}}</p>
-      <p><span>{{i18n "user.api_last_used_at"}}</span> {{bound-date key.last_used_at}}</p>
+  <div class="control-group apps">
+    <label class="control-label">{{i18n 'user.apps'}}</label>
+    <div class="controls">
+      {{#each model.userApiKeys as |key|}}
+        <div>
+          <span>{{key.application_name}}</span>
+          {{#if key.revoked}}
+            {{d-button action=(route-action "undoRevokeApiKey") actionParam=key class="btn" label="user.undo_revoke_access"}}
+          {{else}}
+            {{d-button action=(route-action "revokeApiKey") actionParam=key class="btn" label="user.revoke_access"}}
+          {{/if}}
+          <p>
+            <ul>
+              {{#each key.scopes as |scope|}}
+                <li>{{scope}}</li>
+              {{/each}}
+            </ul>
+          </p>
+          <p><span>{{i18n "user.api_approved"}}</span> {{bound-date key.created_at}}</p>
+          <p><span>{{i18n "user.api_last_used_at"}}</span> {{bound-date key.last_used_at}}</p>
+        </div>
+      {{/each}}
     </div>
-    {{/each}}
   </div>
-</div>
 {{/if}}
 
 {{plugin-outlet name="user-preferences-apps" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index 5e54c3af93..367ea59b0d 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -1,7 +1,7 @@
 {{#unless siteSettings.disable_mailing_list_mode}}
   {{~#if model.user_option.mailing_list_mode}}
     <div class="warning-wrap">
-        <div class="warning">{{i18n 'user.mailing_list_mode.warning'}}</div>
+      <div class="warning">{{i18n 'user.mailing_list_mode.warning'}}</div>
     </div>
   {{/if}}
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index acd5aa60bb..63b96865b2 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -1,19 +1,19 @@
 {{#if showThemeSelector}}
-<div class="control-group theme">
-  <label class="control-label">{{i18n 'user.theme'}}</label>
-  <div class="controls">
-    {{combo-box
-      content=userSelectableThemes
-      value=themeId
-      onChange=(action (mut themeId))
-    }}
-  </div>
-  {{#if showThemeSetDefault}}
+  <div class="control-group theme">
+    <label class="control-label">{{i18n 'user.theme'}}</label>
     <div class="controls">
-      {{preference-checkbox labelKey="user.theme_default_on_all_devices" checked=makeThemeDefault}}
+      {{combo-box
+        content=userSelectableThemes
+        value=themeId
+        onChange=(action (mut themeId))
+      }}
     </div>
-  {{/if}}
-</div>
+    {{#if showThemeSetDefault}}
+      <div class="controls">
+        {{preference-checkbox labelKey="user.theme_default_on_all_devices" checked=makeThemeDefault}}
+      </div>
+    {{/if}}
+  </div>
 {{/if}}
 
 <div class="control-group text-size">
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index f3c1b00f52..a676f29787 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -1,5 +1,5 @@
 <div class="control-group notifications">
-      <label class="control-label">{{i18n 'user.notifications'}}</label>
+  <label class="control-label">{{i18n 'user.notifications'}}</label>
 
   <div class="controls controls-dropdown">
     <label>{{i18n 'user.new_topic_duration.label'}}</label>
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index fed0da9e91..b9a95dc9bb 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -1,10 +1,10 @@
 {{#if canChangeBio}}
-<div class="control-group pref-bio">
-  <label class="control-label">{{i18n 'user.bio'}}</label>
-  <div class="controls bio-composer input-xxlarge">
-    {{d-editor value=model.bio_raw}}
+  <div class="control-group pref-bio">
+    <label class="control-label">{{i18n 'user.bio'}}</label>
+    <div class="controls bio-composer input-xxlarge">
+      {{d-editor value=model.bio_raw}}
+    </div>
   </div>
-</div>
 {{/if}}
 
 <div class="control-group pref-timezone">
@@ -67,7 +67,9 @@
     <label class="control-label">{{i18n 'user.featured_topic'}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
-      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe (replace-emoji model.featured_topic.fancy_title)}}{{/link-to}}
+        {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}
+          {{html-safe (replace-emoji model.featured_topic.fancy_title)}}
+        {{/link-to}}
       </label>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
index 906d7761c0..e645e8175a 100644
--- a/app/assets/javascripts/discourse/templates/preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
@@ -1,64 +1,67 @@
 {{#if siteSettings.tagging_enabled}}
-<div class="control-group tag-notifications">
+  <div class="control-group tag-notifications">
+    <label class="control-label">{{i18n 'user.tag_settings'}}</label>
 
-  <label class="control-label">{{i18n 'user.tag_settings'}}</label>
+    <div class="controls tracking-controls">
+      <label>{{d-icon "d-watching" class="icon watching"}} {{i18n 'user.watched_tags'}}</label>
+      {{tag-chooser
+        tags=model.watched_tags
+        blacklist=selectedTags
+        filterPlaceholder="select_kit.filter_placeholder"
+        allowCreate=false
+        everyTag=true
+        unlimitedTagCount=true
+      }}
+    </div>
 
-  <div class="controls tracking-controls">
-    <label>{{d-icon "d-watching" class="icon watching"}} {{i18n 'user.watched_tags'}}</label>
-    {{tag-chooser
-      tags=model.watched_tags
-      blacklist=selectedTags
-      filterPlaceholder="select_kit.filter_placeholder"
-      allowCreate=false
-      everyTag=true
-      unlimitedTagCount=true}}
+    <div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div>
+
+    <div class="controls tracking-controls">
+      <label>{{d-icon "d-tracking" class="icon tracking"}} {{i18n 'user.tracked_tags'}}</label>
+      {{tag-chooser
+        tags=model.tracked_tags
+        blacklist=selectedTags
+        filterPlaceholder="select_kit.filter_placeholder"
+        allowCreate=false
+        everyTag=true
+        unlimitedTagCount=true}}
+    </div>
+
+    <div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div>
+
+    <div class="controls tracking-controls">
+      <label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n 'user.watched_first_post_tags'}}</label>
+      {{tag-chooser
+        tags=model.watching_first_post_tags
+        blacklist=selectedTags
+        filterPlaceholder="select_kit.filter_placeholder"
+        allowCreate=false
+        everyTag=true
+        unlimitedTagCount=true}}
+    </div>
+
+    <div class="instructions">
+      {{i18n 'user.watched_first_post_tags_instructions'}}
+    </div>
+
+    <div class="controls tracking-controls">
+      <label>{{d-icon "d-muted" class="icon muted"}} {{i18n 'user.muted_tags'}}</label>
+      {{tag-chooser
+        tags=model.muted_tags
+        blacklist=selectedTags
+        filterPlaceholder="select_kit.filter_placeholder"
+        allowCreate=false
+        everyTag=true
+        unlimitedTagCount=true}}
+    </div>
+    <div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div>
   </div>
-  <div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div>
 
-  <div class="controls tracking-controls">
-    <label>{{d-icon "d-tracking" class="icon tracking"}} {{i18n 'user.tracked_tags'}}</label>
-    {{tag-chooser
-      tags=model.tracked_tags
-      blacklist=selectedTags
-      filterPlaceholder="select_kit.filter_placeholder"
-      allowCreate=false
-      everyTag=true
-      unlimitedTagCount=true}}
-  </div>
-  <div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div>
+  {{plugin-outlet name="user-preferences-tags" args=(hash model=model save=(action "save"))}}
 
-  <div class="controls tracking-controls">
-    <label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n 'user.watched_first_post_tags'}}</label>
-    {{tag-chooser
-      tags=model.watching_first_post_tags
-      blacklist=selectedTags
-      filterPlaceholder="select_kit.filter_placeholder"
-      allowCreate=false
-      everyTag=true
-      unlimitedTagCount=true}}
-  </div>
-  <div class="instructions">{{i18n 'user.watched_first_post_tags_instructions'}}</div>
+  <br>
 
-  <div class="controls tracking-controls">
-    <label>{{d-icon "d-muted" class="icon muted"}} {{i18n 'user.muted_tags'}}</label>
-    {{tag-chooser
-      tags=model.muted_tags
-      blacklist=selectedTags
-      filterPlaceholder="select_kit.filter_placeholder"
-      allowCreate=false
-      everyTag=true
-      unlimitedTagCount=true}}
-  </div>
-  <div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div>
-
-</div>
-
-{{plugin-outlet name="user-preferences-tags" args=(hash model=model save=(action "save"))}}
-
-<br>
-
-{{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
-
-{{save-controls model=model action=(action "save") saved=saved}}
+  {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
+  {{save-controls model=model action=(action "save") saved=saved}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/review-topics.hbs b/app/assets/javascripts/discourse/templates/review-topics.hbs
index 5e548c3215..36cdb89b7b 100644
--- a/app/assets/javascripts/discourse/templates/review-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/review-topics.hbs
@@ -7,29 +7,29 @@
       <th></th>
     </thead>
     <tbody>
-    {{#each reviewableTopics as |rt|}}
-      <tr class='reviewable-topic'>
-        <td class="topic-title">
-          <div class='combined-title'>
-            {{topic-status topic=rt}}
-            <a href={{rt.relative_url}} rel="noopener" target="_blank">{{replace-emoji rt.fancy_title}}</a>
-          </div>
-        </td>
-        <td class="reviewable-count">
-          {{rt.stats.count}}
-        </td>
-        <td class="reported-by">
-          {{i18n "review.topics.unique_users" count=rt.stats.unique_users}}
-        </td>
-        <td class="reviewable-details">
-          {{reviewable-claimed-topic topicId=rt.id claimedBy=rt.claimed_by}}
-          {{#link-to "review.index" (query-params topic_id=rt.id) class="btn btn-primary btn-small"}}
-            {{d-icon "list"}}
-            <span>{{i18n "review.topics.details"}}</span>
-          {{/link-to}}
-        </td>
-      </tr>
-    {{/each}}
+      {{#each reviewableTopics as |rt|}}
+        <tr class='reviewable-topic'>
+          <td class="topic-title">
+            <div class='combined-title'>
+              {{topic-status topic=rt}}
+              <a href={{rt.relative_url}} rel="noopener" target="_blank">{{replace-emoji rt.fancy_title}}</a>
+            </div>
+          </td>
+          <td class="reviewable-count">
+            {{rt.stats.count}}
+          </td>
+          <td class="reported-by">
+            {{i18n "review.topics.unique_users" count=rt.stats.unique_users}}
+          </td>
+          <td class="reviewable-details">
+            {{reviewable-claimed-topic topicId=rt.id claimedBy=rt.claimed_by}}
+            {{#link-to "review.index" (query-params topic_id=rt.id) class="btn btn-primary btn-small"}}
+              {{d-icon "list"}}
+              <span>{{i18n "review.topics.details"}}</span>
+            {{/link-to}}
+          </td>
+        </tr>
+      {{/each}}
     </tbody>
   </table>
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index 923dfb991f..638701e3da 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -5,44 +5,45 @@
 <div class="list-controls">
   <div class="container">
     <section class="navigation-container">
-
-    {{#if showTagFilter}}
-      {{bread-crumbs categories=categories
-                     category=category
-                     tagId=tag.id
-                     noSubcategories=noSubcategories}}
-
-      {{navigation-bar navItems=navItems filterMode=filterMode}}
-    {{else}}
-      <h2 class="tag-show-heading">
-        {{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}}
-        {{d-icon "angle-right"}}
-        {{discourse-tag-bound tagRecord=tag style="simple"}}
-        {{#each additionalTags as |tag|}}
-          <span>&amp;</span>
-          {{discourse-tag tag style="simple"}}
-        {{/each}}
-      </h2>
-    {{/if}}
-
-    {{#if tagNotification}}
-      {{#unless additionalTags}}
-        {{tag-notifications-button
-          onChange=(action "changeTagNotificationLevel")
-          value=tagNotification.notification_level
+      {{#if showTagFilter}}
+        {{bread-crumbs
+          categories=categories
+          category=category
+          tagId=tag.id
+          noSubcategories=noSubcategories
         }}
-      {{/unless}}
-    {{/if}}
+        {{navigation-bar navItems=navItems filterMode=filterMode}}
+      {{else}}
+        <h2 class="tag-show-heading">
+          {{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}}
+          {{d-icon "angle-right"}}
+          {{discourse-tag-bound tagRecord=tag style="simple"}}
+          {{#each additionalTags as |tag|}}
+            <span>&amp;</span>
+            {{discourse-tag tag style="simple"}}
+          {{/each}}
+        </h2>
+      {{/if}}
 
-    {{create-topic-button
-      canCreateTopic=canCreateTopic
-      disabled=createTopicDisabled
-      label=createTopicLabel
-      action=(route-action "createTopic")}}
+      {{#if tagNotification}}
+        {{#unless additionalTags}}
+          {{tag-notifications-button
+            onChange=(action "changeTagNotificationLevel")
+            value=tagNotification.notification_level
+          }}
+        {{/unless}}
+      {{/if}}
 
-    {{#if showToggleInfo}}
-      {{d-button icon="tag" label="tagging.info" action=(action "toggleInfo") id="show-tag-info"}}
-    {{/if}}
+      {{create-topic-button
+        canCreateTopic=canCreateTopic
+        disabled=createTopicDisabled
+        label=createTopicLabel
+        action=(route-action "createTopic")
+      }}
+
+      {{#if showToggleInfo}}
+        {{d-button icon="tag" label="tagging.info" action=(action "toggleInfo") id="show-tag-info"}}
+      {{/if}}
     </section>
   </div>
 </div>
@@ -52,6 +53,7 @@
 {{/if}}
 
 {{plugin-outlet name="discovery-list-container-top"}}
+
 <div class="container list-container">
   <div class="row">
     <div class="full-width">
@@ -59,18 +61,18 @@
         {{#unless loading}}
           {{#if list.topics}}
             {{#discovery-topics-list model=list refresh=(action "refresh")}}
-            {{bulk-select-button selected=selected action=(action "refresh")}}
-
-            {{topic-list topics=list.topics
-                        canBulkSelect=canBulkSelect
-                        toggleBulkSelect=(action "toggleBulkSelect")
-                        bulkSelectEnabled=bulkSelectEnabled
-                        selected=selected
-                        showPosters=true
-                        order=order
-                        ascending=ascending
-                        changeSort=(action "changeSort")}}
-
+              {{bulk-select-button selected=selected action=(action "refresh")}}
+              {{topic-list
+                topics=list.topics
+                canBulkSelect=canBulkSelect
+                toggleBulkSelect=(action "toggleBulkSelect")
+                bulkSelectEnabled=bulkSelectEnabled
+                selected=selected
+                showPosters=true
+                order=order
+                ascending=ascending
+                changeSort=(action "changeSort")
+              }}
             {{/discovery-topics-list}}
           {{else}}
             <footer class='topic-list-bottom'>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index bd8e75f1e4..fde0c26227 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -91,8 +91,8 @@
                       {{else}}
                         {{d-button icon="times" action=(action "rescind") actionParam=invite label="user.invited.rescind"}}
                       {{/if}}
-                     </td>
-                     <td>
+                    </td>
+                    <td>
                       {{#if invite.reinvited}}
                         <div>{{i18n 'user.invited.reinvited'}}</div>
                       {{else}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 10881bb35b..59334e9ded 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -1,51 +1,49 @@
 {{plugin-outlet name="above-user-profile" tagName='' args=(hash model=model)}}
 <div class="container {{if viewingSelf 'viewing-self'}}">
   {{#d-section class="user-main"}}
-
     <section class="{{if collapsedInfo 'collapsed-info'}} about {{if hasProfileBackgroundUrl 'has-background' 'no-background'}}" >
-    {{#unless collapsedInfo}}
-    {{#if showStaffCounters}}
-      <div class='staff-counters'>
-        {{#if model.number_of_flags_given}}
-          <div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n 'user.staff_counters.flags_given'}}</div>
-        {{/if}}
-        {{#if model.number_of_flagged_posts}}
-          <div>
-            {{#link-to 'review' (query-params username=model.username status='all' type='ReviewableFlaggedPost')}}
-              <span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n 'user.staff_counters.flagged_posts'}}
-            {{/link-to}}
-          </div>
-        {{/if}}
-        {{#if model.number_of_rejected_posts}}
-          <div>
-            {{#link-to 'review' (query-params username=model.username status='rejected' type='ReviewableQueuedPost')}}
-              <span class="flagged-posts">{{model.number_of_rejected_posts}}</span>{{i18n 'user.staff_counters.rejected_posts'}}
-            {{/link-to}}
-          </div>
-        {{/if}}
-        
-        {{#if model.number_of_deleted_posts}}
-          <div>
-            {{#link-to 'user.deletedPosts' model}}
-              <span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n 'user.staff_counters.deleted_posts'}}
-            {{/link-to}}
-          </div>
-        {{/if}}
-        {{#if model.number_of_suspensions}}
-          <div>
-            <a href {{action "showSuspensions"}}>
-              <span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}
-            </a>
-          </div>
-        {{/if}}
-        {{#if model.warnings_received_count}}
-          <div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
-        {{/if}}
-      </div>
-    {{/if}}
-    <div class="user-profile-image" style={{model.profileBackgroundUrl}}></div>
-    {{/unless}}
+      {{#unless collapsedInfo}}
+        {{#if showStaffCounters}}
+          <div class='staff-counters'>
+            {{#if model.number_of_flags_given}}
+              <div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n 'user.staff_counters.flags_given'}}</div>
+            {{/if}}
+            {{#if model.number_of_flagged_posts}}
+              <div>
+                {{#link-to 'review' (query-params username=model.username status='all' type='ReviewableFlaggedPost')}}
+                  <span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n 'user.staff_counters.flagged_posts'}}
+                {{/link-to}}
+              </div>
+            {{/if}}
+            {{#if model.number_of_rejected_posts}}
+              <div>
+                {{#link-to 'review' (query-params username=model.username status='rejected' type='ReviewableQueuedPost')}}
+                  <span class="flagged-posts">{{model.number_of_rejected_posts}}</span>{{i18n 'user.staff_counters.rejected_posts'}}
+                {{/link-to}}
+              </div>
+            {{/if}}
 
+            {{#if model.number_of_deleted_posts}}
+              <div>
+                {{#link-to 'user.deletedPosts' model}}
+                  <span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n 'user.staff_counters.deleted_posts'}}
+                {{/link-to}}
+              </div>
+            {{/if}}
+            {{#if model.number_of_suspensions}}
+              <div>
+                <a href {{action "showSuspensions"}}>
+                  <span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}
+                </a>
+              </div>
+            {{/if}}
+            {{#if model.warnings_received_count}}
+              <div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
+            {{/if}}
+          </div>
+        {{/if}}
+        <div class="user-profile-image" style={{model.profileBackgroundUrl}}></div>
+      {{/unless}}
       <div class='details'>
         <div class='primary'>
           {{user-profile-avatar user=model tagName=""}}
@@ -113,19 +111,19 @@
             {{/if}}
 
             <h3 class="location-and-website">
-            {{#if model.location}}<div class="user-profile-location">{{d-icon "map-marker-alt"}} {{model.location}}</div>{{/if}}
-            {{#if model.website_name}}
-            <div class="user-profile-website">
-              {{d-icon "globe"}}
-              {{#if linkWebsite}}
-                {{!-- template-lint-disable  --}}
-                <a href={{model.website}} rel="noopener {{unless removeNoFollow 'nofollow ugc'}}" target="_blank">{{model.website_name}}</a>
-              {{else}}
-                <span title={{model.website}}>{{model.website_name}}</span>
+              {{#if model.location}}<div class="user-profile-location">{{d-icon "map-marker-alt"}} {{model.location}}</div>{{/if}}
+              {{#if model.website_name}}
+                <div class="user-profile-website">
+                  {{d-icon "globe"}}
+                  {{#if linkWebsite}}
+                    {{!-- template-lint-disable  --}}
+                    <a href={{model.website}} rel="noopener {{unless removeNoFollow 'nofollow ugc'}}" target="_blank">{{model.website_name}}</a>
+                  {{else}}
+                    <span title={{model.website}}>{{model.website_name}}</span>
+                  {{/if}}
+                </div>
               {{/if}}
-              </div>
-            {{/if}}
-            {{plugin-outlet name="user-location-and-website" args=(hash model=model)}}
+              {{plugin-outlet name="user-location-and-website" args=(hash model=model)}}
             </h3>
 
             <div class='bio'>
@@ -138,7 +136,8 @@
                     {{else}}
                       {{i18n 'user.suspended_notice' date=model.suspendedTillDate}}
                     {{/if}}
-                  </b><br>
+                  </b>
+                  <br>
                   {{#if model.suspend_reason}}
                     <b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}}
                   {{/if}}
@@ -170,97 +169,90 @@
           </div>
         </div>
         {{#unless collapsedInfo}}
-        <div class='secondary'>
-          <dl>
-            {{#if model.created_at}}
-              <div><dt>{{i18n 'user.created'}}</dt><dd>{{bound-date model.created_at}}</dd></div>
-            {{/if}}
-            {{#if model.last_posted_at}}
-              <div><dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date model.last_posted_at}}</dd></div>
-            {{/if}}
-            {{#if model.last_seen_at}}
-              <div><dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date model.last_seen_at}}</dd></div>
-            {{/if}}
-            {{#if model.profile_view_count}}
-              <div><dt>{{i18n 'views'}}</dt><dd>{{model.profile_view_count}}</dd></div>
-            {{/if}}
-            {{#if model.invited_by}}
-              <div><dt class="invited-by">{{i18n 'user.invited_by'}}</dt><dd class="invited-by">{{#link-to 'user' model.invited_by}}{{model.invited_by.username}}{{/link-to}}</dd></div>
-            {{/if}}
-            {{#if model.trust_level}}
-              <div><dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{model.trustLevel.name}}</dd></div>
-            {{/if}}
-            {{#if canCheckEmails}}
-              <div><dt>{{i18n 'user.email.title'}}</dt>
-              <dd title={{model.email}}>
-                {{#if model.email}}
-                  {{model.email}}
-                {{else}}
-                  {{d-button action=(route-action "checkEmail") actionParam=model icon="far-envelope" label="admin.users.check_email.text" class="btn-primary"}}
-                {{/if}}
-              </dd>
-              </div>
-            {{/if}}
+          <div class='secondary'>
+            <dl>
+              {{#if model.created_at}}
+                <div><dt>{{i18n 'user.created'}}</dt><dd>{{bound-date model.created_at}}</dd></div>
+              {{/if}}
+              {{#if model.last_posted_at}}
+                <div><dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date model.last_posted_at}}</dd></div>
+              {{/if}}
+              {{#if model.last_seen_at}}
+                <div><dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date model.last_seen_at}}</dd></div>
+              {{/if}}
+              {{#if model.profile_view_count}}
+                <div><dt>{{i18n 'views'}}</dt><dd>{{model.profile_view_count}}</dd></div>
+              {{/if}}
+              {{#if model.invited_by}}
+                <div><dt class="invited-by">{{i18n 'user.invited_by'}}</dt><dd class="invited-by">{{#link-to 'user' model.invited_by}}{{model.invited_by.username}}{{/link-to}}</dd></div>
+              {{/if}}
+              {{#if model.trust_level}}
+                <div><dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{model.trustLevel.name}}</dd></div>
+              {{/if}}
+              {{#if canCheckEmails}}
+                <div><dt>{{i18n 'user.email.title'}}</dt>
+                <dd title={{model.email}}>
+                  {{#if model.email}}
+                    {{model.email}}
+                  {{else}}
+                    {{d-button action=(route-action "checkEmail") actionParam=model icon="far-envelope" label="admin.users.check_email.text" class="btn-primary"}}
+                  {{/if}}
+                </dd>
+                </div>
+              {{/if}}
+              {{#if model.displayGroups}}
+                <div><dt class="groups">{{i18n 'groups.title' count=model.displayGroups.length}}</dt>
+                <dd class='groups'>
+                  {{#each model.displayGroups as |group|}}
+                    <span>{{#link-to 'group' group.name class="group-link"}}{{group.name}}{{/link-to}}</span>
+                  {{/each}}
 
-            {{#if model.displayGroups}}
-              <div><dt class="groups">{{i18n 'groups.title' count=model.displayGroups.length}}</dt>
-              <dd class='groups'>
-                {{#each model.displayGroups as |group|}}
-                  <span>{{#link-to 'group' group.name class="group-link"}}{{group.name}}{{/link-to}}</span>
-                {{/each}}
+                  {{#link-to "groups" (query-params username=model.username)}}
+                    ...
+                  {{/link-to}}
+                </dd>
+                </div>
+              {{/if}}
 
-                {{#link-to "groups" (query-params username=model.username)}}
-                  ...
-                {{/link-to}}
-              </dd>
-              </div>
-            {{/if}}
-
-            {{#if canDeleteUser}}
-              <div class='pull-right'>{{d-button action=(action "adminDelete") icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
-            {{/if}}
-          </dl>
-          {{plugin-outlet name="user-profile-secondary" args=(hash model=model)}}
-        </div>
+              {{#if canDeleteUser}}
+                <div class='pull-right'>{{d-button action=(action "adminDelete") icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
+              {{/if}}
+            </dl>
+            {{plugin-outlet name="user-profile-secondary" args=(hash model=model)}}
+          </div>
         {{/unless}}
       </div>
-
-
     </section>
-
     <div class='user-content-wrapper'>
-
-    <section class="user-primary-navigation">
-    {{#mobile-nav class='main-nav' desktopClass="nav nav-pills user-nav" currentPath=currentPath}}
-      {{#unless model.profile_hidden}}
-        <li>{{#link-to 'user.summary'}}{{i18n 'user.summary.title'}}{{/link-to}}</li>
-        <li>{{#link-to 'userActivity'}}{{i18n 'user.activity_stream'}}{{/link-to}}</li>
-      {{/unless}}
-      {{#if showNotificationsTab}}
-        <li>
-          {{#link-to 'userNotifications'}}
-            {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
-          {{/link-to}}
-        </li>
-      {{/if}}
-      {{#if showPrivateMessages}}
-        <li>{{#link-to 'userPrivateMessages'}}{{d-icon "far-envelope"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
-      {{/if}}
-      {{#if canInviteToForum}}
-        <li>{{#link-to 'userInvited'}}{{d-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
-      {{/if}}
-      {{#if showBadges}}
-        <li>{{#link-to 'user.badges'}}{{d-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
-      {{/if}}
-      {{plugin-outlet name="user-main-nav" tagName='' connectorTagName='li' args=(hash model=model)}}
-      {{#if model.can_edit}}
-        <li>{{#link-to 'preferences'}}{{d-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
-      {{/if}}
-    {{/mobile-nav}}
-    </section>
-
-        {{outlet}}
-    </div>
-
+      <section class="user-primary-navigation">
+        {{#mobile-nav class='main-nav' desktopClass="nav nav-pills user-nav" currentPath=currentPath}}
+          {{#unless model.profile_hidden}}
+            <li>{{#link-to 'user.summary'}}{{i18n 'user.summary.title'}}{{/link-to}}</li>
+            <li>{{#link-to 'userActivity'}}{{i18n 'user.activity_stream'}}{{/link-to}}</li>
+          {{/unless}}
+          {{#if showNotificationsTab}}
+            <li>
+              {{#link-to 'userNotifications'}}
+                {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
+              {{/link-to}}
+            </li>
+          {{/if}}
+          {{#if showPrivateMessages}}
+            <li>{{#link-to 'userPrivateMessages'}}{{d-icon "far-envelope"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
+          {{/if}}
+          {{#if canInviteToForum}}
+            <li>{{#link-to 'userInvited'}}{{d-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
+          {{/if}}
+          {{#if showBadges}}
+            <li>{{#link-to 'user.badges'}}{{d-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
+          {{/if}}
+          {{plugin-outlet name="user-main-nav" tagName='' connectorTagName='li' args=(hash model=model)}}
+          {{#if model.can_edit}}
+            <li>{{#link-to 'preferences'}}{{d-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
+          {{/if}}
+        {{/mobile-nav}}
+      </section>
+    {{outlet}}
+  </div>
   {{/d-section}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index 2623e57c05..809b8a1629 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -10,34 +10,35 @@
       {{#link-to 'userActivity.replies'}}{{i18n 'user_action_groups.5'}}{{/link-to}}
     </li>
     {{#if user.showDrafts}}
-    <li>
-      {{#link-to 'userActivity.drafts'}}{{i18n 'user_action_groups.15'}}{{/link-to}}
-    </li>
+      <li>
+        {{#link-to 'userActivity.drafts'}}{{i18n 'user_action_groups.15'}}{{/link-to}}
+      </li>
     {{/if}}
     <li>
       {{#link-to 'userActivity.likesGiven'}}{{i18n 'user_action_groups.1'}}{{/link-to}}
     </li>
     {{#if user.showBookmarks}}
       {{#if bookmarksWithRemindersEnabled}}
-      <li>
-        {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
-      </li>
+        <li>
+          {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+        </li>
       {{else}}
-      <li>
-        {{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
-      </li>
+        <li>
+          {{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+        </li>
       {{/if}}
     {{/if}}
-    {{plugin-outlet name="user-activity-bottom"
-                    connectorTagName='li'
-                    args=(hash model=model)}}
+    {{plugin-outlet
+      name="user-activity-bottom"
+      connectorTagName='li'
+      args=(hash model=model)
+    }}
   {{/mobile-nav}}
-
 {{/d-section}}
 {{#if canDownloadPosts}}
-    <section class='user-additional-controls'>
-      {{d-button action=(action "exportUserArchive") class="btn-default" label="user.download_archive.button_text" icon="download"}}
-    </section>
+  <section class='user-additional-controls'>
+    {{d-button action=(action "exportUserArchive") class="btn-default" label="user.download_archive.button_text" icon="download"}}
+  </section>
 {{/if}}
 <section class='user-content'>
   {{outlet}}
diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
index 92c9979b54..75e5b2ce10 100644
--- a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
@@ -11,41 +11,41 @@
           <th>&nbsp;</th>
         </thead>
         <tbody>
-        {{#each content as |bookmark|}}
-          <tr class="topic-list-item bookmark-list-item">
-            <td class="main-link">
-              <span class="link-top-line">
-                <div class="bookmark-metadata">
-                  {{#if bookmark.name}}
-                    <span class="bookmark-metadata-item">
-                      {{d-icon "info-circle"}}{{bookmark.name}}
-                    </span>
-                  {{/if}}
-                  {{#if bookmark.reminder_at}}
-                    <span class="bookmark-metadata-item">
-                      {{d-icon "far-clock"}}{{bookmark.formattedReminder}}
-                    </span>
-                  {{/if}}
-                </div>
+          {{#each content as |bookmark|}}
+            <tr class="topic-list-item bookmark-list-item">
+              <td class="main-link">
+                <span class="link-top-line">
+                  <div class="bookmark-metadata">
+                    {{#if bookmark.name}}
+                      <span class="bookmark-metadata-item">
+                        {{d-icon "info-circle"}}{{bookmark.name}}
+                      </span>
+                    {{/if}}
+                    {{#if bookmark.reminder_at}}
+                      <span class="bookmark-metadata-item">
+                        {{d-icon "far-clock"}}{{bookmark.formattedReminder}}
+                      </span>
+                    {{/if}}
+                  </div>
 
-                {{topic-status topic=bookmark}}
-                {{topic-link bookmark}}
-              </span>
-              {{#if bookmark.excerpt}}
-              <p class="post-excerpt">{{html-safe bookmark.excerpt}}</p>
-              {{/if}}
-              <div class="link-bottom-line">
-                {{category-link bookmark.category}}
-                {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
-             </div>
-            </td>
-            <td>{{format-date bookmark.created_at format="tiny"}}</td>
-            {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
-            <td>
-              {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
-            </td>
-          </tr>
-        {{/each}}
+                  {{topic-status topic=bookmark}}
+                  {{topic-link bookmark}}
+                </span>
+                {{#if bookmark.excerpt}}
+                  <p class="post-excerpt">{{html-safe bookmark.excerpt}}</p>
+                {{/if}}
+                <div class="link-bottom-line">
+                  {{category-link bookmark.category}}
+                  {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
+                </div>
+              </td>
+              <td>{{format-date bookmark.created_at format="tiny"}}</td>
+              {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
+              <td>
+                {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
+              </td>
+            </tr>
+          {{/each}}
         </tbody>
       </table>
       {{conditional-loading-spinner condition=loadingMore}}
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 3dc34f67a1..64e8d53549 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -56,9 +56,7 @@
 {{/d-section}}
 
 <section class='user-content'>
-
-<div class="list-actions">
-
+  <div class="list-actions">
     {{#unless site.mobileView}}
       {{#if showToggleBulkSelect}}
         {{d-button
@@ -106,7 +104,6 @@
         onChange=(action "changeGroupNotificationLevel")
       }}
     {{/if}}
-</div>
-
-{{outlet}}
+  </div>
+  {{outlet}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index 8dca10c91f..2db8a54784 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -32,15 +32,17 @@
 {{/d-section}}
 
 {{#if model}}
-<section class="user-additional-controls">
-    {{d-button title='user.dismiss_notifications_tooltip'
-               class='btn btn-default dismiss-notifications'
-               action=(action "resetNew")
-               label='user.dismiss_notifications'
-               icon='check'
-               disabled=allNotificationsRead}}
-               </section>
-  {{/if}}
+  <section class="user-additional-controls">
+    {{d-button
+      title='user.dismiss_notifications_tooltip'
+      class='btn btn-default dismiss-notifications'
+      action=(action "resetNew")
+      label='user.dismiss_notifications'
+      icon='check'
+      disabled=allNotificationsRead
+    }}
+  </section>
+{{/if}}
 
 <section class='user-content'>
   {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action=(action "loadMore")}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 26ee193bde..d28017469d 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -1,163 +1,163 @@
 {{#d-section pageClass="user-summary" tagName=""}}
-<div class="user-content">
-  <div class='top-section stats-section'>
-    <h3 class='stats-title'>{{i18n "user.summary.stats"}}</h3>
-    <ul>
-      <li>
-        {{user-stat value=model.days_visited label="user.summary.days_visited"}}
-      </li>
-      <li>
-        {{user-stat value=timeRead label="user.summary.time_read" type="string"}}
-      </li>
-      {{#if showRecentTimeRead}}
+  <div class="user-content">
+    <div class='top-section stats-section'>
+      <h3 class='stats-title'>{{i18n "user.summary.stats"}}</h3>
+      <ul>
         <li>
-          {{user-stat value=recentTimeRead label="user.summary.recent_time_read" type="string"}}
+          {{user-stat value=model.days_visited label="user.summary.days_visited"}}
+        </li>
+        <li>
+          {{user-stat value=timeRead label="user.summary.time_read" type="string"}}
+        </li>
+        {{#if showRecentTimeRead}}
+          <li>
+            {{user-stat value=recentTimeRead label="user.summary.recent_time_read" type="string"}}
+          </li>
+        {{/if}}
+        <li>
+          {{user-stat value=model.topics_entered label="user.summary.topics_entered"}}
+        </li>
+        <li>
+          {{user-stat value=model.posts_read_count label="user.summary.posts_read"}}
         </li>
-      {{/if}}
-      <li>
-        {{user-stat value=model.topics_entered label="user.summary.topics_entered"}}
-      </li>
-      <li>
-        {{user-stat value=model.posts_read_count label="user.summary.posts_read"}}
-      </li>
-      <li class="linked-stat">
-        {{#link-to 'userActivity.likesGiven'}}
-          {{user-stat value=model.likes_given icon="heart" label="user.summary.likes_given"}}
-        {{/link-to}}
-      </li>
-      {{#if model.bookmark_count}}
         <li class="linked-stat">
-          {{#link-to 'userActivity.bookmarks'}}
-            {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
+          {{#link-to 'userActivity.likesGiven'}}
+            {{user-stat value=model.likes_given icon="heart" label="user.summary.likes_given"}}
           {{/link-to}}
         </li>
-      {{/if}}
-      <li class="linked-stat">
-        {{#link-to 'userActivity.topics'}}
-          {{user-stat value=model.topic_count label="user.summary.topic_count"}}
-        {{/link-to}}
-      </li>
-      <li class="linked-stat">
-        {{#link-to 'userActivity.replies'}}
-          {{user-stat value=model.post_count label="user.summary.post_count"}}
-        {{/link-to}}
-      </li>
-      <li>
-        {{user-stat value=model.likes_received icon="heart" label="user.summary.likes_received"}}
-      </li>
-      {{plugin-outlet name="user-summary-stat" tagName="" connectorTagName="li" args=(hash model=model)}}
-    </ul>
-  </div>
+        {{#if model.bookmark_count}}
+          <li class="linked-stat">
+            {{#link-to 'userActivity.bookmarks'}}
+              {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
+            {{/link-to}}
+          </li>
+        {{/if}}
+        <li class="linked-stat">
+          {{#link-to 'userActivity.topics'}}
+            {{user-stat value=model.topic_count label="user.summary.topic_count"}}
+          {{/link-to}}
+        </li>
+        <li class="linked-stat">
+          {{#link-to 'userActivity.replies'}}
+            {{user-stat value=model.post_count label="user.summary.post_count"}}
+          {{/link-to}}
+        </li>
+        <li>
+          {{user-stat value=model.likes_received icon="heart" label="user.summary.likes_received"}}
+        </li>
+        {{plugin-outlet name="user-summary-stat" tagName="" connectorTagName="li" args=(hash model=model)}}
+      </ul>
+    </div>
 
-  <div class='top-section'>
-    {{#user-summary-section title="top_replies" class="replies-section pull-left"}}
-      {{#user-summary-topics-list type="replies" items=model.replies user=user as |reply|}}
-        {{user-summary-topic
-          createdAt=reply.createdAt
-          topic=reply.topic
-          likes=reply.like_count
-          url=reply.url}}
-      {{/user-summary-topics-list}}
-    {{/user-summary-section}}
+    <div class='top-section'>
+      {{#user-summary-section title="top_replies" class="replies-section pull-left"}}
+        {{#user-summary-topics-list type="replies" items=model.replies user=user as |reply|}}
+          {{user-summary-topic
+            createdAt=reply.createdAt
+            topic=reply.topic
+            likes=reply.like_count
+            url=reply.url}}
+        {{/user-summary-topics-list}}
+      {{/user-summary-section}}
 
-    {{#user-summary-section title="top_topics" class="topics-section pull-right"}}
-      {{#user-summary-topics-list type="topics" items=model.topics user=user as |topic|}}
-        {{user-summary-topic
-          createdAt=topic.created_at
-          topic=topic
-          likes=topic.like_count
-          url=topic.url}}
-      {{/user-summary-topics-list}}
-    {{/user-summary-section}}
-  </div>
-
-  <div class='top-section'>
-    {{#user-summary-section title="top_links" class="links-section pull-left"}}
-      {{#if model.links.length}}
-        <ul>
-          {{!-- template-lint-disable --}}
-          {{#each model.links as |link|}}
-            <li>
-              <a class='domain'
-                 href={{link.url}}
-                 title={{link.title}}
-                 rel='noopener {{unless user.removeNoFollow 'nofollow ugc'}}'
-                 target='_blank'>
-                {{shorten-url link.url}}
-              </a>
-              <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
-              <br>
-              <a href="{{link.post_url}}">{{html-safe link.topic.fancyTitle}}</a>
-            </li>
-          {{/each}}
-        </ul>
-      {{else}}
-        <p>{{i18n "user.summary.no_links"}}</p>
-      {{/if}}
-    {{/user-summary-section}}
-
-    {{#user-summary-section title="most_replied_to_users" class="summary-user-list replied-section pull-right"}}
-      {{#user-summary-users-list none="no_replies" users=model.most_replied_to_users as |user|}}
-        {{user-summary-user user=user icon="reply" countClass="replies"}}
-      {{/user-summary-users-list}}
-    {{/user-summary-section}}
-  </div>
-
-  <div class='top-section most-liked-section'>
-    {{#user-summary-section title="most_liked_by" class="summary-user-list liked-by-section pull-left"}}
-      {{#user-summary-users-list none="no_likes" users=model.most_liked_by_users as |user|}}
-        {{user-summary-user user=user icon="heart" countClass="likes"}}
-      {{/user-summary-users-list}}
-    {{/user-summary-section}}
-
-    {{#user-summary-section title="most_liked_users" class="summary-user-list liked-section pull-right"}}
-      {{#user-summary-users-list none="no_likes" users=model.most_liked_users as |user|}}
-        {{user-summary-user user=user icon="heart" countClass="likes"}}
-      {{/user-summary-users-list}}
-    {{/user-summary-section}}
-  </div>
-
-  {{#if model.top_categories.length}}
-    <div class='top-section top-categories-section'>
-      {{#user-summary-section title="top_categories" class="summary-category-list pull-left"}}
-        <table>
-          <thead>
-            <th class="category-link"></th>
-            <th class='topic-count'>{{i18n "user.summary.topics"}}</th>
-            <th class='reply-count'>{{i18n "user.summary.replies"}}</th>
-          </thead>
-          <tbody>
-            {{#each model.top_categories as |category|}}
-              <tr>
-                <td class="category-link">
-                  {{category-link category allowUncategorized="true" hideParent=false}}
-                </td>
-                <td class='topic-count'>
-                  {{user-summary-category-search user=user category=category count=category.topic_count}}
-                </td>
-                <td class='reply-count'>
-                  {{user-summary-category-search user=user category=category count=category.post_count}}
-                </td>
-              </tr>
-            {{/each}}
-          </tbody>
-        </table>
+      {{#user-summary-section title="top_topics" class="topics-section pull-right"}}
+        {{#user-summary-topics-list type="topics" items=model.topics user=user as |topic|}}
+          {{user-summary-topic
+            createdAt=topic.created_at
+            topic=topic
+            likes=topic.like_count
+            url=topic.url}}
+        {{/user-summary-topics-list}}
       {{/user-summary-section}}
     </div>
-  {{/if}}
 
-  {{#if siteSettings.enable_badges}}
-    <div class='top-section badges-section'>
-      <h3 class='stats-title'>{{i18n "user.summary.top_badges"}}</h3>
-      {{#each model.badges as |badge|}}
-        {{badge-card badge=badge count=badge.count username=user.username_lower}}
-      {{else}}
-        <p>{{i18n "user.summary.no_badges"}}</p>
-      {{/each}}
-      {{#if moreBadges}}
-        <p>{{#link-to "user.badges" user class="more"}}{{i18n "user.summary.more_badges"}}{{/link-to}}</p>
-      {{/if}}
+    <div class='top-section'>
+      {{#user-summary-section title="top_links" class="links-section pull-left"}}
+        {{#if model.links.length}}
+          <ul>
+            {{!-- template-lint-disable --}}
+            {{#each model.links as |link|}}
+              <li>
+                <a class='domain'
+                   href={{link.url}}
+                   title={{link.title}}
+                   rel='noopener {{unless user.removeNoFollow 'nofollow ugc'}}'
+                   target='_blank'>
+                  {{shorten-url link.url}}
+                </a>
+                <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
+                <br>
+                <a href="{{link.post_url}}">{{html-safe link.topic.fancyTitle}}</a>
+              </li>
+            {{/each}}
+          </ul>
+        {{else}}
+          <p>{{i18n "user.summary.no_links"}}</p>
+        {{/if}}
+      {{/user-summary-section}}
+
+      {{#user-summary-section title="most_replied_to_users" class="summary-user-list replied-section pull-right"}}
+        {{#user-summary-users-list none="no_replies" users=model.most_replied_to_users as |user|}}
+          {{user-summary-user user=user icon="reply" countClass="replies"}}
+        {{/user-summary-users-list}}
+      {{/user-summary-section}}
     </div>
-  {{/if}}
+
+    <div class='top-section most-liked-section'>
+      {{#user-summary-section title="most_liked_by" class="summary-user-list liked-by-section pull-left"}}
+        {{#user-summary-users-list none="no_likes" users=model.most_liked_by_users as |user|}}
+          {{user-summary-user user=user icon="heart" countClass="likes"}}
+        {{/user-summary-users-list}}
+      {{/user-summary-section}}
+
+      {{#user-summary-section title="most_liked_users" class="summary-user-list liked-section pull-right"}}
+        {{#user-summary-users-list none="no_likes" users=model.most_liked_users as |user|}}
+          {{user-summary-user user=user icon="heart" countClass="likes"}}
+        {{/user-summary-users-list}}
+      {{/user-summary-section}}
+    </div>
+
+    {{#if model.top_categories.length}}
+      <div class='top-section top-categories-section'>
+        {{#user-summary-section title="top_categories" class="summary-category-list pull-left"}}
+          <table>
+            <thead>
+              <th class="category-link"></th>
+              <th class='topic-count'>{{i18n "user.summary.topics"}}</th>
+              <th class='reply-count'>{{i18n "user.summary.replies"}}</th>
+            </thead>
+            <tbody>
+              {{#each model.top_categories as |category|}}
+                <tr>
+                  <td class="category-link">
+                    {{category-link category allowUncategorized="true" hideParent=false}}
+                  </td>
+                  <td class='topic-count'>
+                    {{user-summary-category-search user=user category=category count=category.topic_count}}
+                  </td>
+                  <td class='reply-count'>
+                    {{user-summary-category-search user=user category=category count=category.post_count}}
+                  </td>
+                </tr>
+              {{/each}}
+            </tbody>
+          </table>
+        {{/user-summary-section}}
+      </div>
+    {{/if}}
+
+    {{#if siteSettings.enable_badges}}
+      <div class='top-section badges-section'>
+        <h3 class='stats-title'>{{i18n "user.summary.top_badges"}}</h3>
+        {{#each model.badges as |badge|}}
+          {{badge-card badge=badge count=badge.count username=user.username_lower}}
+        {{else}}
+          <p>{{i18n "user.summary.no_badges"}}</p>
+        {{/each}}
+        {{#if moreBadges}}
+          <p>{{#link-to "user.badges" user class="more"}}{{i18n "user.summary.more_badges"}}{{/link-to}}</p>
+        {{/if}}
+      </div>
+    {{/if}}
   </div>
 {{/d-section}}
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
index c2b12d8b7c..e0d1f54f00 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
@@ -13,11 +13,11 @@
       </span>
     {{else}}
       {{#if selectKit.filter}}
-      {{#if selectKit.hasNoContent}}
-        <span class="no-content">
-          {{i18n "select_kit.no_content"}}
-        </span>
-      {{/if}}
+        {{#if selectKit.hasNoContent}}
+          <span class="no-content">
+            {{i18n "select_kit.no_content"}}
+          </span>
+        {{/if}}
       {{/if}}
 
       {{#each collections as |collection|}}
diff --git a/app/assets/javascripts/select-kit/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
index 9e210f7317..a3b71cba23 100644
--- a/app/assets/javascripts/select-kit/templates/components/single-select.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
@@ -17,11 +17,11 @@
       </span>
     {{else}}
       {{#if selectKit.filter}}
-      {{#if selectKit.hasNoContent}}
-        <span class="no-content">
-          {{i18n "select_kit.no_content"}}
-        </span>
-      {{/if}}
+        {{#if selectKit.hasNoContent}}
+          <span class="no-content">
+            {{i18n "select_kit.no_content"}}
+          </span>
+        {{/if}}
       {{/if}}
 
       {{#each collections as |collection|}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
index d520465bd9..dddf1b81e4 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
@@ -1,7 +1,8 @@
 <label>
-{{input type="checkbox"
-        class="wizard-checkbox"
-        checked=field.value}}
-
-{{field.placeholder}}
+  {{input
+    type="checkbox"
+    class="wizard-checkbox"
+    checked=field.value
+  }}
+  {{field.placeholder}}
 </label>

From 73c3fb8fb8d3ca0883eea1bd95058ddd6eaef318 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 13 Apr 2020 17:24:02 +0200
Subject: [PATCH 500/633] DEV: hides block-indentation lint changes from git
 blame (#9409)

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index eec6fc3a2f..5fac6c2850 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -34,3 +34,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # The last remaining ES6
 aabeb17aab4e73de5ef56753ab22ef5d416d2932
+
+# DEV: enforces block-indentation of ember-template-lint rules
+b66b277dc44bcd2122dc21965dab209c30636214

From a10c36994b80c6451af458c0faa998190a66e301 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Mon, 13 Apr 2020 08:57:27 -0700
Subject: [PATCH 501/633] UX: Improve published page avatar resolution (#9405)

---
 app/views/published_pages/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/published_pages/show.html.erb b/app/views/published_pages/show.html.erb
index 08f5474b81..43b11f6851 100644
--- a/app/views/published_pages/show.html.erb
+++ b/app/views/published_pages/show.html.erb
@@ -3,7 +3,7 @@
     <h1 class="published-page-title"><%= @topic.title %></h1>
 
     <div class="published-page-author">
-      <img src="<%= @topic.user.small_avatar_url %>" class="avatar">
+      <img width="45" height="45" src="<%= @topic.user.avatar_template.gsub('{size}', '90') %>" class="avatar">
       <div class="published-page-author-details">
         <div class="username"><%= @topic.user.username %></div>
         <div class="topic-created-at"><%= short_date(@topic.created_at) %></div>

From 799ddeea3c328658a596baab22233444f1e9e915 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 13 Apr 2020 18:57:52 +0300
Subject: [PATCH 502/633] FIX: Include subcategories in 'posts' report (#9410)

---
 app/models/post.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index b57a9502c6..1fe1bed985 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -767,7 +767,7 @@ class Post < ActiveRecord::Base
   def self.public_posts_count_per_day(start_date, end_date, category_id = nil)
     result = public_posts.where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date)
       .where(post_type: Post.types[:regular])
-    result = result.where('topics.category_id = ?', category_id) if category_id
+    result = result.where('topics.category_id IN (?)', Category.subcategory_ids(category_id.to_i)) if category_id
     result
       .group('date(posts.created_at)')
       .order('date(posts.created_at)')

From 7b4fdebbce3bd564e5c5becb72ac49ebf96265b6 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 13 Apr 2020 15:05:46 -0400
Subject: [PATCH 503/633] FEATURE: Plugin support for transpiling regular `.js`
 files (#9398)

This adds support for a new piece of metadata to your plugin.rb
files. If you add:

```
transpile_js: true
```

Then Discourse will support transpilation of assets in your
`assets/javascripts` directory. Previously they had to be named
`.js.es6` but now regular `.js` will work.

Note this is opt-in because some plugins currently have `.js` files in
app/assets that are not meant to be transpiled.

Going forward all plugins should migrate to this setting as they are
comfortable able to do so.
---
 lib/discourse_js_processor.rb |  6 ++++++
 lib/plugin/instance.rb        | 22 +++++++++++++++++++---
 lib/plugin/metadata.rb        |  2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 7417207ff5..6d56af7098 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -4,6 +4,10 @@ require 'mini_racer'
 
 class DiscourseJsProcessor
 
+  def self.plugin_transpile_paths
+    @@plugin_transpile_paths ||= Set.new
+  end
+
   def self.call(input)
     root_path = input[:load_path] || ''
     logical_path = (input[:filename] || '').sub(root_path, '').gsub(/\.(js|es6).*$/, '').sub(/^\//, '')
@@ -56,6 +60,8 @@ class DiscourseJsProcessor
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
 
+    return true if plugin_transpile_paths.any? { |prefix| relative_path.start_with?(prefix) }
+
     !!(relative_path =~ /^#{js_root}\/[^\/]+\// ||
       relative_path =~ /^#{test_root}\/[^\/]+\//)
   end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 2510e6c499..85f06dfb22 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -66,6 +66,13 @@ class Plugin::Instance
     }
   end
 
+  # If plugins provide `transpile_js: true` in their metadata we will
+  # transpile regular JS files in the assets folders. Going forward,
+  # all plugins should do this.
+  def transpile_js
+    metadata.try(:transpile_js) == "true"
+  end
+
   def seed_data
     @seed_data ||= HashWithIndifferentAccess.new({})
   end
@@ -511,16 +518,22 @@ class Plugin::Instance
   def activate!
 
     if @path
+      root_dir_name = File.dirname(@path)
+
       # Automatically include all ES6 JS and hbs files
-      root_path = "#{File.dirname(@path)}/assets/javascripts"
+      root_path = "#{root_dir_name}/assets/javascripts"
       DiscoursePluginRegistry.register_glob(root_path, 'js.es6')
       DiscoursePluginRegistry.register_glob(root_path, 'hbs')
       DiscoursePluginRegistry.register_glob(root_path, 'hbr')
 
-      admin_path = "#{File.dirname(@path)}/admin/assets/javascripts"
+      admin_path = "#{root_dir_name}/admin/assets/javascripts"
       DiscoursePluginRegistry.register_glob(admin_path, 'js.es6', admin: true)
       DiscoursePluginRegistry.register_glob(admin_path, 'hbs', admin: true)
       DiscoursePluginRegistry.register_glob(admin_path, 'hbr', admin: true)
+
+      if transpile_js
+        DiscourseJsProcessor.plugin_transpile_paths << root_path.sub(Rails.root.to_s, '').sub(/^\/*/, '')
+      end
     end
 
     self.instance_eval File.read(path), path
@@ -663,9 +676,12 @@ class Plugin::Instance
       root_path = "#{File.dirname(@path)}/assets/javascripts"
 
       Dir.glob("#{root_path}/**/*") do |f|
+        f_str = f.to_s
         if File.directory?(f)
           yield [f, true]
-        elsif f.to_s.ends_with?(".js.es6") || f.to_s.ends_with?(".hbs") || f.to_s.ends_with?(".hbr")
+        elsif f_str.ends_with?(".js.es6") || f_str.ends_with?(".hbs") || f_str.ends_with?(".hbr")
+          yield [f, false]
+        elsif transpile_js && f_str.ends_with?(".js")
           yield [f, false]
         end
       end
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index 5ceabfde79..1af6c15750 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -78,7 +78,7 @@ class Plugin::Metadata
     "discourse-internet-explorer"
   ])
 
-  FIELDS ||= [:name, :about, :version, :authors, :url, :required_version]
+  FIELDS ||= [:name, :about, :version, :authors, :url, :required_version, :transpile_js]
   attr_accessor(*FIELDS)
 
   def self.parse(text)

From b6b92a562c48895720d7e2ea9cb6dad15efa0107 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 13 Apr 2020 15:17:02 -0400
Subject: [PATCH 504/633] FEATURE: New site setting `embed_unlisted` (#9391)

If enabled, posts imported to discourse via embeddings will default to
unlisted until they receive a reply.
---
 .../javascripts/admin/templates/embedding.hbs  |  1 +
 app/models/embedding.rb                        |  1 +
 app/models/post.rb                             |  3 ++-
 app/models/topic_embed.rb                      | 18 ++++++++++++------
 config/locales/client.en.yml                   |  1 +
 config/locales/server.en.yml                   |  1 +
 config/site_settings.yml                       | 10 ++++------
 lib/post_creator.rb                            | 11 +++++++++++
 spec/models/topic_embed_spec.rb                | 15 +++++++++++++++
 9 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index b9422bbb11..4bf9135fce 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -38,6 +38,7 @@
                         value=embedding.embed_title_scrubber
                         placeholder="- site.com$"}}
     {{embedding-setting field="embed_truncate" value=embedding.embed_truncate type="checkbox"}}
+    {{embedding-setting field="embed_unlisted" value=embedding.embed_unlisted type="checkbox"}}
   </div>
 
   <div class='embedding-secondary'>
diff --git a/app/models/embedding.rb b/app/models/embedding.rb
index 1f2be1ee0f..055cb2b32c 100644
--- a/app/models/embedding.rb
+++ b/app/models/embedding.rb
@@ -10,6 +10,7 @@ class Embedding < OpenStruct
        embed_post_limit
        embed_title_scrubber
        embed_truncate
+       embed_unlisted
        embed_whitelist_selector
        embed_blacklist_selector
        embed_classname_whitelist)
diff --git a/app/models/post.rb b/app/models/post.rb
index 1fe1bed985..86dafde6bc 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -127,7 +127,8 @@ class Post < ActiveRecord::Base
                                  flagged_by_tl3_user: 4,
                                  email_spam_header_found: 5,
                                  flagged_by_tl4_user: 6,
-                                 email_authentication_result_header: 7)
+                                 email_authentication_result_header: 7,
+                                 imported_as_unlisted: 8)
   end
 
   def self.types
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 15922f7c4c..1947a3c640 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -53,12 +53,18 @@ class TopicEmbed < ActiveRecord::Base
           Post.cook_methods[:raw_html]
         end
 
-        creator = PostCreator.new(user,
-                                  title: title,
-                                  raw: absolutize_urls(url, contents),
-                                  skip_validations: true,
-                                  cook_method: cook_method,
-                                  category: eh.try(:category_id))
+        create_args = {
+          title: title,
+          raw: absolutize_urls(url, contents),
+          skip_validations: true,
+          cook_method: cook_method,
+          category: eh.try(:category_id)
+        }
+        if SiteSetting.embed_unlisted?
+          create_args[:visible] = false
+        end
+
+        creator = PostCreator.new(user, create_args)
         post = creator.create
         if post.present?
           TopicEmbed.create!(topic_id: post.topic_id,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f395e62717..4b7b33fa58 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4620,6 +4620,7 @@ en:
         embed_post_limit: "Maximum number of posts to embed"
         embed_title_scrubber: "Regular expression used to scrub the title of posts"
         embed_truncate: "Truncate the embedded posts"
+        embed_unlisted: "Imported topics will be unlisted until there is a reply."
         embed_whitelist_selector: "CSS selector for elements that are allowed in embeds"
         embed_blacklist_selector: "CSS selector for elements that are removed from embeds"
         embed_classname_whitelist: "Allowed CSS class names"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 4fd326065f..df6709c262 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2068,6 +2068,7 @@ en:
     embed_topics_list: "Support HTML embedding of topics lists"
     embed_set_canonical_url: "Set the canonical URL for embeded topics to the embeded content's URL."
     embed_truncate: "Truncate the embedded posts."
+    embed_unlisted: "Imported topics will be unlisted until a user replies."
     embed_support_markdown: "Support Markdown formatting for embedded posts."
     embed_whitelist_selector: "A comma separated list of CSS elements that are allowed in embeds."
     allowed_href_schemes: "Schemes allowed in links in addition to http and https."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index e2fc35aac4..c5b7a3d5cc 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -901,12 +901,10 @@ posting:
   embed_any_origin: false
   embed_topics_list: false
   embed_set_canonical_url: false
-  embed_truncate:
-    default: true
-  embed_support_markdown:
-    default: false
-  embed_whitelist_selector:
-    default: ""
+  embed_unlisted: false
+  embed_truncate: true
+  embed_support_markdown: false
+  embed_whitelist_selector: ""
   allowed_href_schemes:
     client: true
     default: ""
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index fab3de1954..0d3d61a99e 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -186,6 +186,7 @@ class PostCreator
         @post.link_post_uploads
         update_uploads_secure_status
         ensure_in_allowed_users if guardian.is_staff?
+        make_visible
         unarchive_message
         if !@opts[:import_mode]
           DraftSequence.next!(@user, draft_key)
@@ -414,6 +415,16 @@ class PostCreator
     end
   end
 
+  def make_visible
+    return unless SiteSetting.embed_unlisted?
+    return unless @post.post_number > 1
+    return if @post.topic.visible?
+
+    if embed = @post.topic.topic_embed
+      @post.topic.update_status('visible', true, @user)
+    end
+  end
+
   def unarchive_message
     return unless @topic.private_message? && @topic.id
 
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index 4e931f4f99..f15f55fff8 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -41,6 +41,7 @@ describe TopicEmbed do
         expect(TopicEmbed.where(topic_id: post.topic_id)).to be_present
 
         expect(post.topic.category).to eq(embeddable_host.category)
+        expect(post.topic).to be_visible
       end
 
       it "Supports updating the post content" do
@@ -71,6 +72,20 @@ describe TopicEmbed do
         post = TopicEmbed.import(user, cased_url, title, "some random content")
         expect(post.cooked).to match(/#{cased_url}/)
       end
+
+      it "will make the topic unlisted if `embed_unlisted` is set until someone replies" do
+        SiteSetting.embed_unlisted = true
+        imported_post = TopicEmbed.import(user, "http://eviltrout.com/abcd", title, "some random content")
+        expect(imported_post.topic).not_to be_visible
+        pc = PostCreator.new(
+          Fabricate(:user),
+          raw: "this is a reply that will make the topic visible",
+          topic_id: imported_post.topic_id,
+          reply_to_post_number: 1
+        )
+        pc.create
+        expect(imported_post.topic.reload).to be_visible
+      end
     end
 
     context "post creation supports markdown rendering" do

From 10c2087a02865d455cebe3d6ac82ccad389541e7 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 13 Apr 2020 17:23:37 -0400
Subject: [PATCH 505/633] UX: Prevent category dropdown from wrapping count,
 limit mobile width

---
 app/assets/stylesheets/common/select-kit/category-row.scss  | 1 -
 app/assets/stylesheets/mobile/select-kit/category-drop.scss | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
index e0126ab130..aca31f3dd2 100644
--- a/app/assets/stylesheets/common/select-kit/category-row.scss
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -2,7 +2,6 @@
   .category-row {
     .category-status {
       display: flex;
-      flex-wrap: wrap;
       align-items: center;
       max-width: 100%;
       -webkit-box-flex: 0;
diff --git a/app/assets/stylesheets/mobile/select-kit/category-drop.scss b/app/assets/stylesheets/mobile/select-kit/category-drop.scss
index 6205494dea..6697ca91e7 100644
--- a/app/assets/stylesheets/mobile/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/mobile/select-kit/category-drop.scss
@@ -12,6 +12,10 @@
       .select-kit-row {
         font-weight: normal;
       }
+
+      .category-name {
+        max-width: 70vw;
+      }
     }
   }
 }

From 7d1c90e5ebe81594c799ecdb83255765f29957b9 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 14 Apr 2020 00:43:55 +0200
Subject: [PATCH 506/633] DEV: upgrades ember-template-lint 2.5.2 (#9411)

---
 .template-lintrc.js |   5 +-
 package.json        |   2 +-
 yarn.lock           | 648 ++++++++++++++++++++++++++++++++++----------
 3 files changed, 502 insertions(+), 153 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index f5ff55a03d..b4d322875e 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -8,7 +8,7 @@ module.exports = {
   rules: {
     "block-indentation": true,
     "deprecated-render-helper": true,
-    "img-alt-attributes": false,
+    "require-valid-alt-text": false,
     "linebreak-style": true,
     "link-rel-noopener": true,
     "no-abstract-roles": true,
@@ -50,6 +50,7 @@ module.exports = {
     "self-closing-void-elements": true,
     "simple-unless": true,
     "style-concatenation": true,
-    "table-groups": true
+    "table-groups": true,
+    "link-href-attributes": false
   }
 };
diff --git a/package.json b/package.json
index fa7ea12185..eeafd9ec52 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@arkweid/lefthook": "^0.6.3",
     "chrome-launcher": "^0.12.0",
     "chrome-remote-interface": "^0.25",
-    "ember-template-lint": "^1.13.2",
+    "ember-template-lint": "^2.5.2",
     "eslint-config-discourse": "1.1.0",
     "eslint-plugin-discourse-ember": "0.0.3",
     "lodash-cli": "https://github.com/lodash-archive/lodash-cli.git",
diff --git a/yarn.lock b/yarn.lock
index 7bb2c64415..e49da23ce4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -97,42 +97,57 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.2.tgz#8644bc25b19475779a7b7c1fc104bc0a794f4465"
   integrity sha512-XiUPoS79r1G7PcpnNtq85TJ7inJWe0v+b5oZJZKb0pGHNIV6+UiNeQWiFGmuQ0aj7GEhnD/v9iqxIsjuRKtEnQ==
 
-"@glimmer/interfaces@^0.45.3":
-  version "0.45.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.45.3.tgz#9a54b6cc3f9d5887fc26c39750fd180d9dc650c0"
-  integrity sha512-RsjpflPimJUgkJwzhKWhu/CJ8HdRwqBFcSNPL9Fu8cElE1DyERdcqJbSCfw7pkFornVrhoU8gTNxzo24ly1H3g==
+"@glimmer/env@0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
+  integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
+
+"@glimmer/interfaces@^0.50.2":
+  version "0.50.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.50.2.tgz#5637beb45242b9c23b1b82b404ad085f1827ce16"
+  integrity sha512-SbrEspWDHQ6j0DI0inYpg29SMlfEEUS895apZWxMzC2RyGHy5SKmZJ4xjishaq7A0E1AaTfDKYnE/wfWrQZSsw==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.45.0":
-  version "0.45.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.45.3.tgz#298c1eff98661726eb8df0806a241e7b43ac662b"
-  integrity sha512-olTpMV4FiF7ylLYWTHzlNGiirQvCPGSVFDtohDcrNgHVkXwYYpaCF6QUgsHQMPCrY2Zu2Ohqv4PpZo1cJXY0ug==
+"@glimmer/syntax@^0.50.0":
+  version "0.50.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.50.2.tgz#e69731df2fb9069d30469c700eb9bae79e51c257"
+  integrity sha512-kmMZK4bN674sUhphLuads1RQNm3pzEuNcW7SHQiDJJz3zDsMFQ69YPtgYBrpJZtPgF6Oj/QgwUcD0d+ql5/cpw==
   dependencies:
-    "@glimmer/interfaces" "^0.45.3"
-    "@glimmer/util" "^0.45.3"
+    "@glimmer/interfaces" "^0.50.2"
+    "@glimmer/util" "^0.50.2"
     handlebars "^4.5.1"
-    simple-html-tokenizer "^0.5.8"
+    simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.45.3":
-  version "0.45.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.45.3.tgz#da902da3c5e36a8dfc79c9993718044d88eacc76"
-  integrity sha512-2lf+f3ND5OiKIFbjeHMq/1me0xymqAanvJoVjxHMd//s74o6GVsjFUSVx7FJ53E8VE2gmtdL4m/Yz5smAJHD4A==
+"@glimmer/util@^0.50.2":
+  version "0.50.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.50.2.tgz#1519064c2722143871964a183ceb825b5c24f5d3"
+  integrity sha512-FG3gWONYZWUBwZojvuYdPALu6DWKzc2QGBzb6zBgY5vO2otAqLsi8WlfGP8ekkFsEHUtlPGeUAOqr+lSox+DQw==
   dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "^0.50.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
+"@nodelib/fs.scandir@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
   dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
+    "@nodelib/fs.stat" "2.0.3"
+    run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.3"
+    fastq "^1.6.0"
 
 "@popperjs/core@v2.0.6":
   version "2.0.6"
@@ -173,24 +188,10 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
   integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
-"@types/events@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
-  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
-
-"@types/glob@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
-  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
-  dependencies:
-    "@types/events" "*"
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
 "@types/node@*":
   version "12.12.6"
@@ -265,6 +266,11 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -277,6 +283,14 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -312,17 +326,10 @@ array-from@^2.1.1:
   resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
   integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
 
-array-union@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
 array-unique@^0.3.2:
   version "0.3.2"
@@ -339,6 +346,21 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
   integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
+async-promise-queue@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.5.tgz#cb23bce9fce903a133946a700cc85f27f09ea49d"
+  integrity sha512-xi0aQ1rrjPWYmqbwr18rrSKbSaXIeIwSd1J4KAgVfkq8utNbdZoht7GfvfY6swFUAMJ9obkc4WPJmtGwl+B8dw==
+  dependencies:
+    async "^2.4.1"
+    debug "^2.6.8"
+
+async@^2.4.1:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
 async@~0.2.6:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -427,6 +449,13 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -454,11 +483,6 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
-
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -476,6 +500,11 @@ camelcase@^1.0.2:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
   integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
 capture-exit@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
@@ -502,7 +531,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.1.0:
+chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -511,6 +540,22 @@ chalk@^2.0.0, chalk@^2.1.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
+  integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -580,6 +625,18 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.3.0.tgz#0632239a4b5aa4c958610142c34bb7a651fc8df5"
+  integrity sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -594,6 +651,20 @@ cliui@^2.1.0:
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
 closure-compiler@0.2.12:
   version "0.2.12"
   resolved "https://registry.yarnpkg.com/closure-compiler/-/closure-compiler-0.2.12.tgz#6c3087cad12742c79e47f0ce50e87af91cf8e171"
@@ -626,16 +697,28 @@ color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.0.0:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+colors@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
 commander@2.11.x:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
@@ -646,6 +729,11 @@ commander@2.12.2:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
   integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
 
+commander@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.0.0.tgz#dbf1909b49e5044f8fdaf0adc809f0c0722bdfd0"
+  integrity sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==
+
 commander@~2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -722,7 +810,7 @@ debug@^4.1.0:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.0.0:
+decamelize@^1.0.0, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -737,6 +825,13 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -769,12 +864,12 @@ diff@^3.5.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
-dir-glob@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
-  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
-    path-type "^3.0.0"
+    path-type "^4.0.0"
 
 doctrine@^2.1.0:
   version "2.1.0"
@@ -783,17 +878,38 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
-ember-template-lint@^1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-1.13.2.tgz#d4664e37f7af3b74a80eb41e9f03592900cc7e25"
-  integrity sha512-hcOp91lROLo27Ym/qUHEB3QI80rNOSTDO2K4SUeQg7t/MlZ5wie3WkPSVH+jadyvADA3McQZjxX5i9qoPVaLAA==
+ember-template-lint@^2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.5.2.tgz#f1f9c3b1f3355f1a82870fbc81f672ae80e375fe"
+  integrity sha512-IwZziVgoWzqbfLCAQiCkwQ3jv6ZsPF2/pvu7ep3giAdNWbQKVx5NFrktQ+cy8tOG+QYmgrN9v7+8BkMgmE+21Q==
   dependencies:
-    "@glimmer/syntax" "^0.45.0"
-    chalk "^2.0.0"
-    globby "^9.0.0"
-    minimatch "^3.0.4"
-    resolve "^1.1.3"
-    strip-bom "^3.0.0"
+    chalk "^4.0.0"
+    ember-template-recast "^4.1.2"
+    find-up "^4.1.0"
+    globby "^11.0.0"
+    micromatch "^4.0.2"
+    resolve "^1.15.1"
+    yargs "^15.3.1"
+
+ember-template-recast@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-4.1.2.tgz#1999c49df482a042fe3ad02712d62b6d3566addd"
+  integrity sha512-ySBuPVKnGPvJ+y+5MEZ7qHE1p2LunM2CV9RUES0CP4O+fksPNwl79HPV+8rL0gJvN2nUOfkatNF6pcWNxxXaxg==
+  dependencies:
+    "@glimmer/syntax" "^0.50.0"
+    async-promise-queue "^1.0.5"
+    colors "^1.4.0"
+    commander "^5.0.0"
+    globby "^11.0.0"
+    ora "^4.0.3"
+    slash "^3.0.0"
+    tmp "^0.1.0"
+    workerpool "^5.0.4"
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 end-of-stream@^1.1.0:
   version "1.4.1"
@@ -1062,17 +1178,17 @@ fast-deep-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
   integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
-fast-glob@^2.2.6:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
-  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
+fast-glob@^3.1.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d"
+  integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==
   dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
@@ -1084,6 +1200,13 @@ fast-levenshtein@~2.0.4:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fastq@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.7.0.tgz#fcd79a08c5bd7ec5b55cd3f5c4720db551929801"
+  integrity sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==
+  dependencies:
+    reusify "^1.0.4"
+
 "favcount@https://github.com/chrishunt/favcount":
   version "0.0.0"
   resolved "https://github.com/chrishunt/favcount#d053eac5ce33e2e299363ab927103e2ff6c7361e"
@@ -1127,6 +1250,21 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
 findup-sync@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -1169,6 +1307,11 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -1181,18 +1324,12 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+glob-parent@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
   dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
+    is-glob "^4.0.1"
 
 glob@7.1.1:
   version "7.1.1"
@@ -1255,19 +1392,17 @@ globals@^11.0.1, globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globby@^9.0.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
-  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
+globby@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154"
+  integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==
   dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^1.0.2"
-    dir-glob "^2.2.2"
-    fast-glob "^2.2.6"
-    glob "^7.1.3"
-    ignore "^4.0.3"
-    pify "^4.0.1"
-    slash "^2.0.0"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
 
 google-closure-compiler@20150901.x:
   version "20150901.0.0"
@@ -1314,6 +1449,11 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -1380,10 +1520,10 @@ ignore@^3.3.3:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
   integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
-ignore@^4.0.3:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+ignore@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
+  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -1513,6 +1653,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -1520,13 +1665,18 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0:
+is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -1534,6 +1684,11 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -1716,6 +1871,13 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
 "lodash-cli@https://github.com/lodash-archive/lodash-cli.git":
   version "4.17.15"
   resolved "https://github.com/lodash-archive/lodash-cli.git#91176e422d7c10634a59c7e367fe224795ef5a24"
@@ -1726,7 +1888,7 @@ linkify-it@^2.0.0:
     semver "5.3.0"
     uglify-js "2.7.5"
 
-lodash@4.17.15, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@4.17.15, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -1736,6 +1898,13 @@ lodash@^4.17.11:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
   integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
 
+log-symbols@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
+  integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
+  dependencies:
+    chalk "^2.4.2"
+
 lolex@^2.3.2:
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733"
@@ -1818,7 +1987,7 @@ mdurl@^1.0.1:
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
-merge2@^1.2.3:
+merge2@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
   integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
@@ -1828,7 +1997,7 @@ merge@^1.2.0:
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
   integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.0.4, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -1847,6 +2016,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 mime@^2.0.3:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
@@ -1857,6 +2034,11 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
 minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -1939,6 +2121,11 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -2043,6 +2230,13 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+onetime@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  dependencies:
+    mimic-fn "^2.1.0"
+
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
@@ -2063,6 +2257,20 @@ optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
+ora@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.3.tgz#752a1b7b4be4825546a7a3d59256fa523b6b6d05"
+  integrity sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg==
+  dependencies:
+    chalk "^3.0.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.2.0"
+    is-interactive "^1.0.0"
+    log-symbols "^3.0.0"
+    mute-stream "0.0.8"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -2073,6 +2281,25 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
@@ -2083,10 +2310,10 @@ pascalcase@^0.1.1:
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
@@ -2115,27 +2342,20 @@ path-to-regexp@^1.7.0:
   dependencies:
     isarray "0.0.1"
 
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
 pikaday@1.8.0:
   version "1.8.0"
@@ -2266,6 +2486,16 @@ repeat-string@^1.5.2, repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
 require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -2304,10 +2534,10 @@ resolve@1.5.0:
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.1.3:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz#1b7ca96073ebb52e741ffd799f6b39ea462c67f5"
-  integrity sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==
+resolve@^1.15.1:
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
+  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
   dependencies:
     path-parse "^1.0.6"
 
@@ -2319,6 +2549,14 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 resumablejs@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/resumablejs/-/resumablejs-1.1.0.tgz#3160633688ac35bc2a0f119803c190ec369ef4d2"
@@ -2329,6 +2567,11 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -2343,6 +2586,13 @@ rimraf@^2.6.1:
   dependencies:
     glob "^7.0.5"
 
+rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -2367,6 +2617,11 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-parallel@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+
 rx-lite-aggregates@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
@@ -2426,6 +2681,11 @@ semver@^5.5.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
@@ -2463,7 +2723,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-simple-html-tokenizer@^0.5.8:
+simple-html-tokenizer@^0.5.9:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2"
   integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg==
@@ -2481,10 +2741,10 @@ sinon@^7.2.5:
     nise "^1.4.10"
     supports-color "^5.5.0"
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slice-ansi@1.0.0:
   version "1.0.0"
@@ -2582,6 +2842,15 @@ string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -2603,10 +2872,12 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
 
 strip-eof@^1.0.0:
   version "1.0.0"
@@ -2630,6 +2901,13 @@ supports-color@^5.3.0, supports-color@^5.5.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
 table@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
@@ -2659,6 +2937,13 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+  dependencies:
+    rimraf "^2.6.3"
+
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -2684,6 +2969,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -2805,6 +3097,18 @@ watch@~0.18.0:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
 which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -2863,6 +3167,20 @@ workbox-sw@^4.3.1:
   resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-4.3.1.tgz#df69e395c479ef4d14499372bcd84c0f5e246164"
   integrity sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w==
 
+workerpool@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2"
+  integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ==
+
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -2891,11 +3209,41 @@ ws@^6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
+yargs-parser@^18.1.1:
+  version "18.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1"
+  integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@^15.3.1:
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
+  integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.1"
+
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"

From e2284cf7391aa94ed2f22662305bc14e9e51262c Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 14 Apr 2020 11:21:31 +1000
Subject: [PATCH 507/633] Revert "We have had errors reported due to migrations
 breaking and are reverting"

This reverts commit 8b46f14744d4bab9339d075825914d86da6bd5eb.

It corrects the reason for the revert:

We rely on SafeMigrate existing cause we call it from migrations,
Zeitwerk will autoload it.

Instead of previous pattern we explicitly bypass all the hacks in
production mode.

We need to disable SafeMigrate cause it is not thread safe.

A thread safe implementation is possible but not worth the effort,
we catch the issues in dev and test.
---
 lib/freedom_patches/safe_migrations.rb |  12 ++-
 lib/migration/safe_migrate.rb          |   5 ++
 lib/tasks/db.rake                      | 100 +++++++++++++++++++++++++
 3 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/lib/freedom_patches/safe_migrations.rb b/lib/freedom_patches/safe_migrations.rb
index 718ffffb89..cdf989fdd5 100644
--- a/lib/freedom_patches/safe_migrations.rb
+++ b/lib/freedom_patches/safe_migrations.rb
@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
-require_dependency 'migration/safe_migrate'
-
-Migration::SafeMigrate.patch_active_record!
+# We do not run this in production cause it is intrusive and has
+# potential to break stuff, it also breaks under concurrent use
+# which rake:multisite_migrate uses
+#
+# The protection is only needed in Dev and Test
+if ENV['RAILS_ENV'] != "production"
+  require_dependency 'migration/safe_migrate'
+  Migration::SafeMigrate.patch_active_record!
+end
diff --git a/lib/migration/safe_migrate.rb b/lib/migration/safe_migrate.rb
index d9adb518f1..cf6c43be91 100644
--- a/lib/migration/safe_migrate.rb
+++ b/lib/migration/safe_migrate.rb
@@ -73,6 +73,7 @@ class Migration::SafeMigrate
 
   def self.enable!
     return if PG::Connection.method_defined?(:exec_migrator_unpatched)
+    return if ENV['RAILS_ENV'] == "production"
 
     PG::Connection.class_eval do
       alias_method :exec_migrator_unpatched, :exec
@@ -92,6 +93,8 @@ class Migration::SafeMigrate
 
   def self.disable!
     return if !PG::Connection.method_defined?(:exec_migrator_unpatched)
+    return if ENV['RAILS_ENV'] == "production"
+
     PG::Connection.class_eval do
       alias_method :exec, :exec_migrator_unpatched
       alias_method :async_exec, :async_exec_migrator_unpatched
@@ -102,6 +105,8 @@ class Migration::SafeMigrate
   end
 
   def self.patch_active_record!
+    return if ENV['RAILS_ENV'] == "production"
+
     ActiveSupport.on_load(:active_record) do
       ActiveRecord::Migration.prepend(SafeMigration)
     end
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 14b2eb4e20..81087473a0 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -66,6 +66,106 @@ task 'db:rollback' => ['environment', 'set_locale'] do |_, args|
   Rake::Task['db:_dump'].invoke
 end
 
+# our optimized version of multisite migrate, we have many sites and we have seeds
+# this ensures we can run migrations concurrently to save huge amounts of time
+Rake::Task['multisite:migrate'].clear
+
+class StdOutDemux
+  def initialize(stdout)
+    @stdout = stdout
+    @data = {}
+  end
+
+  def write(data)
+    (@data[Thread.current] ||= +"") << data
+  end
+
+  def close
+    finish_chunk
+  end
+
+  def finish_chunk
+    data = @data[Thread.current]
+    if data
+      @stdout.write(data)
+      @data.delete Thread.current
+    end
+  end
+end
+
+task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |_, args|
+  if ENV["RAILS_ENV"] != "production"
+    raise "Multisite migrate is only supported in production"
+  end
+
+  concurrency = (ENV['MIGRATE_CONCURRENCY'].presence || "20").to_i
+
+  puts "Multisite migrator is running using #{concurrency} threads"
+  puts
+
+  queue = Queue.new
+  exceptions = Queue.new
+
+  old_stdout = $stdout
+  $stdout = StdOutDemux.new($stdout)
+
+  RailsMultisite::ConnectionManagement.each_connection do |db|
+    queue << db
+  end
+
+  concurrency.times { queue << :done }
+
+  SeedFu.quiet = true
+
+  (1..concurrency).map do
+    Thread.new {
+      while true
+        db = queue.pop
+        break if db == :done
+
+        RailsMultisite::ConnectionManagement.with_connection(db) do
+          begin
+            puts "Migrating #{db}"
+            ActiveRecord::Tasks::DatabaseTasks.migrate
+            SeedFu.seed(DiscoursePluginRegistry.seed_paths)
+            if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
+              SiteIconManager.ensure_optimized!
+            end
+          rescue => e
+            exceptions << [db, e]
+          ensure
+            begin
+              $stdout.finish_chunk
+            rescue => ex
+              STDERR.puts ex.inspect
+              STDERR.puts ex.backtrace
+            end
+          end
+        end
+      end
+    }
+  end.each(&:join)
+
+  $stdout = old_stdout
+
+  if exceptions.length > 0
+    STDERR.puts
+    STDERR.puts "-" * 80
+    STDERR.puts "#{exceptions.length} migrations failed!"
+    while !exceptions.empty?
+      db, e = exceptions.pop
+      STDERR.puts
+      STDERR.puts "Failed to migrate #{db}"
+      STDERR.puts e.inspect
+      STDERR.puts e.backtrace
+      STDERR.puts
+    end
+    exit 1
+  end
+
+  Rake::Task['db:_dump'].invoke
+end
+
 # we need to run seed_fu every time we run rake db:migrate
 task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
 

From 6f9177e2ed273ebebb8306299425cbfabbf57101 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 14 Apr 2020 14:16:30 +1000
Subject: [PATCH 508/633] FEATURE: enforce_canonical_emails site setting

The new `enforce_canonical_emails` site setting ensures that emails in the
canonical form are unique.

This mean that if `s.a.m+1@gmail.com` is registered `sam@gmail.com` will
not be allowed.

The commit contains a blanket "tag strip" (stripping everything after +)
it also contains special handling of a "dot strip" for googlemail and gmail.

The setting only impacts new registrations after `enforce_canonical_emails`

The setting is default false so it will not impact any existing installs.
---
 app/models/user_email.rb                      | 41 +++++++++++++++----
 config/locales/server.en.yml                  |  1 +
 config/site_settings.yml                      |  1 +
 ...34210_add_canonical_email_to_user_email.rb |  7 ++++
 spec/jobs/user_email_spec.rb                  | 28 +++++++++++++
 5 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20200414034210_add_canonical_email_to_user_email.rb

diff --git a/app/models/user_email.rb b/app/models/user_email.rb
index e6fdaa8fc6..57032164c9 100644
--- a/app/models/user_email.rb
+++ b/app/models/user_email.rb
@@ -15,10 +15,27 @@ class UserEmail < ActiveRecord::Base
   validate :user_id_not_changed, if: :primary
   validate :unique_email
 
+  before_save :save_canonical
+
   scope :secondary, -> { where(primary: false) }
 
+  def self.canonical(email)
+    name, domain = email.split('@', 2)
+    name = name.gsub(/\+.*/, '')
+    if ['gmail.com', 'googlemail.com'].include?(domain.downcase)
+      name = name.gsub('.', '')
+    end
+    "#{name}@#{domain}".downcase
+  end
+
   private
 
+  def save_canonical
+    if SiteSetting.enforce_canonical_emails && self.will_save_change_to_email?
+      self.canonical_email = UserEmail.canonical(self.email)
+    end
+  end
+
   def strip_downcase_email
     if self.email
       self.email = self.email.strip
@@ -32,8 +49,14 @@ class UserEmail < ActiveRecord::Base
   end
 
   def unique_email
-    if self.will_save_change_to_email? && self.class.where("lower(email) = ?", email).exists?
-      self.errors.add(:email, :taken)
+    if self.will_save_change_to_email?
+      exists = self.class.where("lower(email) = ?", email).exists?
+      exists ||= SiteSetting.enforce_canonical_emails &&
+        self.class.where("canonical_email = ?", UserEmail.canonical(email)).exists?
+
+      if exists
+        self.errors.add(:email, :taken)
+      end
     end
   end
 
@@ -50,15 +73,17 @@ end
 #
 # Table name: user_emails
 #
-#  id         :integer          not null, primary key
-#  user_id    :integer          not null
-#  email      :string(513)      not null
-#  primary    :boolean          default(FALSE), not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id              :integer          not null, primary key
+#  user_id         :integer          not null
+#  email           :string(513)      not null
+#  primary         :boolean          default(FALSE), not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  canonical_email :string
 #
 # Indexes
 #
+#  index_user_emails_on_canonical_email      (canonical_email) WHERE (canonical_email IS NOT NULL)
 #  index_user_emails_on_email                (lower((email)::text)) UNIQUE
 #  index_user_emails_on_user_id              (user_id)
 #  index_user_emails_on_user_id_and_primary  (user_id,primary) UNIQUE WHERE "primary"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index df6709c262..ffd392888e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1582,6 +1582,7 @@ en:
     allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines. In exceptional cases you can permanently <a href='%{base_path}/admin/customize/robots'>override robots.txt</a>."
     email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net"
     email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
+    enforce_canonical_emails: "Prior to creating users strip email to canonical form ensuring uniqueness. Setting will only take effect on new account registrations. When set user+1@domain.com will not be allowed to register if user+2@domain.com is already registered."
     auto_approve_email_domains: "Users with email addresses from this list of domains will be automatically approved."
     hide_email_address_taken: "Don't inform users that an account exists with a given email address during signup and from the forgot password form."
     log_out_strict: "When logging out, log out ALL sessions for the user on all devices"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index c5b7a3d5cc..e9175a34d6 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -459,6 +459,7 @@ login:
   email_domains_whitelist:
     default: ""
     type: list
+  enforce_canonical_emails: false
   auto_approve_email_domains:
     default: ""
     type: list
diff --git a/db/migrate/20200414034210_add_canonical_email_to_user_email.rb b/db/migrate/20200414034210_add_canonical_email_to_user_email.rb
new file mode 100644
index 0000000000..7033f55bb7
--- /dev/null
+++ b/db/migrate/20200414034210_add_canonical_email_to_user_email.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class AddCanonicalEmailToUserEmail < ActiveRecord::Migration[6.0]
+  def change
+    add_column :user_emails, :canonical_email, :string, length: 513
+    add_index :user_emails, :canonical_email, where: 'canonical_email IS NOT NULL'
+  end
+end
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index e6def350b2..3cea6c3078 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -672,4 +672,32 @@ describe Jobs::UserEmail do
     end
 
   end
+
+  context "canonical emails" do
+    it "correctly creates canonical emails" do
+      expect(UserEmail.canonical('s.a.m+1@gmail.com')).to eq('sam@gmail.com')
+      expect(UserEmail.canonical('sa.m+1@googlemail.com')).to eq('sam@googlemail.com')
+      expect(UserEmail.canonical('sa.m+1722@sam.com')).to eq('sa.m@sam.com')
+      expect(UserEmail.canonical('sa.m@sam.com')).to eq('sa.m@sam.com')
+    end
+
+    it "correctly bans non canonical emails" do
+
+      email = UserEmail.create!(email: 'sam@sam.com', user_id: user.id)
+      expect(email.canonical_email).to eq(nil)
+
+      email = UserEmail.create!(email: 'sam+1@sam.com', user_id: user.id)
+      expect(email.canonical_email).to eq(nil)
+
+      SiteSetting.enforce_canonical_emails = true
+
+      email = UserEmail.create!(email: 'Sam+5@sam.com', user_id: user.id)
+      expect(email.canonical_email).to eq('sam@sam.com')
+
+      expect do
+        UserEmail.create!(email: 'saM+3@sam.com', user_id: user.id)
+      end.to raise_error(ActiveRecord::RecordInvalid)
+
+    end
+  end
 end

From 2d122f0393fb3e80a34de733171ae0b6424fa804 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 14 Apr 2020 15:17:24 +1000
Subject: [PATCH 509/633] FIX: Toggle bookmark for topic was not working after
 cancelling the modal (#9418)

* When bookmarking the topic, if the user cancelled the bookmark modal the bookmark topic button no longer worked because we did not reset the "bookmarked" property
* Prefill the custom reminder time to 8:00am
---
 app/assets/javascripts/discourse/controllers/bookmark.js | 8 ++++++--
 app/assets/javascripts/discourse/models/post.js          | 4 ++--
 app/assets/javascripts/discourse/models/topic.js         | 8 ++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 22218715b3..ebd999874d 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -78,7 +78,7 @@ export default Controller.extend(ModalFunctionality, {
       closeWithoutSaving: false,
       isSavingBookmarkManually: false,
       customReminderDate: null,
-      customReminderTime: null,
+      customReminderTime: this.defaultCustomReminderTime(),
       lastCustomReminderDate: null,
       lastCustomReminderTime: null,
       userTimezone: this.currentUser.resolvedTimezone()
@@ -270,6 +270,10 @@ export default Controller.extend(ModalFunctionality, {
     return moment.tz(date + " " + time, this.userTimezone);
   },
 
+  defaultCustomReminderTime() {
+    return `0${START_OF_DAY_HOUR}:00`;
+  },
+
   reminderAt() {
     if (!this.selectedReminderType) {
       return;
@@ -295,7 +299,7 @@ export default Controller.extend(ModalFunctionality, {
       case REMINDER_TYPES.CUSTOM:
         this.set(
           "customReminderTime",
-          this.customReminderTime || `0${START_OF_DAY_HOUR}:00`
+          this.customReminderTime || this.defaultCustomReminderTime()
         );
         const customDateTime = this.parseCustomDateTime(
           this.customReminderDate,
diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js
index 9b2dac96cd..f3ae53a606 100644
--- a/app/assets/javascripts/discourse/models/post.js
+++ b/app/assets/javascripts/discourse/models/post.js
@@ -349,8 +349,8 @@ const Post = RestModel.extend({
         controller.setProperties({
           onCloseWithoutSaving: () => {
             this.toggleProperty("bookmarked_with_reminder");
+            resolve({ closedWithoutSaving: true });
             this.appEvents.trigger("post-stream:refresh", { id: this.id });
-            resolve();
           },
           afterSave: (reminderAtISO, reminderType) => {
             this.setProperties({
@@ -358,8 +358,8 @@ const Post = RestModel.extend({
               bookmark_reminder_at: reminderAtISO,
               bookmark_reminder_type: reminderType
             });
+            resolve({ closedWithoutSaving: false });
             this.appEvents.trigger("post-stream:refresh", { id: this.id });
-            resolve();
           }
         });
       });
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 5da7217819..c783fe8827 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -438,9 +438,13 @@ const Topic = RestModel.extend({
       const toggleBookmarkOnServer = () => {
         if (bookmark) {
           if (this.siteSettings.enable_bookmarks_with_reminders) {
-            return firstPost.toggleBookmarkWithReminder().then(() => {
+            return firstPost.toggleBookmarkWithReminder().then(response => {
               this.set("bookmarking", false);
-              return this.afterTopicBookmarked(firstPost);
+              if (response.closedWithoutSaving) {
+                this.set("bookmarked", false);
+              } else {
+                return this.afterTopicBookmarked(firstPost);
+              }
             });
           } else {
             return ajax(`/t/${this.id}/bookmark`, { type: "PUT" })

From c4644c61d97c823b7dd940ffaf0967a104f4b58c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 14 Apr 2020 08:18:49 +0200
Subject: [PATCH 510/633] DEV: enforces double quotes ember-template-lint
 (#9416)

---
 .template-lintrc.js                           |  2 +-
 .../javascripts/admin/templates/admin.hbs     | 26 +++----
 .../admin/templates/api-keys-index.hbs        |  8 +-
 .../admin/templates/api-keys-new.hbs          |  6 +-
 .../admin/templates/api-keys-show.hbs         | 12 +--
 .../javascripts/admin/templates/api.hbs       |  4 +-
 .../javascripts/admin/templates/backups.hbs   |  6 +-
 .../admin/templates/badges-award.hbs          | 22 +++---
 .../admin/templates/badges-index.hbs          |  2 +-
 .../admin/templates/badges-show.hbs           | 48 ++++++------
 .../javascripts/admin/templates/badges.hbs    | 14 ++--
 .../admin/templates/components/ace-editor.hbs |  2 +-
 .../components/admin-editable-field.hbs       |  8 +-
 .../templates/components/admin-form-row.hbs   |  4 +-
 .../admin/templates/components/admin-nav.hbs  |  2 +-
 .../components/admin-report-storage-stats.hbs |  2 +-
 .../components/admin-report-table.hbs         |  6 +-
 .../admin-report-trust-level-counts.hbs       | 10 +--
 .../templates/components/admin-report.hbs     |  4 +-
 .../components/admin-theme-editor.hbs         | 30 ++++----
 .../components/dashboard-problems.hbs         |  4 +-
 .../components/email-styles-editor.hbs        | 18 ++---
 .../templates/components/embeddable-host.hbs  |  2 +-
 .../components/embedding-setting.hbs          |  2 +-
 .../templates/components/flag-user-lists.hbs  | 14 ++--
 .../admin/templates/components/flag-user.hbs  | 14 ++--
 .../components/inline-edit-checkbox.hbs       |  2 +-
 .../components/install-theme-item.hbs         |  4 +-
 .../components/penalty-post-action.hbs        |  8 +-
 .../templates/components/resumable-upload.hbs |  4 +-
 .../components/screened-ip-address-form.hbs   |  2 +-
 .../components/setting-validation-message.hbs |  2 +-
 .../templates/components/silence-details.hbs  |  8 +-
 .../site-customization-change-details.hbs     |  2 +-
 .../site-customization-change-field.hbs       |  2 +-
 .../templates/components/site-setting.hbs     |  6 +-
 .../site-settings/category-list.hbs           |  2 +-
 .../components/site-settings/category.hbs     |  2 +-
 .../components/site-settings/compact-list.hbs |  2 +-
 .../components/site-settings/enum.hbs         |  2 +-
 .../components/site-settings/group-list.hbs   |  2 +-
 .../components/site-settings/host-list.hbs    |  2 +-
 .../components/site-settings/list.hbs         |  2 +-
 .../components/site-settings/secret-list.hbs  |  2 +-
 .../components/site-settings/string.hbs       |  2 +-
 .../components/site-settings/tag-list.hbs     |  2 +-
 .../components/site-settings/upload.hbs       |  2 +-
 .../site-settings/uploaded-image-list.hbs     |  2 +-
 .../components/site-settings/url-list.hbs     |  2 +-
 .../components/site-settings/value-list.hbs   |  2 +-
 .../components/site-text-summary.hbs          |  8 +-
 .../components/suspension-details.hbs         | 10 +--
 .../templates/components/tags-uploader.hbs    |  6 +-
 .../templates/components/themes-list-item.hbs |  2 +-
 .../templates/components/themes-list.hbs      |  4 +-
 .../admin/templates/components/value-list.hbs |  4 +-
 .../components/watched-word-form.hbs          |  2 +-
 .../components/watched-word-uploader.hbs      |  6 +-
 .../templates/customize-colors-index.hbs      |  2 +-
 .../admin/templates/customize-colors-show.hbs | 14 ++--
 .../templates/customize-email-style-edit.hbs  |  6 +-
 .../admin/templates/customize-email-style.hbs |  6 +-
 .../customize-email-templates-edit.hbs        |  4 +-
 .../admin/templates/customize-themes-edit.hbs | 22 +++---
 .../admin/templates/customize-themes-show.hbs | 32 ++++----
 .../javascripts/admin/templates/customize.hbs | 18 ++---
 .../admin/templates/dashboard_general.hbs     | 10 +--
 .../admin/templates/dashboard_moderation.hbs  |  2 +-
 .../admin/templates/dashboard_reports.hbs     |  2 +-
 .../admin/templates/email-advanced-test.hbs   | 10 +--
 .../admin/templates/email-bounced.hbs         | 20 ++---
 .../admin/templates/email-index.hbs           | 14 ++--
 .../admin/templates/email-preview-digest.hbs  | 30 ++++----
 .../admin/templates/email-received.hbs        | 16 ++--
 .../admin/templates/email-rejected.hbs        | 20 ++---
 .../admin/templates/email-sent.hbs            | 28 +++----
 .../admin/templates/email-skipped.hbs         | 22 +++---
 .../javascripts/admin/templates/email.hbs     | 18 ++---
 .../javascripts/admin/templates/embedding.hbs | 22 +++---
 .../javascripts/admin/templates/emojis.hbs    |  4 +-
 .../javascripts/admin/templates/logs.hbs      | 14 ++--
 .../admin/templates/logs/screened-emails.hbs  | 24 +++---
 .../admin/templates/logs/screened-urls.hbs    | 22 +++---
 .../templates/logs/staff-action-logs.hbs      | 40 +++++-----
 .../templates/modal/admin-add-upload.hbs      | 10 +--
 .../templates/modal/admin-install-theme.hbs   | 30 ++++----
 .../templates/modal/admin-silence-user.hbs    |  2 +-
 .../templates/modal/admin-suspend-user.hbs    |  4 +-
 .../templates/modal/admin-theme-item.hbs      |  2 +-
 .../modal/site-setting-default-categories.hbs |  4 +-
 .../admin/templates/permalinks.hbs            | 12 +--
 .../javascripts/admin/templates/plugins.hbs   |  6 +-
 .../admin/templates/search-logs-index.hbs     | 16 ++--
 .../admin/templates/search-logs-term.hbs      | 22 +++---
 .../templates/site-settings-category.hbs      |  4 +-
 .../admin/templates/site-settings.hbs         | 10 +--
 .../admin/templates/site-text-edit.hbs        | 10 +--
 .../admin/templates/site-text-index.hbs       |  6 +-
 .../javascripts/admin/templates/site-text.hbs |  2 +-
 .../admin/templates/user-badges.hbs           | 34 ++++-----
 .../admin/templates/user-fields.hbs           |  6 +-
 .../admin/templates/user-index.hbs            |  4 +-
 .../admin/templates/user-tl3-requirements.hbs | 66 ++++++++---------
 .../admin/templates/users-list-show.hbs       | 34 ++++-----
 .../admin/templates/users-list.hbs            | 16 ++--
 .../admin/templates/watched-words-action.hbs  |  4 +-
 .../admin/templates/watched-words.hbs         |  6 +-
 .../admin/templates/web-hooks-show-events.hbs | 30 ++++----
 .../admin/templates/web-hooks-show.hbs        | 52 ++++++-------
 .../javascripts/admin/templates/web-hooks.hbs | 32 ++++----
 .../javascripts/discourse/templates/about.hbs | 74 +++++++++----------
 .../discourse/templates/account-created.hbs   |  4 +-
 .../templates/account-created/edit-email.hbs  |  4 +-
 .../templates/account-created/index.hbs       |  2 +-
 .../templates/account-created/resent.hbs      |  6 +-
 .../discourse/templates/badges/index.hbs      | 10 +--
 .../discourse/templates/badges/show.hbs       | 24 +++---
 .../templates/components/avatar-uploader.hbs  |  8 +-
 .../templates/components/backup-uploader.hbs  |  2 +-
 .../templates/components/badge-card.hbs       | 16 ++--
 .../templates/components/badge-selector.hbs   |  2 +-
 .../templates/components/badge-title.hbs      |  6 +-
 .../templates/components/basic-topic-list.hbs |  6 +-
 .../components/bulk-select-button.hbs         |  2 +-
 .../templates/components/cancel-link.hbs      |  2 +-
 .../categories-and-latest-topics.hbs          |  4 +-
 .../components/categories-and-top-topics.hbs  |  4 +-
 .../components/categories-boxes-topic.hbs     |  2 +-
 .../categories-boxes-with-topics.hbs          | 10 +--
 .../templates/components/categories-boxes.hbs | 19 +++--
 .../templates/components/categories-only.hbs  | 22 +++---
 .../components/categories-topic-list.hbs      |  6 +-
 .../components/category-name-fields.hbs       |  6 +-
 .../components/category-title-link.hbs        |  2 +-
 .../templates/components/category-unread.hbs  |  4 +-
 .../templates/components/choose-message.hbs   | 12 +--
 .../templates/components/choose-topic.hbs     | 12 +--
 .../templates/components/color-picker.hbs     |  2 +-
 .../components/composer-user-selector.hbs     |  8 +-
 .../components/create-topics-notice.hbs       |  4 +-
 .../templates/components/csv-uploader.hbs     |  2 +-
 .../templates/components/d-button.hbs         |  2 +-
 .../templates/components/d-editor.hbs         | 10 +--
 .../templates/components/d-modal-cancel.hbs   |  2 +-
 .../templates/components/d-modal.hbs          |  2 +-
 .../components/date-time-input-range.hbs      |  4 +-
 .../desktop-notification-config.hbs           |  2 +-
 .../templates/components/directory-item.hbs   |  2 +-
 .../components/edit-category-general.hbs      | 34 ++++-----
 .../components/edit-category-images.hbs       |  8 +-
 .../components/edit-category-security.hbs     |  8 +-
 .../components/edit-category-settings.hbs     | 56 +++++++-------
 .../components/edit-category-tab.hbs          |  2 +-
 .../components/edit-category-tags.hbs         | 34 ++++-----
 .../edit-category-topic-template.hbs          |  2 +-
 .../components/edit-topic-timer-form.hbs      |  2 +-
 .../templates/components/emoji-picker.hbs     |  4 +-
 .../templates/components/emoji-uploader.hbs   |  2 +-
 .../templates/components/featured-topic.hbs   |  6 +-
 .../templates/components/flag-action-type.hbs | 20 ++---
 .../templates/components/flag-selection.hbs   |  2 +-
 .../components/generated-invite-link.hbs      |  2 +-
 .../templates/components/google-search.hbs    |  6 +-
 .../components/group-activity-filter.hbs      |  4 +-
 .../components/group-card-contents.hbs        | 12 +--
 .../components/group-flair-inputs.hbs         | 18 ++---
 .../components/group-manage-logs-row.hbs      | 10 +--
 .../components/group-manage-save-button.hbs   |  6 +-
 .../templates/components/group-member.hbs     |  2 +-
 .../templates/components/group-navigation.hbs |  4 +-
 .../templates/components/group-post.hbs       | 14 ++--
 .../templates/components/group-selector.hbs   |  2 +-
 .../groups-form-interaction-fields.hbs        | 26 +++----
 .../groups-form-membership-fields.hbs         | 22 +++---
 .../components/groups-form-profile-fields.hbs | 12 +--
 .../templates/components/groups-info.hbs      |  4 +-
 .../components/ignored-user-list.hbs          |  6 +-
 .../templates/components/image-uploader.hbs   |  4 +-
 .../templates/components/images-uploader.hbs  |  2 +-
 .../templates/components/ip-lookup.hbs        |  2 +-
 .../components/latest-topic-list-item.hbs     | 10 +--
 .../components/mobile-category-topic.hbs      |  6 +-
 .../templates/components/popup-input-tip.hbs  |  2 +-
 .../components/preference-checkbox.hbs        |  2 +-
 .../templates/components/quote-button.hbs     |  2 +-
 .../components/reviewable-claimed-topic.hbs   |  6 +-
 .../reviewable-conversation-post.hbs          |  4 +-
 .../components/reviewable-created-by-name.hbs |  2 +-
 .../components/reviewable-created-by.hbs      |  2 +-
 .../components/reviewable-field-text.hbs      |  2 +-
 .../templates/components/reviewable-field.hbs |  4 +-
 .../components/reviewable-flagged-post.hbs    | 14 ++--
 .../components/reviewable-histories.hbs       |  2 +-
 .../templates/components/reviewable-item.hbs  | 38 +++++-----
 .../components/reviewable-post-header.hbs     |  6 +-
 .../components/reviewable-queued-post.hbs     | 16 ++--
 .../templates/components/reviewable-score.hbs | 18 ++---
 .../components/reviewable-scores.hbs          |  2 +-
 .../components/reviewable-topic-link.hbs      |  6 +-
 .../templates/components/reviewable-user.hbs  | 28 +++----
 .../templates/components/save-controls.hbs    |  2 +-
 .../templates/components/score-value.hbs      |  8 +-
 .../components/search-advanced-options.hbs    |  4 +-
 .../components/security-key-form.hbs          |  4 +-
 .../components/shared-draft-controls.hbs      |  6 +-
 .../templates/components/tag-groups-form.hbs  | 14 ++--
 .../templates/components/tag-info.hbs         |  6 +-
 .../templates/components/tag-list.hbs         |  4 +-
 .../templates/components/topic-entrance.hbs   |  4 +-
 .../components/topic-footer-buttons.hbs       |  2 +-
 .../components/topic-post-badges.hbs          |  6 +-
 .../templates/components/topic-progress.hbs   |  8 +-
 .../templates/components/topic-status.hbs     | 20 ++---
 .../components/user-card-contents.hbs         | 34 ++++-----
 .../components/user-fields/confirm.hbs        | 10 +--
 .../components/user-fields/dropdown.hbs       |  8 +-
 .../templates/components/user-fields/text.hbs |  8 +-
 .../components/user-flag-percentage.hbs       |  2 +-
 .../templates/components/user-info.hbs        |  4 +-
 .../components/user-profile-avatar.hbs        |  4 +-
 .../templates/components/user-stat.hbs        |  4 +-
 .../templates/components/user-stream-item.hbs | 26 +++----
 .../user-summary-category-search.hbs          |  2 +-
 .../components/user-summary-section.hbs       |  2 +-
 .../components/user-summary-topic.hbs         |  4 +-
 .../discourse/templates/composer.hbs          | 50 ++++++-------
 .../templates/composer/custom-body.hbs        |  2 +-
 .../templates/composer/education.hbs          |  2 +-
 .../templates/composer/group-mentioned.hbs    |  2 +-
 .../templates/composer/similar-topics.hbs     |  6 +-
 .../discourse/templates/discovery/topics.hbs  | 14 ++--
 .../discourse/templates/email-login.hbs       |  2 +-
 .../discourse/templates/exception.hbs         |  2 +-
 .../discourse/templates/full-page-search.hbs  | 34 ++++-----
 .../discourse/templates/group-index.hbs       | 16 ++--
 .../discourse/templates/group-requests.hbs    |  8 +-
 .../javascripts/discourse/templates/group.hbs | 14 ++--
 .../discourse/templates/group/activity.hbs    |  4 +-
 .../discourse/templates/group/manage.hbs      |  4 +-
 .../discourse/templates/group/manage/logs.hbs | 10 +--
 .../discourse/templates/group/messages.hbs    | 10 +--
 .../discourse/templates/groups/index.hbs      | 14 ++--
 .../discourse/templates/groups/new.hbs        | 10 +--
 .../discourse/templates/invites/show.hbs      | 24 +++---
 .../discourse/templates/login-preferences.hbs |  4 +-
 .../mobile/components/basic-topic-list.hbs    | 24 +++---
 .../mobile/components/categories-only.hbs     | 24 +++---
 .../mobile/components/mobile-nav.hbs          |  4 +-
 .../mobile/components/navigation-bar.hbs      |  6 +-
 .../templates/mobile/discovery/topics.hbs     | 12 +--
 .../templates/mobile/modal/login.hbs          | 12 +--
 .../discourse/templates/mobile/users.hbs      | 12 +--
 .../templates/modal/activation-resent.hbs     |  2 +-
 .../modal/associate-account-confirm.hbs       |  2 +-
 .../discourse/templates/modal/auth-token.hbs  |  8 +-
 .../templates/modal/avatar-selector.hbs       | 10 +--
 .../discourse/templates/modal/bookmark.hbs    |  4 +-
 .../templates/modal/bulk-actions-buttons.hbs  |  2 +-
 .../modal/bulk-notification-level.hbs         |  6 +-
 .../templates/modal/change-owner.hbs          |  4 +-
 .../templates/modal/change-timestamp.hbs      |  6 +-
 .../modal/convert-to-public-topic.hbs         |  4 +-
 .../templates/modal/create-account.hbs        | 26 +++----
 .../templates/modal/edit-topic-timer.hbs      | 10 +--
 .../templates/modal/explain-reviewable.hbs    | 10 +--
 .../modal/feature-topic-on-profile.hbs        |  2 +-
 .../templates/modal/forgot-password.hbs       |  4 +-
 .../discourse/templates/modal/grant-badge.hbs |  4 +-
 .../templates/modal/group-bulk-add.hbs        |  2 +-
 .../discourse/templates/modal/history.hbs     |  8 +-
 .../templates/modal/jump-to-post.hbs          |  6 +-
 .../discourse/templates/modal/login.hbs       | 16 ++--
 .../templates/modal/move-to-topic.hbs         | 54 +++++++-------
 .../templates/modal/not-activated.hbs         |  2 +-
 .../templates/modal/publish-page.hbs          |  4 +-
 .../discourse/templates/modal/raw-email.hbs   |  8 +-
 .../templates/modal/reorder-categories.hbs    |  4 +-
 .../modal/request-group-membership-form.hbs   |  2 +-
 .../modal/second-factor-add-security-key.hbs  |  6 +-
 .../modal/second-factor-add-totp.hbs          | 14 ++--
 .../modal/second-factor-edit-security-key.hbs |  4 +-
 .../templates/modal/second-factor-edit.hbs    |  4 +-
 .../discourse/templates/modal/tag-upload.hbs  |  2 +-
 .../templates/modal/topic-bulk-actions.hbs    |  2 +-
 .../templates/modal/upload-selector.hbs       | 10 +--
 .../templates/navigation/category.hbs         |  4 +-
 .../discourse/templates/password-reset.hbs    | 16 ++--
 .../discourse/templates/preferences-email.hbs | 18 ++---
 .../templates/preferences-second-factor.hbs   | 20 ++---
 .../templates/preferences-username.hbs        | 12 +--
 .../discourse/templates/preferences.hbs       | 58 +++++++--------
 .../templates/preferences/account.hbs         | 58 +++++++--------
 .../discourse/templates/preferences/apps.hbs  |  2 +-
 .../templates/preferences/categories.hbs      | 26 +++----
 .../templates/preferences/emails.hbs          | 34 ++++-----
 .../templates/preferences/interface.hbs       | 18 ++---
 .../templates/preferences/notifications.hbs   | 16 ++--
 .../templates/preferences/profile.hbs         | 30 ++++----
 .../discourse/templates/preferences/tags.hbs  | 18 ++---
 .../discourse/templates/preferences/users.hbs |  8 +-
 .../discourse/templates/review-index.hbs      | 30 ++++----
 .../discourse/templates/review-settings.hbs   | 16 ++--
 .../discourse/templates/review-topics.hbs     |  6 +-
 .../discourse/templates/review.hbs            |  6 +-
 .../discourse/templates/static.hbs            |  2 +-
 .../discourse/templates/tag-groups-index.hbs  |  2 +-
 .../discourse/templates/tag-groups.hbs        |  2 +-
 .../discourse/templates/tags/index.hbs        |  6 +-
 .../discourse/templates/tags/show.hbs         |  8 +-
 .../javascripts/discourse/templates/topic.hbs | 32 ++++----
 .../discourse/templates/unknown.hbs           |  2 +-
 .../discourse/templates/user-invited-show.hbs | 50 ++++++-------
 .../templates/user-private-messages-tags.hbs  |  6 +-
 .../javascripts/discourse/templates/user.hbs  | 42 +++++------
 .../discourse/templates/user/activity.hbs     | 22 +++---
 .../discourse/templates/user/bookmarks.hbs    |  2 +-
 .../discourse/templates/user/messages.hbs     | 32 ++++----
 .../templates/user/notifications-index.hbs    |  6 +-
 .../templates/user/notifications.hbs          | 32 ++++----
 .../templates/user/profile-hidden.hbs         |  2 +-
 .../discourse/templates/user/stream.hbs       |  2 +-
 .../discourse/templates/user/summary.hbs      | 32 ++++----
 .../javascripts/discourse/templates/users.hbs | 12 +--
 .../multi-select/selected-category.hbs        |  2 +-
 .../wizard/templates/application.hbs          |  8 +-
 .../templates/components/invite-list-user.hbs |  4 +-
 .../templates/components/invite-list.hbs      |  2 +-
 .../templates/components/radio-button.hbs     |  8 +-
 .../templates/components/staff-count.hbs      |  2 +-
 .../components/wizard-field-image.hbs         |  2 +-
 .../templates/components/wizard-field.hbs     |  8 +-
 .../templates/components/wizard-step.hbs      | 28 +++----
 332 files changed, 1788 insertions(+), 1789 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index b4d322875e..1150803258 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -43,7 +43,7 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
-    "quotes": false,
+    quotes: "double",
     "require-button-type": false,
     "require-iframe-title": true,
     "require-valid-alt-text": false,
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index dacf526c53..bcbe6940d4 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -3,35 +3,35 @@
     <div class="full-width">
       <div class="admin-main-nav">
         <ul class="nav nav-pills">
-          {{nav-item route='admin.dashboard' label='admin.dashboard.title'}}
+          {{nav-item route="admin.dashboard" label="admin.dashboard.title"}}
           {{#if currentUser.admin}}
-            {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}}
+            {{nav-item route="adminSiteSettings" label="admin.site_settings.title"}}
           {{/if}}
-          {{nav-item route='adminUsersList' label='admin.users.title'}}
+          {{nav-item route="adminUsersList" label="admin.users.title"}}
           {{#if showGroups}}
-            {{nav-item route='groups' label='admin.groups.title'}}
+            {{nav-item route="groups" label="admin.groups.title"}}
           {{/if}}
           {{#if showBadges}}
-            {{nav-item route='adminBadges' label='admin.badges.title'}}
+            {{nav-item route="adminBadges" label="admin.badges.title"}}
           {{/if}}
           {{#if currentUser.admin}}
-            {{nav-item route='adminEmail' label='admin.email.title'}}
+            {{nav-item route="adminEmail" label="admin.email.title"}}
           {{/if}}
-          {{nav-item route='adminLogs' label='admin.logs.title'}}
+          {{nav-item route="adminLogs" label="admin.logs.title"}}
           {{#if currentUser.admin}}
-            {{nav-item route='adminCustomize' label='admin.customize.title'}}
-            {{nav-item route='adminApi' label='admin.api.title'}}
+            {{nav-item route="adminCustomize" label="admin.customize.title"}}
+            {{nav-item route="adminApi" label="admin.api.title"}}
             {{#if siteSettings.enable_backups}}
-              {{nav-item route='admin.backups' label='admin.backups.title'}}
+              {{nav-item route="admin.backups" label="admin.backups.title"}}
             {{/if}}
           {{/if}}
-          {{nav-item route='adminPlugins' label='admin.plugins.title'}}
+          {{nav-item route="adminPlugins" label="admin.plugins.title"}}
           {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}}
         </ul>
       </div>
 
-      <div class='boxed white admin-content'>
-        <div class='admin-contents {{adminContentsClassName}}'>
+      <div class="boxed white admin-content">
+        <div class="admin-contents {{adminContentsClassName}}">
           {{outlet}}
         </div>
       </div>
diff --git a/app/assets/javascripts/admin/templates/api-keys-index.hbs b/app/assets/javascripts/admin/templates/api-keys-index.hbs
index 0672b99f4f..ac5dbf7c6b 100644
--- a/app/assets/javascripts/admin/templates/api-keys-index.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-index.hbs
@@ -18,14 +18,14 @@
       {{#each model as |k|}}
         <tr class={{if k.revoked_at "revoked"}}>
           <td class="key">
-            {{#if k.revoked_at}}{{d-icon 'times-circle'}}{{/if}}
+            {{#if k.revoked_at}}{{d-icon "times-circle"}}{{/if}}
             {{k.truncatedKey}}
           </td>
           <td class="key-description">
             {{k.shortDescription}}
           </td>
           <td class="key-user">
-            <div class="label">{{i18n 'admin.api.user'}}</div>
+            <div class="label">{{i18n "admin.api.user"}}</div>
             {{#if k.user}}
               {{#link-to "adminUser" k.user}}
                 {{avatar k.user imageSize="small"}}
@@ -35,11 +35,11 @@
             {{/if}}
           </td>
           <td class="key-created">
-            <div class="label">{{i18n 'admin.api.created'}}</div>
+            <div class="label">{{i18n "admin.api.created"}}</div>
             {{format-date k.created_at}}
           </td>
           <td class="key-last-used">
-            <div class="label">{{i18n 'admin.api.last_used'}}</div>
+            <div class="label">{{i18n "admin.api.last_used"}}</div>
             {{#if k.last_used_at}}
               {{format-date k.last_used_at}}
             {{else}}
diff --git a/app/assets/javascripts/admin/templates/api-keys-new.hbs b/app/assets/javascripts/admin/templates/api-keys-new.hbs
index 3dac84dae2..d48da805e5 100644
--- a/app/assets/javascripts/admin/templates/api-keys-new.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-new.hbs
@@ -1,6 +1,6 @@
-{{#link-to 'adminApiKeys.index' class="go-back"}}
-  {{d-icon 'arrow-left'}}
-  {{i18n 'admin.api.all_api_keys'}}
+{{#link-to "adminApiKeys.index" class="go-back"}}
+  {{d-icon "arrow-left"}}
+  {{i18n "admin.api.all_api_keys"}}
 {{/link-to}}
 
 <div class="api-key">
diff --git a/app/assets/javascripts/admin/templates/api-keys-show.hbs b/app/assets/javascripts/admin/templates/api-keys-show.hbs
index 736a4ef777..d1d35da017 100644
--- a/app/assets/javascripts/admin/templates/api-keys-show.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-show.hbs
@@ -1,11 +1,11 @@
-{{#link-to 'adminApiKeys.index' class="go-back"}}
-  {{d-icon 'arrow-left'}}
-  {{i18n 'admin.api.all_api_keys'}}
+{{#link-to "adminApiKeys.index" class="go-back"}}
+  {{d-icon "arrow-left"}}
+  {{i18n "admin.api.all_api_keys"}}
 {{/link-to}}
 
 <div class="api-key">
   {{#admin-form-row label="admin.api.key"}}
-    {{#if model.revoked_at}}{{d-icon 'times-circle'}}{{/if}}
+    {{#if model.revoked_at}}{{d-icon "times-circle"}}{{/if}}
     {{model.truncatedKey}}
   {{/admin-form-row}}
 
@@ -18,7 +18,7 @@
       </span>
     {{/if}}
 
-    <div class='controls'>
+    <div class="controls">
       {{#if editingDescription}}
         {{d-button class="ok" action=(action "saveDescription") icon="check"}}
         {{d-button class="cancel" action=(action "editDescription") icon="times"}}
@@ -58,7 +58,7 @@
     {{#if model.revoked_at}}
       {{format-date model.revoked_at leaveAgo="true"}}
     {{/if}}
-    <div class='controls'>
+    <div class="controls">
       {{#if model.revoked_at}}
         {{d-button
           action=(action "undoRevokeKey")
diff --git a/app/assets/javascripts/admin/templates/api.hbs b/app/assets/javascripts/admin/templates/api.hbs
index 45bfbd9ca7..288bbc71fe 100644
--- a/app/assets/javascripts/admin/templates/api.hbs
+++ b/app/assets/javascripts/admin/templates/api.hbs
@@ -1,6 +1,6 @@
 {{#admin-nav}}
-  {{nav-item route='adminApiKeys' label='admin.api.title'}}
-  {{nav-item route='adminWebHooks' label='admin.web_hooks.title'}}
+  {{nav-item route="adminApiKeys" label="admin.api.title"}}
+  {{nav-item route="adminWebHooks" label="admin.web_hooks.title"}}
 {{/admin-nav}}
 
 <div class="admin-container">
diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs
index c8d72599e8..23fb6dc458 100644
--- a/app/assets/javascripts/admin/templates/backups.hbs
+++ b/app/assets/javascripts/admin/templates/backups.hbs
@@ -1,9 +1,9 @@
-<div class='admin-backups'>
+<div class="admin-backups">
   <div class="admin-controls">
     <nav>
       <ul class="nav nav-pills">
-        {{nav-item route='admin.backups.index' label='admin.backups.menu.backups'}}
-        {{nav-item route='admin.backups.logs' label='admin.backups.menu.logs'}}
+        {{nav-item route="admin.backups.index" label="admin.backups.menu.backups"}}
+        {{nav-item route="admin.backups.logs" label="admin.backups.menu.logs"}}
         {{plugin-outlet name="downloader" tagName=""}}
         <div class="admin-actions">
           {{#if model.canRollback}}
diff --git a/app/assets/javascripts/admin/templates/badges-award.hbs b/app/assets/javascripts/admin/templates/badges-award.hbs
index d0082dc349..bb6c4bf22e 100644
--- a/app/assets/javascripts/admin/templates/badges-award.hbs
+++ b/app/assets/javascripts/admin/templates/badges-award.hbs
@@ -1,39 +1,39 @@
 {{#d-section class="award-badge"}}
-  <h1>{{i18n 'admin.badges.mass_award.title'}}</h1>
-  <p>{{i18n 'admin.badges.mass_award.description'}}</p>
+  <h1>{{i18n "admin.badges.mass_award.title"}}</h1>
+  <p>{{i18n "admin.badges.mass_award.description"}}</p>
 
   {{#if model}}
     <form class="form-horizontal">
-      <div class='badge-preview'>
+      <div class="badge-preview">
         {{#if model}}
           {{icon-or-image model}}
           <span class="badge-display-name">{{model.name}}</span>
         {{else}}
-          <span class='badge-placeholder'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+          <span class="badge-placeholder">{{i18n "admin.badges.mass_award.no_badge_selected"}}</span>
         {{/if}}
       </div>
       <div>
-        <h4>{{i18n 'admin.badges.mass_award.upload_csv'}}</h4>
-        <input type='file' id='massAwardCSVUpload' accept='.csv'>
+        <h4>{{i18n "admin.badges.mass_award.upload_csv"}}</h4>
+        <input type="file" id="massAwardCSVUpload" accept=".csv">
       </div>
       <div>
         <label>
           {{input type="checkbox" checked=replaceBadgeOwners}}
-          {{i18n 'admin.badges.mass_award.replace_owners'}}
+          {{i18n "admin.badges.mass_award.replace_owners"}}
         </label>
       </div>
       {{d-button
           class="btn-primary"
-          action=(action 'massAward')
+          action=(action "massAward")
           type="submit"
           disabled=saving
           label="admin.badges.mass_award.perform"}}
-      {{#link-to 'adminBadges.index' class="btn btn-danger"}}
+      {{#link-to "adminBadges.index" class="btn btn-danger"}}
         {{d-icon "times"}}
-        <span>{{i18n 'cancel'}}</span>
+        <span>{{i18n "cancel"}}</span>
       {{/link-to}}
     </form>
   {{else}}
-    <span class='badge-required'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+    <span class="badge-required">{{i18n "admin.badges.mass_award.no_badge_selected"}}</span>
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 49c5945ea1..f2b2efeaef 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -2,7 +2,7 @@
   <div class="badge-intro admin-intro">
     <img src={{badgeIntroEmoji}} class="badge-intro-emoji">
     <div class="content-wrapper">
-      <h1>{{i18n 'admin.badges.badge_intro.title'}}</h1>
+      <h1>{{i18n "admin.badges.badge_intro.title"}}</h1>
       <div class="external-resources">
         {{#each badgeIntroLinks as |link|}}
           <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index f3935c4f2f..c121df1cc4 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -1,7 +1,7 @@
 {{#d-section class="current-badge content-body"}}
   <form class="form-horizontal">
     <div>
-      <label for="name">{{i18n 'admin.badges.name'}}</label>
+      <label for="name">{{i18n "admin.badges.name"}}</label>
       {{#if readOnly}}
         {{input type="text" name="name" value=buffered.name disabled=true}}
       {{else}}
@@ -10,7 +10,7 @@
     </div>
 
     <div>
-      <label for="icon">{{i18n 'admin.badges.icon'}}</label>
+      <label for="icon">{{i18n "admin.badges.icon"}}</label>
       {{icon-picker
         name="icon"
         value=buffered.icon
@@ -20,17 +20,17 @@
         onChange=(action (mut buffered.icon))
       }}
 
-      <p class='help'>{{i18n 'admin.badges.icon_help'}}</p>
+      <p class="help">{{i18n "admin.badges.icon_help"}}</p>
     </div>
 
     <div>
-      <label for="image">{{i18n 'admin.badges.image'}}</label>
+      <label for="image">{{i18n "admin.badges.image"}}</label>
       {{input type="text" name="image" value=buffered.image}}
-      <p class='help'>{{i18n 'admin.badges.image_help'}}</p>
+      <p class="help">{{i18n "admin.badges.image_help"}}</p>
     </div>
 
     <div>
-      <label for="badge_type_id">{{i18n 'admin.badges.badge_type'}}</label>
+      <label for="badge_type_id">{{i18n "admin.badges.badge_type"}}</label>
       {{combo-box
         name="badge_type_id"
         value=buffered.badge_type_id
@@ -41,7 +41,7 @@
     </div>
 
     <div>
-      <label for="badge_grouping_id">{{i18n 'admin.badges.badge_grouping'}}</label>
+      <label for="badge_grouping_id">{{i18n "admin.badges.badge_grouping"}}</label>
 
       <div class="badge-grouping-control">
         {{combo-box
@@ -61,7 +61,7 @@
     </div>
 
     <div>
-      <label for="description">{{i18n 'admin.badges.description'}}</label>
+      <label for="description">{{i18n "admin.badges.description"}}</label>
       {{#if buffered.system}}
         {{textarea name="description" value=buffered.description disabled=true}}
       {{else}}
@@ -70,7 +70,7 @@
     </div>
 
     <div>
-      <label for="long_description">{{i18n 'admin.badges.long_description'}}</label>
+      <label for="long_description">{{i18n "admin.badges.long_description"}}</label>
       {{#if buffered.system}}
         {{textarea name="long_description" value=buffered.long_description disabled=true}}
       {{else}}
@@ -80,34 +80,34 @@
 
     {{#if siteSettings.enable_badge_sql}}
       <div>
-        <label for="query">{{i18n 'admin.badges.query'}}</label>
+        <label for="query">{{i18n "admin.badges.query"}}</label>
         {{ace-editor content=buffered.query mode="sql" disabled=readOnly}}
       </div>
 
       {{#if hasQuery}}
-        <a href {{action "preview" buffered "false"}}>{{i18n 'admin.badges.preview.link_text'}}</a>
+        <a href {{action "preview" buffered "false"}}>{{i18n "admin.badges.preview.link_text"}}</a>
         |
-        <a href {{action "preview" buffered "true"}}>{{i18n 'admin.badges.preview.plan_text'}}</a>
+        <a href {{action "preview" buffered "true"}}>{{i18n "admin.badges.preview.plan_text"}}</a>
         {{#if preview_loading}}
-          {{i18n 'loading'}}...
+          {{i18n "loading"}}...
         {{/if}}
 
         <div>
           <label>
             {{input type="checkbox" checked=buffered.auto_revoke disabled=readOnly}}
-            {{i18n 'admin.badges.auto_revoke'}}
+            {{i18n "admin.badges.auto_revoke"}}
           </label>
         </div>
 
         <div>
           <label>
             {{input type="checkbox" checked=buffered.target_posts disabled=readOnly}}
-            {{i18n 'admin.badges.target_posts'}}
+            {{i18n "admin.badges.target_posts"}}
           </label>
         </div>
 
         <div>
-          <label for="trigger">{{i18n 'admin.badges.trigger'}}</label>
+          <label for="trigger">{{i18n "admin.badges.trigger"}}</label>
           {{combo-box
             name="trigger"
             value=buffered.trigger
@@ -122,46 +122,46 @@
     <div>
       <label>
         {{input type="checkbox" checked=buffered.allow_title}}
-        {{i18n 'admin.badges.allow_title'}}
+        {{i18n "admin.badges.allow_title"}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.multiple_grant disabled=readOnly}}
-        {{i18n 'admin.badges.multiple_grant'}}
+        {{i18n "admin.badges.multiple_grant"}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.listable disabled=readOnly}}
-        {{i18n 'admin.badges.listable'}}
+        {{i18n "admin.badges.listable"}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.show_posts disabled=readOnly}}
-        {{i18n 'admin.badges.show_posts'}}
+        {{i18n "admin.badges.show_posts"}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.enabled}}
-        {{i18n 'admin.badges.enabled'}}
+        {{i18n "admin.badges.enabled"}}
       </label>
     </div>
 
-    <div class='buttons'>
+    <div class="buttons">
       {{d-button
         class="btn-primary"
         action=(action "save")
         type="submit"
         disabled=saving
         label="admin.badges.save"}}
-      <span class='saving'>{{savingStatus}}</span>
+      <span class="saving">{{savingStatus}}</span>
       {{#unless readOnly}}
         {{d-button
           action=(action "destroy")
@@ -176,7 +176,7 @@
 {{#if grant_count}}
   <div class="content-body current-badge-actions">
     <div>
-      {{#link-to 'badges.show' this}}{{i18n 'badges.granted' count=grant_count}}{{/link-to}}
+      {{#link-to "badges.show" this}}{{i18n "badges.granted" count=grant_count}}{{/link-to}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/templates/badges.hbs
index f5ff6c7a0d..82d77418d3 100644
--- a/app/assets/javascripts/admin/templates/badges.hbs
+++ b/app/assets/javascripts/admin/templates/badges.hbs
@@ -1,26 +1,26 @@
 <div class="badges">
   <div class="badges-header">
-    <h3 class="badges-heading">{{i18n 'admin.badges.title'}}</h3>
+    <h3 class="badges-heading">{{i18n "admin.badges.title"}}</h3>
     <div class="create-new-badge">
-      {{#link-to 'adminBadges.show' 'new' class="btn btn-primary"}}
+      {{#link-to "adminBadges.show" "new" class="btn btn-primary"}}
         {{d-icon "plus"}}
-        <span>{{i18n 'admin.badges.new'}}</span>
+        <span>{{i18n "admin.badges.new"}}</span>
       {{/link-to}}
 
-      {{#link-to 'adminBadges.award' 'new' class="btn"}}
+      {{#link-to "adminBadges.award" "new" class="btn"}}
         {{d-icon "upload"}}
-        <span>{{i18n 'admin.badges.mass_award.title'}}</span>
+        <span>{{i18n "admin.badges.mass_award.title"}}</span>
       {{/link-to}}
     </div>
   </div>
-  <div class='content-list'>
+  <div class="content-list">
     <ul class="admin-badge-list">
       {{#each model as |badge|}}
         <li class="admin-badge-list-item">
           {{#link-to selectedRoute badge.id}}
             {{badge-button badge=badge}}
             {{#if badge.newBadge}}
-              <span class="list-badge">{{i18n 'filters.new.lower_title'}}</span>
+              <span class="list-badge">{{i18n "filters.new.lower_title"}}</span>
             {{/if}}
           {{/link-to}}
         </li>
diff --git a/app/assets/javascripts/admin/templates/components/ace-editor.hbs b/app/assets/javascripts/admin/templates/components/ace-editor.hbs
index c837b2b34e..b5e30e5323 100644
--- a/app/assets/javascripts/admin/templates/components/ace-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/ace-editor.hbs
@@ -1 +1 @@
-<div class='ace'>{{content}}</div>
+<div class="ace">{{content}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs b/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs
index 05250286a8..7377a782b9 100644
--- a/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs
@@ -1,5 +1,5 @@
-<div class='field'>{{i18n name}}</div>
-<div class='value'>
+<div class="field">{{i18n name}}</div>
+<div class="value">
   {{#if editing}}
     {{text-field value=buffer autofocus="autofocus" autocomplete="discourse"}}
   {{else}}
@@ -8,10 +8,10 @@
     </a>
   {{/if}}
 </div>
-<div class='controls'>
+<div class="controls">
   {{#if editing}}
     {{d-button class="btn-default" action=(action "save") label="admin.user_fields.save"}}
-    <a href {{action "edit"}}>{{i18n 'cancel'}}</a>
+    <a href {{action "edit"}}>{{i18n "cancel"}}</a>
   {{else}}
     {{d-button class="btn-default" action=(action "edit") icon="pencil-alt"}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-form-row.hbs b/app/assets/javascripts/admin/templates/components/admin-form-row.hbs
index aee95b6701..4d1163f95e 100644
--- a/app/assets/javascripts/admin/templates/components/admin-form-row.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-form-row.hbs
@@ -1,11 +1,11 @@
-<div class='form-element label-area'>
+<div class="form-element label-area">
   {{#if label}}
     <label>{{i18n label}}</label>
   {{else}}
     &nbsp;
   {{/if}}
 </div>
-<div class='form-element input-area'>
+<div class="form-element input-area">
   {{#if wrapLabel}}
     <label>{{yield}}</label>
   {{else}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-nav.hbs b/app/assets/javascripts/admin/templates/components/admin-nav.hbs
index eb705949e5..24ea6ca9b9 100644
--- a/app/assets/javascripts/admin/templates/components/admin-nav.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-nav.hbs
@@ -1,4 +1,4 @@
-<div class='admin-controls'>
+<div class="admin-controls">
   <nav>
     <ul class="nav nav-pills">
       {{yield}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index 246d23be25..9a8986e9e6 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -1,7 +1,7 @@
 {{#if showBackupStats}}
   <div class="backups">
     <h3 class="storage-stats-title">
-      <a href={{get-url '/admin/backups'}}>{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
+      <a href={{get-url "/admin/backups"}}>{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
     </h3>
     <p>
       {{#if backupStats.free_bytes}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
index 8188fb3abd..dca6767298 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
@@ -25,7 +25,7 @@
     {{#if showTotalForSample}}
       <tr class="total-row">
         <td colspan={{totalsForSample.length}}>
-          {{i18n 'admin.dashboard.reports.totals_for_sample'}}
+          {{i18n "admin.dashboard.reports.totals_for_sample"}}
         </td>
       </tr>
       <tr class="admin-report-table-row">
@@ -40,7 +40,7 @@
     {{#if showTotal}}
       <tr class="total-row">
         <td colspan="2">
-          {{i18n 'admin.dashboard.reports.total'}}
+          {{i18n "admin.dashboard.reports.total"}}
         </td>
       </tr>
       <tr class="admin-report-table-row">
@@ -52,7 +52,7 @@
     {{#if showAverage}}
       <tr class="total-row">
         <td colspan="2">
-          {{i18n 'admin.dashboard.reports.average_for_sample'}}
+          {{i18n "admin.dashboard.reports.average_for_sample"}}
         </td>
       </tr>
       <tr class="admin-report-table-row">
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs
index 3db7af1daa..ddd2282a16 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs
@@ -1,6 +1,6 @@
 <td class="title">{{report.title}}</td>
-<td class="value">{{#link-to 'adminUsersList.show' 'newuser'}}{{number (value-at-tl report.data level="0")}}{{/link-to}}</td>
-<td class="value">{{#link-to 'adminUsersList.show' 'basic'}}{{number (value-at-tl report.data level="1")}}{{/link-to}}</td>
-<td class="value">{{#link-to 'adminUsersList.show' 'member'}}{{number (value-at-tl report.data level="2")}}{{/link-to}}</td>
-<td class="value">{{#link-to 'adminUsersList.show' 'regular'}}{{number (value-at-tl report.data level="3")}}{{/link-to}}</td>
-<td class="value">{{#link-to 'adminUsersList.show' 'leader'}}{{number (value-at-tl report.data level="4")}}{{/link-to}}</td>
+<td class="value">{{#link-to "adminUsersList.show" "newuser"}}{{number (value-at-tl report.data level="0")}}{{/link-to}}</td>
+<td class="value">{{#link-to "adminUsersList.show" "basic"}}{{number (value-at-tl report.data level="1")}}{{/link-to}}</td>
+<td class="value">{{#link-to "adminUsersList.show" "member"}}{{number (value-at-tl report.data level="2")}}{{/link-to}}</td>
+<td class="value">{{#link-to "adminUsersList.show" "regular"}}{{number (value-at-tl report.data level="3")}}{{/link-to}}</td>
+<td class="value">{{#link-to "adminUsersList.show" "leader"}}{{number (value-at-tl report.data level="4")}}{{/link-to}}</td>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 15d7314622..eeb7894099 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -132,7 +132,7 @@
           {{#if showDatesOptions}}
             <div class="control">
               <span class="label">
-                {{i18n 'admin.dashboard.reports.start_date'}}
+                {{i18n "admin.dashboard.reports.start_date"}}
               </span>
 
               <div class="input">
@@ -145,7 +145,7 @@
 
             <div class="control">
               <span class="label">
-                {{i18n 'admin.dashboard.reports.end_date'}}
+                {{i18n "admin.dashboard.reports.end_date"}}
               </span>
 
               <div class="input">
diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
index 3f9e09eec8..3ebd8f2c86 100644
--- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
@@ -1,6 +1,6 @@
-<div class='edit-main-nav admin-controls'>
+<div class="edit-main-nav admin-controls">
   <nav>
-    <ul class='nav nav-pills target'>
+    <ul class="nav nav-pills target">
       {{#each visibleTargets as |target|}}
         <li>
           {{#link-to editRouteName
@@ -9,11 +9,11 @@
             fieldName
             replace=true
             title=field.title
-            class=(if target.edited 'edited' 'blank')
+            class=(if target.edited "edited" "blank")
           }}
-            {{#if target.error}}{{d-icon 'exclamation-triangle'}}{{/if}}
+            {{#if target.error}}{{d-icon "exclamation-triangle"}}{{/if}}
             {{#if target.icon}}{{d-icon target.icon}}{{/if}}
-            {{i18n (concat 'admin.customize.theme.' target.name)}}
+            {{i18n (concat "admin.customize.theme." target.name)}}
           {{/link-to}}
         </li>
       {{/each}}
@@ -21,9 +21,9 @@
       {{#if allowAdvanced}}
         <li>
           <a {{action "toggleShowAdvanced"}}
-            class='no-text'
             href
-            title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}>
+            title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}
+            class="no-text">
             {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
           </a>
         </li>
@@ -32,16 +32,16 @@
       <li>
         <label>
           {{input type="checkbox" checked=onlyOverridden click=(action "onlyOverriddenChanged" value="target.checked")}}
-          {{i18n 'admin.customize.theme.hide_unused_fields'}}
+          {{i18n "admin.customize.theme.hide_unused_fields"}}
         </label>
       </li>
     </ul>
   </nav>
 </div>
 
-<div class='admin-controls'>
+<div class="admin-controls">
   <nav>
-    <ul class='nav nav-pills fields'>
+    <ul class="nav nav-pills fields">
       {{#each visibleFields as |field|}}
         <li>
           {{#link-to editRouteName
@@ -50,9 +50,9 @@
             field.name
             replace=true
             title=field.title
-            class=(if field.edited 'edited' 'blank')
+            class=(if field.edited "edited" "blank")
           }}
-            {{#if field.error}}{{d-icon 'exclamation-triangle'}}{{/if}}
+            {{#if field.error}}{{d-icon "exclamation-triangle"}}{{/if}}
             {{#if field.icon}}{{d-icon field.icon}}{{/if}}
             {{field.translatedName}}
           {{/link-to}}
@@ -62,7 +62,7 @@
       {{#if showAddField}}
         <li>
           {{#if addingField}}
-            {{input type=text value=newFieldName enter=(action 'addField') escape-press=(action "cancelAddField")}}
+            {{input type=text value=newFieldName enter=(action "addField") escape-press=(action "cancelAddField")}}
             {{d-button class="ok" action=(action "addField" newFieldName) icon="check"}}
             {{d-button class="cancel" action=(action "cancelAddField") icon="times"}}
           {{else}}
@@ -73,7 +73,7 @@
         </li>
       {{/if}}
 
-      <li class='spacer'></li>
+      <li class="spacer"></li>
       <li>
         <a href {{action "toggleMaximize"}} class="no-text">
           {{d-icon maximizeIcon}}
@@ -84,7 +84,7 @@
 </div>
 
 {{#if error}}
-  <pre class='field-error'>{{error}}</pre>
+  <pre class="field-error">{{error}}</pre>
 {{/if}}
 
 {{ace-editor content=activeSection editorId=editorId mode=activeSectionMode autofocus="true"}}
diff --git a/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
index cb8311a4e3..1160a25213 100644
--- a/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
@@ -3,7 +3,7 @@
     <div class="section-title">
       <h2>
         {{d-icon "heart"}}
-        {{i18n 'admin.dashboard.problems_found'}}
+        {{i18n "admin.dashboard.problems_found"}}
       </h2>
     </div>
 
@@ -19,7 +19,7 @@
 
         <p class="actions">
           {{d-button action=refreshProblems class="btn-default" icon="sync" label="admin.dashboard.refresh_problems"}}
-          {{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}
+          {{i18n "admin.dashboard.last_checked"}}: {{problemsTimestamp}}
         </p>
       {{/conditional-loading-section}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/components/email-styles-editor.hbs b/app/assets/javascripts/admin/templates/components/email-styles-editor.hbs
index e03feb7cb7..742c71a5b3 100644
--- a/app/assets/javascripts/admin/templates/components/email-styles-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/email-styles-editor.hbs
@@ -1,9 +1,9 @@
-<div class='row'>
-  <div class='admin-controls'>
+<div class="row">
+  <div class="admin-controls">
     <nav>
-      <ul class='nav nav-pills'>
-        <li>{{#link-to 'adminCustomizeEmailStyle.edit' 'html' replace=true}}{{i18n 'admin.customize.email_style.html'}}{{/link-to}}</li>
-        <li>{{#link-to 'adminCustomizeEmailStyle.edit' 'css' replace=true}}{{i18n 'admin.customize.email_style.css'}}{{/link-to}}</li>
+      <ul class="nav nav-pills">
+        <li>{{#link-to "adminCustomizeEmailStyle.edit" "html" replace=true}}{{i18n "admin.customize.email_style.html"}}{{/link-to}}</li>
+        <li>{{#link-to "adminCustomizeEmailStyle.edit" "css" replace=true}}{{i18n "admin.customize.email_style.css"}}{{/link-to}}</li>
       </ul>
     </nav>
   </div>
@@ -11,10 +11,10 @@
 
 {{ace-editor content=editorContents mode=currentEditorMode editorId=editorId}}
 
-<div class='admin-footer'>
-  <div class='buttons'>
-    {{#d-button action=(action "reset") disabled=resetDisabled class='btn-default'}}
-      {{i18n 'admin.customize.email_style.reset'}}
+<div class="admin-footer">
+  <div class="buttons">
+    {{#d-button action=(action "reset") disabled=resetDisabled class="btn-default"}}
+      {{i18n "admin.customize.email_style.reset"}}
     {{/d-button}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
index 393cf15165..9c418be5eb 100644
--- a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
@@ -30,6 +30,6 @@
   <td><div class="label">{{i18n "admin.embedding.category"}}</div>{{category-badge host.category}}</td>
   <td class="controls">
     {{d-button icon="pencil-alt" action=(action "edit")}}
-    {{d-button icon="far-trash-alt" action=(action "delete") class='btn-danger'}}
+    {{d-button icon="far-trash-alt" action=(action "delete") class="btn-danger"}}
   </td>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/embedding-setting.hbs b/app/assets/javascripts/admin/templates/components/embedding-setting.hbs
index eb63c40af9..5ac27a9981 100644
--- a/app/assets/javascripts/admin/templates/components/embedding-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/embedding-setting.hbs
@@ -8,4 +8,4 @@
   {{input value=value id=inputId placeholder=placeholder}}
 {{/if}}
 
-<div class='clearfix'></div>
+<div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs b/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs
index 62224b13c1..78b30290ee 100644
--- a/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs
+++ b/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs
@@ -1,11 +1,11 @@
-<div class='flagged-by'>
-  <div class='user-list-title'>
+<div class="flagged-by">
+  <div class="user-list-title">
     {{i18n "admin.flags.flagged_by"}}
   </div>
-  <div class='flag-users'>
+  <div class="flag-users">
     {{#each flaggedPost.post_actions as |postAction|}}
       {{#flag-user user=postAction.user date=postAction.created_at}}
-        <div class='flagger-flag-type'>
+        <div class="flagger-flag-type">
           {{post-action-title postAction.post_action_type_id postAction.name_key}}
         </div>
         {{user-flag-percentage
@@ -18,11 +18,11 @@
 </div>
 
 {{#if showResolvedBy}}
-  <div class='flagged-post-resolved-by'>
-    <div class='user-list-title'>
+  <div class="flagged-post-resolved-by">
+    <div class="user-list-title">
       {{i18n "admin.flags.resolved_by"}}
     </div>
-    <div class='flag-users'>
+    <div class="flag-users">
       {{#each flaggedPost.post_actions as |postAction|}}
         {{#flag-user user=postAction.disposed_by date=postAction.disposed_at}}
           {{disposition-icon postAction.disposition}}
diff --git a/app/assets/javascripts/admin/templates/components/flag-user.hbs b/app/assets/javascripts/admin/templates/components/flag-user.hbs
index a6a4ce0f95..0662859c2d 100644
--- a/app/assets/javascripts/admin/templates/components/flag-user.hbs
+++ b/app/assets/javascripts/admin/templates/components/flag-user.hbs
@@ -1,17 +1,17 @@
-<div class='flag-user'>
-  {{#link-to 'adminUser' user.id user.username class='flag-user-avatar'}}
+<div class="flag-user">
+  {{#link-to "adminUser" user.id user.username class="flag-user-avatar"}}
     {{avatar user imageSize="small"}}
   {{/link-to}}
-  <div class='flag-user-details'>
-    <div class='flag-user-who'>
-      {{#link-to 'adminUser' user.id user.username class="flag-user-username"}}
+  <div class="flag-user-details">
+    <div class="flag-user-who">
+      {{#link-to "adminUser" user.id user.username class="flag-user-username"}}
         {{user.username}}
       {{/link-to}}
-      <div class='flag-user-date' title={{raw-date date}}>
+      <div title={{raw-date date}} class="flag-user-date">
         {{format-age date}}
       </div>
     </div>
-    <div class='flag-user-extra'>
+    <div class="flag-user-extra">
       {{yield}}
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs b/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs
index 7c8e0f280e..015cd13ad0 100644
--- a/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs
+++ b/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs
@@ -1,4 +1,4 @@
-<label class='checkbox-label'>
+<label class="checkbox-label">
   {{input type="checkbox" disabled=disabled checked=checkedInternal}}
   {{label}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
index 2697ffe8b9..a44f6837aa 100644
--- a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
@@ -1,8 +1,8 @@
 {{radio-button name="install-items" id=value value=value selection=selection}}
 <label class="radio" for={{value}}>
   {{#if showIcon}}
-    {{d-icon 'plus'}}
+    {{d-icon "plus"}}
   {{/if}}
   {{i18n label}}
 </label>
-{{d-icon 'caret-right'}}
+{{d-icon "caret-right"}}
diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
index b566df7de6..a796f09057 100644
--- a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
+++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
@@ -1,7 +1,7 @@
-<div class='penalty-post-controls'>
+<div class="penalty-post-controls">
   <label>
-    <div class='penalty-post-label'>
-      {{html-safe (i18n 'admin.user.penalty_post_actions')}}
+    <div class="penalty-post-label">
+      {{html-safe (i18n "admin.user.penalty_post_actions")}}
     </div>
   </label>
   {{combo-box
@@ -12,7 +12,7 @@
 </div>
 
 {{#if editing}}
-  <div class='penalty-post-edit'>
+  <div class="penalty-post-edit">
     {{textarea
       value=postEdit
       class="post-editor"}}
diff --git a/app/assets/javascripts/admin/templates/components/resumable-upload.hbs b/app/assets/javascripts/admin/templates/components/resumable-upload.hbs
index dfa89864b7..9186abcbe5 100644
--- a/app/assets/javascripts/admin/templates/components/resumable-upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/resumable-upload.hbs
@@ -1,3 +1,3 @@
 {{uploadingIcon}}
-<span class='ru-label'>{{text}}</span>
-<span class='ru-progress' style={{progressBar}}></span>
+<span class="ru-label">{{text}}</span>
+<span style={{progressBar}} class="ru-progress"></span>
diff --git a/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs b/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs
index 2be732079e..488c14fb5f 100644
--- a/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs
+++ b/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs
@@ -1,4 +1,4 @@
-<b>{{i18n 'admin.logs.screened_ips.form.label'}}</b>
+<b>{{i18n "admin.logs.screened_ips.form.label"}}</b>
 {{text-field value=ip_address disabled=formSubmitted class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.ip_address" autocorrect="off" autocapitalize="off"}}
 
 {{combo-box
diff --git a/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs b/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
index 88d59816fe..61683c73b0 100644
--- a/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
+++ b/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
@@ -1,4 +1,4 @@
-<div class="validation-error {{unless message 'hidden'}}">
+<div class="validation-error {{unless message "hidden"}}">
   {{d-icon "times"}}
   {{message}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index f34559ec3d..c0a37f55bb 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -1,7 +1,7 @@
-<div class='reason-controls'>
+<div class="reason-controls">
   <label>
-    <div class='silence-reason-label'>
-      {{html-safe (i18n 'admin.user.silence_reason_label')}}
+    <div class="silence-reason-label">
+      {{html-safe (i18n "admin.user.silence_reason_label")}}
     </div>
   </label>
   {{text-field
@@ -12,7 +12,7 @@
 </div>
 
 <label>
-  <div class='silence-message-label'>
+  <div class="silence-message-label">
     {{i18n "admin.user.silence_message"}}
   </div>
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs b/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs
index a9ea9cea09..a3358b195b 100644
--- a/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs
@@ -1,5 +1,5 @@
 <section class="field">
-  <b>{{i18n 'admin.customize.enabled'}}</b>: {{change.enabled}}
+  <b>{{i18n "admin.customize.enabled"}}</b>: {{change.enabled}}
 </section>
 
 {{site-customization-change-field field=change.stylesheet name="admin.customize.css"}}
diff --git a/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs b/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs
index 65fb3b3b66..b11022cb3c 100644
--- a/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs
@@ -1,6 +1,6 @@
 {{#if field}}
   <section class="field">
-    <b>{{i18n name}}</b>: ({{i18n 'character_count' count=field.length}})
+    <b>{{i18n name}}</b>: ({{i18n "character_count" count=field.length}})
     <br>
     {{textarea value=field class="plain"}}
   </section>
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 6984723cd6..88f9919692 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -1,14 +1,14 @@
-<div class='setting-label'>
+<div class="setting-label">
   <h3>{{settingName}}</h3>
   {{#if defaultIsAvailable}}
-    <a href onClick={{action 'setDefaultValues'}}>{{setting.setDefaultValuesLabel}}</a>
+    <a href onClick={{action "setDefaultValues"}}>{{setting.setDefaultValuesLabel}}</a>
   {{/if}}
 </div>
 <div class="setting-value">
   {{component componentName setting=setting value=buffered.value validationMessage=validationMessage preview=preview isSecret=isSecret allowAny=allowAny}}
 </div>
 {{#if dirty}}
-  <div class='setting-controls'>
+  <div class="setting-controls">
     {{d-button class="ok" action=(action "update") icon="check"}}
     {{d-button class="cancel" action=(action "cancel") icon="times"}}
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index b9609e2843..a551fd9f12 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -3,5 +3,5 @@
   onChange=(action "onChangeSelectedCategories")
 }}
 
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
index 4358b408de..80a793834e 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
@@ -4,4 +4,4 @@
   onChange=(action (mut value))
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
index 1e7e369b93..4d37e15e87 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
@@ -8,4 +8,4 @@
 }}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index 0b4104086e..265301db6a 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -14,6 +14,6 @@
 
 {{setting-validation-message message=validationMessage}}
 
-<div class='desc'>
+<div class="desc">
   {{html-safe setting.description}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
index 091573eb53..9ad465c8d4 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
@@ -7,4 +7,4 @@
   onChange=(action "onChangeGroupListSetting")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
index 70366aba38..d1486292dd 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_host"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
index 090cc2a5f1..753b9ba987 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value inputDelimiter="|" choices=setting.choices}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
index 7451959841..08b9992e88 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
@@ -1,3 +1,3 @@
 {{secret-value-list setting=setting values=value isSecret=isSecret}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index 160f041df9..91106e9bdd 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -7,4 +7,4 @@
 {{/if}}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 1fb69c595b..f7519e770d 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
 {{tag-chooser tags=selectedTags allowCreate=false}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
index 2758b7be5a..652f773f36 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
@@ -1,2 +1,2 @@
 {{site-settings-image-uploader imageUrl=value placeholderUrl=setting.placeholder type="site_setting"}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
index 146c9d3722..bf8148800c 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,2 +1,2 @@
 {{d-button label="admin.site_settings.uploaded_image_list.label" action=(action "showUploadModal") actionParam=(hash value=value setting=setting)}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
index 7a6cdc517b..7d22100489 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_url"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
index 234ec83f3c..52a0fcc5c9 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-text-summary.hbs b/app/assets/javascripts/admin/templates/components/site-text-summary.hbs
index c0c7063309..42323a1834 100644
--- a/app/assets/javascripts/admin/templates/components/site-text-summary.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-text-summary.hbs
@@ -1,5 +1,5 @@
-{{d-button label="admin.site_text.edit" class='btn-default edit' action=editAction actionParam=siteText}}
-<h3 class='site-text-id'>{{siteText.id}}</h3>
-<div class='site-text-value'>{{siteText.value}}</div>
+{{d-button label="admin.site_text.edit" class="btn-default edit" action=editAction actionParam=siteText}}
+<h3 class="site-text-id">{{siteText.id}}</h3>
+<div class="site-text-value">{{siteText.value}}</div>
 
-<div class='clearfix'></div>
+<div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
index 70968ae746..b7ed0428d3 100644
--- a/app/assets/javascripts/admin/templates/components/suspension-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -1,10 +1,10 @@
-<div class='reason-controls'>
+<div class="reason-controls">
   <label>
-    <div class='suspend-reason-label'>
+    <div class="suspend-reason-label">
       {{#if siteSettings.hide_suspension_reasons}}
-        {{html-safe (i18n 'admin.user.suspend_reason_hidden_label')}}
+        {{html-safe (i18n "admin.user.suspend_reason_hidden_label")}}
       {{else}}
-        {{html-safe (i18n 'admin.user.suspend_reason_label')}}
+        {{html-safe (i18n "admin.user.suspend_reason_label")}}
       {{/if}}
     </div>
   </label>
@@ -15,7 +15,7 @@
 </div>
 
 <label>
-  <div class='suspend-message-label'>
+  <div class="suspend-message-label">
     {{i18n "admin.user.suspend_message"}}
   </div>
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/tags-uploader.hbs b/app/assets/javascripts/admin/templates/components/tags-uploader.hbs
index 62e353810f..1531feb677 100644
--- a/app/assets/javascripts/admin/templates/components/tags-uploader.hbs
+++ b/app/assets/javascripts/admin/templates/components/tags-uploader.hbs
@@ -1,6 +1,6 @@
-<label class="btn {{if addDisabled 'disabled'}}">
+<label class="btn {{if addDisabled "disabled"}}">
   {{d-icon "upload"}}
-  {{i18n 'admin.watched_words.form.upload'}}
+  {{i18n "admin.watched_words.form.upload"}}
   <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain,text/csv">
 </label>
-<span class="instructions">{{i18n 'tagging.upload_instructions'}}</span>
+<span class="instructions">{{i18n "tagging.upload_instructions"}}</span>
diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
index 0c253e0214..c829fe887d 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
@@ -1,5 +1,5 @@
 <div class="inner-wrapper">
-  {{plugin-outlet name="admin-customize-themes-list-item" connectorTagName='span' args=(hash theme=theme)}}
+  {{plugin-outlet name="admin-customize-themes-list-item" connectorTagName="span" args=(hash theme=theme)}}
 
   <div class="info">
     <span class="name">
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
index 2bfbc8843b..a02fb2f2ce 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -2,13 +2,13 @@
   {{d-button
     action=(action "changeView")
     actionParam=THEMES
-    class=(concat "themes-tab " "tab " (if themesTabActive 'btn-danger active' ''))
+    class=(concat "themes-tab " "tab " (if themesTabActive "btn-danger active" ""))
     label="admin.customize.theme.title"
   }}
   {{d-button
     action=(action "changeView")
     actionParam=COMPONENTS
-    class=(concat "components-tab " "tab " (if componentsTabActive 'btn-danger active' ''))
+    class=(concat "components-tab " "tab " (if componentsTabActive "btn-danger active" ""))
     label="admin.customize.theme.components"
     icon="puzzle-piece"
   }}
diff --git a/app/assets/javascripts/admin/templates/components/value-list.hbs b/app/assets/javascripts/admin/templates/components/value-list.hbs
index a5ade53ee0..853daac745 100644
--- a/app/assets/javascripts/admin/templates/components/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/value-list.hbs
@@ -1,7 +1,7 @@
 {{#if collection}}
-  <div class='values'>
+  <div class="values">
     {{#each collection as |value index|}}
-      <div class='value' data-index={{index}}>
+      <div data-index={{index}} class="value">
         {{d-button
           action=(action "removeValue")
           actionParam=value
diff --git a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
index 13454f21a5..0aa201b602 100644
--- a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
+++ b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
@@ -1,4 +1,4 @@
-<b>{{i18n 'admin.watched_words.form.label'}}</b>
+<b>{{i18n "admin.watched_words.form.label"}}</b>
 {{text-field value=word disabled=formSubmitted class="watched-word-input" autocorrect="off" autocapitalize="off" placeholderKey=placeholderKey}}
 {{d-button class="btn-default" action=(action "submit") disabled=formSubmitted label="admin.watched_words.form.add"}}
 
diff --git a/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs b/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
index 3b9518186a..5d92bcc409 100644
--- a/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
+++ b/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
@@ -1,6 +1,6 @@
-<label class="btn btn-default {{if addDisabled 'disabled'}}">
+<label class="btn btn-default {{if addDisabled "disabled"}}">
   {{d-icon "upload"}}
-  {{i18n 'admin.watched_words.form.upload'}}
+  {{i18n "admin.watched_words.form.upload"}}
   <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain">
 </label>
-<span class="instructions">{{i18n 'admin.watched_words.one_word_per_line'}}</span>
+<span class="instructions">{{i18n "admin.watched_words.one_word_per_line"}}</span>
diff --git a/app/assets/javascripts/admin/templates/customize-colors-index.hbs b/app/assets/javascripts/admin/templates/customize-colors-index.hbs
index 62bbb7a8fc..25788d42d4 100644
--- a/app/assets/javascripts/admin/templates/customize-colors-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors-index.hbs
@@ -1 +1 @@
-<p class="about">{{i18n 'admin.customize.colors.about'}}</p>
+<p class="about">{{i18n "admin.customize.colors.about"}}</p>
diff --git a/app/assets/javascripts/admin/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
index 825095909e..b360a1c26b 100644
--- a/app/assets/javascripts/admin/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
@@ -33,16 +33,16 @@
           label="admin.customize.delete"
         }}
       {{/if}}
-      <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
+      <span class="saving {{unless model.savingStatus "hidden"}}">{{model.savingStatus}}</span>
     </div>
 
     <br>
 
-    <div class='admin-controls'>
-      <div class='search controls'>
+    <div class="admin-controls">
+      <div class="search controls">
         <label>
           {{input type="checkbox" checked=onlyOverridden}}
-          {{i18n 'admin.settings.show_overriden'}}
+          {{i18n "admin.settings.show_overriden"}}
         </label>
       </div>
     </div>
@@ -52,13 +52,13 @@
         <thead>
           <tr>
             <th></th>
-            <th class="hex">{{i18n 'admin.customize.color'}}</th>
+            <th class="hex">{{i18n "admin.customize.color"}}</th>
             <th></th>
           </tr>
         </thead>
         <tbody>
           {{#each colors as |c|}}
-            <tr class="{{if c.changed 'changed'}} {{if c.valid 'valid' 'invalid'}}">
+            <tr class="{{if c.changed "changed"}} {{if c.valid "valid" "invalid"}}">
               <td class="name" title={{c.name}}>
                 <h3>{{c.translatedName}}</h3>
                 <p class="description">{{c.description}}</p>
@@ -83,7 +83,7 @@
         </tbody>
       </table>
     {{else}}
-      <p>{{i18n 'search.no_results'}}</p>
+      <p>{{i18n "search.no_results"}}</p>
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/customize-email-style-edit.hbs b/app/assets/javascripts/admin/templates/customize-email-style-edit.hbs
index 1e68fd0c1a..17baf19938 100644
--- a/app/assets/javascripts/admin/templates/customize-email-style-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-email-style-edit.hbs
@@ -1,8 +1,8 @@
 {{email-styles-editor styles=model fieldName=fieldName}}
 
-<div class='admin-footer'>
-  <div class='buttons'>
-    {{#d-button action=(action "save") disabled=saveDisabled class='btn-primary'}}
+<div class="admin-footer">
+  <div class="buttons">
+    {{#d-button action=(action "save") disabled=saveDisabled class="btn-primary"}}
       {{saveButtonText}}
     {{/d-button}}
   </div>
diff --git a/app/assets/javascripts/admin/templates/customize-email-style.hbs b/app/assets/javascripts/admin/templates/customize-email-style.hbs
index d46e732603..2904742035 100644
--- a/app/assets/javascripts/admin/templates/customize-email-style.hbs
+++ b/app/assets/javascripts/admin/templates/customize-email-style.hbs
@@ -1,7 +1,7 @@
-<div class='row'>
-  <h2>{{i18n 'admin.customize.email_style.heading'}}</h2>
+<div class="row">
+  <h2>{{i18n "admin.customize.email_style.heading"}}</h2>
 
-  <p>{{i18n 'admin.customize.email_style.instructions'}}</p>
+  <p>{{i18n "admin.customize.email_style.instructions"}}</p>
 </div>
 
 {{outlet}}
diff --git a/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs b/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs
index 4b80de8718..61abefaa72 100644
--- a/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs
@@ -1,7 +1,7 @@
-<div class='email-template'>
+<div class="email-template">
   <label>{{i18n "admin.customize.email_templates.subject"}}</label>
   {{#if hasMultipleSubjects}}
-    <h3>{{#link-to 'adminSiteText' (query-params q=hasMultipleSubjects)}}{{i18n "admin.customize.email_templates.multiple_subjects"}}{{/link-to}}</h3>
+    <h3>{{#link-to "adminSiteText" (query-params q=hasMultipleSubjects)}}{{i18n "admin.customize.email_templates.multiple_subjects"}}{{/link-to}}</h3>
   {{else}}
     {{input value=buffered.subject}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index 5f6d29e953..31ad084c23 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -1,28 +1,28 @@
-<div class="current-style {{if maximized 'maximized'}}">
-  <div class='wrapper'>
-    <h2>{{i18n 'admin.customize.theme.edit_css_html'}} {{#link-to showRouteName model.id replace=true}}{{model.name}}{{/link-to}}</h2>
+<div class="current-style {{if maximized "maximized"}}">
+  <div class="wrapper">
+    <h2>{{i18n "admin.customize.theme.edit_css_html"}} {{#link-to showRouteName model.id replace=true}}{{model.name}}{{/link-to}}</h2>
 
     {{admin-theme-editor
       theme=model
       editRouteName=editRouteName
       currentTargetName=currentTargetName
       fieldName=fieldName
-      fieldAdded=(action 'fieldAdded')
+      fieldAdded=(action "fieldAdded")
       maximized=maximized
-      onlyOverriddenChanged=(action 'onlyOverriddenChanged')
+      onlyOverriddenChanged=(action "onlyOverriddenChanged")
     }}
 
-    <div class='admin-footer'>
-      <div class='status-actions'>
+    <div class="admin-footer">
+      <div class="status-actions">
         {{#unless model.changed}}
-          <a class='preview-link' href={{previewUrl}} rel="noopener" target='_blank' title={{i18n 'admin.customize.explain_preview'}}>
-            {{i18n 'admin.customize.preview'}}
+          <a href={{previewUrl}} rel="noopener" title={{i18n "admin.customize.explain_preview"}} class="preview-link" target="_blank">
+            {{i18n "admin.customize.preview"}}
           </a>
         {{/unless}}
       </div>
 
-      <div class='buttons'>
-        {{#d-button action=(action "save") disabled=saveDisabled class='btn-primary'}}
+      <div class="buttons">
+        {{#d-button action=(action "save") disabled=saveDisabled class="btn-primary"}}
           {{saveButtonText}}
         {{/d-button}}
       </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index ed4dcf0eb1..c391701c15 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -45,7 +45,7 @@
         {{i18n "admin.customize.theme.disabled"}}
       {{/if}}
       {{d-button
-        class='btn-default'
+        class="btn-default"
         action=(action "enableComponent")
         icon="check"
         label="admin.customize.theme.enable"}}
@@ -97,31 +97,31 @@
         {{/if}}
 
         {{#if model.remote_theme.commits_behind}}
-          {{#d-button action=(action "updateToLatest") icon="download" class='btn-primary'}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}}
+          {{#d-button action=(action "updateToLatest") icon="download" class="btn-primary"}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}}
         {{else}}
           {{#d-button action=(action "checkForThemeUpdates") icon="sync" class="btn-default"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}}
         {{/if}}
 
-        <span class='status-message'>
+        <span class="status-message">
           {{#if updatingRemote}}
-            {{i18n 'admin.customize.theme.updating'}}
+            {{i18n "admin.customize.theme.updating"}}
           {{else}}
             {{#if model.remote_theme.commits_behind}}
-              {{i18n 'admin.customize.theme.commits_behind' count=model.remote_theme.commits_behind}}
+              {{i18n "admin.customize.theme.commits_behind" count=model.remote_theme.commits_behind}}
               {{#if model.remote_theme.github_diff_link}}
                 <a href={{model.remote_theme.github_diff_link}}>
-                  {{i18n 'admin.customize.theme.compare_commits'}}
+                  {{i18n "admin.customize.theme.compare_commits"}}
                 </a>
               {{/if}}
             {{else}}
               {{#unless showRemoteError}}
-                {{i18n 'admin.customize.theme.up_to_date'}} {{format-date model.remote_theme.updated_at leaveAgo="true"}}
+                {{i18n "admin.customize.theme.up_to_date"}} {{format-date model.remote_theme.updated_at leaveAgo="true"}}
               {{/unless}}
             {{/if}}
           {{/if}}
         </span>
       {{else}}
-        <span class='status-message'>
+        <span class="status-message">
           {{d-icon "info-circle"}} {{i18n "admin.customize.theme.imported_from_archive"}}
         </span>
       {{/if}}
@@ -159,7 +159,7 @@
       <div class="mini-title">{{i18n "admin.customize.theme.component_of"}}</div>
       <ul>
         {{#each parentThemes as |theme|}}
-          <li>{{#link-to 'adminCustomizeThemes.show' theme replace=true}}{{theme.name}}{{/link-to}}</li>
+          <li>{{#link-to "adminCustomizeThemes.show" theme replace=true}}{{theme.name}}{{/link-to}}</li>
         {{/each}}
       </ul>
     </div>
@@ -203,11 +203,11 @@
   <div class="control-unit">
     <div class="mini-title">{{i18n "admin.customize.theme.uploads"}}</div>
     {{#if model.uploads}}
-      <ul class='removable-list'>
+      <ul class="removable-list">
         {{#each model.uploads as |upload|}}
           <li>
-            <span class='col'>${{upload.name}}: <a href={{upload.url}} rel="noopener" target='_blank'>{{upload.filename}}</a></span>
-            <span class='col'>
+            <span class="col">${{upload.name}}: <a href={{upload.url}} rel="noopener" target="_blank">{{upload.filename}}</a></span>
+            <span class="col">
               {{d-button action=(action "removeUpload") actionParam=upload class="second btn-default btn-default cancel-edit" icon="times"}}
             </span>
           </li>
@@ -241,21 +241,21 @@
     </div>
   {{/if}}
 
-  <a href={{previewUrl}} title={{i18n 'admin.customize.explain_preview'}} rel="noopener" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
-  <a class="btn btn-default export" rel="noopener" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
+  <a href={{previewUrl}} title={{i18n "admin.customize.explain_preview"}} rel="noopener" target="_blank" class="btn btn-default">{{d-icon "desktop"}}{{i18n "admin.customize.theme.preview"}}</a>
+  <a class="btn btn-default export" rel="noopener" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n "admin.export_json.button_text"}}</a>
 
   {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
 
   {{#if model.component}}
     {{#if model.enabled}}
       {{d-button
-        class='btn-default'
+        class="btn-default"
         action=(action "disableComponent")
         icon="ban"
         label="admin.customize.theme.disable"}}
     {{else}}
       {{d-button
-        class='btn-default'
+        class="btn-default"
         action=(action "enableComponent")
         icon="check"
         label="admin.customize.theme.enable"}}
diff --git a/app/assets/javascripts/admin/templates/customize.hbs b/app/assets/javascripts/admin/templates/customize.hbs
index 768eaf29a2..d017abe67f 100644
--- a/app/assets/javascripts/admin/templates/customize.hbs
+++ b/app/assets/javascripts/admin/templates/customize.hbs
@@ -1,13 +1,13 @@
 {{#admin-nav}}
-  {{nav-item route='adminCustomizeThemes' label='admin.customize.theme.title'}}
-  {{nav-item route='adminCustomize.colors' label='admin.customize.colors.title'}}
-  {{nav-item route='adminSiteText' label='admin.site_text.title'}}
-  {{nav-item route='adminCustomizeEmailTemplates' label='admin.customize.email_templates.title'}}
-  {{nav-item route='adminCustomizeEmailStyle' label='admin.customize.email_style.title'}}
-  {{nav-item route='adminUserFields' label='admin.user_fields.title'}}
-  {{nav-item route='adminEmojis' label='admin.emoji.title'}}
-  {{nav-item route='adminPermalinks' label='admin.permalink.title'}}
-  {{nav-item route='adminEmbedding' label='admin.embedding.title'}}
+  {{nav-item route="adminCustomizeThemes" label="admin.customize.theme.title"}}
+  {{nav-item route="adminCustomize.colors" label="admin.customize.colors.title"}}
+  {{nav-item route="adminSiteText" label="admin.site_text.title"}}
+  {{nav-item route="adminCustomizeEmailTemplates" label="admin.customize.email_templates.title"}}
+  {{nav-item route="adminCustomizeEmailStyle" label="admin.customize.email_style.title"}}
+  {{nav-item route="adminUserFields" label="admin.user_fields.title"}}
+  {{nav-item route="adminEmojis" label="admin.emoji.title"}}
+  {{nav-item route="adminPermalinks" label="admin.permalink.title"}}
+  {{nav-item route="adminEmbedding" label="admin.embedding.title"}}
 {{/admin-nav}}
 
 <div class="admin-container">
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index 94150fef95..2eca2b7d02 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -5,7 +5,7 @@
     <div class="period-section">
       <div class="section-title">
         <h2>
-          <a href={{get-url '/admin/dashboard/reports'}}>
+          <a href={{get-url "/admin/dashboard/reports"}}>
             {{i18n "admin.dashboard.community_health"}}
           </a>
         </h2>
@@ -76,10 +76,10 @@
             <div class="counters-list">
               <div class="counters-header">
                 <div class="counters-cell"></div>
-                <div class="counters-cell">{{i18n 'admin.dashboard.reports.today'}}</div>
-                <div class="counters-cell">{{i18n 'admin.dashboard.reports.yesterday'}}</div>
-                <div class="counters-cell">{{i18n 'admin.dashboard.reports.last_7_days'}}</div>
-                <div class="counters-cell">{{i18n 'admin.dashboard.reports.last_30_days'}}</div>
+                <div class="counters-cell">{{i18n "admin.dashboard.reports.today"}}</div>
+                <div class="counters-cell">{{i18n "admin.dashboard.reports.yesterday"}}</div>
+                <div class="counters-cell">{{i18n "admin.dashboard.reports.last_7_days"}}</div>
+                <div class="counters-cell">{{i18n "admin.dashboard.reports.last_30_days"}}</div>
               </div>
 
               {{#each activityMetrics as |metric|}}
diff --git a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
index 019ffb5990..06ae3567f6 100644
--- a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
@@ -4,7 +4,7 @@
   <div class="moderators-activity section">
     <div class="section-title">
       <h2>
-        <a href={{get-url '/admin/reports/moderators_activity'}}>
+        <a href={{get-url "/admin/reports/moderators_activity"}}>
           {{i18n "admin.dashboard.moderators_activity"}}
         </a>
       </h2>
diff --git a/app/assets/javascripts/admin/templates/dashboard_reports.hbs b/app/assets/javascripts/admin/templates/dashboard_reports.hbs
index e5660e9c50..83f3ad74eb 100644
--- a/app/assets/javascripts/admin/templates/dashboard_reports.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_reports.hbs
@@ -13,7 +13,7 @@
     <ul class="reports-list">
       {{#each filterReports as |report|}}
         <li class="report">
-          {{#link-to 'adminReports.show' report.type}}
+          {{#link-to "adminReports.show" report.type}}
             <h3 class="report-title">{{report.title}}</h3>
             {{#if report.description}}
               <p class="report-description">
diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
index fe55b11009..8e4b0cbff0 100644
--- a/app/assets/javascripts/admin/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
@@ -1,7 +1,7 @@
-<p>{{i18n 'admin.email.advanced_test.desc'}}</p>
+<p>{{i18n "admin.email.advanced_test.desc"}}</p>
 
-<div class='email-advanced-test'>
-  <label for="email">{{i18n 'admin.email.advanced_test.email'}}</label>
+<div class="email-advanced-test">
+  <label for="email">{{i18n "admin.email.advanced_test.email"}}</label>
   {{textarea name="email" value=email class="email-body"}}
   {{d-button
     action=(action "run")
@@ -13,12 +13,12 @@
   {{#if format}}
     <hr>
     <div class="text">
-      <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
+      <h3>{{i18n "admin.email.advanced_test.text"}}</h3>
       <pre class="full-reason">{{html-safe text}}</pre>
     </div>
     <hr>
     <div class="elided">
-      <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
+      <h3>{{i18n "admin.email.advanced_test.elided"}}</h3>
       <pre class="full-reason">{{html-safe elided}}</pre>
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/email-bounced.hbs b/app/assets/javascripts/admin/templates/email-bounced.hbs
index 9868012f2c..85a8ff0d27 100644
--- a/app/assets/javascripts/admin/templates/email-bounced.hbs
+++ b/app/assets/javascripts/admin/templates/email-bounced.hbs
@@ -1,16 +1,16 @@
 {{#load-more selector=".email-list tr" action=(action "loadMore")}}
-  <table class='table email-list'>
+  <table class="table email-list">
     <thead>
       <tr>
-        <th>{{i18n 'admin.email.time'}}</th>
-        <th>{{i18n 'admin.email.user'}}</th>
-        <th>{{i18n 'admin.email.to_address'}}</th>
-        <th>{{i18n 'admin.email.email_type'}}</th>
+        <th>{{i18n "admin.email.time"}}</th>
+        <th>{{i18n "admin.email.user"}}</th>
+        <th>{{i18n "admin.email.to_address"}}</th>
+        <th>{{i18n "admin.email.email_type"}}</th>
       </tr>
     </thead>
     <tbody>
       <tr class="filters">
-        <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+        <td>{{i18n "admin.email.logs.filters.title"}}</td>
         <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
         <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
         <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -21,13 +21,13 @@
           <td>{{format-date l.created_at}}</td>
           <td>
             {{#if l.user}}
-              {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
-              {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{l.user.username}}{{/link-to}}
             {{else}}
               &mdash;
             {{/if}}
           </td>
-          <td><a href='mailto:{{l.to_address}}'>{{l.to_address}}</a></td>
+          <td><a href="mailto:{{l.to_address}}">{{l.to_address}}</a></td>
           {{#if l.has_bounce_key}}
             <td><a href {{action "showIncomingEmail" l.id}}>{{l.email_type}}</a></td>
           {{else}}
@@ -36,7 +36,7 @@
         </tr>
       {{else}}
         {{#unless loading}}
-          <tr><td colspan="4">{{i18n 'admin.email.logs.none'}}</td></tr>
+          <tr><td colspan="4">{{i18n "admin.email.logs.none"}}</td></tr>
         {{/unless}}
       {{/each}}
     </tbody>
diff --git a/app/assets/javascripts/admin/templates/email-index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs
index d510b2f4fc..ddf914fee4 100644
--- a/app/assets/javascripts/admin/templates/email-index.hbs
+++ b/app/assets/javascripts/admin/templates/email-index.hbs
@@ -1,13 +1,13 @@
 <table class="table">
   <tbody>
     <tr>
-      <th>{{i18n 'admin.email.delivery_method'}}</th>
+      <th>{{i18n "admin.email.delivery_method"}}</th>
       <td>{{delivery_method}}</td>
     </tr>
 
     {{#each model.settings as |s|}}
       <tr>
-        <th style='width: 25%'>{{s.name}}</th>
+        <th style="width: 25%">{{s.name}}</th>
         <td>{{s.value}}</td>
       </tr>
     {{/each}}
@@ -15,21 +15,21 @@
 </table>
 
 <form>
-  <div class='admin-controls'>
+  <div class="admin-controls">
     {{#if sendingEmail}}
-      <div class='controls'>{{i18n 'admin.email.sending_test'}}</div>
+      <div class="controls">{{i18n "admin.email.sending_test"}}</div>
     {{else}}
-      <div class='controls'>
+      <div class="controls">
         {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
       </div>
-      <div class='controls'>
+      <div class="controls">
         {{d-button
           class="btn-primary"
           action=(action "sendTestEmail")
           disabled=sendTestEmailDisabled
           label="admin.email.send_test"
           type="submit"}}
-        {{#if sentTestEmailMessage}}<span class='result-message'>{{sentTestEmailMessage}}</span>{{/if}}
+        {{#if sentTestEmailMessage}}<span class="result-message">{{sentTestEmailMessage}}</span>{{/if}}
       </div>
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 82217bacfb..8d10ac3a8b 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -1,26 +1,26 @@
-<p>{{i18n 'admin.email.preview_digest_desc'}}</p>
+<p>{{i18n "admin.email.preview_digest_desc"}}</p>
 
-<div class='admin-controls email-preview'>
-  <div class='controls'>
-    <label for='last-seen'>{{i18n 'admin.email.last_seen_user'}}</label>
+<div class="admin-controls email-preview">
+  <div class="controls">
+    <label for="last-seen">{{i18n "admin.email.last_seen_user"}}</label>
     {{date-picker-past value=lastSeen id="last-seen"}}
-    <label>{{i18n 'admin.email.user'}}:</label>
+    <label>{{i18n "admin.email.user"}}:</label>
     {{user-selector single="true" usernames=username canReceiveUpdates=true}}
     {{d-button
       class="btn-primary digest-refresh-button"
       action=(action "refresh")
       label="admin.email.refresh"}}
     <div class="toggle">
-      <label>{{i18n 'admin.email.format'}}</label>
+      <label>{{i18n "admin.email.format"}}</label>
       {{#if showHtml}}
-        <span>{{i18n 'admin.email.html'}}</span>
+        <span>{{i18n "admin.email.html"}}</span>
          |
         <a href {{action "toggleShowHtml"}}>
-          {{i18n 'admin.email.text'}}
+          {{i18n "admin.email.text"}}
         </a>
       {{else}}
-        <a href {{action "toggleShowHtml"}}>{{i18n 'admin.email.html'}}</a> |
-        <span>{{i18n 'admin.email.text'}}</span>
+        <a href {{action "toggleShowHtml"}}>{{i18n "admin.email.html"}}</a> |
+        <span>{{i18n "admin.email.text"}}</span>
       {{/if}}
     </div>
   </div>
@@ -32,9 +32,9 @@
     {{#if showSendEmailForm}}
       <div class="controls">
         {{#if sendingEmail}}
-          {{i18n 'admin.email.sending_test'}}
+          {{i18n "admin.email.sending_test"}}
         {{else}}
-          <label>{{i18n 'admin.email.send_digest_label'}}</label>
+          <label>{{i18n "admin.email.send_digest_label"}}</label>
           {{text-field value=email placeholderKey="admin.email.test_email_address"}}
           {{d-button
             class="btn-default"
@@ -42,7 +42,7 @@
             disabled=sendEmailDisabled
             label="admin.email.send_digest"}}
           {{#if sentEmail}}
-            <span class='result-message'>{{i18n 'admin.email.sent_test'}}</span>
+            <span class="result-message">{{i18n "admin.email.sent_test"}}</span>
           {{/if}}
         {{/if}}
       </div>
@@ -51,9 +51,9 @@
     <div class="preview-output">
       {{#if showHtml}}
         {{#if htmlEmpty}}
-          <p>{{i18n 'admin.email.no_result'}}</p>
+          <p>{{i18n "admin.email.no_result"}}</p>
         {{else}}
-          <iframe title={{i18n 'admin.email.html_preview'}} srcdoc={{model.html_content}} />
+          <iframe title={{i18n "admin.email.html_preview"}} srcdoc={{model.html_content}} />
         {{/if}}
       {{else}}
         <pre>{{html-safe model.text_content}}</pre>
diff --git a/app/assets/javascripts/admin/templates/email-received.hbs b/app/assets/javascripts/admin/templates/email-received.hbs
index aff40a6601..e8632cc687 100644
--- a/app/assets/javascripts/admin/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/templates/email-received.hbs
@@ -1,17 +1,17 @@
 {{#load-more selector=".email-list tr" action=(action "loadMore")}}
-  <table class='table email-list'>
+  <table class="table email-list">
     <thead>
       <tr>
-        <th>{{i18n 'admin.email.time'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
+        <th>{{i18n "admin.email.time"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.from_address"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.to_addresses"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.subject"}}</th>
       </tr>
     </thead>
 
     <tbody>
       <tr class="filters">
-        <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+        <td>{{i18n "admin.email.logs.filters.title"}}</td>
         <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
         <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
         <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
@@ -23,7 +23,7 @@
           <td class="username">
             <div>
               {{#if email.user}}
-                {{#link-to 'adminUser' email.user}}
+                {{#link-to "adminUser" email.user}}
                   {{avatar email.user imageSize="tiny"}}
                   {{email.from_address}}
                 {{/link-to}}
@@ -49,7 +49,7 @@
           </td>
         </tr>
       {{else}}
-        <tr><td colspan="4">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
+        <tr><td colspan="4">{{i18n "admin.email.incoming_emails.none"}}</td></tr>
       {{/each}}
     </tbody>
   </table>
diff --git a/app/assets/javascripts/admin/templates/email-rejected.hbs b/app/assets/javascripts/admin/templates/email-rejected.hbs
index 9cc9710660..2338af8d15 100644
--- a/app/assets/javascripts/admin/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/templates/email-rejected.hbs
@@ -1,18 +1,18 @@
 {{#load-more selector=".email-list tr" action=(action "loadMore")}}
-  <table class='table email-list'>
+  <table class="table email-list">
     <thead>
       <tr>
-        <th>{{i18n 'admin.email.time'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.error'}}</th>
+        <th>{{i18n "admin.email.time"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.from_address"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.to_addresses"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.subject"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.error"}}</th>
       </tr>
     </thead>
 
     <tbody>
       <tr class="filters">
-        <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+        <td>{{i18n "admin.email.logs.filters.title"}}</td>
         <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
         <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
         <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
@@ -25,13 +25,13 @@
           <td class="username">
             <div>
               {{#if email.user}}
-                {{#link-to 'adminUser' email.user}}
+                {{#link-to "adminUser" email.user}}
                   {{avatar email.user imageSize="tiny"}}
                   {{email.from_address}}
                 {{/link-to}}
               {{else}}
                 {{#if email.from_address}}
-                  <a href='mailto:{{email.from_address}}'>{{email.from_address}}</a>
+                  <a href="mailto:{{email.from_address}}">{{email.from_address}}</a>
                 {{else}}
                   &mdash;
                 {{/if}}
@@ -52,7 +52,7 @@
           </td>
         </tr>
       {{else}}
-        <tr><td colspan="5">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
+        <tr><td colspan="5">{{i18n "admin.email.incoming_emails.none"}}</td></tr>
       {{/each}}
     </tbody>
   </table>
diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index 633b81cb3d..ab0afaaf2d 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -1,17 +1,17 @@
 {{#load-more selector=".email-list tr" action=(action "loadMore")}}
-  <table class='table email-list'>
+  <table class="table email-list">
     <thead>
       <tr>
-        <th>{{i18n 'admin.email.sent_at'}}</th>
-        <th>{{i18n 'admin.email.user'}}</th>
-        <th>{{i18n 'admin.email.to_address'}}</th>
-        <th>{{i18n 'admin.email.email_type'}}</th>
-        <th>{{i18n 'admin.email.reply_key'}}</th>
+        <th>{{i18n "admin.email.sent_at"}}</th>
+        <th>{{i18n "admin.email.user"}}</th>
+        <th>{{i18n "admin.email.to_address"}}</th>
+        <th>{{i18n "admin.email.email_type"}}</th>
+        <th>{{i18n "admin.email.reply_key"}}</th>
       </tr>
     </thead>
     <tbody>
       <tr class="filters">
-        <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+        <td>{{i18n "admin.email.logs.filters.title"}}</td>
         <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
         <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
         <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -23,29 +23,29 @@
           <td>{{format-date l.created_at}}</td>
           <td>
             {{#if l.user}}
-              {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
-              {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{l.user.username}}{{/link-to}}
             {{else}}
               &mdash;
             {{/if}}
           </td>
           <td>
             {{#if l.bounced}}{{d-icon "redo" title="admin.email.bounced"}}{{/if}}
-            <a href='mailto:{{l.to_address}}'>{{l.to_address}}</a>
+            <a href="mailto:{{l.to_address}}">{{l.to_address}}</a>
           </td>
           <td>{{l.email_type}}</td>
-          <td class='post-link'>
+          <td class="post-link">
             {{#if l.post_url}}
               <a href={{l.post_url}}>{{l.post_description}}</a>
-              <span class='reply-key'>{{l.reply_key}}</span>
+              <span class="reply-key">{{l.reply_key}}</span>
             {{else}}
-              <span class='reply-key'>{{l.reply_key}}</span>
+              <span class="reply-key">{{l.reply_key}}</span>
             {{/if}}
           </td>
         </tr>
       {{else}}
         {{#unless loading}}
-          <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
+          <tr><td colspan="5">{{i18n "admin.email.logs.none"}}</td></tr>
         {{/unless}}
       {{/each}}
     </tbody>
diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/templates/email-skipped.hbs
index da27e86914..f125beef36 100644
--- a/app/assets/javascripts/admin/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email-skipped.hbs
@@ -1,17 +1,17 @@
 {{#load-more selector=".email-list tr" action=(action "loadMore")}}
-  <table class='table email-list'>
+  <table class="table email-list">
     <thead>
       <tr>
-        <th>{{i18n 'admin.email.time'}}</th>
-        <th>{{i18n 'admin.email.user'}}</th>
-        <th>{{i18n 'admin.email.to_address'}}</th>
-        <th>{{i18n 'admin.email.email_type'}}</th>
-        <th>{{i18n 'admin.email.skipped_reason'}}</th>
+        <th>{{i18n "admin.email.time"}}</th>
+        <th>{{i18n "admin.email.user"}}</th>
+        <th>{{i18n "admin.email.to_address"}}</th>
+        <th>{{i18n "admin.email.email_type"}}</th>
+        <th>{{i18n "admin.email.skipped_reason"}}</th>
       </tr>
     </thead>
     <tbody>
       <tr class="filters">
-        <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+        <td>{{i18n "admin.email.logs.filters.title"}}</td>
         <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
         <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
         <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -23,13 +23,13 @@
           <td>{{format-date l.created_at}}</td>
           <td>
             {{#if l.user}}
-              {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
-              {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{l.user.username}}{{/link-to}}
             {{else}}
               &mdash;
             {{/if}}
           </td>
-          <td><a href='mailto:{{l.to_address}}'>{{l.to_address}}</a></td>
+          <td><a href="mailto:{{l.to_address}}">{{l.to_address}}</a></td>
           <td>{{l.email_type}}</td>
           <td>
             {{#if l.post_url}}
@@ -41,7 +41,7 @@
         </tr>
       {{else}}
         {{#unless loading}}
-          <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
+          <tr><td colspan="5">{{i18n "admin.email.logs.none"}}</td></tr>
         {{/unless}}
       {{/each}}
     </tbody>
diff --git a/app/assets/javascripts/admin/templates/email.hbs b/app/assets/javascripts/admin/templates/email.hbs
index b8a379d8ae..b61bdcae84 100644
--- a/app/assets/javascripts/admin/templates/email.hbs
+++ b/app/assets/javascripts/admin/templates/email.hbs
@@ -1,13 +1,13 @@
 {{#admin-nav}}
-  {{nav-item route='adminEmail.index' label='admin.email.settings'}}
-  {{nav-item route='adminEmail.previewDigest' label='admin.email.preview_digest'}}
-  {{nav-item route='adminEmail.advancedTest' label='admin.email.advanced_test.title'}}
-  {{nav-item route='adminCustomizeEmailTemplates' label='admin.email.templates'}}
-  {{nav-item route='adminEmail.sent' label='admin.email.sent'}}
-  {{nav-item route='adminEmail.skipped' label='admin.email.skipped'}}
-  {{nav-item route='adminEmail.bounced' label='admin.email.bounced'}}
-  {{nav-item route='adminEmail.received' label='admin.email.received'}}
-  {{nav-item route='adminEmail.rejected' label='admin.email.rejected'}}
+  {{nav-item route="adminEmail.index" label="admin.email.settings"}}
+  {{nav-item route="adminEmail.previewDigest" label="admin.email.preview_digest"}}
+  {{nav-item route="adminEmail.advancedTest" label="admin.email.advanced_test.title"}}
+  {{nav-item route="adminCustomizeEmailTemplates" label="admin.email.templates"}}
+  {{nav-item route="adminEmail.sent" label="admin.email.sent"}}
+  {{nav-item route="adminEmail.skipped" label="admin.email.skipped"}}
+  {{nav-item route="adminEmail.bounced" label="admin.email.bounced"}}
+  {{nav-item route="adminEmail.received" label="admin.email.received"}}
+  {{nav-item route="adminEmail.rejected" label="admin.email.rejected"}}
 {{/admin-nav}}
 
 <div class="admin-container">
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index 4bf9135fce..b70a9be306 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -1,12 +1,12 @@
-<div class='embeddable-hosts'>
+<div class="embeddable-hosts">
   {{#if embedding.embeddable_hosts}}
-    <table class='embedding grid'>
+    <table class="embedding grid">
       <thead>
-        <th style='width: 25%'>{{i18n "admin.embedding.host"}}</th>
-        <th style='width: 15%'>{{i18n "admin.embedding.class_name"}}</th>
-        <th style='width: 25%'>{{i18n "admin.embedding.path_whitelist"}}</th>
-        <th style='width: 25%'>{{i18n "admin.embedding.category"}}</th>
-        <th style='width: 10%'>&nbsp;</th>
+        <th style="width: 25%">{{i18n "admin.embedding.host"}}</th>
+        <th style="width: 15%">{{i18n "admin.embedding.class_name"}}</th>
+        <th style="width: 25%">{{i18n "admin.embedding.path_whitelist"}}</th>
+        <th style="width: 25%">{{i18n "admin.embedding.category"}}</th>
+        <th style="width: 10%">&nbsp;</th>
       </thead>
       <tbody>
         {{#each embedding.embeddable_hosts as |host|}}
@@ -22,14 +22,14 @@
 </div>
 
 {{#if showSecondary}}
-  <div class='embedding-secondary'>
+  <div class="embedding-secondary">
     <p>{{html-safe (i18n "admin.embedding.sample")}}</p>
     {{highlighted-code code=embeddingCode lang="html"}}
   </div>
 
   <hr>
 
-  <div class='embedding-secondary'>
+  <div class="embedding-secondary">
     <h3>{{i18n "admin.embedding.settings"}}</h3>
 
     {{embedding-setting field="embed_by_username" value=embedding.embed_by_username}}
@@ -41,7 +41,7 @@
     {{embedding-setting field="embed_unlisted" value=embedding.embed_unlisted type="checkbox"}}
   </div>
 
-  <div class='embedding-secondary'>
+  <div class="embedding-secondary">
     <h3>{{i18n "admin.embedding.crawling_settings"}}</h3>
     <p class="description">{{i18n "admin.embedding.crawling_description"}}</p>
 
@@ -58,7 +58,7 @@
                         placeholder="emoji, classname"}}
   </div>
 
-  <div class='embedding-secondary'>
+  <div class="embedding-secondary">
     {{d-button label="admin.embedding.save"
                action=(action "saveChanges")
                class="btn-primary embed-save"
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index f2547b9678..b2935978b3 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -1,5 +1,5 @@
-<div class='admin-emojis'>
-  <h1>{{i18n 'admin.emoji.title'}}</h1>
+<div class="admin-emojis">
+  <h1>{{i18n "admin.emoji.title"}}</h1>
 
   <p class="desc">{{i18n "admin.emoji.help"}}</p>
 
diff --git a/app/assets/javascripts/admin/templates/logs.hbs b/app/assets/javascripts/admin/templates/logs.hbs
index b936904999..194f6ec8bf 100644
--- a/app/assets/javascripts/admin/templates/logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs.hbs
@@ -1,12 +1,12 @@
 {{#admin-nav}}
-  {{nav-item route='adminLogs.staffActionLogs' label='admin.logs.staff_actions.title'}}
-  {{nav-item route='adminLogs.screenedEmails' label='admin.logs.screened_emails.title'}}
-  {{nav-item route='adminLogs.screenedIpAddresses' label='admin.logs.screened_ips.title'}}
-  {{nav-item route='adminLogs.screenedUrls' label='admin.logs.screened_urls.title'}}
-  {{nav-item route='adminWatchedWords' label='admin.watched_words.title'}}
-  {{nav-item route='adminSearchLogs' label='admin.logs.search_logs.title'}}
+  {{nav-item route="adminLogs.staffActionLogs" label="admin.logs.staff_actions.title"}}
+  {{nav-item route="adminLogs.screenedEmails" label="admin.logs.screened_emails.title"}}
+  {{nav-item route="adminLogs.screenedIpAddresses" label="admin.logs.screened_ips.title"}}
+  {{nav-item route="adminLogs.screenedUrls" label="admin.logs.screened_urls.title"}}
+  {{nav-item route="adminWatchedWords" label="admin.watched_words.title"}}
+  {{nav-item route="adminSearchLogs" label="admin.logs.search_logs.title"}}
   {{#if currentUser.admin}}
-    {{nav-item path='/logs' label='admin.logs.logster.title'}}
+    {{nav-item path="/logs" label="admin.logs.logster.title"}}
   {{/if}}
 {{/admin-nav}}
 
diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
index 6cc1239783..17b4316629 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
@@ -1,5 +1,5 @@
 <p>
-  {{i18n 'admin.logs.screened_emails.description'}}
+  {{i18n "admin.logs.screened_emails.description"}}
 </p>
 
 {{d-button
@@ -14,14 +14,14 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
 
-    <table class='screened-emails grid'>
+    <table class="screened-emails grid">
       <thead>
-        <th class="first email">{{i18n 'admin.logs.screened_emails.email'}}</th>
-        <th class="action">{{i18n 'admin.logs.action'}}</th>
-        <th class="match_count">{{i18n 'admin.logs.match_count'}}</th>
-        <th class="last_match_at">{{i18n 'admin.logs.last_match_at'}}</th>
-        <th class="created_at">{{i18n 'admin.logs.created_at'}}</th>
-        <th class="ip_address">{{i18n 'admin.logs.ip_address'}}</th>
+        <th class="first email">{{i18n "admin.logs.screened_emails.email"}}</th>
+        <th class="action">{{i18n "admin.logs.action"}}</th>
+        <th class="match_count">{{i18n "admin.logs.match_count"}}</th>
+        <th class="last_match_at">{{i18n "admin.logs.last_match_at"}}</th>
+        <th class="created_at">{{i18n "admin.logs.created_at"}}</th>
+        <th class="ip_address">{{i18n "admin.logs.ip_address"}}</th>
         <th class="action"></th>
       </thead>
       <tbody>
@@ -31,9 +31,9 @@
               <div class="overflow-ellipsis" title={{item.email}}>{{item.email}}</div>
             </td>
             <td class="action">{{item.actionName}}</td>
-            <td class="match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{item.match_count}}</td>
-            <td class="last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip item.last_match_at}}</td>
-            <td class="created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip item.created_at}}</td>
+            <td class="match_count"><div class="label">{{i18n "admin.logs.match_count"}}</div>{{item.match_count}}</td>
+            <td class="last_match_at"><div class="label">{{i18n "admin.logs.last_match_at"}}</div>{{age-with-tooltip item.last_match_at}}</td>
+            <td class="created_at"><div class="label">{{i18n "admin.logs.created_at"}}</div>{{age-with-tooltip item.created_at}}</td>
             <td class="ip_address">{{item.ip_address}}</td>
             <td class="action">
               {{d-button action=(action "clearBlock") actionParam=item icon="check" label="admin.logs.screened_emails.actions.allow"}}
@@ -44,6 +44,6 @@
     </table>
 
   {{else}}
-    {{i18n 'search.no_results'}}
+    {{i18n "search.no_results"}}
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
index ab3fcf1883..d48248152d 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
@@ -1,5 +1,5 @@
 <p>
-  {{i18n 'admin.logs.screened_urls.description'}}
+  {{i18n "admin.logs.screened_urls.description"}}
 </p>
   {{d-button
     class="btn-default"
@@ -11,13 +11,13 @@
 
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
-    <table class='screened-urls grid'>
+    <table class="screened-urls grid">
       <thead>
-        <th class="first domain">{{i18n 'admin.logs.screened_urls.domain'}}</th>
-        <th class="action">{{i18n 'admin.logs.action'}}</th>
-        <th class="match_count">{{i18n 'admin.logs.match_count'}}</th>
-        <th class="last_match_at">{{i18n 'admin.logs.last_match_at'}}</th>
-        <th class="created_at">{{i18n 'admin.logs.created_at'}}</th>
+        <th class="first domain">{{i18n "admin.logs.screened_urls.domain"}}</th>
+        <th class="action">{{i18n "admin.logs.action"}}</th>
+        <th class="match_count">{{i18n "admin.logs.match_count"}}</th>
+        <th class="last_match_at">{{i18n "admin.logs.last_match_at"}}</th>
+        <th class="created_at">{{i18n "admin.logs.created_at"}}</th>
       </thead>
       <tbody>
         {{#each model as |url|}}
@@ -26,14 +26,14 @@
               <div class="overflow-ellipsis" title={{url.domain}}>{{url.domain}}</div>
             </td>
             <td class="col action">{{url.actionName}}</td>
-            <td class="col match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{url.match_count}}</td>
-            <td class="col last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip url.last_match_at}}</td>
-            <td class="col created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip url.created_at}}</td>
+            <td class="col match_count"><div class="label">{{i18n "admin.logs.match_count"}}</div>{{url.match_count}}</td>
+            <td class="col last_match_at"><div class="label">{{i18n "admin.logs.last_match_at"}}</div>{{age-with-tooltip url.last_match_at}}</td>
+            <td class="col created_at"><div class="label">{{i18n "admin.logs.created_at"}}</div>{{age-with-tooltip url.created_at}}</td>
           </tr>
         {{/each}}
       </tbody>
     </table>
   {{else}}
-    {{i18n 'search.no_results'}}
+    {{i18n "search.no_results"}}
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 5a81de8f1d..3996ac2469 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -1,30 +1,30 @@
 <div class="staff-action-logs-controls">
   {{#if filtersExists}}
-    <div class='staff-action-logs-filters'>
+    <div class="staff-action-logs-filters">
       <a href {{action "clearAllFilters"}} class="clear-filters filter">
-        <span class="label">{{i18n 'admin.logs.staff_actions.clear_filters'}}</span>
+        <span class="label">{{i18n "admin.logs.staff_actions.clear_filters"}}</span>
       </a>
       {{#if actionFilter}}
         <a href {{action "clearFilter" "actionFilter"}} class="filter">
-          <span class="label">{{i18n 'admin.logs.action'}}</span>: {{actionFilter}}
+          <span class="label">{{i18n "admin.logs.action"}}</span>: {{actionFilter}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if filters.acting_user}}
         <a href {{action "clearFilter" "acting_user"}} class="filter">
-          <span class="label">{{i18n 'admin.logs.staff_actions.staff_user'}}</span>: {{filters.acting_user}}
+          <span class="label">{{i18n "admin.logs.staff_actions.staff_user"}}</span>: {{filters.acting_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if filters.target_user}}
         <a href {{action "clearFilter" "target_user"}} class="filter">
-          <span class="label">{{i18n 'admin.logs.staff_actions.target_user'}}</span>: {{filters.target_user}}
+          <span class="label">{{i18n "admin.logs.staff_actions.target_user"}}</span>: {{filters.target_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if filters.subject}}
         <a href {{action "clearFilter" "subject"}} class="filter">
-          <span class="label">{{i18n 'admin.logs.staff_actions.subject'}}</span>: {{filters.subject}}
+          <span class="label">{{i18n "admin.logs.staff_actions.subject"}}</span>: {{filters.subject}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
@@ -47,25 +47,25 @@
 {{#staff-actions}}
   {{#load-more selector=".staff-logs tr" action=(action "loadMore")}}
     {{#if model.content}}
-      <table class='table staff-logs grid'>
+      <table class="table staff-logs grid">
         <thead>
-          <th>{{i18n 'admin.logs.staff_actions.staff_user'}}</th>
-          <th>{{i18n 'admin.logs.action'}}</th>
-          <th>{{i18n 'admin.logs.staff_actions.subject'}}</th>
-          <th>{{i18n 'admin.logs.staff_actions.when'}}</th>
-          <th>{{i18n 'admin.logs.staff_actions.details'}}</th>
-          <th>{{i18n 'admin.logs.staff_actions.context'}}</th>
+          <th>{{i18n "admin.logs.staff_actions.staff_user"}}</th>
+          <th>{{i18n "admin.logs.action"}}</th>
+          <th>{{i18n "admin.logs.staff_actions.subject"}}</th>
+          <th>{{i18n "admin.logs.staff_actions.when"}}</th>
+          <th>{{i18n "admin.logs.staff_actions.details"}}</th>
+          <th>{{i18n "admin.logs.staff_actions.context"}}</th>
         </thead>
         <tbody>
           {{#each model.content as |item|}}
-            <tr class='admin-list-item'>
+            <tr class="admin-list-item">
               <td class="staff-users">
                 <div class="staff-user">
                   {{#if item.acting_user}}
-                    {{#link-to 'adminUser' item.acting_user}}{{avatar item.acting_user imageSize="tiny"}}{{/link-to}}
+                    {{#link-to "adminUser" item.acting_user}}{{avatar item.acting_user imageSize="tiny"}}{{/link-to}}
                     <a href {{action "filterByStaffUser" item.acting_user}}>{{item.acting_user.username}}</a>
                   {{else}}
-                    <span class="deleted-user" title={{i18n 'admin.user.deleted'}}>
+                    <span class="deleted-user" title={{i18n "admin.user.deleted"}}>
                       {{d-icon "far-trash-alt"}}
                     </span>
                   {{/if}}
@@ -77,7 +77,7 @@
               <td class="col value subject">
                 <div class="subject">
                   {{#if item.target_user}}
-                    {{#link-to 'adminUser' item.target_user}}{{avatar item.target_user imageSize="tiny"}}{{/link-to}}
+                    {{#link-to "adminUser" item.target_user}}{{avatar item.target_user imageSize="tiny"}}{{/link-to}}
                     <a href {{action "filterByTargetUser" item.target_user}}>{{item.target_user.username}}</a>
                   {{/if}}
                   {{#if item.subject}}
@@ -90,10 +90,10 @@
                 <div>
                   {{html-safe item.formattedDetails}}
                   {{#if item.useCustomModalForDetails}}
-                    <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
+                    <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                   {{#if item.useModalForDetails}}
-                    <a href {{action "showDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
+                    <a href {{action "showDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                 </div>
               </td>
@@ -105,7 +105,7 @@
     {{else if model.loadingMore}}
       {{conditional-loading-spinner condition=model.loadingMore}}
     {{else}}
-      {{i18n 'search.no_results'}}
+      {{i18n "search.no_results"}}
     {{/if}}
   {{/load-more}}
 {{/staff-actions}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
index 160ca685ad..100a36afce 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
@@ -1,11 +1,11 @@
-{{#d-modal-body class='add-upload-modal' title="admin.customize.theme.add_upload"}}
+{{#d-modal-body class="add-upload-modal" title="admin.customize.theme.add_upload"}}
   <div class="inputs">
     <section class="field">
-      <input onchange={{action "updateName"}} type="file" id="file-input" accept='*'>
-      <label for="file-input">{{i18n 'admin.customize.theme.upload_file_tip'}}</label>
+      <input onchange={{action "updateName"}} type="file" id="file-input" accept="*">
+      <label for="file-input">{{i18n "admin.customize.theme.upload_file_tip"}}</label>
     </section>
     <section class="field">
-      <label for="theme-variable-name">{{i18n 'admin.customize.theme.variable_name'}}</label>
+      <label for="theme-variable-name">{{i18n "admin.customize.theme.variable_name"}}</label>
       {{input id="theme-variable-name" value=name}}
     </section>
     {{#if fileSelected}}
@@ -17,6 +17,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action=(action "upload") disabled=disabled class='btn btn-primary' icon='upload' label='admin.customize.theme.upload'}}
+  {{d-button action=(action "upload") disabled=disabled class="btn btn-primary" icon="upload" label="admin.customize.theme.upload"}}
   {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index 5ed497ae57..6c8ab04311 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body class='upload-selector install-theme' title="admin.customize.theme.install"}}
+{{#d-modal-body class="upload-selector install-theme" title="admin.customize.theme.install"}}
   <div class="install-theme-items">
     {{install-theme-item value="popular" selection=selection label="admin.customize.theme.install_popular"}}
     {{install-theme-item value="local" selection=selection label="admin.customize.theme.install_upload"}}
@@ -13,7 +13,7 @@
             <div class="popular-theme-name">
               <a href={{theme.meta_url}} rel="noopener" target="_blank">
                 {{#if theme.component}}
-                  {{d-icon 'puzzle-piece' title='admin.customize.theme.component'}}
+                  {{d-icon "puzzle-piece" title="admin.customize.theme.component"}}
                 {{/if}}
                 {{theme.name}}
               </a>
@@ -26,7 +26,7 @@
               {{#if theme.installed}}
                 <span>{{i18n "admin.customize.theme.installed"}}</span>
               {{else}}
-                {{d-button class='btn-small'
+                {{d-button class="btn-small"
                   label="admin.customize.theme.install"
                   disabled=installDisabled
                   icon="upload"
@@ -44,38 +44,38 @@
 
     {{#if local}}
       <div class="inputs">
-        <input onchange={{action "uploadLocaleFile"}} type="file" id="file-input" accept='.dcstyle.json,application/json,.tar.gz,application/x-gzip,.zip,application/zip'><br>
-        <span class="description">{{i18n 'admin.customize.theme.import_file_tip'}}</span>
+        <input onchange={{action "uploadLocaleFile"}} type="file" id="file-input" accept=".dcstyle.json,application/json,.tar.gz,application/x-gzip,.zip,application/zip"><br>
+        <span class="description">{{i18n "admin.customize.theme.import_file_tip"}}</span>
       </div>
     {{/if}}
 
     {{#if remote}}
       <div class="inputs">
-        <div class='repo'>
-          <div class="label">{{i18n 'admin.customize.theme.import_web_tip'}}</div>
+        <div class="repo">
+          <div class="label">{{i18n "admin.customize.theme.import_web_tip"}}</div>
           {{input value=uploadUrl placeholder=urlPlaceholder}}
         </div>
 
         {{d-button
           class="btn-small advanced-repo"
           action=(action "toggleAdvanced")
-          label='admin.customize.theme.import_web_advanced'}}
+          label="admin.customize.theme.import_web_advanced"}}
 
         {{#if advancedVisible}}
-          <div class='branch'>
-            <div class="label">{{i18n 'admin.customize.theme.remote_branch'}}</div>
+          <div class="branch">
+            <div class="label">{{i18n "admin.customize.theme.remote_branch"}}</div>
             {{input value=branch placeholder="master"}}
           </div>
 
-          <div class='check-private'>
+          <div class="check-private">
             <label>
               {{input type="checkbox" checked=privateChecked}}
-              {{i18n 'admin.customize.theme.is_private'}}
+              {{i18n "admin.customize.theme.is_private"}}
             </label>
           </div>
           {{#if showPublicKey}}
-            <div class='public-key'>
-              <div class="label">{{i18n 'admin.customize.theme.public_key'}}</div>
+            <div class="public-key">
+              <div class="label">{{i18n "admin.customize.theme.public_key"}}</div>
               {{textarea readonly=true value=publicKey}}
             </div>
           {{/if}}
@@ -103,7 +103,7 @@
 
 {{#unless popular}}
   <div class="modal-footer">
-    {{d-button action=(action "installTheme") disabled=installDisabled class='btn btn-primary' label=submitLabel}}
+    {{d-button action=(action "installTheme") disabled=installDisabled class="btn btn-primary" label=submitLabel}}
     {{d-modal-cancel close=(route-action "closeModal")}}
   </div>
 {{/unless}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
index 0b123cdc6a..5e18b4cfb4 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="admin.user.silence_modal_title"}}
   {{#conditional-loading-spinner condition=loadingUser}}
 
-    <div class='until-controls'>
+    <div class="until-controls">
       <label>
         {{future-date-input
           class="silence-until"
diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
index a10ecd9c95..24e837efea 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
@@ -2,7 +2,7 @@
   {{#conditional-loading-spinner condition=loadingUser}}
 
     {{#if user.canSuspend}}
-      <div class='until-controls'>
+      <div class="until-controls">
         <label>
           {{future-date-input
             class="suspend-until"
@@ -24,7 +24,7 @@
       {{/if}}
 
     {{else}}
-      <div class='cant-suspend'>
+      <div class="cant-suspend">
         {{i18n "admin.user.cant_suspend"}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 724af5ace4..1a50682819 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -9,7 +9,7 @@
     {{#if theme.installed}}
       <span>{{i18n "admin.customize.theme.installed"}}</span>
     {{else}}
-      {{d-button class='btn-small'
+      {{d-button class="btn-small"
         label="admin.customize.theme.install"
         disabled=installDisabled
         icon="upload"
diff --git a/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs b/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
index 38a08b7627..cd3e3c6745 100644
--- a/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
+++ b/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
@@ -3,6 +3,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action=(action "updateExistingUsers") class='btn-primary' label='admin.site_settings.default_categories.modal_yes'}}
-  {{d-button action=(action "cancel") label='admin.site_settings.default_categories.modal_no'}}
+  {{d-button action=(action "updateExistingUsers") class="btn-primary" label="admin.site_settings.default_categories.modal_yes"}}
+  {{d-button action=(action "cancel") label="admin.site_settings.default_categories.modal_no"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index a9f1067909..dcfca2a918 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -1,8 +1,8 @@
 <div class="permalink-title">
-  <h2>{{i18n 'admin.permalink.title'}}</h2>
+  <h2>{{i18n "admin.permalink.title"}}</h2>
 </div>
 <div class="permalink-description">
-  <span>{{i18n 'admin.permalink.description'}}</span>
+  <span>{{i18n "admin.permalink.description"}}</span>
 </div>
 <div class="permalink-search">
   {{text-field value=filter class="url-input" placeholderKey="admin.permalink.form.filter" autocorrect="off" autocapitalize="off"}}
@@ -12,10 +12,10 @@
 
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
-    <table class='admin-logs-table permalinks grid'>
+    <table class="admin-logs-table permalinks grid">
       <thead class="heading-container">
-        <th class="col heading first url">{{i18n 'admin.permalink.url'}}</th>
-        <th class="col heading destination">{{i18n 'admin.permalink.destination'}}</th>
+        <th class="col heading first url">{{i18n "admin.permalink.url"}}</th>
+        <th class="col heading destination">{{i18n "admin.permalink.destination"}}</th>
         <th class="col heading actions"></th>
       </thead>
       <tbody>
@@ -47,6 +47,6 @@
       </tbody>
     </table>
   {{else}}
-    {{i18n 'search.no_results'}}
+    {{i18n "search.no_results"}}
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/plugins.hbs b/app/assets/javascripts/admin/templates/plugins.hbs
index dbe648daef..9dad110efc 100644
--- a/app/assets/javascripts/admin/templates/plugins.hbs
+++ b/app/assets/javascripts/admin/templates/plugins.hbs
@@ -1,5 +1,5 @@
-<div class='admin-controls'>
-  <div class='controls'>
+<div class="admin-controls">
+  <div class="controls">
     {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
 
     {{#if currentUser.admin}}
@@ -15,7 +15,7 @@
 
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
-    {{nav-item route='adminPlugins.index' label="admin.plugins.title"}}
+    {{nav-item route="adminPlugins.index" label="admin.plugins.title"}}
 
     {{#each adminRoutes as |route|}}
       {{nav-item route=route.full_location label=route.label}}
diff --git a/app/assets/javascripts/admin/templates/search-logs-index.hbs b/app/assets/javascripts/admin/templates/search-logs-index.hbs
index a0cb23a89b..baf516489d 100644
--- a/app/assets/javascripts/admin/templates/search-logs-index.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-index.hbs
@@ -11,28 +11,28 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
 
-    <table class='search-logs-list grid'>
+    <table class="search-logs-list grid">
       <thead>
-        <th class="col heading term">{{i18n 'admin.logs.search_logs.term'}}</th>
-        <th class="col heading">{{i18n 'admin.logs.search_logs.searches'}}</th>
-        <th class="col heading">{{i18n 'admin.logs.search_logs.click_through_rate'}}</th>
+        <th class="col heading term">{{i18n "admin.logs.search_logs.term"}}</th>
+        <th class="col heading">{{i18n "admin.logs.search_logs.searches"}}</th>
+        <th class="col heading">{{i18n "admin.logs.search_logs.click_through_rate"}}</th>
       </thead>
       <tbody>
         {{#each model as |item|}}
           <tr class="admin-list-item">
             <td class="col term">
-              {{#link-to 'adminSearchLogs.term' (query-params term=item.term period=period) class="test"}}
+              {{#link-to "adminSearchLogs.term" (query-params term=item.term period=period) class="test"}}
                 {{item.term}}
               {{/link-to}}
             </td>
-            <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.searches'}}</div>{{item.searches}}</td>
-            <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.click_through_rate'}}</div>{{item.ctr}}%</td>
+            <td class="col"><div class="label">{{i18n "admin.logs.search_logs.searches"}}</div>{{item.searches}}</td>
+            <td class="col"><div class="label">{{i18n "admin.logs.search_logs.click_through_rate"}}</div>{{item.ctr}}%</td>
           </tr>
         {{/each}}
       </tbody>
     </table>
 
   {{else}}
-    {{i18n 'search.no_results'}}
+    {{i18n "search.no_results"}}
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index c38b4c9e59..5014fd7b90 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -9,7 +9,7 @@
 </div>
 
 <h2>
-  {{#link-to 'full-page-search' (query-params q=term)}}{{term}}{{/link-to}}
+  {{#link-to "full-page-search" (query-params q=term)}}{{term}}{{/link-to}}
 </h2>
 
 {{#conditional-loading-spinner condition=refreshing}}
@@ -19,22 +19,22 @@
   <h2> {{i18n "admin.logs.search_logs.header_search_results"}} </h2>
   <br>
 
-  <div class='header-search-results'>
+  <div class="header-search-results">
     {{#each model.search_result.posts as |result|}}
-      <div class='fps-result'>
-        <div class='author'>
+      <div class="fps-result">
+        <div class="author">
           <a href={{result.userPath}} data-user-card={{result.username}}>
             {{avatar result imageSize="large"}}
           </a>
         </div>
 
-        <div class='fps-topic'>
-          <div class='topic'>
-            <a class='search-link' href={{result.url}}>
-              {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+        <div class="fps-topic">
+          <div class="topic">
+            <a href={{result.url}} class="search-link">
+              {{topic-status topic=result.topic disableActions=true}}<span class="topic-title">{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
             </a>
 
-            <div class='search-category'>
+            <div class="search-category">
               {{#if result.topic.category.parentCategory}}
                 {{category-link result.topic.category.parentCategory}}
               {{/if}}
@@ -45,8 +45,8 @@
             </div>
           </div>
 
-          <div class='blurb container'>
-            <span class='date'>
+          <div class="blurb container">
+            <span class="date">
               {{format-age result.created_at}}
               {{#if result.blurb}}
                 -
diff --git a/app/assets/javascripts/admin/templates/site-settings-category.hbs b/app/assets/javascripts/admin/templates/site-settings-category.hbs
index 2e97b008d4..3703cf3c8f 100644
--- a/app/assets/javascripts/admin/templates/site-settings-category.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings-category.hbs
@@ -4,10 +4,10 @@
       {{site-setting setting=setting afterSave=(route-action "refreshAll")}}
     {{/each}}
     {{#if category.hasMore}}
-      <p class="warning">{{i18n 'admin.site_settings.more_than_30_results'}}</p>
+      <p class="warning">{{i18n "admin.site_settings.more_than_30_results"}}</p>
     {{/if}}
   {{/d-section}}
 {{else}}
   <br>
-  {{i18n 'admin.site_settings.no_results'}}
+  {{i18n "admin.site_settings.no_results"}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs
index 01264be5b5..c316639558 100644
--- a/app/assets/javascripts/admin/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings.hbs
@@ -1,14 +1,14 @@
-<div class='admin-controls'>
+<div class="admin-controls">
 
-  <div class='controls'>
+  <div class="controls">
     {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
     {{text-field id="setting-filter" value=filter placeholderKey="type_to_filter" class="no-blur"}}
     {{d-button class="btn-default" id="clear-filter" action=(action "clearFilter") label="admin.site_settings.clear_filter"}}
   </div>
-  <div class='search controls'>
+  <div class="search controls">
     <label>
       {{input type="checkbox" checked=onlyOverridden}}
-      {{i18n 'admin.settings.show_overriden'}}
+      {{i18n "admin.settings.show_overriden"}}
     </label>
   </div>
 </div>
@@ -17,7 +17,7 @@
   <ul class="nav nav-stacked">
     {{#each visibleSiteSettings as |category|}}
       <li class={{category.nameKey}}>
-        {{#link-to 'adminSiteSettingsCategory' category.nameKey class=category.nameKey}}
+        {{#link-to "adminSiteSettingsCategory" category.nameKey class=category.nameKey}}
           {{category.name}}
           {{#if category.count}}<span class="count">({{category.count}})</span>{{/if}}
         {{/link-to}}
diff --git a/app/assets/javascripts/admin/templates/site-text-edit.hbs b/app/assets/javascripts/admin/templates/site-text-edit.hbs
index dc42c3ba26..279a5a5acb 100644
--- a/app/assets/javascripts/admin/templates/site-text-edit.hbs
+++ b/app/assets/javascripts/admin/templates/site-text-edit.hbs
@@ -1,6 +1,6 @@
-<div class='edit-site-text'>
+<div class="edit-site-text">
 
-  <div class='title'>
+  <div class="title">
     <h3>{{siteText.id}}</h3>
   </div>
 
@@ -12,9 +12,9 @@
     {{/if}}
   {{/save-controls}}
 
-  {{#link-to 'adminSiteText.index' class="go-back"}}
-    {{d-icon 'arrow-left'}}
-    {{i18n 'admin.site_text.go_back'}}
+  {{#link-to "adminSiteText.index" class="go-back"}}
+    {{d-icon "arrow-left"}}
+    {{i18n "admin.site_text.go_back"}}
   {{/link-to}}
 
 </div>
diff --git a/app/assets/javascripts/admin/templates/site-text-index.hbs b/app/assets/javascripts/admin/templates/site-text-index.hbs
index de6b4e707d..fa72cc36f4 100644
--- a/app/assets/javascripts/admin/templates/site-text-index.hbs
+++ b/app/assets/javascripts/admin/templates/site-text-index.hbs
@@ -1,4 +1,4 @@
-<div class='search-area'>
+<div class="search-area">
   <p>{{i18n "admin.site_text.description"}}</p>
 
   {{text-field value=q
@@ -18,7 +18,7 @@
   <p class="filter-options">
     <label>
       {{input type="checkbox" checked=overridden click=(action "toggleOverridden")}}
-      {{i18n 'admin.site_text.show_overriden'}}
+      {{i18n "admin.site_text.show_overriden"}}
     </label>
   </p>
 </div>
@@ -33,6 +33,6 @@
   {{/each}}
 
   {{#if siteTexts.extras.has_more}}
-    <p class="warning">{{i18n 'admin.site_text.more_than_50_results'}}</p>
+    <p class="warning">{{i18n "admin.site_text.more_than_50_results"}}</p>
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/site-text.hbs b/app/assets/javascripts/admin/templates/site-text.hbs
index e12a542d79..5f63ea5b7e 100644
--- a/app/assets/javascripts/admin/templates/site-text.hbs
+++ b/app/assets/javascripts/admin/templates/site-text.hbs
@@ -1,3 +1,3 @@
-<div class='row site-texts'>
+<div class="row site-texts">
   {{outlet}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index f85db56737..a5e66640d3 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -1,21 +1,21 @@
-<div class='admin-controls'>
+<div class="admin-controls">
   <nav>
-    <ul class='nav nav-pills'>
-      <li>{{#link-to 'adminUser' user}}{{d-icon "caret-left"}} &nbsp;{{user.username}}{{/link-to}}</li>
+    <ul class="nav nav-pills">
+      <li>{{#link-to "adminUser" user}}{{d-icon "caret-left"}} &nbsp;{{user.username}}{{/link-to}}</li>
     </ul>
   </nav>
 </div>
 
 {{#conditional-loading-spinner condition=loading}}
-  <div class='admin-container user-badges'>
-    <h2>{{i18n 'admin.badges.grant_badge'}}</h2>
+  <div class="admin-container user-badges">
+    <h2>{{i18n "admin.badges.grant_badge"}}</h2>
     <br>
     {{#if noGrantableBadges}}
-      <p>{{i18n 'admin.badges.no_badges'}}</p>
+      <p>{{i18n "admin.badges.no_badges"}}</p>
     {{else}}
       <form class="form-horizontal">
         <div>
-          <label>{{i18n 'admin.badges.badge'}}</label>
+          <label>{{i18n "admin.badges.badge"}}</label>
           {{combo-box
             filterable=true
             value=selectedBadgeId
@@ -24,8 +24,8 @@
           }}
         </div>
         <div>
-          <label>{{i18n 'admin.badges.reason'}}</label>
-          {{input type="text" value=badgeReason}}<br><small>{{i18n 'admin.badges.reason_help'}}</small>
+          <label>{{i18n "admin.badges.reason"}}</label>
+          {{input type="text" value=badgeReason}}<br><small>{{i18n "admin.badges.reason_help"}}</small>
         </div>
         {{d-button
           class="btn-primary"
@@ -35,25 +35,25 @@
       </form>
     {{/if}}
 
-    <table id='user-badges'>
+    <table id="user-badges">
       <tbody>
         <tr>
-          <th>{{i18n 'admin.badges.badge'}}</th>
-          <th>{{i18n 'admin.badges.granted_by'}}</th>
-          <th class='reason'>{{i18n 'admin.badges.reason'}}</th>
-          <th>{{i18n 'admin.badges.granted_at'}}</th>
+          <th>{{i18n "admin.badges.badge"}}</th>
+          <th>{{i18n "admin.badges.granted_by"}}</th>
+          <th class="reason">{{i18n "admin.badges.reason"}}</th>
+          <th>{{i18n "admin.badges.granted_at"}}</th>
           <th></th>
         </tr>
         {{#each groupedBadges as |userBadge|}}
           <tr>
             <td>{{user-badge badge=userBadge.badge count=userBadge.count}}</td>
             <td>
-              {{#link-to 'adminUser' userBadge.badge.granted_by}}
+              {{#link-to "adminUser" userBadge.badge.granted_by}}
                 {{avatar userBadge.granted_by imageSize="tiny"}}
                 {{userBadge.granted_by.username}}
               {{/link-to}}
             </td>
-            <td class='reason'>
+            <td class="reason">
               {{#if userBadge.postUrl}}
                 <a href={{userBadge.postUrl}}>{{userBadge.topic_title}}</a>
               {{/if}}
@@ -75,7 +75,7 @@
         {{else}}
           <tr>
             <td colspan="5">
-              <p>{{i18n 'admin.badges.no_user_badges' name=user.username}}</p>
+              <p>{{i18n "admin.badges.no_user_badges" name=user.username}}</p>
             </td>
           </tr>
         {{/each}}
diff --git a/app/assets/javascripts/admin/templates/user-fields.hbs b/app/assets/javascripts/admin/templates/user-fields.hbs
index a766d86269..a14119e92b 100644
--- a/app/assets/javascripts/admin/templates/user-fields.hbs
+++ b/app/assets/javascripts/admin/templates/user-fields.hbs
@@ -1,7 +1,7 @@
-<div class='user-fields'>
-  <h2>{{i18n 'admin.user_fields.title'}}</h2>
+<div class="user-fields">
+  <h2>{{i18n "admin.user_fields.title"}}</h2>
 
-  <p class="desc">{{i18n 'admin.user_fields.help'}}</p>
+  <p class="desc">{{i18n "admin.user_fields.help"}}</p>
 
   {{#if model}}
     {{#each sortedFields as |uf|}}
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 6cabbb87ad..c23c88a3d6 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -1,4 +1,4 @@
-<section class="details {{unless model.active 'not-activated'}}">
+<section class="details {{unless model.active "not-activated"}}">
   <div class="user-controls">
     {{#if model.canViewProfile}}
       {{#link-to "user" model class="btn btn-default"}}
@@ -604,7 +604,7 @@
     </div>
     <div class="controls">
       {{#if model.flags_received_count}}
-        {{#link-to 'review' (query-params username=model.username type="ReviewableFlaggedPost" status="all") class="btn"}}
+        {{#link-to "review" (query-params username=model.username type="ReviewableFlaggedPost" status="all") class="btn"}}
           {{i18n "admin.user.show_flags_received"}}
         {{/link-to}}
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index 8fcc81a7ce..6a76b438a1 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -1,109 +1,109 @@
-<div class='admin-controls'>
+<div class="admin-controls">
   <nav>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminUser' model}}{{d-icon "caret-left"}} &nbsp;{{model.username}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'member'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}</li>
+      <li>{{#link-to "adminUser" model}}{{d-icon "caret-left"}} &nbsp;{{model.username}}{{/link-to}}</li>
+      <li>{{#link-to "adminUsersList.show" "member"}}{{i18n "admin.user.trust_level_2_users"}}{{/link-to}}</li>
     </ul>
   </nav>
 </div>
 
 <div class="admin-container tl3-requirements">
-  <h2>{{model.username}} - {{i18n 'admin.user.tl3_requirements.title'}}</h2>
+  <h2>{{model.username}} - {{i18n "admin.user.tl3_requirements.title"}}</h2>
   <br>
-  <p>{{i18n 'admin.user.tl3_requirements.table_title' count=model.tl3Requirements.time_period}}</p>
+  <p>{{i18n "admin.user.tl3_requirements.table_title" count=model.tl3Requirements.time_period}}</p>
 
   <table class="table" style="width: auto;">
     <thead>
       <tr>
         <th></th>
         <th></th>
-        <th>{{i18n 'admin.user.tl3_requirements.value_heading'}}</th>
-        <th>{{i18n 'admin.user.tl3_requirements.requirement_heading'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.value_heading"}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.requirement_heading"}}</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.visits'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.visits"}}</th>
         <td>{{check-icon model.tl3Requirements.met.days_visited}}</td>
         <td>
-          {{model.tl3Requirements.days_visited_percent}}% ({{model.tl3Requirements.days_visited}} / {{model.tl3Requirements.time_period}} {{i18n 'admin.user.tl3_requirements.days'}})
+          {{model.tl3Requirements.days_visited_percent}}% ({{model.tl3Requirements.days_visited}} / {{model.tl3Requirements.time_period}} {{i18n "admin.user.tl3_requirements.days"}})
         </td>
         <td>{{model.tl3Requirements.min_days_visited_percent}}%</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.topics_replied_to'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.topics_replied_to"}}</th>
         <td>{{check-icon model.tl3Requirements.met.topics_replied_to}}</td>
         <td>{{model.tl3Requirements.num_topics_replied_to}}</td>
         <td>{{model.tl3Requirements.min_topics_replied_to}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.topics_viewed'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.topics_viewed"}}</th>
         <td>{{check-icon model.tl3Requirements.met.topics_viewed}}</td>
         <td>{{model.tl3Requirements.topics_viewed}}</td>
         <td>{{model.tl3Requirements.min_topics_viewed}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.topics_viewed_all_time'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.topics_viewed_all_time"}}</th>
         <td>{{check-icon model.tl3Requirements.met.topics_viewed_all_time}}</td>
         <td>{{model.tl3Requirements.topics_viewed_all_time}}</td>
         <td>{{model.tl3Requirements.min_topics_viewed_all_time}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.posts_read'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.posts_read"}}</th>
         <td>{{check-icon model.tl3Requirements.met.posts_read}}</td>
         <td>{{model.tl3Requirements.posts_read}}</td>
         <td>{{model.tl3Requirements.min_posts_read}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.posts_read_all_time'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.posts_read_all_time"}}</th>
         <td>{{check-icon model.tl3Requirements.met.posts_read_all_time}}</td>
         <td>{{model.tl3Requirements.posts_read_all_time}}</td>
         <td>{{model.tl3Requirements.min_posts_read_all_time}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.flagged_posts'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.flagged_posts"}}</th>
         <td>{{check-icon model.tl3Requirements.met.flagged_posts}}</td>
         <td>{{model.tl3Requirements.num_flagged_posts}}</td>
-        <td>{{i18n 'max_of_count' count=model.tl3Requirements.max_flagged_posts}}</td>
+        <td>{{i18n "max_of_count" count=model.tl3Requirements.max_flagged_posts}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.flagged_by_users'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.flagged_by_users"}}</th>
         <td>{{check-icon model.tl3Requirements.met.flagged_by_users}}</td>
         <td>{{model.tl3Requirements.num_flagged_by_users}}</td>
-        <td>{{i18n 'max_of_count' count=model.tl3Requirements.max_flagged_by_users}}</td>
+        <td>{{i18n "max_of_count" count=model.tl3Requirements.max_flagged_by_users}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.likes_given'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.likes_given"}}</th>
         <td>{{check-icon model.tl3Requirements.met.likes_given}}</td>
         <td>{{model.tl3Requirements.num_likes_given}}</td>
         <td>{{model.tl3Requirements.min_likes_given}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.likes_received'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.likes_received"}}</th>
         <td>{{check-icon model.tl3Requirements.met.likes_received}}</td>
         <td>{{model.tl3Requirements.num_likes_received}}</td>
         <td>{{model.tl3Requirements.min_likes_received}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.likes_received_days'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.likes_received_days"}}</th>
         <td>{{check-icon model.tl3Requirements.met.likes_received_days}}</td>
         <td>{{model.tl3Requirements.num_likes_received_days}}</td>
         <td>{{model.tl3Requirements.min_likes_received_days}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.likes_received_users'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.likes_received_users"}}</th>
         <td>{{check-icon model.tl3Requirements.met.likes_received_users}}</td>
         <td>{{model.tl3Requirements.num_likes_received_users}}</td>
         <td>{{model.tl3Requirements.min_likes_received_users}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.silenced'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.silenced"}}</th>
         <td>{{check-icon model.tl3Requirements.met.silenced}}</td>
         <td>{{model.tl3Requirements.penalty_counts.silenced}}</td>
         <td>0</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.suspended'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.suspended"}}</th>
         <td>{{check-icon model.tl3Requirements.met.suspended}}</td>
         <td>{{model.tl3Requirements.penalty_counts.suspended}}</td>
         <td>0</td>
@@ -118,24 +118,24 @@
         {{! tl implicitly not locked }}
         {{#if model.tl3Requirements.on_grace_period}}
           {{d-icon "times"}}
-          {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
+          {{i18n "admin.user.tl3_requirements.on_grace_period"}}
         {{else}}
           {{! not on grace period }}
           {{d-icon "times"}}
-          {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
-          {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
+          {{i18n "admin.user.tl3_requirements.does_not_qualify"}}
+          {{i18n "admin.user.tl3_requirements.will_be_demoted"}}
         {{/if}}
       {{else}}
         {{! requirements not lost - remains tl3 }}
         {{#if model.tl3Requirements.trust_level_locked}}
           {{d-icon "lock"}}
-          {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
+          {{i18n "admin.user.tl3_requirements.locked_will_not_be_demoted"}}
         {{else}}
           {{! tl not locked }}
           {{d-icon "check"}}
-          {{i18n 'admin.user.tl3_requirements.qualifies'}}
+          {{i18n "admin.user.tl3_requirements.qualifies"}}
           {{#if model.tl3Requirements.on_grace_period}}
-            {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
+            {{i18n "admin.user.tl3_requirements.on_grace_period"}}
           {{/if}}
         {{/if}}
       {{/if}}
@@ -144,13 +144,13 @@
       {{#if model.tl3Requirements.requirements_met}}
         {{! met & not tl3 - will be promoted}}
         {{d-icon "check"}}
-        {{i18n 'admin.user.tl3_requirements.qualifies'}}
-        {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
+        {{i18n "admin.user.tl3_requirements.qualifies"}}
+        {{i18n "admin.user.tl3_requirements.will_be_promoted"}}
       {{else}}
         {{! requirements not met - remains regular }}
         {{#if model.tl3Requirements.trust_level_locked}}
           {{d-icon "lock"}}
-          {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
+          {{i18n "admin.user.tl3_requirements.locked_will_not_be_promoted"}}
         {{else}}
           {{d-icon "times"}}
         {{/if}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 6b0253aeda..e96f794a67 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -15,65 +15,65 @@
   {{/if}}
 </div>
 
-<div class='username controls'>
+<div class="username controls">
   {{text-field value=listFilter placeholder=searchHint}}
 </div>
 
 {{#load-more selector=".users-list tr" action=(action "loadMore")}}
   {{#if model}}
-    <table class='table users-list grid'>
+    <table class="table users-list grid">
       <thead>
-        {{admin-directory-toggle field="username" i18nKey='username' order=order ascending=ascending}}
-        {{admin-directory-toggle field="email" i18nKey='email' order=order ascending=ascending}}
-        {{admin-directory-toggle field="last_emailed" i18nKey='admin.users.last_emailed' order=order ascending=ascending}}
-        {{admin-directory-toggle field="seen" i18nKey='last_seen' order=order ascending=ascending}}
+        {{admin-directory-toggle field="username" i18nKey="username" order=order ascending=ascending}}
+        {{admin-directory-toggle field="email" i18nKey="email" order=order ascending=ascending}}
+        {{admin-directory-toggle field="last_emailed" i18nKey="admin.users.last_emailed" order=order ascending=ascending}}
+        {{admin-directory-toggle field="seen" i18nKey="last_seen" order=order ascending=ascending}}
         {{admin-directory-toggle field="topics_viewed" i18nKey="admin.user.topics_entered" order=order ascending=ascending}}
         {{admin-directory-toggle field="posts_read" i18nKey="admin.user.posts_read_count" order=order ascending=ascending}}
         {{admin-directory-toggle field="read_time" i18nKey="admin.user.time_read" order=order ascending=ascending}}
         {{admin-directory-toggle field="created" i18nKey="created" order=order ascending=ascending}}
         {{#if siteSettings.must_approve_users}}
-          <th>{{i18n 'admin.users.approved'}}</th>
+          <th>{{i18n "admin.users.approved"}}</th>
         {{/if}}
         <th>&nbsp;</th>
       </thead>
       <tbody>
         {{#each model as |user|}}
-          <tr class="user {{user.selected}} {{unless user.active 'not-activated'}}">
+          <tr class="user {{user.selected}} {{unless user.active "not-activated"}}">
             <td class="username">
               <a href={{user.path}} data-user-card={{user.username}}>
                 {{avatar user imageSize="small"}}
               </a>
-              {{#link-to 'adminUser' user}}{{user.username}}{{/link-to}}
+              {{#link-to "adminUser" user}}{{user.username}}{{/link-to}}
               {{#if user.staged}}
                 {{d-icon "far-envelope" title="user.staged" }}
               {{/if}}
             </td>
-            <td class='email'>
+            <td class="email">
               {{~user.email~}}
             </td>
             <td class="last-emailed">
-              <div class="label">{{i18n 'admin.users.last_emailed'}}</div>
+              <div class="label">{{i18n "admin.users.last_emailed"}}</div>
               <div>{{format-duration user.last_emailed_age}}</div>
             </td>
             <td class="last-seen">
-              <div class="label">{{i18n 'last_seen'}}</div>
+              <div class="label">{{i18n "last_seen"}}</div>
               <div>{{format-duration user.last_seen_age}}</div>
             </td>
             <td class="topics-entered">
-              <div class="label">{{i18n 'admin.user.topics_entered'}}</div>
+              <div class="label">{{i18n "admin.user.topics_entered"}}</div>
               <div>{{number user.topics_entered}}</div>
             </td>
             <td class="posts-read">
-              <div class="label">{{i18n 'admin.user.posts_read_count'}}</div>
+              <div class="label">{{i18n "admin.user.posts_read_count"}}</div>
               <div>{{number user.posts_read_count}}</div>
             </td>
             <td class="time-read">
-              <div class="label">{{i18n 'admin.user.time_read'}}</div>
+              <div class="label">{{i18n "admin.user.time_read"}}</div>
               <div>{{format-duration user.time_read}}</div>
             </td>
 
             <td class="created">
-              <div class="label">{{i18n 'created'}}</div>
+              <div class="label">{{i18n "created"}}</div>
               <div>{{format-duration user.created_at_age}}</div>
             </td>
 
@@ -100,6 +100,6 @@
     {{conditional-loading-spinner condition=refreshing}}
 
   {{else}}
-    <p>{{i18n 'search.no_results'}}</p>
+    <p>{{i18n "search.no_results"}}</p>
   {{/if}}
 {{/load-more}}
diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
index 2e1fe0c3ab..27d3684917 100644
--- a/app/assets/javascripts/admin/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/templates/users-list.hbs
@@ -1,13 +1,13 @@
-<div class='admin-controls'>
+<div class="admin-controls">
   <nav>
     <ul class="nav nav-pills">
-      {{nav-item route='adminUsersList.show' routeParam='active' label='admin.users.nav.active'}}
-      {{nav-item route='adminUsersList.show' routeParam='new' label='admin.users.nav.new'}}
-      {{nav-item route='adminUsersList.show' routeParam='staff' label='admin.users.nav.staff'}}
-      {{nav-item route='adminUsersList.show' routeParam='suspended' label='admin.users.nav.suspended'}}
-      {{nav-item route='adminUsersList.show' routeParam='silenced' label='admin.users.nav.silenced'}}
-      {{nav-item route='adminUsersList.show' routeParam='staged' label='admin.users.nav.staged'}}
-      {{nav-item route='groups' label='groups.index.title'}}
+      {{nav-item route="adminUsersList.show" routeParam="active" label="admin.users.nav.active"}}
+      {{nav-item route="adminUsersList.show" routeParam="new" label="admin.users.nav.new"}}
+      {{nav-item route="adminUsersList.show" routeParam="staff" label="admin.users.nav.staff"}}
+      {{nav-item route="adminUsersList.show" routeParam="suspended" label="admin.users.nav.suspended"}}
+      {{nav-item route="adminUsersList.show" routeParam="silenced" label="admin.users.nav.silenced"}}
+      {{nav-item route="adminUsersList.show" routeParam="staged" label="admin.users.nav.staged"}}
+      {{nav-item route="groups" label="groups.index.title"}}
 
       <li class="admin-actions">
         {{#if currentUser.can_invite_to_forum}}
diff --git a/app/assets/javascripts/admin/templates/watched-words-action.hbs b/app/assets/javascripts/admin/templates/watched-words-action.hbs
index 68222ccedb..4f15862a8a 100644
--- a/app/assets/javascripts/admin/templates/watched-words-action.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words-action.hbs
@@ -24,7 +24,7 @@
 <div>
   <label class="show-words-checkbox">
     {{input type="checkbox" checked=adminWatchedWords.showWords disabled=adminWatchedWords.disableShowWords}}
-    {{i18n 'admin.watched_words.show_words'}}
+    {{i18n "admin.watched_words.show_words"}}
   </label>
 </div>
 <div class="watched-words-list">
@@ -33,7 +33,7 @@
       <div class="watched-word-box">{{admin-watched-word word=word action=(action "recordRemoved")}}</div>
     {{/each}}
   {{else}}
-    {{i18n 'admin.watched_words.word_count' count=wordCount}}
+    {{i18n "admin.watched_words.word_count" count=wordCount}}
   {{/if}}
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/watched-words.hbs b/app/assets/javascripts/admin/templates/watched-words.hbs
index 6897721197..02f81d7866 100644
--- a/app/assets/javascripts/admin/templates/watched-words.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words.hbs
@@ -1,5 +1,5 @@
-<div class='admin-controls'>
-  <div class='controls'>
+<div class="admin-controls">
+  <div class="controls">
     {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
     {{text-field value=filter placeholderKey="admin.watched_words.search" class="no-blur"}}
     {{d-button action=(action "clearFilter") label="admin.watched_words.clear_filter"}}
@@ -10,7 +10,7 @@
   <ul class="nav nav-stacked">
     {{#each model as |action|}}
       <li class={{action.nameKey}}>
-        {{#link-to 'adminWatchedWords.action' action.nameKey}}
+        {{#link-to "adminWatchedWords.action" action.nameKey}}
           {{action.name}}
           {{#if action.count}}<span class="count">({{action.count}})</span>{{/if}}
         {{/link-to}}
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
index 7161ff0a0a..14557341d8 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
@@ -1,27 +1,27 @@
 <div class="web-hook-direction">
-  {{#link-to 'adminWebHooks' tagName='button' classNames='btn'}}
-    {{d-icon 'list'}} {{i18n 'admin.web_hooks.events.go_list'}}
+  {{#link-to "adminWebHooks" tagName="button" classNames="btn"}}
+    {{d-icon "list"}} {{i18n "admin.web_hooks.events.go_list"}}
   {{/link-to}}
   {{d-button icon="paper-plane" label="admin.web_hooks.events.ping" action=(action "ping") disabled=pingDisabled}}
-  {{#link-to 'adminWebHooks.show' model.extras.web_hook_id tagName='button' classNames='btn'}}
-    {{d-icon 'far-edit'}} {{i18n 'admin.web_hooks.events.go_details'}}
+  {{#link-to "adminWebHooks.show" model.extras.web_hook_id tagName="button" classNames="btn"}}
+    {{d-icon "far-edit"}} {{i18n "admin.web_hooks.events.go_details"}}
   {{/link-to}}
 </div>
 
-<div class='web-hook-events-listing'>
+<div class="web-hook-events-listing">
   {{#if model}}
     {{#load-more selector=".web-hook-events li" action=(action "loadMore")}}
-      <div class='web-hook-events content-list'>
-        <div class='heading-container'>
-          <div class='col heading first status'>{{i18n 'admin.web_hooks.events.status'}}</div>
-          <div class='col heading event-id'>{{i18n 'admin.web_hooks.events.event_id'}}</div>
-          <div class='col heading timestamp'>{{i18n 'admin.web_hooks.events.timestamp'}}</div>
-          <div class='col heading completion'>{{i18n 'admin.web_hooks.events.completion'}}</div>
-          <div class='col heading actions'>{{i18n 'admin.web_hooks.events.actions'}}</div>
-          <div class='clearfix'></div>
+      <div class="web-hook-events content-list">
+        <div class="heading-container">
+          <div class="col heading first status">{{i18n "admin.web_hooks.events.status"}}</div>
+          <div class="col heading event-id">{{i18n "admin.web_hooks.events.event_id"}}</div>
+          <div class="col heading timestamp">{{i18n "admin.web_hooks.events.timestamp"}}</div>
+          <div class="col heading completion">{{i18n "admin.web_hooks.events.completion"}}</div>
+          <div class="col heading actions">{{i18n "admin.web_hooks.events.actions"}}</div>
+          <div class="clearfix"></div>
         </div>
         {{#if hasIncoming}}
-          <a href class='alert alert-info clickable' tabindex="0" {{action "showInserted"}}>
+          <a href tabindex="0" {{action "showInserted"}} class="alert alert-info clickable">
             {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}}
           </a>
         {{/if}}
@@ -34,6 +34,6 @@
       {{conditional-loading-spinner condition=model.loadingMore}}
     {{/load-more}}
   {{else}}
-    <p>{{i18n 'admin.web_hooks.events.none'}}</p>
+    <p>{{i18n "admin.web_hooks.events.none"}}</p>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
index ee7cb36eca..83540a03da 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
@@ -1,19 +1,19 @@
-{{#link-to 'adminWebHooks' class="go-back"}}
-  {{d-icon 'arrow-left'}}
-  {{i18n 'admin.web_hooks.go_back'}}
+{{#link-to "adminWebHooks" class="go-back"}}
+  {{d-icon "arrow-left"}}
+  {{i18n "admin.web_hooks.go_back"}}
 {{/link-to}}
 
-<div class='web-hook-container'>
-  <p>{{i18n 'admin.web_hooks.detailed_instruction'}}</p>
-  <form class='web-hook form-horizontal'>
+<div class="web-hook-container">
+  <p>{{i18n "admin.web_hooks.detailed_instruction"}}</p>
+  <form class="web-hook form-horizontal">
     <div>
-      <label for='payload-url'>{{i18n 'admin.web_hooks.payload_url'}}</label>
+      <label for="payload-url">{{i18n "admin.web_hooks.payload_url"}}</label>
       {{text-field name="payload-url" value=model.payload_url placeholderKey="admin.web_hooks.payload_url_placeholder"}}
       {{input-tip validation=urlValidation}}
     </div>
 
     <div>
-      <label for='content-type'>{{i18n 'admin.web_hooks.content_type'}}</label>
+      <label for="content-type">{{i18n "admin.web_hooks.content_type"}}</label>
       {{combo-box
         content=contentTypes
         name="content-type"
@@ -23,16 +23,16 @@
     </div>
 
     <div>
-      <label for='secret'>{{i18n 'admin.web_hooks.secret'}}</label>
+      <label for="secret">{{i18n "admin.web_hooks.secret"}}</label>
       {{text-field name="secret" value=model.secret placeholderKey="admin.web_hooks.secret_placeholder"}}
       {{input-tip validation=secretValidation}}
     </div>
 
     <div class="cbox10">
-      <label>{{i18n 'admin.web_hooks.event_chooser'}}</label>
+      <label>{{i18n "admin.web_hooks.event_chooser"}}</label>
       <div>
         {{radio-button class="subscription-choice" name="subscription-choice" value="individual" selection=model.webHookType}}
-        {{i18n 'admin.web_hooks.individual_event'}}
+        {{i18n "admin.web_hooks.individual_event"}}
         {{input-tip validation=eventTypeValidation}}
       </div>
       {{#unless model.wildcard_web_hook}}
@@ -44,57 +44,57 @@
       {{/unless}}
       <div>
         {{radio-button class="subscription-choice" name="subscription-choice" value="wildcard" selection=model.webHookType}}
-        {{i18n 'admin.web_hooks.wildcard_event'}}
+        {{i18n "admin.web_hooks.wildcard_event"}}
       </div>
     </div>
 
-    <div class='filters'>
+    <div class="filters">
       <div class="filter">
-        <label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.categories_filter'}}</label>
+        <label>{{d-icon "circle" class="tracking"}}{{i18n "admin.web_hooks.categories_filter"}}</label>
         {{category-selector
           categories=model.categories
           onChange=(action (mut model.categories))
         }}
-        <div class="instructions">{{i18n 'admin.web_hooks.categories_filter_instructions'}}</div>
+        <div class="instructions">{{i18n "admin.web_hooks.categories_filter_instructions"}}</div>
       </div>
       {{#if showTagsFilter}}
         <div class="filter">
-          <label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.tags_filter'}}</label>
+          <label>{{d-icon "circle" class="tracking"}}{{i18n "admin.web_hooks.tags_filter"}}</label>
           {{tag-chooser tags=model.tag_names everyTag=true excludeSynonyms=true}}
-          <div class="instructions">{{i18n 'admin.web_hooks.tags_filter_instructions'}}</div>
+          <div class="instructions">{{i18n "admin.web_hooks.tags_filter_instructions"}}</div>
         </div>
       {{/if}}
       <div class="filter">
-        <label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.groups_filter'}}</label>
+        <label>{{d-icon "circle" class="tracking"}}{{i18n "admin.web_hooks.groups_filter"}}</label>
         {{group-selector groupNames=model.groupsFilterInName groupFinder=model.groupFinder}}
-        <div class="instructions">{{i18n 'admin.web_hooks.groups_filter_instructions'}}</div>
+        <div class="instructions">{{i18n "admin.web_hooks.groups_filter_instructions"}}</div>
       </div>
     </div>
 
     {{plugin-outlet name="web-hook-fields" args=(hash model=model)}}
 
     <div>
-      {{input type="checkbox" name="verify_certificate" checked=model.verify_certificate}} {{i18n 'admin.web_hooks.verify_certificate'}}
+      {{input type="checkbox" name="verify_certificate" checked=model.verify_certificate}} {{i18n "admin.web_hooks.verify_certificate"}}
     </div>
     <div>
       <div>
-        {{input type="checkbox" name="active" checked=model.active}} {{i18n 'admin.web_hooks.active'}}
+        {{input type="checkbox" name="active" checked=model.active}} {{i18n "admin.web_hooks.active"}}
       </div>
       {{#if model.active}}
-        <div class="instructions">{{i18n 'admin.web_hooks.active_notice'}}</div>
+        <div class="instructions">{{i18n "admin.web_hooks.active_notice"}}</div>
       {{/if}}
     </div>
   </form>
 
-  <div class='controls'>
+  <div class="controls">
     {{d-button class="btn-default" translatedLabel=saveButtonText action=(action "save") disabled=saveButtonDisabled}}
 
     {{#unless model.isNew}}
       {{d-button class="btn-danger" label="admin.web_hooks.destroy" action=(action "destroy")}}
-      {{#link-to 'adminWebHooks.showEvents' model.id class="btn"}}
-        {{i18n 'admin.web_hooks.events.go_events'}}
+      {{#link-to "adminWebHooks.showEvents" model.id class="btn"}}
+        {{i18n "admin.web_hooks.events.go_events"}}
       {{/link-to}}
     {{/unless}}
-    <span class='saving'>{{savingStatus}}</span>
+    <span class="saving">{{savingStatus}}</span>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks.hbs b/app/assets/javascripts/admin/templates/web-hooks.hbs
index c65964d41f..abc2b6e90e 100644
--- a/app/assets/javascripts/admin/templates/web-hooks.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks.hbs
@@ -1,29 +1,29 @@
-<div class='web-hooks-listing'>
-  <p>{{i18n 'admin.web_hooks.instruction'}}</p>
-  <div class='new-webhook'>
-    {{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn btn-default'}}
-      {{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
+<div class="web-hooks-listing">
+  <p>{{i18n "admin.web_hooks.instruction"}}</p>
+  <div class="new-webhook">
+    {{#link-to "adminWebHooks.show" "new" tagName="button" classNames="btn btn-default"}}
+      {{d-icon "plus"}} {{i18n "admin.web_hooks.new"}}
     {{/link-to}}
   </div>
   {{#if model}}
     {{#load-more selector=".web-hooks tr" action=(action "loadMore")}}
-      <table class='web-hooks grid'>
+      <table class="web-hooks grid">
         <thead>
           <tr>
-            <th>{{i18n 'admin.web_hooks.delivery_status.title'}}</th>
-            <th>{{i18n 'admin.web_hooks.payload_url'}}</th>
-            <th>{{i18n 'admin.web_hooks.description'}}</th>
-            <th>{{i18n 'admin.web_hooks.controls'}}</th>
+            <th>{{i18n "admin.web_hooks.delivery_status.title"}}</th>
+            <th>{{i18n "admin.web_hooks.payload_url"}}</th>
+            <th>{{i18n "admin.web_hooks.description"}}</th>
+            <th>{{i18n "admin.web_hooks.controls"}}</th>
           </tr>
         </thead>
         <tbody>
           {{#each model as |webHook|}}
             <tr>
-              <td class='delivery-status'>{{#link-to 'adminWebHooks.showEvents' webHook.id}}{{admin-web-hook-status deliveryStatuses=deliveryStatuses model=webHook}}{{/link-to}}</td>
-              <td class='payload-url'>{{#link-to 'adminWebHooks.show' webHook}}{{webHook.payload_url}}{{/link-to}}</td>
-              <td class='description'>{{webHook.description}}</td>
-              <td class='controls'>
-                {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{d-icon 'far-edit'}}{{/link-to}}
+              <td class="delivery-status">{{#link-to "adminWebHooks.showEvents" webHook.id}}{{admin-web-hook-status deliveryStatuses=deliveryStatuses model=webHook}}{{/link-to}}</td>
+              <td class="payload-url">{{#link-to "adminWebHooks.show" webHook}}{{webHook.payload_url}}{{/link-to}}</td>
+              <td class="description">{{webHook.description}}</td>
+              <td class="controls">
+                {{#link-to "adminWebHooks.show" webHook tagName="button" classNames="btn btn-default no-text"}}{{d-icon "far-edit"}}{{/link-to}}
                 {{d-button class="destroy btn-danger" action=(action "destroy") actionParam=webHook icon="times"}}
               </td>
             </tr>
@@ -33,6 +33,6 @@
       {{conditional-loading-spinner condition=model.loadingMore}}
     {{/load-more}}
   {{else}}
-    <p>{{i18n 'admin.web_hooks.none'}}</p>
+    <p>{{i18n "admin.web_hooks.none"}}</p>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index 11c0471480..63cae2c260 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -1,106 +1,106 @@
 {{#d-section pageClass="about"}}
-  <div class='container'>
-    <div class='contents clearfix body-page'>
+  <div class="container">
+    <div class="contents clearfix body-page">
 
       <ul class="nav-pills">
-        <li class="nav-item-about">{{#link-to 'about' class="active"}}{{i18n 'about.simple_title'}}{{/link-to}}</li>
+        <li class="nav-item-about">{{#link-to "about" class="active"}}{{i18n "about.simple_title"}}{{/link-to}}</li>
         {{#if faqOverriden}}
-          <li class="nav-item-guidelines">{{#link-to 'guidelines'}}{{i18n 'guidelines'}}{{/link-to}}</li>
-          <li class="nav-item-faq">{{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}</li>
+          <li class="nav-item-guidelines">{{#link-to "guidelines"}}{{i18n "guidelines"}}{{/link-to}}</li>
+          <li class="nav-item-faq">{{#link-to "faq"}}{{i18n "faq"}}{{/link-to}}</li>
         {{else}}
-          <li class="nav-item-faq">{{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}</li>
+          <li class="nav-item-faq">{{#link-to "faq"}}{{i18n "faq"}}{{/link-to}}</li>
         {{/if}}
-        <li class="nav-item-tos">{{#link-to 'tos'}}{{i18n 'tos'}}{{/link-to}}</li>
-        <li class="nav-item-privacy">{{#link-to 'privacy'}}{{i18n 'privacy'}}{{/link-to}}</li>
+        <li class="nav-item-tos">{{#link-to "tos"}}{{i18n "tos"}}{{/link-to}}</li>
+        <li class="nav-item-privacy">{{#link-to "privacy"}}{{i18n "privacy"}}{{/link-to}}</li>
       </ul>
 
-      <section class='about description'>
-        <h2>{{i18n 'about.title' title=model.title}}</h2>
+      <section class="about description">
+        <h2>{{i18n "about.title" title=model.title}}</h2>
         <p>{{model.description}}</p>
       </section>
 
       {{plugin-outlet name="about-after-description"
-              connectorTagName='section'
-              tagName=''
+              connectorTagName="section"
+              tagName=""
               args=(hash model=model)}}
 
       {{#if model.admins}}
-        <section class='about admins'>
-          <h3>{{d-icon "users"}} {{i18n 'about.our_admins'}}</h3>
+        <section class="about admins">
+          <h3>{{d-icon "users"}} {{i18n "about.our_admins"}}</h3>
 
           {{about-page-users users=model.admins}}
-          <div class='clearfix'></div>
+          <div class="clearfix"></div>
 
         </section>
       {{/if}}
 
       {{plugin-outlet name="about-after-admins"
-                    connectorTagName='section'
+                    connectorTagName="section"
                     args=(hash model=model)}}
 
       {{#if model.moderators}}
-        <section class='about moderators'>
-          <h3>{{d-icon "users"}} {{i18n 'about.our_moderators'}}</h3>
+        <section class="about moderators">
+          <h3>{{d-icon "users"}} {{i18n "about.our_moderators"}}</h3>
 
-          <div class='users'>
+          <div class="users">
             {{about-page-users users=model.moderators}}
           </div>
-          <div class='clearfix'></div>
+          <div class="clearfix"></div>
         </section>
       {{/if}}
 
       {{plugin-outlet name="about-after-moderators"
-                    connectorTagName='section'
+                    connectorTagName="section"
                     args=(hash model=model)}}
 
       {{#if model.category_moderators.length}}
         {{#each model.category_moderators as |cm|}}
-          <section class='about category-moderators moderators-{{cm.category.slug}}'>
+          <section class="about category-moderators moderators-{{cm.category.slug}}">
             <h3>{{category-link cm.category}}{{i18n "about.moderators"}}</h3>
-            <div class='users'>
+            <div class="users">
               {{about-page-users users=cm.moderators}}
             </div>
-            <div class='clearfix'></div>
+            <div class="clearfix"></div>
           </section>
         {{/each}}
       {{/if}}
-      <section class='about stats'>
-        <h3>{{d-icon "far-chart-bar"}}  {{i18n 'about.stats'}}</h3>
+      <section class="about stats">
+        <h3>{{d-icon "far-chart-bar"}}  {{i18n "about.stats"}}</h3>
 
-        <table class='table'>
+        <table class="table">
           <tbody>
             <tr>
               <th>&nbsp;</th>
-              <th>{{i18n 'about.stat.last_7_days'}}</th>
-              <th>{{i18n 'about.stat.last_30_days'}}</th>
-              <th>{{i18n 'about.stat.all_time'}}</th>
+              <th>{{i18n "about.stat.last_7_days"}}</th>
+              <th>{{i18n "about.stat.last_30_days"}}</th>
+              <th>{{i18n "about.stat.all_time"}}</th>
             </tr>
             <tr>
-              <td class='title'>{{i18n 'about.topic_count'}}</td>
+              <td class="title">{{i18n "about.topic_count"}}</td>
               <td>{{number model.stats.topics_7_days}}</td>
               <td>{{number model.stats.topics_30_days}}</td>
               <td>{{number model.stats.topic_count}}</td>
             </tr>
             <tr>
-              <td>{{i18n 'about.post_count'}}</td>
+              <td>{{i18n "about.post_count"}}</td>
               <td>{{number model.stats.posts_7_days}}</td>
               <td>{{number model.stats.posts_30_days}}</td>
               <td>{{number model.stats.post_count}}</td>
             </tr>
             <tr>
-              <td>{{i18n 'about.user_count'}}</td>
+              <td>{{i18n "about.user_count"}}</td>
               <td>{{number model.stats.users_7_days}}</td>
               <td>{{number model.stats.users_30_days}}</td>
               <td>{{number model.stats.user_count}}</td>
             </tr>
             <tr>
-              <td>{{i18n 'about.active_user_count'}}</td>
+              <td>{{i18n "about.active_user_count"}}</td>
               <td>{{number model.stats.active_users_7_days}}</td>
               <td>{{number model.stats.active_users_30_days}}</td>
               <td>&mdash;</td>
             </tr>
             <tr>
-              <td>{{i18n 'about.like_count'}}</td>
+              <td>{{i18n "about.like_count"}}</td>
               <td>{{number model.stats.likes_7_days}}</td>
               <td>{{number model.stats.likes_30_days}}</td>
               <td>{{number model.stats.like_count}}</td>
@@ -110,8 +110,8 @@
       </section>
 
       {{#if contactInfo}}
-        <section class='about contact'>
-          <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
+        <section class="about contact">
+          <h3>{{d-icon "far-envelope"}} {{i18n "about.contact"}}</h3>
           <p>{{html-safe contactInfo}}</p>
         </section>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/account-created.hbs b/app/assets/javascripts/discourse/templates/account-created.hbs
index e2d9b1756a..46bbcd1094 100644
--- a/app/assets/javascripts/discourse/templates/account-created.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created.hbs
@@ -1,5 +1,5 @@
-<div id='simple-container'>
-  <div class='account-created'>
+<div id="simple-container">
+  <div class="account-created">
     {{outlet}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs b/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs
index dfbfaba92b..677a6c5634 100644
--- a/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs
@@ -1,8 +1,8 @@
-<div class='ac-message'>
+<div class="ac-message">
   {{activation-email-form email=newEmail}}
 </div>
 
-<div class='activation-controls'>
+<div class="activation-controls">
   {{d-button action=(action "changeEmail")
              label="login.submit_new_email"
              disabled=submitDisabled
diff --git a/app/assets/javascripts/discourse/templates/account-created/index.hbs b/app/assets/javascripts/discourse/templates/account-created/index.hbs
index 8122270cd6..3bbbb93011 100644
--- a/app/assets/javascripts/discourse/templates/account-created/index.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/index.hbs
@@ -1,4 +1,4 @@
-<div class='ac-message'>
+<div class="ac-message">
   {{html-safe accountCreated.message}}
 </div>
 {{#if accountCreated.show_controls}}
diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
index 16c29c4b9b..17863fd965 100644
--- a/app/assets/javascripts/discourse/templates/account-created/resent.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
@@ -1,7 +1,7 @@
-<div class='ac-message'>
+<div class="ac-message">
   {{#if email}}
-    {{html-safe (i18n 'login.sent_activation_email_again' currentEmail=email)}}
+    {{html-safe (i18n "login.sent_activation_email_again" currentEmail=email)}}
   {{else}}
-    {{i18n 'login.sent_activation_email_again_generic'}}
+    {{i18n "login.sent_activation_email_again_generic"}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/templates/badges/index.hbs
index 8c7288185f..0f64b83f62 100644
--- a/app/assets/javascripts/discourse/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/index.hbs
@@ -1,11 +1,11 @@
 {{#d-section pageClass="badges"}}
-  <div class='container badges'>
-    <h1>{{i18n 'badges.title'}}</h1>
+  <div class="container badges">
+    <h1>{{i18n "badges.title"}}</h1>
 
-    <div class='badge-groups'>
+    <div class="badge-groups">
       {{#each badgeGroups as |bg|}}
-        <div class='badge-grouping'>
-          <div class='title'>
+        <div class="badge-grouping">
+          <div class="title">
             <h3>{{bg.badgeGrouping.displayName}}</h3>
           </div>
           <div class="badge-group-list">
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 38869b6f0d..7080c1af16 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -1,17 +1,17 @@
-<div class='container show-badge {{model.slug}}'>
+<div class="container show-badge {{model.slug}}">
   <h1>
-    {{#link-to 'badges.index'}}{{i18n 'badges.title'}}{{/link-to}}
+    {{#link-to "badges.index"}}{{i18n "badges.title"}}{{/link-to}}
      /
     {{model.name}}
   </h1>
 
-  <div class='show-badge-details'>
+  <div class="show-badge-details">
     {{badge-card badge=model size="large" count=userBadges.grant_count}}
-    <div class='badge-grant-info {{if hiddenSetTitle '' 'hidden'}}'>
+    <div class="badge-grant-info {{if hiddenSetTitle "" "hidden"}}">
       <div>
         {{#if canSelectTitle}}
-          <div class='grant-info-item'>
-            {{i18n 'badges.allow_title'}}
+          <div class="grant-info-item">
+            {{i18n "badges.allow_title"}}
             {{d-button
               class="btn-default pad-left"
               action=(action "toggleSetUserTitle")
@@ -19,15 +19,15 @@
           </div>
         {{/if}}
         {{#if model.multiple_grant}}
-          <div class='grant-info-item'>
-            {{i18n 'badges.multiple_grant'}}
+          <div class="grant-info-item">
+            {{i18n "badges.multiple_grant"}}
           </div>
         {{/if}}
       </div>
     </div>
 
     {{#if canSelectTitle}}
-      <div class='badge-set-title {{if hiddenSetTitle 'hidden' ''}}'>
+      <div class="badge-set-title {{if hiddenSetTitle "hidden" ""}}">
         {{badge-title selectableUserBadges=selectableUserBadges user=user}}
         {{d-button class="btn-default close-btn" action=(action "toggleSetUserTitle") label="close"}}
       </div>
@@ -40,7 +40,7 @@
         <div class="badges-granted">
           {{#each userBadges as |ub|}}
             {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
-              <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
+              <div class="granted-on">{{i18n "badges.granted_on" date=(inline-date ub.granted_at)}}</div>
               {{#if ub.post_number}}
                 <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
               {{/if}}
@@ -51,8 +51,8 @@
 
       {{#unless canLoadMore}}
         {{#if canShowOthers}}
-          <div class='clearfix'>
-            <a class='btn' href={{model.url}}>{{i18n 'badges.others_count' count=othersCount}}</a>
+          <div class="clearfix">
+            <a href={{model.url}} class="btn">{{i18n "badges.others_count" count=othersCount}}</a>
           </div>
         {{/if}}
       {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index 80bbae0936..c33db7c9a5 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,13 +1,13 @@
-<label class="btn btn-default btn-icon-text" disabled={{uploading}} title={{i18n 'user.change_avatar.upload_title'}}>
+<label class="btn btn-default btn-icon-text" disabled={{uploading}} title={{i18n "user.change_avatar.upload_title"}}>
   {{d-icon "far-image"}}
   {{#if uploading}}
-    {{i18n 'uploading'}} {{uploadProgress}}%
+    {{i18n "uploading"}} {{uploadProgress}}%
   {{else}}
-    {{i18n 'upload'}}
+    {{i18n "upload"}}
   {{/if}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
 </label>
 
 {{#if imageIsNotASquare}}
-  <div class="warning">{{i18n 'user.change_avatar.image_is_not_a_square'}}</div>
+  <div class="warning">{{i18n "user.change_avatar.image_is_not_a_square"}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs b/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
index 77581a3598..90c8c9f10b 100644
--- a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn" disabled={{uploading}} title={{i18n 'admin.backups.upload.title'}}>
+<label class="btn" disabled={{uploading}} title={{i18n "admin.backups.upload.title"}}>
   {{d-icon "upload"}}&nbsp;{{uploadButtonText}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".gz">
 </label>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 4fb6aa77c0..415e4738c0 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -1,17 +1,17 @@
 {{#if displayCount}}
-  <a href={{url}} class='grant-count' title={{i18n 'badges.granted' count=displayCount}}>{{displayCount}}</a>
+  <a href={{url}} title={{i18n "badges.granted" count=displayCount}} class="grant-count">{{displayCount}}</a>
 {{/if}}
 {{#if badge.has_badge}}
-  <a href={{url}} class='check-display status-checked'>{{d-icon "check"}}</a>
+  <a href={{url}} class="check-display status-checked">{{d-icon "check"}}</a>
 {{/if}}
-<div class='badge-contents'>
-  <div class='badge-icon {{badge.badgeTypeClassName}}'>
+<div class="badge-contents">
+  <div class="badge-icon {{badge.badgeTypeClassName}}">
     <a href={{url}}>{{icon-or-image badge}}</a>
   </div>
-  <div class='badge-info'>
-    <div class='badge-info-item'>
-      <h3><a href={{url}} class='badge-link'>{{badge.name}}</a></h3>
-      <div class='badge-summary'>{{html-safe summary}}</div>
+  <div class="badge-info">
+    <div class="badge-info-item">
+      <h3><a href={{url}} class="badge-link">{{badge.name}}</a></h3>
+      <div class="badge-summary">{{html-safe summary}}</div>
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-selector.hbs b/app/assets/javascripts/discourse/templates/components/badge-selector.hbs
index c1c29859e2..5ea3c796ec 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-selector.hbs
@@ -1 +1 @@
-<input class='ember-text-field badge-names' type="text" placeholder={{placeholder}} name="badges">
+<input type="text" placeholder={{placeholder}} name="badges" class="ember-text-field badge-names">
diff --git a/app/assets/javascripts/discourse/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
index abb66e44aa..de1e7fbafa 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
@@ -1,9 +1,9 @@
-<section class='user-content'>
+<section class="user-content">
   <form class="form-horizontal">
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n 'badges.select_badge_for_title'}}</h3>
+        <h3>{{i18n "badges.select_badge_for_title"}}</h3>
       </div>
     </div>
 
@@ -25,7 +25,7 @@
           action=(action "save")
           disabled=saving
           label=(if saving "saving" "save")}}
-        {{#if saved}}{{i18n 'saved'}}{{/if}}
+        {{#if saved}}{{i18n "saved"}}{{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index 39a6b0112d..b0c43c6639 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -1,7 +1,7 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if hasIncoming}}
     <div class="show-mores">
-      <a tabindex="0" href {{action showInserted}} class='alert alert-info clickable'>
+      <a tabindex="0" href {{action showInserted}} class="alert alert-info clickable">
         {{count-i18n key="topic_count_" suffix="latest" count=2}}
       </a>
     </div>
@@ -23,8 +23,8 @@
     }}
   {{else}}
     {{#unless loadingMore}}
-      <div class='alert alert-info'>
-        {{i18n 'choose_topic.none_found'}}
+      <div class="alert alert-info">
+        {{i18n "choose_topic.none_found"}}
       </div>
     {{/unless}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs b/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs
index eca71a610a..9a950ed741 100644
--- a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs
@@ -1,5 +1,5 @@
 {{#if selected}}
-  <div id='bulk-select'>
+  <div id="bulk-select">
     {{d-button class="btn-default" action=(action "showBulkActions") icon="wrench"}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/cancel-link.hbs b/app/assets/javascripts/discourse/templates/components/cancel-link.hbs
index 4455e8b8d4..311aaceae0 100644
--- a/app/assets/javascripts/discourse/templates/components/cancel-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/cancel-link.hbs
@@ -1,3 +1,3 @@
 {{#link-to route args class="cancel"}}
-  {{i18n 'cancel'}}
+  {{i18n "cancel"}}
 {{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
index be7ee3e4a3..29c22f16fa 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
@@ -1,7 +1,7 @@
-<div class='column categories'>
+<div class="column categories">
   {{categories-only categories=categories}}
 </div>
 
-<div class='column'>
+<div class="column">
   {{categories-topic-list topics=topics filter="latest" class="latest-topic-list"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs
index 4e84c4d631..ebb4a35781 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs
@@ -1,7 +1,7 @@
-<div class='column categories'>
+<div class="column categories">
   {{categories-only categories=categories}}
 </div>
 
-<div class='column'>
+<div class="column">
   {{categories-topic-list topics=topics filter="top" class="top-topic-list"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
index b95a06db7a..63277909ec 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
@@ -1,5 +1,5 @@
 {{d-icon topicStatusIcon}}
 
-<a class='title' href={{topic.lastUnreadUrl}}>
+<a href={{topic.lastUnreadUrl}} class="title">
   {{text-overflow class="overflow" text=topic.fancyTitle}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index ea6853b37d..16861c98f0 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -1,7 +1,7 @@
 {{#each categories as |c|}}
-  <div data-notification-level={{c.notificationLevelString}} class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}' style={{unless noCategoryStyle (border-color c.color)}}>
-    <div class='category-box-inner'>
-      <div class='category-box-heading'>
+  <div data-notification-level={{c.notificationLevelString}} style={{unless noCategoryStyle (border-color c.color)}} class="category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}">
+    <div class="category-box-inner">
+      <div class="category-box-heading">
         <a href={{c.url}}>
           {{#unless c.isMuted}}
             {{#if c.uploaded_logo.url}}
@@ -16,7 +16,7 @@
           <h3>
             {{category-title-before category=c}}
             {{#if c.read_restricted}}
-              {{d-icon 'lock'}}
+              {{d-icon "lock"}}
             {{/if}}
             {{c.name}}
           </h3>
@@ -24,7 +24,7 @@
       </div>
 
       {{#unless c.isMuted}}
-        <div class='featured-topics'>
+        <div class="featured-topics">
           {{#if c.topics}}
             <ul>
               {{#each c.topics as |topic|}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 40b256d283..1b224b7c58 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -1,7 +1,6 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}' style={{unless noCategoryStyle (border-color c.color)}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
-   data-url={{c.url}}>
-    <div class='category-box-inner'>
+  <div style={{unless noCategoryStyle (border-color c.color)}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} data-url={{c.url}} class="category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}">
+    <div class="category-box-inner">
       {{#unless c.isMuted}}
         <div class="category-logo">
           {{#if c.uploaded_logo.url}}
@@ -15,11 +14,11 @@
         </div>
       {{/unless}}
       <div class="category-details">
-        <div class='category-box-heading'>
+        <div class="category-box-heading">
           <a class="parent-box-link" href={{c.url}}>
             <h3>
               {{#if c.read_restricted}}
-                {{d-icon 'lock'}}
+                {{d-icon "lock"}}
               {{/if}}
               {{c.name}}
             </h3>
@@ -27,19 +26,19 @@
         </div>
 
         {{#unless c.isMuted}}
-          <div class='description'>
+          <div class="description">
             {{text-overflow class="overflow" text=c.description_excerpt}}
           </div>
           {{#if c.isGrandParent}}
             {{#each c.subcategories as |subcategory|}}
-              <div data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}}  style={{border-color subcategory.color}} class="subcategory with-subcategories {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
+              <div data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}} style={{border-color subcategory.color}} class="subcategory with-subcategories {{if subcategory.uploaded_logo.url "has-logo" "no-logo"}}">
                 <div class="subcategory-box-inner">
                   {{category-title-link tagName="h4" category=subcategory}}
                   {{#if subcategory.subcategories}}
-                    <div class='subcategories'>
+                    <div class="subcategories">
                       {{#each subcategory.subcategories as |subsubcategory|}}
                         {{#unless subsubcategory.isMuted}}
-                          <span class='subcategory'>
+                          <span class="subcategory">
                             {{category-title-before category=subsubcategory}}
                             {{category-link subsubcategory hideParent="true"}}
                           </span>
@@ -51,7 +50,7 @@
               </div>
             {{/each}}
           {{else if c.subcategories}}
-            <div class='subcategories'>
+            <div class="subcategories">
               {{#each c.subcategories as |sc|}}
                 <a class="subcategory" href={{sc.url}}>
                   <span class="subcategory-image-placeholder">
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 495a40ec9f..787968d3d5 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -1,18 +1,18 @@
 {{#if categories}}
-  <table class="category-list {{if showTopics 'with-topics'}}">
+  <table class="category-list {{if showTopics "with-topics"}}">
     <thead>
       <tr>
-        <th class="category"><span aria-role="heading" aria-level="2" id="categories-only-category">{{i18n 'categories.category'}}</span></th>
-        <th class="topics">{{i18n 'categories.topics'}}</th>
+        <th class="category"><span aria-role="heading" aria-level="2" id="categories-only-category">{{i18n "categories.category"}}</span></th>
+        <th class="topics">{{i18n "categories.topics"}}</th>
         {{#if showTopics}}
-          <th class="latest">{{i18n 'categories.latest'}}</th>
+          <th class="latest">{{i18n "categories.latest"}}</th>
         {{/if}}
       </tr>
     </thead>
     <tbody aria-labelledby="categories-only-category">
       {{#each categories as |c|}}
-        <tr data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
-          <td class="category {{if c.isMuted 'muted'}} {{if noCategoryStyle "no-category-style"}}" style={{unless noCategoryStyle (border-color c.color)}}>
+        <tr data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class="{{if c.description_excerpt "has-description" "no-description"}} {{if c.uploaded_logo.url "has-logo" "no-logo"}}">
+          <td class="category {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-style"}}" style={{unless noCategoryStyle (border-color c.color)}}>
             {{category-title-link category=c}}
             {{#unless c.isMuted}}
               {{#if c.description_excerpt}}
@@ -24,7 +24,7 @@
                 <table class="category-list subcategories-with-subcategories">
                   <tbody>
                     {{#each c.subcategories as |subcategory|}}
-                      <tr data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}} class="{{if subcategory.description_excerpt 'has-description' 'no-description'}} {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
+                      <tr data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}} class="{{if subcategory.description_excerpt "has-description" "no-description"}} {{if subcategory.uploaded_logo.url "has-logo" "no-logo"}}">
                         <td class="category" style={{border-color subcategory.color}}>
                           {{category-title-link tagName="h4" category=subcategory}}
                           {{#if subcategory.description_excerpt}}
@@ -33,10 +33,10 @@
                             </div>
                           {{/if}}
                           {{#if subcategory.subcategories}}
-                            <div class='subcategories'>
+                            <div class="subcategories">
                               {{#each subcategory.subcategories as |subsubcategory|}}
                                 {{#unless subsubcategory.isMuted}}
-                                  <span class='subcategory'>
+                                  <span class="subcategory">
                                     {{category-title-before category=subsubcategory}}
                                     {{category-link subsubcategory hideParent="true"}}
                                   </span>
@@ -56,10 +56,10 @@
                   </tbody>
                 </table>
               {{else if c.subcategories}}
-                <div class='subcategories'>
+                <div class="subcategories">
                   {{#each c.subcategories as |subcategory|}}
                     {{#unless subcategory.isMuted}}
-                      <span class='subcategory'>
+                      <span class="subcategory">
                         {{category-title-before category=subcategory}}
                         {{category-link subcategory hideParent="true"}}
                         {{category-unread category=subcategory}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
index 8a70f1b6fc..7c94faebd2 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
@@ -1,4 +1,4 @@
-<div class='table-heading' aria-role="heading" aria-level="2">
+<div aria-role="heading" aria-level="2" class="table-heading">
   {{i18n (concat "filters." filter ".title")}}
 </div>
 
@@ -7,10 +7,10 @@
     {{latest-topic-list-item topic=t}}
   {{/each}}
   <div class="more-topics">
-    <a href={{get-url (concat '/' filter)}} class="btn btn-default pull-right">{{i18n "more"}}</a>
+    <a href={{get-url (concat "/" filter)}} class="btn btn-default pull-right">{{i18n "more"}}</a>
   </div>
 {{else}}
-  <div class='no-topics'>
+  <div class="no-topics">
     <h3>{{i18n (concat "topics.none." filter)}}</h3>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs b/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs
index d6449d3136..b54858ff79 100644
--- a/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs
@@ -1,12 +1,12 @@
-<section class='field'>
+<section class="field">
   {{#unless category.isUncategorizedCategory}}
     <section class="field-item">
-      <label>{{i18n 'category.name'}}</label>
+      <label>{{i18n "category.name"}}</label>
       {{text-field value=category.name placeholderKey="category.name_placeholder" maxlength="50"}}
     </section>
   {{/unless}}
   <section class="field-item">
-    <label>{{i18n 'category.slug'}}</label>
+    <label>{{i18n "category.slug"}}</label>
     {{text-field value=category.slug placeholderKey="category.slug_placeholder" maxlength="255"}}
   </section>
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
index f973a28f1f..a37e55354f 100644
--- a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
@@ -2,7 +2,7 @@
   <div class="category-text-title">
     {{category-title-before category=category}}
     {{#if category.read_restricted}}
-      {{d-icon 'lock'}}
+      {{d-icon "lock"}}
     {{/if}}
     <span class="category-name">{{dir-span category.name}}</span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
index 15604d0f3c..f50c843f85 100644
--- a/app/assets/javascripts/discourse/templates/components/category-unread.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
@@ -1,6 +1,6 @@
 {{#if category.unreadTopics}}
-  <a href={{category.unreadUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.unread_topics' count=category.unreadTopics}}>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
+  <a href={{category.unreadUrl}} title={{i18n "topic.unread_topics" count=category.unreadTopics}} class="badge new-posts badge-notification">{{i18n "filters.unread.lower_title_with_count" count=category.unreadTopics}}</a>
 {{/if}}
 {{#if category.newTopics}}
-  <a href={{category.newUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.new_topics' count=category.newTopics}}>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
+  <a href={{category.newUrl}} title={{i18n "topic.new_topics" count=category.newTopics}} class="badge new-posts badge-notification">{{i18n "filters.new.lower_title_with_count" count=category.newTopics}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
index b602627f0f..f8005caa4a 100644
--- a/app/assets/javascripts/discourse/templates/components/choose-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
@@ -1,17 +1,17 @@
-<label for='choose-message-title'>{{i18n 'choose_message.title.search'}}</label>
+<label for="choose-message-title">{{i18n "choose_message.title.search"}}</label>
 
 {{text-field value=messageTitle placeholderKey="choose_message.title.placeholder" id="choose-message-title"}}
 
 {{#if loading}}
-  <p>{{i18n 'loading'}}</p>
+  <p>{{i18n "loading"}}</p>
 {{else}}
   {{#if noResults}}
-    <p>{{i18n 'choose_message.none_found'}}</p>
+    <p>{{i18n "choose_message.none_found"}}</p>
   {{else}}
     {{#each messages as |m|}}
-      <div class='controls existing-message'>
-        <label class='radio'>
-          <input type='radio' id="choose-message-{{m.id}}" name='choose_message_id' {{action "chooseMessage" m}}>
+      <div class="controls existing-message">
+        <label class="radio">
+          <input id="choose-message-{{m.id}}" {{action "chooseMessage" m}} type="radio" name="choose_message_id">
           <span class="message-title">
             {{m.title}}
           </span>
diff --git a/app/assets/javascripts/discourse/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
index 2e5921d0e7..65a8dd3639 100644
--- a/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
@@ -1,17 +1,17 @@
-<label for='choose-topic-title'>{{i18n labelText}}</label>
+<label for="choose-topic-title">{{i18n labelText}}</label>
 
 {{text-field value=topicTitle placeholderKey="choose_topic.title.placeholder" id="choose-topic-title"}}
 
 {{#if loading}}
-  <p>{{i18n 'loading'}}</p>
+  <p>{{i18n "loading"}}</p>
 {{else}}
   {{#if noResults}}
-    <p>{{i18n 'choose_topic.none_found'}}</p>
+    <p>{{i18n "choose_topic.none_found"}}</p>
   {{else}}
     {{#each topics as |t|}}
-      <div class='controls existing-topic'>
-        <label class='radio'>
-          <input type='radio' id="choose-topic-{{t.id}}" name='choose_topic_id' {{action "chooseTopic" t}}>
+      <div class="controls existing-topic">
+        <label class="radio">
+          <input id="choose-topic-{{t.id}}" {{action "chooseTopic" t}} type="radio" name="choose_topic_id">
           {{raw "topic-status" topic=t}}
           <span class="topic-title">
             {{t.title}}
diff --git a/app/assets/javascripts/discourse/templates/components/color-picker.hbs b/app/assets/javascripts/discourse/templates/components/color-picker.hbs
index 9832ffdf7d..a7b3613fa5 100644
--- a/app/assets/javascripts/discourse/templates/components/color-picker.hbs
+++ b/app/assets/javascripts/discourse/templates/components/color-picker.hbs
@@ -1,5 +1,5 @@
 {{#each colors as |c|}}
   {{#color-picker-choice color=c usedColors=usedColors selectColor=(action "selectColor")}}
-    {{d-icon 'check'}}
+    {{d-icon "check"}}
   {{/color-picker-choice}}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
index dd7ad30ff6..34e72ab50e 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
@@ -3,19 +3,19 @@
     topicId=topicId
     onChangeCallback=(action "triggerResize")
     id="private-message-users"
-    includeMessageableGroups='true'
+    includeMessageableGroups="true"
     placeholderKey="composer.users_placeholder"
     tabindex="1"
     usernames=usernames
     hasGroups=hasGroups
-    allowEmails='true'
+    allowEmails="true"
     autocomplete="discourse"
   }}
 {{else}}
   <a href {{action "toggleSelector"}}>
-    <div class='ac-wrap composer-user-selector-limited'>
+    <div class="ac-wrap composer-user-selector-limited">
       <span>{{limitedUsernames}}</span>
-      <span class='btn btn-primary'>{{hiddenUsersCount}}</span>
+      <span class="btn btn-primary">{{hiddenUsersCount}}</span>
     </div>
   </a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs b/app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs
index a508a69b39..af83ebbb10 100644
--- a/app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs
+++ b/app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs
@@ -1,6 +1,6 @@
 {{#unless hidden}}
-  <div class='row'>
-    <div class='alert alert-info alert-too-few-topics'>
+  <div class="row">
+    <div class="alert alert-info alert-too-few-topics">
       {{message}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
index 51fc598783..4d03e30953 100644
--- a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
@@ -3,5 +3,5 @@
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".csv">
 </label>
 {{#if uploading}}
-  <span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
+  <span>{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index 58105b2cd2..6c9ed40075 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -11,7 +11,7 @@
 {{/if}}
 
 {{#if translatedLabel}}
-  <span class='d-button-label'>{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
+  <span class="d-button-label">{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 955ef53a71..f48dc424ac 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -1,6 +1,6 @@
-<div class='d-editor-container'>
+<div class="d-editor-container">
   <div class="d-editor-textarea-wrapper {{if disabled "disabled"}}">
-    <div class='d-editor-button-bar'>
+    <div class="d-editor-button-bar">
       {{#each toolbar.groups as |group|}}
         {{#each group.buttons as |b|}}
           {{#if b.popupMenu}}
@@ -27,7 +27,7 @@
         {{/each}}
 
         {{#unless group.lastGroup}}
-          <div class='d-editor-spacer'></div>
+          <div class="d-editor-spacer"></div>
         {{/unless}}
       {{/each}}
     </div>
@@ -45,10 +45,10 @@
     {{plugin-outlet name="after-d-editor" tagName="" args=outletArgs}}
   </div>
 
-  <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
+  <div class="d-editor-preview-wrapper {{if forcePreview "force-preview"}}">
     <div class="d-editor-preview">{{html-safe preview}}</div>
     {{plugin-outlet name="editor-preview" classNames="d-editor-plugin" args=outletArgs}}
   </div>
 </div>
 
-{{emoji-picker active=emojiPickerIsActive isEditorFocused=isEditorFocused emojiSelected=(action 'emojiSelected')}}
+{{emoji-picker active=emojiPickerIsActive isEditorFocused=isEditorFocused emojiSelected=(action "emojiSelected")}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs b/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs
index f61b3ed7c7..1acf461025 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs
@@ -1 +1 @@
-<a href {{action close}} class='d-modal-cancel'>{{i18n 'cancel'}}</a>
+<a href {{action close}} class="d-modal-cancel">{{i18n "cancel"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
index 9df8af3a17..f9e2c830dd 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -27,7 +27,7 @@
         {{/if}}
       </div>
 
-      <div id='modal-alert'></div>
+      <div id="modal-alert"></div>
 
       {{yield}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs b/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
index 0df2fbcc70..faa96a1eca 100644
--- a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
@@ -17,7 +17,7 @@
   <div class="alert error">{{error}}</div>
 {{/if}}
 
-<div class="panel from {{if fromPanelActive 'visible'}}">
+<div class="panel from {{if fromPanelActive "visible"}}">
   {{date-time-input
     date=from
     onChange=(action "_onChange" (hash prop="from"))
@@ -25,7 +25,7 @@
   }}
 </div>
 
-<div class="panel to {{if toPanelActive 'visible'}}">
+<div class="panel to {{if toPanelActive "visible"}}">
   {{date-time-input
     date=to
     onChange=(action "_onChange" (hash prop="to"))
diff --git a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
index 4b1ea0f111..0d88488ae4 100644
--- a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
+++ b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
@@ -2,7 +2,7 @@
   {{d-button icon="bell-slash" class="btn-default" label="user.desktop_notifications.not_supported" disabled="true"}}
 {{/if}}
 {{#if isDeniedPermission}}
-  {{d-button icon="bell-slash" class="btn-default"  label="user.desktop_notifications.perm_denied_btn" action=(action "recheckPermission") disabled='true'}}
+  {{d-button icon="bell-slash" class="btn-default" label="user.desktop_notifications.perm_denied_btn" action=(action "recheckPermission") disabled="true"}}
   {{i18n "user.desktop_notifications.perm_denied_expl"}}
 {{else}}
   {{#if isEnabled}}
diff --git a/app/assets/javascripts/discourse/templates/components/directory-item.hbs b/app/assets/javascripts/discourse/templates/components/directory-item.hbs
index e7758227f4..d939e353b4 100644
--- a/app/assets/javascripts/discourse/templates/components/directory-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/directory-item.hbs
@@ -7,5 +7,5 @@
 <td>{{number item.posts_read}}</td>
 <td>{{number item.days_visited}}</td>
 {{#if showTimeRead}}
-  <td><span class='time-read'>{{format-duration item.time_read}}</span></td>
+  <td><span class="time-read">{{format-duration item.time_read}}</span></td>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 9799c5ee42..75590dbbdb 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,7 +1,7 @@
 {{#if category.isUncategorizedCategory}}
   <p class="warning">
     {{d-icon "exclamation-triangle"}}
-    {{html-safe (i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink)}}
+    {{html-safe (i18n "category.uncategorized_general_warning" settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink)}}
   </p>
 {{/if}}
 
@@ -9,8 +9,8 @@
   {{category-name-fields category=category tagName=""}}
 
   {{#if canSelectParentCategory}}
-    <section class='field'>
-      <label>{{i18n 'category.parent'}}</label>
+    <section class="field">
+      <label>{{i18n "category.parent"}}</label>
       {{category-chooser
         rootNone=true
         value=category.parent_category_id
@@ -24,8 +24,8 @@
   {{/if}}
 
   {{#if subCategories}}
-    <section class='field'>
-      <label>{{i18n 'categories.subcategories'}}</label>
+    <section class="field">
+      <label>{{i18n "categories.subcategories"}}</label>
       {{#each subCategories as |s|}}
         {{category-badge s hideParent="true"}}
       {{/each}}
@@ -33,12 +33,12 @@
   {{/if}}
 
   {{#if showDescription}}
-    <section class='field'>
-      <label>{{i18n 'category.description'}}</label>
+    <section class="field">
+      <label>{{i18n "category.description"}}</label>
       {{#if category.description}}
         {{html-safe category.description}}
       {{else}}
-        {{i18n 'category.no_description'}}
+        {{i18n "category.no_description"}}
       {{/if}}
       {{#if category.topic_url}}
         <br>
@@ -48,24 +48,24 @@
   {{/if}}
 
   {{#unless noCategoryStyle}}
-    <section class='field'>
-      <label>{{i18n 'category.badge_colors'}}</label>
+    <section class="field">
+      <label>{{i18n "category.badge_colors"}}</label>
       <div class="category-color-editor">
         {{html-safe categoryBadgePreview}}
 
-        <div class='input-prepend input-append' style="margin-top: 10px;">
-          <span class='color-title'>{{i18n 'category.background_color'}}:</span>
+        <div style="margin-top: 10px;" class="input-prepend input-append">
+          <span class="color-title">{{i18n "category.background_color"}}:</span>
           <div class="colorpicker-wrapper">
-            <span class='add-on'>#</span>{{text-field value=category.color placeholderKey="category.color_placeholder" maxlength="6"}}
+            <span class="add-on">#</span>{{text-field value=category.color placeholderKey="category.color_placeholder" maxlength="6"}}
             {{color-picker colors=backgroundColors usedColors=usedBackgroundColors value=category.color}}
           </div>
         </div>
 
-        <div class='input-prepend input-append'>
-          <span class='color-title'>{{i18n 'category.foreground_color'}}:</span>
+        <div class="input-prepend input-append">
+          <span class="color-title">{{i18n "category.foreground_color"}}:</span>
           <div class="colorpicker-wrapper">
-            <span class='add-on'>#</span>{{text-field value=category.text_color placeholderKey="category.color_placeholder" maxlength="6"}}
-            {{color-picker colors=foregroundColors value=category.text_color id='edit-text-color'}}
+            <span class="add-on">#</span>{{text-field value=category.text_color placeholderKey="category.color_placeholder" maxlength="6"}}
+            {{color-picker colors=foregroundColors value=category.text_color id="edit-text-color"}}
           </div>
         </div>
       </div>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs
index f84d3e88a1..e55962d806 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs
@@ -1,5 +1,5 @@
-<section class='field'>
-  <label>{{i18n 'category.logo'}}</label>
+<section class="field">
+  <label>{{i18n "category.logo"}}</label>
   {{image-uploader
     imageUrl=logoImageUrl
     onUploadDone=(action "logoUploadDone")
@@ -8,8 +8,8 @@
     class="no-repeat contain-image"}}
 </section>
 
-<section class='field'>
-  <label>{{i18n 'category.background_image'}}</label>
+<section class="field">
+  <label>{{i18n "category.background_image"}}</label>
   {{image-uploader
     imageUrl=backgroundImageUrl
     onUploadDone=(action "backgroundUploadDone")
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index 68fb66239c..91978bec1c 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -1,13 +1,13 @@
-<section class='field'>
+<section class="field">
   {{#if category.is_special}}
     {{#if category.isUncategorizedCategory}}
-      <p class="warning">{{i18n 'category.uncategorized_security_warning'}}</p>
+      <p class="warning">{{i18n "category.uncategorized_security_warning"}}</p>
     {{else}}
-      <p class="warning">{{i18n 'category.special_warning'}}</p>
+      <p class="warning">{{i18n "category.special_warning"}}</p>
     {{/if}}
   {{/if}}
   {{#unless category.isUncategorizedCategory}}
-    <ul class='permission-list'>
+    <ul class="permission-list">
       {{#each category.permissions as |p|}}
         <li>
           <span class="name"><span class="badge-group">{{p.group_name}}</span></span>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index 401f4ebcb7..f7b4981e7a 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -1,19 +1,19 @@
 <section>
-  <h3>{{i18n 'category.settings_sections.general'}}</h3>
+  <h3>{{i18n "category.settings_sections.general"}}</h3>
 
   {{#if showPositionInput}}
-    <section class='field position-fields'>
+    <section class="field position-fields">
       <label for="category-position">
-        {{i18n 'category.position'}}
+        {{i18n "category.position"}}
       </label>
       {{text-field value=category.position id="category-position" class="position-input" type="number"}}
     </section>
   {{/if}}
 
   {{#unless showPositionInput}}
-    <section class='field'>
-      {{i18n 'category.position_disabled'}}
-      <a href={{get-url '/admin/site_settings/category/basic'}}>{{i18n 'category.position_disabled_click'}}</a>
+    <section class="field">
+      {{i18n "category.position_disabled"}}
+      <a href={{get-url "/admin/site_settings/category/basic"}}>{{i18n "category.position_disabled_click"}}</a>
     </section>
   {{/unless}}
 
@@ -46,19 +46,19 @@
     </div>
   </section>
 
-  <section class='field'>
+  <section class="field">
     <label>
       {{input type="checkbox" checked=category.allow_badges}}
-      {{i18n 'category.allow_badges_label'}}
+      {{i18n "category.allow_badges_label"}}
     </label>
   </section>
 
   {{#if siteSettings.topic_featured_link_enabled}}
-    <section class='field'>
+    <section class="field">
       <div class="allowed-topic-featured-link-category">
         <label class="checkbox-label">
           {{input type="checkbox" checked=category.topic_featured_link_allowed}}
-          {{i18n 'category.topic_featured_link_allowed'}}
+          {{i18n "category.topic_featured_link_allowed"}}
         </label>
       </div>
     </section>
@@ -80,11 +80,11 @@
 </section>
 
 <section>
-  <h3>{{i18n 'category.settings_sections.moderation'}}</h3>
+  <h3>{{i18n "category.settings_sections.moderation"}}</h3>
   {{#if siteSettings.enable_category_group_review}}
     <section class="field">
       <label for="reviewable-by-group">
-        {{i18n 'category.reviewable_by_group'}}
+        {{i18n "category.reviewable_by_group"}}
       </label>
       {{group-selector
         groupFinder=groupFinder
@@ -98,34 +98,34 @@
   <section class="field">
     <label>
       {{input type="checkbox" checked=category.custom_fields.require_topic_approval}}
-      {{i18n 'category.require_topic_approval'}}
+      {{i18n "category.require_topic_approval"}}
     </label>
   </section>
 
   <section class="field">
     <label>
       {{input type="checkbox" checked=category.custom_fields.require_reply_approval}}
-      {{i18n 'category.require_reply_approval'}}
+      {{i18n "category.require_reply_approval"}}
     </label>
   </section>
 
-  <section class='field'>
+  <section class="field">
     <div class="control-group">
       <label for="topic-auto-close">
-        {{i18n 'topic.auto_close.label'}}
+        {{i18n "topic.auto_close.label"}}
       </label>
       {{text-field value=category.auto_close_hours id="topic-auto-close" type="number"}}
       <label>
         {{input type="checkbox" checked=category.auto_close_based_on_last_post}}
-        {{i18n 'topic.auto_close.based_on_last_post'}}
+        {{i18n "topic.auto_close.based_on_last_post"}}
       </label>
     </div>
   </section>
 
   {{#if siteSettings.tagging_enabled}}
-    <section class='field minimum-required-tags'>
+    <section class="field minimum-required-tags">
       <label for="category-minimum-tags">
-        {{i18n 'category.minimum_required_tags'}}
+        {{i18n "category.minimum_required_tags"}}
       </label>
       {{text-field value=category.minimum_required_tags id="category-minimum-tags" type="number" min="0"}}
     </section>
@@ -227,25 +227,25 @@
   <h3>{{i18n "category.settings_sections.email"}}</h3>
 
   {{#if emailInEnabled}}
-    <section class='field'>
+    <section class="field">
       <label for="category-email-in">
         {{d-icon "far-envelope"}}
-        {{i18n 'category.email_in'}}
+        {{i18n "category.email_in"}}
       </label>
       {{text-field id="category-email-in" class="email-in" value=category.email_in}}
     </section>
 
-    <section class='field'>
+    <section class="field">
       <label>
         {{input type="checkbox" checked=category.email_in_allow_strangers}}
-        {{i18n 'category.email_in_allow_strangers'}}
+        {{i18n "category.email_in_allow_strangers"}}
       </label>
     </section>
 
-    <section class='field'>
+    <section class="field">
       <label>
         {{input type="checkbox" checked=category.mailinglist_mirror}}
-        {{i18n 'category.mailinglist_mirror'}}
+        {{i18n "category.mailinglist_mirror"}}
       </label>
     </section>
 
@@ -253,9 +253,9 @@
   {{/if}}
 
   {{#unless emailInEnabled}}
-    <section class='field'>
-      {{i18n 'category.email_in_disabled'}}
-      <a href={{get-url '/admin/site_settings/category/email'}}>{{i18n 'category.email_in_disabled_click'}}</a>
+    <section class="field">
+      {{i18n "category.email_in_disabled"}}
+      <a href={{get-url "/admin/site_settings/category/email"}}>{{i18n "category.email_in_disabled_click"}}</a>
     </section>
   {{/unless}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
index f56683a3f6..4338f2cb57 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
@@ -1 +1 @@
-<a href {{action "select"}} class={{if active 'active'}}>{{title}}</a>
+<a href {{action "select"}} class={{if active "active"}}>{{title}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
index 593d835744..6fcb4bded0 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
@@ -1,5 +1,5 @@
 <section class="field">
-  <label for="category-allowed-tags">{{i18n 'category.tags_allowed_tags'}}</label>
+  <label for="category-allowed-tags">{{i18n "category.tags_allowed_tags"}}</label>
   {{tag-chooser
     id="category-allowed-tags"
     tags=category.allowed_tags
@@ -14,36 +14,36 @@
 </section>
 
 <section class="field">
-  <label for="category-allowed-tag-groups">{{i18n 'category.tags_allowed_tag_groups'}}</label>
+  <label for="category-allowed-tag-groups">{{i18n "category.tags_allowed_tag_groups"}}</label>
   {{tag-group-chooser
     id="category-allowed-tag-groups"
     tagGroups=category.allowed_tag_groups
   }}
-  {{#link-to 'tagGroups'}}{{i18n 'category.manage_tag_groups_link'}}{{/link-to}}
-</section>
-
-<section class='field'>
-  <label>
-    {{input type="checkbox" checked=category.allow_global_tags id="allow_global_tags" disabled=disableAllowGlobalTags}}
-    {{i18n 'category.allow_global_tags_label'}}
-  </label>
-</section>
-
-<section class='field'>
-  {{i18n 'category.tags_tab_description'}}
+  {{#link-to "tagGroups"}}{{i18n "category.manage_tag_groups_link"}}{{/link-to}}
 </section>
 
 <section class="field">
-  {{i18n 'category.required_tag_group_description'}}
+  <label>
+    {{input type="checkbox" checked=category.allow_global_tags id="allow_global_tags" disabled=disableAllowGlobalTags}}
+    {{i18n "category.allow_global_tags_label"}}
+  </label>
+</section>
+
+<section class="field">
+  {{i18n "category.tags_tab_description"}}
+</section>
+
+<section class="field">
+  {{i18n "category.required_tag_group_description"}}
 </section>
 
 <section class="field with-items">
   <section class="field-item">
-    <label>{{i18n 'category.min_tags_from_required_group_label'}}</label>
+    <label>{{i18n "category.min_tags_from_required_group_label"}}</label>
     {{text-field value=category.min_tags_from_required_group id="category-min-tags-from-group" type="number" min="1"}}
   </section>
   <section class="field-item">
-    <label>{{i18n 'category.required_tag_group_label'}}</label>
+    <label>{{i18n "category.required_tag_group_label"}}</label>
     {{tag-group-chooser
       id="category-required-tag-group"
       tagGroups=category.required_tag_groups
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs
index c0d58fbbd9..6b9fa9b84d 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs
@@ -1,2 +1,2 @@
-<label>{{i18n 'category.topic_template'}}</label>
+<label>{{i18n "category.topic_template"}}</label>
 {{d-editor value=category.topic_template}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
index e5ad76f979..0303a494a6 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
@@ -9,7 +9,7 @@
   </div>
   {{#if publishToCategory}}
     <div class="control-group">
-      <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
+      <label>{{i18n "topic.topic_status_update.publish_to"}}</label>
       {{category-chooser
         value=topicTimer.category_id
         excludeCategoryId=excludeCategoryId
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
index a5a525b4f1..7f7490eef7 100644
--- a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
@@ -1,2 +1,2 @@
-<div class='emoji-picker'></div>
-<div class='emoji-picker-modal'></div>
+<div class="emoji-picker"></div>
+<div class="emoji-picker-modal"></div>
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
index 186ee15afe..7e1506383c 100644
--- a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
@@ -33,7 +33,7 @@
     </div>
     <div class="control">
       <div class="input">
-        <label class="btn btn-default btn-primary {{if addDisabled 'disabled'}}">
+        <label class="btn btn-default btn-primary {{if addDisabled "disabled"}}">
           {{d-icon "plus"}}
           {{i18n "admin.emoji.add"}}
           <input
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index 10d9d5fcba..937d05c1d5 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,10 +1,10 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href={{topic.lastUnreadUrl}}>{{html-safe topic.fancyTitle}}</a>
+<a href={{topic.lastUnreadUrl}} class="title">{{html-safe topic.fancyTitle}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
-  <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href={{html-safe topic.lastPosterUrl}}>{{topic.last_poster.username}}</a>
+  <div class="last-user-info">
+    {{i18n "categories.latest_by"}} <a href={{html-safe topic.lastPosterUrl}}>{{topic.last_poster.username}}</a>
     <a href={{topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index cc7b592b42..88166064c0 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -1,11 +1,11 @@
 {{#if isNotifyUser}}
   <h3>{{formattedName}}</h3>
-  <div class='controls'>
-    <label class='radio'>
-      <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
+  <div class="controls">
+    <label class="radio">
+      <input id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} type="radio" name="post_action_type_index">
 
-      <div class='flag-action-type-details'>
-        <span class='description'>{{html-safe flag.description}}</span>
+      <div class="flag-action-type-details">
+        <span class="description">{{html-safe flag.description}}</span>
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
           <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
@@ -15,16 +15,16 @@
   </div>
   {{#if staffFlagsAvailable}}
     <hr>
-    <h3>{{i18n 'flagging.notify_staff'}}</h3>
+    <h3>{{i18n "flagging.notify_staff"}}</h3>
   {{/if}}
 {{else}}
   <div class="controls {{flag.name_key}}">
-    <label class='radio'>
-      <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
-      <div class='flag-action-type-details'>
+    <label class="radio">
+      <input id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} type="radio" name="post_action_type_index">
+      <div class="flag-action-type-details">
         <strong>{{formattedName}}</strong>
         {{#if showDescription}}
-          <div class='description'>{{html-safe description}}</div>
+          <div class="description">{{html-safe description}}</div>
         {{/if}}
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-selection.hbs b/app/assets/javascripts/discourse/templates/components/flag-selection.hbs
index 4aadb91c82..86dbbe8093 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-selection.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-selection.hbs
@@ -1,5 +1,5 @@
 {{#each flags as |f|}}
   {{yield f}}
 {{else}}
-  {{i18n 'flagging.cant'}}
+  {{i18n "flagging.cant"}}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs b/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs
index 09d02aae71..9e10822972 100644
--- a/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs
@@ -1,5 +1,5 @@
 <p>{{i18n "user.invited.link_generated"}}</p>
 <p>
-  <input class='invite-link-input' style='width: 75%' type='text' value={{link}}>
+  <input value={{link}} class="invite-link-input" style="width: 75%" type="text">
 </p>
 <p>{{i18n "user.invited.valid_for" email=email}}</p>
diff --git a/app/assets/javascripts/discourse/templates/components/google-search.hbs b/app/assets/javascripts/discourse/templates/components/google-search.hbs
index 28893ffff8..ce28f58662 100644
--- a/app/assets/javascripts/discourse/templates/components/google-search.hbs
+++ b/app/assets/javascripts/discourse/templates/components/google-search.hbs
@@ -1,7 +1,7 @@
 <div>
-  <form action='//google.com/search' id='google-search'>
+  <form action="//google.com/search" id="google-search">
     <input type="text" name="q" value={{searchTerm}}>
-    <input type='hidden' name="as_sitesearch" value={{siteUrl}}>
-    <button class="btn btn-primary">{{i18n 'search.search_google_button'}}</button>
+    <input name="as_sitesearch" value={{siteUrl}} type="hidden">
+    <button class="btn btn-primary">{{i18n "search.search_google_button"}}</button>
   </form>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs b/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs
index 68623d09c8..85e3a212ae 100644
--- a/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs
@@ -1,3 +1,3 @@
-{{#link-to (concat 'group.activity.' filter) (query-params category_id=categoryId)}}
-  {{i18n (concat 'groups.' filter)}}
+{{#link-to (concat "group.activity." filter) (query-params category_id=categoryId)}}
+  {{i18n (concat "groups." filter)}}
 {{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index cc819f07a9..3c867903a2 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -14,12 +14,12 @@
       <div class="names">
         <span>
           <h1 class={{group.name}}>
-            <a href={{groupPath}} {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a>
+            <a href={{groupPath}} {{action "showGroup" group}} class="group-page-link">{{group.name}}</a>
           </h1>
           {{#if group.full_name}}
-            <h2 class='full-name'>{{group.full_name}}</h2>
+            <h2 class="full-name">{{group.full_name}}</h2>
           {{else}}
-            <h2 class='username'>{{group.name}}</h2>
+            <h2 class="username">{{group.name}}</h2>
           {{/if}}
         </span>
       </div>
@@ -45,7 +45,7 @@
 
     {{#if group.bio_cooked}}
       <div class="card-row second-row">
-        <div class='bio'>{{html-safe group.bio_cooked}}</div>
+        <div class="bio">{{html-safe group.bio_cooked}}</div>
       </div>
     {{/if}}
 
@@ -54,7 +54,7 @@
         <div class="metadata">
           <h3>
             <span class="desc">
-              {{i18n 'groups.user_count'}}
+              {{i18n "groups.user_count"}}
             </span>
             {{group.user_count}}
           </h3>
@@ -73,7 +73,7 @@
       <div class="card-row fourth-row">
         <div class="members metadata">
           {{#each group.members as |user|}}
-            <a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
+            <a href {{action "showUser" user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
           {{/each}}
           {{#if showMoreMembers}}
             <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link">
diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
index 319fa80805..85077306a2 100644
--- a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
@@ -1,17 +1,17 @@
-<div class='control-group'>
-  <label class="control-label" for="flair_url">{{i18n 'groups.flair_url'}}</label>
+<div class="control-group">
+  <label class="control-label" for="flair_url">{{i18n "groups.flair_url"}}</label>
 
   {{text-field name="flair_url"
       class="input-xxlarge"
       value=model.flair_url
       placeholderKey="groups.flair_url_placeholder"}}
   <div class="control-instructions">
-    {{i18n 'groups.flair_url_description'}}
+    {{i18n "groups.flair_url_description"}}
   </div>
 </div>
 
-<div class='control-group'>
-  <label class="control-label" for="flair_bg_color">{{i18n 'groups.flair_bg_color'}}</label>
+<div class="control-group">
+  <label class="control-label" for="flair_bg_color">{{i18n "groups.flair_bg_color"}}</label>
 
   {{text-field name="flair_bg_color"
       class="group-flair-bg-color input-xxlarge"
@@ -20,8 +20,8 @@
 </div>
 
 {{#if flairPreviewIcon}}
-  <div class='control-group'>
-    <label class="control-label" for="flair_color">{{i18n 'groups.flair_color'}}</label>
+  <div class="control-group">
+    <label class="control-label" for="flair_color">{{i18n "groups.flair_color"}}</label>
 
     {{text-field name="flair_color"
         class="group-flair-color input-xxlarge"
@@ -30,8 +30,8 @@
   </div>
 {{/if}}
 
-<div class='control-group'>
-  <label class='control-label'>{{flairPreviewLabel}}</label>
+<div class="control-group">
+  <label class="control-label">{{flairPreviewLabel}}</label>
 
   <div class="avatar-flair-preview">
     <div class="avatar-wrapper">
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
index dd929c5617..d835fb97c6 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
@@ -6,7 +6,7 @@
   </td>
 
   <td>
-    <span>{{avatar log.acting_user imageSize='tiny'}}</span>
+    <span>{{avatar log.acting_user imageSize="tiny"}}</span>
 
     {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.acting_user.username key="acting_user")}}
       {{log.acting_user.username}}
@@ -15,7 +15,7 @@
 
   <td>
     {{#if log.target_user}}
-      <span>{{avatar log.target_user imageSize='tiny'}}</span>
+      <span>{{avatar log.target_user imageSize="tiny"}}</span>
 
       {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.target_user.username key="target_user")}}
         {{log.target_user.username}}
@@ -45,13 +45,13 @@
 
 {{#if expandDetails}}
   <tr>
-    <td colspan='6'>
+    <td colspan="6">
       <p>
-        <strong>{{i18n 'groups.manage.logs.from'}}</strong>: <code>{{log.prev_value}}</code>
+        <strong>{{i18n "groups.manage.logs.from"}}</strong>: <code>{{log.prev_value}}</code>
       </p>
 
       <p>
-        <strong>{{i18n 'groups.manage.logs.to'}}</strong>: <code>{{log.new_value}}</code>
+        <strong>{{i18n "groups.manage.logs.to"}}</strong>: <code>{{log.new_value}}</code>
       </p>
     </td>
   </tr>
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
index 3efeac10ac..a01cf4d384 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
@@ -1,12 +1,12 @@
-<div class='control-group buttons'>
+<div class="control-group buttons">
   {{#d-button action=(action "save")
     disabled=saving
-    class='btn btn-primary group-manage-save'
+    class="btn btn-primary group-manage-save"
   }}
     {{savingText}}
   {{/d-button}}
 
   {{#if saved}}
-    <span>{{i18n 'saved'}}</span>
+    <span>{{i18n "saved"}}</span>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/group-member.hbs b/app/assets/javascripts/discourse/templates/components/group-member.hbs
index dcdfc050d6..10da5fb4df 100644
--- a/app/assets/javascripts/discourse/templates/components/group-member.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-member.hbs
@@ -3,7 +3,7 @@
 </a>
 <span>{{member.username}}</span>
 {{#unless automatic}}
-  <a href class='remove' {{action "remove"}}>
+  <a href {{action "remove"}} class="remove">
     {{d-icon "times"}}
   </a>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-navigation.hbs b/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
index eb9c9140cb..cea8bb0a7e 100644
--- a/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
@@ -1,4 +1,4 @@
-{{#mobile-nav class='group-nav' desktopClass="nav nav-pills" currentPath=currentPath}}
+{{#mobile-nav class="group-nav" desktopClass="nav nav-pills" currentPath=currentPath}}
   {{#if site.mobileView}}
     <li>
       {{#link-to "groups.index"}}
@@ -17,7 +17,7 @@
       {{#link-to tab.route group title=tab.message class=tab.name}}
         {{#if tab.icon}}{{d-icon tab.icon}}{{/if}}
         {{tab.message}}
-        {{#if tab.count}}<span class='count'>({{tab.count}})</span>{{/if}}
+        {{#if tab.count}}<span class="count">({{tab.count}})</span>{{/if}}
       {{/link-to}}
     </li>
   {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index 451904c542..25c500b782 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -1,13 +1,13 @@
-<div class='clearfix info'>
-  <a href={{post.user.userUrl}} data-user-card={{post.user.username}} class='avatar-link'>
+<div class="clearfix info">
+  <a href={{post.user.userUrl}} data-user-card={{post.user.username}} class="avatar-link">
     {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
   </a>
-  <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
+  <span class="time">{{format-date post.created_at leaveAgo="true"}}</span>
   {{expand-post item=post}}
 
-  <div class='stream-topic-details'>
-    <div class='stream-topic-title'>
-      <span class='title'>
+  <div class="stream-topic-details">
+    <div class="stream-topic-title">
+      <span class="title">
         <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
       </span>
     </div>
@@ -21,7 +21,7 @@
   </div>
 </div>
 
-<div class='excerpt'>
+<div class="excerpt">
   {{#if post.expandedExcerpt}}
     {{html-safe post.expandedExcerpt}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-selector.hbs b/app/assets/javascripts/discourse/templates/components/group-selector.hbs
index af73c13cbc..0ceb9144ce 100644
--- a/app/assets/javascripts/discourse/templates/components/group-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-selector.hbs
@@ -1 +1 @@
-<input class='group-selector' placeholder={{placeholder}} type='text' name='groups'>
+<input placeholder={{placeholder}} class="group-selector" type="text" name="groups">
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
index fcc29b71b2..1a2c473824 100644
--- a/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
@@ -1,7 +1,7 @@
 {{#if currentUser.admin}}
   <div class="control-group">
-    <label class="control-label">{{i18n 'admin.groups.manage.interaction.visibility'}}</label>
-    <label for="visiblity">{{i18n 'admin.groups.manage.interaction.visibility_levels.title'}}</label>
+    <label class="control-label">{{i18n "admin.groups.manage.interaction.visibility"}}</label>
+    <label for="visiblity">{{i18n "admin.groups.manage.interaction.visibility_levels.title"}}</label>
 
     {{combo-box
       name="alias"
@@ -14,12 +14,12 @@
     }}
 
     <div class="control-instructions">
-      {{i18n 'admin.groups.manage.interaction.visibility_levels.description'}}
+      {{i18n "admin.groups.manage.interaction.visibility_levels.description"}}
     </div>
   </div>
 
   <div class="control-group">
-    <label for="visiblity">{{i18n 'admin.groups.manage.interaction.members_visibility_levels.title'}}</label>
+    <label for="visiblity">{{i18n "admin.groups.manage.interaction.members_visibility_levels.title"}}</label>
 
     {{combo-box name="alias"
         valueProperty="value"
@@ -29,14 +29,14 @@
         class="groups-form-members-visibility-level"}}
 
     <div class="control-instructions">
-      {{i18n 'admin.groups.manage.interaction.members_visibility_levels.description'}}
+      {{i18n "admin.groups.manage.interaction.members_visibility_levels.description"}}
     </div>
   </div>
 {{/if}}
 
 <div class="control-group">
-  <label class="control-label">{{i18n 'groups.manage.interaction.posting'}}</label>
-  <label for="alias">{{i18n 'groups.alias_levels.mentionable'}}</label>
+  <label class="control-label">{{i18n "groups.manage.interaction.posting"}}</label>
+  <label for="alias">{{i18n "groups.alias_levels.mentionable"}}</label>
 
   {{combo-box
     name="alias"
@@ -49,7 +49,7 @@
 </div>
 
 <div class="control-group">
-  <label for="alias">{{i18n 'groups.alias_levels.messageable'}}</label>
+  <label for="alias">{{i18n "groups.alias_levels.messageable"}}</label>
 
   {{combo-box
     name="alias"
@@ -67,14 +67,14 @@
           checked=model.publish_read_state
           class="groups-form-publish-read-state"}}
 
-    {{i18n 'admin.groups.manage.interaction.publish_read_state'}}
+    {{i18n "admin.groups.manage.interaction.publish_read_state"}}
   </label>
 </div>
 
 {{#if showEmailSettings}}
   <div class="control-group">
-    <label class="control-label">{{i18n 'admin.groups.manage.interaction.email'}}</label>
-    <label for="incoming_email">{{i18n 'admin.groups.manage.interaction.incoming_email'}}</label>
+    <label class="control-label">{{i18n "admin.groups.manage.interaction.email"}}</label>
+    <label for="incoming_email">{{i18n "admin.groups.manage.interaction.incoming_email"}}</label>
 
     {{text-field name="incoming_email"
         class="input-xxlarge groups-form-incoming-email"
@@ -85,10 +85,10 @@
   </div>
 {{/if}}
 
-<label class="control-label">{{i18n 'groups.manage.interaction.notification'}}</label>
+<label class="control-label">{{i18n "groups.manage.interaction.notification"}}</label>
 
 <div class="control-group">
-  <label>{{i18n 'groups.notification_level'}}</label>
+  <label>{{i18n "groups.notification_level"}}</label>
 
   {{notifications-button
     value=model.default_notification_level
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
index 3b1a41304a..b92c678716 100644
--- a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
@@ -3,7 +3,7 @@
     <label class="control-label">{{i18n "admin.groups.manage.membership.automatic"}}</label>
 
     <label for="automatic_membership">
-      {{i18n 'admin.groups.manage.membership.automatic_membership_email_domains'}}
+      {{i18n "admin.groups.manage.membership.automatic_membership_email_domains"}}
     </label>
 
     {{list-setting
@@ -23,7 +23,7 @@
           checked=model.automatic_membership_retroactive
           class="groups-form-automatic-membership-retroactive"}}
 
-      {{i18n 'admin.groups.manage.membership.automatic_membership_retroactive'}}
+      {{i18n "admin.groups.manage.membership.automatic_membership_retroactive"}}
     </label>
   </div>
 
@@ -32,7 +32,7 @@
 
   <div class="control-group">
     <label class="control-label">{{i18n "admin.groups.manage.membership.effects"}}</label>
-    <label for="grant_trust_level">{{i18n 'admin.groups.manage.membership.trust_levels_title'}}</label>
+    <label for="grant_trust_level">{{i18n "admin.groups.manage.membership.trust_levels_title"}}</label>
 
     {{combo-box
       name="grant_trust_level"
@@ -47,7 +47,7 @@
           checked=model.primary_group
           class="groups-form-primary-group"}}
 
-      {{i18n 'admin.groups.manage.membership.primary_group'}}
+      {{i18n "admin.groups.manage.membership.primary_group"}}
     </label>
 
   </div>
@@ -62,15 +62,15 @@
         checked=model.public_admission
         disabled=disablePublicSetting}}
 
-    {{i18n 'groups.public_admission'}}
+    {{i18n "groups.public_admission"}}
   </label>
 
   <label>
-    {{input type='checkbox'
-        class='group-form-public-exit'
+    {{input type="checkbox"
+        class="group-form-public-exit"
         checked=model.public_exit}}
 
-    {{i18n 'groups.public_exit'}}
+    {{i18n "groups.public_exit"}}
   </label>
 
   <label>
@@ -79,17 +79,17 @@
         checked=model.allow_membership_requests
         disabled=disableMembershipRequestSetting}}
 
-    {{i18n 'groups.allow_membership_requests'}}
+    {{i18n "groups.allow_membership_requests"}}
   </label>
 
   {{#if model.allow_membership_requests}}
     <div>
       <label for="membership-request-template">
-        {{i18n 'groups.membership_request_template'}}
+        {{i18n "groups.membership_request_template"}}
       </label>
 
       {{expanding-text-area name="membership-request-template"
-          class='group-form-membership-request-template input-xxlarge'
+          class="group-form-membership-request-template input-xxlarge"
           value=model.membership_request_template}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs
index c99bd33ad5..15230779e4 100644
--- a/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs
@@ -1,7 +1,7 @@
 {{#if canEdit}}
   {{#if this.currentUser.admin}}
     <div class="control-group">
-      <label class="control-label" for="name">{{i18n 'groups.name'}}</label>
+      <label class="control-label" for="name">{{i18n "groups.name"}}</label>
 
       {{text-field name="name"
           class="input-xxlarge group-form-name"
@@ -13,9 +13,9 @@
   {{/if}}
 
   <div class="control-group">
-    <label class="control-label" for='full_name'>{{i18n 'groups.manage.full_name'}}</label>
+    <label class="control-label" for="full_name">{{i18n "groups.manage.full_name"}}</label>
 
-    {{text-field name='full_name'
+    {{text-field name="full_name"
         class="input-xxlarge group-form-full-name"
         value=model.full_name}}
   </div>
@@ -23,20 +23,20 @@
   {{#if this.currentUser.admin}}
     <div class="control-group">
       <label class="control-label" for="title">
-        {{i18n 'admin.groups.default_title'}}
+        {{i18n "admin.groups.default_title"}}
       </label>
 
       {{input value=model.title name="title" class="input-xxlarge"}}
 
       <div class="control-instructions">
-        {{i18n 'admin.groups.default_title_description'}}
+        {{i18n "admin.groups.default_title_description"}}
       </div>
     </div>
   {{/if}}
 {{/if}}
 
 <div class="control-group">
-  <label class="control-label" for="bio">{{i18n 'groups.bio'}}</label>
+  <label class="control-label" for="bio">{{i18n "groups.bio"}}</label>
   {{d-editor value=model.bio_raw class="group-form-bio input-xxlarge"}}
 </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/groups-info.hbs b/app/assets/javascripts/discourse/templates/components/groups-info.hbs
index 69a583598d..a82509be40 100644
--- a/app/assets/javascripts/discourse/templates/components/groups-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/groups-info.hbs
@@ -1,5 +1,5 @@
 {{#if showFullName}}
-  <span class='groups-info-name'>{{group.full_name}}</span>
+  <span class="groups-info-name">{{group.full_name}}</span>
 {{else}}
-  <span class='groups-info-name'>{{group.displayName}}</span>
+  <span class="groups-info-name">{{group.displayName}}</span>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs b/app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs
index 12e1f06942..73e122024d 100644
--- a/app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs
@@ -2,8 +2,8 @@
   {{#each items as |item|}}
     {{ignored-user-list-item item=item onRemoveIgnoredUser=(action "removeIgnoredUser")}}
   {{else}}
-    {{i18n 'user.user_notifications.ignore_no_users'}}
+    {{i18n "user.user_notifications.ignore_no_users"}}
   {{/each}}
 </div>
-<div class="instructions">{{i18n 'user.ignored_users_instructions'}}</div>
-<div>{{#d-button action=(action "newIgnoredUser") class="btn-default" icon="plus"}}{{i18n 'user.user_notifications.add_ignored_user'}}{{/d-button}}</div>
+<div class="instructions">{{i18n "user.ignored_users_instructions"}}</div>
+<div>{{#d-button action=(action "newIgnoredUser") class="btn-default" icon="plus"}}{{i18n "user.user_notifications.add_ignored_user"}}{{/d-button}}</div>
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index 9820cb33a0..04096a287a 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -3,7 +3,7 @@
     <div class="placeholder-overlay" style={{placeholderStyle}}></div>
   {{/if}}
   <div class="image-upload-controls">
-    <label class="btn btn-default pad-left no-text {{if uploading 'disabled'}}">
+    <label class="btn btn-default pad-left no-text {{if uploading "disabled"}}">
       {{d-icon "far-image"}}
       <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
     </label>
@@ -26,7 +26,7 @@
       }}
     {{/if}}
 
-    <span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
+    <span class="btn {{unless uploading "hidden"}}">{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
   </div>
 
   {{#if imageUrl}}
diff --git a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
index ea9a23d1e4..b7c195cc65 100644
--- a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
@@ -3,5 +3,5 @@
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" multiple>
 </label>
 {{#if uploading}}
-  <span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
+  <span>{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 35e074e661..3e57bd71d8 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -14,7 +14,7 @@
       {{d-button action=(action "copy") class="pull-right no-text" icon="copy"}}
     {{/if}}
     <h4>{{i18n "ip_lookup.title"}}</h4>
-    <p class='powered-by'>{{html-safe (i18n "ip_lookup.powered_by")}}</p>
+    <p class="powered-by">{{html-safe (i18n "ip_lookup.powered_by")}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
index c071eaaef1..5e369f51f9 100644
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
@@ -1,4 +1,4 @@
-<div class='topic-poster'>
+<div class="topic-poster">
   {{#user-link user=topic.lastPosterUser}}
     {{avatar topic.lastPosterUser imageSize="large"}}
   {{/user-link}}
@@ -10,8 +10,8 @@
       groupName=topic.lastPosterGroup.name}}
   {{/if}}
 </div>
-<div class='main-link'>
-  <div class='top-row'>
+<div class="main-link">
+  <div class="top-row">
     {{raw "topic-status" topic=topic}}
     {{topic-link topic}}
     {{#if topic.featured_link}}
@@ -19,12 +19,12 @@
     {{/if}}
     {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
   </div>
-  <div class='bottom-row'>
+  <div class="bottom-row">
     {{category-link topic.category}}
     {{discourse-tags topic mode="list"}}
   </div>
 </div>
-<div class='topic-stats'>
+<div class="topic-stats">
   {{raw "list/posts-count-column" topic=topic tagName="div"}}
   <div class="topic-last-activity">
     <a href={{topic.lastPostUrl}} title={{topic.bumpedAtTitle}}>{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
index 3c4fcf9491..1f1fc1ec80 100644
--- a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
@@ -1,5 +1,5 @@
-<td class='main-link'>
-  <div class='topic-inset'>
+<td class="main-link">
+  <div class="topic-inset">
     {{raw "topic-status" topic=topic}}
     {{topic-link topic}}
     {{#if topic.unseen}}
@@ -8,4 +8,4 @@
     <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{format-age topic.last_posted_at}}</span>
   </div>
 </td>
-<td class='num posts'>{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
+<td class="num posts">{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs b/app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs
index ded803482f..f58909e3b2 100644
--- a/app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs
+++ b/app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs
@@ -1 +1 @@
-<span class='close'>{{closeIcon}}</span>{{tipReason}}
+<span class="close">{{closeIcon}}</span>{{tipReason}}
diff --git a/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs b/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs
index f7931d5918..1d5fd86eb7 100644
--- a/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs
+++ b/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs
@@ -1,4 +1,4 @@
-<label class='checkbox-label'>
+<label class="checkbox-label">
   {{input type="checkbox" disabled=disabled checked=checked}}
   {{label}}
 </label>
diff --git a/app/assets/javascripts/discourse/templates/components/quote-button.hbs b/app/assets/javascripts/discourse/templates/components/quote-button.hbs
index 163e768ec0..868baa320f 100644
--- a/app/assets/javascripts/discourse/templates/components/quote-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/quote-button.hbs
@@ -1 +1 @@
-{{d-icon "quote-left"}} <span class='quote-label'>{{i18n "post.quote_reply"}}</span>
+{{d-icon "quote-left"}} <span class="quote-label">{{i18n "post.quote_reply"}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs
index 92f3fccfb4..80e825fa08 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs
@@ -1,9 +1,9 @@
 {{#if enabled}}
-  <div class='reviewable-claimed-topic'>
+  <div class="reviewable-claimed-topic">
     {{#if claimedBy}}
-      <div class='claimed-by'>
+      <div class="claimed-by">
         {{avatar claimedBy imageSize="small"}}
-        <span class='claimed-username'>{{claimedBy.username}}</span>
+        <span class="claimed-username">{{claimedBy.username}}</span>
       </div>
       {{d-button
         icon="times"
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
index 25aeea0726..a9c94a9cf7 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
@@ -1,7 +1,7 @@
 {{#if post}}
-  <div class='reviewable-conversation-post'>
+  <div class="reviewable-conversation-post">
     {{#if showUsername}}
-      {{#link-to 'user' post.user class="username"}}@{{post.user.username}}{{/link-to}}
+      {{#link-to "user" post.user class="username"}}@{{post.user.username}}{{/link-to}}
     {{/if}}
     {{html-safe post.excerpt}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
index f45506550f..aaa17dcd34 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
@@ -1,4 +1,4 @@
-<div class='names'>
+<div class="names">
   <span class="username">
     {{#if user}}
       {{#user-link user=user}}{{user.username}}{{/user-link}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs
index 7bcc990233..ea8f4fd878 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs
@@ -1,4 +1,4 @@
-<div class='created-by'>
+<div class="created-by">
   {{#if user}}
     {{#user-link user=user}}{{avatar user imageSize="large"}}{{/user-link}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs
index 2b3e5f0f8e..e41a036af6 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs
@@ -1 +1 @@
-{{input value=value change=valueChanged class='reviewable-input-text'}}
+{{input value=value change=valueChanged class="reviewable-input-text"}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs
index 821a601d33..af12e4c377 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs
@@ -1,6 +1,6 @@
 {{#if value}}
   <div class={{classes}}>
-    <div class='name'>{{name}}</div>
-    <div class='value'>{{value}}</div>
+    <div class="name">{{name}}</div>
+    <div class="value">{{value}}</div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
index 6cbad0ec06..3302312732 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
@@ -1,5 +1,5 @@
-<div class='flagged-post-header'>
-  {{reviewable-topic-link reviewable=reviewable tagName=''}}
+<div class="flagged-post-header">
+  {{reviewable-topic-link reviewable=reviewable tagName=""}}
   {{#if hasEdits}}
     <a href {{action "showEditHistory"}}
       class="has-edits {{historyClass}}"
@@ -9,11 +9,11 @@
   {{/if}}
 </div>
 
-<div class='post-contents-wrapper'>
-  {{reviewable-created-by user=reviewable.target_created_by tagName=''}}
-  <div class='post-contents'>
-    {{reviewable-post-header reviewable=reviewable createdBy=reviewable.target_created_by tagName=''}}
-    <div class='post-body'>
+<div class="post-contents-wrapper">
+  {{reviewable-created-by user=reviewable.target_created_by tagName=""}}
+  <div class="post-contents">
+    {{reviewable-post-header reviewable=reviewable createdBy=reviewable.target_created_by tagName=""}}
+    <div class="post-body">
       {{#if reviewable.blank_post}}
         <p>{{i18n "review.deleted_post"}}</p>
       {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
index 6b1f327638..433ee1f15d 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
@@ -1,5 +1,5 @@
 {{#if filteredHistories}}
-  <table class='reviewable-histories'>
+  <table class="reviewable-histories">
     <thead>
       <tr>
         <th colspan="3">{{i18n "review.history.title"}}</th>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
index 7b3a7a2f2a..3df7b43133 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
@@ -1,34 +1,34 @@
-<div class='reviewable-item {{customClass}}' data-reviewable-id={{reviewable.id}}>
-  <div class='reviewable-meta-data'>
-    <span class='reviewable-type'>{{reviewable.humanType}}</span>
+<div data-reviewable-id={{reviewable.id}} class="reviewable-item {{customClass}}">
+  <div class="reviewable-meta-data">
+    <span class="reviewable-type">{{reviewable.humanType}}</span>
     {{#if reviewable.reply_count}}
-      <span class='reply-count'>{{i18n "review.replies" count=reviewable.reply_count}}</span>
+      <span class="reply-count">{{i18n "review.replies" count=reviewable.reply_count}}</span>
     {{/if}}
-    <span class='created-at'>
-      {{#link-to 'review.show' reviewable.id}}{{age-with-tooltip reviewable.created_at}}{{/link-to}}
+    <span class="created-at">
+      {{#link-to "review.show" reviewable.id}}{{age-with-tooltip reviewable.created_at}}{{/link-to}}
     </span>
-    <span class='status'>
+    <span class="status">
       {{reviewable-status reviewable.status}}
     </span>
-    <a href {{action "explainReviewable" reviewable}} class='explain' title={{i18n "review.explain.why"}}>
+    <a href {{action "explainReviewable" reviewable}} title={{i18n "review.explain.why"}} class="explain">
       {{d-icon "question-circle"}}
     </a>
   </div>
 
-  <div class='reviewable-contents'>
+  <div class="reviewable-contents">
     {{#if editing}}
-      <div class='editable-fields'>
+      <div class="editable-fields">
         {{#if reviewable.created_by}}
-          <div class='editable-created-by'>
+          <div class="editable-created-by">
             {{avatar reviewable.created_by imageSize="tiny"}}
-            {{reviewable-created-by-name user=reviewable.created_by tagName=''}}
+            {{reviewable-created-by-name user=reviewable.created_by tagName=""}}
           </div>
         {{/if}}
 
         {{#each reviewable.editable_fields as |f|}}
-          <div class='editable-field {{dasherize f.id}}'>
+          <div class="editable-field {{dasherize f.id}}">
             {{component (concat "reviewable-field-" f.type)
-              tagName=''
+              tagName=""
               value=(editable-value reviewable f.id)
               tagCategoryId=reviewable.category.id
               valueChanged=(action "valueChanged" f.id)
@@ -38,15 +38,15 @@
         {{/each}}
       </div>
     {{else}}
-      {{#component reviewableComponent reviewable=reviewable tagName=''}}
-        {{reviewable-scores reviewable=reviewable tagName=''}}
+      {{#component reviewableComponent reviewable=reviewable tagName=""}}
+        {{reviewable-scores reviewable=reviewable tagName=""}}
       {{/component}}
     {{/if}}
   </div>
-  <div class='reviewable-actions'>
+  <div class="reviewable-actions">
     {{#if claimEnabled}}
-      <div class='claimed-actions'>
-        <span class='help'>{{html-safe claimHelp}}</span>
+      <div class="claimed-actions">
+        <span class="help">{{html-safe claimHelp}}</span>
         {{reviewable-claimed-topic topicId=topicId claimedBy=reviewable.claimed_by}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs
index 70b7d32673..3d2ffd8234 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs
@@ -1,7 +1,7 @@
-<div class='reviewable-post-header'>
-  {{reviewable-created-by-name user=createdBy tagName=''}}
+<div class="reviewable-post-header">
+  {{reviewable-created-by-name user=createdBy tagName=""}}
   {{#if reviewable.reply_to_post_number}}
-    <a href={{concat reviewable.topic_url "/" reviewable.reply_to_post_number}} class='reviewable-reply-to'>
+    <a href={{concat reviewable.topic_url "/" reviewable.reply_to_post_number}} class="reviewable-reply-to">
       {{d-icon "share"}}
       <span>{{i18n "review.in_reply_to"}}</span>
     </a>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs
index 30aff53c6a..215b4e7005 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs
@@ -1,24 +1,24 @@
-{{#reviewable-topic-link reviewable=reviewable tagName=''}}
+{{#reviewable-topic-link reviewable=reviewable tagName=""}}
   <div class="title-text">
     {{d-icon "plus-square" title="review.new_topic"}}
     {{reviewable.payload.title}}
   </div>
   {{category-badge reviewable.category}}
-  {{reviewable-tags tags=reviewable.payload.tags tagName=''}}
+  {{reviewable-tags tags=reviewable.payload.tags tagName=""}}
   {{#if reviewable.payload.via_email}}
-    <a href {{action "showRawEmail"}} class='show-raw-email'>
+    <a href {{action "showRawEmail"}} class="show-raw-email">
       {{d-icon "far-envelope" title="post.via_email"}}
     </a>
   {{/if}}
 {{/reviewable-topic-link}}
 
-<div class='post-contents-wrapper'>
-  {{reviewable-created-by user=reviewable.created_by tagName=''}}
+<div class="post-contents-wrapper">
+  {{reviewable-created-by user=reviewable.created_by tagName=""}}
 
-  <div class='post-contents'>
-    {{reviewable-post-header reviewable=reviewable createdBy=reviewable.created_by tagName=''}}
+  <div class="post-contents">
+    {{reviewable-post-header reviewable=reviewable createdBy=reviewable.created_by tagName=""}}
 
-    <div class='post-body'>
+    <div class="post-body">
       {{cook-text reviewable.payload.raw}}
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
index 847cc42154..58ce2cb9fa 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
@@ -1,5 +1,5 @@
-<tr class='reviewable-score'>
-  <td class='user'>
+<tr class="reviewable-score">
+  <td class="user">
     {{#user-link user=rs.user}}
       {{avatar rs.user imageSize="tiny"}}
       {{rs.user.username}}
@@ -22,7 +22,7 @@
       {{d-icon "angle-double-right"}}
     </td>
 
-    <td class='reviewed-by'>
+    <td class="reviewed-by">
       {{#if rs.reviewed_by}}
         {{#user-link user=rs.reviewed_by}}
           {{avatar rs.reviewed_by imageSize="tiny"}}
@@ -48,21 +48,21 @@
 
 {{#if rs.reason}}
   <tr>
-    <td colspan='7'>
-      <div class='reviewable-score-reason'>{{html-safe rs.reason}}</div>
+    <td colspan="7">
+      <div class="reviewable-score-reason">{{html-safe rs.reason}}</div>
     </td>
   </tr>
 {{/if}}
 
 {{#if rs.reviewable_conversation}}
   <tr>
-    <td colspan='7'>
-      <div class='reviewable-conversation'>
+    <td colspan="7">
+      <div class="reviewable-conversation">
         {{#each rs.reviewable_conversation.conversation_posts as |p index|}}
           {{reviewable-conversation-post post=p index=index}}
         {{/each}}
-        <div class='controls'>
-          <a href={{rs.reviewable_conversation.permalink}} class='btn btn-small'>
+        <div class="controls">
+          <a href={{rs.reviewable_conversation.permalink}} class="btn btn-small">
             {{i18n "review.conversation.view_full"}}
           </a>
         </div>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
index f15b9e4ace..3d6bb9d09b 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
@@ -1,5 +1,5 @@
 {{#if reviewable.reviewable_scores}}
-  <table class='reviewable-scores'>
+  <table class="reviewable-scores">
     <tbody>
       {{#each reviewable.reviewable_scores as |rs|}}
         {{reviewable-score rs=rs reviewable=reviewable}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
index b43876ab48..2860b51b82 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
@@ -1,9 +1,9 @@
-<div class='post-topic'>
+<div class="post-topic">
   {{#if reviewable.topic}}
     {{topic-status topic=reviewable.topic showPrivateMessageIcon=true}}
-    <a href={{reviewable.target_url}} class='title-text'>{{reviewable.topic.title}}</a>
+    <a href={{reviewable.target_url}} class="title-text">{{reviewable.topic.title}}</a>
     {{category-badge reviewable.category}}
-    {{reviewable-tags tags=reviewable.topic_tags tagName=''}}
+    {{reviewable-tags tags=reviewable.topic_tags tagName=""}}
   {{else if (has-block)}}
     {{yield}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
index e3f4ea1efd..4c246153ce 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
@@ -1,8 +1,8 @@
-<div class='reviewable-user-info'>
-  <div class='reviewable-user-fields'>
-    <div class='reviewable-user-details username'>
-      <div class='name'>{{i18n "review.user.username"}}</div>
-      <div class='value'>
+<div class="reviewable-user-info">
+  <div class="reviewable-user-fields">
+    <div class="reviewable-user-details username">
+      <div class="name">{{i18n "review.user.username"}}</div>
+      <div class="value">
         {{#if reviewable.link_admin}}
           <a href={{get-url (concat "/admin/users/" reviewable.user_id "/" reviewable.payload.username)}}>
             {{reviewable.payload.username}}
@@ -13,29 +13,29 @@
       </div>
     </div>
 
-    {{reviewable-field classes='reviewable-user-details name'
-                       name=(i18n 'review.user.name')
+    {{reviewable-field classes="reviewable-user-details name"
+                       name=(i18n "review.user.name")
                        value=reviewable.payload.name}}
 
-    {{reviewable-field classes='reviewable-user-details email'
-                       name=(i18n 'review.user.email')
+    {{reviewable-field classes="reviewable-user-details email"
+                       name=(i18n "review.user.email")
                        value=reviewable.payload.email}}
 
-    {{reviewable-field classes='reviewable-user-details bio'
-                       name=(i18n 'review.user.bio')
+    {{reviewable-field classes="reviewable-user-details bio"
+                       name=(i18n "review.user.bio")
                        value=reviewable.payload.bio}}
 
     {{#if reviewable.payload.website}}
       <div class="reviewable-user-details website">
-        <div class='name'>{{i18n 'review.user.website'}}</div>
-        <div class='value'>
+        <div class="name">{{i18n "review.user.website"}}</div>
+        <div class="value">
           <a href={{reviewable.payload.website}} target="_blank" rel="noopener">{{reviewable.payload.website}}</a>
         </div>
       </div>
     {{/if}}
 
     {{#each userFields as |f|}}
-      {{reviewable-field classes='reviewable-user-details user-field'
+      {{reviewable-field classes="reviewable-user-details user-field"
                          name=f.name
                          value=f.value}}
     {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/save-controls.hbs b/app/assets/javascripts/discourse/templates/components/save-controls.hbs
index 013cb6e0b7..9d95f47a31 100644
--- a/app/assets/javascripts/discourse/templates/components/save-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/save-controls.hbs
@@ -1,6 +1,6 @@
 {{d-button action=action disabled=buttonDisabled label=savingText class="btn-primary save-changes"}}
 {{#if saved}}
-  <span class='saved'>{{i18n 'saved'}}</span>
+  <span class="saved">{{i18n "saved"}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/score-value.hbs b/app/assets/javascripts/discourse/templates/components/score-value.hbs
index e78eeb32b2..c6ba3e7160 100644
--- a/app/assets/javascripts/discourse/templates/components/score-value.hbs
+++ b/app/assets/javascripts/discourse/templates/components/score-value.hbs
@@ -1,11 +1,11 @@
 {{#if value}}
-  <span class='score-value'>
-    <span class='score-number'>{{float value}}</span>
+  <span class="score-value">
+    <span class="score-number">{{float value}}</span>
     {{#if label}}
-      <span class='score-value-type' title={{i18n (concat "review.explain." label ".title")}}>
+      <span title={{i18n (concat "review.explain." label ".title")}} class="score-value-type">
         {{i18n (concat "review.explain." label ".name")}}
       </span>
     {{/if}}
   </span>
-  <span class='op'>+</span>
+  <span class="op">+</span>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
index c3548b7c58..9b46c49f42 100644
--- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -66,7 +66,7 @@
     <label class="control-label" for="search-in-options">{{i18n "search.advanced.filters.label"}}</label>
     <div class="controls">
       {{#if currentUser}}
-        <section class='field'>
+        <section class="field">
           <label>{{input type="checkbox" class="in-title" checked=searchedTerms.special.in.title}} {{i18n "search.advanced.filters.title"}}</label>
           <label>{{input type="checkbox" class="in-likes" checked=searchedTerms.special.in.likes}} {{i18n "search.advanced.filters.likes"}}</label>
           <label>{{input type="checkbox" class="in-private" checked=searchedTerms.special.in.personal}} {{i18n "search.advanced.filters.private"}}</label>
@@ -119,7 +119,7 @@
   <div class="control-group pull-left">
     <label class="control-label" for="search-min-post-count">{{i18n "search.advanced.post.count.label"}}</label>
     <div class="controls">
-      {{input type="number" value=searchedTerms.min_post_count class="input-small" id='search-min-post-count'}}
+      {{input type="number" value=searchedTerms.min_post_count class="input-small" id="search-min-post-count"}}
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/security-key-form.hbs b/app/assets/javascripts/discourse/templates/components/security-key-form.hbs
index e5bc247ad3..93158de33c 100644
--- a/app/assets/javascripts/discourse/templates/components/security-key-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/security-key-form.hbs
@@ -5,10 +5,10 @@
       id="security-key-authenticate-button"
       label="login.security_key_authenticate"
       type="button"
-      class='btn btn-large btn-primary'}}
+      class="btn btn-large btn-primary"}}
   <p>
     {{#if otherMethodAllowed}}
-      <a href="" class="toggle-second-factor-method" {{action "useAnotherMethod"}}>{{ i18n 'login.security_key_alternative' }}</a>
+      <a href="" class="toggle-second-factor-method" {{action "useAnotherMethod"}}>{{ i18n "login.security_key_alternative" }}</a>
     {{/if}}
   </p>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
index f641a14a56..03bc3de807 100644
--- a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
@@ -1,10 +1,10 @@
-<div class='shared-draft-controls'>
+<div class="shared-draft-controls">
   {{#if publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
     {{html-safe (i18n "shared_drafts.notice" category=topic.category.name)}}
 
-    <div class='publish-field'>
+    <div class="publish-field">
       <label>{{i18n "shared_drafts.destination_category"}}</label>
       {{category-chooser
         value=topic.destination_category_id
@@ -12,7 +12,7 @@
       }}
     </div>
 
-    <div class='publish-field'>
+    <div class="publish-field">
       {{#if validCategory}}
         {{d-button
           action=(action "publish")
diff --git a/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
index e0cd0eb1d9..0bca43013d 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
@@ -3,7 +3,7 @@
   <br>
 
   <section class="group-tags-list">
-    <label>{{i18n 'tagging.groups.tags_label'}}</label><br>
+    <label>{{i18n "tagging.groups.tags_label"}}</label><br>
     {{tag-chooser
       tags=buffered.tag_names
       everyTag=true
@@ -14,7 +14,7 @@
   </section>
 
   <section class="parent-tag-section">
-    <label>{{i18n 'tagging.groups.parent_tag_label'}}</label>
+    <label>{{i18n "tagging.groups.parent_tag_label"}}</label>
     {{tag-chooser
       tags=buffered.parent_tag_name
       everyTag=true
@@ -22,13 +22,13 @@
       allowCreate=true
       excludeSynonyms=true
       filterPlaceholder="tagging.groups.parent_tag_placeholder"}}
-    <span class="description">{{i18n 'tagging.groups.parent_tag_description'}}</span>
+    <span class="description">{{i18n "tagging.groups.parent_tag_description"}}</span>
   </section>
 
   <section class="group-one-per-topic">
     <label>
       {{input type="checkbox" checked=buffered.one_per_topic name="onepertopic"}}
-      {{i18n 'tagging.groups.one_per_topic_label'}}
+      {{i18n "tagging.groups.one_per_topic_label"}}
     </label>
   </section>
 
@@ -43,7 +43,7 @@
         onChange=(action "setPermissions")}}
 
       <label class="radio" for="public-permission">
-        {{i18n 'tagging.groups.everyone_can_use'}}
+        {{i18n "tagging.groups.everyone_can_use"}}
       </label>
     </div>
     <div>
@@ -56,7 +56,7 @@
         onChange=(action "setPermissions")}}
 
       <label class="radio" for="visible-permission">
-        {{i18n 'tagging.groups.usable_only_by_staff'}}
+        {{i18n "tagging.groups.usable_only_by_staff"}}
       </label>
     </div>
     <div>
@@ -69,7 +69,7 @@
         onChange=(action "setPermissions")}}
 
       <label class="radio" for="private-permission">
-        {{i18n 'tagging.groups.visible_only_to_staff'}}
+        {{i18n "tagging.groups.visible_only_to_staff"}}
       </label>
     </div>
   </section>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
index b1031c4558..ba20f68a74 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
@@ -35,7 +35,7 @@
         <div>{{html-safe (i18n "tagging.synonyms_description" base_tag_name=tagInfo.name)}}</div>
         <div class="tag-list">
           {{#each tagInfo.synonyms as |tag|}}
-            <div class='tag-box'>
+            <div class="tag-box">
               {{discourse-tag tag.id pmOnly=tag.pmOnly tagName="div"}}
               {{#if editSynonymsMode}}
                 <a href {{action "unlinkSynonym" tag}} class="unlink-synonym">
@@ -52,7 +52,7 @@
     {{/if}}
     {{#if editSynonymsMode}}
       <section class="add-synonyms field">
-        <label for="add-synonyms">{{i18n 'tagging.add_synonyms_label'}}</label>
+        <label for="add-synonyms">{{i18n "tagging.add_synonyms_label"}}</label>
         {{tag-chooser
           id="add-synonyms"
           tags=newSynonyms
@@ -69,6 +69,6 @@
     {{/if}}
   {{/if}}
   {{#if loading}}
-    <div>{{i18n 'loading'}}</div>
+    <div>{{i18n "loading"}}</div>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-list.hbs b/app/assets/javascripts/discourse/templates/components/tag-list.hbs
index b7ce5970dc..6f5f0da581 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-list.hbs
@@ -8,8 +8,8 @@
   <h3>{{tagGroupName}}</h3>
 {{/if}}
 {{#each sortedTags as |tag|}}
-  <div class='tag-box'>
-    {{discourse-tag tag.id isPrivateMessage=isPrivateMessage pmOnly=tag.pmOnly tagsForUser=tagsForUser}} {{#if tag.pmOnly}}{{d-icon "far-envelope"}}{{/if}}{{#if tag.totalCount}} <span class='tag-count'>x {{tag.totalCount}}</span>{{/if}}
+  <div class="tag-box">
+    {{discourse-tag tag.id isPrivateMessage=isPrivateMessage pmOnly=tag.pmOnly tagsForUser=tagsForUser}} {{#if tag.pmOnly}}{{d-icon "far-envelope"}}{{/if}}{{#if tag.totalCount}} <span class="tag-count">x {{tag.totalCount}}</span>{{/if}}
   </div>
 {{/each}}
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
index 227674d60c..9872c066aa 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 {{#d-button action=(action "enterTop") class="full jump-top"}}
-  {{d-icon 'step-backward'}} {{html-safe topDate}}
+  {{d-icon "step-backward"}} {{html-safe topDate}}
 {{/d-button}}
 
 {{#d-button action=(action "enterBottom") class="full jump-bottom"}}
-  {{html-safe bottomDate}} {{d-icon 'step-forward'}}
+  {{html-safe bottomDate}} {{d-icon "step-forward"}}
 {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
index 67f890abd2..766ae9bf2b 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -1,4 +1,4 @@
-<div class='topic-footer-main-buttons'>
+<div class="topic-footer-main-buttons">
   {{topic-admin-menu-button
     topic=topic
     openUpwards="true"
diff --git a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs b/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
index 1d992c500e..98e3ea3c3f 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
@@ -1,9 +1,9 @@
 {{#if unread }}
-  &nbsp;<a href={{url}} class='badge badge-notification unread' title={{i18n "topic.unread_posts" count=unread}}>{{unread}}</a>
+  &nbsp;<a href={{url}} title={{i18n "topic.unread_posts" count=unread}} class="badge badge-notification unread">{{unread}}</a>
 {{/if}}
 {{#if newPosts}}
-  &nbsp;<a href={{url}} class='badge badge-notification new-posts' title={{i18n "topic.total_unread_posts" count=newPosts}}>{{newPosts}}</a>
+  &nbsp;<a href={{url}} title={{i18n "topic.total_unread_posts" count=newPosts}} class="badge badge-notification new-posts">{{newPosts}}</a>
 {{/if}}
 {{#if unseen}}
-  &nbsp;<a href={{url}} class='badge badge-notification new-topic' title={{i18n "topic.new"}}>{{newDotText}}</a>
+  &nbsp;<a href={{url}} title={{i18n "topic.new"}} class="badge badge-notification new-topic">{{newDotText}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index 4bfcbdc6fd..326aeb3538 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
@@ -3,15 +3,15 @@
 {{/unless}}
 
 {{#if showBackButton}}
-  <div class='progress-back-container'>
+  <div class="progress-back-container">
     {{d-button label="topic.timeline.back" class="btn-primary progress-back" action=(action "goBack") icon="arrow-down"}}
   </div>
 {{/if}}
 
-<nav id='topic-progress' title={{i18n 'topic.progress.title'}} class={{if hideProgress 'hidden'}}>
-  <div class='nums'>
+<nav title={{i18n "topic.progress.title"}} class={{if hideProgress "hidden"}} id="topic-progress">
+  <div class="nums">
     <h4>{{progressPosition}}</h4>
-    <span class={{if hugeNumberOfPosts 'hidden'}}>
+    <span class={{if hugeNumberOfPosts "hidden"}}>
       <span>/</span>
       <h4>{{postStream.filteredPostsCount}}</h4>
     </span>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-status.hbs b/app/assets/javascripts/discourse/templates/components/topic-status.hbs
index bf655d9219..23761e150f 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-status.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-status.hbs
@@ -1,32 +1,32 @@
 {{~#if topicClosedArchived~}}
-  <span class='topic-status' title={{closedArchivedTitle}}>{{closedArchivedIcon}}</span>
+  <span title={{closedArchivedTitle}} class="topic-status">{{closedArchivedIcon}}</span>
 {{~/if~}}
 {{~#if closedIcon~}}
-  <span class='topic-status' title={{closedTitle}}>{{closedIcon}}</span>
+  <span title={{closedTitle}} class="topic-status">{{closedIcon}}</span>
 {{~/if~}}
 {{~#if archivedIcon~}}
-  <span class='topic-status' title={{archivedTitle}}>{{archivedIcon}}</span>
+  <span title={{archivedTitle}} class="topic-status">{{archivedIcon}}</span>
 {{~/if~}}
 {{~#if topicPrivateMessage~}}
-  <span class='topic-status' title={{privateMessageTitle}}>{{privateMessageIcon}}</span>
+  <span title={{privateMessageTitle}} class="topic-status">{{privateMessageIcon}}</span>
 {{~/if~}}
 {{~#if topicWarning~}}
-  <span class='topic-status topic-status-warning' title={{warningTitle}}>{{warningIcon}}</span>
+  <span title={{warningTitle}} class="topic-status topic-status-warning">{{warningIcon}}</span>
 {{~/if~}}
 {{~#if topicPinned~}}
   {{~#if canAct~}}
-    <a href="" class='topic-status' title={{pinnedTitle}}>{{pinnedIcon}}</a>
+    <a href="" title={{pinnedTitle}} class="topic-status">{{pinnedIcon}}</a>
   {{~else~}}
-    <span class='topic-status' title={{pinnedTitle}}>{{pinnedIcon}}</span>
+    <span title={{pinnedTitle}} class="topic-status">{{pinnedIcon}}</span>
   {{~/if~}}
 {{~/if~}}
 {{~#if topicUnpinned~}}
   {{~#if canAct~}}
-    <a href="" class='topic-status' title={{unpinnedTitle}}>{{unpinnedIcon}}</a>
+    <a href="" title={{unpinnedTitle}} class="topic-status">{{unpinnedIcon}}</a>
   {{~else~}}
-    <span class='topic-status' title={{unpinnedTitle}}>{{unpinnedIcon}}</span>
+    <span title={{unpinnedTitle}} class="topic-status">{{unpinnedIcon}}</span>
   {{~/if~}}
 {{~/if~}}
 {{~#if topicInvisible~}}
-  <span class='topic-status' title={{invisibleTitle}}>{{invisibleIcon}}</span>
+  <span title={{invisibleTitle}} class="topic-status">{{invisibleIcon}}</span>
 {{~/if~}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 60bf8008b9..e5ac4178c2 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -34,7 +34,7 @@
             flairColor=user.primary_group_flair_color
             groupName=user.primary_group_name}}
           {{/if}}
-          {{plugin-outlet name="user-card-avatar-flair" args=(hash user=user) tagName='div'}}
+          {{plugin-outlet name="user-card-avatar-flair" args=(hash user=user) tagName="div"}}
         </div>
         <div class="names">
           <h1 class="{{staff}} {{newUser}} {{if nameFirst "full-name" "username"}}">
@@ -43,7 +43,7 @@
                 {{if nameFirst user.name (format-username username)}}
               </span>
             {{else}}
-              <a href={{user.path}} {{action "showUser" user}} class='user-profile-link'>
+              <a href={{user.path}} {{action "showUser" user}} class="user-profile-link">
                 <span class="name-username-wrapper">
                   {{if nameFirst user.name (format-username username)}}
                 </span>
@@ -51,25 +51,25 @@
               </a>
             {{/if}}
           </h1>
-          {{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=''}}
+          {{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=""}}
           {{#if nameFirst}}
-            <h2 class='username'>{{username}}</h2>
+            <h2 class="username">{{username}}</h2>
           {{else}}
             {{#if user.name}}
-              <h2 class='full-name'>{{user.name}}</h2>
+              <h2 class="full-name">{{user.name}}</h2>
             {{/if}}
           {{/if}}
           {{#if user.title}}
             <h2>{{user.title}}</h2>
           {{/if}}
           {{#if user.staged}}
-            <h2 class="staged">{{i18n 'user.staged'}}</h2>
+            <h2 class="staged">{{i18n "user.staged"}}</h2>
           {{/if}}
-          {{plugin-outlet name="user-card-post-names" args=(hash user=user) tagName='div'}}
+          {{plugin-outlet name="user-card-post-names" args=(hash user=user) tagName="div"}}
         </div>
         <ul class="usercard-controls">
           {{#if user.can_send_private_message_to_user}}
-            <li class='compose-pm'>
+            <li class="compose-pm">
               {{d-button
               class="btn-primary"
               action=(action "composePM" user post)
@@ -113,7 +113,7 @@
 
       {{#if user.profile_hidden}}
         <div class="card-row second-row">
-          <div class='profile-hidden'>
+          <div class="profile-hidden">
             <span>{{i18n "user.profile_hidden"}}</span>
           </div>
         </div>
@@ -122,19 +122,19 @@
       {{#if isSuspendedOrHasBio}}
         <div class="card-row second-row">
           {{#if user.suspend_reason}}
-            <div class='suspended'>
+            <div class="suspended">
               <div class="suspension-date">
                 {{d-icon "ban"}}
-                {{i18n 'user.suspended_notice' date=user.suspendedTillDate}}
+                {{i18n "user.suspended_notice" date=user.suspendedTillDate}}
               </div>
-              <div class='suspension-reason'>
-                <span class="suspension-reason-title">{{i18n 'user.suspended_reason'}}</span>
+              <div class="suspension-reason">
+                <span class="suspension-reason-title">{{i18n "user.suspended_reason"}}</span>
                 <span class="suspension-reason-description">{{user.suspend_reason}}</span>
               </div>
             </div>
           {{else}}
             {{#if user.bio_excerpt}}
-              <div class='bio'>{{text-overflow class="overflow" text=user.bio_excerpt}}</div>
+              <div class="bio">{{text-overflow class="overflow" text=user.bio_excerpt}}</div>
             {{/if}}
           {{/if}}
         </div>
@@ -143,7 +143,7 @@
       {{#if showFeaturedTopic}}
         <div class="card-row">
           <div class="featured-topic">
-            <span class="desc">{{i18n 'user.featured_topic'}}</span>
+            <span class="desc">{{i18n "user.featured_topic"}}</span>
             {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe (replace-emoji user.featured_topic.fancy_title)}}{{/link-to}}
           </div>
         </div>
@@ -153,13 +153,13 @@
         <div class="card-row">
           <div class="location-and-website">
             {{#if user.location}}
-              <span class='location'>
+              <span class="location">
                 {{d-icon "map-marker-alt"}}
                 <span>{{user.location}}</span>
               </span>
             {{/if}}
             {{#if user.website_name}}
-              <span class='website-name'>
+              <span class="website-name">
                 {{d-icon "globe"}}
                 {{#if linkWebsite}}
                   {{!-- template-lint-disable  --}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index c09e659301..64ee54fa82 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,14 +1,14 @@
 {{#if field.name}}
-  <label class="control-label" for={{concat 'user-' elementId}}>
-    {{html-safe field.name}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
+  <label class="control-label" for={{concat "user-" elementId}}>
+    {{html-safe field.name}}   {{#if field.required}}<span class="required">*</span>{{/if}}
   </label>
 {{/if}}
 
-<div class='controls'>
+<div class="controls">
   <label class="control-label checkbox-label">
-    {{input id=(concat 'user-' elementId) checked=value type="checkbox"}}
+    {{input id=(concat "user-" elementId) checked=value type="checkbox"}}
     <span>
-      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
+      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class="required">*</span>{{/if}}{{/unless}}
     </span>
   </label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index 5583c96f89..f59b0dfd05 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,13 +1,13 @@
-<label class="control-label" for={{concat 'user-' elementId}}>
+<label class="control-label" for={{concat "user-" elementId}}>
   {{html-safe field.name}}
   {{#if field.required}}
-    <span class='required'>*</span>
+    <span class="required">*</span>
   {{/if}}
 </label>
 
-<div class='controls'>
+<div class="controls">
   {{combo-box
-    id=(concat 'user-' elementId)
+    id=(concat "user-" elementId)
     content=field.options
     valueProperty=null
     nameProperty=null
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 1518688a95..09a8a136e7 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,8 +1,8 @@
-<label class="control-label" for={{concat 'user-' elementId}}>
+<label class="control-label" for={{concat "user-" elementId}}>
   {{html-safe field.name}}
-  {{#if field.required}}<span class='required'>*</span>{{/if}}
+  {{#if field.required}}<span class="required">*</span>{{/if}}
 </label>
-<div class='controls'>
-  {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
+<div class="controls">
+  {{input id=(concat "user-" elementId) value=value maxlength=site.user_field_max_length}}
   <div class="instructions">{{html-safe field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs b/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
index b358f961e7..93b924b75d 100644
--- a/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
@@ -1,5 +1,5 @@
 {{#if showPercentage}}
-  <div class='user-flag-percentage' title={{percentage.title}}>
+  <div title={{percentage.title}} class="user-flag-percentage">
     <span class="percentage-label {{percentage.className}}">{{percentage.label}}</span>
     {{d-icon percentage.icon}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-info.hbs b/app/assets/javascripts/discourse/templates/components/user-info.hbs
index 6c3e7aaceb..59160413bb 100644
--- a/app/assets/javascripts/discourse/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-info.hbs
@@ -12,14 +12,14 @@
 </div>
 
 <div class="user-detail">
-  <div class='name-line'>
+  <div class="name-line">
     <span class="username"><a href={{userPath}} data-user-card={{user.username}}>{{format-username user.username}}</a></span>
     <span class="name">{{name}}</span>
   </div>
   <div class="title">{{user.title}}</div>
 
   {{#if hasBlock}}
-    <div class='details'>
+    <div class="details">
       {{yield}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
index 757526cf38..303878d412 100644
--- a/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
@@ -1,4 +1,4 @@
-<div class='user-profile-avatar'>
+<div class="user-profile-avatar">
   {{bound-avatar user "huge"}}
   {{#if user.primary_group_name}}
     {{avatar-flair
@@ -7,5 +7,5 @@
       flairColor=user.primary_group_flair_color
       groupName=user.primary_group_name}}
   {{/if}}
-  {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=user) tagName='div'}}
+  {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=user) tagName="div"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 20bbb3204a..e95ab17d31 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -1,4 +1,4 @@
-<span class='value'>
+<span class="value">
   {{#if isNumber}}
     {{number value}}
   {{else if isDuration}}
@@ -7,7 +7,7 @@
     {{value}}
   {{/if}}
 </span>
-<span class='label'>
+<span class="label">
   {{#if icon}}{{d-icon icon}}{{/if}}
   {{html-safe (i18n label count=value)}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index 50d4f6ee86..278606bdb9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -1,13 +1,13 @@
-<div class='clearfix info'>
-  <a href={{item.userUrl}} data-user-card={{item.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
-  <span class='time'>{{format-date item.created_at}}</span>
+<div class="clearfix info">
+  <a href={{item.userUrl}} data-user-card={{item.username}} class="avatar-link"><div class="avatar-wrapper">{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
+  <span class="time">{{format-date item.created_at}}</span>
   {{#if item.draftType}}
-    <span class='draft-type'>{{html-safe item.draftType}}</span>
+    <span class="draft-type">{{html-safe item.draftType}}</span>
   {{else}}
     {{expand-post item=item}}
   {{/if}}
-  <div class='stream-topic-details'>
-    <div class='stream-topic-title'>
+  <div class="stream-topic-details">
+    <div class="stream-topic-title">
       {{topic-status topic=item disableActions=true}}
       <span class="title">
         {{#if item.postUrl}}
@@ -32,10 +32,10 @@
 </div>
 
 {{#if actionDescription}}
-  <p class='excerpt'>{{actionDescription}}</p>
+  <p class="excerpt">{{actionDescription}}</p>
 {{/if}}
 
-<p class='excerpt' data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}}>
+<p data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}} class="excerpt">
   {{!-- template-lint-disable no-triple-curlies --}}
   {{~#if item.expandedExcerpt}}
     {{~{item.expandedExcerpt}~}}
@@ -47,7 +47,7 @@
 
 {{#each item.children as |child|}}
   {{!-- DEPRECATED: 'child-actions' class --}}
-  <div class='user-stream-item-actions child-actions'>
+  <div class="user-stream-item-actions child-actions">
     {{d-icon child.icon class="icon"}}
     {{#each child.items as |grandChild|}}
       {{#if grandChild.removableBookmark}}
@@ -58,7 +58,7 @@
           label="bookmarks.remove"
         }}
       {{else}}
-        <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
+        <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class="avatar-link"><div class="avatar-wrapper">{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
         {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{grandChild.edit_reason}}</span>{{/if}}
       {{/if}}
     {{/each}}
@@ -66,8 +66,8 @@
 {{/each}}
 
 {{#if item.editableDraft}}
-  <div class='user-stream-item-draft-actions'>
-    {{d-button action=resumeDraft actionParam=item icon="pencil-alt" label='drafts.resume' class="btn-default resume-draft"}}
-    {{d-button action=removeDraft actionParam=item icon="far-trash-alt" label='drafts.remove' class="btn-default remove-draft"}}
+  <div class="user-stream-item-draft-actions">
+    {{d-button action=resumeDraft actionParam=item icon="pencil-alt" label="drafts.resume" class="btn-default resume-draft"}}
+    {{d-button action=removeDraft actionParam=item icon="far-trash-alt" label="drafts.remove" class="btn-default remove-draft"}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
index 50ab46f1dc..4694405f99 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
@@ -1,5 +1,5 @@
 {{#if count}}
-  {{#link-to 'full-page-search' (query-params q=searchParams)}}
+  {{#link-to "full-page-search" (query-params q=searchParams)}}
     {{count}}
   {{/link-to}}
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
index 28bdf9d7b8..69763aba1d 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
@@ -1,2 +1,2 @@
-<h3 class='stats-title'>{{i18n (concat "user.summary." title)}}</h3>
+<h3 class="stats-title">{{i18n (concat "user.summary." title)}}</h3>
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 970592ece4..b1ab485fa6 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -1,8 +1,8 @@
-<span class='topic-info'>
+<span class="topic-info">
   {{format-date createdAt format="tiny" noTitle="true"}}
   {{#if likes}}
     &middot;
-    {{d-icon 'heart'}}&nbsp;<span class='like-count'>{{number likes}}</span>
+    {{d-icon "heart"}}&nbsp;<span class="like-count">{{number likes}}</span>
   {{/if}}
 </span>
 <br>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 7cd5c8f42a..6f133154bd 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -10,10 +10,10 @@
                         messageCount=messageCount
                         addLinkLookup=(action "addLinkLookup")}}
     {{#if model.viewOpenOrFullscreen}}
-      <div class="reply-area {{if canEditTags 'with-tags'}}">
-        <div class='composer-fields'>
+      <div class="reply-area {{if canEditTags "with-tags"}}">
+        <div class="composer-fields">
           {{plugin-outlet name="composer-open" args=(hash model=model)}}
-          <div class='reply-to'>
+          <div class="reply-to">
             {{#unless model.viewFullscreen}}
               <div class="reply-details">
                 {{composer-action-title
@@ -26,10 +26,10 @@
 
                 {{#unless site.mobileView}}
                   {{#if isWhispering}}
-                    <span class='whisper'>{{d-icon "far-eye-slash"}}</span>
+                    <span class="whisper">{{d-icon "far-eye-slash"}}</span>
                   {{/if}}
                   {{#if model.unlistTopic}}
-                    <span class='whisper'>({{i18n 'composer.unlist'}})</span>
+                    <span class="whisper">({{i18n "composer.unlist"}})</span>
                   {{/if}}
                   {{#if model.noBump}}
                     <span class="no-bump">{{d-icon "anchor"}}</span>
@@ -51,14 +51,14 @@
           {{#unless model.viewFullscreen}}
             {{#if model.canEditTitle}}
               {{#if model.creatingPrivateMessage}}
-                <div class='user-selector'>
+                <div class="user-selector">
                   {{composer-user-selector topicId=topicModel.id
                                            usernames=model.targetRecipients
                                            hasGroups=model.hasTargetGroups
                                            focusTarget=focusTarget
                                            class="users-input"}}
                   {{#if showWarning}}
-                    <label class='add-warning'>
+                    <label class="add-warning">
                       {{input type="checkbox" checked=model.isWarning tabindex="3"}}
                       {{i18n "composer.add_warning"}}
                     </label>
@@ -66,7 +66,7 @@
                 </div>
               {{/if}}
 
-              <div class="title-and-category {{if showPreview 'with-preview'}}">
+              <div class="title-and-category {{if showPreview "with-preview"}}">
 
                 {{composer-title composer=model lastValidatedAt=lastValidatedAt focusTarget=focusTarget}}
 
@@ -127,10 +127,10 @@
                           afterRefresh=(action "afterRefresh")
                           focusTarget=focusTarget}}
 
-        <div class='submit-panel'>
+        <div class="submit-panel">
           {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
 
-          <div class='save-or-cancel'>
+          <div class="save-or-cancel">
             {{#unless model.viewFullscreen}}
               {{composer-save-button action=(action "save")
                                      icon=saveIcon
@@ -138,7 +138,7 @@
                                      disableSubmit=disableSubmit}}
 
               {{#if site.mobileView}}
-                <a href {{action "cancel"}} class='cancel' tabindex="6" title={{i18n 'cancel'}}>
+                <a href {{action "cancel"}} tabindex="6" title={{i18n "cancel"}} class="cancel">
                   {{#if canEdit}}
                     {{d-icon "times"}}
                   {{else}}
@@ -146,13 +146,13 @@
                   {{/if}}
                 </a>
               {{else}}
-                <a href {{action "cancel"}} class='cancel' tabindex="6" >{{i18n 'cancel'}}</a>
+                <a href {{action "cancel"}} tabindex="6" class="cancel" >{{i18n "cancel"}}</a>
               {{/if}}
             {{/unless}}
 
             {{#if site.mobileView}}
               {{#if whisperOrUnlistTopic}}
-                <span class='whisper'>
+                <span class="whisper">
                   {{d-icon "far-eye-slash"}}
                 </span>
               {{/if}}
@@ -163,21 +163,21 @@
 
             {{#if isUploading}}
               <div id="file-uploading">
-                {{loading-spinner size="small"}}<span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
+                {{loading-spinner size="small"}}<span>{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
                 {{#if isCancellable}}
                   <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
                 {{/if}}
               </div>
             {{/if}}
-            <div id='draft-status' class={{if isUploading 'hidden'}}>
+            <div class={{if isUploading "hidden"}} id="draft-status">
               {{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
-              {{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
+              {{#if model.draftSaved}}{{d-icon "check" class="save-animation"}}{{/if}}
               {{#if model.draftStatus}}
                 <span title={{model.draftStatus}}>
                   {{#if model.draftConflictUser}}
-                    {{avatar model.draftConflictUser imageSize="small"}} {{d-icon 'user-edit'}}
+                    {{avatar model.draftConflictUser imageSize="small"}} {{d-icon "user-edit"}}
                   {{else}}
-                    {{d-icon 'sync-alt'}}
+                    {{d-icon "sync-alt"}}
                   {{/if}}
                   {{#unless site.mobileView}}
                     {{model.draftStatus}}
@@ -189,12 +189,12 @@
 
           {{#if site.mobileView}}
             {{#if allowUpload}}
-              <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
+              <a class="btn btn-default no-text mobile-file-upload {{if isUploading "hidden"}}">
                 {{d-icon uploadIcon}}
               </a>
             {{/if}}
 
-            <a href class="btn btn-default no-text mobile-preview" title={{i18n 'composer.show_preview'}} {{action "togglePreview"}}>
+            <a href class="btn btn-default no-text mobile-preview" title={{i18n "composer.show_preview"}} {{action "togglePreview"}}>
               {{d-icon "desktop"}}
             </a>
 
@@ -202,22 +202,22 @@
               {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
             {{/if}}
           {{else}}
-            <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
+            <a href {{action "togglePreview"}} class="toggle-preview">{{html-safe toggleText}}</a>
           {{/if}}
 
         </div>
       </div>
 
     {{else}}
-      <div class='saving-text'>
+      <div class="saving-text">
         {{#if model.createdPost}}
-          {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+          {{i18n "composer.saved"}} <a href={{createdPost.url}} {{action "viewNewReply"}} class="permalink">{{i18n "composer.view_new_post"}}</a>
         {{else}}
-          {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
+          {{i18n "composer.saving"}} {{loading-spinner size="small"}}
         {{/if}}
       </div>
 
-      <div class='draft-text'>
+      <div class="draft-text">
         {{#if model.topic}}
           {{d-icon "share"}} {{html-safe draftTitle}}
         {{else}}
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
index 238de27da0..50f12536d6 100644
--- a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
-<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
+<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
 <p>{{html-safe message.body}}</p>
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs
index 269e44e595..ea644416c0 100644
--- a/app/assets/javascripts/discourse/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/education.hbs
@@ -1,2 +1,2 @@
-<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
+<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
 {{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
index 269e44e595..ea644416c0 100644
--- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
-<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
+<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
 {{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
index 6972b13d07..8a44bb09de 100644
--- a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
@@ -1,6 +1,6 @@
-<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-<h3>{{i18n 'composer.similar_topics'}}</h3>
+<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
+<h3>{{i18n "composer.similar_topics"}}</h3>
 
-<ul class='topics'>
+<ul class="topics">
   {{mount-widget widget="search-result-topic" args=(hash results=message.similarTopics)}}
 </ul>
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 208de9a709..8f13b1b615 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -38,13 +38,13 @@
 
 {{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount as |discoveryTopicList|}}
   {{#if top}}
-    <div class='top-lists'>
+    <div class="top-lists">
       {{period-chooser period=period action=(action "changePeriod") fullDay=false}}
     </div>
   {{else}}
     {{#if topicTrackingState.hasIncoming}}
-      <div class="show-more {{if hasTopics 'has-topics'}}">
-        <a class='alert alert-info clickable' tabindex="0" href {{action "showInserted"}}>
+      <div class="show-more {{if hasTopics "has-topics"}}">
+        <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
           {{count-i18n key="topic_count_" suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
         </a>
       </div>
@@ -75,7 +75,7 @@
   {{/if}}
 {{/discovery-topics-list}}
 
-<footer class='topic-list-bottom'>
+<footer class="topic-list-bottom">
   {{conditional-loading-spinner condition=model.loadingMore}}
   {{#if allLoaded}}
     {{#if showDismissRead}}
@@ -97,12 +97,12 @@
 
     {{#footer-message education=footerEducation message=footerMessage}}
       {{#if latest}}
-        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
+        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n "topic.suggest_create_topic"}}</a>{{/if}}
       {{else if top}}
-        {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
+        {{#link-to "discovery.categories"}}{{i18n "topic.browse_all_categories"}}{{/link-to}}, {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}} {{i18n "or"}} {{i18n "filters.top.other_periods"}}
         {{top-period-buttons period=period action=(action "changePeriod")}}
       {{else}}
-        {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
+        {{#link-to "discovery.categories"}} {{i18n "topic.browse_all_categories"}}{{/link-to}} {{i18n "or"}} {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}}
       {{/if}}
     {{/footer-message}}
 
diff --git a/app/assets/javascripts/discourse/templates/email-login.hbs b/app/assets/javascripts/discourse/templates/email-login.hbs
index 96ba848bfb..3e89b6cc61 100644
--- a/app/assets/javascripts/discourse/templates/email-login.hbs
+++ b/app/assets/javascripts/discourse/templates/email-login.hbs
@@ -6,7 +6,7 @@
   <div class="pull-left col-form">
     <form>
       {{#if model.error}}
-        <div class='alert alert-error'>
+        <div class="alert alert-error">
           {{model.error}}
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/exception.hbs b/app/assets/javascripts/discourse/templates/exception.hbs
index 2c6d59e487..99d6e459a9 100644
--- a/app/assets/javascripts/discourse/templates/exception.hbs
+++ b/app/assets/javascripts/discourse/templates/exception.hbs
@@ -3,7 +3,7 @@
     <div class="face">:(</div>
     <div class="reason">{{reason}}</div>
     <div class="url">
-      {{i18n 'errors.prev_page'}} <a href={{requestUrl}} data-auto-route="true">{{requestUrl}}</a>
+      {{i18n "errors.prev_page"}} <a href={{requestUrl}} data-auto-route="true">{{requestUrl}}</a>
     </div>
     <div class="desc">
       {{#if networkFixed}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 649c3af0e4..d6cdd92227 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -20,7 +20,7 @@
     {{!-- context is only provided when searching from mobile view --}}
     <div class="search-context">
       {{#if context}}
-        <div class='fps-search-context'>
+        <div class="fps-search-context">
           <label>
             {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
           </label>
@@ -29,7 +29,7 @@
     </div>
 
     {{#if hasResults}}
-      <div class='search-title'>
+      <div class="search-title">
         {{#if hasResults}}
           {{create-topic-button canCreateTopic=canCreateTopic action=(action "createTopic" searchTerm)}}
         {{/if}}
@@ -40,19 +40,19 @@
         {{/if}}
 
         {{#if bulkSelectEnabled}}
-          <div class='fps-select'>
+          <div class="fps-select">
             <a href {{action "selectAll"}}>{{i18n "search.select_all"}}</a>
             <a href {{action "clearAll"}}>{{i18n "search.clear_all"}}</a>
           </div>
         {{/if}}
       </div>
 
-      <div class='search-info'>
-        <div class='result-count'>
+      <div class="search-info">
+        <div class="result-count">
           {{html-safe resultCountLabel}}
         </div>
-        <div class='sort-by'>
-          <span class='desc'>
+        <div class="sort-by">
+          <span class="desc">
             {{i18n "search.sort_by"}}
           </span>
           {{combo-box
@@ -73,25 +73,25 @@
       <div class="search-results">
         {{#load-more selector=".fps-result" action=(action "loadMore")}}
           {{#each model.posts as |result|}}
-            <div class='fps-result'>
-              <div class='author'>
+            <div class="fps-result">
+              <div class="author">
                 <a href={{result.userPath}} data-user-card={{result.username}}>
                   {{avatar result imageSize="large"}}
                 </a>
               </div>
 
-              <div class='fps-topic'>
-                <div class='topic'>
+              <div class="fps-topic">
+                <div class="topic">
                   {{#if bulkSelectEnabled}}
                     {{track-selected selectedList=selected selectedId=result.topic}}
                   {{/if}}
 
-                  <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
+                  <a href={{result.url}} {{action "logClick" result.topic_id}} class="search-link">
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+                    <span class="topic-title">{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
                   </a>
 
-                  <div class='search-category'>
+                  <div class="search-category">
                     {{#if result.topic.category.parentCategory}}
                       {{category-link result.topic.category.parentCategory}}
                     {{/if}}
@@ -103,8 +103,8 @@
                   </div>
                 </div>
 
-                <div class='blurb container'>
-                  <span class='date'>
+                <div class="blurb container">
+                  <span class="date">
                     {{format-age result.created_at}}
                     {{#if result.blurb}}
                       -
@@ -120,7 +120,7 @@
 
                 {{#if showLikeCount}}
                   {{#if result.like_count}}
-                    <span class='like-count'>
+                    <span class="like-count">
                       {{result.like_count}} {{d-icon "heart"}}
                     </span>
                   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index cd2608f2c2..f917c42d76 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -27,24 +27,24 @@
 
   {{#if hasMembers}}
     {{#load-more selector=".group-members tr" action=(action "loadMore")}}
-      <table class='group-members'>
+      <table class="group-members">
         <thead>
-          {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
-          <th class='group-owner'>{{i18n "groups.members.owner"}}</th>
-          {{group-index-toggle order=order desc=desc field='added_at' i18nKey='groups.member_added'}}
-          {{group-index-toggle order=order desc=desc field='last_posted_at' i18nKey='last_post'}}
-          {{group-index-toggle order=order desc=desc field='last_seen_at'  i18nKey='last_seen'}}
+          {{group-index-toggle order=order desc=desc field="username_lower" i18nKey="username"}}
+          <th class="group-owner">{{i18n "groups.members.owner"}}</th>
+          {{group-index-toggle order=order desc=desc field="added_at" i18nKey="groups.member_added"}}
+          {{group-index-toggle order=order desc=desc field="last_posted_at" i18nKey="last_post"}}
+          {{group-index-toggle order=order desc=desc field="last_seen_at" i18nKey="last_seen"}}
           <th></th>
         </thead>
 
         <tbody>
           {{#each model.members as |m|}}
             <tr>
-              <td class='avatar'>
+              <td class="avatar">
                 {{user-info user=m skipName=skipName}}
               </td>
 
-              <td class='group-owner'>
+              <td class="group-owner">
                 {{#if m.owner}}
                   <strong class="group-owner-label">
                     {{d-icon "shield-alt"}}
diff --git a/app/assets/javascripts/discourse/templates/group-requests.hbs b/app/assets/javascripts/discourse/templates/group-requests.hbs
index 7b8b793315..7ee73b8fb6 100644
--- a/app/assets/javascripts/discourse/templates/group-requests.hbs
+++ b/app/assets/javascripts/discourse/templates/group-requests.hbs
@@ -10,10 +10,10 @@
 
   {{#if hasRequesters}}
     {{#load-more selector=".group-members tr" action=(action "loadMore")}}
-      <table class='group-members'>
+      <table class="group-members">
         <thead>
-          {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
-          {{group-index-toggle order=order desc=desc field='requested_at' i18nKey='groups.member_requested'}}
+          {{group-index-toggle order=order desc=desc field="username_lower" i18nKey="username"}}
+          {{group-index-toggle order=order desc=desc field="requested_at" i18nKey="groups.member_requested"}}
           <th>{{i18n "groups.requests.reason"}}</th>
           <th></th>
           <th></th>
@@ -22,7 +22,7 @@
         <tbody>
           {{#each model.requesters as |m|}}
             <tr>
-              <td class='avatar'>
+              <td class="avatar">
                 {{user-info user=m skipName=skipName}}
               </td>
               <td>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 4cb1033389..0a53f7f1c0 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -1,10 +1,10 @@
 {{plugin-outlet name="before-group-container" args=(hash group=model)}}
 
 <div class="container group {{model.name}}">
-  <div class='group-details-container'>
-    <div class='group-info'>
+  <div class="group-details-container">
+    <div class="group-info">
       {{#if model.flair_url}}
-        <span class='group-avatar-flair'>
+        <span class="group-avatar-flair">
           {{avatar-flair
             flairURL=model.flair_url
             flairBgColor=model.flair_bg_color
@@ -14,10 +14,10 @@
       {{/if}}
 
       <span>
-        <span class='group-info-name'>{{groupName}}</span>
+        <span class="group-info-name">{{groupName}}</span>
 
         <div>
-          {{#if model.full_name}}<span class='group-info-full-name'>{{model.name}}</span>{{/if}}
+          {{#if model.full_name}}<span class="group-info-full-name">{{model.name}}</span>{{/if}}
         </div>
       </span>
     </div>
@@ -25,7 +25,7 @@
     {{#if model.bio_cooked}}
       <hr>
 
-      <div class='group-bio'>
+      <div class="group-bio">
         <p>{{html-safe model.bio_cooked}}</p>
       </div>
     {{/if}}
@@ -48,7 +48,7 @@
         {{d-button action=(action "destroy")
             disabled=destroying
             icon="trash-alt"
-            class='btn-danger'
+            class="btn-danger"
             label="admin.groups.delete"}}
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/templates/group/activity.hbs
index 5d94db7b56..c8f26f44af 100644
--- a/app/assets/javascripts/discourse/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/group/activity.hbs
@@ -1,5 +1,5 @@
 <section class="user-secondary-navigation">
-  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router._router.currentPath}}
+  {{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked" currentPath=router._router.currentPath}}
     {{#if model.can_see_members}}
       {{group-activity-filter filter="posts" categoryId=category_id}}
       {{group-activity-filter filter="topics" categoryId=category_id}}
@@ -7,7 +7,7 @@
     {{#if siteSettings.enable_mentions}}
       {{group-activity-filter filter="mentions" categoryId=category_id}}
     {{/if}}
-    {{plugin-outlet name="group-activity-bottom" tagName='' connectorTagName='li'}}
+    {{plugin-outlet name="group-activity-bottom" tagName="" connectorTagName="li"}}
   {{/mobile-nav}}
 </section>
 <section class="user-content">
diff --git a/app/assets/javascripts/discourse/templates/group/manage.hbs b/app/assets/javascripts/discourse/templates/group/manage.hbs
index 459cdd7a18..de09c82655 100644
--- a/app/assets/javascripts/discourse/templates/group/manage.hbs
+++ b/app/assets/javascripts/discourse/templates/group/manage.hbs
@@ -1,5 +1,5 @@
-<section class='user-secondary-navigation'>
-  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router._router.currentPath}}
+<section class="user-secondary-navigation">
+  {{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked" currentPath=router._router.currentPath}}
     {{#each tabs as |tab|}}
       <li>
         {{#link-to tab.route model.name}}
diff --git a/app/assets/javascripts/discourse/templates/group/manage/logs.hbs b/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
index 96ee61cd8d..a124328634 100644
--- a/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
+++ b/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
@@ -9,11 +9,11 @@
   {{#load-more selector=".group-manage-logs .group-manage-logs-row" action=(action "loadMore")}}
     <table class="group-manage-logs">
       <thead>
-        <th>{{i18n 'groups.manage.logs.action'}}</th>
-        <th>{{i18n 'groups.manage.logs.acting_user'}}</th>
-        <th>{{i18n 'groups.manage.logs.target_user'}}</th>
-        <th>{{i18n 'groups.manage.logs.subject'}}</th>
-        <th>{{i18n 'groups.manage.logs.when'}}</th>
+        <th>{{i18n "groups.manage.logs.action"}}</th>
+        <th>{{i18n "groups.manage.logs.acting_user"}}</th>
+        <th>{{i18n "groups.manage.logs.target_user"}}</th>
+        <th>{{i18n "groups.manage.logs.subject"}}</th>
+        <th>{{i18n "groups.manage.logs.when"}}</th>
         <th></th>
       </thead>
 
diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/templates/group/messages.hbs
index f923416abb..2a05efd124 100644
--- a/app/assets/javascripts/discourse/templates/group/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/group/messages.hbs
@@ -1,13 +1,13 @@
 <section class="user-secondary-navigation">
-  {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=router._router.currentPath}}
+  {{#mobile-nav class="messages-nav" desktopClass="nav-stacked action-list" currentPath=router._router.currentPath}}
     <li>
-      {{#link-to 'group.messages.inbox' model.name}}
-        {{i18n 'user.messages.inbox'}}
+      {{#link-to "group.messages.inbox" model.name}}
+        {{i18n "user.messages.inbox"}}
       {{/link-to}}
     </li>
     <li>
-      {{#link-to 'group.messages.archive' model.name}}
-        {{i18n 'user.messages.archive'}}
+      {{#link-to "group.messages.archive" model.name}}
+        {{i18n "user.messages.archive"}}
       {{/link-to}}
     </li>
   {{/mobile-nav}}
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index a3f46e47db..d1e4330e3f 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -33,14 +33,14 @@
   {{#if groups}}
     {{#conditional-loading-spinner condition=isLoading}}
       {{#load-more selector=".groups-boxes .group-box" action=(action "loadMore")}}
-        <div class='container'>
+        <div class="container">
           <div class="groups-boxes">
             {{#each groups as |group|}}
               {{#link-to "group.members" group.name class="group-box"}}
                 <div class="group-box-inner">
                   <div class="group-info-wrapper">
                     {{#if group.flair_url}}
-                      <span class='group-avatar-flair'>
+                      <span class="group-avatar-flair">
                         {{avatar-flair
                           flairURL=group.flair_url
                           flairBgColor=group.flair_bg_color
@@ -59,7 +59,7 @@
                   <div class="group-description">{{html-safe group.bio_excerpt}}</div>
 
                   <div class="group-membership">
-                    {{#group-membership-button tagName='' model=group showLogin=(route-action "showLogin")}}
+                    {{#group-membership-button tagName="" model=group showLogin=(route-action "showLogin")}}
                       {{#if group.is_group_owner}}
                         <span class="is-group-owner">
                           {{d-icon "shield-alt"}}
@@ -71,16 +71,16 @@
                           {{i18n "groups.index.is_group_user"}}
                         </span>
                       {{else if group.public_admission}}
-                        {{i18n 'groups.index.public'}}
+                        {{i18n "groups.index.public"}}
                       {{else if group.isPrivate}}
                         {{d-icon "far-eye-slash"}}
-                        {{i18n 'groups.index.private'}}
+                        {{i18n "groups.index.private"}}
                       {{else}}
                         {{#if group.automatic}}
-                          {{i18n 'groups.index.automatic'}}
+                          {{i18n "groups.index.automatic"}}
                         {{else}}
                           {{d-icon "ban"}}
-                          {{i18n 'groups.index.closed'}}
+                          {{i18n "groups.index.closed"}}
                         {{/if}}
                       {{/if}}
                     {{/group-membership-button}}
diff --git a/app/assets/javascripts/discourse/templates/groups/new.hbs b/app/assets/javascripts/discourse/templates/groups/new.hbs
index b472353ee5..0a923cf3aa 100644
--- a/app/assets/javascripts/discourse/templates/groups/new.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/new.hbs
@@ -6,7 +6,7 @@
   <form class="groups-form form-vertical">
     {{#groups-form-profile-fields model=model disableSave=saving}}
       <div class="control-group">
-        <label class="control-label" for="owner-selector">{{i18n 'admin.groups.add_owners'}}</label>
+        <label class="control-label" for="owner-selector">{{i18n "admin.groups.add_owners"}}</label>
 
         {{user-selector usernames=model.ownerUsernames
             class="input-xxlarge"
@@ -15,7 +15,7 @@
       </div>
 
       <div class="control-group">
-        <label class="control-label" for="member-selector">{{i18n 'groups.members.title'}}</label>
+        <label class="control-label" for="member-selector">{{i18n "groups.members.title"}}</label>
 
         {{user-selector usernames=model.usernames
             class="input-xxlarge"
@@ -27,16 +27,16 @@
     {{groups-form-membership-fields model=model}}
     {{groups-form-interaction-fields model=model}}
 
-    <div class='control-group buttons'>
+    <div class="control-group buttons">
       {{d-button
         action=(action "save")
         type="submit"
         disabled=saving
-        class='btn btn-primary group-form-save'
+        class="btn btn-primary group-form-save"
         label="admin.groups.new.create"}}
 
       {{#link-to "groups"}}
-        {{i18n 'cancel'}}
+        {{i18n "cancel"}}
       {{/link-to}}
     </div>
   </form>
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index ce3f115efa..816303a5c7 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -9,50 +9,50 @@
     <div class="col-form">
       {{#if successMessage}}
         <br><br>
-        <div class='alert alert-info'>
+        <div class="alert alert-info">
           <p>{{html-safe successMessage}}</p>
         </div>
       {{else}}
-        <p>{{i18n 'invites.invited_by'}}</p>
+        <p>{{i18n "invites.invited_by"}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
         <p>
           {{html-safe yourEmailMessage}}
           {{#if externalAuthsEnabled}}
-            {{i18n 'invites.social_login_available'}}
+            {{i18n "invites.social_login_available"}}
           {{/if}}
         </p>
 
         <form>
           <div class="input username-input">
-            <label>{{i18n 'user.username.title'}}</label>
+            <label>{{i18n "user.username.title"}}</label>
             {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
             &nbsp;{{input-tip validation=usernameValidation id="username-validation"}}
-            <div class="instructions">{{i18n 'user.username.instructions'}}</div>
+            <div class="instructions">{{i18n "user.username.instructions"}}</div>
           </div>
 
           {{#if fullnameRequired}}
             <div class="input name-input">
-              <label>{{i18n 'invites.name_label'}}</label>
+              <label>{{i18n "invites.name_label"}}</label>
               {{input value=accountName id="new-account-name" name="name"}}
               <div class="instructions">{{nameInstructions}}</div>
             </div>
           {{/if}}
 
           <div class="input password-input">
-            <label>{{i18n 'invites.password_label'}}</label>
+            <label>{{i18n "invites.password_label"}}</label>
             {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
             &nbsp;{{input-tip validation=passwordValidation}}
             <div class="instructions">
-              {{passwordInstructions}} {{i18n 'invites.optional_description'}}
-              <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
-                {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+              {{passwordInstructions}} {{i18n "invites.optional_description"}}
+              <div class="caps-lock-warning {{unless capsLockOn "invisible"}}">
+                {{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}
               </div>
             </div>
           </div>
 
           {{#if userFields}}
-            <div class='user-fields'>
+            <div class="user-fields">
               {{#each userFields as |f|}}
                 {{user-field field=f.field value=f.value}}
               {{/each}}
@@ -69,7 +69,7 @@
 
           {{#if errorMessage}}
             <br><br>
-            <div class='alert alert-error'>{{errorMessage}}</div>
+            <div class="alert alert-error">{{errorMessage}}</div>
           {{/if}}
         </form>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/login-preferences.hbs b/app/assets/javascripts/discourse/templates/login-preferences.hbs
index 24b7dce52f..4fb2bfe4b4 100644
--- a/app/assets/javascripts/discourse/templates/login-preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/login-preferences.hbs
@@ -1,7 +1,7 @@
-<div class='container'>
+<div class="container">
   <h2>{{i18n "login.to_continue"}}</h2>
 
-  <p style='margin-top: 1em'>{{i18n "login.preferences"}}</p>
+  <p style="margin-top: 1em">{{i18n "login.preferences"}}</p>
 
   {{d-button class="btn-primary" action=(route-action "showLogin") label="log_in"}}
   {{#unless siteSettings.enable_sso}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index f9fa81455a..9a3961ad71 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -1,7 +1,7 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if hasIncoming}}
     <div class="show-mores">
-      <a href class='alert alert-info clickable' {{action showInserted}}>
+      <a href {{action showInserted}} class="alert alert-info clickable">
         {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
       </a>
     </div>
@@ -11,9 +11,9 @@
     <table class="topic-list">
       <tbody>
         {{#each topics as |t|}}
-          <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
+          <tr class="topic-list-item {{if t.archived "archived"}} {{if t.visited "visited"}}" data-topic-id={{t.id}}>
             <td>
-              <div class='main-link'>
+              <div class="main-link">
                 {{topic-status topic=t}}
                 {{topic-link t}}
                 {{raw "list/unread-indicator"
@@ -29,29 +29,29 @@
                     {{html-safe t.excerpt}}
                     {{#if t.excerptTruncated}}
                       {{#unless t.canClearPin}}
-                        <a href={{t.url}}>{{i18n 'read_more'}}</a>
+                        <a href={{t.url}}>{{i18n "read_more"}}</a>
                       {{/unless}}
                     {{/if}}
                     {{#if t.canClearPin}}
-                      <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>
-                        {{i18n 'topic.clear_pin.title'}}
+                      <a href {{action "clearPin" t}} title={{i18n "topic.clear_pin.help"}}>
+                        {{i18n "topic.clear_pin.title"}}
                       </a>
                     {{/if}}
                   </div>
                 {{/if}}
               </div>
-              <div class='pull-right'>
+              <div class="pull-right">
                 {{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
               </div>
-              <div class='clearfix'></div>
+              <div class="clearfix"></div>
               <div class="topic-item-stats clearfix">
                 {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
                 <div class="pull-right">
                   {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                  <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
+                  <a href={{t.lastPostUrl}} title="{{i18n "last_post"}}: {{raw-date t.bumped_at}}">{{t.last_poster_username}}</a>
                 </div>
                 {{#unless hideCategory}}
-                  <div class='category'>
+                  <div class="category">
                     {{category-link t.category}}
                   </div>
                 {{/unless}}
@@ -63,8 +63,8 @@
       </tbody>
     </table>
   {{else}}
-    <div class='alert alert-info'>
-      {{i18n 'choose_topic.none_found'}}
+    <div class="alert alert-info">
+      {{i18n "choose_topic.none_found"}}
     </div>
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 148c009254..04cf4d8578 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -1,8 +1,8 @@
 {{#if categories}}
-  <div class="category-list {{if showTopics 'with-topics'}}">
+  <div class="category-list {{if showTopics "with-topics"}}">
     {{#each categories as |c|}}
-      <div data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class='category-list-item category {{if c.isMuted "muted"}}' style={{border-color c.color}}>
-        <table class='topic-list'>
+      <div data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} style={{border-color c.color}} class="category-list-item category {{if c.isMuted "muted"}}">
+        <table class="topic-list">
           <tbody>
             <tr>
               <th class="main-link">
@@ -24,12 +24,12 @@
               {{/if}}
               {{#if c.isGrandParent}}
                 {{#each c.subcategories as |subcategory|}}
-                  <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
+                  <tr data-category-id={{c.id}} style={{border-color subcategory.color}} class="subcategory-list-item category">
                     <td>
                       {{category-title-link tagName="h4" category=subcategory}}
                       <div class="subcategories-list">
                         {{#if subcategory.subcategories}}
-                          <div class='subcategories'>
+                          <div class="subcategories">
                             {{#each subcategory.subcategories as |subsubcategory|}}
                               {{#unless subsubcategory.isMuted}}
                                 {{category-link subsubcategory}}
@@ -44,7 +44,7 @@
               {{else if c.subcategories}}
                 <tr class="subcategories-list">
                   <td>
-                    <div class='subcategories'>
+                    <div class="subcategories">
                       {{#each c.subcategories as |subcategory|}}
                         {{#unless subcategory.isMuted}}
                           {{category-link subcategory}}
@@ -58,20 +58,20 @@
           </tbody>
         </table>
         <footer class="clearfix">
-          <figure title={{i18n 'all_time_desc'}}>
+          <figure title={{i18n "all_time_desc"}}>
             {{number c.topics_all_time}}
-            <figcaption>{{i18n 'all_time'}}</figcaption>
+            <figcaption>{{i18n "all_time"}}</figcaption>
           </figure>
           {{#if c.pickMonth}}
-            <figure title={{i18n 'month_desc'}}>
+            <figure title={{i18n "month_desc"}}>
               {{number c.topics_month}}
-              <figcaption>/ {{i18n 'month'}}</figcaption>
+              <figcaption>/ {{i18n "month"}}</figcaption>
             </figure>
           {{/if}}
           {{#if c.pickWeek}}
-            <figure title={{i18n 'week_desc'}}>
+            <figure title={{i18n "week_desc"}}>
               {{number c.topics_week}}
-              <figcaption>/ {{i18n 'week'}}</figcaption>
+              <figcaption>/ {{i18n "week"}}</figcaption>
             </figure>
           {{/if}}
         </footer>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index c657025ee4..be9b156b45 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -1,11 +1,11 @@
 {{#if selectedHtml}}
   <li>
-    <a href class='expander' {{action 'toggleExpanded'}}>
+    <a href {{action "toggleExpanded"}} class="expander">
       <span>{{html-safe selectedHtml}}</span>
       {{d-icon "caret-down"}}
     </a>
   </li>
 {{/if}}
-<ul class='drop {{if expanded 'expanded'}}'>
+<ul class="drop {{if expanded "expanded"}}">
   {{yield}}
 </ul>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
index dc7b593da3..d0610da670 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
@@ -1,11 +1,11 @@
-<li class='navigation-toggle'>
-  <a href {{action "toggleDrop"}} class='toggle-link'>
+<li class="navigation-toggle">
+  <a href {{action "toggleDrop"}} class="toggle-link">
     {{selectedNavItem.displayName}}
     {{d-icon "caret-down"}}
   </a>
 </li>
 {{#if expanded}}
-  <ul class='drop'>
+  <ul class="drop">
     {{#each navItems as |navItem|}}
       {{navigation-item content=navItem filterMode=filterMode category=category}}
     {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index 394aea6d86..d9b2df6cd0 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -1,11 +1,11 @@
 {{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount as |discoveryTopicList|}}
   {{#if top}}
-    <div class='top-lists'>
+    <div class="top-lists">
       {{period-chooser period=period action=(action "changePeriod") fullDay=false}}
     </div>
   {{else}}
     {{#if topicTrackingState.hasIncoming}}
-      <a href class='alert alert-info clickable' {{action "showInserted"}}>
+      <a href {{action "showInserted"}} class="alert alert-info clickable">
         {{count-i18n key="topic_count_" suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
       </a>
     {{/if}}
@@ -27,7 +27,7 @@
   {{/if}}
 {{/discovery-topics-list}}
 
-<footer class='topic-list-bottom'>
+<footer class="topic-list-bottom">
   {{conditional-loading-spinner condition=model.loadingMore}}
   {{#if allLoaded}}
     {{#if showDismissRead}}
@@ -49,12 +49,12 @@
 
     {{#footer-message education=footerEducation message=footerMessage}}
       {{#if latest}}
-        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
+        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n "topic.suggest_create_topic"}}</a>{{/if}}
       {{else if top}}
-        {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
+        {{#link-to "discovery.categories"}}{{i18n "topic.browse_all_categories"}}{{/link-to}}, {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}} {{i18n "or"}} {{i18n "filters.top.other_periods"}}
         {{top-period-buttons period=period action=(action "changePeriod")}}
       {{else}}
-        {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
+        {{#link-to "discovery.categories"}} {{i18n "topic.browse_all_categories"}}{{/link-to}} {{i18n "or"}} {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}}
       {{/if}}
     {{/footer-message}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index 514416915b..d8be898136 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -10,13 +10,13 @@
     {{/if}}
 
     {{#if canLoginLocal}}
-      <form id='login-form' method='post'>
+      <form id="login-form" method="post">
         <div id="credentials" class={{credentialsClass}}>
           <table>
             <tbody>
               <tr>
                 <td>
-                  <label for='login-account-name'>{{i18n 'login.username'}}</label>
+                  <label for="login-account-name">{{i18n "login.username"}}</label>
                 </td>
                 <td>
                   {{text-field value=loginName type="email" placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" disabled=showSecondFactor}}
@@ -24,7 +24,7 @@
               </tr>
               <tr>
                 <td>
-                  <label for='login-account-password'>{{i18n 'login.password'}}</label>
+                  <label for="login-account-password">{{i18n "login.password"}}</label>
                 </td>
                 <td>
                   {{text-field value=loginPassword type="password" id="login-account-password" maxlength="200" disabled=showSecondFactor}}
@@ -33,7 +33,7 @@
               <tr>
                 <td></td>
                 <td>
-                  <a href id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
+                  <a href id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n "forgot_password.action"}}</a>
                 </td>
               </tr>
             </tbody>
@@ -56,7 +56,7 @@
               action=(action "authenticateSecurityKey")}}
             {{/security-key-form}}
           {{else}}
-            {{second-factor-input value=secondFactorToken inputId='login-second-factor' secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
+            {{second-factor-input value=secondFactorToken inputId="login-second-factor" secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
           {{/if}}
         {{/second-factor-form}}
       </form>
@@ -84,5 +84,5 @@
 
   {{plugin-outlet name="login-after-modal-footer" tagName=""}}
 
-  <div id='login-alert' class={{alertClass}}>{{alert}}</div>
+  <div class={{alertClass}} id="login-alert">{{alert}}</div>
 {{/login-modal}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs
index a24f118619..e7f3884e52 100644
--- a/app/assets/javascripts/discourse/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs
@@ -1,12 +1,12 @@
 {{#load-more selector=".directory .user" action=(action "loadMore")}}
   <div class="container">
-    <div class='users-directory directory'>
-      {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
+    <div class="users-directory directory">
+      {{plugin-outlet name="users-top" connectorTagName="div" args=(hash model=model)}}
 
-      <div class='directory-controls'>
+      <div class="directory-controls">
         {{period-chooser period=period onChange=(action (mut period)) fullDay=false}}
         {{#if lastUpdatedAt}}
-          <div class='directory-last-updated'>
+          <div class="directory-last-updated">
             {{i18n "directory.last_updated"}}
             {{lastUpdatedAt}}
           </div>
@@ -16,14 +16,14 @@
 
       {{#conditional-loading-spinner condition=model.loading}}
         {{#if model.length}}
-          <div class='total-rows'>{{i18n "directory.total_rows" count=model.totalRows}}</div>
+          <div class="total-rows">{{i18n "directory.total_rows" count=model.totalRows}}</div>
           {{#each model as |item|}}
             {{directory-item tagName="div" class="user" item=item showTimeRead=showTimeRead}}
           {{/each}}
 
           {{conditional-loading-spinner condition=model.loadingMore}}
         {{else}}
-          <div class='clearfix'></div>
+          <div class="clearfix"></div>
           <p>{{i18n "directory.no_results"}}</p>
         {{/if}}
       {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
index 8780608607..6928158040 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{html-safe (i18n 'login.sent_activation_email_again' currentEmail=currentEmail)}}
+  {{html-safe (i18n "login.sent_activation_email_again" currentEmail=currentEmail)}}
 {{/d-modal-body}}
 
 {{modal-footer-close closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs b/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
index ae5a9419f4..3d8b26af63 100644
--- a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
@@ -5,7 +5,7 @@
     )
 }}
   {{#if model.error}}
-    <div class='alert alert-error'>
+    <div class="alert alert-error">
       {{model.error}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index add7e7ce5a..11d8da0bf6 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -1,11 +1,11 @@
 {{#d-modal-body title="user.auth_tokens.was_this_you"}}
   <div>
-    <p>{{i18n 'user.auth_tokens.was_this_you_description'}}</p>
-    <p>{{html-safe (i18n 'user.second_factor.extended_description')}}</p>
+    <p>{{i18n "user.auth_tokens.was_this_you_description"}}</p>
+    <p>{{html-safe (i18n "user.second_factor.extended_description")}}</p>
   </div>
 
   <div>
-    <h3>{{i18n 'user.auth_tokens.details'}}</h3>
+    <h3>{{i18n "user.auth_tokens.details"}}</h3>
     <ul style="list-style-type:none">
       <li>{{d-icon "far-clock"}} {{format-date model.seen_at}}</li>
       <li>{{d-icon "map-marker-alt"}} {{model.location}}</li>
@@ -16,7 +16,7 @@
   {{#if latest_post}}
     <div>
       <h3>
-        {{i18n 'user.auth_tokens.latest_post'}}
+        {{i18n "user.auth_tokens.latest_post"}}
         <a href {{action "toggleExpanded"}}>{{d-icon (if expanded "caret-up" "caret-down")}}</a>
       </h3>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index edc2c4a4d8..67429842ef 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -10,11 +10,11 @@
   {{else}}
     <div class="avatar-choice">
       {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
-      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{html-safe (i18n 'user.change_avatar.letter_based')}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{html-safe (i18n "user.change_avatar.letter_based")}}</label>
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{html-safe (i18n 'user.change_avatar.gravatar' gravatarName=gravatarName gravatarBaseUrl=gravatarBaseUrl gravatarLoginUrl=gravatarLoginUrl)}} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{html-safe (i18n "user.change_avatar.gravatar" gravatarName=gravatarName gravatarBaseUrl=gravatarBaseUrl gravatarLoginUrl=gravatarLoginUrl)}} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
                  translatedTitle=(i18n "user.change_avatar.refresh_gravatar_title" gravatarName=gravatarName)
@@ -23,7 +23,7 @@
                  class="btn-default avatar-selector-refresh-gravatar"}}
 
       {{#if gravatarFailed}}
-        <p class="error">{{I18n 'user.change_avatar.gravatar_failed' gravatarName=gravatarName}}</p>
+        <p class="error">{{I18n "user.change_avatar.gravatar_failed" gravatarName=gravatarName}}</p>
       {{/if}}
     </div>
     {{#if allowAvatarUpload}}
@@ -32,9 +32,9 @@
         <label class="radio" for="uploaded-avatar">
           {{#if user.custom_avatar_template}}
             {{bound-avatar-template user.custom_avatar_template "large"}}
-            {{i18n 'user.change_avatar.uploaded_avatar'}}
+            {{i18n "user.change_avatar.uploaded_avatar"}}
           {{else}}
-            {{i18n 'user.change_avatar.uploaded_avatar_empty'}}
+            {{i18n "user.change_avatar.uploaded_avatar_empty"}}
           {{/if}}
         </label>
         {{avatar-uploader user_id=user.id
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 553705c7a5..51d6c2b734 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -3,7 +3,7 @@
     {{#if errorMessage}}
       <div class="control-group">
         <div class="controls">
-          <div class='alert alert-error'>{{errorMessage}}</div>
+          <div class="alert alert-error">{{errorMessage}}</div>
         </div>
       </div>
     {{/if}}
@@ -15,7 +15,7 @@
     {{#if showBookmarkReminderControls}}
       <div class="control-group">
         <label class="control-label" for="set_reminder">
-          {{i18n 'post.bookmarks.set_reminder'}}
+          {{i18n "post.bookmarks.set_reminder"}}
         </label>
 
         {{#if userHasTimezoneSet}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs
index 286b77ac36..0217263bd7 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs
@@ -1,4 +1,4 @@
-<div class='bulk-buttons'>
+<div class="bulk-buttons">
   {{#each buttons as |button|}}
     {{d-button action=(action button.action) label=button.label icon=button.icon class=button.class}}
   {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
index 0cfc45782d..26e9d7df3c 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
@@ -1,8 +1,8 @@
 {{#each notificationLevels as |level|}}
-  <div class='controls'>
-    <label class='radio'>
+  <div class="controls">
+    <label class="radio">
       {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
-      <div class='description'>{{html-safe level.description}}</div>
+      <div class="description">{{html-safe level.description}}</div>
     </label>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 13ee97c97b..0e06efcf1b 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,6 +1,6 @@
-{{#d-modal-body class='change-ownership'}}
+{{#d-modal-body class="change-ownership"}}
   <span>
-    {{html-safe (i18n (if selectedPostsUsername 'topic.change_owner.instructions' 'topic.change_owner.instructions_without_old_user')
+    {{html-safe (i18n (if selectedPostsUsername "topic.change_owner.instructions" "topic.change_owner.instructions_without_old_user")
         count=selectedPostsCount
         old_user=selectedPostsUsername
       )
diff --git a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs
index 242f01bf78..268a446501 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs
@@ -1,10 +1,10 @@
 {{#d-modal-body class="change-timestamp"}}
   <p>
-    {{i18n 'topic.change_timestamp.instructions'}}
+    {{i18n "topic.change_timestamp.instructions"}}
   </p>
 
-  <p class="alert alert-error {{unless validTimestamp 'hidden'}}">
-    {{i18n 'topic.change_timestamp.invalid_timestamp'}}
+  <p class="alert alert-error {{unless validTimestamp "hidden"}}">
+    {{i18n "topic.change_timestamp.invalid_timestamp"}}
   </p>
 
   <form>
diff --git a/app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs b/app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs
index 66d01ec2b4..314a5478f5 100644
--- a/app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs
@@ -1,6 +1,6 @@
 {{#d-modal-body title="topic.make_public.title"}}
 
-  <div class='instructions'>
+  <div class="instructions">
     {{i18n "topic.make_public.choose_category"}}
   </div>
   {{category-chooser
@@ -10,7 +10,7 @@
 
 {{/d-modal-body}}
 
-<div class='modal-footer'>
+<div class="modal-footer">
   {{d-button class="btn-primary" action=(action "makePublic") label="composer.modal_ok" disabled=saving}}
   {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index c5b493a8a1..df8acfc051 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -13,7 +13,7 @@
             <table>
               <tbody>
                 <tr class="input create-account-email">
-                  <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
+                  <td class="label"><label for="new-account-email">{{i18n "user.email.title"}}</label></td>
                   <td>
                     {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
                   </td>
@@ -22,12 +22,12 @@
                 <tr class="instructions create-account-email">
                   <td></td>
                   {{input-tip validation=emailValidation id="account-email-validation"}}
-                  <td><label>{{i18n 'user.email.instructions'}}</label></td>
+                  <td><label>{{i18n "user.email.instructions"}}</label></td>
                 </tr>
 
                 {{#if usernameRequired}}
                   <tr class="input">
-                    <td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td>
+                    <td class="label"><label for="new-account-username">{{i18n "user.username.title"}}</label></td>
                     <td>
                       {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
                     </td>
@@ -35,14 +35,14 @@
                   <tr class="instructions">
                     <td></td>
                     {{input-tip validation=usernameValidation id="username-validation"}}
-                    <td><label>{{i18n 'user.username.instructions'}}</label></td>
+                    <td><label>{{i18n "user.username.instructions"}}</label></td>
                   </tr>
                 {{/if}}
 
                 {{#if fullnameRequired}}
                   <tr class="input">
                     <td class="label">
-                      <label for='new-account-name'>{{i18n 'user.name.title'}}</label>
+                      <label for="new-account-name">{{i18n "user.name.title"}}</label>
                     </td>
                     <td>
                       {{text-field value=accountName id="new-account-name"}}
@@ -69,7 +69,7 @@
 
                 {{#if passwordRequired}}
                   <tr class="input">
-                    <td class="label"><label for='new-account-password'>{{i18n 'user.password.title'}}</label></td>
+                    <td class="label"><label for="new-account-password">{{i18n "user.password.title"}}</label></td>
                     <td>
                       {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
                     </td>
@@ -79,15 +79,15 @@
                     {{input-tip validation=passwordValidation}}
                     <td>
                       <label>{{passwordInstructions}}</label>
-                      <div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">
-                        {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+                      <div class="caps-lock-warning {{unless capsLockOn "hidden"}}">
+                        {{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}
                       </div>
                     </td>
                   </tr>
                 {{/if}}
 
                 <tr class="password-confirmation">
-                  <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
+                  <td><label for="new-account-password-confirmation">{{i18n "user.password_confirmation.title"}}</label></td>
                   <td>
                     {{honeypot-input id="new-account-confirmation" autocomplete="new-password" value=accountHoneypot}}
                     {{input value=accountChallenge id="new-account-challenge"}}
@@ -96,11 +96,11 @@
 
                 {{#if requireInviteCode }}
                   <tr class="invite-code">
-                    <td><label for='invite-code'>{{i18n 'user.invite_code.title'}}</label></td>
+                    <td><label for="invite-code">{{i18n "user.invite_code.title"}}</label></td>
                     <td>
                       {{input value=inviteCode id="inviteCode"}}
                     </td>
-                    <td><label>{{i18n 'user.invite_code.instructions'}}</label></td>
+                    <td><label>{{i18n "user.invite_code.instructions"}}</label></td>
                   </tr>
                 {{/if}}
 
@@ -118,7 +118,7 @@
             </table>
 
             {{#if userFields}}
-              <div class='user-fields'>
+              <div class="user-fields">
                 {{#each userFields as |f|}}
                   {{user-field field=f.field value=f.value}}
                 {{/each}}
@@ -144,7 +144,7 @@
           {{/d-button}}
         {{/conditional-loading-spinner}}
 
-        <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
+        <div class="disclaimer">{{html-safe disclaimerHtml}}</div>
       </div>
 
       {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
index 316e51b00f..7f6634297b 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
@@ -1,13 +1,13 @@
 {{#d-modal-body title="topic.topic_status_update.title" autoFocus="false"}}
   <div class="radios">
     <label for="public-topic-timer">
-      {{radio-button id='public-topic-timer' name="topic-timer" value="true" selection=isPublic}}
-      <b>{{i18n 'topic.topic_status_update.public_timer_types'}}</b>
+      {{radio-button id="public-topic-timer" name="topic-timer" value="true" selection=isPublic}}
+      <b>{{i18n "topic.topic_status_update.public_timer_types"}}</b>
     </label>
 
     <label for="private-topic-timer">
-      {{radio-button id='private-topic-timer' name="topic-timer" value="false" selection=isPublic}}
-      <b>{{i18n 'topic.topic_status_update.private_timer_types'}}</b>
+      {{radio-button id="private-topic-timer" name="topic-timer" value="false" selection=isPublic}}
+      <b>{{i18n "topic.topic_status_update.private_timer_types"}}</b>
     </label>
   </div>
 
@@ -33,6 +33,6 @@
   {{#if topicTimer.execute_at}}
     {{d-button class="pull-right btn-danger"
         action=(action "removeTimer")
-        label='topic.topic_status_update.remove'}}
+        label="topic.topic_status_update.remove"}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs b/app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs
index 2c398264d4..27ad4bf86c 100644
--- a/app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs
@@ -15,27 +15,27 @@
               {{score-value value=s.trust_level_bonus label="trust_level_bonus" tagName=""}}
               {{score-value value=s.user_accuracy_bonus label="user_accuracy_bonus" tagName=""}}
             </td>
-            <td class='sum'>{{float s.score}}</td>
+            <td class="sum">{{float s.score}}</td>
           </tr>
         {{/each}}
         <tr class="total">
           <td>{{i18n "review.explain.total"}}</td>
-          <td class='sum'>{{float reviewableExplanation.total_score}}</td>
+          <td class="sum">{{float reviewableExplanation.total_score}}</td>
         </tr>
       </tbody>
     </table>
 
-    <table class='thresholds'>
+    <table class="thresholds">
       <tbody>
         <tr>
           <td>{{i18n "review.explain.min_score_visibility"}}</td>
-          <td class='sum'>
+          <td class="sum">
             {{float reviewableExplanation.min_score_visibility}}
           </td>
         </tr>
         <tr>
           <td>{{i18n "review.explain.score_to_hide"}}</td>
-          <td class='sum'>
+          <td class="sum">
             {{float reviewableExplanation.hide_post_score}}
           </td>
         </tr>
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs
index 82331a0ea3..a53e8745a5 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body class="feature-topic-on-profile" id='choosing-topic'}}
+{{#d-modal-body class="feature-topic-on-profile" id="choosing-topic"}}
   {{choose-topic currentTopicId=model.featured_topic.id
     selectedTopicId=newFeaturedTopicId
     additionalFilters="status:public"
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 19be52ceb5..9e85097906 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -3,7 +3,7 @@
     {{#if offerHelp}}
       {{html-safe offerHelp}}
     {{else}}
-      <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
+      <label for="username-or-email">{{i18n "forgot_password.invite"}}</label>
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
     {{/if}}
   {{/d-modal-body}}
@@ -24,7 +24,7 @@
                  label="forgot_password.reset"
                  disabled=submitDisabled
                  class="btn-primary forgot-password-reset"
-                 type='submit'}}
+                 type="submit"}}
     {{/if}}
   </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs b/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
index 985c7fe1f1..4a4d464690 100644
--- a/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
@@ -1,7 +1,7 @@
-{{#d-modal-body class='grant-badge'}}
+{{#d-modal-body class="grant-badge"}}
   {{#conditional-loading-spinner condition=loading}}
     {{#if noGrantableBadges}}
-      <p>{{i18n 'admin.badges.no_badges'}}</p>
+      <p>{{i18n "admin.badges.no_badges"}}</p>
     {{else}}
       <p>
         {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs b/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
index 495c4a16c0..7e47e247df 100644
--- a/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
@@ -14,7 +14,7 @@
     {{/if}}
 
     <div class="">
-      <a href {{action 'cancel'}}>{{i18n 'cancel'}}</a>
+      <a href {{action "cancel"}}>{{i18n "cancel"}}</a>
     </div>
   {{else}}
     <form class="form-vertical group-bulk-add">
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index c81dfe2238..fb41be53b0 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -2,7 +2,7 @@
   <div id="revision">
     <div id="revision-details">
       {{d-icon "pencil-alt"}}
-      {{#link-to 'user' model.username}}
+      {{#link-to "user" model.username}}
         {{bound-avatar-template model.avatar_template "small"}} {{model.username}}
       {{/link-to}}
       <span class="date">{{bound-date model.created_at}}</span>
@@ -77,7 +77,7 @@
       {{/if}}
     {{/if}}
     {{#if model.tags_changes}}
-      <div class='row'>
+      <div class="row">
         {{i18n "tagging.changed"}}
         {{#each previousTagChanges as |t|}}
           {{discourse-tag t}}
@@ -90,7 +90,7 @@
       </div>
     {{/if}}
     {{#if model.featured_link_changes}}
-      <div class='row'>
+      <div class="row">
         {{model.featured_link_changes.previous}}
         &rarr;
         {{model.featured_link_changes.current}}
@@ -109,7 +109,7 @@
     <div id="revision-controls">
       {{d-button class="btn-default" action=(action "loadFirstVersion") icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}}
       {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
-      <div id="revision-numbers" class={{unless displayRevisions 'invisible'}}>
+      <div id="revision-numbers" class={{unless displayRevisions "invisible"}}>
         {{#conditional-loading-spinner condition=loading size="small"}}
           {{html-safe revisionsText}}
         {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs b/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
index 671d594032..61b764ddce 100644
--- a/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
@@ -4,7 +4,7 @@
     <div class="jump-to-post-control">
       <span class="index">#</span>
       {{input id="post-jump" type="number" value=postNumber insert-newline=(action "jump")}}
-      <span class='input-hint-text post-number'>
+      <span class="input-hint-text post-number">
         {{i18n "topic.progress.jump_prompt_of" count=filteredPostsCount}}
       </span>
     </div>
@@ -17,7 +17,7 @@
     </div>
 
     <div class="jump-to-date-control">
-      <span class='input-hint-text post-date'>
+      <span class="input-hint-text post-date">
         {{i18n "topic.progress.jump_prompt_to_date"}}
       </span>
       {{date-picker id="post-date" class="date-input" value=postDate defaultDate="YYYY-MM-DD"}}
@@ -25,7 +25,7 @@
   </div>
 {{/d-modal-body}}
 
-<div class='modal-footer'>
+<div class="modal-footer">
   {{d-button class="btn-primary" action=(action "jump") label="composer.modal_ok"}}
   {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index 151cc42e0a..87c5c8c6fc 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -3,22 +3,22 @@
   {{#d-modal-body title="login.title" class=modalBodyClasses}}
 
     {{#if canLoginLocal}}
-      <form id='login-form' method='post'>
+      <form id="login-form" method="post">
         <div id="credentials" class={{credentialsClass}}>
           <table>
             <tbody>
               <tr>
-                <td><label for='login-account-name'>{{i18n 'login.username'}}</label></td>
+                <td><label for="login-account-name">{{i18n "login.username"}}</label></td>
                 <td>{{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus" disabled=disableLoginFields}}</td>
               </tr>
               <tr>
-                <td><label for='login-account-password'>{{i18n 'login.password'}}</label></td>
+                <td><label for="login-account-password">{{i18n "login.password"}}</label></td>
                 <td>{{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn disabled=disableLoginFields}}</td>
-                <td><a href id="forgot-password-link" {{action "forgotPassword"}}>{{i18n 'forgot_password.action'}}</a></td>
+                <td><a href id="forgot-password-link" {{action "forgotPassword"}}>{{i18n "forgot_password.action"}}</a></td>
               </tr>
               <tr>
                 <td></td>
-                <td><div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">{{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div></td>
+                <td><div class="caps-lock-warning {{unless capsLockOn "hidden"}}">{{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}</div></td>
                 <td></td>
               </tr>
             </tbody>
@@ -41,7 +41,7 @@
               action=(action "authenticateSecurityKey")}}
             {{/security-key-form}}
           {{else}}
-            {{second-factor-input value=secondFactorToken inputId='login-second-factor' secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
+            {{second-factor-input value=secondFactorToken inputId="login-second-factor" secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
           {{/if}}
         {{/second-factor-form}}
       </form>
@@ -65,7 +65,7 @@
           icon="unlock"
           label=loginButtonLabel
           disabled=loginDisabled
-          class='btn btn-large btn-primary'}}
+          class="btn btn-large btn-primary"}}
       {{/unless}}
 
       {{#if showSignupLink}}
@@ -82,5 +82,5 @@
 
   {{plugin-outlet name="login-after-modal-footer" tagName=""}}
 
-  <div id='login-alert' class={{alertClass}}>{{alert}}</div>
+  <div class={{alertClass}} id="login-alert">{{alert}}</div>
 {{/login-modal}}
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index 6f1e802770..6386cecd2a 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -1,29 +1,29 @@
-{{#d-modal-body id='choosing-topic'}}
+{{#d-modal-body id="choosing-topic"}}
 
   {{#if model.isPrivateMessage}}
     <div class="radios">
       {{#if canSplitToPM}}
         <label class="radio-label" for="move-to-new-message">
-          {{radio-button id='move-to-new-message' name="move-to-entity" value="new_message" selection=selection}}
-          <b>{{i18n 'topic.move_to_new_message.radio_label'}}</b>
+          {{radio-button id="move-to-new-message" name="move-to-entity" value="new_message" selection=selection}}
+          <b>{{i18n "topic.move_to_new_message.radio_label"}}</b>
         </label>
       {{/if}}
 
       <label class="radio-label" for="move-to-existing-message">
-        {{radio-button id='move-to-existing-message' name="move-to-entity" value="existing_message" selection=selection}}
-        <b>{{i18n 'topic.move_to_existing_message.radio_label'}}</b>
+        {{radio-button id="move-to-existing-message" name="move-to-entity" value="existing_message" selection=selection}}
+        <b>{{i18n "topic.move_to_existing_message.radio_label"}}</b>
       </label>
     </div>
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
+        <p>{{html-safe (i18n "topic.move_to_new_message.instructions" count=selectedPostsCount)}}</p>
         <form>
-          <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
+          <label>{{i18n "topic.move_to_new_message.message_title"}}</label>
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id="split-topic-name"}}
 
           {{#if canTagMessages}}
-            <label>{{i18n 'tagging.tags'}}</label>
+            <label>{{i18n "tagging.tags"}}</label>
             {{tag-chooser tags=tags filterable=true}}
           {{/if}}
         </form>
@@ -31,11 +31,11 @@
     {{/if}}
 
     {{#if existingMessage}}
-      <p>{{html-safe (i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount)}}</p>
+      <p>{{html-safe (i18n "topic.move_to_existing_message.instructions" count=selectedPostsCount)}}</p>
       <form>
         {{choose-message currentTopicId=model.id selectedTopicId=selectedTopicId}}
 
-        <label>{{i18n 'topic.move_to_new_message.participants'}}</label>
+        <label>{{i18n "topic.move_to_new_message.participants"}}</label>
         {{user-selector usernames=participants class="participant-selector"}}
       </form>
     {{/if}}
@@ -45,26 +45,26 @@
     <div class="radios">
       {{#if canSplitTopic}}
         <label class="radio-label" for="move-to-new-topic">
-          {{radio-button id='move-to-new-topic' name="move-to-entity" value="new_topic" selection=selection}}
-          <b>{{i18n 'topic.split_topic.radio_label'}}</b>
+          {{radio-button id="move-to-new-topic" name="move-to-entity" value="new_topic" selection=selection}}
+          <b>{{i18n "topic.split_topic.radio_label"}}</b>
         </label>
       {{/if}}
 
       <label class="radio-label" for="move-to-existing-topic">
-        {{radio-button id='move-to-existing-topic' name="move-to-entity" value="existing_topic" selection=selection}}
-        <b>{{i18n 'topic.merge_topic.radio_label'}}</b>
+        {{radio-button id="move-to-existing-topic" name="move-to-entity" value="existing_topic" selection=selection}}
+        <b>{{i18n "topic.merge_topic.radio_label"}}</b>
       </label>
 
       {{#if canSplitToPM}}
         <label class="radio-label" for="move-to-new-message">
-          {{radio-button id='move-to-new-message' name="move-to-entity" value="new_message" selection=selection}}
-          <b>{{i18n 'topic.move_to_new_message.radio_label'}}</b>
+          {{radio-button id="move-to-new-message" name="move-to-entity" value="new_message" selection=selection}}
+          <b>{{i18n "topic.move_to_new_message.radio_label"}}</b>
         </label>
       {{/if}}
     </div>
 
     {{#if existingTopic}}
-      <p>{{html-safe (i18n 'topic.merge_topic.instructions' count=selectedPostsCount)}}</p>
+      <p>{{html-safe (i18n "topic.merge_topic.instructions" count=selectedPostsCount)}}</p>
       <form>
         {{choose-topic currentTopicId=model.id selectedTopicId=selectedTopicId}}
       </form>
@@ -72,19 +72,19 @@
 
     {{#if canSplitTopic}}
       {{#if newTopic}}
-        <p>{{html-safe (i18n 'topic.split_topic.instructions' count=selectedPostsCount)}}</p>
+        <p>{{html-safe (i18n "topic.split_topic.instructions" count=selectedPostsCount)}}</p>
         <form>
-          <label>{{i18n 'topic.split_topic.topic_name'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
+          <label>{{i18n "topic.split_topic.topic_name"}}</label>
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id="split-topic-name"}}
 
-          <label>{{i18n 'categories.category'}}</label>
+          <label>{{i18n "categories.category"}}</label>
           {{category-chooser
             value=categoryId
             class="small"
             onChange=(action (mut categoryId))
           }}
           {{#if canAddTags}}
-            <label>{{i18n 'tagging.tags'}}</label>
+            <label>{{i18n "tagging.tags"}}</label>
             {{tag-chooser tags=tags filterable=true categoryId=categoryId}}
           {{/if}}
         </form>
@@ -93,13 +93,13 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
+        <p>{{html-safe (i18n "topic.move_to_new_message.instructions" count=selectedPostsCount)}}</p>
         <form>
-          <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
+          <label>{{i18n "topic.move_to_new_message.message_title"}}</label>
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id="split-topic-name"}}
 
           {{#if canTagMessages}}
-            <label>{{i18n 'tagging.tags'}}</label>
+            <label>{{i18n "tagging.tags"}}</label>
             {{tag-chooser tags=tags filterable=true}}
           {{/if}}
         </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index b1ba99bdc9..16adb4032d 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{html-safe (i18n 'login.not_activated' sentTo=sentTo)}}
+  {{html-safe (i18n "login.not_activated" sentTo=sentTo)}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
index 027f3ee764..a3c780ddbe 100644
--- a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
@@ -14,7 +14,7 @@
         {{conditional-loading-spinner condition=checking}}
 
         {{#if existing}}
-          <div class='current-url'>
+          <div class="current-url">
             {{i18n "topic.publish_page.publish_url"}}
             <div>
               <a href={{publishedPage.url}} target="_blank" rel="noopener">{{publishedPage.url}}</a>
@@ -24,7 +24,7 @@
           {{#if showUrl}}
             <div class="valid-slug">
               {{i18n "topic.publish_page.preview_url"}}
-              <div class='example-url'>{{publishedPage.url}}</div>
+              <div class="example-url">{{publishedPage.url}}</div>
             </div>
           {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
index 0a3a0eda22..cce4c69cdb 100644
--- a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
@@ -3,14 +3,14 @@
     {{d-button action=(action "displayRaw")
                label="post.raw_email.displays.raw.button"
                title="post.raw_email.displays.raw.title"
-               class=(if showRawEmail 'active')
+               class=(if showRawEmail "active")
     }}
 
     {{#if textPart}}
       {{d-button action=(action "displayTextPart")
                  label="post.raw_email.displays.text_part.button"
                  title="post.raw_email.displays.text_part.title"
-                 class=(if showTextPart 'active')
+                 class=(if showTextPart "active")
       }}
     {{/if}}
 
@@ -18,7 +18,7 @@
       {{d-button action=(action "displayHtmlPart")
                  label="post.raw_email.displays.html_part.button"
                  title="post.raw_email.displays.html_part.title"
-                 class=(if showHtmlPart 'active')
+                 class=(if showHtmlPart "active")
       }}
     {{/if}}
   </div>
@@ -28,7 +28,7 @@
       {{#if rawEmail}}
         {{textarea value=rawEmail}}
       {{else}}
-        {{i18n 'raw_email.not_available'}}
+        {{i18n "raw_email.not_available"}}
       {{/if}}
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
index df4dd14513..6b2a8f26ef 100644
--- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
@@ -9,13 +9,13 @@
       {{#each categoriesOrdered as |cat|}}
         <tr data-category-id={{cat.id}}>
           <td>
-            <div class={{concat 'reorder-categories-depth-' cat.depth}}>
+            <div class={{concat "reorder-categories-depth-" cat.depth}}>
               {{category-badge cat allowUncategorized="true"}}
             </div>
           </td>
 
           <td>
-            {{number-field number=(readonly cat.position) change=(action 'change' cat)}}
+            {{number-field number=(readonly cat.position) change=(action "change" cat)}}
             {{d-button class="btn-default no-text" action=(action "moveUp") actionParam=cat icon="arrow-up"}}
             {{d-button class="btn-default no-text" action=(action "moveDown") actionParam=cat icon="arrow-down"}}
           </td>
diff --git a/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs b/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
index b8bcae7847..4340f03ee1 100644
--- a/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
@@ -1,4 +1,4 @@
-<form class='request-group-membership-form'>
+<form class="request-group-membership-form">
   {{#d-modal-body rawTitle=title}}
     <div class="control-group">
       <label>
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index c97746956d..641a21e1c7 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -3,20 +3,20 @@
     {{#if errorMessage}}
       <div class="control-group">
         <div class="controls">
-          <div class='alert alert-error'>{{errorMessage}}</div>
+          <div class="alert alert-error">{{errorMessage}}</div>
         </div>
       </div>
     {{/if}}
 
     <div class="control-group">
       <div class="controls">
-        {{html-safe (i18n 'user.second_factor.enable_security_key_description')}}
+        {{html-safe (i18n "user.second_factor.enable_security_key_description")}}
       </div>
     </div>
 
     <div class="control-group">
       <div class="controls">
-        {{input value=securityKeyName id='security-key-name' placeholder='security key name'}}
+        {{input value=securityKeyName id="security-key-name" placeholder="security key name"}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index c993a811a2..00d466e413 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -3,14 +3,14 @@
     {{#if errorMessage}}
       <div class="control-group">
         <div class="controls">
-          <div class='alert alert-error'>{{errorMessage}}</div>
+          <div class="alert alert-error">{{errorMessage}}</div>
         </div>
       </div>
     {{/if}}
 
     <div class="control-group">
       <div class="controls">
-        {{html-safe (i18n 'user.second_factor.enable_description')}}
+        {{html-safe (i18n "user.second_factor.enable_description")}}
       </div>
     </div>
 
@@ -26,21 +26,21 @@
           {{#if showSecondFactorKey}}
             {{secondFactorKey}}
           {{else}}
-            <a href {{action "showSecondFactorKey"}}>{{i18n 'user.second_factor.show_key_description'}}</a>
+            <a href {{action "showSecondFactorKey"}}>{{i18n "user.second_factor.show_key_description"}}</a>
           {{/if}}
         </p>
       </div>
     </div>
 
     <div class="control-group">
-      <label class="control-label input-prepend">{{i18n 'user.second_factor.name'}}</label>
+      <label class="control-label input-prepend">{{i18n "user.second_factor.name"}}</label>
       <div class="controls">
-        {{second-factor-input value=secondFactorName inputId='second-factor-name' placeholder=(i18n 'user.second_factor.totp.default_name')}}
+        {{second-factor-input value=secondFactorName inputId="second-factor-name" placeholder=(i18n "user.second_factor.totp.default_name")}}
       </div>
 
-      <label class="control-label input-prepend">{{i18n 'user.second_factor.label'}}</label>
+      <label class="control-label input-prepend">{{i18n "user.second_factor.label"}}</label>
       <div class="controls">
-        {{second-factor-input maxlength=6 value=secondFactorToken inputId='second-factor-token' placeholder='123456'}}
+        {{second-factor-input maxlength=6 value=secondFactorToken inputId="second-factor-token" placeholder="123456"}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
index b7e9bb651d..bd0d5a2636 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
@@ -2,8 +2,8 @@
   <div class="form-horizontal">
     {{input type="text" value=model.name}}
   </div>
-  <div class='second-factor instructions'>
-    {{i18n 'user.second_factor.security_key.edit_description'}}
+  <div class="second-factor instructions">
+    {{i18n "user.second_factor.security_key.edit_description"}}
   </div>
   {{d-button
     action=(action "editSecurityKey")
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
index 4155ce69f6..2a77fceab6 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
@@ -2,8 +2,8 @@
   <div class="form-horizontal">
     {{input type="text" value=model.name}}
   </div>
-  <div class='second-factor instructions'>
-    {{i18n 'user.second_factor.edit_description'}}
+  <div class="second-factor instructions">
+    {{i18n "user.second_factor.edit_description"}}
   </div>
   {{d-button
     action=(action "editSecondFactor")
diff --git a/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs b/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs
index b33a394d20..05dc32b6fd 100644
--- a/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs
@@ -1,3 +1,3 @@
-{{#d-modal-body title='tagging.upload'}}
+{{#d-modal-body title="tagging.upload"}}
   {{tags-uploader refresh=(route-action "refresh") closeModal=(route-action "closeModal")}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index b9eb57fe8c..f973233739 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,4 +1,4 @@
 {{#d-modal-body}}
-  <p>{{html-safe (i18n 'topics.bulk.selected' count=model.topics.length)}}</p>
+  <p>{{html-safe (i18n "topics.bulk.selected" count=model.topics.length)}}</p>
   {{outlet "bulkOutlet"}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs b/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
index 1822acf063..44c65cef85 100644
--- a/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title=title class="upload-selector"}}
   <div class="radios">
     {{radio-button name="upload" id="local" value="local" selection=selection}}
-    <label class="radio" for="local">{{i18n 'upload_selector.from_my_computer'}}</label>
+    <label class="radio" for="local">{{i18n "upload_selector.from_my_computer"}}</label>
     {{#if local}}
       <div class="inputs">
         <input type="file" id="filename-input" multiple><br>
@@ -11,7 +11,7 @@
   </div>
   <div class="radios">
     {{radio-button name="upload" id="remote" value="remote" selection=selection}}
-    <label class="radio" for="remote">{{i18n 'upload_selector.from_the_web'}}</label>
+    <label class="radio" for="remote">{{i18n "upload_selector.from_the_web"}}</label>
     {{#if remote}}
       <div class="inputs">
         {{input value=imageUrl placeholder="http://example.com/image.png"}}
@@ -23,9 +23,9 @@
     <div class="inputs">
       <p class="hint">
         {{#if capabilities.canPasteImages}}
-          {{i18n 'upload_selector.hint'}}
+          {{i18n "upload_selector.hint"}}
         {{else}}
-          {{i18n 'upload_selector.hint_for_supported_browsers'}}
+          {{i18n "upload_selector.hint_for_supported_browsers"}}
         {{/if}}
       </p>
     </div>
@@ -33,6 +33,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action=(action "upload") class='btn-primary' icon=uploadIcon label='upload'}}
+  {{d-button action=(action "upload") class="btn-primary" icon=uploadIcon label="upload"}}
   {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index 6d44492afe..9ac32133da 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -1,7 +1,7 @@
 {{#d-section class="navigation-container"}}
   {{add-category-tag-classes category=category}}
 
-  <section class='category-heading'>
+  <section class="category-heading">
     {{#if category.uploaded_logo.url}}
       {{cdn-img
         src=category.uploaded_logo.url
@@ -14,7 +14,7 @@
     {{/if}}
   </section>
 
-  <div class='category-navigation'>
+  <div class="category-navigation">
     {{d-navigation
       category=category
       filterMode=filterMode
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index 0d3e5b8818..282526bc02 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -8,7 +8,7 @@
       <p>{{successMessage}}</p>
 
       {{#if requiresApproval}}
-        <p>{{i18n 'login.not_approved'}}</p>
+        <p>{{i18n "login.not_approved"}}</p>
       {{else}}
         {{#unless redirected}}
           <a class="btn" href={{redirectHref}} {{action "done"}}>{{continueButtonText}}</a>
@@ -18,7 +18,7 @@
       <form>
         {{#if securityKeyOrSecondFactorRequired }}
           {{#if errorMessage}}
-            <div class='alert alert-error'>{{errorMessage}}</div>
+            <div class="alert alert-error">{{errorMessage}}</div>
             <br>
           {{/if}}
           {{#if securityKeyRequired }}
@@ -37,14 +37,14 @@
               secondFactorToken=secondFactorToken
               backupEnabled=backupEnabled
               isLogin=false}}
-              {{second-factor-input value=secondFactorToken inputId='second-factor' secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
+              {{second-factor-input value=secondFactorToken inputId="second-factor" secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
             {{/second-factor-form}}
           {{/if}}
           {{#unless securityKeyRequired }}
-            {{d-button action=(action "submit") class='btn-primary' label='submit' type='submit'}}
+            {{d-button action=(action "submit") class="btn-primary" label="submit" type="submit"}}
           {{/unless}}
         {{else}}
-          <h2>{{i18n 'user.change_password.choose'}}</h2>
+          <h2>{{i18n "user.change_password.choose"}}</h2>
 
           <div class="input">
             {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn autofocus="autofocus"}}
@@ -52,12 +52,12 @@
           </div>
 
           <div class="instructions">
-            <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
-              {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+            <div class="caps-lock-warning {{unless capsLockOn "invisible"}}">
+              {{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}
             </div>
           </div>
 
-          {{d-button action=(action "submit") class='btn-primary' label='user.change_password.set_password' type='submit'}}
+          {{d-button action=(action "submit") class="btn-primary" label="user.change_password.set_password" type="submit"}}
         {{/if}}
       </form>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/templates/preferences-email.hbs
index d335e0fafb..1c561e265f 100644
--- a/app/assets/javascripts/discourse/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-email.hbs
@@ -1,9 +1,9 @@
-<section class='user-preferences solo-preference'>
+<section class="user-preferences solo-preference">
   <form class="form-horizontal">
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n 'user.change_email.title'}}</h3>
+        <h3>{{i18n "user.change_email.title"}}</h3>
       </div>
     </div>
 
@@ -13,9 +13,9 @@
           <div class="instructions">
             <p>
               {{#if model.staff}}
-                {{i18n 'user.change_email.success_staff'}}
+                {{i18n "user.change_email.success_staff"}}
               {{else}}
-                {{i18n 'user.change_email.success'}}
+                {{i18n "user.change_email.success"}}
               {{/if}}
             </p>
           </div>
@@ -25,23 +25,23 @@
       {{#if error}}
         <div class="control-group">
           <div class="controls">
-            <div class='alert alert-error'>{{errorMessage}}</div>
+            <div class="alert alert-error">{{errorMessage}}</div>
           </div>
         </div>
       {{/if}}
 
       <div class="control-group">
-        <label class="control-label">{{i18n 'user.email.title'}}</label>
+        <label class="control-label">{{i18n "user.email.title"}}</label>
         <div class="controls">
           {{text-field value=newEmail id="change-email" classNames="input-xxlarge" autofocus="autofocus"}}
           {{input-tip validation=emailValidation}}
         </div>
         <div class="controls">
-          <div class='instructions'>
+          <div class="instructions">
             {{#if taken}}
-              {{i18n 'user.change_email.taken'}}
+              {{i18n "user.change_email.taken"}}
             {{else}}
-              {{i18n 'user.email.instructions'}}
+              {{i18n "user.email.instructions"}}
             {{/if}}
           </div>
         </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index 0d3d8f48c8..d8b8d95ac0 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -1,10 +1,10 @@
-<section class='user-preferences solo-preference second-factor'>
+<section class="user-preferences solo-preference second-factor">
   {{#conditional-loading-spinner condition=loading}}
     <form class="form-horizontal">
       {{#if showEnforcedNotice}}
         <div class="control-group">
           <div class="controls">
-            <div class='alert alert-error'>{{i18n 'user.second_factor.enforced_notice'}}</div>
+            <div class="alert alert-error">{{i18n "user.second_factor.enforced_notice"}}</div>
           </div>
         </div>
       {{/if}}
@@ -12,7 +12,7 @@
       {{#if displayOAuthWarning}}
         <div class="control-group">
           <div class="controls">
-            {{i18n 'user.second_factor.oauth_enabled_warning'}}
+            {{i18n "user.second_factor.oauth_enabled_warning"}}
           </div>
         </div>
       {{/if}}
@@ -20,7 +20,7 @@
       {{#if errorMessage}}
         <div class="control-group">
           <div class="controls">
-            <div class='alert alert-error'>{{errorMessage}}</div>
+            <div class="alert alert-error">{{errorMessage}}</div>
           </div>
         </div>
       {{/if}}
@@ -85,9 +85,9 @@
             <h2>{{i18n "user.second_factor_backup.title"}}</h2>
             {{#if model.second_factor_enabled}}
               {{#if model.second_factor_backup_enabled}}
-                {{html-safe (i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes)}}
+                {{html-safe (i18n "user.second_factor_backup.manage" count=model.second_factor_remaining_backup_codes)}}
               {{else}}
-                {{i18n 'user.second_factor_backup.enable_long'}}
+                {{i18n "user.second_factor_backup.enable_long"}}
               {{/if}}
 
               {{#if isCurrentUser}}
@@ -119,7 +119,7 @@
         {{/if}}
       {{else}}
         <div class="control-group">
-          <label class='control-label'>{{i18n 'user.password.title'}}</label>
+          <label class="control-label">{{i18n "user.password.title"}}</label>
 
           <div class="controls">
             <div>
@@ -129,8 +129,8 @@
                 classNames="input-large"
                 autofocus="autofocus"}}
             </div>
-            <div class='instructions'>
-              {{i18n 'user.second_factor.confirm_password_description'}}
+            <div class="instructions">
+              {{i18n "user.second_factor.confirm_password_description"}}
             </div>
           </div>
         </div>
@@ -151,7 +151,7 @@
           <div class="controls" style="margin-top: 5px">
             {{resetPasswordProgress}}
             {{#unless resetPasswordLoading}}
-              <a href class="instructions" {{action "resetPassword"}}>{{ i18n 'user.second_factor.forgot_password' }}</a>
+              <a href class="instructions" {{action "resetPassword"}}>{{ i18n "user.second_factor.forgot_password" }}</a>
             {{/unless}}
           </div>
         </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences-username.hbs b/app/assets/javascripts/discourse/templates/preferences-username.hbs
index b1550b9c16..c7c59b17d0 100644
--- a/app/assets/javascripts/discourse/templates/preferences-username.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-username.hbs
@@ -1,21 +1,21 @@
-<section class='user-preferences  solo-preference'>
+<section class="user-preferences  solo-preference">
   <form class="form-horizontal">
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n 'user.change_username.title'}}</h3>
+        <h3>{{i18n "user.change_username.title"}}</h3>
       </div>
     </div>
 
     <div class="control-group">
-      <label class="control-label">{{i18n 'user.username.title'}}</label>
+      <label class="control-label">{{i18n "user.username.title"}}</label>
       <div class="controls">
         {{text-field value=newUsername id="change_username" classNames="input-xxlarge" maxlength=maxLength autofocus="autofocus" insert-newline="changeUsername"}}
       </div>
-      <div class='instructions controls'>
+      <div class="instructions controls">
         <p>
           {{#if taken}}
-            {{i18n 'user.change_username.taken'}}
+            {{i18n "user.change_username.taken"}}
           {{/if}}
           <span>{{errorMessage}}</span>
         </p>
@@ -33,7 +33,7 @@
           {{saveButtonText}}
         {{/d-button}}
 
-        {{#if saved}}{{i18n 'saved'}}{{/if}}
+        {{#if saved}}{{i18n "saved"}}{{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences.hbs b/app/assets/javascripts/discourse/templates/preferences.hbs
index 854db06883..f40ca7128c 100644
--- a/app/assets/javascripts/discourse/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences.hbs
@@ -1,51 +1,51 @@
 {{#d-section pageClass="user-preferences" class="user-secondary-navigation"}}
-  {{#mobile-nav class='preferences-nav' desktopClass='preferences-list action-list nav-stacked' currentPath=router._router.currentPath}}
-    <li class='nav-account'>
-      {{#link-to 'preferences.account'}}
-        {{i18n 'user.preferences_nav.account'}}
+  {{#mobile-nav class="preferences-nav" desktopClass="preferences-list action-list nav-stacked" currentPath=router._router.currentPath}}
+    <li class="nav-account">
+      {{#link-to "preferences.account"}}
+        {{i18n "user.preferences_nav.account"}}
       {{/link-to}}
     </li>
-    <li class='nav-profile'>
-      {{#link-to 'preferences.profile'}}
-        {{i18n 'user.preferences_nav.profile'}}
+    <li class="nav-profile">
+      {{#link-to "preferences.profile"}}
+        {{i18n "user.preferences_nav.profile"}}
       {{/link-to}}
     </li>
-    <li class='nav-emails'>
-      {{#link-to 'preferences.emails'}}
-        {{i18n 'user.preferences_nav.emails'}}
+    <li class="nav-emails">
+      {{#link-to "preferences.emails"}}
+        {{i18n "user.preferences_nav.emails"}}
       {{/link-to}}
     </li>
-    <li class='nav-notifications'>
-      {{#link-to 'preferences.notifications'}}
-        {{i18n 'user.preferences_nav.notifications'}}
+    <li class="nav-notifications">
+      {{#link-to "preferences.notifications"}}
+        {{i18n "user.preferences_nav.notifications"}}
       {{/link-to}}
     </li>
-    <li class='indent nav-categories'>
-      {{#link-to 'preferences.categories'}}
-        {{i18n 'user.preferences_nav.categories'}}
+    <li class="indent nav-categories">
+      {{#link-to "preferences.categories"}}
+        {{i18n "user.preferences_nav.categories"}}
       {{/link-to}}
     </li>
-    <li class='indent nav-users'>
-      {{#link-to 'preferences.users'}}
-        {{i18n 'user.preferences_nav.users'}}
+    <li class="indent nav-users">
+      {{#link-to "preferences.users"}}
+        {{i18n "user.preferences_nav.users"}}
       {{/link-to}}
     </li>
     {{#if siteSettings.tagging_enabled}}
-      <li class='indent nav-tags'>
-        {{#link-to 'preferences.tags'}}
-          {{i18n 'user.preferences_nav.tags'}}
+      <li class="indent nav-tags">
+        {{#link-to "preferences.tags"}}
+          {{i18n "user.preferences_nav.tags"}}
         {{/link-to}}
       </li>
     {{/if}}
-    <li class='nav-interface'>
-      {{#link-to 'preferences.interface'}}
-        {{i18n 'user.preferences_nav.interface'}}
+    <li class="nav-interface">
+      {{#link-to "preferences.interface"}}
+        {{i18n "user.preferences_nav.interface"}}
       {{/link-to}}
     </li>
     {{#if model.userApiKeys}}
-      <li class='nav-apps'>
-        {{#link-to 'preferences.apps'}}
-          {{i18n 'user.preferences_nav.apps'}}
+      <li class="nav-apps">
+        {{#link-to "preferences.apps"}}
+          {{i18n "user.preferences_nav.apps"}}
         {{/link-to}}
       </li>
     {{/if}}
@@ -53,7 +53,7 @@
   {{/mobile-nav}}
 {{/d-section}}
 
-<section class='user-content user-preferences'>
+<section class="user-content user-preferences">
   {{plugin-outlet name="above-user-preferences" args=(hash model=model)}}
 
   <form class="form-vertical">
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 9c1483e50e..cd931ff10e 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -1,7 +1,7 @@
 <div class="control-group pref-username">
-  <label class="control-label">{{i18n 'user.username.title'}}</label>
+  <label class="control-label">{{i18n "user.username.title"}}</label>
   <div class="controls">
-    <span class='static'>{{model.username}}</span>
+    <span class="static">{{model.username}}</span>
     {{#if model.can_edit_username}}
       {{#link-to "preferences.username" class="btn btn-default btn-small btn-icon pad-left no-text"}}
         {{d-icon "pencil-alt"}}
@@ -9,15 +9,15 @@
     {{/if}}
   </div>
   {{#if siteSettings.enable_mentions}}
-    <div class='instructions'>
-      {{html-safe (i18n 'user.username.short_instructions' username=model.username)}}
+    <div class="instructions">
+      {{html-safe (i18n "user.username.short_instructions" username=model.username)}}
     </div>
   {{/if}}
 </div>
 
 {{#unless siteSettings.sso_overrides_avatar}}
   <div class="control-group pref-avatar">
-    <label class="control-label" id="profile-picture">{{i18n 'user.avatar.title'}}</label>
+    <label class="control-label" id="profile-picture">{{i18n "user.avatar.title"}}</label>
     <div class="controls">
       {{! we want the "huge" version even though we're downsizing it in CSS }}
       {{bound-avatar model "huge"}}
@@ -28,15 +28,15 @@
 
 {{#if canEditName}}
   <div class="control-group pref-name">
-    <label class="control-label">{{i18n 'user.name.title'}}</label>
+    <label class="control-label">{{i18n "user.name.title"}}</label>
     <div class="controls">
       {{#if model.can_edit_name}}
         {{text-field value=newNameInput classNames="input-xxlarge" maxlength="255"}}
       {{else}}
-        <span class='static'>{{model.name}}</span>
+        <span class="static">{{model.name}}</span>
       {{/if}}
     </div>
-    <div class='instructions'>
+    <div class="instructions">
       {{nameInstructions}}
     </div>
   </div>
@@ -44,19 +44,19 @@
 
 {{#if canCheckEmails}}
   <div class="control-group pref-email">
-    <label class="control-label">{{i18n 'user.email.title'}}</label>
+    <label class="control-label">{{i18n "user.email.title"}}</label>
     {{#if model.email}}
       <div class="controls">
-        <span class='static'>{{model.email}}</span>
+        <span class="static">{{model.email}}</span>
         {{#if model.can_edit_email}}
           {{#link-to "preferences.email" class="btn btn-default btn-small btn-icon pad-left no-text"}}{{d-icon "pencil-alt"}}{{/link-to}}
         {{/if}}
       </div>
-      <div class='instructions'>
+      <div class="instructions">
         {{#if siteSettings.sso_overrides_email}}
-          {{i18n 'user.email.sso_override_instructions'}}
+          {{i18n "user.email.sso_override_instructions"}}
         {{/if}}
-        {{i18n 'user.email.instructions'}}
+        {{i18n "user.email.instructions"}}
       </div>
     {{else}}
       <div class="controls">
@@ -68,14 +68,14 @@
 
 {{#if canChangePassword}}
   <div class="control-group pref-password">
-    <label class="control-label">{{i18n 'user.password.title'}}</label>
+    <label class="control-label">{{i18n "user.password.title"}}</label>
     <div class="controls">
-      <a href {{action "changePassword"}} class='btn btn-default'>
+      <a href {{action "changePassword"}} class="btn btn-default">
         {{d-icon "envelope"}}
         {{#if model.no_password}}
-          {{i18n 'user.change_password.set_password'}}
+          {{i18n "user.change_password.set_password"}}
         {{else}}
-          {{i18n 'user.change_password.action'}}
+          {{i18n "user.change_password.action"}}
         {{/if}}
       </a>
 
@@ -84,16 +84,16 @@
   </div>
 
   <div class="control-group pref-second-factor">
-    <label class="control-label">{{i18n 'user.second_factor.title'}}</label>
+    <label class="control-label">{{i18n "user.second_factor.title"}}</label>
     {{#unless model.second_factor_enabled}}
       <label>
-        {{i18n 'user.second_factor.short_description'}}
+        {{i18n "user.second_factor.short_description"}}
       </label>
     {{/unless}}
     <div class="controls pref-second-factor">
       {{#if isCurrentUser}}
         {{#link-to "preferences.second-factor" class="btn btn-default"}}
-          {{d-icon "lock"}} <span>{{i18n 'user.second_factor.enable'}}</span>
+          {{d-icon "lock"}} <span>{{i18n "user.second_factor.enable"}}</span>
         {{/link-to}}
       {{/if}}
     </div>
@@ -102,7 +102,7 @@
 
 {{#if canUpdateAssociatedAccounts}}
   <div class="control-group pref-associated-accounts">
-    <label class="control-label">{{i18n 'user.associated_accounts.title'}}</label>
+    <label class="control-label">{{i18n "user.associated_accounts.title"}}</label>
     {{#if associatedAccountsLoaded}}
       <table>
         <tbody>
@@ -124,7 +124,7 @@
                   {{#if authProvider.method.can_connect}}
                     {{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" class="btn-default" icon="plug" disabled=disableConnectButtons}}
                   {{else}}
-                    {{i18n 'user.associated_accounts.not_connected'}}
+                    {{i18n "user.associated_accounts.not_connected"}}
                   {{/if}}
                 </td>
               </tr>
@@ -142,7 +142,7 @@
 
 {{#if canSelectTitle}}
   <div class="control-group pref-title">
-    <label class="control-label">{{i18n 'user.title.title'}}</label>
+    <label class="control-label">{{i18n "user.title.title"}}</label>
     <div class="controls">
       {{combo-box
         value=newTitleInput
@@ -156,7 +156,7 @@
 
 {{#if canSelectPrimaryGroup}}
   <div class="control-group pref-primary-group">
-    <label class="control-label">{{i18n 'user.primary_group.title'}}</label>
+    <label class="control-label">{{i18n "user.primary_group.title"}}</label>
     <div class="controls">
       {{combo-box
         value=newPrimaryGroupInput
@@ -168,7 +168,7 @@
 
 {{#if canCheckEmails}}
   <div class="control-group pref-auth-tokens">
-    <label class="control-label">{{i18n 'user.auth_tokens.title'}}</label>
+    <label class="control-label">{{i18n "user.auth_tokens.title"}}</label>
 
     <div class="auth-tokens">
       {{#each authTokens as |token|}}
@@ -185,7 +185,7 @@
           <div class="auth-token-second">
             {{token.browser}} |
             {{#if token.is_active}}
-              <span class="active">{{i18n 'user.auth_tokens.active'}}</span>
+              <span class="active">{{i18n "user.auth_tokens.active"}}</span>
             {{else}}
               {{format-date token.seen_at}}
             {{/if}}
@@ -197,14 +197,14 @@
     {{#if canShowAllAuthTokens}}
       <a href {{action "toggleShowAllAuthTokens"}}>
         {{#if showAllAuthTokens}}
-          {{d-icon "caret-up"}} {{i18n 'user.auth_tokens.show_few'}}
+          {{d-icon "caret-up"}} {{i18n "user.auth_tokens.show_few"}}
         {{else}}
-          {{d-icon "caret-down"}} {{i18n 'user.auth_tokens.show_all' count=model.user_auth_tokens.length}}
+          {{d-icon "caret-down"}} {{i18n "user.auth_tokens.show_all" count=model.user_auth_tokens.length}}
         {{/if}}
       </a>
     {{/if}}
 
-    <a href {{action "revokeAuthToken"}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n 'user.auth_tokens.log_out_all'}}</a>
+    <a href {{action "revokeAuthToken"}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n "user.auth_tokens.log_out_all"}}</a>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/apps.hbs b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
index bb9216086c..79e9e7bf6b 100644
--- a/app/assets/javascripts/discourse/templates/preferences/apps.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
@@ -1,6 +1,6 @@
 {{#if model.userApiKeys}}
   <div class="control-group apps">
-    <label class="control-label">{{i18n 'user.apps'}}</label>
+    <label class="control-label">{{i18n "user.apps"}}</label>
     <div class="controls">
       {{#each model.userApiKeys as |key|}}
         <div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index dacfbc1c8b..cd907dc0ed 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -1,10 +1,10 @@
 <div class="control-group category-notifications">
-  <label class="control-label">{{i18n 'user.categories_settings'}}</label>
+  <label class="control-label">{{i18n "user.categories_settings"}}</label>
 
   <div class="controls tracking-controls">
-    <label>{{d-icon "d-watching"}} {{i18n 'user.watched_categories'}}</label>
+    <label>{{d-icon "d-watching"}} {{i18n "user.watched_categories"}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href={{model.watchingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{model.watchingTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
     {{/if}}
     {{category-selector
       categories=model.watchedCategories
@@ -12,12 +12,12 @@
       onChange=(action (mut model.watchedCategories))
     }}
   </div>
-  <div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
+  <div class="instructions">{{i18n "user.watched_categories_instructions"}}</div>
 
   <div class="controls tracking-controls">
-    <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
+    <label>{{d-icon "d-tracking"}} {{i18n "user.tracked_categories"}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href={{model.trackingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{model.trackingTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
     {{/if}}
     {{category-selector
       categories=model.trackedCategories
@@ -25,23 +25,23 @@
       onChange=(action (mut model.trackedCategories))
     }}
   </div>
-  <div class="instructions">{{i18n 'user.tracked_categories_instructions'}}</div>
+  <div class="instructions">{{i18n "user.tracked_categories_instructions"}}</div>
 
   <div class="controls tracking-controls">
-    <label>{{d-icon "d-watching-first"}} {{i18n 'user.watched_first_post_categories'}}</label>
+    <label>{{d-icon "d-watching-first"}} {{i18n "user.watched_first_post_categories"}}</label>
     {{category-selector
       categories=model.watchedFirstPostCategories
       blacklist=selectedCategories
       onChange=(action (mut model.watchedFirstPostCategories))
     }}
   </div>
-  <div class="instructions">{{i18n 'user.watched_first_post_categories_instructions'}}</div>
+  <div class="instructions">{{i18n "user.watched_first_post_categories_instructions"}}</div>
 
   {{#unless siteSettings.mute_all_categories_by_default}}
     <div class="controls tracking-controls">
-      <label>{{d-icon "d-muted"}} {{i18n 'user.muted_categories'}}</label>
+      <label>{{d-icon "d-muted"}} {{i18n "user.muted_categories"}}</label>
       {{#if canSee}}
-        <a class="show-tracking" href={{model.mutedTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+        <a class="show-tracking" href={{model.mutedTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
       {{/if}}
       {{category-selector
         categories=model.mutedCategories
@@ -49,7 +49,7 @@
         onChange=(action (mut model.mutedCategories))
       }}
     </div>
-    <div class="instructions">{{i18n (if hideMutedTags 'user.muted_categories_instructions' 'user.muted_categories_instructions_dont_hide')}}</div>
+    <div class="instructions">{{i18n (if hideMutedTags "user.muted_categories_instructions" "user.muted_categories_instructions_dont_hide")}}</div>
   {{/unless}}
 </div>
 
@@ -62,5 +62,5 @@
 {{#if canSave}}
   {{save-controls model=model action=(action "save") saved=saved}}
 {{else}}
-  {{i18n 'user.no_category_access'}}
+  {{i18n "user.no_category_access"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index 367ea59b0d..d5850f3ad1 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -1,15 +1,15 @@
 {{#unless siteSettings.disable_mailing_list_mode}}
   {{~#if model.user_option.mailing_list_mode}}
     <div class="warning-wrap">
-      <div class="warning">{{i18n 'user.mailing_list_mode.warning'}}</div>
+      <div class="warning">{{i18n "user.mailing_list_mode.warning"}}</div>
     </div>
   {{/if}}
 {{/unless}}
 <div class="control-group pref-email-settings">
-  <label class="control-label">{{i18n 'user.email_settings'}}</label>
+  <label class="control-label">{{i18n "user.email_settings"}}</label>
 
-  <div class='controls controls-dropdown'>
-    <label for="user-email-messages-level">{{i18n 'user.email_messages_level'}}</label>
+  <div class="controls controls-dropdown">
+    <label for="user-email-messages-level">{{i18n "user.email_messages_level"}}</label>
     {{combo-box
       valueProperty="value"
       content=emailLevelOptions
@@ -18,12 +18,12 @@
       onChange=(action (mut model.user_option.email_messages_level))
     }}
     {{#if emailMessagesLevelAway}}
-      <div class='instructions'>{{emailFrequencyInstructions}}</div>
+      <div class="instructions">{{emailFrequencyInstructions}}</div>
     {{/if}}
   </div>
 
-  <div class='controls controls-dropdown'>
-    <label for="user-email-level">{{i18n 'user.email_level.title'}}</label>
+  <div class="controls controls-dropdown">
+    <label for="user-email-level">{{i18n "user.email_level.title"}}</label>
     {{combo-box
       valueProperty="value"
       content=emailLevelOptions
@@ -32,12 +32,12 @@
       onChange=(action (mut model.user_option.email_level))
     }}
     {{#if emailLevelAway}}
-      <div class='instructions'>{{emailFrequencyInstructions}}</div>
+      <div class="instructions">{{emailFrequencyInstructions}}</div>
     {{/if}}
   </div>
 
-  <div class='controls controls-dropdown'>
-    <label>{{i18n 'user.email_previous_replies.title'}}</label>
+  <div class="controls controls-dropdown">
+    <label>{{i18n "user.email_previous_replies.title"}}</label>
     {{combo-box
       valueProperty="value"
       content=previousRepliesOptions
@@ -51,11 +51,11 @@
 </div>
 
 {{#unless siteSettings.disable_digest_emails}}
-  <div class='control-group pref-activity-summary'>
-    <label class="control-label">{{i18n 'user.email_activity_summary'}}</label>
+  <div class="control-group pref-activity-summary">
+    <label class="control-label">{{i18n "user.email_activity_summary"}}</label>
     {{preference-checkbox labelKey="user.email_digests.title" disabled=model.user_option.mailing_list_mode checked=model.user_option.email_digests}}
     {{#if model.user_option.email_digests}}
-      <div class='controls controls-dropdown'>
+      <div class="controls controls-dropdown">
         {{combo-box
           valueProperty="value"
           filterable=true
@@ -70,12 +70,12 @@
 {{/unless}}
 
 {{#unless siteSettings.disable_mailing_list_mode}}
-  <div class='control-group pref-mailing-list-mode'>
-    <label class="control-label">{{i18n 'user.mailing_list_mode.label'}}</label>
+  <div class="control-group pref-mailing-list-mode">
+    <label class="control-label">{{i18n "user.mailing_list_mode.label"}}</label>
     {{preference-checkbox labelKey="user.mailing_list_mode.enabled" checked=model.user_option.mailing_list_mode}}
-    <div class='instructions'>{{html-safe (i18n 'user.mailing_list_mode.instructions')}}</div>
+    <div class="instructions">{{html-safe (i18n "user.mailing_list_mode.instructions")}}</div>
     {{#if model.user_option.mailing_list_mode}}
-      <div class='controls controls-dropdown'>
+      <div class="controls controls-dropdown">
         {{combo-box
           valueProperty="value"
           content=mailingListModeOptions
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index 63b96865b2..45607c8cb7 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -1,6 +1,6 @@
 {{#if showThemeSelector}}
   <div class="control-group theme">
-    <label class="control-label">{{i18n 'user.theme'}}</label>
+    <label class="control-label">{{i18n "user.theme"}}</label>
     <div class="controls">
       {{combo-box
         content=userSelectableThemes
@@ -17,7 +17,7 @@
 {{/if}}
 
 <div class="control-group text-size">
-  <label class="control-label">{{i18n 'user.text_size.title'}}</label>
+  <label class="control-label">{{i18n "user.text_size.title"}}</label>
   <div class="controls">
     {{combo-box
       valueProperty="value"
@@ -35,7 +35,7 @@
 
 {{#if siteSettings.allow_user_locale}}
   <div class="control-group pref-locale">
-    <label class="control-label">{{i18n 'user.locale.title'}}</label>
+    <label class="control-label">{{i18n "user.locale.title"}}</label>
     <div class="controls">
       {{combo-box
         valueProperty="value"
@@ -48,14 +48,14 @@
         )
       }}
     </div>
-    <div class='instructions'>
-      {{i18n 'user.locale.instructions'}}
+    <div class="instructions">
+      {{i18n "user.locale.instructions"}}
     </div>
   </div>
 {{/if}}
 
 <div class="control-group home">
-  <label class="control-label">{{i18n 'user.home'}}</label>
+  <label class="control-label">{{i18n "user.home"}}</label>
   <div class="controls">
     {{combo-box
       content=userSelectableHome
@@ -67,7 +67,7 @@
 </div>
 
 <div class="control-group other">
-  <label class="control-label">{{i18n 'user.other_settings'}}</label>
+  <label class="control-label">{{i18n "user.other_settings"}}</label>
 
   {{preference-checkbox labelKey="user.external_links_in_new_tab" checked=model.user_option.external_links_in_new_tab class="pref-external-links"}}
   {{preference-checkbox labelKey="user.enable_quoting" checked=model.user_option.enable_quoting class="pref-enable-quoting"}}
@@ -80,8 +80,8 @@
     {{preference-checkbox labelKey="user.enable_physical_keyboard" checked=disableSafariHacks  class="pref-safari-hacks"}}
   {{/if}}
   {{preference-checkbox labelKey="user.dynamic_favicon" checked=model.user_option.dynamic_favicon  class="pref-dynamic-favicon"}}
-  <div class='controls controls-dropdown pref-page-title'>
-    <label for="user-email-level">{{i18n 'user.title_count_mode.title'}}</label>
+  <div class="controls controls-dropdown pref-page-title">
+    <label for="user-email-level">{{i18n "user.title_count_mode.title"}}</label>
     {{combo-box
       valueProperty="value"
       content=titleCountModes
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index a676f29787..9e079fd5c5 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -1,8 +1,8 @@
 <div class="control-group notifications">
-  <label class="control-label">{{i18n 'user.notifications'}}</label>
+  <label class="control-label">{{i18n "user.notifications"}}</label>
 
   <div class="controls controls-dropdown">
-    <label>{{i18n 'user.new_topic_duration.label'}}</label>
+    <label>{{i18n "user.new_topic_duration.label"}}</label>
     {{combo-box
       class="duration"
       valueProperty="value"
@@ -13,7 +13,7 @@
   </div>
 
   <div class="controls controls-dropdown">
-    <label>{{i18n 'user.auto_track_topics'}}</label>
+    <label>{{i18n "user.auto_track_topics"}}</label>
     {{combo-box
       valueProperty="value"
       content=autoTrackDurations
@@ -23,7 +23,7 @@
   </div>
 
   <div class="controls controls-dropdown">
-    <label>{{i18n 'user.notification_level_when_replying'}}</label>
+    <label>{{i18n "user.notification_level_when_replying"}}</label>
     {{combo-box
       valueProperty="value"
       content=notificationLevelsForReplying
@@ -33,7 +33,7 @@
   </div>
 
   <div class="controls controls-dropdown">
-    <label>{{i18n 'user.like_notification_frequency.title'}}</label>
+    <label>{{i18n "user.like_notification_frequency.title"}}</label>
     {{combo-box
       valueProperty="value"
       content=likeNotificationFrequencies
@@ -45,16 +45,16 @@
 
 {{#unless isIOS}}
   <div class="control-group desktop-notifications">
-    <label class="control-label">{{i18n 'user.desktop_notifications.label'}}</label>
+    <label class="control-label">{{i18n "user.desktop_notifications.label"}}</label>
     {{desktop-notification-config}}
-    <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
+    <div class="instructions">{{i18n "user.desktop_notifications.each_browser_note"}}</div>
     {{plugin-outlet name="user-preferences-desktop-notifications" args=(hash model=model save=(action "save"))}}
   </div>
 {{/unless}}
 
 {{#if siteSettings.enable_personal_messages}}
   <div class="control-group private-messages">
-    <label class="control-label">{{i18n 'user.private_messages'}}</label>
+    <label class="control-label">{{i18n "user.private_messages"}}</label>
 
     <div class="controls">
       {{preference-checkbox
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index b9a95dc9bb..f07bcafb74 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -1,6 +1,6 @@
 {{#if canChangeBio}}
   <div class="control-group pref-bio">
-    <label class="control-label">{{i18n 'user.bio'}}</label>
+    <label class="control-label">{{i18n "user.bio"}}</label>
     <div class="controls bio-composer input-xxlarge">
       {{d-editor value=model.bio_raw}}
     </div>
@@ -8,7 +8,7 @@
 {{/if}}
 
 <div class="control-group pref-timezone">
-  <label class="control-label">{{i18n 'user.timezone'}}</label>
+  <label class="control-label">{{i18n "user.timezone"}}</label>
   {{timezone-input
     value=model.user_option.timezone
     onChange=(action (mut model.user_option.timezone))
@@ -18,14 +18,14 @@
 </div>
 
 <div class="control-group pref-location">
-  <label class="control-label">{{i18n 'user.location'}}</label>
+  <label class="control-label">{{i18n "user.location"}}</label>
   <div class="controls">
-    {{input type="text" value=model.location class="input-xxlarge" id='edit-location'}}
+    {{input type="text" value=model.location class="input-xxlarge" id="edit-location"}}
   </div>
 </div>
 
 <div class="control-group pref-website">
-  <label class="control-label">{{i18n 'user.website'}}</label>
+  <label class="control-label">{{i18n "user.website"}}</label>
   <div class="controls">
     {{input type="text" value=model.website class="input-xxlarge"}}
   </div>
@@ -36,35 +36,35 @@
     {{user-field field=uf.field value=uf.value}}
   </div>
 {{/each}}
-<div class='clearfix'></div>
+<div class="clearfix"></div>
 
 {{#if siteSettings.allow_profile_backgrounds}}
   <div class="control-group pref-profile-bg">
-    <label class="control-label">{{i18n 'user.change_profile_background.title'}}</label>
+    <label class="control-label">{{i18n "user.change_profile_background.title"}}</label>
     <div class="controls">
       {{image-uploader imageUrl=model.profile_background_upload_url
                        type="profile_background"}}
     </div>
-    <div class='instructions'>
-      {{i18n 'user.change_profile_background.instructions'}}
+    <div class="instructions">
+      {{i18n "user.change_profile_background.instructions"}}
     </div>
   </div>
 
   <div class="control-group pref-profile-bg">
-    <label class="control-label">{{i18n 'user.change_card_background.title'}}</label>
+    <label class="control-label">{{i18n "user.change_card_background.title"}}</label>
     <div class="controls">
       {{image-uploader imageUrl=model.card_background_upload_url
                        type="card_background"}}
     </div>
-    <div class='instructions'>
-      {{i18n 'user.change_card_background.instructions'}}
+    <div class="instructions">
+      {{i18n "user.change_card_background.instructions"}}
     </div>
   </div>
 {{/if}}
 
 {{#if siteSettings.allow_featured_topic_on_user_profiles}}
   <div class="control-group">
-    <label class="control-label">{{i18n 'user.featured_topic'}}</label>
+    <label class="control-label">{{i18n "user.featured_topic"}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
         {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}
@@ -83,8 +83,8 @@
           label="user.feature_topic_on_profile.clear.title"}}
       {{/if}}
     </div>
-    <div class='instructions'>
-      {{i18n 'user.change_featured_topic.instructions'}}
+    <div class="instructions">
+      {{i18n "user.change_featured_topic.instructions"}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
index e645e8175a..9774a0def2 100644
--- a/app/assets/javascripts/discourse/templates/preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
@@ -1,9 +1,9 @@
 {{#if siteSettings.tagging_enabled}}
   <div class="control-group tag-notifications">
-    <label class="control-label">{{i18n 'user.tag_settings'}}</label>
+    <label class="control-label">{{i18n "user.tag_settings"}}</label>
 
     <div class="controls tracking-controls">
-      <label>{{d-icon "d-watching" class="icon watching"}} {{i18n 'user.watched_tags'}}</label>
+      <label>{{d-icon "d-watching" class="icon watching"}} {{i18n "user.watched_tags"}}</label>
       {{tag-chooser
         tags=model.watched_tags
         blacklist=selectedTags
@@ -14,10 +14,10 @@
       }}
     </div>
 
-    <div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div>
+    <div class="instructions">{{i18n "user.watched_tags_instructions"}}</div>
 
     <div class="controls tracking-controls">
-      <label>{{d-icon "d-tracking" class="icon tracking"}} {{i18n 'user.tracked_tags'}}</label>
+      <label>{{d-icon "d-tracking" class="icon tracking"}} {{i18n "user.tracked_tags"}}</label>
       {{tag-chooser
         tags=model.tracked_tags
         blacklist=selectedTags
@@ -27,10 +27,10 @@
         unlimitedTagCount=true}}
     </div>
 
-    <div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div>
+    <div class="instructions">{{i18n "user.tracked_tags_instructions"}}</div>
 
     <div class="controls tracking-controls">
-      <label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n 'user.watched_first_post_tags'}}</label>
+      <label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n "user.watched_first_post_tags"}}</label>
       {{tag-chooser
         tags=model.watching_first_post_tags
         blacklist=selectedTags
@@ -41,11 +41,11 @@
     </div>
 
     <div class="instructions">
-      {{i18n 'user.watched_first_post_tags_instructions'}}
+      {{i18n "user.watched_first_post_tags_instructions"}}
     </div>
 
     <div class="controls tracking-controls">
-      <label>{{d-icon "d-muted" class="icon muted"}} {{i18n 'user.muted_tags'}}</label>
+      <label>{{d-icon "d-muted" class="icon muted"}} {{i18n "user.muted_tags"}}</label>
       {{tag-chooser
         tags=model.muted_tags
         blacklist=selectedTags
@@ -54,7 +54,7 @@
         everyTag=true
         unlimitedTagCount=true}}
     </div>
-    <div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div>
+    <div class="instructions">{{i18n "user.muted_tags_instructions"}}</div>
   </div>
 
   {{plugin-outlet name="user-preferences-tags" args=(hash model=model save=(action "save"))}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/users.hbs b/app/assets/javascripts/discourse/templates/preferences/users.hbs
index 799b9c5c5a..7db61c6aa2 100644
--- a/app/assets/javascripts/discourse/templates/preferences/users.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/users.hbs
@@ -1,8 +1,8 @@
-<label class="control-label">{{i18n 'user.users'}}</label>
+<label class="control-label">{{i18n "user.users"}}</label>
 {{#if ignoredEnabled}}
   <div class="control-group user-ignore">
     <div class="controls tracking-controls user-notifications">
-      <label>{{d-icon "far-eye-slash" class="icon"}} {{i18n 'user.ignored_users'}}</label>
+      <label>{{d-icon "far-eye-slash" class="icon"}} {{i18n "user.ignored_users"}}</label>
       {{ignored-user-list model=model items=model.ignored_usernames saving=saved}}
     </div>
   </div>
@@ -12,7 +12,7 @@
   <div class="controls tracking-controls">
     <label>
       {{d-icon "d-muted" class="icon"}}
-      <span>{{i18n 'user.muted_users'}}</span>
+      <span>{{i18n "user.muted_users"}}</span>
     </label>
     {{user-chooser
       value=mutedUsernames
@@ -22,7 +22,7 @@
       )
     }}
   </div>
-  <div class="instructions">{{i18n 'user.muted_users_instructions'}}</div>
+  <div class="instructions">{{i18n "user.muted_users_instructions"}}</div>
 </div>
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/review-index.hbs b/app/assets/javascripts/discourse/templates/review-index.hbs
index ab354f4fa1..7b603f9fa0 100644
--- a/app/assets/javascripts/discourse/templates/review-index.hbs
+++ b/app/assets/javascripts/discourse/templates/review-index.hbs
@@ -2,7 +2,7 @@
   <div class="reviewable-list">
     {{#if reviewables}}
       {{#load-more selector=".reviewable-item" action=(action "loadMore")}}
-        <div class='reviewables'>
+        <div class="reviewables">
           {{#each reviewables as |r|}}
             {{reviewable-item reviewable=r remove=(action "remove")}}
           {{/each}}
@@ -16,9 +16,9 @@
     {{/if}}
   </div>
 
-  <div class='reviewable-filters'>
-    <div class='reviewable-filter'>
-      <label class='filter-label'>{{i18n "review.filters.status"}}</label>
+  <div class="reviewable-filters">
+    <div class="reviewable-filter">
+      <label class="filter-label">{{i18n "review.filters.status"}}</label>
       {{combo-box
         value=filterStatus
         content=statuses
@@ -30,8 +30,8 @@
 
       {{plugin-outlet name="above-review-filters" args=(hash model=model additionalFilters=additionalFilters)}}
 
-      <div class='reviewable-filter'>
-        <label class='filter-label'>{{i18n "review.filters.type.title"}}</label>
+      <div class="reviewable-filter">
+        <label class="filter-label">{{i18n "review.filters.type.title"}}</label>
         {{combo-box
           value=filterType
           content=allTypes
@@ -40,8 +40,8 @@
         }}
       </div>
 
-      <div class='reviewable-filter'>
-        <label class='filter-label'>{{i18n "review.filters.priority.title"}}</label>
+      <div class="reviewable-filter">
+        <label class="filter-label">{{i18n "review.filters.priority.title"}}</label>
         {{combo-box
           value=filterPriority
           content=priorities
@@ -49,8 +49,8 @@
         }}
       </div>
 
-      <div class='reviewable-filter'>
-        <label class='filter-label'>{{i18n "review.filters.category"}}</label>
+      <div class="reviewable-filter">
+        <label class="filter-label">{{i18n "review.filters.category"}}</label>
         {{category-chooser
           none="review.filters.all_categories"
           value=filterCategoryId
@@ -58,7 +58,7 @@
         }}
       </div>
 
-      <div class='reviewable-filter topic-filter'>
+      <div class="reviewable-filter topic-filter">
         {{i18n "review.filtered_user"}}
         {{user-selector
           excludeCurrentUser=false
@@ -70,17 +70,17 @@
       </div>
 
       {{#if filterTopic}}
-        <div class='reviewable-filter topic-filter'>
+        <div class="reviewable-filter topic-filter">
           {{i18n "review.filtered_topic"}}
           {{d-button label="review.show_all_topics" icon="times" action=(action "resetTopic")}}
         </div>
       {{/if}}
 
-      <div class='reviewable-filter date-range'>
+      <div class="reviewable-filter date-range">
         {{date-time-input-range showFromTime=false showToTime=false from=filterFromDate to=filterToDate onChange=setRange}}
       </div>
 
-      <div class='reviewable-filter sort-order'>
+      <div class="reviewable-filter sort-order">
         {{i18n "review.order_by"}}
         {{combo-box
           value=filterSortOrder
@@ -90,7 +90,7 @@
       </div>
     {{/if}}
 
-    <div class='reviewable-filters-actions'>
+    <div class="reviewable-filters-actions">
       {{d-button
         icon="sync"
         label="review.filters.refresh"
diff --git a/app/assets/javascripts/discourse/templates/review-settings.hbs b/app/assets/javascripts/discourse/templates/review-settings.hbs
index f798ca59c6..599ae01602 100644
--- a/app/assets/javascripts/discourse/templates/review-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/review-settings.hbs
@@ -1,10 +1,10 @@
-<div class='reviewable-settings'>
+<div class="reviewable-settings">
   <h4>{{i18n "review.settings.priorities.title"}}</h4>
 
   {{#each settings.reviewable_score_types as |rst|}}
-    <div class='reviewable-score-type'>
-      <div class='title'>{{rst.title}}</div>
-      <div class='field'>
+    <div class="reviewable-score-type">
+      <div class="title">{{rst.title}}</div>
+      <div class="field">
         {{combo-box
           value=rst.reviewable_priority
           content=settings.reviewable_priorities
@@ -14,9 +14,9 @@
     </div>
   {{/each}}
 
-  <div class='reviewable-score-type'>
-    <div class='title'></div>
-    <div class='field'>
+  <div class="reviewable-score-type">
+    <div class="title"></div>
+    <div class="field">
       {{d-button
         icon="check"
         label="review.settings.save_changes"
@@ -25,7 +25,7 @@
         disabled=saving}}
 
       {{#if saved}}
-        <span class='saved'>{{i18n "review.settings.saved"}}</span>
+        <span class="saved">{{i18n "review.settings.saved"}}</span>
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/review-topics.hbs b/app/assets/javascripts/discourse/templates/review-topics.hbs
index 36cdb89b7b..337cb4207d 100644
--- a/app/assets/javascripts/discourse/templates/review-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/review-topics.hbs
@@ -1,5 +1,5 @@
 {{#if reviewableTopics}}
-  <table class='reviewable-topics'>
+  <table class="reviewable-topics">
     <thead>
       <th>{{i18n "review.topics.topic"}} </th>
       <th>{{i18n "review.topics.reviewable_count"}}</th>
@@ -8,9 +8,9 @@
     </thead>
     <tbody>
       {{#each reviewableTopics as |rt|}}
-        <tr class='reviewable-topic'>
+        <tr class="reviewable-topic">
           <td class="topic-title">
-            <div class='combined-title'>
+            <div class="combined-title">
               {{topic-status topic=rt}}
               <a href={{rt.relative_url}} rel="noopener" target="_blank">{{replace-emoji rt.fancy_title}}</a>
             </div>
diff --git a/app/assets/javascripts/discourse/templates/review.hbs b/app/assets/javascripts/discourse/templates/review.hbs
index f5e5dcdd2e..6077454af2 100644
--- a/app/assets/javascripts/discourse/templates/review.hbs
+++ b/app/assets/javascripts/discourse/templates/review.hbs
@@ -1,9 +1,9 @@
 <div class="reviewable">
   <ul class="nav nav-pills reviewable-title">
-    {{nav-item route='review.index' label='review.view_all'}}
-    {{nav-item route='review.topics' label='review.grouped_by_topic'}}
+    {{nav-item route="review.index" label="review.view_all"}}
+    {{nav-item route="review.topics" label="review.grouped_by_topic"}}
     {{#if currentUser.admin}}
-      {{nav-item route='review.settings' label='review.settings.title' icon='wrench'}}
+      {{nav-item route="review.settings" label="review.settings.title" icon="wrench"}}
     {{/if}}
   </ul>
 
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index aee9390704..a33cfa1e3a 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -1,6 +1,6 @@
 {{#d-section bodyClass=bodyClass class="container"}}
   {{#watch-read action=(action "markFaqRead") path=model.path}}
-    <div class='contents clearfix body-page'>
+    <div class="contents clearfix body-page">
       {{plugin-outlet name="above-static"}}
       {{html-safe model.html}}
 
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-index.hbs b/app/assets/javascripts/discourse/templates/tag-groups-index.hbs
index 0c933221d9..51a1f5a1b6 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups-index.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups-index.hbs
@@ -1,3 +1,3 @@
 <div class="tag-group-content">
-  <p class="about">{{i18n 'tagging.groups.about'}}</p>
+  <p class="about">{{i18n "tagging.groups.about"}}</p>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/templates/tag-groups.hbs b/app/assets/javascripts/discourse/templates/tag-groups.hbs
index 6d7d1b0c74..8bbc36c229 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups.hbs
@@ -1,7 +1,7 @@
 <div class="container tag-groups-container">
   <h2>{{i18n "tagging.groups.title"}}</h2>
 
-  <div class='content-list'>
+  <div class="content-list">
     <ul>
       {{#each model as |tagGroup|}}
         <li>
diff --git a/app/assets/javascripts/discourse/templates/tags/index.hbs b/app/assets/javascripts/discourse/templates/tags/index.hbs
index c71934d127..3527823b28 100644
--- a/app/assets/javascripts/discourse/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/index.hbs
@@ -11,10 +11,10 @@
   </div>
 </div>
 
-<div class='tag-sort-options'>
+<div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
-  <span class="tag-sort-count {{if sortedByCount 'active'}}"><a href {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
-  <span class="tag-sort-name {{if sortedByName 'active'}}"><a href {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
+  <span class="tag-sort-count {{if sortedByCount "active"}}"><a href {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
+  <span class="tag-sort-name {{if sortedByName "active"}}"><a href {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
 </div>
 
 <hr>
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index 638701e3da..80f38623c3 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -15,7 +15,7 @@
         {{navigation-bar navItems=navItems filterMode=filterMode}}
       {{else}}
         <h2 class="tag-show-heading">
-          {{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}}
+          {{#link-to "tags"}}{{i18n "tagging.tags"}}{{/link-to}}
           {{d-icon "angle-right"}}
           {{discourse-tag-bound tagRecord=tag style="simple"}}
           {{#each additionalTags as |tag|}}
@@ -57,7 +57,7 @@
 <div class="container list-container">
   <div class="row">
     <div class="full-width">
-      <div id='list-area'>
+      <div id="list-area">
         {{#unless loading}}
           {{#if list.topics}}
             {{#discovery-topics-list model=list refresh=(action "refresh")}}
@@ -75,9 +75,9 @@
               }}
             {{/discovery-topics-list}}
           {{else}}
-            <footer class='topic-list-bottom'>
+            <footer class="topic-list-bottom">
               <h3>
-                {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}.
+                {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n "topic.browse_all_categories"}}{{/link-to}} {{i18n "or"}} {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}}.
               </h3>
             </footer>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index ed26ae62ba..7a4f6d6c7e 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -87,7 +87,7 @@
       {{/topic-title}}
 
       {{#if model.publishedPage}}
-        <div class='published-page'>
+        <div class="published-page">
           <div class="details">
             {{i18n "topic.publish_page.topic_published"}}
             <div>
@@ -107,7 +107,7 @@
     {{/if}}
 
     <div class="container posts">
-      <div class='selected-posts {{unless multiSelect 'hidden'}}'>
+      <div class="selected-posts {{unless multiSelect "hidden"}}">
         {{selected-posts
           selectedPostsCount=selectedPostsCount
           canSelectAll=canSelectAll
@@ -261,25 +261,25 @@
             {{#if loadedAllPosts}}
 
               {{#if model.pending_posts}}
-                <div class='pending-posts'>
+                <div class="pending-posts">
                   {{#each model.pending_posts as |pending|}}
-                    <div class='reviewable-item'>
-                      <div class='reviewable-meta-data'>
-                        <span class='reviewable-type'>
+                    <div class="reviewable-item">
+                      <div class="reviewable-meta-data">
+                        <span class="reviewable-type">
                           {{i18n "review.awaiting_approval"}}
                         </span>
-                        <span class='created-at'>
+                        <span class="created-at">
                           {{age-with-tooltip pending.created_at}}
                         </span>
                       </div>
-                      <div class='post-contents-wrapper'>
-                        {{reviewable-created-by user=currentUser tagName=''}}
-                        <div class='post-contents'>
-                          {{reviewable-created-by-name user=currentUser tagName=''}}
-                          <div class='post-body'>{{cook-text pending.raw}}</div>
+                      <div class="post-contents-wrapper">
+                        {{reviewable-created-by user=currentUser tagName=""}}
+                        <div class="post-contents">
+                          {{reviewable-created-by-name user=currentUser tagName=""}}
+                          <div class="post-body">{{cook-text pending.raw}}</div>
                         </div>
                       </div>
-                      <div class='reviewable-actions'>
+                      <div class="reviewable-actions">
                         {{d-button
                           class="btn-danger"
                           label="review.delete"
@@ -297,7 +297,7 @@
                     {{html-safe (i18n "review.topic_has_pending" count=model.queued_posts_count)}}
                   </div>
 
-                  {{#link-to 'review' (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
+                  {{#link-to "review" (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
                     {{i18n "review.view_pending"}}
                   {{/link-to}}
                 </div>
@@ -356,7 +356,7 @@
               {{/if}}
 
               {{#if showSelectedPostsAtBottom}}
-                <div class='selected-posts {{unless multiSelect 'hidden'}}'>
+                <div class="selected-posts {{unless multiSelect "hidden"}}">
                   {{selected-posts
                     selectedPostsCount=selectedPostsCount
                     canSelectAll=canSelectAll
@@ -375,7 +375,7 @@
               {{/if}}
 
               {{plugin-outlet name="topic-above-suggested" args=(hash model=model)}}
-              <div class="{{if model.relatedMessages.length 'related-messages-wrapper'}} {{if model.suggestedTopics.length 'suggested-topics-wrapper'}}">
+              <div class="{{if model.relatedMessages.length "related-messages-wrapper"}} {{if model.suggestedTopics.length "suggested-topics-wrapper"}}">
                 {{#if model.relatedMessages.length}}
                   {{related-messages topic=model}}
                 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/templates/unknown.hbs
index 5ff548e033..168cdc06d5 100644
--- a/app/assets/javascripts/discourse/templates/unknown.hbs
+++ b/app/assets/javascripts/discourse/templates/unknown.hbs
@@ -1,3 +1,3 @@
-<div class='container'>
+<div class="container">
   {{html-safe model}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index fde0c26227..30aa848824 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -2,14 +2,14 @@
   {{#if canInviteToForum}}
     {{#load-more class="user-content" selector=".user-invite-list tr" action=(action "loadMore")}}
       <section>
-        <h2>{{i18n 'user.invited.title'}}</h2>
+        <h2>{{i18n "user.invited.title"}}</h2>
 
         {{#if model.can_see_invite_details}}
-          <div class='admin-controls'>
+          <div class="admin-controls">
             <nav>
               <ul class="nav nav-pills">
-                {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}}
-                {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}}
+                {{nav-item route="userInvited.show" routeParam="pending" i18nLabel=pendingLabel}}
+                {{nav-item route="userInvited.show" routeParam="redeemed" i18nLabel=redeemedLabel}}
               </ul>
             </nav>
 
@@ -21,12 +21,12 @@
               {{/if}}
               {{#if showBulkActionButtons}}
                 {{#if rescindedAll}}
-                  {{i18n 'user.invited.rescinded_all'}}
+                  {{i18n "user.invited.rescinded_all"}}
                 {{else}}
                   {{d-button icon="times" action=(action "rescindAll") label="user.invited.rescind_all"}}
                 {{/if}}
                 {{#if reinvitedAll}}
-                  {{i18n 'user.invited.reinvited_all'}}
+                  {{i18n "user.invited.reinvited_all"}}
                 {{else}}
                   {{d-button icon="sync" action=(action "reinviteAll") label="user.invited.reinvite_all"}}
                 {{/if}}
@@ -42,30 +42,30 @@
         {{/if}}
 
         {{#if model.invites}}
-          <table class='table user-invite-list'>
+          <table class="table user-invite-list">
             <tbody>
               <tr>
                 {{#if inviteRedeemed}}
-                  <th>{{i18n 'user.invited.user'}}</th>
-                  <th>{{i18n 'user.invited.redeemed_at'}}</th>
+                  <th>{{i18n "user.invited.user"}}</th>
+                  <th>{{i18n "user.invited.redeemed_at"}}</th>
                   {{#if model.can_see_invite_details}}
-                    <th>{{i18n 'user.last_seen'}}</th>
-                    <th>{{i18n 'user.invited.topics_entered'}}</th>
-                    <th>{{i18n 'user.invited.posts_read_count'}}</th>
-                    <th>{{i18n 'user.invited.time_read'}}</th>
-                    <th>{{i18n 'user.invited.days_visited'}}</th>
+                    <th>{{i18n "user.last_seen"}}</th>
+                    <th>{{i18n "user.invited.topics_entered"}}</th>
+                    <th>{{i18n "user.invited.posts_read_count"}}</th>
+                    <th>{{i18n "user.invited.time_read"}}</th>
+                    <th>{{i18n "user.invited.days_visited"}}</th>
                   {{/if}}
                 {{else}}
-                  <th colspan="1">{{i18n 'user.invited.user'}}</th>
-                  <th colspan="6">{{i18n 'user.invited.sent'}}</th>
+                  <th colspan="1">{{i18n "user.invited.user"}}</th>
+                  <th colspan="6">{{i18n "user.invited.sent"}}</th>
                 {{/if}}
               </tr>
               {{#each model.invites as |invite|}}
                 <tr>
                   {{#if invite.user}}
                     <td>
-                      {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}}
-                      {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}}
+                      {{#link-to "user" invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}}
+                      {{#link-to "user" invite.user}}{{invite.user.username}}{{/link-to}}
                     </td>
                     <td>{{format-date invite.redeemed_at}}</td>
                     {{#if model.can_see_invite_details}}
@@ -74,9 +74,9 @@
                       <td>{{number invite.user.posts_read_count}}</td>
                       <td>{{format-duration invite.user.time_read}}</td>
                       <td>
-                        <span title={{i18n 'user.invited.days_visited'}}>{{html-safe invite.user.days_visited}}</span>
+                        <span title={{i18n "user.invited.days_visited"}}>{{html-safe invite.user.days_visited}}</span>
                           /
-                        <span title={{i18n 'user.invited.account_age_days'}}>{{html-safe invite.user.days_since_created}}</span>
+                        <span title={{i18n "user.invited.account_age_days"}}>{{html-safe invite.user.days_since_created}}</span>
                       </td>
                     {{/if}}
                   {{else}}
@@ -84,17 +84,17 @@
                     <td>{{format-date invite.updated_at}}</td>
                     <td>
                       {{#if invite.expired}}
-                        <div>{{i18n 'user.invited.expired'}}</div>
+                        <div>{{i18n "user.invited.expired"}}</div>
                       {{/if}}
                       {{#if invite.rescinded}}
-                        {{i18n 'user.invited.rescinded'}}
+                        {{i18n "user.invited.rescinded"}}
                       {{else}}
                         {{d-button icon="times" action=(action "rescind") actionParam=invite label="user.invited.rescind"}}
                       {{/if}}
                     </td>
                     <td>
                       {{#if invite.reinvited}}
-                        <div>{{i18n 'user.invited.reinvited'}}</div>
+                        <div>{{i18n "user.invited.reinvited"}}</div>
                       {{else}}
                         {{d-button icon="sync" action=(action "reinvite") actionParam=invite label="user.invited.reinvite"}}
                       {{/if}}
@@ -109,9 +109,9 @@
         {{else}}
           <div class="user-invite-none">
             {{#if canBulkInvite}}
-              {{html-safe (i18n 'user.invited.bulk_invite.none')}}
+              {{html-safe (i18n "user.invited.bulk_invite.none")}}
             {{else}}
-              {{i18n 'user.invited.none'}}
+              {{i18n "user.invited.none"}}
             {{/if}}
           </div>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs b/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs
index 5c331cac16..68c054b801 100644
--- a/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs
+++ b/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs
@@ -4,14 +4,14 @@
   </div>
 </div>
 
-<div class='tag-sort-options'>
+<div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
-  <span class="tag-sort-count {{if sortedByCount 'active'}}">
+  <span class="tag-sort-count {{if sortedByCount "active"}}">
     <a href {{action "sortByCount"}}>
       {{i18n "tagging.sort_by_count"}}
     </a>
   </span>
-  <span class="tag-sort-name {{if sortedByName 'active'}}">
+  <span class="tag-sort-name {{if sortedByName "active"}}">
     <a href {{action "sortById"}}>
       {{i18n "tagging.sort_by_name"}}
     </a>
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 59334e9ded..9290b1d832 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -1,53 +1,53 @@
-{{plugin-outlet name="above-user-profile" tagName='' args=(hash model=model)}}
-<div class="container {{if viewingSelf 'viewing-self'}}">
+{{plugin-outlet name="above-user-profile" tagName="" args=(hash model=model)}}
+<div class="container {{if viewingSelf "viewing-self"}}">
   {{#d-section class="user-main"}}
-    <section class="{{if collapsedInfo 'collapsed-info'}} about {{if hasProfileBackgroundUrl 'has-background' 'no-background'}}" >
+    <section class="{{if collapsedInfo "collapsed-info"}} about {{if hasProfileBackgroundUrl "has-background" "no-background"}}" >
       {{#unless collapsedInfo}}
         {{#if showStaffCounters}}
-          <div class='staff-counters'>
+          <div class="staff-counters">
             {{#if model.number_of_flags_given}}
-              <div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n 'user.staff_counters.flags_given'}}</div>
+              <div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n "user.staff_counters.flags_given"}}</div>
             {{/if}}
             {{#if model.number_of_flagged_posts}}
               <div>
-                {{#link-to 'review' (query-params username=model.username status='all' type='ReviewableFlaggedPost')}}
-                  <span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n 'user.staff_counters.flagged_posts'}}
+                {{#link-to "review" (query-params username=model.username status="all" type="ReviewableFlaggedPost")}}
+                  <span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n "user.staff_counters.flagged_posts"}}
                 {{/link-to}}
               </div>
             {{/if}}
             {{#if model.number_of_rejected_posts}}
               <div>
-                {{#link-to 'review' (query-params username=model.username status='rejected' type='ReviewableQueuedPost')}}
-                  <span class="flagged-posts">{{model.number_of_rejected_posts}}</span>{{i18n 'user.staff_counters.rejected_posts'}}
+                {{#link-to "review" (query-params username=model.username status="rejected" type="ReviewableQueuedPost")}}
+                  <span class="flagged-posts">{{model.number_of_rejected_posts}}</span>{{i18n "user.staff_counters.rejected_posts"}}
                 {{/link-to}}
               </div>
             {{/if}}
 
             {{#if model.number_of_deleted_posts}}
               <div>
-                {{#link-to 'user.deletedPosts' model}}
-                  <span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n 'user.staff_counters.deleted_posts'}}
+                {{#link-to "user.deletedPosts" model}}
+                  <span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n "user.staff_counters.deleted_posts"}}
                 {{/link-to}}
               </div>
             {{/if}}
             {{#if model.number_of_suspensions}}
               <div>
                 <a href {{action "showSuspensions"}}>
-                  <span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}
+                  <span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n "user.staff_counters.suspensions"}}
                 </a>
               </div>
             {{/if}}
             {{#if model.warnings_received_count}}
-              <div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
+              <div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n "user.staff_counters.warnings_received"}}</div>
             {{/if}}
           </div>
         {{/if}}
         <div class="user-profile-image" style={{model.profileBackgroundUrl}}></div>
       {{/unless}}
-      <div class='details'>
-        <div class='primary'>
+      <div class="details">
+        <div class="primary">
           {{user-profile-avatar user=model tagName=""}}
-          <section class='controls'>
+          <section class="controls">
             <ul>
               {{#if model.can_send_private_message_to_user}}
                 <li>
@@ -67,7 +67,7 @@
                 </li>
               {{/if}}
               {{#if currentUser.staff}}
-                <li><a href={{model.adminPath}} class="btn btn-default">{{d-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>
+                <li><a href={{model.adminPath}} class="btn btn-default">{{d-icon "wrench"}}{{i18n "admin.user.show_admin_profile"}}</a></li>
               {{/if}}
               {{plugin-outlet name="user-profile-controls"
                               tagName=""
@@ -78,11 +78,11 @@
                 <li>
                   {{#if collapsedInfo}}
                     <a {{action "expandProfile"}} href class="btn btn-default">
-                      {{d-icon "angle-double-down"}} {{i18n 'user.expand_profile'}}
+                      {{d-icon "angle-double-down"}} {{i18n "user.expand_profile"}}
                     </a>
                   {{else}}
                     <a {{action "collapseProfile"}} href class="btn btn-default">
-                      {{d-icon "angle-double-up"}} {{i18n 'user.collapse_profile'}}
+                      {{d-icon "angle-double-up"}} {{i18n "user.collapse_profile"}}
                     </a>
                   {{/if}}
                 </li>
@@ -95,7 +95,7 @@
               <h1 class={{if nameFirst "full-name" "username"}}>{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
               <h2 class={{if nameFirst "username" "full-name"}}>{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
               {{#if model.staged}}
-                <h2 class="staged">{{i18n 'user.staged'}}</h2>
+                <h2 class="staged">{{i18n "user.staged"}}</h2>
               {{/if}}
               {{#if model.title}}
                 <h3>{{model.title}}</h3>
@@ -105,7 +105,7 @@
 
             {{#if showFeaturedTopic}}
               <h3 class="featured-topic">
-                <span>{{i18n 'user.featured_topic'}}</span>
+                <span>{{i18n "user.featured_topic"}}</span>
                 {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe (replace-emoji model.featured_topic.fancy_title)}}{{/link-to}}
               </h3>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index 809b8a1629..15ac59b652 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -1,45 +1,45 @@
 {{#d-section pageClass="user-activity" class="user-secondary-navigation" scrollTop="false"}}
-  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router._router.currentPath}}
+  {{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked" currentPath=router._router.currentPath}}
     <li>
-      {{#link-to 'userActivity.index'}}{{i18n 'user.filters.all'}}{{/link-to}}
+      {{#link-to "userActivity.index"}}{{i18n "user.filters.all"}}{{/link-to}}
     </li>
     <li>
-      {{#link-to 'userActivity.topics'}}{{i18n 'user_action_groups.4'}}{{/link-to}}
+      {{#link-to "userActivity.topics"}}{{i18n "user_action_groups.4"}}{{/link-to}}
     </li>
     <li>
-      {{#link-to 'userActivity.replies'}}{{i18n 'user_action_groups.5'}}{{/link-to}}
+      {{#link-to "userActivity.replies"}}{{i18n "user_action_groups.5"}}{{/link-to}}
     </li>
     {{#if user.showDrafts}}
       <li>
-        {{#link-to 'userActivity.drafts'}}{{i18n 'user_action_groups.15'}}{{/link-to}}
+        {{#link-to "userActivity.drafts"}}{{i18n "user_action_groups.15"}}{{/link-to}}
       </li>
     {{/if}}
     <li>
-      {{#link-to 'userActivity.likesGiven'}}{{i18n 'user_action_groups.1'}}{{/link-to}}
+      {{#link-to "userActivity.likesGiven"}}{{i18n "user_action_groups.1"}}{{/link-to}}
     </li>
     {{#if user.showBookmarks}}
       {{#if bookmarksWithRemindersEnabled}}
         <li>
-          {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+          {{#link-to "userActivity.bookmarksWithReminders"}}{{i18n "user_action_groups.3"}}{{/link-to}}
         </li>
       {{else}}
         <li>
-          {{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+          {{#link-to "userActivity.bookmarks"}}{{i18n "user_action_groups.3"}}{{/link-to}}
         </li>
       {{/if}}
     {{/if}}
     {{plugin-outlet
       name="user-activity-bottom"
-      connectorTagName='li'
+      connectorTagName="li"
       args=(hash model=model)
     }}
   {{/mobile-nav}}
 {{/d-section}}
 {{#if canDownloadPosts}}
-  <section class='user-additional-controls'>
+  <section class="user-additional-controls">
     {{d-button action=(action "exportUserArchive") class="btn-default" label="user.download_archive.button_text" icon="download"}}
   </section>
 {{/if}}
-<section class='user-content'>
+<section class="user-content">
   {{outlet}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
index 75e5b2ce10..fd6a5c5d1a 100644
--- a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
@@ -1,5 +1,5 @@
 {{#if noContent}}
-  <div class='alert alert-info'>{{noResultsHelp}}</div>
+  <div class="alert alert-info">{{noResultsHelp}}</div>
 {{else}}
   {{#conditional-loading-spinner condition=loading}}
     {{#load-more selector=".bookmark-list tr" action=(action "loadMore")}}
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 64e8d53549..41c19141fd 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -5,34 +5,34 @@
     {{/if}}
   {{/unless}}
 
-  {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=currentPath}}
+  {{#mobile-nav class="messages-nav" desktopClass="nav-stacked action-list" currentPath=currentPath}}
     <li class="noGlyph">
-      {{#link-to 'userPrivateMessages.index' model}}
-        {{i18n 'user.messages.inbox'}}
+      {{#link-to "userPrivateMessages.index" model}}
+        {{i18n "user.messages.inbox"}}
       {{/link-to}}
     </li>
     <li class="noGlyph">
-      {{#link-to 'userPrivateMessages.sent' model}}
-        {{i18n 'user.messages.sent'}}
+      {{#link-to "userPrivateMessages.sent" model}}
+        {{i18n "user.messages.sent"}}
       {{/link-to}}
     </li>
     <li class="noGlyph">
-      {{#link-to 'userPrivateMessages.archive' model}}
-        {{i18n 'user.messages.archive'}}
+      {{#link-to "userPrivateMessages.archive" model}}
+        {{i18n "user.messages.archive"}}
       {{/link-to}}
     </li>
-    {{plugin-outlet name="user-messages-nav" connectorTagName='li' args=(hash model=model)}}
+    {{plugin-outlet name="user-messages-nav" connectorTagName="li" args=(hash model=model)}}
     {{#each model.groups as |group|}}
       {{#if group.has_messages}}
         <li>
-          {{#link-to 'userPrivateMessages.group' group.name}}
+          {{#link-to "userPrivateMessages.group" group.name}}
             {{d-icon "users"}}
             {{capitalize-string group.name}}
           {{/link-to}}
         </li>
-        <li class='archive'>
-          {{#link-to 'userPrivateMessages.groupArchive' group.name}}
-            {{i18n 'user.messages.archive'}}
+        <li class="archive">
+          {{#link-to "userPrivateMessages.groupArchive" group.name}}
+            {{i18n "user.messages.archive"}}
           {{/link-to}}
         </li>
       {{/if}}
@@ -40,13 +40,13 @@
 
     {{#if pmTaggingEnabled}}
       <li class="noGlyph">
-        {{#link-to 'userPrivateMessages.tags' model}}
-          {{i18n 'user.messages.tags'}}
+        {{#link-to "userPrivateMessages.tags" model}}
+          {{i18n "user.messages.tags"}}
         {{/link-to}}
       </li>
       {{#if tagId}}
         <li class="archive">
-          {{#link-to 'userPrivateMessages.tagsShow' tagId}}
+          {{#link-to "userPrivateMessages.tagsShow" tagId}}
             {{tagId}}
           {{/link-to}}
         </li>
@@ -55,7 +55,7 @@
   {{/mobile-nav}}
 {{/d-section}}
 
-<section class='user-content'>
+<section class="user-content">
   <div class="list-actions">
     {{#unless site.mobileView}}
       {{#if showToggleBulkSelect}}
diff --git a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs
index 875153c437..a44a96e8d9 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs
@@ -1,9 +1,9 @@
 {{#if model.error}}
   <div class="item error">
     {{#if model.forbidden}}
-      {{i18n 'errors.reasons.forbidden'}}
+      {{i18n "errors.reasons.forbidden"}}
     {{else}}
-      {{i18n 'errors.desc.unknown'}}
+      {{i18n "errors.desc.unknown"}}
     {{/if}}
   </div>
 {{/if}}
@@ -12,5 +12,5 @@
   {{user-notifications-large notifications=model}}
   {{conditional-loading-spinner condition=loading}}
 {{else}}
-  <div class='alert alert-info'>{{i18n 'notifications.empty'}}</div>
+  <div class="alert alert-info">{{i18n "notifications.empty"}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index 2db8a54784..5a79a5f4c8 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -1,30 +1,30 @@
 {{#d-section pageClass="user-notifications" class="user-secondary-navigation"}}
-  {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=currentPath}}
+  {{#mobile-nav class="notifications-nav" desktopClass="notification-list action-list nav-stacked" currentPath=currentPath}}
     <li>
-      {{#link-to 'userNotifications.index'}}
-        {{i18n 'user.filters.all'}}
+      {{#link-to "userNotifications.index"}}
+        {{i18n "user.filters.all"}}
       {{/link-to}}
     </li>
     <li>
-      {{#link-to 'userNotifications.responses'}}
-        {{i18n 'user_action_groups.6'}}
+      {{#link-to "userNotifications.responses"}}
+        {{i18n "user_action_groups.6"}}
       {{/link-to}}
     </li>
     <li>
-      {{#link-to 'userNotifications.likesReceived'}}
-        {{i18n 'user_action_groups.2'}}
+      {{#link-to "userNotifications.likesReceived"}}
+        {{i18n "user_action_groups.2"}}
       {{/link-to}}
     </li>
     {{#if siteSettings.enable_mentions}}
       <li>
-        {{#link-to 'userNotifications.mentions'}}
-          {{i18n 'user_action_groups.7'}}
+        {{#link-to "userNotifications.mentions"}}
+          {{i18n "user_action_groups.7"}}
         {{/link-to}}
       </li>
     {{/if}}
     <li>
-      {{#link-to 'userNotifications.edits'}}
-        {{i18n 'user_action_groups.11'}}
+      {{#link-to "userNotifications.edits"}}
+        {{i18n "user_action_groups.11"}}
       {{/link-to}}
     </li>
   {{/mobile-nav}}
@@ -34,17 +34,17 @@
 {{#if model}}
   <section class="user-additional-controls">
     {{d-button
-      title='user.dismiss_notifications_tooltip'
-      class='btn btn-default dismiss-notifications'
+      title="user.dismiss_notifications_tooltip"
+      class="btn btn-default dismiss-notifications"
       action=(action "resetNew")
-      label='user.dismiss_notifications'
-      icon='check'
+      label="user.dismiss_notifications"
+      icon="check"
       disabled=allNotificationsRead
     }}
   </section>
 {{/if}}
 
-<section class='user-content'>
+<section class="user-content">
   {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action=(action "loadMore")}}
     {{outlet}}
     {{conditional-loading-spinner condition=model.loadingMore}}
diff --git a/app/assets/javascripts/discourse/templates/user/profile-hidden.hbs b/app/assets/javascripts/discourse/templates/user/profile-hidden.hbs
index 680e87157d..be9cdd5de7 100644
--- a/app/assets/javascripts/discourse/templates/user/profile-hidden.hbs
+++ b/app/assets/javascripts/discourse/templates/user/profile-hidden.hbs
@@ -1 +1 @@
-<p class='user-profile-hidden'>{{i18n "user.profile_hidden"}}</p>
+<p class="user-profile-hidden">{{i18n "user.profile_hidden"}}</p>
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index de791d9420..5ee2929a64 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,4 +1,4 @@
 {{#if model.noContent}}
-  <div class='alert alert-info'>{{html-safe model.noContentHelp}}</div>
+  <div class="alert alert-info">{{html-safe model.noContentHelp}}</div>
 {{/if}}
 {{user-stream stream=model}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index d28017469d..ddd89595c5 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -1,7 +1,7 @@
 {{#d-section pageClass="user-summary" tagName=""}}
   <div class="user-content">
-    <div class='top-section stats-section'>
-      <h3 class='stats-title'>{{i18n "user.summary.stats"}}</h3>
+    <div class="top-section stats-section">
+      <h3 class="stats-title">{{i18n "user.summary.stats"}}</h3>
       <ul>
         <li>
           {{user-stat value=model.days_visited label="user.summary.days_visited"}}
@@ -21,24 +21,24 @@
           {{user-stat value=model.posts_read_count label="user.summary.posts_read"}}
         </li>
         <li class="linked-stat">
-          {{#link-to 'userActivity.likesGiven'}}
+          {{#link-to "userActivity.likesGiven"}}
             {{user-stat value=model.likes_given icon="heart" label="user.summary.likes_given"}}
           {{/link-to}}
         </li>
         {{#if model.bookmark_count}}
           <li class="linked-stat">
-            {{#link-to 'userActivity.bookmarks'}}
+            {{#link-to "userActivity.bookmarks"}}
               {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
             {{/link-to}}
           </li>
         {{/if}}
         <li class="linked-stat">
-          {{#link-to 'userActivity.topics'}}
+          {{#link-to "userActivity.topics"}}
             {{user-stat value=model.topic_count label="user.summary.topic_count"}}
           {{/link-to}}
         </li>
         <li class="linked-stat">
-          {{#link-to 'userActivity.replies'}}
+          {{#link-to "userActivity.replies"}}
             {{user-stat value=model.post_count label="user.summary.post_count"}}
           {{/link-to}}
         </li>
@@ -49,7 +49,7 @@
       </ul>
     </div>
 
-    <div class='top-section'>
+    <div class="top-section">
       {{#user-summary-section title="top_replies" class="replies-section pull-left"}}
         {{#user-summary-topics-list type="replies" items=model.replies user=user as |reply|}}
           {{user-summary-topic
@@ -71,7 +71,7 @@
       {{/user-summary-section}}
     </div>
 
-    <div class='top-section'>
+    <div class="top-section">
       {{#user-summary-section title="top_links" class="links-section pull-left"}}
         {{#if model.links.length}}
           <ul>
@@ -103,7 +103,7 @@
       {{/user-summary-section}}
     </div>
 
-    <div class='top-section most-liked-section'>
+    <div class="top-section most-liked-section">
       {{#user-summary-section title="most_liked_by" class="summary-user-list liked-by-section pull-left"}}
         {{#user-summary-users-list none="no_likes" users=model.most_liked_by_users as |user|}}
           {{user-summary-user user=user icon="heart" countClass="likes"}}
@@ -118,13 +118,13 @@
     </div>
 
     {{#if model.top_categories.length}}
-      <div class='top-section top-categories-section'>
+      <div class="top-section top-categories-section">
         {{#user-summary-section title="top_categories" class="summary-category-list pull-left"}}
           <table>
             <thead>
               <th class="category-link"></th>
-              <th class='topic-count'>{{i18n "user.summary.topics"}}</th>
-              <th class='reply-count'>{{i18n "user.summary.replies"}}</th>
+              <th class="topic-count">{{i18n "user.summary.topics"}}</th>
+              <th class="reply-count">{{i18n "user.summary.replies"}}</th>
             </thead>
             <tbody>
               {{#each model.top_categories as |category|}}
@@ -132,10 +132,10 @@
                   <td class="category-link">
                     {{category-link category allowUncategorized="true" hideParent=false}}
                   </td>
-                  <td class='topic-count'>
+                  <td class="topic-count">
                     {{user-summary-category-search user=user category=category count=category.topic_count}}
                   </td>
-                  <td class='reply-count'>
+                  <td class="reply-count">
                     {{user-summary-category-search user=user category=category count=category.post_count}}
                   </td>
                 </tr>
@@ -147,8 +147,8 @@
     {{/if}}
 
     {{#if siteSettings.enable_badges}}
-      <div class='top-section badges-section'>
-        <h3 class='stats-title'>{{i18n "user.summary.top_badges"}}</h3>
+      <div class="top-section badges-section">
+        <h3 class="stats-title">{{i18n "user.summary.top_badges"}}</h3>
         {{#each model.badges as |badge|}}
           {{badge-card badge=badge count=badge.count username=user.username_lower}}
         {{else}}
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index 35e1f5d19b..cdb85f24de 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -1,13 +1,13 @@
 {{#d-section pageClass="users"}}
   {{#load-more selector=".directory tbody tr" action=(action "loadMore")}}
     <div class="container">
-      <div class='users-directory directory'>
-        {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
-        <div class='directory-controls'>
-          <div class='period-controls'>
+      <div class="users-directory directory">
+        {{plugin-outlet name="users-top" connectorTagName="div" args=(hash model=model)}}
+        <div class="directory-controls">
+          <div class="period-controls">
             {{period-chooser period=period onChange=(action (mut period)) fullDay=false}}
             {{#if lastUpdatedAt}}
-              <div class='directory-last-updated'>
+              <div class="directory-last-updated">
                 {{i18n "directory.last_updated"}}
                 {{lastUpdatedAt}}
               </div>
@@ -42,7 +42,7 @@
 
             {{conditional-loading-spinner condition=model.loadingMore}}
           {{else}}
-            <div class='clearfix'></div>
+            <div class="clearfix"></div>
             <p>{{i18n "directory.no_results"}}</p>
           {{/if}}
         {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
index 1eb83f0050..dd729183a8 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
@@ -1,4 +1,4 @@
 <div class="body">
   {{badge}}
-  {{d-icon 'times'}}
+  {{d-icon "times"}}
 </div>
diff --git a/app/assets/javascripts/wizard/templates/application.hbs b/app/assets/javascripts/wizard/templates/application.hbs
index 0f99c338ba..93ff41a860 100644
--- a/app/assets/javascripts/wizard/templates/application.hbs
+++ b/app/assets/javascripts/wizard/templates/application.hbs
@@ -2,11 +2,11 @@
   {{wizard-canvas}}
 {{/if}}
 
-<div class='wizard-column'>
-  <div class='wizard-column-contents'>
+<div class="wizard-column">
+  <div class="wizard-column-contents">
     {{outlet}}
   </div>
-  <div class='wizard-footer'>
-    <div class='discourse-logo'></div>
+  <div class="wizard-footer">
+    <div class="discourse-logo"></div>
   </div>
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
index 0c4c88a27b..15c822bcf1 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
@@ -1,5 +1,5 @@
-<span class='email'>{{user.email}}</span>
-<span class='role'>{{roleName}}</span>
+<span class="email">{{user.email}}</span>
+<span class="role">{{roleName}}</span>
 
 <button class="wizard-btn small danger remove-user" {{action removeUser user}}>
   {{d-icon "times"}}
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
index 95739573ee..1c6f780684 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
@@ -8,7 +8,7 @@
 {{/if}}
 
 <div class="new-user">
-  <div class="text-field {{if invalid 'invalid'}}">
+  <div class="text-field {{if invalid "invalid"}}">
     {{input class="invite-email wizard-focusable" value=inviteEmail placeholder="user@example.com" tabindex="9"}}
   </div>
 
diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index c3a82790be..cdd4756b35 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -1,17 +1,17 @@
-<div class='radio-area'>
+<div class="radio-area">
   <input type="radio" name={{label}} tabindex="9">
-  <span class='radio-label'>
+  <span class="radio-label">
     {{#if icon}}
       {{d-icon icon}}
     {{/if}}
     {{label}}
   </span>
   {{#if extraLabel}}
-    <span class='extra-label'>
+    <span class="extra-label">
       {{html-safe extraLabel}}
     </span>
   {{/if}}
 </div>
-<div class='radio-description'>
+<div class="radio-description">
   {{description}}
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/staff-count.hbs b/app/assets/javascripts/wizard/templates/components/staff-count.hbs
index e8f6a1f2f1..d75d67fefe 100644
--- a/app/assets/javascripts/wizard/templates/components/staff-count.hbs
+++ b/app/assets/javascripts/wizard/templates/components/staff-count.hbs
@@ -1,5 +1,5 @@
 {{#if showStaffCount}}
-  <div class='staff-count'>
+  <div class="staff-count">
     {{i18n "wizard.staff_count" count=field.value}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
index 7554473330..a33d24443f 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
@@ -2,7 +2,7 @@
   {{component previewComponent field=field fieldClass=fieldClass wizard=wizard}}
 {{/if}}
 
-<label class="wizard-btn wizard-btn-upload {{if uploading 'disabled'}}">
+<label class="wizard-btn wizard-btn-upload {{if uploading "disabled"}}">
   {{#if uploading}}
     {{i18n "wizard.uploading"}}
   {{else}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
index 7510570b5d..86745dc9fe 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
@@ -1,15 +1,15 @@
 <label for={{field.id}}>
-  <span class='label-value'>{{field.label}}</span>
+  <span class="label-value">{{field.label}}</span>
 
   {{#if field.description}}
-    <div class='field-description'>{{html-safe field.description}}</div>
+    <div class="field-description">{{html-safe field.description}}</div>
   {{/if}}
 </label>
 
-<div class='input-area'>
+<div class="input-area">
   {{component inputComponentName field=field step=step fieldClass=fieldClass wizard=wizard}}
 </div>
 
 {{#if field.errorDescription}}
-  <div class='field-error-description'>{{html-safe field.errorDescription}}</div>
+  <div class="field-error-description">{{html-safe field.errorDescription}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 67f9b50e5f..1f0b84a857 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -1,6 +1,6 @@
-<div class='wizard-step-contents'>
+<div class="wizard-step-contents">
   {{#if step.title}}
-    <h1 class='wizard-step-title'>{{step.title}}</h1>
+    <h1 class="wizard-step-title">{{step.title}}</h1>
   {{/if}}
 
   <div class={{bannerAndDescriptionClass}}>
@@ -9,7 +9,7 @@
     {{/if}}
 
     {{#if step.description}}
-      <p class='wizard-step-description'>{{html-safe step.description}}</p>
+      <p class="wizard-step-description">{{html-safe step.description}}</p>
     {{/if}}
   </div>
 
@@ -20,39 +20,39 @@
   {{/wizard-step-form}}
 </div>
 
-<div class='wizard-step-footer'>
+<div class="wizard-step-footer">
 
-  <div class='wizard-progress'>
-    <div class='white'></div>
-    <div class='black' style={{barStyle}}></div>
-    <div class='screen'></div>
+  <div class="wizard-progress">
+    <div class="white"></div>
+    <div style={{barStyle}} class="black"></div>
+    <div class="screen"></div>
     <span>{{bound-i18n "wizard.step" current=step.displayIndex total=wizard.totalSteps}}</span>
   </div>
 
-  <div class='wizard-buttons'>
+  <div class="wizard-buttons">
     {{#if showQuitButton}}
-      <a href {{action "quit"}} class='action-link quit' tabindex="11">{{i18n "wizard.quit"}}</a>
+      <a href {{action "quit"}} tabindex="11" class="action-link quit">{{i18n "wizard.quit"}}</a>
     {{/if}}
 
     {{#if showFinishButton}}
-      <button class='wizard-btn finish' {{action "exitEarly"}} disabled={{saving}} tabindex="10">
+      <button {{action "exitEarly"}} disabled={{saving}} tabindex="10" class="wizard-btn finish">
         {{i18n "wizard.finish"}}
       </button>
     {{/if}}
 
     {{#if showBackButton}}
-      <a href {{action "backStep"}} class='action-link back' tabindex="11">{{i18n "wizard.back"}}</a>
+      <a href {{action "backStep"}} tabindex="11" class="action-link back">{{i18n "wizard.back"}}</a>
     {{/if}}
 
     {{#if showNextButton}}
-      <button class='wizard-btn next primary' {{action "nextStep"}} disabled={{saving}} tabindex="10">
+      <button {{action "nextStep"}} disabled={{saving}} tabindex="10" class="wizard-btn next primary">
         {{i18n "wizard.next"}}
         {{d-icon "chevron-right"}}
       </button>
     {{/if}}
 
     {{#if showDoneButton}}
-      <button class='wizard-btn done' {{action "quit"}} disabled={{saving}} tabindex="10">
+      <button {{action "quit"}} disabled={{saving}} tabindex="10" class="wizard-btn done">
         {{i18n "wizard.done"}}
       </button>
     {{/if}}

From fffbb30ba416003797a558abbd560b5f6038116b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 14 Apr 2020 08:21:13 +0200
Subject: [PATCH 511/633] DEV: hides double quotes lint changes from git blame
 (#9420)

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 5fac6c2850..15d8c36a8a 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -37,3 +37,6 @@ aabeb17aab4e73de5ef56753ab22ef5d416d2932
 
 # DEV: enforces block-indentation of ember-template-lint rules
 b66b277dc44bcd2122dc21965dab209c30636214
+
+# DEV: enforces double quotes ember-template-lint
+c4644c61d97c823b7dd940ffaf0967a104f4b58c

From 2aaf5cb2b827a06443f87c6415896e65ed8e2e47 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 14 Apr 2020 17:28:51 +1000
Subject: [PATCH 512/633] FEATURE: Extend bookmark cutoff time for "Later
 Today" to 5pm (#9419)

* Extend cutoff time for "Later Today" to 5pm

* users can now use the Later Today option up until 5PM
* the time for later today maxes out at 6pm, so any time
  it is used after 3pm it is maxed to 6pm
* round to hour instead of half-hour for Later Today as well

* Rounding time bugfix
---
 .../discourse/controllers/bookmark.js         |  8 ++-
 test/javascripts/controllers/bookmark-test.js | 67 +++++++++++++++++--
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index ebd999874d..88ed8e00f2 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -19,6 +19,7 @@ import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 const GLOBAL_SHORTCUTS_TO_PAUSE = ["c", "r", "l", "d", "t"];
 const START_OF_DAY_HOUR = 8;
 const LATER_TODAY_CUTOFF_HOUR = 17;
+const LATER_TODAY_MAX_HOUR = 18;
 const REMINDER_TYPES = {
   AT_DESKTOP: "at_desktop",
   LATER_TODAY: "later_today",
@@ -172,7 +173,7 @@ export default Controller.extend(ModalFunctionality, {
     let later = this.laterToday();
     return (
       !later.isSame(this.tomorrow(), "date") &&
-      later.hour() <= LATER_TODAY_CUTOFF_HOUR
+      this.now().hour() < LATER_TODAY_CUTOFF_HOUR
     );
   },
 
@@ -340,8 +341,11 @@ export default Controller.extend(ModalFunctionality, {
 
   laterToday() {
     let later = this.now().add(3, "hours");
+    if (later.hour() >= LATER_TODAY_MAX_HOUR) {
+      return later.hour(LATER_TODAY_MAX_HOUR).startOf("hour");
+    }
     return later.minutes() < 30
-      ? later.minutes(30)
+      ? later.startOf("hour")
       : later.add(30, "minutes").startOf("hour");
   },
 
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js
index 84d323d382..756e91d672 100644
--- a/test/javascripts/controllers/bookmark-test.js
+++ b/test/javascripts/controllers/bookmark-test.js
@@ -1,10 +1,12 @@
 import { logIn } from "helpers/qunit-helpers";
 import User from "discourse/models/user";
+import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";
 let BookmarkController;
 
 moduleFor("controller:bookmark", {
   beforeEach() {
     logIn();
+    KeyboardShortcutInitializer.initialize(Discourse.__container__);
     BookmarkController = this.subject({ currentUser: User.current() });
     BookmarkController.onShow();
   },
@@ -27,8 +29,18 @@ QUnit.test("showLaterToday when later today is tomorrow do not show", function(
   assert.equal(BookmarkController.get("showLaterToday"), false);
 });
 
-QUnit.test("showLaterToday when later today is after 5pm", function(assert) {
-  mockMomentTz("2019-12-11T15:00:00");
+QUnit.test(
+  "showLaterToday when later today is after 5pm but before 6pm",
+  function(assert) {
+    mockMomentTz("2019-12-11T15:00:00");
+    assert.equal(BookmarkController.get("showLaterToday"), true);
+  }
+);
+
+QUnit.test("showLaterToday when now is after the cutoff time (5pm)", function(
+  assert
+) {
+  mockMomentTz("2019-12-11T17:00:00");
   assert.equal(BookmarkController.get("showLaterToday"), false);
 });
 
@@ -112,13 +124,13 @@ QUnit.test(
 );
 
 QUnit.test(
-  "laterToday gets 3 hours from now and if before half-past, it sets the time to half-past",
+  "laterToday gets 3 hours from now and if before half-past, it rounds down",
   function(assert) {
     mockMomentTz("2019-12-11T08:13:00");
 
     assert.equal(
       BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
-      "2019-12-11 11:30:00"
+      "2019-12-11 11:00:00"
     );
   }
 );
@@ -135,6 +147,53 @@ QUnit.test(
   }
 );
 
+QUnit.test(
+  "laterToday is capped to 6pm. later today at 3pm = 6pm, 3:30pm = 6pm, 4pm = 6pm, 4:59pm = 6pm",
+  function(assert) {
+    mockMomentTz("2019-12-11T15:00:00");
+
+    assert.equal(
+      BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 18:00:00",
+      "3pm should max to 6pm"
+    );
+
+    mockMomentTz("2019-12-11T15:31:00");
+
+    assert.equal(
+      BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 18:00:00",
+      "3:30pm should max to 6pm"
+    );
+
+    mockMomentTz("2019-12-11T16:00:00");
+
+    assert.equal(
+      BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 18:00:00",
+      "4pm should max to 6pm"
+    );
+
+    mockMomentTz("2019-12-11T16:59:00");
+
+    assert.equal(
+      BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 18:00:00",
+      "4:59pm should max to 6pm"
+    );
+  }
+);
+
+QUnit.test("showLaterToday returns false if >= 5PM", function(assert) {
+  mockMomentTz("2019-12-11T17:00:01");
+  assert.equal(BookmarkController.showLaterToday, false);
+});
+
+QUnit.test("showLaterToday returns false if >= 5PM", function(assert) {
+  mockMomentTz("2019-12-11T17:00:01");
+  assert.equal(BookmarkController.showLaterToday, false);
+});
+
 QUnit.test(
   "reminderAt - custom - defaults to 8:00am if the time is not selected",
   function(assert) {

From f07c4a781c6c054e5d2dc05ab6c0fd0b6cbb0645 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 14 Apr 2020 09:17:00 -0500
Subject: [PATCH 513/633] DEV: Add options to theme install rake task - more
 options (#9394)

---
 app/services/themes_install_task.rb |  44 ++++---
 lib/tasks/themes.rake               |  43 ++++---
 spec/services/themes_spec.rb        | 171 +++++++++++++++++++---------
 3 files changed, 171 insertions(+), 87 deletions(-)

diff --git a/app/services/themes_install_task.rb b/app/services/themes_install_task.rb
index 8466e7b8cb..36ece33dea 100644
--- a/app/services/themes_install_task.rb
+++ b/app/services/themes_install_task.rb
@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
 class ThemesInstallTask
-  def self.install(yml)
-    counts = { installed: 0, updated: 0, skipped: 0, errors: 0 }
+  def self.install(themes)
+    counts = { installed: 0, updated: 0, errors: 0 }
     log = []
-    themes = YAML::load(yml)
-    themes.each do |theme|
-      name = theme[0]
-      val = theme[1]
+    themes.each do |name, val|
       installer = new(val)
+      next if installer.url.nil?
 
       if installer.theme_exists?
-        log << "#{name}: is already installed"
-        counts[:skipped] += 1
+        installer.update
+        log << "#{name}: is already installed. Updating from remote."
+        counts[:updated] += 1
       else
         begin
           installer.install
@@ -32,7 +31,8 @@ class ThemesInstallTask
 
   def initialize(url_or_options = nil)
     if url_or_options.is_a?(Hash)
-      @url = url_or_options.fetch("url")
+      url_or_options.deep_symbolize_keys!
+      @url = url_or_options.fetch(:url, nil)
       @options = url_or_options
     else
       @url = url_or_options
@@ -41,14 +41,28 @@ class ThemesInstallTask
   end
 
   def theme_exists?
-    RemoteTheme
-      .where(remote_url: url)
-      .where(branch: options.fetch("branch", nil))
-      .exists?
+    @remote_theme = RemoteTheme.find_by(remote_url: @url, branch: @options.fetch(:branch, nil))
+    @theme = @remote_theme&.theme
+    @theme.present?
   end
 
   def install
-    theme = RemoteTheme.import_theme(url, Discourse.system_user, private_key: options["private_key"], branch: options["branch"])
-    theme.set_default! if options.fetch("default", false)
+    @theme = RemoteTheme.import_theme(@url, Discourse.system_user, private_key: @options[:private_key], branch: @options[:branch])
+    @theme.set_default! if @options.fetch(:default, false)
+    add_component_to_all_themes
+  end
+
+  def update
+    @remote_theme.update_from_remote
+    add_component_to_all_themes
+  end
+
+  def add_component_to_all_themes
+    return if (!@options.fetch(:add_to_all_themes, false) || !@theme.component)
+
+    Theme.where(component: false).each do |parent_theme|
+      next if ChildTheme.where(parent_theme_id: parent_theme.id, child_theme_id: @theme.id).exists?
+      parent_theme.add_relative_theme!(:child, @theme)
+    end
   end
 end
diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake
index bce21369d2..8a90196faf 100644
--- a/lib/tasks/themes.rake
+++ b/lib/tasks/themes.rake
@@ -2,31 +2,41 @@
 
 require 'yaml'
 
-# == YAML file format
 #
 # 2 different formats are accepted:
 #
+# == JSON format
+#
+# bin/rake themes:install -- '--{"discourse-something": "https://github.com/discourse/discourse-something"}'
+# OR
+# bin/rake themes:install -- '--{"discourse-something": {"url": "https://github.com/discourse/discourse-something", default: true}}'
+#
+# == YAML file formats
+#
 # theme_name: https://github.com/example/theme.git
-#
+# OR
 # theme_name:
-#   url: https://github.com/example/theme.git
-#   branch: abc
-#   private_key: ...
-#   default: true
+#   url: https://github.com/example/theme_name.git
+#   branch: "master"
+#   private_key: ""
+#   default: false
+#   add_to_all_themes: false  # only for components - install on every theme
 #
-# In the second form, only the url is required.
+# In the first form, only the url is required.
 #
 desc "Install themes & theme components"
-task "themes:install" => :environment do
-  yml = (STDIN.tty?) ? '' : STDIN.read
-  if yml == ''
-    puts
-    puts "Please specify a themes yml file"
-    puts "Example: rake themes:install < themes.yml"
-    exit 1
-  end
+task "themes:install" => :environment do |task, args|
+  theme_args = (STDIN.tty?) ? '' : STDIN.read
+  use_json = theme_args == ''
 
-  log, counts = ThemesInstallTask.install(yml)
+  theme_args = begin
+                 use_json ? JSON.parse(ARGV.last.gsub('--', '')) : YAML::load(theme_args)
+               rescue
+                 puts use_json ? "Invalid JSON input. \n#{ARGV.last}" : "Invalid YML: \n#{theme_args}"
+                 exit 1
+               end
+
+  log, counts = ThemesInstallTask.install(theme_args)
 
   puts log
 
@@ -34,7 +44,6 @@ task "themes:install" => :environment do
   puts "Results:"
   puts " Installed: #{counts[:installed]}"
   puts " Updated:   #{counts[:updated]}"
-  puts " Skipped:   #{counts[:skipped]}"
   puts " Errors:    #{counts[:errors]}"
 
   if counts[:errors] > 0
diff --git a/spec/services/themes_spec.rb b/spec/services/themes_spec.rb
index cabf942df1..2410a5e04c 100644
--- a/spec/services/themes_spec.rb
+++ b/spec/services/themes_spec.rb
@@ -8,75 +8,136 @@ describe ThemesInstallTask do
     Discourse::Application.load_tasks
   end
 
-  let(:github_repo) { 'https://github.com/example/theme.git' }
-  let(:branch) { 'master' }
-
   describe '.new' do
-    context 'with url' do
-      subject { described_class.new(github_repo) }
-
-      it 'configures the url' do
-        expect(subject.url).to eq github_repo
+    def setup_git_repo(files)
+      dir = Dir.tmpdir
+      repo_dir = "#{dir}/#{SecureRandom.hex}"
+      `mkdir #{repo_dir}`
+      `cd #{repo_dir} && git init . `
+      `cd #{repo_dir} && git config user.email 'someone@cool.com'`
+      `cd #{repo_dir} && git config user.name 'The Cool One'`
+      `cd #{repo_dir} && git config commit.gpgsign 'false'`
+      files.each do |name, data|
+        FileUtils.mkdir_p(Pathname.new("#{repo_dir}/#{name}").dirname)
+        File.write("#{repo_dir}/#{name}", data)
+        `cd #{repo_dir} && git add #{name}`
       end
+      `cd #{repo_dir} && git commit -am 'first commit'`
+      repo_dir
+    end
 
-      it 'initializes without options' do
-        expect(subject.options).to eq({})
+    THEME_NAME = "awesome theme"
+
+    def about_json(love_color: "FAFAFA", tertiary_low_color: "FFFFFF", color_scheme_name: "Amazing", about_url: "https://www.site.com/about", component: false)
+      <<~JSON
+        {
+          "name": "#{THEME_NAME}",
+          "about_url": "#{about_url}",
+          "license_url": "https://www.site.com/license",
+          "theme_version": "1.0",
+          "minimum_discourse_version": "1.0.0",
+          "assets": {
+            "font": "assets/font.woff2"
+          },
+          "component": "#{component}",
+          "color_schemes": {
+            "#{color_scheme_name}": {
+              "love": "#{love_color}",
+              "tertiary-low": "#{tertiary_low_color}"
+            }
+          },
+          "modifiers": {
+            "serialize_topic_excerpts": true
+          }
+        }
+      JSON
+    end
+
+    let :scss_data do
+      "@font-face { font-family: magic; src: url($font)}; body {color: $color; content: $name;}"
+    end
+
+    let :theme_repo do
+      setup_git_repo(
+        "about.json" => about_json,
+        "desktop/desktop.scss" => scss_data,
+        "scss/oldpath.scss" => ".class2{color:blue}",
+        "stylesheets/file.scss" => ".class1{color:red}",
+        "stylesheets/empty.scss" => "",
+        "javascripts/discourse/controllers/test.js.es6" => "console.log('test');",
+        "common/header.html" => "I AM HEADER",
+        "common/random.html" => "I AM SILLY",
+        "common/embedded.scss" => "EMBED",
+        "assets/font.woff2" => "FAKE FONT",
+        "settings.yaml" => "boolean_setting: true",
+        "locales/en.yml" => "sometranslations"
+      )
+    end
+
+    let :component_repo do
+      setup_git_repo(
+        "about.json" => about_json(component: true),
+        "desktop/desktop.scss" => scss_data,
+        "scss/oldpath.scss" => ".class2{color:blue}",
+        "stylesheets/file.scss" => ".class1{color:red}",
+        "stylesheets/empty.scss" => "",
+        "javascripts/discourse/controllers/test.js.es6" => "console.log('test');",
+        "common/header.html" => "I AM HEADER",
+        "common/random.html" => "I AM SILLY",
+        "common/embedded.scss" => "EMBED",
+        "assets/font.woff2" => "FAKE FONT",
+        "settings.yaml" => "boolean_setting: true",
+        "locales/en.yml" => "sometranslations"
+      )
+    end
+
+    after do
+      `rm -fr #{theme_repo}`
+      `rm -fr #{component_repo}`
+    end
+
+    it 'gracefully fails' do
+      ThemesInstallTask.install("nothing": "fail!")
+      expect(Theme.where(name: "fail!").exists?).to eq(false)
+    end
+
+    describe "no options" do
+      it 'installs a theme' do
+        ThemesInstallTask.install("some_theme": theme_repo)
+        expect(Theme.where(name: THEME_NAME).exists?).to eq(true)
       end
     end
 
-    context 'with options' do
-      subject { described_class.new(options) }
-      let(:options) { { 'url' => github_repo, 'branch' => branch } }
-
-      it 'configures the url' do
-        expect(subject.url).to eq github_repo
+    describe "with options" do
+      it 'installs a theme from only a url' do
+        ThemesInstallTask.install({ "some_theme": { "url": theme_repo } })
+        expect(Theme.where(name: THEME_NAME).exists?).to eq(true)
       end
 
-      it 'initializes options' do
-        expect(subject.options).to eq("url" => github_repo, "branch" => branch)
-      end
-    end
-  end
-
-  describe '#theme_exists?' do
-    let(:theme) { Fabricate(:theme) }
-    subject { described_class.new(options) }
-
-    context 'without branch' do
-      let(:options) { github_repo }
-
-      it 'returns true when a branchless theme exists' do
-        theme.create_remote_theme(remote_url: github_repo)
-        expect(subject.theme_exists?).to be true
+      it 'does not set the theme to default if the key/value is not present' do
+        ThemesInstallTask.install({ "some_theme": { "url": theme_repo } })
+        theme = Theme.find_by(name: THEME_NAME)
+        expect(theme.default?).to eq(false)
       end
 
-      it 'returns false when the url exists but with a branch' do
-        theme.create_remote_theme(remote_url: github_repo, branch: branch)
-        expect(subject.theme_exists?).to be false
+      it 'sets the theme to default if the key/value is true' do
+        ThemesInstallTask.install({ "some_theme": { "url": theme_repo, default: true } })
+        theme = Theme.find_by(name: THEME_NAME)
+        expect(theme.default?).to eq(true)
       end
 
-      it 'returns false when it doesnt exist' do
-        theme.create_remote_theme(remote_url: 'https://github.com/example/different_theme.git')
-        expect(subject.theme_exists?).to be false
-      end
-    end
-
-    context 'with branch' do
-      let(:options) { { 'url' => github_repo, 'branch' => branch } }
-
-      it 'returns false when a branchless theme exists' do
-        theme.create_remote_theme(remote_url: github_repo)
-        expect(subject.theme_exists?).to be false
+      it 'installs theme components, but does not add them to themes' do
+        ThemesInstallTask.install({ "some_theme": { "url": component_repo } })
+        theme = Theme.find_by(name: THEME_NAME)
+        expect(theme.component).to eq(true)
       end
 
-      it 'returns true when the url exists with a branch' do
-        theme.create_remote_theme(remote_url: github_repo, branch: branch)
-        expect(subject.theme_exists?).to be true
-      end
-
-      it 'returns false when it doesnt exist' do
-        theme.create_remote_theme(remote_url: 'https://github.com/example/different_theme.git')
-        expect(subject.theme_exists?).to be false
+      it 'adds component to all themes if "add_to_all_themes" is true' do
+        ThemesInstallTask.install({ "some_theme": { "url": component_repo, add_to_all_themes: true } })
+        theme = Theme.find_by(name: THEME_NAME)
+        Theme.where(component: false).each do |parent_theme|
+          expect(ChildTheme.find_by(parent_theme_id: parent_theme.id, child_theme_id: theme.id).nil?).to eq(false)
+        end
       end
     end
   end

From d9db0e6691d149b98548c42746986e95f72409a4 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 14 Apr 2020 16:43:57 +0200
Subject: [PATCH 514/633] FIX: allows custom groups updates to be reflected
 without recompilation (#9421)

---
 .../discourse/components/emoji-picker.js      | 52 +++++------
 .../templates/components/emoji-picker.hbs     |  2 -
 .../templates/components/emoji-picker.hbs.erb | 88 +++++++++++++++++++
 .../discourse/templates/emoji-picker.hbr.erb  | 81 -----------------
 app/assets/stylesheets/common/base/emoji.scss |  7 ++
 .../acceptance/emoji-picker-test.js           |  4 +-
 6 files changed, 121 insertions(+), 113 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
 create mode 100644 app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
 delete mode 100644 app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb

diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js b/app/assets/javascripts/discourse/components/emoji-picker.js
index ef56c4182a..88b7599324 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js
@@ -1,4 +1,5 @@
 import { inject as service } from "@ember/service";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "discourse-common/utils/decorators";
 import { findRawTemplate } from "discourse/lib/raw-templates";
@@ -16,23 +17,16 @@ const { run } = Ember;
 const PER_ROW = 11;
 function customEmojis() {
   const list = extendedEmojiList();
-  const emojis = Object.keys(list)
-    .map(code => {
-      const { group } = list[code];
-      return {
-        code,
-        src: emojiUrlFor(code),
-        group,
-        key: `emoji_picker.${group || "default"}`
-      };
-    })
-    .reduce((acc, curr) => {
-      if (!acc[curr.group]) acc[curr.group] = [];
-      acc[curr.group].push(curr);
-      return acc;
-    }, {});
-
-  return Object.values(emojis);
+  const groups = [];
+  Object.keys(list).forEach(code => {
+    const emoji = list[code];
+    groups[emoji.group] = groups[emoji.group] || [];
+    groups[emoji.group].push({
+      code,
+      src: emojiUrlFor(code)
+    });
+  });
+  return groups;
 }
 
 export default Component.extend({
@@ -42,9 +36,8 @@ export default Component.extend({
   close() {
     this._unbindEvents();
 
-    this.$picker
-      .css({ width: "", left: "", bottom: "", display: "none" })
-      .empty();
+    this.$picker &&
+      this.$picker.css({ width: "", left: "", bottom: "", display: "none" });
 
     this.$modal.removeClass("fadeIn");
 
@@ -52,11 +45,6 @@ export default Component.extend({
   },
 
   show() {
-    const template = findRawTemplate("emoji-picker")({
-      customEmojis: customEmojis()
-    });
-    this.$picker.html(template);
-
     this.$filter = this.$picker.find(".filter");
     this.$results = this.$picker.find(".results");
     this.$list = this.$picker.find(".list");
@@ -84,6 +72,7 @@ export default Component.extend({
 
   @on("init")
   _setInitialValues() {
+    this.set("customEmojis", customEmojis());
     this._checkTimeout = null;
     this.scrollPosition = 0;
     this.$visibleSections = [];
@@ -100,14 +89,21 @@ export default Component.extend({
 
   @on("didInsertElement")
   _setup() {
-    this.$picker = $(this.element.querySelector(".emoji-picker"));
-    this.$modal = $(this.element.querySelector(".emoji-picker-modal"));
     this.appEvents.on("emoji-picker:close", this, "_closeEmojiPicker");
   },
 
   @on("didUpdateAttrs")
   _setState() {
-    this.active ? this.show() : this.close();
+    schedule("afterRender", () => {
+      if (!this.element) {
+        return;
+      }
+
+      this.$picker = $(this.element.querySelector(".emoji-picker"));
+      this.$modal = $(this.element.querySelector(".emoji-picker-modal"));
+
+      this.active ? this.show() : this.close();
+    });
   },
 
   @observes("filter")
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
deleted file mode 100644
index 7f7490eef7..0000000000
--- a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="emoji-picker"></div>
-<div class="emoji-picker-modal"></div>
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
new file mode 100644
index 0000000000..f3504d33f0
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
@@ -0,0 +1,88 @@
+<div class="emoji-picker">
+  {{#if active}}
+    <div class='categories-column'>
+      <div class='category-icon'>
+        <button type="button" class="emoji" tabindex="-1" title="{{i18n 'emoji_picker.recent'}}" data-section="recent" data-tabicon="star"></button>
+      </div>
+
+      <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
+        <div class='category-icon'>
+        <button type="button" class="emoji" tabindex="-1" data-tabicon="<%= group["tabicon"] %>" data-section="<%= group["name"] %>" title="{{i18n '<%= "emoji_picker.#{group["name"]}" %>'}}"></button>
+        </div>
+      <% end %>
+
+      {{#each-in customEmojis as |group emojis|}}
+        <div class='category-icon'>
+          <button data-tabicon={{emojis.firstObject.code}} type="button" class="emoji" tabindex="-1" data-section="custom-{{group}}" title="{{i18n (concat 'emoji_picker.' group)}}"></button>
+        </div>
+      {{/each-in}}
+    </div>
+
+    <div class='main-column'>
+      <div class='filter'>
+        {{d-icon 'search'}}
+        <input type='text' name="filter" placeholder="{{i18n 'emoji_picker.filter_placeholder'}}" autocomplete="discourse"/>
+        <button class='clear-filter'>
+          {{d-icon 'times'}}
+        </button>
+      </div>
+
+      <div class='results'></div>
+
+      <div class='list'>
+        <div class='section' data-section='recent'>
+          <div class='section-header'>
+            <span class="title">{{i18n 'emoji_picker.recent'}}</span>
+            <a href='#' class='clear-recent'>{{d-icon "trash-alt"}}</a>
+          </div>
+          <div class='section-group'></div>
+        </div>
+
+        <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
+          <div class='section' data-section='<%= group["name"] %>'>
+            <div class='section-header'>
+              <span class="title">{{i18n 'emoji_picker.<%= group["name"] %>'}}</span>
+            </div>
+            <div class='section-group'>
+              <% group["icons"].each  do |icon| %>
+                <button type="button" class="emoji <%= "diversity" if icon["diversity"] %>" tabindex="-1" title="<%= icon['name']%>"></button>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+
+        {{#each-in customEmojis as |group emojis|}}
+          <div class='section' data-section='custom-{{group}}'>
+            <div class='section-header'>
+              <span class="title">
+                {{i18n (concat 'emoji_picker.' group)}}
+              </span>
+            </div>
+            {{#if emojis.length}}
+              <div class='section-group'>
+                {{#each emojis as |emoji|}}
+                  <button type="button" class="emoji" tabindex="-1" title=":{{emoji.code}}:">
+                    <img loading="lazy" class="emoji" src="{{emoji.src}}">
+                  </button>
+                {{/each}}
+              </div>
+            {{/if}}
+          </div>
+        {{/each-in}}
+      </div>
+
+      <div class='footer'>
+        <div class='info'></div>
+        <div class='diversity-picker'>
+          <% ['default', 'light', 'medium-light', 'medium', 'medium-dark', 'dark'].each.with_index do |diversity, index| %>
+            <a href='#' title="{{i18n 'emoji_picker.<%= diversity.gsub('-', '_') %>_tone'}}" class='diversity-scale <%= diversity %>' data-level="<%= index + 1 %>">
+              {{d-icon "check"}}
+            </a>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  {{/if}}
+</div>
+
+<div class="emoji-picker-modal"></div>
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb b/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb
deleted file mode 100644
index 5a33352165..0000000000
--- a/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb
+++ /dev/null
@@ -1,81 +0,0 @@
-<div class='categories-column'>
-  <div class='category-icon'>
-    <button type="button" class="emoji" tabindex="-1" title="{{i18n 'emoji_picker.recent'}}" data-section="recent" data-tabicon="star"></button>
-  </div>
-
-  <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
-    <div class='category-icon'>
-    <button type="button" class="emoji" tabindex="-1" data-tabicon="<%= group["tabicon"] %>" data-section="<%= group["name"] %>" title="{{i18n '<%= "emoji_picker.#{group["name"]}" %>'}}"></button>
-    </div>
-  <% end %>
-
-  <% Emoji.custom.group_by { |emoji| emoji.group }.each do |group, emojis| %>
-    <% if emojis.present? %>
-      <div class='category-icon'>
-        <button data-tabicon="<%= emojis.first.name %>" type="button" class="emoji" tabindex="-1" data-section="custom-<%= group %>" title="{{i18n 'emoji_picker.<%= group %>'}}"></button>
-      </div>
-    <% end %>
-  <% end %>
-</div>
-
-<div class='main-column'>
-  <div class='filter'>
-    {{d-icon 'search'}}
-    <input type='text' name="filter" placeholder="{{i18n 'emoji_picker.filter_placeholder'}}" autocomplete="discourse"/>
-    <button class='clear-filter'>
-      {{d-icon 'times'}}
-    </button>
-  </div>
-
-  <div class='results'></div>
-
-  <div class='list'>
-    <div class='section' data-section='recent'>
-      <div class='section-header'>
-        <span class="title">{{i18n 'emoji_picker.recent'}}</span>
-        <a href='#' class='clear-recent'>{{d-icon "trash-alt"}}</a>
-      </div>
-      <div class='section-group'></div>
-    </div>
-
-    <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
-      <div class='section' data-section='<%= group["name"] %>'>
-        <div class='section-header'>
-          <span class="title">{{i18n 'emoji_picker.<%= group["name"] %>'}}</span>
-        </div>
-        <div class='section-group'>
-          <% group["icons"].each  do |icon| %>
-            <button type="button" class="emoji <%= "diversity" if icon["diversity"] %>" tabindex="-1" title="<%= icon['name']%>"></button>
-          <% end %>
-        </div>
-      </div>
-    <% end %>
-
-    {{#each customEmojis as |emojis|}}
-      {{#if emojis.length}}
-        <div class='section' data-section='custom-{{emojis.firstObject.group}}'>
-          <div class='section-header'>
-            <span class="title">
-              {{i18n emojis.firstObject.key}}
-            </span>
-          </div>
-          <div class='section-group'>
-            {{#each emojis as |emoji|}}
-              <button style="background-url: url("{{emoji.src}}")" type="button" class="emoji" tabindex="-1" title="{{emoji.code}}"></button>
-            {{/each}}
-          </div>
-        </div>
-      {{/if}}
-    {{/each}}
-  </div>
-  <div class='footer'>
-    <div class='info'></div>
-    <div class='diversity-picker'>
-      <% ['default', 'light', 'medium-light', 'medium', 'medium-dark', 'dark'].each.with_index do |diversity, index| %>
-        <a href='#' title="{{i18n 'emoji_picker.<%= diversity.gsub('-', '_') %>_tone'}}" class='diversity-scale <%= diversity %>' data-level="<%= index + 1 %>">
-          {{d-icon "check"}}
-        </a>
-      <% end %>
-    </div>
-  </div>
-</div>
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index b4c2098104..8517597c37 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -35,6 +35,13 @@ sup img.emoji {
   color: $primary;
   background-color: $secondary;
   border: 1px solid $primary-low;
+
+  img.emoji {
+    // custom emojis might import images of various sizes
+    // we don't want the picker to be difformed
+    width: 20px !important;
+    height: 20px !important;
+  }
 }
 
 .emoji-picker .categories-column {
diff --git a/test/javascripts/acceptance/emoji-picker-test.js b/test/javascripts/acceptance/emoji-picker-test.js
index fac37414a6..6a4922ed5c 100644
--- a/test/javascripts/acceptance/emoji-picker-test.js
+++ b/test/javascripts/acceptance/emoji-picker-test.js
@@ -22,7 +22,7 @@ QUnit.test("emoji picker can be opened/closed", async assert => {
     find(".emoji-picker")
       .html()
       .trim(),
-    "",
+    "<!---->",
     "it opens the picker"
   );
 
@@ -31,7 +31,7 @@ QUnit.test("emoji picker can be opened/closed", async assert => {
     find(".emoji-picker")
       .html()
       .trim(),
-    "",
+    "<!---->",
     "it closes the picker"
   );
 });

From e3590d4eada9f15c72b3f789370d0b4e2021f54e Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 14 Apr 2020 06:32:24 -1000
Subject: [PATCH 515/633] FEATURE: add user_session_refreshed trigger (#9412)

Trigger an event for plugins to consume when a user session is refreshed.

This allows external auth to be notified about account activity, and be
able to take action such as use oauth refresh tokens to keep oauth
tokens valid.
---
 lib/auth/default_current_user_provider.rb     |  1 +
 .../default_current_user_provider_spec.rb     | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index fc7f850026..acd9381771 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -148,6 +148,7 @@ class Auth::DefaultCurrentUserProvider
                                client_ip: @request.ip,
                                path: @env['REQUEST_PATH'])
           cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token)
+          DiscourseEvent.trigger(:user_session_refreshed, user)
         end
       end
     end
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 621ece61e0..ab4fa86369 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -595,6 +595,43 @@ describe Auth::DefaultCurrentUserProvider do
 
   end
 
+  context "events" do
+    before do
+      @refreshes = 0
+
+      @increase_refreshes = -> (user) { @refreshes += 1 }
+      DiscourseEvent.on(:user_session_refreshed, &@increase_refreshes)
+    end
+
+    after do
+      DiscourseEvent.off(:user_session_refreshed, &@increase_refreshes)
+    end
+
+    it "fires event when updating last seen" do
+      user = Fabricate(:user)
+      @provider = provider('/')
+      cookies = {}
+      @provider.log_on_user(user, {}, cookies)
+      unhashed_token = cookies["_t"][:value]
+      freeze_time 20.minutes.from_now
+      provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}")
+      provider2.refresh_session(user, {}, {})
+      expect(@refreshes).to eq(1)
+    end
+
+    it "does not fire an event when last seen does not update" do
+      user = Fabricate(:user)
+      @provider = provider('/')
+      cookies = {}
+      @provider.log_on_user(user, {}, cookies)
+      unhashed_token = cookies["_t"][:value]
+      freeze_time 2.minutes.from_now
+      provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}")
+      provider2.refresh_session(user, {}, {})
+      expect(@refreshes).to eq(0)
+    end
+  end
+
   context "rate limiting" do
 
     before do

From 6023ea197909c42f4fb4c21ff1dcda3be90a161f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 14 Apr 2020 18:45:40 +0200
Subject: [PATCH 516/633] DEV: pass widget back when cleaning up stream (#9422)

---
 app/assets/javascripts/discourse/components/mount-widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/mount-widget.js b/app/assets/javascripts/discourse/components/mount-widget.js
index dc1eb2e166..3701b32d00 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js
+++ b/app/assets/javascripts/discourse/components/mount-widget.js
@@ -58,7 +58,7 @@ export default Component.extend({
   willClearRender() {
     const callbacks = _cleanCallbacks[this.widget];
     if (callbacks) {
-      callbacks.forEach(cb => cb());
+      callbacks.forEach(cb => cb(this._tree));
     }
 
     this._connected.forEach(v => v.destroy());

From 40531fc85e30aa2236c1acc2f136b7362646eac8 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 14 Apr 2020 14:20:21 -0500
Subject: [PATCH 517/633] DEV: themes_install_task find existing themes
 consistently (#9424)

---
 app/services/themes_install_task.rb |  9 ++++++++-
 spec/services/themes_spec.rb        | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/services/themes_install_task.rb b/app/services/themes_install_task.rb
index 36ece33dea..9999de7ab8 100644
--- a/app/services/themes_install_task.rb
+++ b/app/services/themes_install_task.rb
@@ -40,8 +40,15 @@ class ThemesInstallTask
     end
   end
 
+  def repo_name
+    @url.gsub(Regexp.union('git@github.com:', 'https://github.com/', '.git'), '')
+  end
+
   def theme_exists?
-    @remote_theme = RemoteTheme.find_by(remote_url: @url, branch: @options.fetch(:branch, nil))
+    @remote_theme = RemoteTheme
+      .where("remote_url like ?", "%#{repo_name}%")
+      .where(branch: @options.fetch(:branch, nil))
+      .first
     @theme = @remote_theme&.theme
     @theme.present?
   end
diff --git a/spec/services/themes_spec.rb b/spec/services/themes_spec.rb
index 2410a5e04c..bc8e8a5952 100644
--- a/spec/services/themes_spec.rb
+++ b/spec/services/themes_spec.rb
@@ -141,4 +141,23 @@ describe ThemesInstallTask do
       end
     end
   end
+  describe '#theme_exists?' do
+    it 'can use https or ssh and find the same repo' do
+      remote_theme = RemoteTheme.create!(
+        remote_url: "https://github.com/org/testtheme.git",
+        local_version: "a2ec030e551fc8d8579790e1954876fe769fe40a",
+        remote_version: "21122230dbfed804067849393c3332083ddd0c07",
+        commits_behind: 2
+      )
+      Fabricate(:theme, remote_theme: remote_theme)
+
+      # https
+      installer = ThemesInstallTask.new({ "url": "https://github.com/org/testtheme" })
+      expect(installer.theme_exists?).to eq(true)
+
+      # ssh
+      installer = ThemesInstallTask.new({ "url": "git@github.com:org/testtheme.git" })
+      expect(installer.theme_exists?).to eq(true)
+    end
+  end
 end

From fec68d3d25bfc80d084af52e17882ad886fd5cd0 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Tue, 14 Apr 2020 14:30:42 -0600
Subject: [PATCH 518/633] DEV: Confirm email when creating users via the API

This commit is for a frequently requested task on meta so that only 1
API call is needed instead of 3!

In order to create a user via the api and not have them receive an
activation email you can pass in the `active=true` flag. This prevents
sending an email, but it is only half of the solution and puts the db in
a weird state where it has an active user with an unconfirmed email.

This commit fixes that and ensures that if the `active=true` flag is set
the user's email is also marked as confirmed.

This change only applies to admins using the API.

Related topics on meta:

 - https://meta.discourse.org/t/-/68663
 - https://meta.discourse.org/t/-/33133
 - https://meta.discourse.org/t/-/36133
---
 app/controllers/users_controller.rb    | 6 ++++--
 spec/requests/users_controller_spec.rb | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b3acc1f74c..29d7bc9963 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -507,8 +507,10 @@ class UsersController < ApplicationController
       session["user_created_message"] = activation.message
       session[SessionController::ACTIVATE_USER_KEY] = user.id
 
-      # If the user was created as active, they might need to be approved
-      user.create_reviewable if user.active?
+      # If the user was created as active this will
+      # ensure their email is confirmed and
+      # add them to the review queue if they need to be approved
+      user.activate if user.active?
 
       render json: {
         success: true,
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index d35e8f9727..507c28f910 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -768,6 +768,7 @@ describe UsersController do
           json = JSON.parse(response.body)
 
           new_user = User.find(json["user_id"])
+          email_token = new_user.email_tokens.active.where(email: new_user.email).first
 
           expect(json['active']).to be_truthy
 
@@ -775,6 +776,7 @@ describe UsersController do
           expect(new_user.approved).to eq(true)
           expect(new_user.approved_by_id).to eq(admin.id)
           expect(new_user.approved_at).to_not eq(nil)
+          expect(email_token.confirmed?).to eq(true)
         end
 
         it "will create a reviewable when a user is created as active but not approved" do

From c21df2286c8bdb0442571cf68e3f83c64c810837 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 15 Apr 2020 09:19:59 +1000
Subject: [PATCH 519/633] FIX: add short_path to upload_serializer (#9417)

What problem I am trying to solve?

When an encrypted message is crafted and the image is added - discourse needs a hard refresh to display that image.

What is happening?

Everything starts here - when the upload is finished we add serialized object to the cache https://github.com/discourse/discourse/blob/master/app/assets/javascripts/discourse/components/composer-editor.js#L748:L757

Then, `discourse-encrypt` is trying to get an image from the cache and use `short_path` property
https://github.com/discourse/discourse-encrypt/blob/master/assets/javascripts/discourse/initializers/hook-decrypt-post.js.es6#L142:L143

Why is it working after a hard refresh?

After refresh, we populate cache once again using that function: https://github.com/discourse/discourse/blob/master/app/assets/javascripts/pretty-text/upload-short-url.js#L11:L17

And lookup_urls method from backend is returning `short_path`
https://github.com/discourse/discourse/blob/master/app/controllers/uploads_controller.rb#L55:L64

TL;DR We should expose short path in upload serializer. I ensured that this serializer is used only when attachments are uploaded so it should not affect performance.
---
 app/serializers/upload_serializer.rb       | 1 +
 spec/serializers/upload_serializer_spec.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/serializers/upload_serializer.rb b/app/serializers/upload_serializer.rb
index 938ab5b0ad..a04300b022 100644
--- a/app/serializers/upload_serializer.rb
+++ b/app/serializers/upload_serializer.rb
@@ -11,6 +11,7 @@ class UploadSerializer < ApplicationSerializer
              :thumbnail_height,
              :extension,
              :short_url,
+             :short_path,
              :retain_hours,
              :human_filesize
 
diff --git a/spec/serializers/upload_serializer_spec.rb b/spec/serializers/upload_serializer_spec.rb
index 3865000913..b0f5e6429c 100644
--- a/spec/serializers/upload_serializer_spec.rb
+++ b/spec/serializers/upload_serializer_spec.rb
@@ -14,6 +14,7 @@ RSpec.describe UploadSerializer do
     expect(json_data['height']).to eql upload.height
     expect(json_data['thumbnail_width']).to eql upload.thumbnail_width
     expect(json_data['thumbnail_height']).to eql upload.thumbnail_height
+    expect(json_data['short_path']).to eql upload.short_path
   end
 
   context "when the upload is secure" do

From 5a5685766aaa1f9dd6870fa86ca38b25b5ecef93 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 13 Apr 2020 15:39:06 -0700
Subject: [PATCH 520/633] DEV: Fix all 'require-valid-alt-text' lints except in
 reused compoments

Three violations require parameters from the caller to generate valid alt text.
---
 app/assets/javascripts/admin/templates/badges-index.hbs     | 2 +-
 .../javascripts/admin/templates/customize-themes-index.hbs  | 2 +-
 app/assets/javascripts/admin/templates/emojis.hbs           | 2 +-
 .../discourse/templates/components/group-flair-inputs.hbs   | 4 ++--
 app/assets/javascripts/discourse/templates/email-login.hbs  | 2 +-
 app/assets/javascripts/discourse/templates/invites/show.hbs | 2 +-
 .../javascripts/discourse/templates/password-reset.hbs      | 2 +-
 config/locales/client.en.yml                                | 6 ++++++
 8 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index f2b2efeaef..528e86e4d3 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -1,6 +1,6 @@
 {{#d-section class="current-badges"}}
   <div class="badge-intro admin-intro">
-    <img src={{badgeIntroEmoji}} class="badge-intro-emoji">
+    <img src={{badgeIntroEmoji}} class="badge-intro-emoji" alt={{i18n 'admin.badges.badge_intro.emoji'}}>
     <div class="content-wrapper">
       <h1>{{i18n "admin.badges.badge_intro.title"}}</h1>
       <div class="external-resources">
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 1c17f0b99b..7402ef2724 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -1,5 +1,5 @@
 <div class="themes-intro admin-intro">
-  <img src={{womanArtistEmojiURL}}>
+  <img src={{womanArtistEmojiURL}} alt={{i18n "admin.customize.theme.themes_intro_emoji"}}>
   <div class="content-wrapper">
     <h1>{{i18n "admin.customize.theme.themes_intro"}}</h1>
     <div class="create-actions">
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index b2935978b3..63df5d99ac 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -31,7 +31,7 @@
       <tbody>
         {{#each sortedEmojis as |e|}}
           <tr>
-            <th><img class="emoji emoji-custom" src={{e.url}} title={{e.name}}></th>
+            <th><img class="emoji emoji-custom" src={{e.url}} title={{e.name}} alt={{i18n "admin.emoji.alt"}}></th>
             <th>:{{e.name}}:</th>
             <th>{{e.group}}</th>
             <th>
diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
index 85077306a2..36dfc26202 100644
--- a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
@@ -35,13 +35,13 @@
 
   <div class="avatar-flair-preview">
     <div class="avatar-wrapper">
-      <img width="45" height="45" src={{demoAvatarUrl}} class="avatar actor">
+      <img width="45" height="45" src={{demoAvatarUrl}} class="avatar actor" alt="" role="presentation">
     </div>
 
     {{#if flairPreviewImage}}
       <div class="avatar-flair demo {{flairPreviewClasses}}" style={{flairPreviewStyle}}></div>
     {{else}}
-      <div class="avatar-flair demo {{flairPreviewClasses}}" style={{flairPreviewStyle}}>
+      <div class="avatar-flair demo {{flairPreviewClasses}}" style={{flairPreviewStyle}} role="presentation">
         {{d-icon flairPreviewIconUrl}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/email-login.hbs b/app/assets/javascripts/discourse/templates/email-login.hbs
index 3e89b6cc61..24e1f319fe 100644
--- a/app/assets/javascripts/discourse/templates/email-login.hbs
+++ b/app/assets/javascripts/discourse/templates/email-login.hbs
@@ -1,6 +1,6 @@
 <div class="container email-login clearfix">
   <div class="pull-left col-image">
-    <img src={{lockImageUrl}} class="password-reset-img">
+    <img src={{lockImageUrl}} class="password-reset-img" alt={{i18n "email_login.emoji"}}>
   </div>
 
   <div class="pull-left col-form">
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 816303a5c7..0243e8df81 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -3,7 +3,7 @@
 
   <div class="two-col">
     <div class="col-image">
-      <img src={{inviteImageUrl}}>
+      <img src={{inviteImageUrl}} alt={{i18n 'invites.emoji'}}>
     </div>
 
     <div class="col-form">
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index 282526bc02..656f0ae7a5 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -1,6 +1,6 @@
 <div class="container password-reset clearfix">
   <div class="pull-left col-image">
-    <img src={{lockImageUrl}} class="password-reset-img">
+    <img src={{lockImageUrl}} class="password-reset-img" alt={{i18n "user.change_password.emoji"}}>
   </div>
 
   <div class="pull-left col-form">
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4b7b33fa58..3f25460ee5 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -983,6 +983,7 @@ en:
         success: "(email sent)"
         in_progress: "(sending email)"
         error: "(error)"
+        emoji: "lock emoji"
         action: "Send Password Reset Email"
         set_password: "Set Password"
         choose_new: "Choose a new password"
@@ -1504,6 +1505,7 @@ en:
     email_login:
       link_label: "Email me a login link"
       button_label: "with email"
+      emoji: "lock emoji"
       complete_username: "If an account matches the username <b>%{username}</b>, you should receive an email with a login link shortly."
       complete_email: "If an account matches <b>%{email}</b>, you should receive an email with a login link shortly."
       complete_username_found: "We found an account that matches the username <b>%{username}</b>, you should receive an email with a login link shortly."
@@ -1584,6 +1586,7 @@ en:
         backup_code: "Use a backup code instead"
     invites:
       accept_title: "Invitation"
+      emoji: "envelope emoji"
       welcome_to: "Welcome to %{site_name}!"
       invited_by: "You were invited by:"
       social_login_available: "You'll also be able to sign in with any social login using that email."
@@ -3719,6 +3722,7 @@ en:
           theme_name: "Theme name"
           component_name: "Component name"
           themes_intro: "Select an existing theme or install a new one to get started"
+          themes_intro_emoji: "woman artist emoji"
           beginners_guide_title: "Beginner’s guide to using Discourse Themes"
           developers_guide_title: "Developer’s guide to Discourse Themes"
           browse_themes: "Browse community themes"
@@ -4580,6 +4584,7 @@ en:
             with_time: <span class="username">%{username}</span> at <span class="time">%{time}</span>
         badge_intro:
           title: "Select an existing badge or create a new one to get started"
+          emoji: "woman student emoji"
           what_are_badges_title: "What are badges?"
           badge_query_examples_title: "Badge query examples"
         mass_award:
@@ -4599,6 +4604,7 @@ en:
         name: "Name"
         group: "Group"
         image: "Image"
+        alt: "custom emoji preview"
         delete_confirm: "Are you sure you want to delete the :%{name}: emoji?"
 
       embedding:

From c670a340138072632dcd986d9cfdd033e2ae275c Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 13 Apr 2020 15:22:35 -0700
Subject: [PATCH 521/633] DEV: Fix and enable the 'require-button-type' lint

---
 .template-lintrc.js                                         | 4 ++--
 .../javascripts/admin/templates/customize-themes-show.hbs   | 2 +-
 .../javascripts/discourse/templates/components/d-modal.hbs  | 2 +-
 .../discourse/templates/components/google-search.hbs        | 2 +-
 .../discourse/templates/components/login-buttons.hbs        | 2 +-
 .../discourse/templates/components/topic-timer-info.hbs     | 2 +-
 .../wizard/templates/components/invite-list-user.hbs        | 2 +-
 .../javascripts/wizard/templates/components/invite-list.hbs | 2 +-
 .../javascripts/wizard/templates/components/wizard-step.hbs | 6 +++---
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 1150803258..b0a14bbf22 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -43,8 +43,8 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
-    quotes: "double",
-    "require-button-type": false,
+    "quotes": "double",
+    "require-button-type": true,
     "require-iframe-title": true,
     "require-valid-alt-text": false,
     "self-closing-void-elements": true,
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index c391701c15..186cd9b358 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -15,7 +15,7 @@
 
   {{#each model.errors as |error|}}
     <div class="alert alert-error">
-      <button class="close" data-dismiss="alert">×</button>
+      <button type="button" class="close" data-dismiss="alert" aria-label={{i18n "modal.dismiss_error"}}>×</button>
       {{error}}
     </div>
   {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
index f9e2c830dd..1a81e466d2 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -33,7 +33,7 @@
 
       {{#each errors as |error|}}
         <div class="alert alert-error">
-          <button class="close" data-dismiss="alert" aria-label={{i18n "modal.dismiss_error"}}>×</button>
+          <button type="button" class="close" data-dismiss="alert" aria-label={{i18n "modal.dismiss_error"}}>×</button>
           {{error}}
         </div>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/google-search.hbs b/app/assets/javascripts/discourse/templates/components/google-search.hbs
index ce28f58662..cbe90dcbce 100644
--- a/app/assets/javascripts/discourse/templates/components/google-search.hbs
+++ b/app/assets/javascripts/discourse/templates/components/google-search.hbs
@@ -2,6 +2,6 @@
   <form action="//google.com/search" id="google-search">
     <input type="text" name="q" value={{searchTerm}}>
     <input name="as_sitesearch" value={{siteUrl}} type="hidden">
-    <button class="btn btn-primary">{{i18n "search.search_google_button"}}</button>
+    <button class="btn btn-primary" type="submit">{{i18n "search.search_google_button"}}</button>
   </form>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
index 85ba0d6870..c81a7745ea 100644
--- a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
@@ -1,5 +1,5 @@
 {{#each buttons as |b|}}
-  <button class="btn btn-social {{b.name}}" {{action externalLogin b}}>
+  <button type="button" class="btn btn-social {{b.name}}" {{action externalLogin b}}>
     {{#if b.isGoogle}}
       <svg class="fa d-icon d-icon-custom-google-oauth2 svg-icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4z"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path clip-path="url(#b)" fill="#FBBC05" d="M0 37V11l17 13z"/><path clip-path="url(#b)" fill="#EA4335" d="M0 11l17 13 7-6.1L48 14V0H0z"/><path clip-path="url(#b)" fill="#34A853" d="M0 37l30-23 7.9 1L48 0v48H0z"/><path clip-path="url(#b)" fill="#4285F4" d="M48 48L17 24l-4-3 35-10z"/></svg>
     {{else if b.icon}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
index 7741113b5d..8a546ab791 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
@@ -4,7 +4,7 @@
       {{clockIcon}} {{notice}}
     </span>
     {{#if showTrashCan}}
-      <button class="btn topic-timer-remove no-text" title={{trashCanTitle}}>
+      <button type="button" class="btn topic-timer-remove no-text" title={{trashCanTitle}}>
         {{trashCanIcon}}
       </button>
     {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
index 15c822bcf1..790586fa8d 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
@@ -1,6 +1,6 @@
 <span class="email">{{user.email}}</span>
 <span class="role">{{roleName}}</span>
 
-<button class="wizard-btn small danger remove-user" {{action removeUser user}}>
+<button type="button" class="wizard-btn small danger remove-user" {{action removeUser user}}>
   {{d-icon "times"}}
 </button>
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
index 1c6f780684..5c829fb9dc 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
@@ -19,7 +19,7 @@
     onChange=(action (mut inviteRole))
   }}
 
-  <button class="wizard-btn small add-user" {{action "addUser"}}>
+  <button type="button" class="wizard-btn small add-user" {{action "addUser"}}>
     {{d-icon "plus"}}{{i18n "wizard.invites.add_user"}}
   </button>
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 1f0b84a857..01650e3ca0 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -35,7 +35,7 @@
     {{/if}}
 
     {{#if showFinishButton}}
-      <button {{action "exitEarly"}} disabled={{saving}} tabindex="10" class="wizard-btn finish">
+      <button {{action "exitEarly"}} disabled={{saving}} tabindex="10" type="button" class="wizard-btn finish">
         {{i18n "wizard.finish"}}
       </button>
     {{/if}}
@@ -45,14 +45,14 @@
     {{/if}}
 
     {{#if showNextButton}}
-      <button {{action "nextStep"}} disabled={{saving}} tabindex="10" class="wizard-btn next primary">
+      <button {{action "nextStep"}} disabled={{saving}} tabindex="10" type="button" class="wizard-btn next primary">
         {{i18n "wizard.next"}}
         {{d-icon "chevron-right"}}
       </button>
     {{/if}}
 
     {{#if showDoneButton}}
-      <button {{action "quit"}} disabled={{saving}} tabindex="10" class="wizard-btn done">
+      <button {{action "quit"}} disabled={{saving}} tabindex="10" type="button" class="wizard-btn done">
         {{i18n "wizard.done"}}
       </button>
     {{/if}}

From 4a2c4232c557ab7da1b5ee6036b41c9c8d43bf7c Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 15 Apr 2020 11:11:00 +0530
Subject: [PATCH 522/633] FIX: remove word boundary regex (\b) for search
 result highlights. (#9338)

---
 .../admin/components/site-text-summary.js     |  13 ++-
 .../admin/templates/search-logs-term.hbs      |   6 +-
 .../discourse/components/highlight-search.js  |  13 +++
 .../discourse/components/highlight-text.js    |  18 ++-
 .../discourse/lib/highlight-html.js           |  84 ++++++++++++++
 ...{highlight-text.js => highlight-search.js} |   7 +-
 .../discourse/templates/full-page-search.hbs  |   6 +-
 .../discourse/widgets/post-cooked.js          |  19 +--
 .../discourse/widgets/search-menu-results.js  |   4 +-
 app/assets/javascripts/vendor.js              |   1 -
 test/javascripts/acceptance/search-test.js    |   4 +-
 .../lib/highlight-search-test.js.es6          |  48 ++++++++
 test/javascripts/lib/highlight-text-test.js   |  26 -----
 vendor/assets/javascripts/highlight.js        | 108 ------------------
 14 files changed, 186 insertions(+), 171 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/components/highlight-search.js
 create mode 100644 app/assets/javascripts/discourse/lib/highlight-html.js
 rename app/assets/javascripts/discourse/lib/{highlight-text.js => highlight-search.js} (72%)
 create mode 100644 test/javascripts/lib/highlight-search-test.js.es6
 delete mode 100644 test/javascripts/lib/highlight-text-test.js
 delete mode 100644 vendor/assets/javascripts/highlight.js

diff --git a/app/assets/javascripts/admin/components/site-text-summary.js b/app/assets/javascripts/admin/components/site-text-summary.js
index 11c6bc45eb..23ee2d8aa6 100644
--- a/app/assets/javascripts/admin/components/site-text-summary.js
+++ b/app/assets/javascripts/admin/components/site-text-summary.js
@@ -1,5 +1,6 @@
 import Component from "@ember/component";
 import { on } from "discourse-common/utils/decorators";
+import highlightHTML from "discourse/lib/highlight-html";
 
 export default Component.extend({
   classNames: ["site-text"],
@@ -10,11 +11,13 @@ export default Component.extend({
     const term = this._searchTerm();
 
     if (term) {
-      $(
-        this.element.querySelector(".site-text-id, .site-text-value")
-      ).highlight(term, {
-        className: "text-highlight"
-      });
+      highlightHTML(
+        this.element.querySelector(".site-text-id, .site-text-value"),
+        term,
+        {
+          className: "text-highlight"
+        }
+      );
     }
     $(this.element.querySelector(".site-text-value")).ellipsis();
   },
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 5014fd7b90..54348aea2e 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
         <div class="fps-topic">
           <div class="topic">
             <a href={{result.url}} class="search-link">
-              {{topic-status topic=result.topic disableActions=true}}<span class="topic-title">{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+              {{topic-status topic=result.topic disableActions=true}}<span class="topic-title">{{#highlight-search highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
             </a>
 
             <div class="search-category">
@@ -54,9 +54,9 @@
             </span>
 
             {{#if result.blurb}}
-              {{#highlight-text highlight=term}}
+              {{#highlight-search highlight=term}}
                 {{html-safe result.blurb}}
-              {{/highlight-text}}
+              {{/highlight-search}}
             {{/if}}
           </div>
         </div>
diff --git a/app/assets/javascripts/discourse/components/highlight-search.js b/app/assets/javascripts/discourse/components/highlight-search.js
new file mode 100644
index 0000000000..a7077a79c7
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/highlight-search.js
@@ -0,0 +1,13 @@
+import Component from "@ember/component";
+import highlightSearch from "discourse/lib/highlight-search";
+
+export default Component.extend({
+  tagName: "span",
+
+  _highlightOnInsert: function() {
+    const term = this.highlight;
+    highlightSearch(this.element, term);
+  }
+    .observes("highlight")
+    .on("didInsertElement")
+});
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js b/app/assets/javascripts/discourse/components/highlight-text.js
index a98ffdb653..d97572d215 100644
--- a/app/assets/javascripts/discourse/components/highlight-text.js
+++ b/app/assets/javascripts/discourse/components/highlight-text.js
@@ -1,13 +1,11 @@
-import Component from "@ember/component";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/components/highlight-search";
+import deprecated from "discourse-common/lib/deprecated";
 
-export default Component.extend({
-  tagName: "span",
-
-  _highlightOnInsert: function() {
-    const term = this.highlight;
-    highlightText($(this.element), term);
+export default highlightSearch.extend({
+  init() {
+    this._super(...arguments);
+    deprecated(
+      "`highlight-text` component is deprecated,  use the `highlight-search` instead."
+    );
   }
-    .observes("highlight")
-    .on("didInsertElement")
 });
diff --git a/app/assets/javascripts/discourse/lib/highlight-html.js b/app/assets/javascripts/discourse/lib/highlight-html.js
new file mode 100644
index 0000000000..a6f093b632
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/highlight-html.js
@@ -0,0 +1,84 @@
+import { makeArray } from "discourse-common/lib/helpers";
+
+function highlight(node, pattern, nodeName, className) {
+  if (
+    ![Node.ELEMENT_NODE, Node.TEXT_NODE].includes(node.nodeType) ||
+    ["SCRIPT", "STYLE"].includes(node.tagName) ||
+    (node.tagName === nodeName && node.className === className)
+  ) {
+    return 0;
+  }
+
+  if (node.nodeType === Node.ELEMENT_NODE && node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) {
+      i += highlight(node.childNodes[i], pattern, nodeName, className);
+    }
+    return 0;
+  }
+
+  if (node.nodeType === Node.TEXT_NODE) {
+    const match = node.data.match(pattern);
+
+    if (!match) {
+      return 0;
+    }
+
+    const element = document.createElement(nodeName);
+    element.className = className;
+    element.innerText = match[0];
+    const matchNode = node.splitText(match.index);
+    matchNode.splitText(match[0].length);
+    matchNode.parentNode.replaceChild(element, matchNode);
+    return 1;
+  }
+
+  return 0;
+}
+
+export default function(node, words, opts = {}) {
+  let settings = {
+    nodeName: "span",
+    className: "highlighted",
+    matchCase: false
+  };
+
+  settings = Object.assign({}, settings, opts);
+  words = makeArray(words)
+    .filter(Boolean)
+    .map(word => word.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&"));
+
+  if (!words.length) return node;
+
+  const pattern = `(${words.join(" ")})`;
+  let flag;
+
+  if (!settings.matchCase) {
+    flag = "i";
+  }
+
+  highlight(
+    node,
+    new RegExp(pattern, flag),
+    settings.nodeName.toUpperCase(),
+    settings.className
+  );
+
+  return node;
+}
+
+export function unhighlightHTML(opts = {}) {
+  let settings = {
+    nodeName: "span",
+    className: "highlighted"
+  };
+
+  settings = Object.assign({}, settings, opts);
+
+  document
+    .querySelectorAll(`${settings.nodeName}.${settings.className}`)
+    .forEach(element => {
+      const parentNode = element.parentNode;
+      parentNode.replaceChild(element.firstChild, element);
+      parentNode.normalize();
+    });
+}
diff --git a/app/assets/javascripts/discourse/lib/highlight-text.js b/app/assets/javascripts/discourse/lib/highlight-search.js
similarity index 72%
rename from app/assets/javascripts/discourse/lib/highlight-text.js
rename to app/assets/javascripts/discourse/lib/highlight-search.js
index 6fa7a09faf..0d9318fb7a 100644
--- a/app/assets/javascripts/discourse/lib/highlight-text.js
+++ b/app/assets/javascripts/discourse/lib/highlight-search.js
@@ -1,8 +1,9 @@
 import { PHRASE_MATCH_REGEXP_PATTERN } from "discourse/lib/concerns/search-constants";
+import highlightHTML from "discourse/lib/highlight-html";
 
 export const CLASS_NAME = "search-highlight";
 
-export default function($elem, term, opts = {}) {
+export default function(elem, term, opts = {}) {
   if (!_.isEmpty(term)) {
     // special case ignore "l" which is used for magic sorting
     let words = _.reject(
@@ -11,8 +12,8 @@ export default function($elem, term, opts = {}) {
     );
 
     words = words.map(w => w.replace(/^"(.*)"$/, "$1"));
-    const highlightOpts = { wordsOnly: true };
+    const highlightOpts = {};
     if (!opts.defaultClassName) highlightOpts.className = CLASS_NAME;
-    $elem.highlight(words, highlightOpts);
+    highlightHTML(elem, words, highlightOpts);
   }
 }
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index d6cdd92227..12a2bd5b19 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -88,7 +88,7 @@
 
                   <a href={{result.url}} {{action "logClick" result.topic_id}} class="search-link">
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class="topic-title">{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+                    <span class="topic-title">{{#highlight-search highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
                   </a>
 
                   <div class="search-category">
@@ -112,9 +112,9 @@
                   </span>
 
                   {{#if result.blurb}}
-                    {{#highlight-text highlight=highlightQuery}}
+                    {{#highlight-search highlight=highlightQuery}}
                       {{html-safe result.blurb}}
-                    {{/highlight-text}}
+                    {{/highlight-search}}
                   {{/if}}
                 </div>
 
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js b/app/assets/javascripts/discourse/widgets/post-cooked.js
index 3d55314f08..3b0ca2423d 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js
@@ -2,7 +2,11 @@ import { iconHTML } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
 import { isValidLink } from "discourse/lib/click-track";
 import { number } from "discourse/lib/formatter";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/lib/highlight-search";
+import {
+  default as highlightHTML,
+  unhighlightHTML
+} from "discourse/lib/highlight-html";
 
 let _decorators = [];
 
@@ -48,17 +52,18 @@ export default class PostCooked {
   }
 
   _applySearchHighlight($html) {
+    const html = $html[0];
     const highlight = this.attrs.highlightTerm;
 
     if (highlight && highlight.length > 2) {
       if (this._highlighted) {
-        $html.unhighlight();
+        unhighlightHTML(html);
       }
 
-      highlightText($html, highlight, { defaultClassName: true });
+      highlightSearch(html, highlight, { defaultClassName: true });
       this._highlighted = true;
     } else if (this._highlighted) {
-      $html.unhighlight();
+      unhighlightHTML(html);
       this._highlighted = false;
     }
   }
@@ -175,10 +180,8 @@ export default class PostCooked {
           div.html(result.cooked);
           _decorators.forEach(cb => cb(div, this.decoratorHelper));
 
-          div.highlight(originalText, {
-            caseSensitive: true,
-            element: "span",
-            className: "highlighted"
+          highlightHTML(div[0], originalText, {
+            matchCase: true
           });
           $blockQuote.showHtml(div, "fast", finished);
         })
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js b/app/assets/javascripts/discourse/widgets/search-menu-results.js
index 636c069f94..6d46819263 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js
@@ -3,7 +3,7 @@ import { dateNode } from "discourse/helpers/node";
 import RawHtml from "discourse/widgets/raw-html";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/lib/highlight-search";
 import { escapeExpression, formatUsername } from "discourse/lib/utilities";
 import { iconNode } from "discourse-common/lib/icon-library";
 import renderTag from "discourse/lib/render-tag";
@@ -15,7 +15,7 @@ class Highlighted extends RawHtml {
   }
 
   decorate($html) {
-    highlightText($html, this.term);
+    highlightSearch($html[0], this.term);
   }
 }
 
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index adc682eba5..64119c4940 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -28,5 +28,4 @@
 //= require jquery.autoellipsis-1.0.10
 //= require virtual-dom
 //= require virtual-dom-amd
-//= require highlight.js
 //= require intersection-observer
diff --git a/test/javascripts/acceptance/search-test.js b/test/javascripts/acceptance/search-test.js
index 1b930c7905..62d4323867 100644
--- a/test/javascripts/acceptance/search-test.js
+++ b/test/javascripts/acceptance/search-test.js
@@ -94,13 +94,13 @@ QUnit.test("Search with context", async assert => {
 
   const highlighted = [];
 
-  find("#post_7 span.highlight-strong").map((_, span) => {
+  find("#post_7 span.highlighted").map((_, span) => {
     highlighted.push(span.innerText);
   });
 
   assert.deepEqual(
     highlighted,
-    ["a", "a", "proper", "a"],
+    ["a proper"],
     "it should highlight the post with the search terms correctly"
   );
 
diff --git a/test/javascripts/lib/highlight-search-test.js.es6 b/test/javascripts/lib/highlight-search-test.js.es6
new file mode 100644
index 0000000000..fcbc9f4fa4
--- /dev/null
+++ b/test/javascripts/lib/highlight-search-test.js.es6
@@ -0,0 +1,48 @@
+import highlightSearch, { CLASS_NAME } from "discourse/lib/highlight-search";
+import { fixture } from "helpers/qunit-helpers";
+
+QUnit.module("lib:highlight-search");
+
+QUnit.test("highlighting text", assert => {
+  fixture().html(
+    `
+    <p>This is some text to highlight</p>
+    `
+  );
+
+  highlightSearch(fixture()[0], "some text");
+
+  const terms = [];
+
+  fixture(`.${CLASS_NAME}`).each((_, elem) => {
+    terms.push(elem.textContent);
+  });
+
+  assert.equal(
+    terms.join(" "),
+    "some text",
+    "it should highlight the terms correctly"
+  );
+});
+
+QUnit.test("highlighting unicode text", assert => {
+  fixture().html(
+    `
+    <p>This is some தமிழ் & русский text to highlight</p>
+    `
+  );
+
+  highlightSearch(fixture()[0], "தமிழ் & русский");
+
+  const terms = [];
+
+  fixture(`.${CLASS_NAME}`).each((_, elem) => {
+    terms.push(elem.textContent);
+  });
+
+  assert.equal(
+    terms.join(" "),
+    "தமிழ் & русский",
+    "it should highlight the terms correctly"
+  );
+});
diff --git a/test/javascripts/lib/highlight-text-test.js b/test/javascripts/lib/highlight-text-test.js
deleted file mode 100644
index d222b8a753..0000000000
--- a/test/javascripts/lib/highlight-text-test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import highlightText, { CLASS_NAME } from "discourse/lib/highlight-text";
-import { fixture } from "helpers/qunit-helpers";
-
-QUnit.module("lib:highlight-text");
-
-QUnit.test("highlighting text", assert => {
-  fixture().html(
-    `
-    <p>This is some text to highlight</p>
-    `
-  );
-
-  highlightText(fixture(), "some text");
-
-  const terms = [];
-
-  fixture(`.${CLASS_NAME}`).each((_, elem) => {
-    terms.push(elem.textContent);
-  });
-
-  assert.equal(
-    terms.join(" "),
-    "some text",
-    "it should highlight the terms correctly"
-  );
-});
diff --git a/vendor/assets/javascripts/highlight.js b/vendor/assets/javascripts/highlight.js
deleted file mode 100644
index c13dd7ff9f..0000000000
--- a/vendor/assets/javascripts/highlight.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// forked cause we may want to amend the logic a bit
-/*
- * jQuery Highlight plugin
- *
- * Based on highlight v3 by Johann Burkard
- * http://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html
- *
- * Code a little bit refactored and cleaned (in my humble opinion).
- * Most important changes:
- *  - has an option to highlight only entire words (wordsOnly - false by default),
- *  - has an option to be case sensitive (caseSensitive - false by default)
- *  - highlight element tag and class names can be specified in options
- *
- * Usage:
- *   // wrap every occurrance of text 'lorem' in content
- *   // with <span class='highlight'> (default options)
- *   $('#content').highlight('lorem');
- *
- *   // search for and highlight more terms at once
- *   // so you can save some time on traversing DOM
- *   $('#content').highlight(['lorem', 'ipsum']);
- *   $('#content').highlight('lorem ipsum');
- *
- *   // search only for entire word 'lorem'
- *   $('#content').highlight('lorem', { wordsOnly: true });
- *
- *   // don't ignore case during search of term 'lorem'
- *   $('#content').highlight('lorem', { caseSensitive: true });
- *
- *   // wrap every occurrance of term 'ipsum' in content
- *   // with <em class='important'>
- *   $('#content').highlight('ipsum', { element: 'em', className: 'important' });
- *
- *   // remove default highlight
- *   $('#content').unhighlight();
- *
- *   // remove custom highlight
- *   $('#content').unhighlight({ element: 'em', className: 'important' });
- *
- *
- * Copyright (c) 2009 Bartek Szopka
- *
- * Licensed under MIT license.
- *
- */
-
-jQuery.extend({
-    highlight: function (node, re, nodeName, className) {
-        if (node.nodeType === 3) {
-            var match = node.data.match(re);
-            if (match) {
-                var highlight = document.createElement(nodeName || 'span');
-                highlight.className = className || 'highlight';
-                var wordNode = node.splitText(match.index);
-                wordNode.splitText(match[0].length);
-                var wordClone = wordNode.cloneNode(true);
-                highlight.appendChild(wordClone);
-                wordNode.parentNode.replaceChild(highlight, wordNode);
-                return 1; //skip added node in parent
-            }
-        } else if ((node.nodeType === 1 && node.childNodes) && // only element nodes that have children
-                !/(script|style)/i.test(node.tagName) && // ignore script and style nodes
-                !(node.tagName === nodeName.toUpperCase() && node.className === className)) { // skip if already highlighted
-            for (var i = 0; i < node.childNodes.length; i++) {
-                i += jQuery.highlight(node.childNodes[i], re, nodeName, className);
-            }
-        }
-        return 0;
-    }
-});
-
-jQuery.fn.unhighlight = function (options) {
-    var settings = { className: 'highlight-strong', element: 'span' };
-    jQuery.extend(settings, options);
-
-    return this.find(settings.element + "." + settings.className).each(function () {
-        var parent = this.parentNode;
-        parent.replaceChild(this.firstChild, this);
-        parent.normalize();
-    }).end();
-};
-
-jQuery.fn.highlight = function (words, options) {
-    var settings = { className: 'highlight-strong', element: 'span', caseSensitive: false, wordsOnly: false };
-    jQuery.extend(settings, options);
-
-    if (words.constructor === String) {
-        words = [words];
-    }
-    words = jQuery.grep(words, function(word){
-      return word !== '';
-    });
-    words = jQuery.map(words, function(word) {
-      return word.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-    });
-    if (words.length === 0) { return this; }
-
-    var flag = settings.caseSensitive ? "" : "i";
-    var pattern = "(" + words.join("|") + ")";
-    if (settings.wordsOnly) {
-        pattern = "\\b" + pattern + "\\b";
-    }
-    var re = new RegExp(pattern, flag);
-
-    return this.each(function () {
-        jQuery.highlight(this, re, settings.element, settings.className);
-    });
-};

From 72a3f387f2af09b358c7a33de6099068eb5eba2a Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 15 Apr 2020 15:57:28 +1000
Subject: [PATCH 523/633] Only run ember-template-lint precommit on staged
 files

* instead of running on the whole app folder, which just adds extra
  overhead
---
 lefthook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lefthook.yml b/lefthook.yml
index 7060a976d4..749f080134 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -17,7 +17,7 @@ pre-commit:
       exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
       run: yarn eslint -f compact {staged_files}
     ember-template-lint:
-      run: yarn run ember-template-lint app
+      run: yarn run ember-template-lint {staged_files}
     yaml-syntax:
       glob: "*.{yaml,yml}"
       # database.yml is an erb file not a yaml file

From f1b844ba8848950274ea2100fc1b52a47ba317c2 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 14 Apr 2020 23:14:53 -0700
Subject: [PATCH 524/633] FIX: Only apply bold font on topic lists (#9396)

---
 app/assets/stylesheets/common/base/_topic-list.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 4250650446..6113446577 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -213,7 +213,6 @@
 .heatmap-high,
 .heatmap-high a {
   color: #ec7213 !important;
-  font-weight: bold;
 }
 .heatmap-med,
 .heatmap-med a {
@@ -224,6 +223,10 @@
   color: #93704a !important;
 }
 
+.topic-list .heatmap-high {
+  font-weight: bold;
+}
+
 .loading .topic-list {
   border: 0;
   box-shadow: none;

From 8c5831999290eddb3c152289349d1e70c1bc4fad Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 15 Apr 2020 12:41:01 +0200
Subject: [PATCH 525/633] DEV: allows to decorate topic header class (#9427)

---
 .../discourse/widgets/header-topic-info.js         | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js b/app/assets/javascripts/discourse/widgets/header-topic-info.js
index 2e73b3253b..c6488d0562 100644
--- a/app/assets/javascripts/discourse/widgets/header-topic-info.js
+++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js
@@ -57,6 +57,18 @@ createWidget("topic-header-participant", {
 export default createWidget("header-topic-info", {
   tagName: "div.extra-info-wrapper",
 
+  buildFancyTitleClass() {
+    const baseClass = ["topic-link"];
+    const flatten = array => [].concat.apply([], array);
+    const extraClass = flatten(
+      applyDecorators(this, "fancyTitleClass", this.attrs, this.state)
+    );
+    return baseClass
+      .concat(extraClass)
+      .filter(Boolean)
+      .join(" ");
+  },
+
   html(attrs, state) {
     const topic = attrs.topic;
 
@@ -87,7 +99,7 @@ export default createWidget("header-topic-info", {
       const titleHTML = new RawHtml({ html: `<span>${fancyTitle}</span>` });
       heading.push(
         this.attach("link", {
-          className: "topic-link",
+          className: this.buildFancyTitleClass(),
           action: "jumpToTopPost",
           href,
           attributes: { "data-topic-id": topic.get("id") },

From 884eea7a8346cf1c0a2bb6ff3b852d3f1fb52684 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 15 Apr 2020 18:34:02 +0530
Subject: [PATCH 526/633] FEATURE: add support for `upload` format in theme
 settings.

---
 app/models/theme_setting.rb                      | 2 +-
 config/locales/server.en.yml                     | 2 +-
 lib/theme_settings_manager.rb                    | 3 +++
 spec/fixtures/theme_settings/valid_settings.yaml | 4 ++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/models/theme_setting.rb b/app/models/theme_setting.rb
index b34fd5fbef..86d8c0247c 100644
--- a/app/models/theme_setting.rb
+++ b/app/models/theme_setting.rb
@@ -16,7 +16,7 @@ class ThemeSetting < ActiveRecord::Base
   end
 
   def self.types
-    @types ||= Enum.new(integer: 0, float: 1, string: 2, bool: 3, list: 4, enum: 5)
+    @types ||= Enum.new(integer: 0, float: 1, string: 2, bool: 3, list: 4, enum: 5, upload: 6)
   end
 
   def self.acceptable_value_for_type?(value, type)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index ffd392888e..64ed44da9b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -96,7 +96,7 @@ en:
       optimized_link: Optimized image links are ephemeral and should not be included in theme source code.
     settings_errors:
       invalid_yaml: "Provided YAML is invalid."
-      data_type_not_a_number: "Setting `%{name}` type is unsupported. Supported types are `integer`, `bool`, `list` and `enum`"
+      data_type_not_a_number: "Setting `%{name}` type is unsupported. Supported types are `integer`, `bool`, `list`, `enum` and `upload`"
       name_too_long: "There is a setting with a too long name. Maximum length is 255"
       default_value_missing: "Setting `%{name}` has no default value"
       default_not_match_type: "Setting `%{name}` default value's type doesn't match with the setting type."
diff --git a/lib/theme_settings_manager.rb b/lib/theme_settings_manager.rb
index cc69dee04e..49ad6a6d61 100644
--- a/lib/theme_settings_manager.rb
+++ b/lib/theme_settings_manager.rb
@@ -167,4 +167,7 @@ class ThemeSettingsManager
       @opts[:choices]
     end
   end
+
+  class Upload < self
+  end
 end
diff --git a/spec/fixtures/theme_settings/valid_settings.yaml b/spec/fixtures/theme_settings/valid_settings.yaml
index 2885fba1b8..35a6973e66 100644
--- a/spec/fixtures/theme_settings/valid_settings.yaml
+++ b/spec/fixtures/theme_settings/valid_settings.yaml
@@ -68,3 +68,7 @@ enum_setting_03:
     - 10
     - 100
     - 1000
+
+upload_setting:
+  type: upload
+  default: ""

From 338eaf9167ca7c8979d3ffc1fe1d85e02345064e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 15 Apr 2020 10:30:30 -0400
Subject: [PATCH 527/633] Build(deps): Bump parser from 2.7.1.0 to 2.7.1.1
 (#9425)

Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.0 to 2.7.1.1.
- [Release notes](https://github.com/whitequark/parser/releases)
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.0...v2.7.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 020705664b..f7e168e827 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,7 +253,7 @@ GEM
     parallel (1.19.1)
     parallel_tests (2.32.0)
       parallel
-    parser (2.7.1.0)
+    parser (2.7.1.1)
       ast (~> 2.4.0)
     pg (1.2.3)
     progress (3.5.2)

From 8b2e7483b29164802da8fa394eef4cde848f96db Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 15 Apr 2020 11:21:21 -0400
Subject: [PATCH 528/633] DEV: Only warn about invalid email setting in
 production

In development and test mode you don't care about email domains. Now
that `rake db:migrate` outputs a lot less this felt like an error when
it's really a warning.
---
 db/fixtures/990_settings.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/db/fixtures/990_settings.rb b/db/fixtures/990_settings.rb
index 7086f6b1cd..6f21e58813 100644
--- a/db/fixtures/990_settings.rb
+++ b/db/fixtures/990_settings.rb
@@ -5,6 +5,8 @@ if SiteSetting.notification_email == SiteSetting.defaults[:notification_email]
   begin
     SiteSetting.notification_email = "noreply@#{Discourse.current_hostname}"
   rescue Discourse::InvalidParameters
-    STDERR.puts "Discourse hostname: #{Discourse.current_hostname} is not a valid domain for emails!"
+    if Rails.env.production?
+      STDERR.puts "WARNING: Discourse hostname: #{Discourse.current_hostname} is not a valid domain for emails!"
+    end
   end
 end

From 5a8a844e4e2907f077099177d07d3a4c27571d2f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 15 Apr 2020 19:59:27 +0200
Subject: [PATCH 529/633] FIX: attempts to listen more reliably to
 scopedCategoryId changes (#9431)

---
 .../select-kit/components/category-chooser.js    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js b/app/assets/javascripts/select-kit/components/category-chooser.js
index 76c47a6a18..423481706a 100644
--- a/app/assets/javascripts/select-kit/components/category-chooser.js
+++ b/app/assets/javascripts/select-kit/components/category-chooser.js
@@ -85,13 +85,17 @@ export default ComboBoxComponent.extend({
     }
   },
 
-  content: computed("selectKit.{filter,options.scopedCategoryId}", function() {
-    if (!this.selectKit.filter && this.selectKit.options.scopedCategoryId) {
-      return this.categoriesByScope(this.selectKit.options.scopedCategoryId);
-    } else {
-      return this.categoriesByScope();
+  content: computed(
+    "selectKit.filter",
+    "selectKit.options.scopedCategoryId",
+    function() {
+      if (!this.selectKit.filter && this.selectKit.options.scopedCategoryId) {
+        return this.categoriesByScope(this.selectKit.options.scopedCategoryId);
+      } else {
+        return this.categoriesByScope();
+      }
     }
-  }),
+  ),
 
   categoriesByScope(scopedCategoryId = null) {
     const categories = this.fixedCategoryPositionsOnCreate

From 3c72cbc5de3fa0123e56e6134bd327bb61ccb659 Mon Sep 17 00:00:00 2001
From: Jay Pfaffman <jay@literatecomputing.com>
Date: Wed, 15 Apr 2020 13:45:14 -0700
Subject: [PATCH 530/633] FIX: Google groups import changed login URL (#9432)

I'm not clear why changing only the `wait_for_url` address was necessary and not also the `get` a few lines above, but this change seems to work for me on both literatecomputing.com Groups and a public group.
---
 script/import_scripts/google_groups.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/import_scripts/google_groups.rb b/script/import_scripts/google_groups.rb
index bbcfb6442b..359114e662 100755
--- a/script/import_scripts/google_groups.rb
+++ b/script/import_scripts/google_groups.rb
@@ -186,7 +186,7 @@ def login
   get("https://myaccount.google.com/?utm_source=sign_in_no_continue")
 
   begin
-    wait_for_url { |url| url.start_with?("https://myaccount.google.com") }
+    wait_for_url { |url| url.start_with?("https://accounts.google.com") }
   rescue Selenium::WebDriver::Error::TimeoutError
     exit_with_error("Failed to login. Please check the content of your cookies.txt".red.bold)
   end

From d7f744490a751502d6a7ea788567fc759357f2e2 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 16 Apr 2020 09:20:44 +1000
Subject: [PATCH 531/633] FEATURE: Decorate topic-level bookmark button with
 reminder time (#9426)

* Show the correct bookmark with clock icon when topic-level bookmark reminder time is set and show the time of the reminder in the title on hover.
* Add a new bookmark lib and reminder time formatting function to show time with today/tomorrow shorthand for readability. E.g. tomorrow at 8:00am instead of Apr 16 2020 at 8:00am. This only applies to today + tomorrow, future dates are still treated the same.
---
 .../discourse/controllers/bookmark.js         | 14 +----
 .../initializers/topic-footer-buttons.js      | 29 ++++++++---
 .../javascripts/discourse/lib/bookmark.js     | 31 +++++++++++
 .../javascripts/discourse/models/topic.js     |  5 +-
 .../discourse/widgets/post-menu.js            |  6 ++-
 .../stylesheets/desktop/topic-post.scss       |  3 +-
 app/assets/stylesheets/mobile/topic-post.scss |  3 +-
 app/serializers/topic_view_serializer.rb      |  9 ++++
 config/locales/client.en.yml                  |  7 ++-
 lib/topic_view.rb                             |  4 ++
 test/javascripts/lib/bookmark-test.js         | 51 +++++++++++++++++++
 11 files changed, 137 insertions(+), 25 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/lib/bookmark.js
 create mode 100644 test/javascripts/lib/bookmark-test.js

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 88ed8e00f2..39baaa07b2 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -7,6 +7,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { ajax } from "discourse/lib/ajax";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
+import { REMINDER_TYPES } from "discourse/lib/bookmark";
 
 // global shortcuts that interfere with these modal shortcuts, they are rebound when the
 // modal is closed
@@ -20,19 +21,6 @@ const GLOBAL_SHORTCUTS_TO_PAUSE = ["c", "r", "l", "d", "t"];
 const START_OF_DAY_HOUR = 8;
 const LATER_TODAY_CUTOFF_HOUR = 17;
 const LATER_TODAY_MAX_HOUR = 18;
-const REMINDER_TYPES = {
-  AT_DESKTOP: "at_desktop",
-  LATER_TODAY: "later_today",
-  NEXT_BUSINESS_DAY: "next_business_day",
-  TOMORROW: "tomorrow",
-  NEXT_WEEK: "next_week",
-  NEXT_MONTH: "next_month",
-  CUSTOM: "custom",
-  LAST_CUSTOM: "last_custom",
-  NONE: "none",
-  START_OF_NEXT_BUSINESS_WEEK: "start_of_next_business_week",
-  LATER_THIS_WEEK: "later_this_week"
-};
 
 const BOOKMARK_BINDINGS = {
   enter: { handler: "saveAndClose" },
diff --git a/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
index 3cd0827a6f..a75949ba23 100644
--- a/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
@@ -1,10 +1,12 @@
 import showModal from "discourse/lib/show-modal";
 import { registerTopicFooterButton } from "discourse/lib/register-topic-footer-button";
+import { formattedReminderTime } from "discourse/lib/bookmark";
 
 export default {
   name: "topic-footer-buttons",
 
-  initialize() {
+  initialize(container) {
+    const currentUser = container.lookup("current-user:main");
     registerTopicFooterButton({
       id: "share-and-invite",
       icon: "link",
@@ -84,7 +86,12 @@ export default {
     registerTopicFooterButton({
       dependentKeys: ["topic.bookmarked", "topic.isPrivateMessage"],
       id: "bookmark",
-      icon: "bookmark",
+      icon() {
+        if (this.get("topic.bookmark_reminder_at")) {
+          return "discourse-bookmark-clock";
+        }
+        return "bookmark";
+      },
       priority: 1000,
       classNames() {
         const bookmarked = this.get("topic.bookmarked");
@@ -94,11 +101,21 @@ export default {
         const bookmarked = this.get("topic.bookmarked");
         return bookmarked ? "bookmarked.clear_bookmarks" : "bookmarked.title";
       },
-      title() {
+      translatedTitle() {
         const bookmarked = this.get("topic.bookmarked");
-        return bookmarked
-          ? "bookmarked.help.unbookmark"
-          : "bookmarked.help.bookmark";
+        const bookmark_reminder_at = this.get("topic.bookmark_reminder_at");
+        if (bookmarked) {
+          if (bookmark_reminder_at) {
+            return I18n.t("bookmarked.help.unbookmark_with_reminder", {
+              reminder_at: formattedReminderTime(
+                bookmark_reminder_at,
+                currentUser.resolvedTimezone()
+              )
+            });
+          }
+          return I18n.t("bookmarked.help.unbookmark");
+        }
+        return I18n.t("bookmarked.help.bookmark");
       },
       action: "toggleBookmark",
       dropdown() {
diff --git a/app/assets/javascripts/discourse/lib/bookmark.js b/app/assets/javascripts/discourse/lib/bookmark.js
new file mode 100644
index 0000000000..8874034e9a
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/bookmark.js
@@ -0,0 +1,31 @@
+export function formattedReminderTime(reminderAt, timezone) {
+  let reminderAtDate = moment.tz(reminderAt, timezone);
+  let formatted = reminderAtDate.format(I18n.t("dates.time"));
+  let now = moment.tz(timezone);
+  let tomorrow = moment(now).add(1, "day");
+
+  if (reminderAtDate.isSame(tomorrow, "date")) {
+    return I18n.t("bookmarks.reminders.tomorrow_with_time", {
+      time: formatted
+    });
+  } else if (reminderAtDate.isSame(now, "date")) {
+    return I18n.t("bookmarks.reminders.today_with_time", { time: formatted });
+  }
+  return I18n.t("bookmarks.reminders.at_time", {
+    date_time: reminderAtDate.format(I18n.t("dates.long_with_year"))
+  });
+}
+
+export const REMINDER_TYPES = {
+  AT_DESKTOP: "at_desktop",
+  LATER_TODAY: "later_today",
+  NEXT_BUSINESS_DAY: "next_business_day",
+  TOMORROW: "tomorrow",
+  NEXT_WEEK: "next_week",
+  NEXT_MONTH: "next_month",
+  CUSTOM: "custom",
+  LAST_CUSTOM: "last_custom",
+  NONE: "none",
+  START_OF_NEXT_BUSINESS_WEEK: "start_of_next_business_week",
+  LATER_THIS_WEEK: "later_this_week"
+};
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index c783fe8827..ce951d6edc 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -401,6 +401,7 @@ const Topic = RestModel.extend({
     if (firstPost) {
       firstPost.set("bookmarked", true);
       if (this.siteSettings.enable_bookmarks_with_reminders) {
+        this.set("bookmark_reminder_at", firstPost.bookmark_reminder_at);
         firstPost.set("bookmarked_with_reminder", true);
       }
       return [firstPost.id];
@@ -440,7 +441,7 @@ const Topic = RestModel.extend({
           if (this.siteSettings.enable_bookmarks_with_reminders) {
             return firstPost.toggleBookmarkWithReminder().then(response => {
               this.set("bookmarking", false);
-              if (response.closedWithoutSaving) {
+              if (response && response.closedWithoutSaving) {
                 this.set("bookmarked", false);
               } else {
                 return this.afterTopicBookmarked(firstPost);
@@ -459,6 +460,7 @@ const Topic = RestModel.extend({
           return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
             .then(() => {
               this.toggleProperty("bookmarked");
+              this.set("bookmark_reminder_at", null);
               if (posts) {
                 const updated = [];
                 posts.forEach(post => {
@@ -474,6 +476,7 @@ const Topic = RestModel.extend({
                     updated.push(post.id);
                   }
                 });
+                firstPost.set("bookmarked_with_reminder", false);
                 return updated;
               }
             })
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js b/app/assets/javascripts/discourse/widgets/post-menu.js
index c21d60f698..c8374058ee 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js
@@ -5,6 +5,7 @@ import { h } from "virtual-dom";
 import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
 import ENV from "discourse-common/config/environment";
+import { formattedReminderTime } from "discourse/lib/bookmark";
 
 const LIKE_ACTION = 2;
 const VIBRATE_DURATION = 5;
@@ -314,12 +315,13 @@ registerButton("bookmarkWithReminder", (attrs, state, siteSettings) => {
     classNames.push("bookmarked");
 
     if (attrs.bookmarkReminderAt) {
-      let reminderAtDate = moment(attrs.bookmarkReminderAt).tz(
+      let formattedReminder = formattedReminderTime(
+        attrs.bookmarkReminderAt,
         Discourse.currentUser.resolvedTimezone()
       );
       title = "bookmarks.created_with_reminder";
       titleOptions = {
-        date: reminderAtDate.format(I18n.t("dates.long_with_year"))
+        date: formattedReminder
       };
     } else if (attrs.bookmarkReminderType === "at_desktop") {
       title = "bookmarks.created_with_at_desktop_reminder";
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 1b60137985..2406f4e79b 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -454,7 +454,8 @@ nav.post-controls {
       color: $tertiary;
     }
   }
-  .bookmark.bookmarked .d-icon-bookmark {
+  .bookmark.bookmarked .d-icon-bookmark,
+  .bookmark.bookmarked .d-icon-discourse-bookmark-clock {
     color: $tertiary;
   }
   .feature-on-profile.featured-on-profile .d-icon-id-card {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 1d37052b88..e6c008c62d 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -237,7 +237,8 @@ a.reply-to-tab {
 #topic-footer-buttons {
   @include clearfix;
   padding: 20px 0 0 0;
-  .d-icon-bookmark.bookmarked {
+  .d-icon-bookmark.bookmarked,
+  .d-icon-discourse-bookmark-clock.bookmarked {
     color: $tertiary;
   }
   .combobox {
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 1aec5f442d..4bace8d9ed 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -61,6 +61,7 @@ class TopicViewSerializer < ApplicationSerializer
     :is_warning,
     :chunk_size,
     :bookmarked,
+    :bookmark_reminder_at,
     :message_archived,
     :topic_timer,
     :private_topic_timer,
@@ -192,6 +193,14 @@ class TopicViewSerializer < ApplicationSerializer
     end
   end
 
+  def include_bookmark_reminder_at?
+    SiteSetting.enable_bookmarks_with_reminders? && bookmarked
+  end
+
+  def bookmark_reminder_at
+    object.first_post_bookmark_reminder_at
+  end
+
   def topic_timer
     TopicTimerSerializer.new(object.topic.public_topic_timer, root: false)
   end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3f25460ee5..64492a2bc7 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -302,11 +302,13 @@ en:
       help:
         bookmark: "Click to bookmark the first post on this topic"
         unbookmark: "Click to remove all bookmarks in this topic"
+        unbookmark_with_reminder: "Click to remove all bookmarks and reminders in this topic. You have a reminder set %{reminder_at} for this topic."
+
 
     bookmarks:
       created: "you've bookmarked this post"
       not_bookmarked: "bookmark this post"
-      created_with_reminder: "you've bookmarked this post with a reminder at %{date}"
+      created_with_reminder: "you've bookmarked this post with a reminder %{date}"
       created_with_at_desktop_reminder: "you've bookmarked this post and will be reminded next time you are at your desktop"
       remove: "Remove Bookmark"
       confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
@@ -326,6 +328,9 @@ en:
         custom: "Custom date and time"
         last_custom: "Last"
         none: "No reminder needed"
+        today_with_time: "today at %{time}"
+        tomorrow_with_time: "tomorrow at %{time}"
+        at_time: "at %{date_time}"
 
     drafts:
       resume: "Resume"
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 82ae26c573..42405f8e33 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -354,6 +354,10 @@ class TopicView
     @topic.bookmarks.exists?(user_id: @user.id)
   end
 
+  def first_post_bookmark_reminder_at
+    @topic.first_post.bookmarks.where(user: @user).pluck_first(:reminder_at)
+  end
+
   MAX_PARTICIPANTS = 24
 
   def post_counts_by_user
diff --git a/test/javascripts/lib/bookmark-test.js b/test/javascripts/lib/bookmark-test.js
new file mode 100644
index 0000000000..1e2530a530
--- /dev/null
+++ b/test/javascripts/lib/bookmark-test.js
@@ -0,0 +1,51 @@
+import { formattedReminderTime } from "discourse/lib/bookmark";
+
+QUnit.module("lib:bookmark", {
+  beforeEach() {
+    // set the current now time for all tests
+    let now = moment.tz("2020-04-11 08:00:00", "Australia/Brisbane");
+    sandbox.useFakeTimers(now.valueOf());
+  }
+});
+
+QUnit.test(
+  "formattedReminderTime works when the reminder time is tomorrow",
+  assert => {
+    let reminderAt = "2020-04-12 09:45:00";
+    let reminderAtDate = moment
+      .tz(reminderAt, "Australia/Brisbane")
+      .format("H:mm a");
+    assert.equal(
+      formattedReminderTime(reminderAt, "Australia/Brisbane"),
+      "tomorrow at " + reminderAtDate
+    );
+  }
+);
+
+QUnit.test(
+  "formattedReminderTime works when the reminder time is today",
+  assert => {
+    let reminderAt = "2020-04-11 09:45:00";
+    let reminderAtDate = moment
+      .tz(reminderAt, "Australia/Brisbane")
+      .format("H:mm a");
+    assert.equal(
+      formattedReminderTime(reminderAt, "Australia/Brisbane"),
+      "today at " + reminderAtDate
+    );
+  }
+);
+
+QUnit.test(
+  "formattedReminderTime works when the reminder time is in the future",
+  assert => {
+    let reminderAt = "2020-04-15 09:45:00";
+    let reminderAtDate = moment
+      .tz(reminderAt, "Australia/Brisbane")
+      .format("H:mm a");
+    assert.equal(
+      formattedReminderTime(reminderAt, "Australia/Brisbane"),
+      "at Apr 15, 2020 " + reminderAtDate
+    );
+  }
+);

From 51672b912109438542f2bf97802f035f14ed0454 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 16 Apr 2020 11:32:21 +1000
Subject: [PATCH 532/633] FIX: Minor bookmark with reminder issue cleanup
 (#9436)

* Count user summary bookmarks from new Bookmark table if bookmarks with reminders enabled
* Update topic user bookmarked column when new topic bookmark changed
* Make in:bookmarks search work with new bookmarks
* Fix batch inserts for bookmark rake task (and thus migration). We were only inserting one bookmark at a time, completely defeating the purpose of batching!
---
 app/models/user_summary.rb        | 12 ++++---
 lib/bookmark_manager.rb           | 11 +++++++
 lib/search.rb                     | 31 ++++++++++++------
 lib/tasks/bookmarks.rake          | 53 ++++++++++++++++++-------------
 spec/lib/bookmark_manager_spec.rb | 14 ++++++++
 5 files changed, 85 insertions(+), 36 deletions(-)

diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb
index 4d7af5149d..52c9199577 100644
--- a/app/models/user_summary.rb
+++ b/app/models/user_summary.rb
@@ -117,10 +117,14 @@ class UserSummary
   end
 
   def bookmark_count
-    UserAction
-      .where(user: @user)
-      .where(action_type: UserAction::BOOKMARK)
-      .count
+    if SiteSetting.enable_bookmarks_with_reminders
+      Bookmark.where(user: @user).count
+    else
+      UserAction
+        .where(user: @user)
+        .where(action_type: UserAction::BOOKMARK)
+        .count
+    end
   end
 
   def recent_time_read
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index c2184b394c..33c2758c12 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -27,6 +27,11 @@ class BookmarkManager
       return add_errors_from(bookmark)
     end
 
+    # bookmarking the topic-level mean
+    if post.is_first_post?
+      update_topic_user_bookmarked(topic: post.topic, bookmarked: true)
+    end
+
     BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(@user)
     bookmark
   end
@@ -49,6 +54,8 @@ class BookmarkManager
         raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_delete?(bookmark)
         bookmark.destroy
       end
+
+      update_topic_user_bookmarked(topic: topic, bookmarked: false)
     end
 
     clear_at_desktop_cache_if_required
@@ -69,4 +76,8 @@ class BookmarkManager
   def user_has_any_pending_at_desktop_reminders?
     Bookmark.at_desktop_reminders_for_user(@user).any?
   end
+
+  def update_topic_user_bookmarked(topic:, bookmarked:)
+    TopicUser.change(@user.id, topic, bookmarked: bookmarked)
+  end
 end
diff --git a/lib/search.rb b/lib/search.rb
index 6bfc2834cb..bcbf5107e9 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -364,17 +364,28 @@ class Search
     end
   end
 
-  advanced_filter(/^in:(likes|bookmarks)$/) do |posts, match|
-    if @guardian.user
-      post_action_type = PostActionType.types[:like] if match == "likes"
-      post_action_type = PostActionType.types[:bookmark] if match == "bookmarks"
+  def post_action_type_filter(posts, post_action_type)
+    posts.where("posts.id IN (
+      SELECT pa.post_id FROM post_actions pa
+      WHERE pa.user_id = #{@guardian.user.id} AND
+            pa.post_action_type_id = #{post_action_type} AND
+            deleted_at IS NULL
+    )")
+  end
 
-      posts.where("posts.id IN (
-                            SELECT pa.post_id FROM post_actions pa
-                            WHERE pa.user_id = #{@guardian.user.id} AND
-                                  pa.post_action_type_id = #{post_action_type} AND
-                                  deleted_at IS NULL
-                         )")
+  advanced_filter(/^in:(likes)$/) do |posts, match|
+    if @guardian.user
+      post_action_type_filter(posts, PostActionType.types[:like])
+    end
+  end
+
+  advanced_filter(/^in:(bookmarks)$/) do |posts, match|
+    if @guardian.user
+      if SiteSetting.enable_bookmarks_with_reminders
+        posts.where("posts.id IN (SELECT post_id FROM bookmarks WHERE bookmarks.user_id = #{@guardian.user.id})")
+      else
+        post_action_type_filter(posts, PostActionType.types[:bookmark])
+      end
     end
   end
 
diff --git a/lib/tasks/bookmarks.rake b/lib/tasks/bookmarks.rake
index db48125b07..833a5f8015 100644
--- a/lib/tasks/bookmarks.rake
+++ b/lib/tasks/bookmarks.rake
@@ -30,34 +30,43 @@ task "bookmarks:sync_to_table", [:sync_limit] => :environment do |_t, args|
   post_action_bookmark_count = post_action_bookmarks.count('post_actions.id')
   i = 0
 
+  bookmarks_to_create = []
   post_action_bookmarks.find_each(batch_size: 2000) do |pab|
-    # clear at start of each batch to only insert X at a time
-    bookmarks_to_create = []
+    RakeHelpers.print_status_with_label("Creating post new bookmarks.......", i, post_action_bookmark_count)
+    now = Time.zone.now
+    bookmarks_to_create << {
+      topic_id: pab.topic_id,
+      post_id: pab.post_id,
+      user_id: pab.user_id,
+      created_at: now,
+      updated_at: now
+    }
 
-    Bookmark.transaction do
-      RakeHelpers.print_status_with_label("Creating post new bookmarks.......", i, post_action_bookmark_count)
-      now = Time.zone.now
-      bookmarks_to_create << {
-        topic_id: pab.topic_id,
-        post_id: pab.post_id,
-        user_id: pab.user_id,
-        created_at: now,
-        updated_at: now
-      }
+    i += 1
 
-      i += 1
-
-      # this will ignore conflicts in the bookmarks table so
-      # if the user already has a post bookmarked in the new way,
-      # then we don't error and keep on truckin'
-      #
-      # we shouldn't have duplicates here at any rate because of
-      # the above LEFT JOIN but best to be safe knowing this
-      # won't blow up
-      Bookmark.insert_all(bookmarks_to_create)
+    # once we get to 2000 records to create, insert them all and reset
+    # the array and counter to make sure we don't have too many in memory
+    if i >= 2000
+      create_bookmarks(bookmarks_to_create)
+      i = 0
+      bookmarks_to_create = []
     end
   end
 
+  # if there was < 2000 bookmarks this finishes off the last ones
+  create_bookmarks(bookmarks_to_create)
+
   RakeHelpers.print_status_with_label("Bookmark creation complete!            ", i, post_action_bookmark_count)
   puts ""
 end
+
+def create_bookmarks(bookmarks_to_create)
+  # this will ignore conflicts in the bookmarks table so
+  # if the user already has a post bookmarked in the new way,
+  # then we don't error and keep on truckin'
+  #
+  # we shouldn't have duplicates here at any rate because of
+  # the above LEFT JOIN but best to be safe knowing this
+  # won't blow up
+  Bookmark.insert_all(bookmarks_to_create)
+end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index a19380bb83..2130e50610 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -32,6 +32,14 @@ RSpec.describe BookmarkManager do
       end
     end
 
+    context "when bookmarking the topic level (post is OP)" do
+      it "updates the topic user bookmarked column to true" do
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+        tu = TopicUser.find_by(user: user)
+        expect(tu.bookmarked).to eq(true)
+      end
+    end
+
     context "when the reminder type is at_desktop" do
       let(:reminder_type) { 'at_desktop' }
       let(:reminder_at) { nil }
@@ -188,6 +196,12 @@ RSpec.describe BookmarkManager do
       end
     end
 
+    it "updates the topic user bookmarked column to false" do
+      TopicUser.create(user: user, topic: topic, bookmarked: true)
+      subject.destroy_for_topic(topic)
+      tu = TopicUser.find_by(user: user)
+      expect(tu.bookmarked).to eq(false)
+    end
   end
 
   describe ".send_reminder_notification" do

From ca06991ee58685d867ff3b827624cd947e554c60 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 07:57:32 +0200
Subject: [PATCH 533/633] FIX: makes topic-list-item decorator work on mobile
 (#9433)

---
 .../discourse/templates/mobile/list/topic-list-item.hbr         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
index 07acb21db6..c126de0924 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
@@ -17,7 +17,7 @@
         <div class='main-link'>
           {{~raw-plugin-outlet name="topic-list-before-status"}}
           {{~raw "topic-status" topic=topic~}}
-          {{~topic-link topic~}}
+          {{~topic-link topic class="raw-link raw-topic-link"}}
           {{~#if topic.featured_link~}}
           {{~topic-featured-link topic~}}
           {{~/if~}}

From 5e244364547516a834517edc9b1ab5d940029f93 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 07:58:04 +0200
Subject: [PATCH 534/633] DEV: attempts to fix various leaks (#9428)

* DEV: attempts to fix various leaks

* scheduleOnce doesnt work with anon function

* removes the I18n change
---
 .../discourse/components/composer-body.js     |  4 +-
 .../discourse/components/composer-editor.js   | 10 +--
 .../discourse/components/d-editor.js          |  6 +-
 .../edit-category-topic-template.js           |  4 +-
 .../discourse/components/emoji-picker.js      | 14 ++--
 .../components/expanding-text-area.js         |  4 +-
 .../discourse/components/quote-button.js      | 10 ++-
 .../components/search-advanced-options.js     |  2 +-
 .../discourse/controllers/insert-hyperlink.js |  4 +-
 .../discourse/controllers/login.js            |  5 +-
 .../discourse/controllers/topic.js            |  7 +-
 .../initializers/keyboard-shortcuts.js        |  4 ++
 .../initializers/title-notifications.js       |  8 +++
 .../discourse/lib/keyboard-shortcuts.js       |  4 ++
 .../discourse/lib/link-mentions.js            |  4 +-
 .../discourse/routes/topic-from-params.js     |  4 +-
 .../javascripts/discourse/routes/topic.js     | 70 +++++++++++--------
 .../wizard/components/invite-list.js          |  4 +-
 .../wizard/components/wizard-step.js          |  6 +-
 test/javascripts/test_helper.js               |  2 +
 20 files changed, 103 insertions(+), 73 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/composer-body.js b/app/assets/javascripts/discourse/components/composer-body.js
index 80bb8d38bb..e5a6e8261d 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js
+++ b/app/assets/javascripts/discourse/components/composer-body.js
@@ -1,7 +1,7 @@
 import {
   run,
   cancel,
-  scheduleOnce,
+  schedule,
   later,
   debounce,
   throttle
@@ -65,7 +65,7 @@ export default Component.extend(KeyEnterEscape, {
     "composer.canEditTopicFeaturedLink"
   )
   resize() {
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       if (!this.element || this.isDestroying || this.isDestroyed) {
         return;
       }
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js b/app/assets/javascripts/discourse/components/composer-editor.js
index b14b0af74a..e6e000aa09 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/components/composer-editor.js
@@ -1,4 +1,4 @@
-import { debounce, later, next, scheduleOnce, throttle } from "@ember/runloop";
+import { debounce, later, next, schedule, throttle } from "@ember/runloop";
 import Component from "@ember/component";
 import userSearch from "discourse/lib/user-search";
 import discourseComputed, {
@@ -194,7 +194,7 @@ export default Component.extend({
         transformComplete: v => v.username || v.name,
         afterComplete() {
           // ensures textarea scroll position is correct
-          scheduleOnce("afterRender", () => $input.blur().focus());
+          schedule("afterRender", () => $input.blur().focus());
         },
         triggerRule: textarea =>
           !inCodeBlock(textarea.value, caretPosition(textarea))
@@ -323,7 +323,7 @@ export default Component.extend({
       this.appEvents.on(event, this, this._resetShouldBuildScrollMap);
     });
 
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       $input.on("touchstart mouseenter", () => {
         if (!$preview.is(":visible")) return;
         $preview.off("scroll");
@@ -569,7 +569,7 @@ export default Component.extend({
   },
 
   _warnMentionedGroups($preview) {
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       var found = this.warnedGroupMentions || [];
       $preview.find(".mention-group.notify").each((idx, e) => {
         const $e = $(e);
@@ -597,7 +597,7 @@ export default Component.extend({
       return;
     }
 
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       let found = this.warnedCannotSeeMentions || [];
 
       $preview.find(".mention.cannot-see").each((idx, e) => {
diff --git a/app/assets/javascripts/discourse/components/d-editor.js b/app/assets/javascripts/discourse/components/d-editor.js
index 4dd2c72700..11ec7b06ca 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js
+++ b/app/assets/javascripts/discourse/components/d-editor.js
@@ -356,7 +356,7 @@ export default Component.extend({
         return;
       }
       this.set("preview", cooked);
-      scheduleOnce("afterRender", () => {
+      schedule("afterRender", () => {
         if (this._state !== "inDOM") {
           return;
         }
@@ -559,7 +559,7 @@ export default Component.extend({
   },
 
   _selectText(from, length) {
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       const textarea = this.element.querySelector("textarea.d-editor-input");
       const $textarea = $(textarea);
       const oldScrollPos = $textarea.scrollTop();
@@ -898,7 +898,7 @@ export default Component.extend({
   // ensures textarea scroll position is correct
   _focusTextArea() {
     const textarea = this.element.querySelector("textarea.d-editor-input");
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       textarea.blur();
       textarea.focus();
     });
diff --git a/app/assets/javascripts/discourse/components/edit-category-topic-template.js b/app/assets/javascripts/discourse/components/edit-category-topic-template.js
index 9a5d7d7ab1..1ccf804dd1 100644
--- a/app/assets/javascripts/discourse/components/edit-category-topic-template.js
+++ b/app/assets/javascripts/discourse/components/edit-category-topic-template.js
@@ -1,4 +1,4 @@
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import { observes } from "discourse-common/utils/decorators";
 
@@ -6,7 +6,7 @@ export default buildCategoryPanel("topic-template", {
   @observes("activeTab")
   _activeTabChanged: function() {
     if (this.activeTab) {
-      scheduleOnce("afterRender", () =>
+      schedule("afterRender", () =>
         this.element.querySelector(".d-editor-input").focus()
       );
     }
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js b/app/assets/javascripts/discourse/components/emoji-picker.js
index 88b7599324..90e2fefe13 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js
@@ -1,5 +1,5 @@
 import { inject as service } from "@ember/service";
-import { schedule } from "@ember/runloop";
+import { throttle, debounce, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "discourse-common/utils/decorators";
 import { findRawTemplate } from "discourse/lib/raw-templates";
@@ -12,8 +12,6 @@ import {
 import { safariHacksDisabled } from "discourse/lib/utilities";
 import ENV, { INPUT_DELAY } from "discourse-common/config/environment";
 
-const { run } = Ember;
-
 const PER_ROW = 11;
 function customEmojis() {
   const list = extendedEmojiList();
@@ -54,7 +52,7 @@ export default Component.extend({
       recentEmojis: this.emojiStore.favorites
     });
 
-    run.scheduleOnce("afterRender", this, function() {
+    schedule("afterRender", this, function() {
       this._bindEvents();
       this._loadCategoriesEmojis();
       this._positionPicker();
@@ -110,7 +108,7 @@ export default Component.extend({
   filterChanged() {
     this.$filter.find(".clear-filter").toggle(!_.isEmpty(this.filter));
     const filterDelay = this.site.isMobileDevice ? 400 : INPUT_DELAY;
-    run.debounce(this, this._filterEmojisList, filterDelay);
+    debounce(this, this._filterEmojisList, filterDelay);
   },
 
   @observes("selectedDiversity")
@@ -309,11 +307,11 @@ export default Component.extend({
 
   _bindResizing() {
     $(window).on("resize", () => {
-      run.throttle(this, this._positionPicker, 16);
+      throttle(this, this._positionPicker, 16);
     });
 
     $("#reply-control").on("div-resizing", () => {
-      run.throttle(this, this._positionPicker, 16);
+      throttle(this, this._positionPicker, 16);
     });
   },
 
@@ -376,7 +374,7 @@ export default Component.extend({
 
   _bindSectionsScroll() {
     let onScroll = () => {
-      run.debounce(this, this._checkVisibleSection, 50);
+      debounce(this, this._checkVisibleSection, 50);
     };
 
     this.$list.on("scroll", onScroll);
diff --git a/app/assets/javascripts/discourse/components/expanding-text-area.js b/app/assets/javascripts/discourse/components/expanding-text-area.js
index ca215cc3f7..94c976c4d3 100644
--- a/app/assets/javascripts/discourse/components/expanding-text-area.js
+++ b/app/assets/javascripts/discourse/components/expanding-text-area.js
@@ -1,12 +1,12 @@
 import { TextArea } from "@ember/component";
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { on, observes } from "discourse-common/utils/decorators";
 import autosize from "discourse/lib/autosize";
 
 export default TextArea.extend({
   @on("didInsertElement")
   _startWatching() {
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       $(this.element).focus();
       autosize(this.element);
     });
diff --git a/app/assets/javascripts/discourse/components/quote-button.js b/app/assets/javascripts/discourse/components/quote-button.js
index 3a35269153..8f7d464543 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js
+++ b/app/assets/javascripts/discourse/components/quote-button.js
@@ -1,4 +1,4 @@
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseDebounce from "discourse/lib/debounce";
 import toMarkdown from "discourse/lib/to-markdown";
@@ -138,7 +138,11 @@ export default Component.extend({
     }
 
     // change the position of the button
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
+      if (!this.element || this.isDestroying || this.isDestroyed) {
+        return;
+      }
+
       let top = markerOffset.top;
       let left = markerOffset.left + Math.max(0, parentScrollLeft);
 
@@ -160,6 +164,8 @@ export default Component.extend({
   },
 
   didInsertElement() {
+    this._super(...arguments);
+
     const { isWinphone, isAndroid } = this.capabilities;
     const wait = isWinphone || isAndroid ? INPUT_DELAY : 25;
     const onSelectionChanged = discourseDebounce(
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js b/app/assets/javascripts/discourse/components/search-advanced-options.js
index 136c416588..274e62e7b1 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js
@@ -77,7 +77,7 @@ export default Component.extend({
 
     this._init();
 
-    scheduleOnce("afterRender", () => this._update());
+    scheduleOnce("afterRender", this, this._update);
   },
 
   @observes("searchTerm")
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js
index 57d751b56e..4e5f6ba821 100644
--- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js
+++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js
@@ -1,5 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { cancel, debounce, scheduleOnce } from "@ember/runloop";
+import { cancel, debounce, schedule } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { searchForTerm } from "discourse/lib/search";
@@ -17,7 +17,7 @@ export default Controller.extend(ModalFunctionality, {
       selectedRow: -1
     });
 
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       const element = document.querySelector(".insert-link");
 
       element.addEventListener("keydown", e => this.keyDown(e));
diff --git a/app/assets/javascripts/discourse/controllers/login.js b/app/assets/javascripts/discourse/controllers/login.js
index de39f7ec8a..993b1a398f 100644
--- a/app/assets/javascripts/discourse/controllers/login.js
+++ b/app/assets/javascripts/discourse/controllers/login.js
@@ -2,8 +2,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { alias, or, readOnly } from "@ember/object/computed";
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { next, schedule } from "@ember/runloop";
 import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -152,7 +151,7 @@ export default Controller.extend(ModalFunctionality, {
 
               // only need to focus the 2FA input for TOTP
               if (!this.showSecurityKey) {
-                scheduleOnce("afterRender", () =>
+                schedule("afterRender", () =>
                   document
                     .getElementById("second-factor")
                     .querySelector("input")
diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/controllers/topic.js
index 49da4ed9f4..eea22c7d88 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js
+++ b/app/assets/javascripts/discourse/controllers/topic.js
@@ -1,8 +1,7 @@
 import { isPresent, isEmpty } from "@ember/utils";
 import { or, and, not, alias } from "@ember/object/computed";
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { next, schedule } from "@ember/runloop";
 import Controller, { inject as controller } from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
@@ -137,9 +136,7 @@ export default Controller.extend(bufferedProperty("model"), {
       return;
     }
 
-    scheduleOnce("afterRender", () => {
-      this.send("showHistory", post, revision);
-    });
+    schedule("afterRender", () => this.send("showHistory", post, revision));
   },
 
   showCategoryChooser: not("model.isPrivateMessage"),
diff --git a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
index a0de2c5d2a..90860193f9 100644
--- a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
@@ -7,5 +7,9 @@ export default {
   initialize(container) {
     KeyboardShortcuts.init(Mousetrap, container);
     KeyboardShortcuts.bindEvents();
+  },
+
+  teardown() {
+    KeyboardShortcuts.teardown();
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/title-notifications.js b/app/assets/javascripts/discourse/initializers/title-notifications.js
index cfc0c3ed6d..c7ae1d5f06 100644
--- a/app/assets/javascripts/discourse/initializers/title-notifications.js
+++ b/app/assets/javascripts/discourse/initializers/title-notifications.js
@@ -13,6 +13,14 @@ export default {
       .on("notifications:changed", this, "_updateTitle");
   },
 
+  teardown(container) {
+    container
+      .lookup("service:app-events")
+      .off("notifications:changed", this, "_updateTitle");
+
+    this.container = null;
+  },
+
   _updateTitle() {
     const user = this.container.lookup("current-user:main");
     if (!user) return; // must be logged in
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index db3400cabd..9a3aff88a4 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -106,6 +106,10 @@ export default {
     });
   },
 
+  teardown() {
+    this.container = null;
+  },
+
   bindKey(key, binding = null) {
     if (!binding) {
       binding = DEFAULT_BINDINGS[key];
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js b/app/assets/javascripts/discourse/lib/link-mentions.js
index 30bdcdda95..02872edaec 100644
--- a/app/assets/javascripts/discourse/lib/link-mentions.js
+++ b/app/assets/javascripts/discourse/lib/link-mentions.js
@@ -1,4 +1,4 @@
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 import { formatUsername } from "discourse/lib/utilities";
@@ -40,7 +40,7 @@ const checked = {};
 const cannotSee = [];
 
 function updateFound($mentions, usernames) {
-  scheduleOnce("afterRender", function() {
+  schedule("afterRender", function() {
     $mentions.each((i, e) => {
       const $e = $(e);
       const username = usernames[i];
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js b/app/assets/javascripts/discourse/routes/topic-from-params.js
index 1429fb0c16..bcf904ad38 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js
@@ -1,5 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
@@ -60,7 +60,7 @@ export default DiscourseRoute.extend({
         topicController.subscribe();
 
         // Highlight our post after the next render
-        scheduleOnce("afterRender", () =>
+        schedule("afterRender", () =>
           this.appEvents.trigger("post:highlight", closest)
         );
 
diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/routes/topic.js
index 5aebefe6a4..46a1b3ada9 100644
--- a/app/assets/javascripts/discourse/routes/topic.js
+++ b/app/assets/javascripts/discourse/routes/topic.js
@@ -1,20 +1,26 @@
 import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
-import { cancel, later, scheduleOnce } from "@ember/runloop";
+import { cancel, later, schedule } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
 import { EventTarget } from "rsvp";
 
-let isTransitioning = false,
-  scheduledReplace = null,
-  lastScrollPos = null;
-
 const SCROLL_DELAY = 500;
 
 import showModal from "discourse/lib/show-modal";
 
 const TopicRoute = DiscourseRoute.extend({
+  init() {
+    this._super(...arguments);
+
+    this.setProperties({
+      isTransitioning: false,
+      scheduledReplace: null,
+      lastScrollPos: null
+    });
+  },
+
   redirect() {
     return this.redirectIfLoginRequired();
   },
@@ -169,7 +175,7 @@ const TopicRoute = DiscourseRoute.extend({
     // Use replaceState to update the URL once it changes
     postChangedRoute(currentPost) {
       // do nothing if we are transitioning to another route
-      if (isTransitioning || TopicRoute.disableReplaceState) {
+      if (this.isTransitioning || TopicRoute.disableReplaceState) {
         return;
       }
 
@@ -180,14 +186,17 @@ const TopicRoute = DiscourseRoute.extend({
           postUrl += "/" + currentPost;
         }
 
-        cancel(scheduledReplace);
-        lastScrollPos = parseInt($(document).scrollTop(), 10);
-        scheduledReplace = later(
-          this,
-          "_replaceUnlessScrolling",
-          postUrl,
-          Ember.Test ? 0 : SCROLL_DELAY
-        );
+        cancel(this.scheduledReplace);
+
+        this.setProperties({
+          lastScrollPos: parseInt($(document).scrollTop(), 10),
+          scheduledReplace: later(
+            this,
+            "_replaceUnlessScrolling",
+            postUrl,
+            Ember.Test ? 0 : SCROLL_DELAY
+          )
+        });
       }
     },
 
@@ -198,8 +207,8 @@ const TopicRoute = DiscourseRoute.extend({
 
     willTransition() {
       this._super(...arguments);
-      cancel(scheduledReplace);
-      isTransitioning = true;
+      cancel(this.scheduledReplace);
+      this.set("isTransitioning", true);
       return true;
     }
   },
@@ -208,17 +217,20 @@ const TopicRoute = DiscourseRoute.extend({
   // within a topic until scrolling stops
   _replaceUnlessScrolling(url) {
     const currentPos = parseInt($(document).scrollTop(), 10);
-    if (currentPos === lastScrollPos) {
+    if (currentPos === this.lastScrollPos) {
       DiscourseURL.replaceState(url);
       return;
     }
-    lastScrollPos = currentPos;
-    scheduledReplace = later(
-      this,
-      "_replaceUnlessScrolling",
-      url,
-      SCROLL_DELAY
-    );
+
+    this.setProperties({
+      lastScrollPos: currentPos,
+      scheduledReplace: later(
+        this,
+        "_replaceUnlessScrolling",
+        url,
+        SCROLL_DELAY
+      )
+    });
   },
 
   setupParams(topic, params) {
@@ -264,7 +276,7 @@ const TopicRoute = DiscourseRoute.extend({
 
   activate() {
     this._super(...arguments);
-    isTransitioning = false;
+    this.set("isTransitioning", false);
 
     const topic = this.modelFor("topic");
     this.session.set("lastTopicIdViewed", parseInt(topic.get("id"), 10));
@@ -292,7 +304,7 @@ const TopicRoute = DiscourseRoute.extend({
 
   setupController(controller, model) {
     // In case we navigate from one topic directly to another
-    isTransitioning = false;
+    this.set("isTransitioning", false);
 
     controller.setProperties({
       model,
@@ -314,9 +326,9 @@ const TopicRoute = DiscourseRoute.extend({
     // We reset screen tracking every time a topic is entered
     this.screenTrack.start(model.get("id"), controller);
 
-    scheduleOnce("afterRender", () => {
-      this.appEvents.trigger("header:update-topic", model);
-    });
+    schedule("afterRender", () =>
+      this.appEvents.trigger("header:update-topic", model)
+    );
   }
 });
 
diff --git a/app/assets/javascripts/wizard/components/invite-list.js b/app/assets/javascripts/wizard/components/invite-list.js
index 2c541d38c5..39435e0f89 100644
--- a/app/assets/javascripts/wizard/components/invite-list.js
+++ b/app/assets/javascripts/wizard/components/invite-list.js
@@ -1,4 +1,4 @@
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 
 export default Component.extend({
@@ -63,7 +63,7 @@ export default Component.extend({
       this.updateField();
 
       this.set("inviteEmail", "");
-      scheduleOnce("afterRender", () =>
+      schedule("afterRender", () =>
         this.element.querySelector(".invite-email").focus()
       );
     },
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js b/app/assets/javascripts/wizard/components/wizard-step.js
index dd36c58891..9056e9a052 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js
+++ b/app/assets/javascripts/wizard/components/wizard-step.js
@@ -1,4 +1,4 @@
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import getUrl from "discourse-common/lib/get-url";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
@@ -96,7 +96,7 @@ export default Component.extend({
   },
 
   autoFocus() {
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       const $invalid = $(".wizard-field.invalid:eq(0) .wizard-focusable");
 
       if ($invalid.length) {
@@ -108,7 +108,7 @@ export default Component.extend({
   },
 
   animateInvalidFields() {
-    scheduleOnce("afterRender", () =>
+    schedule("afterRender", () =>
       $(".invalid input[type=text], .invalid textarea").wiggle(2, 100)
     );
   },
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 0f2fd5ec0a..38afc19d67 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -201,6 +201,8 @@ QUnit.testDone(function() {
   });
 
   window.MessageBus.unsubscribe("*");
+  delete window.server;
+  window.Mousetrap.reset();
 });
 
 // Load ES6 tests

From ed6b3b82bd376e80fa5880bc767cc6a5d5d66702 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 16 Apr 2020 12:13:13 +0100
Subject: [PATCH 535/633] FIX: Reopen sidekiq log files after rotation (#9429)

Unicorn uses the USR1 to indicate that log files should be reopened. This commit implements the same functionality for our forked sidekiq workers:

- USR1 is intercepted in the unicorn master, and re-issued to all child processes
- USR1 is trapped in the sidekiq processes, and `Unicorn::Util.reopen_logs` is used to re-open log files
---
 config/unicorn.conf.rb |  7 +++++++
 lib/demon/base.rb      | 11 +++++++++++
 lib/demon/sidekiq.rb   |  7 +++++++
 3 files changed, 25 insertions(+)

diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index dd698f379f..268edb66c9 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -95,6 +95,13 @@ before_fork do |server, worker|
         Demon::Sidekiq.stop
       end
 
+      # Trap USR1, so we can re-issue to sidekiq workers
+      # but chain the default unicorn implementation as well
+      old_handler = Signal.trap("USR1") do
+        Demon::Sidekiq.kill("USR1")
+        old_handler.call
+      end
+
       class ::Unicorn::HttpServer
         alias :master_sleep_orig :master_sleep
 
diff --git a/lib/demon/base.rb b/lib/demon/base.rb
index d1626114d7..fc752a4464 100644
--- a/lib/demon/base.rb
+++ b/lib/demon/base.rb
@@ -37,6 +37,13 @@ class Demon::Base
     end
   end
 
+  def self.kill(signal)
+    return unless @demons
+    @demons.values.each do |demon|
+      demon.kill(signal)
+    end
+  end
+
   attr_reader :pid, :parent_pid, :started, :index
   attr_accessor :stop_timeout
 
@@ -63,6 +70,10 @@ class Demon::Base
     end
   end
 
+  def kill(signal)
+    Process.kill(signal, @pid)
+  end
+
   def stop_signal
     "HUP"
   end
diff --git a/lib/demon/sidekiq.rb b/lib/demon/sidekiq.rb
index e5ff82f702..a66fed3aef 100644
--- a/lib/demon/sidekiq.rb
+++ b/lib/demon/sidekiq.rb
@@ -34,6 +34,13 @@ class Demon::Sidekiq < ::Demon::Base
     Sidekiq.logger = nil
     cli = Sidekiq::CLI.instance
 
+    # Unicorn uses USR1 to indicate that log files have been rotated
+    Signal.trap("USR1") do
+      puts "Sidekiq PID #{Process.pid} reopening logs..."
+      Unicorn::Util.reopen_logs
+      puts "Sidekiq PID #{Process.pid} done reopening logs..."
+    end
+
     options = ["-c", GlobalSetting.sidekiq_workers.to_s]
 
     [['critical', 8], ['default', 4], ['low', 2], ['ultra_low', 1]].each do |queue_name, weight|

From 1168d5c70ab9edbef6a7008a10c61291b2772a7f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 15:45:18 +0200
Subject: [PATCH 536/633] FIX: ensures keyboard event is not propagated when
 using c shortcut (#9441)

---
 app/assets/javascripts/discourse/lib/keyboard-shortcuts.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 9a3aff88a4..2ce05f463b 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -283,11 +283,13 @@ export default {
     });
   },
 
-  createTopic() {
+  createTopic(event) {
     if (!(this.currentUser && this.currentUser.can_create_topic)) {
       return;
     }
 
+    event.preventDefault();
+
     // If the page has a create-topic button, use it for context sensitive attributes like category
     let $createTopicButton = $("#create-topic");
     if ($createTopicButton.length) {

From 074509fd957ebc63c2afe9cc06b7609632217638 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 16 Apr 2020 12:28:16 -0400
Subject: [PATCH 537/633] FIX: don't demote users to TL2 when default trust
 level is 3

Within 24 hours of signing up, new users were losing their
default trust level of 3. With this fix, demotions from
trust level 3 won't happen when the "default trust level"
setting is 3 or 4.
---
 app/jobs/scheduled/tl3_promotions.rb          | 32 ++++++++++---------
 app/models/trust_level3_requirements.rb       |  1 +
 spec/jobs/tl3_promotions_spec.rb              |  9 ++++++
 spec/models/trust_level3_requirements_spec.rb |  8 +++++
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/app/jobs/scheduled/tl3_promotions.rb b/app/jobs/scheduled/tl3_promotions.rb
index 848f409b9c..7dcce77a05 100644
--- a/app/jobs/scheduled/tl3_promotions.rb
+++ b/app/jobs/scheduled/tl3_promotions.rb
@@ -6,22 +6,24 @@ module Jobs
     daily at: 4.hours
 
     def execute(args)
-      # Demotions
-      demoted_user_ids = []
-      User.real
-        .joins("LEFT JOIN (SELECT gu.user_id, MAX(g.grant_trust_level) AS group_granted_trust_level FROM groups g, group_users gu WHERE g.id = gu.group_id GROUP BY gu.user_id) tl ON users.id = tl.user_id")
-        .where(
-          trust_level: TrustLevel[3],
-          manual_locked_trust_level: nil
-        )
-        .where("group_granted_trust_level IS NULL OR group_granted_trust_level < ?", TrustLevel[3])
-        .find_each do |u|
-        # Don't demote too soon after being promoted
-        next if u.on_tl3_grace_period?
+      if SiteSetting.default_trust_level < 3
+        # Demotions
+        demoted_user_ids = []
+        User.real
+          .joins("LEFT JOIN (SELECT gu.user_id, MAX(g.grant_trust_level) AS group_granted_trust_level FROM groups g, group_users gu WHERE g.id = gu.group_id GROUP BY gu.user_id) tl ON users.id = tl.user_id")
+          .where(
+            trust_level: TrustLevel[3],
+            manual_locked_trust_level: nil
+          )
+          .where("group_granted_trust_level IS NULL OR group_granted_trust_level < ?", TrustLevel[3])
+          .find_each do |u|
+          # Don't demote too soon after being promoted
+          next if u.on_tl3_grace_period?
 
-        if Promotion.tl3_lost?(u)
-          demoted_user_ids << u.id
-          Promotion.new(u).change_trust_level!(TrustLevel[2])
+          if Promotion.tl3_lost?(u)
+            demoted_user_ids << u.id
+            Promotion.new(u).change_trust_level!(TrustLevel[2])
+          end
         end
       end
 
diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb
index b01da6c10e..bf511a0647 100644
--- a/app/models/trust_level3_requirements.rb
+++ b/app/models/trust_level3_requirements.rb
@@ -67,6 +67,7 @@ class TrustLevel3Requirements
 
   def requirements_lost?
     return false if trust_level_locked
+    return false if SiteSetting.default_trust_level > 2
 
     @user.suspended? ||
       @user.silenced? ||
diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb
index abfa8ebc8f..f76007df55 100644
--- a/spec/jobs/tl3_promotions_spec.rb
+++ b/spec/jobs/tl3_promotions_spec.rb
@@ -135,5 +135,14 @@ describe Jobs::Tl3Promotions do
       run_job
       expect(user.reload.trust_level).to eq(TrustLevel[3])
     end
+
+    it "doesn't demote if default trust level for all users is 3" do
+      SiteSetting.default_trust_level = 3
+      user = Fabricate(:user, trust_level: TrustLevel[3], created_at: 1.year.ago)
+      expect(user).to_not be_on_tl3_grace_period
+      TrustLevel3Requirements.any_instance.stubs(:requirements_met?).returns(false)
+      run_job
+      expect(user.reload.trust_level).to eq(TrustLevel[3])
+    end
   end
 end
diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index ef36c18728..a28f54debb 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -586,6 +586,14 @@ describe TrustLevel3Requirements do
       user.silenced_till = 4.weeks.from_now
       expect(tl3_requirements.requirements_lost?).to eq(true)
     end
+
+    [3, 4].each do |default_tl|
+      it "is not lost if default_trust_level is #{default_tl}" do
+        SiteSetting.default_trust_level = default_tl
+        tl3_requirements.stubs(:days_visited).returns(1)
+        expect(tl3_requirements.requirements_lost?).to eq(false)
+      end
+    end
   end
 
 end

From 424a76145d8f844c2e952f7974bcde16d5a85faa Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 15 Apr 2020 14:37:37 -0700
Subject: [PATCH 538/633] DEV: Fix no-implicit-this for all user-* components

---
 .../templates/components/user-badge.hbs       |   8 +-
 .../components/user-card-contents.hbs         | 156 +++++++++---------
 .../components/user-fields/confirm.hbs        |  10 +-
 .../components/user-fields/dropdown.hbs       |  18 +-
 .../templates/components/user-fields/text.hbs |  10 +-
 .../components/user-flag-percentage.hbs       |   8 +-
 .../templates/components/user-info.hbs        |  18 +-
 .../components/user-profile-avatar.hbs        |  14 +-
 .../templates/components/user-stat.hbs        |  14 +-
 .../templates/components/user-stream-item.hbs |  50 +++---
 .../templates/components/user-stream.hbs      |   2 +-
 .../user-summary-category-search.hbs          |   6 +-
 .../components/user-summary-section.hbs       |   2 +-
 .../components/user-summary-topic.hbs         |   8 +-
 .../components/user-summary-topics-list.hbs   |  12 +-
 .../components/user-summary-user.hbs          |   6 +-
 .../components/user-summary-users-list.hbs    |   6 +-
 17 files changed, 174 insertions(+), 174 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/user-badge.hbs b/app/assets/javascripts/discourse/templates/components/user-badge.hbs
index c1af47a6da..89c7dd8b70 100644
--- a/app/assets/javascripts/discourse/templates/components/user-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-badge.hbs
@@ -1,7 +1,7 @@
-<a href={{badgeUrl}}>
-  {{#badge-button badge=badge}}
-    {{#if showGrantCount}}
-      <span class="count">(&times;&nbsp;{{count}})</span>
+<a href={{this.badgeUrl}}>
+  {{#badge-button badge=@badge}}
+    {{#if this.showGrantCount}}
+      <span class="count">(&times;&nbsp;{{@count}})</span>
     {{/if}}
   {{/badge-button}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index e5ac4178c2..3be60e856c 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -1,6 +1,6 @@
-{{#if visible}}
+{{#if this.visible}}
   <div class="card-content">
-    {{#if loading}}
+    {{#if this.loading}}
       <div class="card-row first-row">
         <div class="user-card-avatar">
           <div class="card-avatar-placeholder animated-placeholder placeholder-animation"></div>
@@ -22,71 +22,71 @@
     {{else}}
       <div class="card-row first-row">
         <div class="user-card-avatar">
-          {{#if user.profile_hidden}}
-            <span class="card-huge-avatar">{{bound-avatar user "huge"}}</span>
+          {{#if this.user.profile_hidden}}
+            <span class="card-huge-avatar">{{bound-avatar this.user "huge"}}</span>
           {{else}}
-            <a href={{user.path}} {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
+            <a href={{this.user.path}} {{action "showUser" this.user}} class="card-huge-avatar">{{bound-avatar this.user "huge"}}</a>
           {{/if}}
-          {{#if user.primary_group_name}}
+          {{#if this.user.primary_group_name}}
             {{avatar-flair
-            flairURL=user.primary_group_flair_url
-            flairBgColor=user.primary_group_flair_bg_color
-            flairColor=user.primary_group_flair_color
-            groupName=user.primary_group_name}}
+            flairURL=this.user.primary_group_flair_url
+            flairBgColor=this.user.primary_group_flair_bg_color
+            flairColor=this.user.primary_group_flair_color
+            groupName=this.user.primary_group_name}}
           {{/if}}
-          {{plugin-outlet name="user-card-avatar-flair" args=(hash user=user) tagName="div"}}
+          {{plugin-outlet name="user-card-avatar-flair" args=(hash user=this.user) tagName="div"}}
         </div>
         <div class="names">
-          <h1 class="{{staff}} {{newUser}} {{if nameFirst "full-name" "username"}}">
-            {{#if user.profile_hidden}}
+          <h1 class="{{this.staff}} {{this.newUser}} {{if this.nameFirst "full-name" "username"}}">
+            {{#if this.user.profile_hidden}}
               <span class="name-username-wrapper">
-                {{if nameFirst user.name (format-username username)}}
+                {{if this.nameFirst this.user.name (format-username this.username)}}
               </span>
             {{else}}
-              <a href={{user.path}} {{action "showUser" user}} class="user-profile-link">
+              <a href={{this.user.path}} {{action "showUser" this.user}} class="user-profile-link">
                 <span class="name-username-wrapper">
-                  {{if nameFirst user.name (format-username username)}}
+                  {{if this.nameFirst this.user.name (format-username this.username)}}
                 </span>
-                {{user-status user currentUser=currentUser}}
+                {{user-status this.user currentUser=this.currentUser}}
               </a>
             {{/if}}
           </h1>
-          {{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=""}}
-          {{#if nameFirst}}
-            <h2 class="username">{{username}}</h2>
+          {{plugin-outlet name="user-card-after-username" args=(hash user=this.user showUser=(action "showUser" this.user)) tagName=""}}
+          {{#if this.nameFirst}}
+            <h2 class="username">{{this.username}}</h2>
           {{else}}
-            {{#if user.name}}
-              <h2 class="full-name">{{user.name}}</h2>
+            {{#if this.user.name}}
+              <h2 class="full-name">{{this.user.name}}</h2>
             {{/if}}
           {{/if}}
-          {{#if user.title}}
-            <h2>{{user.title}}</h2>
+          {{#if this.user.title}}
+            <h2>{{this.user.title}}</h2>
           {{/if}}
-          {{#if user.staged}}
+          {{#if this.user.staged}}
             <h2 class="staged">{{i18n "user.staged"}}</h2>
           {{/if}}
-          {{plugin-outlet name="user-card-post-names" args=(hash user=user) tagName="div"}}
+          {{plugin-outlet name="user-card-post-names" args=(hash user=this.user) tagName="div"}}
         </div>
         <ul class="usercard-controls">
-          {{#if user.can_send_private_message_to_user}}
+          {{#if this.user.can_send_private_message_to_user}}
             <li class="compose-pm">
               {{d-button
               class="btn-primary"
-              action=(action "composePM" user post)
+              action=(action "composePM" this.user this.post)
               icon="envelope"
               label="user.private_message"}}
             </li>
           {{/if}}
-          {{#if showFilter}}
+          {{#if this.showFilter}}
             <li>
               {{d-button
               class="btn-default"
-              action=(action "togglePosts" user)
+              action=(action "togglePosts" this.user)
               icon="filter"
-              translatedLabel=togglePostsLabel}}
+              translatedLabel=this.togglePostsLabel}}
             </li>
           {{/if}}
-          {{#if hasUserFilters}}
+          {{#if this.hasUserFilters}}
             <li>
               {{d-button
               action=(action "cancelFilter")
@@ -94,12 +94,12 @@
               label="topic.filters.cancel"}}
             </li>
           {{/if}}
-          {{#if showDelete}}
+          {{#if this.showDelete}}
             <li>
               {{d-button
               class="btn-danger"
               action=(action "deleteUser")
-              actionParam=user
+              actionParam=this.user
               icon="exclamation-triangle"
               label="admin.user.delete"}}
             </li>
@@ -107,11 +107,11 @@
         </ul>
         {{plugin-outlet
         name="user-card-additional-controls"
-        args=(hash user=user close=(action "close"))
+        args=(hash user=this.user close=(action "close"))
         tagName=""}}
       </div>
 
-      {{#if user.profile_hidden}}
+      {{#if this.user.profile_hidden}}
         <div class="card-row second-row">
           <div class="profile-hidden">
             <span>{{i18n "user.profile_hidden"}}</span>
@@ -119,105 +119,105 @@
         </div>
       {{/if}}
 
-      {{#if isSuspendedOrHasBio}}
+      {{#if this.isSuspendedOrHasBio}}
         <div class="card-row second-row">
-          {{#if user.suspend_reason}}
+          {{#if this.user.suspend_reason}}
             <div class="suspended">
               <div class="suspension-date">
                 {{d-icon "ban"}}
-                {{i18n "user.suspended_notice" date=user.suspendedTillDate}}
+                {{i18n "user.suspended_notice" date=this.user.suspendedTillDate}}
               </div>
               <div class="suspension-reason">
                 <span class="suspension-reason-title">{{i18n "user.suspended_reason"}}</span>
-                <span class="suspension-reason-description">{{user.suspend_reason}}</span>
+                <span class="suspension-reason-description">{{this.user.suspend_reason}}</span>
               </div>
             </div>
           {{else}}
-            {{#if user.bio_excerpt}}
-              <div class="bio">{{text-overflow class="overflow" text=user.bio_excerpt}}</div>
+            {{#if this.user.bio_excerpt}}
+              <div class="bio">{{text-overflow class="overflow" text=this.user.bio_excerpt}}</div>
             {{/if}}
           {{/if}}
         </div>
       {{/if}}
 
-      {{#if showFeaturedTopic}}
+      {{#if this.showFeaturedTopic}}
         <div class="card-row">
           <div class="featured-topic">
             <span class="desc">{{i18n "user.featured_topic"}}</span>
-            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe (replace-emoji user.featured_topic.fancy_title)}}{{/link-to}}
+            {{#link-to "topic" this.user.featured_topic.slug this.user.featured_topic.id }}{{html-safe (replace-emoji this.user.featured_topic.fancy_title)}}{{/link-to}}
           </div>
         </div>
       {{/if}}
 
-      {{#if hasLocationOrWebsite}}
+      {{#if this.hasLocationOrWebsite}}
         <div class="card-row">
           <div class="location-and-website">
-            {{#if user.location}}
+            {{#if this.user.location}}
               <span class="location">
                 {{d-icon "map-marker-alt"}}
-                <span>{{user.location}}</span>
+                <span>{{this.user.location}}</span>
               </span>
             {{/if}}
-            {{#if user.website_name}}
+            {{#if this.user.website_name}}
               <span class="website-name">
                 {{d-icon "globe"}}
-                {{#if linkWebsite}}
+                {{#if this.linkWebsite}}
                   {{!-- template-lint-disable  --}}
-                  <a href="{{user.website}}" rel="noopener {{unless removeNoFollow 'nofollow ugc'}}"
-                   target="_blank">{{user.website_name}}</a>
+                  <a href="{{this.user.website}}" rel="noopener {{unless this.removeNoFollow 'nofollow ugc'}}"
+                   target="_blank">{{this.user.website_name}}</a>
                 {{else}}
-                  <span title={{user.website}}>{{user.website_name}}</span>
+                  <span title={{this.user.website}}>{{this.user.website_name}}</span>
                 {{/if}}
               </span>
             {{/if}}
-            {{plugin-outlet name="user-card-location-and-website" args=(hash user=user)}}
+            {{plugin-outlet name="user-card-location-and-website" args=(hash user=this.user)}}
           </div>
         </div>
       {{/if}}
 
       <div class="card-row">
-        {{#unless user.profile_hidden}}
+        {{#unless this.user.profile_hidden}}
           <div class="metadata">
-            {{#if user.last_posted_at}}
+            {{#if this.user.last_posted_at}}
               <h3><span class='desc'>{{i18n 'last_post'}}</span>
-                {{format-date user.last_posted_at leaveAgo="true"}}</h3>
+                {{format-date this.user.last_posted_at leaveAgo="true"}}</h3>
             {{/if}}
             <h3><span class='desc'>{{i18n 'joined'}}</span>
-              {{format-date user.created_at leaveAgo="true"}}</h3>
-            {{#if user.time_read}}
-              <h3 title="{{timeReadTooltip}}">
+              {{format-date this.user.created_at leaveAgo="true"}}</h3>
+            {{#if this.user.time_read}}
+              <h3 title="{{this.timeReadTooltip}}">
                 <span class='desc'>{{i18n 'time_read'}}</span>
-                {{format-duration user.time_read}}
-                {{#if showRecentTimeRead}}
-                  <span>({{i18n 'time_read_recently' time_read=recentTimeRead}})</span>
+                {{format-duration this.user.time_read}}
+                {{#if this.showRecentTimeRead}}
+                  <span>({{i18n 'time_read_recently' time_read=this.recentTimeRead}})</span>
                 {{/if}}
               </h3>
             {{/if}}
-            {{#if showCheckEmail}}
+            {{#if this.showCheckEmail}}
               <h3 class="email">
                 {{d-icon "far-envelope" title="user.email.title"}}
-                {{#if user.email}}
-                  {{user.email}}
+                {{#if this.user.email}}
+                  {{this.user.email}}
                 {{else}}
                   {{d-button
                     action=(action "checkEmail")
-                    actionParam=user
+                    actionParam=this.user
                     icon="far-envelope"
                     label="admin.users.check_email.text"
                     class="btn-primary"}}
                 {{/if}}
               </h3>
             {{/if}}
-            {{plugin-outlet name="user-card-metadata" args=(hash user=user)}}
+            {{plugin-outlet name="user-card-metadata" args=(hash user=this.user)}}
           </div>
         {{/unless}}
-        {{plugin-outlet name="user-card-after-metadata" args=(hash user=user)}}
+        {{plugin-outlet name="user-card-after-metadata" args=(hash user=this.user)}}
       </div>
 
-      {{#if publicUserFields}}
+      {{#if this.publicUserFields}}
         <div class="card-row">
           <div class="public-user-fields">
-            {{#each publicUserFields as |uf|}}
+            {{#each this.publicUserFields as |uf|}}
               {{#if uf.value}}
                 <div class="public-user-field {{uf.field.dasherized_name}}">
                   <span class="user-field-name">{{uf.field.name}}:</span>
@@ -229,19 +229,19 @@
         </div>
       {{/if}}
 
-      {{plugin-outlet name="user-card-before-badges" args=(hash user=user)}}
+      {{plugin-outlet name="user-card-before-badges" args=(hash user=this.user)}}
 
-      {{#if showBadges}}
+      {{#if this.showBadges}}
         <div class="card-row">
-          {{#if user.featured_user_badges}}
+          {{#if this.user.featured_user_badges}}
             <div class="badge-section">
-              {{#each user.featured_user_badges as |ub|}}
-                {{user-badge badge=ub.badge user=user}}
+              {{#each this.user.featured_user_badges as |ub|}}
+                {{user-badge badge=ub.badge user=this.user}}
               {{/each}}
-              {{#if showMoreBadges}}
+              {{#if this.showMoreBadges}}
                 <span class='more-user-badges'>
-                  {{#link-to 'user.badges' user}}
-                    {{i18n 'badges.more_badges' count=moreBadgesCount}}
+                  {{#link-to 'user.badges' this.user}}
+                    {{i18n 'badges.more_badges' count=this.moreBadgesCount}}
                   {{/link-to}}
                 </span>
               {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index 64ee54fa82..a60986f98b 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,14 +1,14 @@
-{{#if field.name}}
-  <label class="control-label" for={{concat "user-" elementId}}>
-    {{html-safe field.name}}   {{#if field.required}}<span class="required">*</span>{{/if}}
+{{#if this.field.name}}
+  <label class="control-label" for={{concat "user-" this.elementId}}>
+    {{html-safe this.field.name}} {{#if this.field.required}}<span class="required">*</span>{{/if}}
   </label>
 {{/if}}
 
 <div class="controls">
   <label class="control-label checkbox-label">
-    {{input id=(concat "user-" elementId) checked=value type="checkbox"}}
+    {{input id=(concat "user-" this.elementId) checked=this.value type="checkbox"}}
     <span>
-      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class="required">*</span>{{/if}}{{/unless}}
+      {{html-safe this.field.description}} {{#unless this.field.name}}{{#if this.field.required}}<span class="required">*</span>{{/if}}{{/unless}}
     </span>
   </label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index f59b0dfd05..f34fe5267b 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,19 +1,19 @@
-<label class="control-label" for={{concat "user-" elementId}}>
-  {{html-safe field.name}}
-  {{#if field.required}}
+<label class="control-label" for={{concat "user-" this.elementId}}>
+  {{html-safe this.field.name}}
+  {{#if this.field.required}}
     <span class="required">*</span>
   {{/if}}
 </label>
 
 <div class="controls">
   {{combo-box
-    id=(concat "user-" elementId)
-    content=field.options
+    id=(concat "user-" this.elementId)
+    content=this.field.options
     valueProperty=null
     nameProperty=null
-    value=value
-    none=noneLabel
-    onChange=(action (mut value))
+    value=this.value
+    none=this.noneLabel
+    onChange=(action (mut this.value))
   }}
-  <div class="instructions">{{html-safe field.description}}</div>
+  <div class="instructions">{{html-safe this.field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 09a8a136e7..81c9439cb6 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,8 +1,8 @@
-<label class="control-label" for={{concat "user-" elementId}}>
-  {{html-safe field.name}}
-  {{#if field.required}}<span class="required">*</span>{{/if}}
+<label class="control-label" for={{concat "user-" this.elementId}}>
+  {{html-safe this.field.name}}
+  {{#if this.field.required}}<span class="required">*</span>{{/if}}
 </label>
 <div class="controls">
-  {{input id=(concat "user-" elementId) value=value maxlength=site.user_field_max_length}}
-  <div class="instructions">{{html-safe field.description}}</div>
+  {{input id=(concat "user-" this.elementId) value=this.value maxlength=this.site.user_field_max_length}}
+  <div class="instructions">{{html-safe this.field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs b/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
index 93b924b75d..c129ebd59f 100644
--- a/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
@@ -1,6 +1,6 @@
-{{#if showPercentage}}
-  <div title={{percentage.title}} class="user-flag-percentage">
-    <span class="percentage-label {{percentage.className}}">{{percentage.label}}</span>
-    {{d-icon percentage.icon}}
+{{#if this.showPercentage}}
+  <div title={{this.percentage.title}} class="user-flag-percentage">
+    <span class="percentage-label {{this.percentage.className}}">{{this.percentage.label}}</span>
+    {{d-icon this.percentage.icon}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-info.hbs b/app/assets/javascripts/discourse/templates/components/user-info.hbs
index 59160413bb..fe6c7823fe 100644
--- a/app/assets/javascripts/discourse/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-info.hbs
@@ -1,22 +1,22 @@
 <div class="user-image">
   <div class="user-image-inner">
-    <a href={{userPath}} data-user-card={{user.username}}>{{avatar user imageSize="large"}}</a>
-    {{#if user.primary_group_name}}
+    <a href={{this.userPath}} data-user-card={{@user.username}}>{{avatar @user imageSize="large"}}</a>
+    {{#if @user.primary_group_name}}
       {{avatar-flair
-        flairURL=user.primary_group_flair_url
-        flairBgColor=user.primary_group_flair_bg_color
-        flairColor=user.primary_group_flair_color
-        groupName=user.primary_group_name}}
+        flairURL=@user.primary_group_flair_url
+        flairBgColor=@user.primary_group_flair_bg_color
+        flairColor=@user.primary_group_flair_color
+        groupName=@user.primary_group_name}}
     {{/if}}
   </div>
 </div>
 
 <div class="user-detail">
   <div class="name-line">
-    <span class="username"><a href={{userPath}} data-user-card={{user.username}}>{{format-username user.username}}</a></span>
-    <span class="name">{{name}}</span>
+    <span class="username"><a href={{this.userPath}} data-user-card={{@user.username}}>{{format-username @user.username}}</a></span>
+    <span class="name">{{this.name}}</span>
   </div>
-  <div class="title">{{user.title}}</div>
+  <div class="title">{{@user.title}}</div>
 
   {{#if hasBlock}}
     <div class="details">
diff --git a/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
index 303878d412..f2965aabb0 100644
--- a/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
@@ -1,11 +1,11 @@
 <div class="user-profile-avatar">
-  {{bound-avatar user "huge"}}
-  {{#if user.primary_group_name}}
+  {{bound-avatar @user "huge"}}
+  {{#if @user.primary_group_name}}
     {{avatar-flair
-      flairURL=user.primary_group_flair_url
-      flairBgColor=user.primary_group_flair_bg_color
-      flairColor=user.primary_group_flair_color
-      groupName=user.primary_group_name}}
+      flairURL=@user.primary_group_flair_url
+      flairBgColor=@user.primary_group_flair_bg_color
+      flairColor=@user.primary_group_flair_color
+      groupName=@user.primary_group_name}}
   {{/if}}
-  {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=user) tagName="div"}}
+  {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=@user) tagName="div"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index e95ab17d31..68cb27dad9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -1,13 +1,13 @@
 <span class="value">
-  {{#if isNumber}}
-    {{number value}}
-  {{else if isDuration}}
-    {{format-duration value}}
+  {{#if this.isNumber}}
+    {{number @value}}
+  {{else if this.isDuration}}
+    {{format-duration @value}}
   {{else}}
-    {{value}}
+    {{@value}}
   {{/if}}
 </span>
 <span class="label">
-  {{#if icon}}{{d-icon icon}}{{/if}}
-  {{html-safe (i18n label count=value)}}
+  {{#if @icon}}{{d-icon @icon}}{{/if}}
+  {{html-safe (i18n @label count=@value)}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index 278606bdb9..acfdaaa01f 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -1,51 +1,51 @@
 <div class="clearfix info">
-  <a href={{item.userUrl}} data-user-card={{item.username}} class="avatar-link"><div class="avatar-wrapper">{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
-  <span class="time">{{format-date item.created_at}}</span>
-  {{#if item.draftType}}
-    <span class="draft-type">{{html-safe item.draftType}}</span>
+  <a href={{@item.userUrl}} data-user-card={{@item.username}} class="avatar-link"><div class="avatar-wrapper">{{avatar @item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
+  <span class="time">{{format-date @item.created_at}}</span>
+  {{#if @item.draftType}}
+    <span class="draft-type">{{html-safe @item.draftType}}</span>
   {{else}}
-    {{expand-post item=item}}
+    {{expand-post item=@item}}
   {{/if}}
   <div class="stream-topic-details">
     <div class="stream-topic-title">
-      {{topic-status topic=item disableActions=true}}
+      {{topic-status topic=@item disableActions=true}}
       <span class="title">
-        {{#if item.postUrl}}
-          <a href={{item.postUrl}}>{{html-safe item.title}}</a>
+        {{#if @item.postUrl}}
+          <a href={{@item.postUrl}}>{{html-safe @item.title}}</a>
         {{else}}
-          {{html-safe item.title}}
+          {{html-safe @item.title}}
         {{/if}}
       </span>
     </div>
-    <div class="category">{{category-link item.category}}</div>
+    <div class="category">{{category-link @item.category}}</div>
   </div>
 
-  {{#if item.deleted_by}}
+  {{#if @item.deleted_by}}
     <span class="delete-info">
       {{d-icon "far-trash-alt"}}
-      {{avatar item.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
-      {{format-date item.deleted_at leaveAgo="true"}}
+      {{avatar @item.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
+      {{format-date @item.deleted_at leaveAgo="true"}}
     </span>
   {{/if}}
 
-  {{plugin-outlet name="user-stream-item-header" args=(hash item=item)}}
+  {{plugin-outlet name="user-stream-item-header" args=(hash item=@item)}}
 </div>
 
-{{#if actionDescription}}
-  <p class="excerpt">{{actionDescription}}</p>
+{{#if this.actionDescription}}
+  <p class="excerpt">{{this.actionDescription}}</p>
 {{/if}}
 
-<p data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}} class="excerpt">
+<p data-topic-id={{@item.topic_id}} data-post-id={{@item.post_id}} data-user-id={{@item.user_id}} class="excerpt">
   {{!-- template-lint-disable no-triple-curlies --}}
-  {{~#if item.expandedExcerpt}}
-    {{~{item.expandedExcerpt}~}}
+  {{~#if @item.expandedExcerpt}}
+    {{~{@item.expandedExcerpt}~}}
   {{else}}
-    {{~{item.excerpt}~}}
+    {{~{@item.excerpt}~}}
   {{/if~}}
   {{!-- template-lint-enable --}}
 </p>
 
-{{#each item.children as |child|}}
+{{#each @item.children as |child|}}
   {{!-- DEPRECATED: 'child-actions' class --}}
   <div class="user-stream-item-actions child-actions">
     {{d-icon child.icon class="icon"}}
@@ -53,7 +53,7 @@
       {{#if grandChild.removableBookmark}}
         {{d-button
           class="btn-default remove-bookmark"
-          action=(action removeBookmark grandChild)
+          action=(action @removeBookmark grandChild)
           icon="times"
           label="bookmarks.remove"
         }}
@@ -65,9 +65,9 @@
   </div>
 {{/each}}
 
-{{#if item.editableDraft}}
+{{#if @item.editableDraft}}
   <div class="user-stream-item-draft-actions">
-    {{d-button action=resumeDraft actionParam=item icon="pencil-alt" label="drafts.resume" class="btn-default resume-draft"}}
-    {{d-button action=removeDraft actionParam=item icon="far-trash-alt" label="drafts.remove" class="btn-default remove-draft"}}
+    {{d-button action=@resumeDraft actionParam=@item icon="pencil-alt" label="drafts.resume" class="btn-default resume-draft"}}
+    {{d-button action=@removeDraft actionParam=@item icon="far-trash-alt" label="drafts.remove" class="btn-default remove-draft"}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream.hbs b/app/assets/javascripts/discourse/templates/components/user-stream.hbs
index 1e3b3c306e..b9a007f4dd 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream.hbs
@@ -1,4 +1,4 @@
-{{#each stream.content as |item|}}
+{{#each @stream.content as |item|}}
   {{user-stream-item
       item=item
       removeBookmark=(action "removeBookmark")
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
index 4694405f99..a0e1f3f0e0 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
@@ -1,6 +1,6 @@
-{{#if count}}
-  {{#link-to "full-page-search" (query-params q=searchParams)}}
-    {{count}}
+{{#if @count}}
+  {{#link-to "full-page-search" (query-params q=this.searchParams)}}
+    {{@count}}
   {{/link-to}}
 {{else}}
   &ndash;
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
index 69763aba1d..ae85180b48 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
@@ -1,2 +1,2 @@
-<h3 class="stats-title">{{i18n (concat "user.summary." title)}}</h3>
+<h3 class="stats-title">{{i18n (concat "user.summary." @title)}}</h3>
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index b1ab485fa6..1d11ac6522 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -1,9 +1,9 @@
 <span class="topic-info">
-  {{format-date createdAt format="tiny" noTitle="true"}}
-  {{#if likes}}
+  {{format-date @createdAt format="tiny" noTitle="true"}}
+  {{#if @likes}}
     &middot;
-    {{d-icon "heart"}}&nbsp;<span class="like-count">{{number likes}}</span>
+    {{d-icon "heart"}}&nbsp;<span class="like-count">{{number @likes}}</span>
   {{/if}}
 </span>
 <br>
-<a href={{url}}>{{html-safe topic.fancyTitle}}</a>
+<a href={{@url}}>{{html-safe @topic.fancyTitle}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs
index a74e5d6a23..d7e60c03ac 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs
@@ -1,16 +1,16 @@
-{{#if items}}
+{{#if @items}}
   <ul>
-    {{#each items as |item|}}
+    {{#each @items as |item|}}
       {{yield item}}
     {{/each}}
   </ul>
-  {{#if hasMore}}
+  {{#if this.hasMore}}
     <p>
-      {{#link-to (concat "userActivity." type) user class="more"}}
-        {{i18n (concat "user.summary.more_" type)}}
+      {{#link-to (concat "userActivity." @type) @user class="more"}}
+        {{i18n (concat "user.summary.more_" @type)}}
       {{/link-to}}
     </p>
   {{/if}}
 {{else}}
-  <p>{{i18n (concat "user.summary.no_" type)}}</p>
+  <p>{{i18n (concat "user.summary.no_" @type)}}</p>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs
index 876702f195..6213d66c83 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs
@@ -1,4 +1,4 @@
-{{#user-info user=user}}
-  {{d-icon icon}}
-  <span class={{countClass}}>{{number user.count}}</span>
+{{#user-info user=@user}}
+  {{d-icon @icon}}
+  <span class={{@countClass}}>{{number @user.count}}</span>
 {{/user-info}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs
index 1b291b638a..926a1fb4a8 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs
@@ -1,9 +1,9 @@
-{{#if users}}
+{{#if this.users}}
   <ul>
-    {{#each users as |user|}}
+    {{#each this.users as |user|}}
       {{yield user}}
     {{/each}}
   </ul>
 {{else}}
-  <p>{{i18n (concat "user.summary." none)}}</p>
+  <p>{{i18n (concat "user.summary." this.none)}}</p>
 {{/if}}

From 6e1a33b744ee94bad083f842d10ebe046d1939c0 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Thu, 16 Apr 2020 11:14:25 -0700
Subject: [PATCH 539/633] revert heatmap color changes in favor of accessible
 theme

---
 app/assets/stylesheets/common/base/_topic-list.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 6113446577..5b9cff0076 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -212,15 +212,15 @@
 
 .heatmap-high,
 .heatmap-high a {
-  color: #ec7213 !important;
+  color: #fe7a15 !important;
 }
 .heatmap-med,
 .heatmap-med a {
-  color: #b06318 !important;
+  color: #cf7721 !important;
 }
 .heatmap-low,
 .heatmap-low a {
-  color: #93704a !important;
+  color: #9b764f !important;
 }
 
 .topic-list .heatmap-high {

From 0fccea3762ed5f6c2d4d78381663001df315d106 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 16 Apr 2020 12:01:11 -0700
Subject: [PATCH 540/633] FIX: Keyboard navigation fixes in setup wizard
 (#9413)

- Delete a positive tabindex from a reused component
 - Copy :hover styles to :focus
 - Replace an 'outline: 0' rule with a TODO for a custom :focus style

Discovered while fixing the no-positive-tabindex lint.
---
 .../templates/components/radio-button.hbs     |  2 +-
 app/assets/stylesheets/wizard.scss            | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index cdd4756b35..2974b5ebec 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -1,5 +1,5 @@
 <div class="radio-area">
-  <input type="radio" name={{label}} tabindex="9">
+  <input type="radio" name={{label}}>
   <span class="radio-label">
     {{#if icon}}
       {{d-icon icon}}
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 2fd2067bd7..16a59ce294 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -280,7 +280,8 @@ body.wizard {
       font-size: $font-down-1;
     }
 
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: #eee;
     }
 
@@ -311,7 +312,8 @@ body.wizard {
     color: white;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.6);
 
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: #80b3ff;
     }
 
@@ -328,7 +330,8 @@ body.wizard {
     background-color: #e60000;
     color: white;
 
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: #cc0000;
     }
 
@@ -374,7 +377,8 @@ body.wizard {
       color: #333;
       box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
 
-      &:hover {
+      &:hover,
+      &:focus {
         background-color: #eee;
       }
 
@@ -396,7 +400,8 @@ body.wizard {
       color: #fff;
       background-color: #33b333;
 
-      &:hover {
+      &:hover,
+      &:focus {
         background-color: #4dcd4d;
       }
 
@@ -477,7 +482,8 @@ body.wizard {
       padding: 8px;
       margin: 0px 4px;
       width: 25%;
-      &:hover {
+      &:hover,
+      &:focus {
         background: #f3f3f3;
       }
     }
@@ -519,7 +525,8 @@ body.wizard {
   margin-bottom: 1.25em;
 
   input {
-    outline: 0;
+    /* TODO: Custom :focus style */
+    /* outline: 0;*/
   }
 
   .radio-label {

From b37b23838202dc9f49bd6bf108301218c4d72b17 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 16 Apr 2020 15:08:43 -0400
Subject: [PATCH 541/633] FIX: Reviewable score JS was in the wrong folder

---
 .../discourse/{templates => }/components/reviewable-score.js      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/assets/javascripts/discourse/{templates => }/components/reviewable-score.js (100%)

diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.js b/app/assets/javascripts/discourse/components/reviewable-score.js
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-score.js
rename to app/assets/javascripts/discourse/components/reviewable-score.js

From 0a9f283e7e8e336f3af602ad576c1b44be5cd58c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 22:12:37 +0200
Subject: [PATCH 542/633] REFACTOR: various refactoring applied to group pages
 (#9440)

---
 .../controllers/group-add-members.js          |  55 +++++----
 .../discourse/controllers/group-index.js      | 109 +++++++++---------
 .../controllers/group-manage-logs.js          |  44 ++++---
 .../discourse/controllers/group.js            |  82 +++++++------
 .../discourse/controllers/groups-new.js       |  23 ++--
 .../discourse/routes/group-index.js           |  29 ++---
 .../discourse/routes/group-members.js         |   2 +-
 .../javascripts/discourse/routes/group.js     |   2 +-
 .../javascripts/discourse/templates/group.hbs |  31 ++---
 9 files changed, 192 insertions(+), 185 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js b/app/assets/javascripts/discourse/controllers/group-add-members.js
index 9b1f888113..0637ac7993 100644
--- a/app/assets/javascripts/discourse/controllers/group-add-members.js
+++ b/app/assets/javascripts/discourse/controllers/group-add-members.js
@@ -3,6 +3,7 @@ import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import { extractError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { action } from "@ember/object";
 
 export default Controller.extend(ModalFunctionality, {
   loading: false,
@@ -13,36 +14,32 @@ export default Controller.extend(ModalFunctionality, {
     return loading || !usernames || !(usernames.length > 0);
   },
 
-  actions: {
-    addMembers() {
-      this.set("loading", true);
+  @action
+  addMembers() {
+    this.set("loading", true);
 
-      const model = this.model;
-      const usernames = model.get("usernames");
-      if (isEmpty(usernames)) {
-        return;
-      }
-      let promise;
-
-      if (this.setAsOwner) {
-        promise = model.addOwners(usernames, true);
-      } else {
-        promise = model.addMembers(usernames, true);
-      }
-
-      promise
-        .then(() => {
-          this.transitionToRoute("group.members", this.get("model.name"), {
-            queryParams: { filter: usernames }
-          });
-
-          model.set("usernames", null);
-          this.send("closeModal");
-        })
-        .catch(error => {
-          this.flash(extractError(error), "error");
-        })
-        .finally(() => this.set("loading", false));
+    const usernames = this.model.usernames;
+    if (isEmpty(usernames)) {
+      return;
     }
+    let promise;
+
+    if (this.setAsOwner) {
+      promise = this.model.addOwners(usernames, true);
+    } else {
+      promise = this.model.addMembers(usernames, true);
+    }
+
+    promise
+      .then(() => {
+        this.transitionToRoute("group.members", this.get("model.name"), {
+          queryParams: { filter: usernames }
+        });
+
+        this.model.set("usernames", null);
+        this.send("closeModal");
+      })
+      .catch(error => this.flash(extractError(error), "error"))
+      .finally(() => this.set("loading", false));
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js b/app/assets/javascripts/discourse/controllers/group-index.js
index b4168ba4c0..6d66189144 100644
--- a/app/assets/javascripts/discourse/controllers/group-index.js
+++ b/app/assets/javascripts/discourse/controllers/group-index.js
@@ -1,8 +1,9 @@
 import Controller, { inject as controller } from "@ember/controller";
-import { alias } from "@ember/object/computed";
+import { gt, readOnly } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseDebounce from "discourse/lib/debounce";
+import { action } from "@ember/object";
 
 export default Controller.extend({
   application: controller(),
@@ -15,7 +16,7 @@ export default Controller.extend({
   filterInput: null,
 
   loading: false,
-  isOwner: alias("model.is_group_owner"),
+  isOwner: readOnly("model.is_group_owner"),
   showActions: false,
 
   @observes("filterInput")
@@ -29,27 +30,22 @@ export default Controller.extend({
   },
 
   findMembers(refresh) {
-    if (this.loading) {
+    if (this.loading || !this.model) {
       return;
     }
 
-    const model = this.model;
-    if (!model) {
-      return;
-    }
-
-    if (!refresh && model.members.length >= model.user_count) {
+    if (!refresh && this.model.members.length >= this.model.user_count) {
       this.set("application.showFooter", true);
       return;
     }
 
     this.set("loading", true);
-    model.findMembers(this.memberParams, refresh).finally(() => {
-      this.set(
-        "application.showFooter",
-        model.members.length >= model.user_count
-      );
-      this.set("loading", false);
+    this.model.findMembers(this.memberParams, refresh).finally(() => {
+      this.setProperties({
+        "application.showFooter":
+          this.model.members.length >= this.model.user_count,
+        loading: false
+      });
     });
   },
 
@@ -58,10 +54,7 @@ export default Controller.extend({
     return { order, desc, filter };
   },
 
-  @discourseComputed("model.members.[]")
-  hasMembers(members) {
-    return members && members.length > 0;
-  },
+  hasMembers: gt("model.members.length", 0),
 
   @discourseComputed("model")
   canManageGroup(model) {
@@ -77,49 +70,53 @@ export default Controller.extend({
     }
   },
 
-  actions: {
-    loadMore() {
-      this.findMembers();
-    },
+  @action
+  loadMore() {
+    this.findMembers();
+  },
 
-    toggleActions() {
-      this.toggleProperty("showActions");
-    },
+  @action
+  toggleActions() {
+    this.toggleProperty("showActions");
+  },
 
-    actOnGroup(member, actionId) {
-      switch (actionId) {
-        case "removeMember":
-          this.send("removeMember", member);
-          break;
-        case "makeOwner":
-          this.send("makeOwner", member.username);
-          break;
-        case "removeOwner":
-          this.send("removeOwner", member);
-          break;
-      }
-    },
+  @action
+  actOnGroup(member, actionId) {
+    switch (actionId) {
+      case "removeMember":
+        this.removeMember(member);
+        break;
+      case "makeOwner":
+        this.makeOwner(member.username);
+        break;
+      case "removeOwner":
+        this.removeOwner(member);
+        break;
+    }
+  },
 
-    removeMember(user) {
-      this.model.removeMember(user, this.memberParams);
-    },
+  @action
+  removeMember(user) {
+    this.model.removeMember(user, this.memberParams);
+  },
 
-    makeOwner(username) {
-      this.model.addOwners(username);
-    },
+  @action
+  makeOwner(username) {
+    this.model.addOwners(username);
+  },
 
-    removeOwner(user) {
-      this.model.removeOwner(user);
-    },
+  @action
+  removeOwner(user) {
+    this.model.removeOwner(user);
+  },
 
-    addMembers() {
-      const usernames = this.usernames;
-      if (usernames && usernames.length > 0) {
-        this.model
-          .addMembers(usernames)
-          .then(() => this.set("usernames", []))
-          .catch(popupAjaxError);
-      }
+  @action
+  addMembers() {
+    if (this.usernames && this.usernames.length > 0) {
+      this.model
+        .addMembers(this.usernames)
+        .then(() => this.set("usernames", []))
+        .catch(popupAjaxError);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-logs.js b/app/assets/javascripts/discourse/controllers/group-manage-logs.js
index 80947cb9a6..ab3ff8ea81 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage-logs.js
+++ b/app/assets/javascripts/discourse/controllers/group-manage-logs.js
@@ -1,5 +1,5 @@
 import Controller, { inject as controller } from "@ember/controller";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
@@ -19,8 +19,8 @@ export default Controller.extend({
     "filters.target_user",
     "filters.subject"
   )
-  filterParams(action, acting_user, target_user, subject) {
-    return { action, acting_user, target_user, subject };
+  filterParams(filtersAction, acting_user, target_user, subject) {
+    return { action: filtersAction, acting_user, target_user, subject };
   },
 
   @observes(
@@ -54,28 +54,26 @@ export default Controller.extend({
     });
   },
 
-  actions: {
-    loadMore() {
-      if (this.get("model.all_loaded")) return;
+  @action
+  loadMore() {
+    if (this.get("model.all_loaded")) return;
 
-      this.set("loading", true);
+    this.set("loading", true);
 
-      this.get("group.model")
-        .findLogs(this.offset + 1, this.filterParams)
-        .then(results => {
-          results.logs.forEach(result =>
-            this.get("model.logs").addObject(result)
-          );
-          this.incrementProperty("offset");
-          this.set("model.all_loaded", results.all_loaded);
-        })
-        .finally(() => {
-          this.set("loading", false);
-        });
-    },
+    this.get("group.model")
+      .findLogs(this.offset + 1, this.filterParams)
+      .then(results => {
+        results.logs.forEach(result =>
+          this.get("model.logs").addObject(result)
+        );
+        this.incrementProperty("offset");
+        this.set("model.all_loaded", results.all_loaded);
+      })
+      .finally(() => this.set("loading", false));
+  },
 
-    clearFilter(key) {
-      this.set(`filters.${key}`, "");
-    }
+  @action
+  clearFilter(key) {
+    this.set(`filters.${key}`, "");
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group.js b/app/assets/javascripts/discourse/controllers/group.js
index b66561f39c..3ec4f40128 100644
--- a/app/assets/javascripts/discourse/controllers/group.js
+++ b/app/assets/javascripts/discourse/controllers/group.js
@@ -1,15 +1,18 @@
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import { inject as service } from "@ember/service";
 import { readOnly } from "@ember/object/computed";
+import deprecated from "discourse-common/lib/deprecated";
 
 const Tab = EmberObject.extend({
   init() {
     this._super(...arguments);
-    let name = this.name;
-    this.set("route", this.route || `group.` + name);
-    this.set("message", I18n.t(`groups.${this.i18nKey || name}`));
+
+    this.setProperties({
+      route: this.route || `group.${this.name}`,
+      message: I18n.t(`groups.${this.i18nKey || this.name}`)
+    });
   }
 });
 
@@ -19,7 +22,7 @@ export default Controller.extend({
   showing: "members",
   destroying: null,
   router: service(),
-  currentPath: readOnly("router._router.currentPath"),
+  currentPath: readOnly("router.currentRouteName"),
 
   @discourseComputed(
     "showMessages",
@@ -39,11 +42,10 @@ export default Controller.extend({
       name: "members",
       route: "group.index",
       icon: "users",
-      i18nKey: "members.title"
+      i18nKey: "members.title",
+      count: userCount
     });
 
-    membersTab.set("count", userCount);
-
     const defaultTabs = [membersTab, Tab.create({ name: "activity" })];
 
     if (canManageGroup && allowMembershipRequests) {
@@ -127,37 +129,45 @@ export default Controller.extend({
     );
   },
 
-  actions: {
-    messageGroup() {
-      this.send("createNewMessageViaParams", this.get("model.name"));
-    },
+  @action
+  messageGroup() {
+    this.send("createNewMessageViaParams", this.get("model.name"));
+  },
 
-    destroy() {
-      const group = this.model;
-      this.set("destroying", true);
+  @action
+  destroyGroup() {
+    this.set("destroying", true);
 
-      bootbox.confirm(
-        I18n.t("admin.groups.delete_confirm"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        confirmed => {
-          if (confirmed) {
-            group
-              .destroy()
-              .then(() => {
-                this.transitionToRoute("groups.index");
-              })
-              .catch(error => {
-                // eslint-disable-next-line no-console
-                console.error(error);
-                bootbox.alert(I18n.t("admin.groups.delete_failed"));
-              })
-              .finally(() => this.set("destroying", false));
-          } else {
-            this.set("destroying", false);
-          }
+    bootbox.confirm(
+      I18n.t("admin.groups.delete_confirm"),
+      I18n.t("no_value"),
+      I18n.t("yes_value"),
+      confirmed => {
+        if (confirmed) {
+          this.model
+            .destroy()
+            .then(() => this.transitionToRoute("groups.index"))
+            .catch(error => {
+              // eslint-disable-next-line no-console
+              console.error(error);
+              bootbox.alert(I18n.t("admin.groups.delete_failed"));
+            })
+            .finally(() => this.set("destroying", false));
+        } else {
+          this.set("destroying", false);
         }
-      );
+      }
+    );
+  },
+
+  actions: {
+    destroy() {
+      deprecated("Use `destroyGroup` action instead of `destroy`.", {
+        since: "2.5.0",
+        dropFrom: "2.6.0"
+      });
+
+      this.destroyGroup();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js b/app/assets/javascripts/discourse/controllers/groups-new.js
index f93c08959d..05013cb7da 100644
--- a/app/assets/javascripts/discourse/controllers/groups-new.js
+++ b/app/assets/javascripts/discourse/controllers/groups-new.js
@@ -1,21 +1,20 @@
+import { action } from "@ember/object";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   saving: null,
 
-  actions: {
-    save() {
-      this.set("saving", true);
-      const group = this.model;
+  @action
+  save() {
+    this.set("saving", true);
 
-      group
-        .create()
-        .then(() => {
-          this.transitionToRoute("group.members", group.name);
-        })
-        .catch(popupAjaxError)
-        .finally(() => this.set("saving", false));
-    }
+    this.model
+      .create()
+      .then(() => {
+        this.transitionToRoute("group.members", this.model.name);
+      })
+      .catch(popupAjaxError)
+      .finally(() => this.set("saving", false));
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-index.js b/app/assets/javascripts/discourse/routes/group-index.js
index a3aed42816..a543c89613 100644
--- a/app/assets/javascripts/discourse/routes/group-index.js
+++ b/app/assets/javascripts/discourse/routes/group-index.js
@@ -1,5 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
+import { action } from "@ember/object";
 
 export default DiscourseRoute.extend({
   titleToken() {
@@ -12,28 +13,28 @@ export default DiscourseRoute.extend({
   },
 
   setupController(controller, model) {
-    this.controllerFor("group").set("showing", "members");
-
     controller.setProperties({
       model,
-      filterInput: this._params.filter
+      filterInput: this._params.filter,
+      showing: "members"
     });
 
     controller.findMembers(true);
   },
 
-  actions: {
-    showAddMembersModal() {
-      showModal("group-add-members", { model: this.modelFor("group") });
-    },
+  @action
+  showAddMembersModal() {
+    showModal("group-add-members", { model: this.modelFor("group") });
+  },
 
-    showBulkAddModal() {
-      showModal("group-bulk-add", { model: this.modelFor("group") });
-    },
+  @action
+  showBulkAddModal() {
+    showModal("group-bulk-add", { model: this.modelFor("group") });
+  },
 
-    didTransition() {
-      this.controllerFor("group-index").set("filterInput", this._params.filter);
-      return true;
-    }
+  @action
+  didTransition() {
+    this.controllerFor("group-index").set("filterInput", this._params.filter);
+    return true;
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-members.js b/app/assets/javascripts/discourse/routes/group-members.js
index 872052de67..a3031c03bb 100644
--- a/app/assets/javascripts/discourse/routes/group-members.js
+++ b/app/assets/javascripts/discourse/routes/group-members.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  beforeModel: function() {
+  beforeModel() {
     this.transitionTo("group.index");
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/group.js b/app/assets/javascripts/discourse/routes/group.js
index bd58f6d3a7..8a60e8654e 100644
--- a/app/assets/javascripts/discourse/routes/group.js
+++ b/app/assets/javascripts/discourse/routes/group.js
@@ -14,6 +14,6 @@ export default DiscourseRoute.extend({
   },
 
   setupController(controller, model) {
-    controller.setProperties({ model });
+    controller.set("model", model);
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 0a53f7f1c0..ba6ed2b8cc 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -9,7 +9,8 @@
             flairURL=model.flair_url
             flairBgColor=model.flair_bg_color
             flairColor=model.flair_color
-            groupName=model.name}}
+            groupName=model.name
+          }}
         </span>
       {{/if}}
 
@@ -32,24 +33,28 @@
 
     <div class="group-details-button">
       {{group-membership-button
-          class="inline"
-          model=model
-          showLogin=(route-action  "showLogin")}}
+        class="inline"
+        model=model
+        showLogin=(route-action "showLogin")
+      }}
 
       {{#if displayGroupMessageButton}}
         {{d-button
-            action=(action "messageGroup")
-            class="btn-primary group-message-button inline"
-            icon="envelope"
-            label="groups.message"}}
+          action=(action "messageGroup")
+          class="btn-primary group-message-button inline"
+          icon="envelope"
+          label="groups.message"
+        }}
       {{/if}}
 
       {{#if currentUser.admin}}
-        {{d-button action=(action "destroy")
-            disabled=destroying
-            icon="trash-alt"
-            class="btn-danger"
-            label="admin.groups.delete"}}
+        {{d-button
+          action=(action "destroy")
+          disabled=destroying
+          icon="trash-alt"
+          class="btn-danger"
+          label="admin.groups.delete"
+        }}
       {{/if}}
     </div>
   </div>

From 28906fdbc70b972965317727c3c08a2b7edba188 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 22:14:46 +0200
Subject: [PATCH 543/633] linting (#9447)

---
 app/assets/javascripts/admin/templates/badges-index.hbs     | 2 +-
 app/assets/javascripts/discourse/templates/invites/show.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 528e86e4d3..7e2f21b127 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -1,6 +1,6 @@
 {{#d-section class="current-badges"}}
   <div class="badge-intro admin-intro">
-    <img src={{badgeIntroEmoji}} class="badge-intro-emoji" alt={{i18n 'admin.badges.badge_intro.emoji'}}>
+    <img src={{badgeIntroEmoji}} class="badge-intro-emoji" alt={{i18n "admin.badges.badge_intro.emoji"}}>
     <div class="content-wrapper">
       <h1>{{i18n "admin.badges.badge_intro.title"}}</h1>
       <div class="external-resources">
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 0243e8df81..96804f5f82 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -3,7 +3,7 @@
 
   <div class="two-col">
     <div class="col-image">
-      <img src={{inviteImageUrl}} alt={{i18n 'invites.emoji'}}>
+      <img src={{inviteImageUrl}} alt={{i18n "invites.emoji"}}>
     </div>
 
     <div class="col-form">

From b6c19cba20bffe18eea7bbd4b31fa640b04ac00b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 16 Apr 2020 21:24:09 +0100
Subject: [PATCH 544/633] FIX: Abort emit_web_hook_event job cleanly if web
 hook was deleted (#9445)

Raising an error causes the job to be retried, and causes a lot of noise in the logs
---
 app/jobs/regular/emit_web_hook_event.rb | 3 ++-
 spec/jobs/emit_web_hook_event_spec.rb   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index ffd8e410ec..57ee27f2ce 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -14,6 +14,8 @@ module Jobs
       @web_hook = WebHook.find_by(id: @arguments[:web_hook_id])
       validate_arguments!
 
+      return if @web_hook.blank? # Web Hook was deleted
+
       unless ping_event?(@arguments[:event_type])
         validate_argument!(:payload)
 
@@ -31,7 +33,6 @@ module Jobs
     def validate_arguments!
       validate_argument!(:web_hook_id)
       validate_argument!(:event_type)
-      raise Discourse::InvalidParameters.new(:web_hook_id) if @web_hook.blank?
     end
 
     def validate_argument!(key)
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index 453db11abb..0e649c882e 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -17,13 +17,13 @@ describe Jobs::EmitWebHookEvent do
 
   it 'raises an error when there is no event type' do
     expect do
-      subject.execute(web_hook_id: 1, payload: {})
+      subject.execute(web_hook_id: post_hook.id, payload: {})
     end.to raise_error(Discourse::InvalidParameters)
   end
 
   it 'raises an error when there is no payload' do
     expect do
-      subject.execute(web_hook_id: 1, event_type: 'post')
+      subject.execute(web_hook_id: post_hook.id, event_type: 'post')
     end.to raise_error(Discourse::InvalidParameters)
   end
 

From 98039e6cc5eff656f71231d8dfd2641f552cdfd8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 22:38:10 +0200
Subject: [PATCH 545/633] FIX: template-lint uses strict rel-noopener rule
 which requires noreferrer (#9449)

---
 .template-lintrc.js                                         | 4 ++--
 app/assets/javascripts/admin/templates/badges-index.hbs     | 2 +-
 .../javascripts/admin/templates/components/admin-report.hbs | 2 +-
 .../admin/templates/components/version-checks.hbs           | 2 +-
 .../javascripts/admin/templates/customize-themes-edit.hbs   | 2 +-
 .../javascripts/admin/templates/customize-themes-index.hbs  | 2 +-
 .../javascripts/admin/templates/customize-themes-show.hbs   | 6 +++---
 .../javascripts/admin/templates/dashboard_general.hbs       | 2 +-
 .../admin/templates/modal/admin-install-theme.hbs           | 4 ++--
 .../javascripts/admin/templates/modal/admin-theme-item.hbs  | 2 +-
 app/assets/javascripts/admin/templates/plugins-index.hbs    | 2 +-
 .../discourse/templates/components/backup-codes.hbs         | 2 +-
 .../discourse/templates/components/ip-lookup.hbs            | 2 +-
 .../discourse/templates/components/reviewable-user.hbs      | 2 +-
 .../javascripts/discourse/templates/modal/publish-page.hbs  | 2 +-
 .../javascripts/discourse/templates/review-topics.hbs       | 2 +-
 app/assets/javascripts/discourse/templates/topic.hbs        | 2 +-
 .../javascripts/discourse/templates/user-invited-show.hbs   | 2 +-
 .../wizard/templates/components/popular-themes.hbs          | 2 +-
 19 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index b0a14bbf22..d7b4a104eb 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -10,7 +10,7 @@ module.exports = {
     "deprecated-render-helper": true,
     "require-valid-alt-text": false,
     "linebreak-style": true,
-    "link-rel-noopener": true,
+    "link-rel-noopener": "strict",
     "no-abstract-roles": true,
     "no-args-paths": true,
     "no-attrs-in-components": true,
@@ -43,7 +43,7 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
-    "quotes": "double",
+    quotes: "double",
     "require-button-type": true,
     "require-iframe-title": true,
     "require-valid-alt-text": false,
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 7e2f21b127..4f26fde7f3 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -5,7 +5,7 @@
       <h1>{{i18n "admin.badges.badge_intro.title"}}</h1>
       <div class="external-resources">
         {{#each badgeIntroLinks as |link|}}
-          <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
+          <a href={{link.href}} class="external-link" target="_blank" rel="noopener noreferrer">
             {{d-icon link.icon}}
             <span>{{i18n link.text}}</span>
           </a>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index eeb7894099..2aa3143a47 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -24,7 +24,7 @@
 
                 {{#if model.description}}
                   {{#if model.description_link}}
-                    <a target="_blank" rel="noopener" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
+                    <a target="_blank" rel="noopener noreferrer" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
                       {{d-icon "question-circle"}}
                     </a>
                   {{else}}
diff --git a/app/assets/javascripts/admin/templates/components/version-checks.hbs b/app/assets/javascripts/admin/templates/components/version-checks.hbs
index aa2fcc97c0..9471bcc980 100644
--- a/app/assets/javascripts/admin/templates/components/version-checks.hbs
+++ b/app/assets/javascripts/admin/templates/components/version-checks.hbs
@@ -18,7 +18,7 @@
     {{#if versionCheck.gitLink}}
       <div class="sha-link">
         (
-        <a href={{versionCheck.gitLink}} rel="noopener" target="_blank">
+        <a href={{versionCheck.gitLink}} rel="noopener noreferrer" target="_blank">
           {{versionCheck.shortSha}}
         </a>
         )
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index 31ad084c23..a4e7fa583f 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -15,7 +15,7 @@
     <div class="admin-footer">
       <div class="status-actions">
         {{#unless model.changed}}
-          <a href={{previewUrl}} rel="noopener" title={{i18n "admin.customize.explain_preview"}} class="preview-link" target="_blank">
+          <a href={{previewUrl}} rel="noopener noreferrer" title={{i18n "admin.customize.explain_preview"}} class="preview-link" target="_blank">
             {{i18n "admin.customize.preview"}}
           </a>
         {{/unless}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 7402ef2724..fd1914a910 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -7,7 +7,7 @@
     </div>
     <div class="external-resources">
       {{#each externalResources as |resource|}}
-        <a href={{resource.link}} class="external-link" rel="noopener" target="_blank">
+        <a href={{resource.link}} class="external-link" rel="noopener noreferrer" target="_blank">
           {{d-icon resource.icon}}
           {{i18n resource.key}}
         </a>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 186cd9b358..9f46d47d69 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -206,7 +206,7 @@
       <ul class="removable-list">
         {{#each model.uploads as |upload|}}
           <li>
-            <span class="col">${{upload.name}}: <a href={{upload.url}} rel="noopener" target="_blank">{{upload.filename}}</a></span>
+            <span class="col">${{upload.name}}: <a href={{upload.url}} rel="noopener noreferrer" target="_blank">{{upload.filename}}</a></span>
             <span class="col">
               {{d-button action=(action "removeUpload") actionParam=upload class="second btn-default btn-default cancel-edit" icon="times"}}
             </span>
@@ -241,8 +241,8 @@
     </div>
   {{/if}}
 
-  <a href={{previewUrl}} title={{i18n "admin.customize.explain_preview"}} rel="noopener" target="_blank" class="btn btn-default">{{d-icon "desktop"}}{{i18n "admin.customize.theme.preview"}}</a>
-  <a class="btn btn-default export" rel="noopener" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n "admin.export_json.button_text"}}</a>
+  <a href={{previewUrl}} title={{i18n "admin.customize.explain_preview"}} rel="noopener noreferrer" target="_blank" class="btn btn-default">{{d-icon "desktop"}}{{i18n "admin.customize.theme.preview"}}</a>
+  <a class="btn btn-default export" rel="noopener noreferrer" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n "admin.export_json.button_text"}}</a>
 
   {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
 
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index 2eca2b7d02..16214a92e3 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -121,7 +121,7 @@
             <div>
               <h4>{{i18n "admin.dashboard.discourse_last_updated"}} </h4>
               <p>{{format-date model.attributes.discourse_updated_at leaveAgo="true"}}</p>
-              <a rel="noopener" target="_blank" href={{model.attributes.release_notes_link}} class="btn btn-default">
+              <a rel="noopener noreferrer" target="_blank" href={{model.attributes.release_notes_link}} class="btn btn-default">
                 {{i18n "admin.dashboard.whats_new_in_discourse"}}
               </a>
             </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index 6c8ab04311..604befe690 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -11,7 +11,7 @@
         {{#each themes as |theme|}}
           <div class="popular-theme-item">
             <div class="popular-theme-name">
-              <a href={{theme.meta_url}} rel="noopener" target="_blank">
+              <a href={{theme.meta_url}} rel="noopener noreferrer" target="_blank">
                 {{#if theme.component}}
                   {{d-icon "puzzle-piece" title="admin.customize.theme.component"}}
                 {{/if}}
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{i18n "admin.customize.theme.preview"}}</a>
+                  <a href={{theme.preview}} rel="noopener noreferrer" target="_blank">{{d-icon "desktop"}} {{i18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 1a50682819..7a7198fd57 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -2,7 +2,7 @@
   <div class="popular-theme-name">
     {{theme.name}}
     {{#if theme.preview}}
-      <a href={{theme.preview}} title="Preview" rel="noopener" target="_blank">{{d-icon "far-eye"}}</a>
+      <a href={{theme.preview}} title="Preview" rel="noopener noreferrer" target="_blank">{{d-icon "far-eye"}}</a>
     {{/if}}
   </div>
   <div class="popular-theme-buttons">
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index e17804d7ff..b89b6e6f01 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -24,7 +24,7 @@
 
           <td class="plugin-name">
             {{#if plugin.url}}
-              <a href={{plugin.url}} rel="noopener" target="_blank">{{plugin.name}}</a>
+              <a href={{plugin.url}} rel="noopener noreferrer" target="_blank">{{plugin.name}}</a>
             {{else}}
               {{plugin.name}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
index 046baed16a..73b7ad43aa 100644
--- a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
@@ -8,7 +8,7 @@
 
   <a download="backup_codes.txt"
      class="btn no-text btn-icon backup-codes-download-btn"
-     rel="noopener"
+     rel="noopener noreferrer"
      target="_blank"
      href="data:application/octet-stream;charset=utf-8;base64,{{base64BackupCode}}">
     {{d-icon "download"}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 3e57bd71d8..b6980b39d5 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -25,7 +25,7 @@
         <dt>{{i18n "ip_lookup.location"}}</dt>
         <dd>
           {{#if location.location}}
-            <a href="https://maps.google.com/maps?q={{location.latitude}},{{location.longitude}}" rel="noopener" target="_blank">
+            <a href="https://maps.google.com/maps?q={{location.latitude}},{{location.longitude}}" rel="noopener noreferrer" target="_blank">
               {{location.location}}
             </a>
           {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
index 4c246153ce..be61c74e81 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
@@ -29,7 +29,7 @@
       <div class="reviewable-user-details website">
         <div class="name">{{i18n "review.user.website"}}</div>
         <div class="value">
-          <a href={{reviewable.payload.website}} target="_blank" rel="noopener">{{reviewable.payload.website}}</a>
+          <a href={{reviewable.payload.website}} target="_blank" rel="noopener noreferrer">{{reviewable.payload.website}}</a>
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
index a3c780ddbe..07c3640ddd 100644
--- a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
@@ -17,7 +17,7 @@
           <div class="current-url">
             {{i18n "topic.publish_page.publish_url"}}
             <div>
-              <a href={{publishedPage.url}} target="_blank" rel="noopener">{{publishedPage.url}}</a>
+              <a href={{publishedPage.url}} target="_blank" rel="noopener noreferrer">{{publishedPage.url}}</a>
             </div>
           </div>
         {{else}}
diff --git a/app/assets/javascripts/discourse/templates/review-topics.hbs b/app/assets/javascripts/discourse/templates/review-topics.hbs
index 337cb4207d..6bce353354 100644
--- a/app/assets/javascripts/discourse/templates/review-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/review-topics.hbs
@@ -12,7 +12,7 @@
           <td class="topic-title">
             <div class="combined-title">
               {{topic-status topic=rt}}
-              <a href={{rt.relative_url}} rel="noopener" target="_blank">{{replace-emoji rt.fancy_title}}</a>
+              <a href={{rt.relative_url}} rel="noopener noreferrer" target="_blank">{{replace-emoji rt.fancy_title}}</a>
             </div>
           </td>
           <td class="reviewable-count">
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 7a4f6d6c7e..a3068355d0 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -91,7 +91,7 @@
           <div class="details">
             {{i18n "topic.publish_page.topic_published"}}
             <div>
-              <a href={{model.publishedPage.url}} target="_blank" rel="noopener">{{model.publishedPage.url}}</a>
+              <a href={{model.publishedPage.url}} target="_blank" rel="noopener noreferrer">{{model.publishedPage.url}}</a>
             </div>
           </div>
           <div class="controls">
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 30aa848824..1def791972 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -17,7 +17,7 @@
               {{d-button icon="plus" action=(route-action "showInvite") label="user.invited.create"}}
               {{#if canBulkInvite}}
                 {{csv-uploader uploading=uploading}}
-                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" rel="noopener" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
+                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" rel="noopener noreferrer" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
               {{/if}}
               {{#if showBulkActionButtons}}
                 {{#if rescindedAll}}
diff --git a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
index 6f6ddf02ed..774f8c0a27 100644
--- a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
+++ b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
@@ -1,5 +1,5 @@
 {{#each popular_components as |theme|}}
-  <a class="popular-theme-item" href={{theme.meta_url}} rel="noopener" target="_blank">
+  <a class="popular-theme-item" href={{theme.meta_url}} rel="noopener noreferrer" target="_blank">
     {{theme.name}}
   </a>
 {{/each}}

From e96e57c6290c8be0370a297a4dad35f2023a3024 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Thu, 16 Apr 2020 16:31:24 -0500
Subject: [PATCH 546/633] UX: Wizard Font Size (#9448)

Define font-size in wizard
---
 app/assets/stylesheets/wizard.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 16a59ce294..81c95de9b3 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -11,10 +11,9 @@ body.wizard {
   background-image: asset-url("/images/wizard/bubbles.png");
   background-repeat: repeat;
   background-position: left top;
-
   color: #444;
-
   line-height: $line-height-large;
+  font-size: 15px;
 }
 
 .finish-installation {

From e8e764c0645476d921eb56d922dd93de128883c2 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 17 Apr 2020 09:04:10 +1000
Subject: [PATCH 547/633] FIX: flaky groups_controller_spec (#9439)

Sometimes spec which is testing order groups by user count is failing.

My theory is that cause is the randomness of Postgres when the order value is the same for 2 rows.

In spec, we got three groups
`moderator_group` - 0 users
`group` - 1 user
`other_group` - 1 user

And we are expecting that controller will return them in ascending order [moderator, group, other_group]

Because `group` and `other_group` contain the same amount of users, we are dealing with luck

Therefore, I believe that adding one more user to other_group should make that query reliable.

It was not crashing on my local machine, so I am not 100% sure.
---
 spec/requests/groups_controller_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 381e247e42..0f1027edf3 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -4,6 +4,7 @@ require 'rails_helper'
 
 describe GroupsController do
   fab!(:user) { Fabricate(:user) }
+  let(:other_user) { Fabricate(:user) }
   let(:group) { Fabricate(:group, users: [user]) }
   let(:moderator_group_id) { Group::AUTO_GROUPS[:moderators] }
   fab!(:admin) { Fabricate(:admin) }
@@ -91,7 +92,7 @@ describe GroupsController do
         sign_in(user)
       end
 
-      let!(:other_group) { Fabricate(:group, name: "other_group", users: [user]) }
+      let!(:other_group) { Fabricate(:group, name: "other_group", users: [user, other_user]) }
 
       context "with default (descending) order" do
         it "sorts by name" do
@@ -116,7 +117,7 @@ describe GroupsController do
           body = JSON.parse(response.body)
 
           expect(body["groups"].map { |g| g["id"] }).to eq([
-            group.id, other_group.id, moderator_group_id
+            other_group.id, group.id, moderator_group_id
           ])
 
           expect(body["load_more_groups"]).to eq("/groups?order=user_count&page=1")

From 5a60a4233e7498795155252a842c2c7ef5b8ec05 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 17 Apr 2020 09:35:26 +1000
Subject: [PATCH 548/633] FIX: topic title in search contains data-topic-id
 (#9435)

Data topic id is required by the discourse-encrypt plugin.

Related to https://github.com/discourse/discourse-encrypt/pull/12
---
 .../javascripts/discourse/widgets/search-menu-results.js    | 6 +++++-
 test/javascripts/acceptance/search-test.js                  | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js b/app/assets/javascripts/discourse/widgets/search-menu-results.js
index 6d46819263..cdb486954f 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js
@@ -145,7 +145,11 @@ createSearchResult({
 
     const firstLine = [
       this.attach("topic-status", { topic, disableActions: true }),
-      h("span.topic-title", new Highlighted(topic.fancyTitle, term))
+      h(
+        "span.topic-title",
+        { attributes: { "data-topic-id": topic.id } },
+        new Highlighted(topic.fancyTitle, term)
+      )
     ];
 
     const secondLine = [
diff --git a/test/javascripts/acceptance/search-test.js b/test/javascripts/acceptance/search-test.js
index 62d4323867..018e3a08c7 100644
--- a/test/javascripts/acceptance/search-test.js
+++ b/test/javascripts/acceptance/search-test.js
@@ -28,6 +28,10 @@ QUnit.test("search", async assert => {
   await fillIn("#search-term", "dev");
   await keyEvent("#search-term", "keyup", 16);
   assert.ok(exists(".search-menu .results ul li"), "it shows results");
+  assert.ok(
+    exists(".search-menu .results ul li .topic-title[data-topic-id]"),
+    "topic has data-topic-id"
+  );
 
   await click(".show-help");
 

From 6fad04635b40363e7a5c5e354341c2f000383f01 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 16 Apr 2020 20:19:23 -0400
Subject: [PATCH 549/633] UX: Set focus when launching composer on iOS (#9443)

---
 app/assets/javascripts/application.js         |  1 +
 .../discourse/components/composer-body.js     | 21 +++--
 .../discourse/components/composer-editor.js   | 10 +--
 .../discourse/components/composer-title.js    |  2 +-
 .../components/composer-user-selector.js      |  2 +-
 .../discourse/controllers/composer.js         |  6 +-
 .../discourse/lib/put-cursor-at-end.js        | 16 ++++
 .../javascripts/discourse/lib/safari-hacks.js | 81 ++++++++++---------
 .../javascripts/discourse/lib/utilities.js    |  6 --
 app/assets/stylesheets/mobile/compose.scss    |  7 +-
 10 files changed, 80 insertions(+), 72 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/lib/put-cursor-at-end.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 9addddf9ef..6a6cc8ac41 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -54,6 +54,7 @@
 //= require ./discourse/lib/autocomplete
 //= require ./discourse/lib/after-transition
 //= require ./discourse/lib/safari-hacks
+//= require ./discourse/lib/put-cursor-at-end
 //= require_tree ./discourse/adapters
 //= require ./discourse/models/post-action-type
 //= require ./discourse/models/post
diff --git a/app/assets/javascripts/discourse/components/composer-body.js b/app/assets/javascripts/discourse/components/composer-body.js
index e5a6e8261d..83792801aa 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js
+++ b/app/assets/javascripts/discourse/components/composer-body.js
@@ -150,28 +150,27 @@ export default Component.extend(KeyEnterEscape, {
   },
 
   viewportResize() {
-    const composerVH = window.visualViewport.height * 0.01;
+    const composerVH = window.visualViewport.height * 0.01,
+      doc = document.documentElement;
 
-    document.documentElement.style.setProperty(
-      "--composer-vh",
-      `${composerVH}px`
-    );
+    doc.style.setProperty("--composer-vh", `${composerVH}px`);
 
     const viewportWindowDiff =
       window.innerHeight - window.visualViewport.height;
 
+    viewportWindowDiff
+      ? doc.classList.add("keyboard-visible")
+      : doc.classList.remove("keyboard-visible");
     // adds bottom padding when using a hardware keyboard and the accessory bar is visible
     // accessory bar height is 55px, using 75 allows a small buffer
-    if (viewportWindowDiff > 0 && viewportWindowDiff < 75) {
-      document.documentElement.style.setProperty(
+
+    if (viewportWindowDiff < 75) {
+      doc.style.setProperty(
         "--composer-ipad-padding",
         `${viewportWindowDiff}px`
       );
     } else {
-      document.documentElement.style.setProperty(
-        "--composer-ipad-padding",
-        "0px"
-      );
+      doc.style.setProperty("--composer-ipad-padding", "0px");
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js b/app/assets/javascripts/discourse/components/composer-editor.js
index e6e000aa09..ad34e96184 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/components/composer-editor.js
@@ -28,11 +28,10 @@ import {
   tinyAvatar,
   formatUsername,
   clipboardData,
-  safariHacksDisabled,
   caretPosition,
-  inCodeBlock,
-  putCursorAtEnd
+  inCodeBlock
 } from "discourse/lib/utilities";
+import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
 import {
   validateUploadedFiles,
   authorizesOneOrMoreImageExtensions,
@@ -210,10 +209,7 @@ export default Component.extend({
     }
 
     // Focus on the body unless we have a title
-    if (
-      !this.get("composer.canEditTitle") &&
-      (!this.capabilities.isIOS || safariHacksDisabled())
-    ) {
+    if (!this.get("composer.canEditTitle")) {
       putCursorAtEnd(this.element.querySelector(".d-editor-input"));
     }
 
diff --git a/app/assets/javascripts/discourse/components/composer-title.js b/app/assets/javascripts/discourse/components/composer-title.js
index e036beef1a..b4cb3ef382 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js
+++ b/app/assets/javascripts/discourse/components/composer-title.js
@@ -7,7 +7,7 @@ import { lookupCache } from "pretty-text/oneboxer-cache";
 import { ajax } from "discourse/lib/ajax";
 import ENV from "discourse-common/config/environment";
 import EmberObject from "@ember/object";
-import { putCursorAtEnd } from "discourse/lib/utilities";
+import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
 
 export default Component.extend({
   classNames: ["title-input"],
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js b/app/assets/javascripts/discourse/components/composer-user-selector.js
index 3418697207..efbc3aafdb 100644
--- a/app/assets/javascripts/discourse/components/composer-user-selector.js
+++ b/app/assets/javascripts/discourse/components/composer-user-selector.js
@@ -1,7 +1,7 @@
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { putCursorAtEnd } from "discourse/lib/utilities";
+import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
 
 export default Component.extend({
   showSelector: true,
diff --git a/app/assets/javascripts/discourse/controllers/composer.js b/app/assets/javascripts/discourse/controllers/composer.js
index 1706c82dd9..b7855d54b9 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js
+++ b/app/assets/javascripts/discourse/controllers/composer.js
@@ -13,7 +13,7 @@ import discourseComputed, {
   on
 } from "discourse-common/utils/decorators";
 import { getOwner } from "discourse-common/lib/get-owner";
-import { escapeExpression, safariHacksDisabled } from "discourse/lib/utilities";
+import { escapeExpression } from "discourse/lib/utilities";
 import {
   authorizesOneOrMoreExtensions,
   uploadIcon
@@ -136,10 +136,6 @@ export default Controller.extend({
     "model.composeState"
   )
   focusTarget(replyingToTopic, creatingPM, usernames, composeState) {
-    if (this.capabilities.isIOS && !safariHacksDisabled()) {
-      return "none";
-    }
-
     // Focus on usernames if it's blank or if it's just you
     usernames = usernames || "";
     if (
diff --git a/app/assets/javascripts/discourse/lib/put-cursor-at-end.js b/app/assets/javascripts/discourse/lib/put-cursor-at-end.js
new file mode 100644
index 0000000000..eec28b36a3
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/put-cursor-at-end.js
@@ -0,0 +1,16 @@
+import positioningWorkaround from "discourse/lib/safari-hacks";
+import { isAppleDevice } from "discourse/lib/utilities";
+
+export default function(element) {
+  if (isAppleDevice() && positioningWorkaround.touchstartEvent) {
+    positioningWorkaround.touchstartEvent(element);
+  } else {
+    element.focus();
+  }
+
+  const len = element.value.length;
+  element.setSelectionRange(len, len);
+
+  // Scroll to the bottom, in case we're in a tall textarea
+  element.scrollTop = 999999;
+}
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js b/app/assets/javascripts/discourse/lib/safari-hacks.js
index 40d8ee4637..d18d06fcc1 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js
@@ -84,6 +84,12 @@ function positioningWorkaround($fixedElement) {
     return;
   }
 
+  document.addEventListener("scroll", () => {
+    if (!caps.isIpadOS && workaroundActive) {
+      document.documentElement.scrollTop = 0;
+    }
+  });
+
   const fixedElement = $fixedElement[0];
   const oldHeight = fixedElement.style.height;
 
@@ -94,17 +100,17 @@ function positioningWorkaround($fixedElement) {
     if (workaroundActive) {
       $("body").removeClass("ios-safari-composer-hacks");
 
+      $(window).scrollTop(originalScrollTop);
+      if (evt && evt.target) {
+        evt.target.removeEventListener("blur", blurred);
+      }
+
+      workaroundActive = false;
+
       if (!iOSWithVisualViewport()) {
         fixedElement.style.height = oldHeight;
         later(() => $(fixedElement).removeClass("no-transition"), 500);
       }
-
-      $(window).scrollTop(originalScrollTop);
-
-      if (evt) {
-        evt.target.removeEventListener("blur", blurred);
-      }
-      workaroundActive = false;
     }
   };
 
@@ -113,8 +119,9 @@ function positioningWorkaround($fixedElement) {
     // document.activeElement is also unreliable (iOS does not mark buttons as focused)
     // so instead, we store the last touched element and check against it
 
-    // cancel blur event if user is:
+    // cancel blur event when:
     // - switching to another iOS app
+    // - displaying title field
     // - invoking a select-kit dropdown
     // - invoking mentions
     // - invoking emoji dropdown via : and hitting return
@@ -123,6 +130,7 @@ function positioningWorkaround($fixedElement) {
     if (
       lastTouchedElement &&
       (document.visibilityState === "hidden" ||
+        $fixedElement.hasClass("edit-title") ||
         $(lastTouchedElement).hasClass("select-kit-header") ||
         $(lastTouchedElement).closest(".autocomplete").length ||
         (lastTouchedElement.nodeName.toLowerCase() === "textarea" &&
@@ -140,6 +148,12 @@ function positioningWorkaround($fixedElement) {
   var blurred = discourseDebounce(blurredNow, INPUT_DELAY);
 
   var positioningHack = function(evt) {
+    let _this = this;
+
+    if (evt === undefined) {
+      evt = new CustomEvent("no-op");
+    }
+
     // we need this, otherwise changing focus means we never clear
     this.addEventListener("blur", blurred);
 
@@ -150,12 +164,22 @@ function positioningWorkaround($fixedElement) {
       .find(".select-kit > button.is-focused")
       .removeClass("is-focused");
 
-    if ($(window).scrollTop() > 0) {
-      originalScrollTop = $(window).scrollTop();
+    originalScrollTop = $(window).scrollTop();
+
+    const elementRect = _this.getBoundingClientRect();
+    if (elementRect.top > 100) {
+      // this tricks iOS safari into assuming input/textarea is at top of the viewport
+      // via https://stackoverflow.com/questions/38017771/mobile-safari-prevent-scroll-page-when-focus-on-input
+      _this.style.transform = "translateY(-400px)";
+      setTimeout(function() {
+        _this.style.transform = "none";
+      }, 30);
     }
 
+    let delay = caps.isIpadOS ? 350 : 150;
+
     setTimeout(function() {
-      if (iOSWithVisualViewport()) {
+      if (caps.isIpadOS && iOSWithVisualViewport()) {
         // disable hacks when using a hardware keyboard
         // by default, a hardware keyboard will show the keyboard accessory bar
         // whose height is currently 55px (using 75 for a bit of a buffer)
@@ -165,38 +189,14 @@ function positioningWorkaround($fixedElement) {
         }
       }
 
-      if (fixedElement.style.top === "0px") {
-        if (this !== document.activeElement) {
-          evt.preventDefault();
-
-          // this tricks safari into assuming current input is at top of the viewport
-          // via https://stackoverflow.com/questions/38017771/mobile-safari-prevent-scroll-page-when-focus-on-input
-          this.style.transform = "translateY(-200px)";
-          this.focus();
-          let _this = this;
-          setTimeout(function() {
-            _this.style.transform = "none";
-          }, 30);
-        }
-        return;
-      }
-
       // don't trigger keyboard on disabled element (happens when a category is required)
-      if (this.disabled) {
+      if (_this.disabled) {
         return;
       }
 
       $("body").addClass("ios-safari-composer-hacks");
       $(window).scrollTop(0);
 
-      let i = 20;
-      let interval = setInterval(() => {
-        $(window).scrollTop(0);
-        if (i-- === 0) {
-          clearInterval(interval);
-        }
-      }, 10);
-
       if (!iOSWithVisualViewport()) {
         const height = calcHeight();
         fixedElement.style.height = height + "px";
@@ -204,9 +204,9 @@ function positioningWorkaround($fixedElement) {
       }
 
       evt.preventDefault();
-      this.focus();
+      _this.focus();
       workaroundActive = true;
-    }, 350);
+    }, delay);
   };
 
   var lastTouched = function(evt) {
@@ -230,6 +230,11 @@ function positioningWorkaround($fixedElement) {
     });
   }, 100);
 
+  positioningWorkaround.touchstartEvent = function(element) {
+    var triggerHack = positioningHack.bind(element);
+    triggerHack();
+  };
+
   const config = {
     childList: true,
     subtree: true,
diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index c753f4b0cf..03ef200016 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -444,11 +444,5 @@ export function inCodeBlock(text, pos) {
   return result;
 }
 
-export function putCursorAtEnd(element) {
-  element.focus();
-  const len = element.value.length;
-  element.setSelectionRange(len, len);
-}
-
 // This prevents a mini racer crash
 export default {};
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index f4062f5241..e28806131b 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -26,9 +26,10 @@
 
   body.ios-safari-composer-hacks &.open {
     height: calc(var(--composer-vh, 1vh) * 100);
-    .reply-area {
-      padding-bottom: 0px;
-    }
+  }
+
+  .keyboard-visible body.ios-safari-composer-hacks &.open .reply-area {
+    padding-bottom: 0px;
   }
 
   .reply-to {

From 8f0544137a392e22addb87b49ad76b516a929ece Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 17 Apr 2020 11:08:07 +1000
Subject: [PATCH 550/633] FEATURE: Allow editing bookmark reminders (#9437)

Users can now edit the bookmark name and reminder time from their list of bookmarks.

We use "Custom" for the date and time in the modal because if the user set a reminder for "tomorrow" then edit the reminder "tomorrow", the definition of what "tomorrow" is has changed.
---
 .../components/bookmark-actions-dropdown.js   |   8 +
 .../discourse/controllers/bookmark.js         | 100 ++++++++---
 .../user-activity-bookmarks-with-reminders.js |  23 ++-
 .../javascripts/discourse/models/bookmark.js  |   8 +-
 .../discourse/templates/modal/bookmark.hbs    | 161 +++++++++---------
 .../discourse/templates/user/bookmarks.hbs    |   6 +-
 .../common/components/bookmark-modal.scss     |  10 ++
 app/controllers/bookmarks_controller.rb       |  18 ++
 config/locales/client.en.yml                  |   5 +
 config/routes.rb                              |   2 +-
 lib/bookmark_manager.rb                       |  18 ++
 lib/guardian/bookmark_guardian.rb             |   4 +
 spec/lib/bookmark_manager_spec.rb             |  37 ++++
 test/javascripts/controllers/bookmark-test.js |  18 ++
 14 files changed, 305 insertions(+), 113 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js b/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
index 6e72fafc44..84737c4973 100644
--- a/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
+++ b/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
@@ -20,6 +20,12 @@ export default DropdownSelectBoxComponent.extend({
         description: I18n.t(
           "post.bookmarks.actions.delete_bookmark.description"
         )
+      },
+      {
+        id: "edit",
+        icon: "pencil",
+        name: I18n.t("post.bookmarks.actions.edit_bookmark.name"),
+        description: I18n.t("post.bookmarks.actions.edit_bookmark.description")
       }
     ];
   }),
@@ -28,6 +34,8 @@ export default DropdownSelectBoxComponent.extend({
   onChange(selectedAction) {
     if (selectedAction === "remove") {
       this.removeBookmark(this.bookmark);
+    } else if (selectedAction === "edit") {
+      this.editBookmark(this.bookmark);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 39baaa07b2..f9bf306824 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -1,4 +1,5 @@
 import { and } from "@ember/object/computed";
+import { isPresent } from "@ember/utils";
 import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { Promise } from "rsvp";
@@ -7,7 +8,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { ajax } from "discourse/lib/ajax";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
-import { REMINDER_TYPES } from "discourse/lib/bookmark";
+import { formattedReminderTime, REMINDER_TYPES } from "discourse/lib/bookmark";
 
 // global shortcuts that interfere with these modal shortcuts, they are rebound when the
 // modal is closed
@@ -47,7 +48,6 @@ const BOOKMARK_BINDINGS = {
 export default Controller.extend(ModalFunctionality, {
   loading: false,
   errorMessage: null,
-  name: null,
   selectedReminderType: null,
   closeWithoutSaving: false,
   isSavingBookmarkManually: false,
@@ -62,7 +62,6 @@ export default Controller.extend(ModalFunctionality, {
   onShow() {
     this.setProperties({
       errorMessage: null,
-      name: null,
       selectedReminderType: REMINDER_TYPES.NONE,
       closeWithoutSaving: false,
       isSavingBookmarkManually: false,
@@ -76,9 +75,47 @@ export default Controller.extend(ModalFunctionality, {
     this.bindKeyboardShortcuts();
     this.loadLastUsedCustomReminderDatetime();
 
-    // make sure the input is cleared, otherwise the keyboard shortcut to toggle
-    // bookmark for post ends up in the input
-    next(() => this.set("name", null));
+    if (this.editingExistingBookmark()) {
+      this.initializeExistingBookmarkData();
+    } else {
+      // make sure the input is cleared, otherwise the keyboard shortcut to toggle
+      // bookmark for post ends up in the input
+      next(() => this.set("model.name", null));
+    }
+  },
+
+  /**
+   * We always want to save the bookmark unless the user specifically
+   * clicks the save or cancel button to mimic browser behaviour.
+   */
+  onClose() {
+    this.unbindKeyboardShortcuts();
+    this.restoreGlobalShortcuts();
+    if (!this.closeWithoutSaving && !this.isSavingBookmarkManually) {
+      this.saveBookmark().catch(e => this.handleSaveError(e));
+    }
+    if (this.onCloseWithoutSaving && this.closeWithoutSaving) {
+      this.onCloseWithoutSaving();
+    }
+  },
+
+  initializeExistingBookmarkData() {
+    if (this.existingBookmarkHasReminder()) {
+      let parsedReminderAt = this.parseCustomDateTime(this.model.reminderAt);
+      this.setProperties({
+        customReminderDate: parsedReminderAt.format("YYYY-MM-DD"),
+        customReminderTime: parsedReminderAt.format("HH:mm"),
+        selectedReminderType: REMINDER_TYPES.CUSTOM
+      });
+    }
+  },
+
+  editingExistingBookmark() {
+    return isPresent(this.model) && isPresent(this.model.id);
+  },
+
+  existingBookmarkHasReminder() {
+    return isPresent(this.model) && isPresent(this.model.reminderAt);
   },
 
   loadLastUsedCustomReminderDatetime() {
@@ -88,6 +125,7 @@ export default Controller.extend(ModalFunctionality, {
     if (lastTime && lastDate) {
       let parsed = this.parseCustomDateTime(lastDate, lastTime);
 
+      // can't set reminders in the past
       if (parsed < this.now()) {
         return;
       }
@@ -121,21 +159,11 @@ export default Controller.extend(ModalFunctionality, {
     KeyboardShortcuts.unpause(GLOBAL_SHORTCUTS_TO_PAUSE);
   },
 
-  // we always want to save the bookmark unless the user specifically
-  // clicks the save or cancel button to mimic browser behaviour
-  onClose() {
-    this.unbindKeyboardShortcuts();
-    this.restoreGlobalShortcuts();
-    if (!this.closeWithoutSaving && !this.isSavingBookmarkManually) {
-      this.saveBookmark().catch(e => this.handleSaveError(e));
-    }
-    if (this.onCloseWithoutSaving && this.closeWithoutSaving) {
-      this.onCloseWithoutSaving();
-    }
+  @discourseComputed("model.reminderAt")
+  showExistingReminderAt(existingReminderAt) {
+    return isPresent(existingReminderAt);
   },
 
-  showBookmarkReminderControls: true,
-
   @discourseComputed()
   showAtDesktop() {
     return (
@@ -177,6 +205,11 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
+  @discourseComputed("model.reminderAt")
+  existingReminderAtFormatted(existingReminderAt) {
+    return formattedReminderTime(existingReminderAt, this.userTimezone);
+  },
+
   @discourseComputed()
   startNextBusinessWeekFormatted() {
     return this.nextWeek()
@@ -244,19 +277,32 @@ export default Controller.extend(ModalFunctionality, {
     const data = {
       reminder_type: reminderType,
       reminder_at: reminderAtISO,
-      name: this.name,
-      post_id: this.model.postId
+      name: this.model.name,
+      post_id: this.model.postId,
+      id: this.model.id
     };
 
-    return ajax("/bookmarks", { type: "POST", data }).then(() => {
-      if (this.afterSave) {
-        this.afterSave(reminderAtISO, this.selectedReminderType);
-      }
-    });
+    if (this.editingExistingBookmark()) {
+      return ajax("/bookmarks/" + this.model.id, {
+        type: "PUT",
+        data
+      }).then(() => {
+        if (this.afterSave) {
+          this.afterSave(reminderAtISO, this.selectedReminderType);
+        }
+      });
+    } else {
+      return ajax("/bookmarks", { type: "POST", data }).then(() => {
+        if (this.afterSave) {
+          this.afterSave(reminderAtISO, this.selectedReminderType);
+        }
+      });
+    }
   },
 
   parseCustomDateTime(date, time) {
-    return moment.tz(date + " " + time, this.userTimezone);
+    let dateTime = isPresent(time) ? date + " " + time : date;
+    return moment.tz(dateTime, this.userTimezone);
   },
 
   defaultCustomReminderTime() {
diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
index 11cc0bb622..a2176a7a2b 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
+++ b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
 import { inject } from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -35,9 +36,9 @@ export default Controller.extend({
       );
   },
 
-  @discourseComputed("loaded", "content.length")
-  noContent(loaded, contentLength) {
-    return loaded && contentLength === 0;
+  @discourseComputed("loaded", "content.length", "noResultsHelp")
+  noContent(loaded, contentLength, noResultsHelp) {
+    return loaded && contentLength === 0 && noResultsHelp !== null;
   },
 
   processLoadResponse(response) {
@@ -63,6 +64,22 @@ export default Controller.extend({
       return bookmark.destroy().then(() => this.loadItems());
     },
 
+    editBookmark(bookmark) {
+      let controller = showModal("bookmark", {
+        model: {
+          postId: bookmark.post_id,
+          id: bookmark.id,
+          reminderAt: bookmark.reminder_at,
+          name: bookmark.name
+        },
+        title: "post.bookmarks.edit",
+        modalClass: "bookmark-with-reminder"
+      });
+      controller.setProperties({
+        afterSave: () => this.loadItems()
+      });
+    },
+
     loadMore() {
       if (this.loadingMore) {
         return Promise.resolve();
diff --git a/app/assets/javascripts/discourse/models/bookmark.js b/app/assets/javascripts/discourse/models/bookmark.js
index 8a8c09f35f..44daca7cdd 100644
--- a/app/assets/javascripts/discourse/models/bookmark.js
+++ b/app/assets/javascripts/discourse/models/bookmark.js
@@ -10,6 +10,7 @@ import { ajax } from "discourse/lib/ajax";
 import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import discourseComputed from "discourse-common/utils/decorators";
+import { formattedReminderTime } from "discourse/lib/bookmark";
 
 const Bookmark = RestModel.extend({
   newBookmark: none("id"),
@@ -110,9 +111,10 @@ const Bookmark = RestModel.extend({
 
   @discourseComputed("reminder_at", "currentUser")
   formattedReminder(bookmarkReminderAt, currentUser) {
-    return moment
-      .tz(bookmarkReminderAt, currentUser.resolvedTimezone())
-      .format(I18n.t("dates.long_with_year"));
+    return formattedReminderTime(
+      bookmarkReminderAt,
+      currentUser.resolvedTimezone()
+    ).capitalize();
   },
 
   loadItems() {
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 51d6c2b734..8e20711ef3 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -9,89 +9,94 @@
     {{/if}}
 
     <div class="control-group">
-      {{input value=name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
+      {{input value=model.name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
     </div>
 
-    {{#if showBookmarkReminderControls}}
-      <div class="control-group">
-        <label class="control-label" for="set_reminder">
-          {{i18n "post.bookmarks.set_reminder"}}
-        </label>
-
-        {{#if userHasTimezoneSet}}
-          {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
-            {{#if showAtDesktop}}
-              {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-                <div class="tap-tile-title">{{i18n "bookmarks.reminders.at_desktop"}}</div>
-              {{/tap-tile}}
-            {{/if}}
-
-            {{#if showLaterToday}}
-              {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-                <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_today"}}</div>
-                <div class="tap-tile-date">{{laterTodayFormatted}}</div>
-              {{/tap-tile}}
-            {{/if}}
-            {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.tomorrow"}}</div>
-              <div class="tap-tile-date">{{tomorrowFormatted}}</div>
-            {{/tap-tile}}
-            {{#if showLaterThisWeek}}
-              {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-                <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_this_week"}}</div>
-                <div class="tap-tile-date">{{laterThisWeekFormatted}}</div>
-              {{/tap-tile}}
-            {{/if}}
-            {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.start_of_next_business_week"}}</div>
-              <div class="tap-tile-date">{{startNextBusinessWeekFormatted}}</div>
-            {{/tap-tile}}
-            {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_week"}}</div>
-              <div class="tap-tile-date">{{nextWeekFormatted}}</div>
-            {{/tap-tile}}
-            {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_month"}}</div>
-              <div class="tap-tile-date">{{nextMonthFormatted}}</div>
-            {{/tap-tile}}
-            {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.custom"}}</div>
-            {{/tap-tile}}
-
-            {{#if customDateTimeSelected}}
-              <div class="control-group custom-date-time-wrap">
-                <div class="tap-tile-date-input">
-                  {{d-icon "calendar-alt"}}
-                  {{date-picker-future
-                    value=customReminderDate
-                    onSelect=(action (mut customReminderDate))
-                  }}
-                </div>
-                <div class="tap-tile-time-input">
-                  {{d-icon "far-clock"}}
-                  {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
-                </div>
-              </div>
-            {{/if}}
-
-            {{#if showLastCustom}}
-              {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-                <div class="tap-tile-title">{{i18n "bookmarks.reminders.last_custom"}}</div>
-                <div class="tap-tile-date">{{lastCustomFormatted}}</div>
-              {{/tap-tile}}
-            {{/if}}
-
-            {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.none"}}</div>
-            {{/tap-tile}}
-          {{/tap-tile-grid}}
-
-        {{else}}
-          <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
-        {{/if}}
+    {{#if showExistingReminderAt }}
+      <div class="alert alert-info existing-reminder-at-alert">
+        {{d-icon "far-clock"}}
+        <span>{{i18n "bookmarks.reminders.existing_reminder"}} {{existingReminderAtFormatted}}</span>
       </div>
     {{/if}}
 
+    <div class="control-group">
+      <label class="control-label" for="set_reminder">
+        {{i18n "post.bookmarks.set_reminder"}}
+      </label>
+
+      {{#if userHasTimezoneSet}}
+        {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
+          {{#if showAtDesktop}}
+            {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.at_desktop"}}</div>
+            {{/tap-tile}}
+          {{/if}}
+
+          {{#if showLaterToday}}
+            {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_today"}}</div>
+              <div class="tap-tile-date">{{laterTodayFormatted}}</div>
+            {{/tap-tile}}
+          {{/if}}
+          {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.tomorrow"}}</div>
+            <div class="tap-tile-date">{{tomorrowFormatted}}</div>
+          {{/tap-tile}}
+          {{#if showLaterThisWeek}}
+            {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_this_week"}}</div>
+              <div class="tap-tile-date">{{laterThisWeekFormatted}}</div>
+            {{/tap-tile}}
+          {{/if}}
+          {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.start_of_next_business_week"}}</div>
+            <div class="tap-tile-date">{{startNextBusinessWeekFormatted}}</div>
+          {{/tap-tile}}
+          {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_week"}}</div>
+            <div class="tap-tile-date">{{nextWeekFormatted}}</div>
+          {{/tap-tile}}
+          {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_month"}}</div>
+            <div class="tap-tile-date">{{nextMonthFormatted}}</div>
+          {{/tap-tile}}
+          {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.custom"}}</div>
+          {{/tap-tile}}
+
+          {{#if customDateTimeSelected}}
+            <div class="control-group custom-date-time-wrap">
+              <div class="tap-tile-date-input">
+                {{d-icon "calendar-alt"}}
+                {{date-picker-future
+                  value=customReminderDate
+                  onSelect=(action (mut customReminderDate))
+                }}
+              </div>
+              <div class="tap-tile-time-input">
+                {{d-icon "far-clock"}}
+                {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
+              </div>
+            </div>
+          {{/if}}
+
+          {{#if showLastCustom}}
+            {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.last_custom"}}</div>
+              <div class="tap-tile-date">{{lastCustomFormatted}}</div>
+            {{/tap-tile}}
+          {{/if}}
+
+          {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.none"}}</div>
+          {{/tap-tile}}
+        {{/tap-tile-grid}}
+
+      {{else}}
+        <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
+      {{/if}}
+    </div>
+
     <div class="control-group">
       {{d-button label="bookmarks.save" class="btn-primary" action=(action "saveAndClose")}}
       {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}
diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
index fd6a5c5d1a..77ecf91231 100644
--- a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
@@ -42,7 +42,11 @@
               <td>{{format-date bookmark.created_at format="tiny"}}</td>
               {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
               <td>
-                {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
+                {{bookmark-actions-dropdown
+                  bookmark=bookmark
+                  removeBookmark=(action "removeBookmark")
+                  editBookmark=(action "editBookmark")
+                }}
               </td>
             </tr>
           {{/each}}
diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index 2c15181cf6..45ad12fc18 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -19,6 +19,16 @@
     }
   }
 
+  .existing-reminder-at-alert {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    .d-icon {
+      margin-right: 1em;
+    }
+  }
+
   .custom-date-time-wrap {
     padding: 1em 1em 0.5em;
     border: 1px solid $primary-low;
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index c47dfdc025..4fd077d45e 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -26,4 +26,22 @@ class BookmarksController < ApplicationController
     BookmarkManager.new(current_user).destroy(params[:id])
     render json: success_json
   end
+
+  def update
+    params.require(:id)
+
+    bookmark_manager = BookmarkManager.new(current_user)
+    bookmark_manager.update(
+      bookmark_id: params[:id],
+      name: params[:name],
+      reminder_type: params[:reminder_type],
+      reminder_at: params[:reminder_at]
+    )
+
+    if bookmark_manager.errors.empty?
+      return render json: success_json
+    end
+
+    render json: failed_json.merge(errors: bookmark_manager.errors.full_messages), status: 400
+  end
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 64492a2bc7..9bd07e6819 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -331,6 +331,7 @@ en:
         today_with_time: "today at %{time}"
         tomorrow_with_time: "tomorrow at %{time}"
         at_time: "at %{date_time}"
+        existing_reminder: "You have a reminder set for this bookmark which will be sent"
 
     drafts:
       resume: "Resume"
@@ -2716,6 +2717,7 @@ en:
 
       bookmarks:
         create: "Create bookmark"
+        edit: "Edit bookmark"
         created: "Created"
         name: "Name"
         name_placeholder: "What is this bookmark for?"
@@ -2724,6 +2726,9 @@ en:
           delete_bookmark:
             name: "Delete bookmark"
             description: "Removes the bookmark from your profile and stops all reminders for the bookmark"
+          edit_bookmark:
+            name: "Edit bookmark"
+            description: "Edit the bookmark name or change the reminder date and time"
 
     category:
       can: "can&hellip; "
diff --git a/config/routes.rb b/config/routes.rb
index 1a92a5440d..2fc21b435e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -606,7 +606,7 @@ Discourse::Application.routes.draw do
     end
   end
 
-  resources :bookmarks, only: %i[create destroy]
+  resources :bookmarks, only: %i[create destroy update]
 
   resources :notifications, except: :show do
     collection do
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index 33c2758c12..9da2dc257b 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -66,6 +66,24 @@ class BookmarkManager
     BookmarkReminderNotificationHandler.send_notification(bookmark)
   end
 
+  def update(bookmark_id:, name:, reminder_type:, reminder_at:)
+    bookmark = Bookmark.find_by(id: bookmark_id)
+
+    raise Discourse::NotFound if bookmark.blank?
+    raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_edit?(bookmark)
+
+    if bookmark.errors.any?
+      return add_errors_from(bookmark)
+    end
+
+    bookmark.update(
+      name: name,
+      reminder_at: reminder_at,
+      reminder_type: reminder_type,
+      reminder_set_at: Time.zone.now
+    )
+  end
+
   private
 
   def clear_at_desktop_cache_if_required
diff --git a/lib/guardian/bookmark_guardian.rb b/lib/guardian/bookmark_guardian.rb
index 1754c280e2..7f0b63c620 100644
--- a/lib/guardian/bookmark_guardian.rb
+++ b/lib/guardian/bookmark_guardian.rb
@@ -5,6 +5,10 @@ module BookmarkGuardian
     @user == bookmark.user
   end
 
+  def can_edit_bookmark?(bookmark)
+    @user == bookmark.user
+  end
+
   def can_create_bookmark?(bookmark)
     can_see_topic?(bookmark.topic)
   end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 2130e50610..de25969f2c 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -160,6 +160,43 @@ RSpec.describe BookmarkManager do
     end
   end
 
+  describe ".update" do
+    let!(:bookmark) { Fabricate(:bookmark_next_business_day_reminder, user: user, post: post, name: "Old name") }
+    let(:new_name) { "Some new name" }
+    let(:new_reminder_at) { 10.days.from_now }
+    let(:new_reminder_type) { Bookmark.reminder_types[:custom] }
+
+    def update_bookmark
+      subject.update(
+        bookmark_id: bookmark.id, name: new_name, reminder_type: new_reminder_type, reminder_at: new_reminder_at
+      )
+    end
+
+    it "saves the time and new reminder type sucessfully" do
+      update_bookmark
+       bookmark.reload
+       expect(bookmark.name).to eq(new_name)
+       expect(bookmark.reminder_at).to eq_time(new_reminder_at)
+       expect(bookmark.reminder_type).to eq(new_reminder_type)
+    end
+
+    context "if the bookmark is belonging to some other user" do
+      let!(:bookmark) { Fabricate(:bookmark, user: Fabricate(:admin), post: post) }
+      it "raises an invalid access error" do
+        expect { update_bookmark }.to raise_error(Discourse::InvalidAccess)
+      end
+    end
+
+    context "if the bookmark no longer exists" do
+      before do
+        bookmark.destroy!
+      end
+      it "raises an invalid access error" do
+        expect { update_bookmark }.to raise_error(Discourse::NotFound)
+      end
+    end
+  end
+
   describe ".destroy_for_topic" do
     let!(:topic) { Fabricate(:topic) }
     let!(:bookmark1) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js
index 756e91d672..7a68739289 100644
--- a/test/javascripts/controllers/bookmark-test.js
+++ b/test/javascripts/controllers/bookmark-test.js
@@ -1,6 +1,7 @@
 import { logIn } from "helpers/qunit-helpers";
 import User from "discourse/models/user";
 import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";
+import { REMINDER_TYPES } from "discourse/lib/bookmark";
 let BookmarkController;
 
 moduleFor("controller:bookmark", {
@@ -263,3 +264,20 @@ QUnit.test("user timezone updates when the modal is shown", function(assert) {
   );
   stub.restore();
 });
+
+QUnit.test(
+  "opening the modal with an existing bookmark with reminder at prefills the custom reminder type",
+  function(assert) {
+    let name = "test";
+    let reminderAt = "2020-05-15T09:45:00";
+    BookmarkController.model = { id: 1, name: name, reminderAt: reminderAt };
+    BookmarkController.onShow();
+    assert.equal(
+      BookmarkController.selectedReminderType,
+      REMINDER_TYPES.CUSTOM
+    );
+    assert.equal(BookmarkController.customReminderDate, "2020-05-15");
+    assert.equal(BookmarkController.customReminderTime, "09:45");
+    assert.equal(BookmarkController.model.name, name);
+  }
+);

From 17c0c9652dfae50f1d61a1dd31341a975826de94 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 17 Apr 2020 10:05:51 +0200
Subject: [PATCH 551/633] FIX: stops bookmark keybaod event to be propagated
 into modal (#9457)

---
 app/assets/javascripts/discourse/controllers/bookmark.js   | 5 -----
 app/assets/javascripts/discourse/lib/keyboard-shortcuts.js | 5 ++++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index f9bf306824..ec384d54ae 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -1,6 +1,5 @@
 import { and } from "@ember/object/computed";
 import { isPresent } from "@ember/utils";
-import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { Promise } from "rsvp";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -77,10 +76,6 @@ export default Controller.extend(ModalFunctionality, {
 
     if (this.editingExistingBookmark()) {
       this.initializeExistingBookmarkData();
-    } else {
-      // make sure the input is cleared, otherwise the keyboard shortcut to toggle
-      // bookmark for post ends up in the input
-      next(() => this.set("model.name", null));
     }
   },
 
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 2ce05f463b..498c920e9d 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -174,7 +174,10 @@ export default {
     this.pause(Object.keys(combinations));
   },
 
-  toggleBookmark() {
+  toggleBookmark(event) {
+    event.preventDefault();
+    event.stopPropagation();
+
     this.sendToSelectedPost("toggleBookmark");
     this.sendToTopicListItemView("toggleBookmark");
   },

From 576872a2d93ce8546c5fded6d9edf5344c9bb4fe Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 17 Apr 2020 09:42:57 +0100
Subject: [PATCH 552/633] PERF: Enable new user card route by default (#9442)

https://meta.discourse.org/t/changes-to-the-user-card-data-source/139951
---
 .../components/user-card-contents.js          |   2 +-
 config/site_settings.yml                      |   5 -
 test/javascripts/fixtures/user_fixtures.js    | 197 ++++++++++++++++++
 3 files changed, 198 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js b/app/assets/javascripts/discourse/components/user-card-contents.js
index 5ad24526dc..655c97fc28 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js
@@ -141,7 +141,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     this.setProperties({ visible: true, loading: true });
 
     const args = {
-      forCard: this.siteSettings.enable_new_user_card_route,
+      forCard: true,
       include_post_count_for: this.get("topic.id")
     };
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index e9175a34d6..4684b7d4ca 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2012,11 +2012,6 @@ uncategorized:
     default: ""
     hidden: true
 
-  enable_new_user_card_route:
-    default: false
-    client: true
-    hidden: true
-
 user_preferences:
   default_email_digest_frequency:
     enum: "DigestEmailSiteSetting"
diff --git a/test/javascripts/fixtures/user_fixtures.js b/test/javascripts/fixtures/user_fixtures.js
index c801b5d355..f6a2f87050 100644
--- a/test/javascripts/fixtures/user_fixtures.js
+++ b/test/javascripts/fixtures/user_fixtures.js
@@ -278,6 +278,125 @@ export default {
       ]
     }
   },
+  "/u/eviltrout/card.json": {
+    user_badges: [
+      {
+        id: 5870,
+        granted_at: "2014-05-16T02:39:38.388Z",
+        badge_id: 4,
+        user_id: 19,
+        granted_by_id: -1
+      },
+      {
+        id: 40673,
+        granted_at: "2014-03-31T14:23:18.060Z",
+        post_id: 7241,
+        post_number: 19,
+        badge_id: 23,
+        user_id: 19,
+        granted_by_id: -1,
+        topic_id: 3153
+      },
+      {
+        id: 5868,
+        granted_at: "2014-05-16T02:39:38.380Z",
+        badge_id: 3,
+        user_id: 19,
+        granted_by_id: -1
+      }
+    ],
+    badges: [
+      {
+        id: 4,
+        name: "Leader",
+        description: null,
+        grant_count: 7,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-user",
+        image: null,
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 4,
+        system: true,
+        badge_type_id: 1
+      },
+      {
+        id: 23,
+        name: "Great Share",
+        description: null,
+        grant_count: 14,
+        allow_title: false,
+        multiple_grant: true,
+        icon: "fa-certificate",
+        image: null,
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 2,
+        system: true,
+        badge_type_id: 1
+      },
+      {
+        id: 3,
+        name: "Regular",
+        description: null,
+        grant_count: 30,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-user",
+        image: null,
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 4,
+        system: true,
+        badge_type_id: 2
+      }
+    ],
+    badge_types: [
+      { id: 1, name: "Gold", sort_order: 9 },
+      { id: 2, name: "Silver", sort_order: 8 },
+      { id: 3, name: "Bronze", sort_order: 7 }
+    ],
+    users: [
+      {
+        id: 19,
+        username: "eviltrout",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
+      },
+      {
+        id: -1,
+        username: "system",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
+      }
+    ],
+    user: {
+      id: 19,
+      username: "eviltrout",
+      name: "Robin Ward",
+      avatar_template:
+        "/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
+      last_posted_at: "2015-05-07T15:23:35.074Z",
+      last_seen_at: "2015-05-13T14:34:23.188Z",
+      created_at: "2013-02-03T15:19:22.704Z",
+      can_send_private_messages: true,
+      can_send_private_message_to_user: false,
+      trust_level: 4,
+      moderator: true,
+      admin: true,
+      title: "co-founder",
+      badge_count: 23,
+      custom_fields: {},
+      bio_excerpt:
+        '<p>Co-founder of Discourse. Previously, I created <a href="http://forumwarz.com">Forumwarz</a>. <a href="https://twitter.com/eviltrout">Follow me on Twitter</a>. I am <a class="mention" href="/u/eviltrout">@eviltrout</a>.</p>',
+      website: "http://eviltrout.com",
+      location: "Toronto",
+      featured_user_badge_ids: [5870, 40673, 5868]
+    }
+  },
   "/user_actions.json": {
     user_actions: [
       {
@@ -2531,6 +2650,84 @@ export default {
       }
     }
   },
+  "/u/charlie/card.json": {
+    user_badges: [
+      {
+        id: 17,
+        granted_at: "2019-03-06T19:08:28.230Z",
+        count: 1,
+        badge_id: 3,
+        user_id: 5,
+        granted_by_id: -1
+      }
+    ],
+    badges: [
+      {
+        id: 3,
+        name: "Regular",
+        description:
+          '<a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Granted</a> recategorize, rename, followed links, wiki, more likes',
+        grant_count: 3,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-user",
+        image: null,
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 4,
+        system: true,
+        slug: "regular",
+        manually_grantable: false,
+        badge_type_id: 2
+      }
+    ],
+    badge_types: [{ id: 2, name: "Silver", sort_order: 8 }],
+    users: [
+      {
+        id: 5,
+        username: "charlie",
+        name: null,
+        avatar_template: "/letter_avatar_proxy/v3/letter/c/d6d6ee/{size}.png",
+        moderator: false,
+        admin: false
+      },
+      {
+        id: -1,
+        username: "system",
+        name: "system",
+        avatar_template: "/user_avatar/localhost/system/{size}/2_2.png",
+        moderator: true,
+        admin: true
+      }
+    ],
+    user: {
+      id: 5,
+      username: "charlie",
+      name: null,
+      avatar_template: "/letter_avatar_proxy/v3/letter/c/d6d6ee/{size}.png",
+      last_posted_at: null,
+      last_seen_at: null,
+      created_at: "2019-03-06T19:06:20.340Z",
+      ignored: false,
+      can_ignore_user: false,
+      can_send_private_messages: true,
+      can_send_private_message_to_user: true,
+      trust_level: 3,
+      moderator: false,
+      admin: false,
+      title: null,
+      badge_count: 3,
+      custom_fields: {},
+      time_read: 0,
+      recent_time_read: 0,
+      primary_group_name: null,
+      primary_group_flair_url: null,
+      primary_group_flair_bg_color: null,
+      primary_group_flair_color: null,
+      staged: false,
+      featured_user_badge_ids: [17]
+    }
+  },
   "/u/charlie/summary.json": {
     topics: [],
     badges: [

From 35f51100e1f161dfbbb1fb727bbfca85a7e76919 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 17 Apr 2020 10:27:11 -0300
Subject: [PATCH 553/633] FEATURE: Users can be ignored for six months. (#9446)

---
 .../select-kit/components/future-date-input-selector.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js b/app/assets/javascripts/select-kit/components/future-date-input-selector.js
index 34efa2551c..ae34273692 100644
--- a/app/assets/javascripts/select-kit/components/future-date-input-selector.js
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector.js
@@ -132,7 +132,7 @@ export const TIMEFRAMES = [
   buildTimeframe({
     id: "six_months",
     format: "MMM D",
-    enabled: opts => opts.includeFarFuture,
+    enabled: opts => opts.includeMidFuture,
     when: (time, timeOfDay) =>
       time
         .add(6, "month")

From 6f391b93871144a93287259109ca9031106a6860 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 17 Apr 2020 11:16:14 -0400
Subject: [PATCH 554/633] Upgrade rubocop

---
 .rubocop.yml | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index f74aa303ee..f389e688ca 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -86,7 +86,7 @@ Layout/SpaceInsideParens:
   Enabled: true
 
 # Detect hard tabs, no hard tabs.
-Layout/Tab:
+Layout/IndentationStyle:
   Enabled: true
 
 # Blank lines should not have any spaces.
diff --git a/Gemfile.lock b/Gemfile.lock
index f7e168e827..34f3ff9543 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -340,7 +340,7 @@ GEM
       rspec-support (~> 3.8)
     rspec-support (3.9.2)
     rtlit (0.0.5)
-    rubocop (0.81.0)
+    rubocop (0.82.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)

From 9c40c42bb5723aada2a2d85434958213154a1f5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2020 11:31:11 -0400
Subject: [PATCH 555/633] Build(deps): Bump https-proxy-agent from 2.2.1 to
 2.2.4 (#9453)

Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4.
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e49da23ce4..e9a942667b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -220,10 +220,10 @@ acorn@^5.5.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-agent-base@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
   dependencies:
     es6-promisify "^5.0.0"
 
@@ -929,9 +929,9 @@ entities@~2.0.0:
   integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
 
 es6-promise@^4.0.3:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
-  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
@@ -1501,11 +1501,11 @@ homedir-polyfill@^1.0.1:
   resolved "https://github.com/tautologistics/node-htmlparser#9613b99096ac1757b81695b1a4bbee7f10afcd7f"
 
 https-proxy-agent@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
   dependencies:
-    agent-base "^4.1.0"
+    agent-base "^4.3.0"
     debug "^3.1.0"
 
 iconv-lite@^0.4.17:
@@ -2112,9 +2112,9 @@ ms@2.0.0:
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 mute-stream@0.0.7:
   version "0.0.7"

From 4eebbd221239eaa3fc7e6f1bd6a9dcf0239b8444 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 17 Apr 2020 16:41:47 +0100
Subject: [PATCH 556/633] Revert "FIX: Detect more unsupported browsers"

This change broke IE11 support, even with the polyfills enabled. We may need to add a WeakSet polyfill, but reverting this change for now.

This reverts commit 1cd8c6ce4caf15c4d0bd27077dcfc2592f7d1974.
---
 app/assets/javascripts/browser-detect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/browser-detect.js b/app/assets/javascripts/browser-detect.js
index 57fb1e7f6c..bdbbc27b3e 100644
--- a/app/assets/javascripts/browser-detect.js
+++ b/app/assets/javascripts/browser-detect.js
@@ -1,3 +1,3 @@
-if (!window.WeakMap || !window.WeakSet || !window.Promise) {
+if (!window.WeakMap || !window.Promise) {
   window.unsupportedBrowser = true;
 }

From 77dd31a642ecbf36a63ea7a823b636255811f538 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2020 12:10:39 -0400
Subject: [PATCH 557/633] Build(deps): Bump sidekiq from 6.0.6 to 6.0.7 (#9460)

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.6 to 6.0.7.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.0.6...v6.0.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 34f3ff9543..3eed581808 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -377,7 +377,7 @@ GEM
       activesupport (>= 3.1)
     shoulda-matchers (4.3.0)
       activesupport (>= 4.2.0)
-    sidekiq (6.0.6)
+    sidekiq (6.0.7)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       rack-protection (>= 2.0.0)

From 0e4497b6be081371e15e28d54c528391858b53f9 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 17 Apr 2020 17:23:40 +0100
Subject: [PATCH 558/633] DEV: Update tl3 spec to remove hard-coded primary
 keys

In some test runs, the hard-coded ids could correspond to real topics created earlier in the tests, and cause random test failures
---
 spec/models/trust_level3_requirements_spec.rb | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index a28f54debb..3189c5e2e6 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -8,13 +8,17 @@ describe TrustLevel3Requirements do
   subject(:tl3_requirements) { described_class.new(user) }
   fab!(:moderator) { Fabricate(:moderator) }
 
+  fab!(:topic1) { Fabricate(:topic) }
+  fab!(:topic2) { Fabricate(:topic) }
+  fab!(:topic3) { Fabricate(:topic) }
+  fab!(:topic4) { Fabricate(:topic) }
+
   before do
     described_class.clear_cache
   end
 
-  def make_view(id, at, user_id)
-    Fabricate(:topic, id: id) unless Topic.where(id: id).exists?
-    TopicViewItem.add(id, '11.22.33.44', user_id, at, _skip_redis = true)
+  def make_view(topic, at, user_id)
+    TopicViewItem.add(topic.id, '11.22.33.44', user_id, at, _skip_redis = true)
   end
 
   def like_at(created_by, post, created_at)
@@ -270,21 +274,21 @@ describe TrustLevel3Requirements do
   describe "topics_viewed" do
     it "counts topics views within last 100 days (default time period), not counting a topic more than once" do
       user.save
-      make_view(9, 1.day.ago,    user.id)
-      make_view(9, 3.days.ago,   user.id) # same topic, different day
-      make_view(3, 4.days.ago,   user.id)
-      make_view(2, 101.days.ago, user.id) # too long ago
+      make_view(topic1, 1.day.ago,    user.id)
+      make_view(topic1, 3.days.ago,   user.id) # same topic, different day
+      make_view(topic2, 4.days.ago,   user.id)
+      make_view(topic3, 101.days.ago, user.id) # too long ago
       expect(tl3_requirements.topics_viewed).to eq(2)
     end
 
     it "counts topics views within last 200 days, respecting tl3_time_period setting" do
       SiteSetting.tl3_time_period = 200
       user.save
-      make_view(9, 1.day.ago,    user.id)
-      make_view(9, 3.days.ago,   user.id) # same topic, different day
-      make_view(3, 4.days.ago,   user.id)
-      make_view(2, 101.days.ago, user.id)
-      make_view(4, 201.days.ago, user.id) # too long ago
+      make_view(topic1, 1.day.ago,    user.id)
+      make_view(topic1, 3.days.ago,   user.id) # same topic, different day
+      make_view(topic2, 4.days.ago,   user.id)
+      make_view(topic3, 101.days.ago, user.id)
+      make_view(topic4, 201.days.ago, user.id) # too long ago
       expect(tl3_requirements.topics_viewed).to eq(3)
     end
 
@@ -296,8 +300,8 @@ describe TrustLevel3Requirements do
         target_usernames: [user.username, moderator.username]
       ).topic
 
-      make_view(9, 1.day.ago, user.id)
-      make_view(private_topic.id, 1.day.ago, user.id)
+      make_view(topic1, 1.day.ago, user.id)
+      make_view(private_topic, 1.day.ago, user.id)
       expect(tl3_requirements.topics_viewed).to eq(1)
     end
   end
@@ -316,9 +320,9 @@ describe TrustLevel3Requirements do
   describe "topics_viewed_all_time" do
     it "counts topics viewed at any time" do
       user.save
-      make_view(10, 1.day.ago,    user.id)
-      make_view(9,  100.days.ago, user.id)
-      make_view(8,  101.days.ago, user.id)
+      make_view(topic1, 1.day.ago,    user.id)
+      make_view(topic2,  100.days.ago, user.id)
+      make_view(topic3,  101.days.ago, user.id)
       expect(tl3_requirements.topics_viewed_all_time).to eq(3)
     end
 
@@ -330,11 +334,11 @@ describe TrustLevel3Requirements do
         target_usernames: [user.username, moderator.username]
       ).topic
 
-      make_view(10, 1.day.ago,    user.id)
-      make_view(9,  100.days.ago, user.id)
-      make_view(8,  101.days.ago, user.id)
-      make_view(private_topic.id, 1.day.ago, user.id)
-      make_view(private_topic.id, 100.days.ago, user.id)
+      make_view(topic1, 1.day.ago,    user.id)
+      make_view(topic2,  100.days.ago, user.id)
+      make_view(topic3,  101.days.ago, user.id)
+      make_view(private_topic, 1.day.ago, user.id)
+      make_view(private_topic, 100.days.ago, user.id)
       expect(tl3_requirements.topics_viewed_all_time).to eq(3)
     end
   end

From dce46086f49c1a16d2bbf9e5b090b2d7477ee8ed Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 17 Apr 2020 14:23:33 -0300
Subject: [PATCH 559/633] FIX: Do not raise an error if the post action type is
 nil (#9458)

---
 .../post_action_users_controller.rb           |  2 +-
 .../post_action_users_controller_spec.rb      | 23 +++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/controllers/post_action_users_controller.rb b/app/controllers/post_action_users_controller.rb
index 73efa06a3e..fe42fd3b9c 100644
--- a/app/controllers/post_action_users_controller.rb
+++ b/app/controllers/post_action_users_controller.rb
@@ -27,7 +27,7 @@ class PostActionUsersController < ApplicationController
     end
 
     action_type = PostActionType.types.key(post_action_type_id)
-    total_count = post["#{action_type}_count"]
+    total_count = post["#{action_type}_count"].to_i
 
     data = { post_action_users: serialize_data(post_actions.to_a, PostActionUserSerializer) }
 
diff --git a/spec/requests/post_action_users_controller_spec.rb b/spec/requests/post_action_users_controller_spec.rb
index 4b6f6375d4..bc053524fe 100644
--- a/spec/requests/post_action_users_controller_spec.rb
+++ b/spec/requests/post_action_users_controller_spec.rb
@@ -15,8 +15,8 @@ describe PostActionUsersController do
 
       get "/post_action_users.json", params: { id: post.id, post_action_type_id: notify_mod }
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
-      users = json["post_action_users"]
+
+      users = response.parsed_body["post_action_users"]
 
       expect(users.length).to eq(1)
       expect(users[0]["id"]).to eq(post.user.id)
@@ -69,14 +69,27 @@ describe PostActionUsersController do
 
     get "/post_action_users.json",
       params: { id: post.id, post_action_type_id: PostActionType.types[:like], page: 1, limit: 2 }
-    json = JSON.parse(response.body)
 
-    users = json["post_action_users"]
-    total = json["total_rows_post_action_users"]
+    users = response.parsed_body["post_action_users"]
+    total = response.parsed_body["total_rows_post_action_users"]
 
     expect(users.length).to eq(2)
     expect(users.map { |u| u["id"] }).to eq(user_ids[2..3])
 
     expect(total).to eq(5)
   end
+
+  it 'returns no users when the action type id is invalid' do
+    get "/post_action_users.json", params: {
+      id: post.id, post_action_type_id: "invalid_action_type"
+    }
+
+    expect(response.status).to eq(200)
+
+    users = response.parsed_body["post_action_users"]
+    total = response.parsed_body["total_rows_post_action_users"]
+
+    expect(users.length).to eq(0)
+    expect(total).to be_nil
+  end
 end

From 80563705daada279feadbb464f4078fb106d7e56 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2020 14:31:27 -0400
Subject: [PATCH 560/633] Build(deps-dev): Bump byebug from 11.1.1 to 11.1.2
 (#9462)

Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 11.1.1 to 11.1.2.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases)
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.1.1...v11.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3eed581808..0e938abf43 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,7 +78,7 @@ GEM
     bullet (6.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    byebug (11.1.1)
+    byebug (11.1.2)
     cbor (0.5.9.6)
     certified (1.0.0)
     chunky_png (1.3.11)

From 0e74dd7d7c576248e698f6d53bf769f6b02d2450 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 17 Apr 2020 13:39:04 -0500
Subject: [PATCH 561/633] FIX: Set user timezone on password reset login
 (#9461)

---
 .../discourse/controllers/password-reset.js          |  3 ++-
 app/controllers/users_controller.rb                  |  1 +
 spec/requests/users_controller_spec.rb               | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js b/app/assets/javascripts/discourse/controllers/password-reset.js
index dcb1931ac0..efdf9db0ae 100644
--- a/app/assets/javascripts/discourse/controllers/password-reset.js
+++ b/app/assets/javascripts/discourse/controllers/password-reset.js
@@ -54,7 +54,8 @@ export default Controller.extend(PasswordValidation, {
           password: this.accountPassword,
           second_factor_token:
             this.securityKeyCredential || this.secondFactorToken,
-          second_factor_method: this.secondFactorMethod
+          second_factor_method: this.secondFactorMethod,
+          timezone: moment.tz.guess()
         }
       })
         .then(result => {
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 29d7bc9963..80583ad79b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -641,6 +641,7 @@ class UsersController < ApplicationController
       # if we have run into no errors then the user is a-ok to
       # change the password
       if @user.errors.empty?
+        @user.update_timezone_if_missing(params[:timezone]) if params[:timezone]
         @user.password = params[:password]
         @user.password_required!
         @user.user_auth_tokens.destroy_all
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 507c28f910..9bb8992c70 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -279,6 +279,18 @@ describe UsersController do
         expect(response).to redirect_to(wizard_path)
       end
 
+      it "sets the users timezone if the param is present" do
+        user = Fabricate(:admin)
+        UserAuthToken.generate!(user_id: user.id)
+
+        token = user.email_tokens.create(email: user.email).token
+        get "/u/password-reset/#{token}"
+
+        expect(user.user_option.timezone).to eq(nil)
+        put "/u/password-reset/#{token}", params: { password: 'hg9ow8yhg98oadminlonger', timezone: "America/Chicago" }
+        expect(user.user_option.reload.timezone).to eq("America/Chicago")
+      end
+
       it "logs the password change" do
         user = Fabricate(:admin)
         UserAuthToken.generate!(user_id: user.id)

From 3ac6e16250e17fcb242e0dada6519df485bcbf20 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2020 17:32:30 -0400
Subject: [PATCH 562/633] Build(deps): Bump aws-sigv4 from 1.1.1 to 1.1.2
 (#9465)

Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.1...1.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0e938abf43..ef1c3e67ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,7 @@ GEM
     aws-sdk-sns (1.22.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.1)
+    aws-sigv4 (1.1.2)
       aws-eventstream (~> 1.0, >= 1.0.2)
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)

From e41f1e6ec221c10024bde6c33336e1dc21684d9d Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Fri, 17 Apr 2020 14:59:54 -0700
Subject: [PATCH 563/633] FEATURE: Rake task to export groups (#9450)

---
 lib/import_export.rb                      |  5 ++++
 lib/import_export/base_exporter.rb        | 36 ++++++++++++++++-------
 lib/import_export/group_exporter.rb       | 28 ++++++++++++++++++
 lib/tasks/export.rake                     |  8 +++++
 spec/fixtures/json/import-export.json     |  4 +--
 spec/import_export/group_exporter_spec.rb | 32 ++++++++++++++++++++
 spec/import_export/importer_spec.rb       | 14 +++++++++
 7 files changed, 115 insertions(+), 12 deletions(-)
 create mode 100644 lib/import_export/group_exporter.rb
 create mode 100644 spec/import_export/group_exporter_spec.rb

diff --git a/lib/import_export.rb b/lib/import_export.rb
index f86600253d..6a32d686f1 100644
--- a/lib/import_export.rb
+++ b/lib/import_export.rb
@@ -5,6 +5,7 @@ require "import_export/base_exporter"
 require "import_export/category_structure_exporter"
 require "import_export/category_exporter"
 require "import_export/topic_exporter"
+require "import_export/group_exporter"
 require "json"
 
 module ImportExport
@@ -26,4 +27,8 @@ module ImportExport
     ImportExport::TopicExporter.new(topic_ids).perform.save_to_file(filename)
   end
 
+  def self.export_groups(include_users, filename = nil)
+    ImportExport::GroupExporter.new(include_users).perform.save_to_file(filename)
+  end
+
 end
diff --git a/lib/import_export/base_exporter.rb b/lib/import_export/base_exporter.rb
index ec0bd2b428..f53b38025f 100644
--- a/lib/import_export/base_exporter.rb
+++ b/lib/import_export/base_exporter.rb
@@ -8,9 +8,11 @@ module ImportExport
                       :auto_close_hours, :parent_category_id, :auto_close_based_on_last_post,
                       :topic_template, :all_topics_wiki, :permissions_params]
 
-    GROUP_ATTRS = [ :id, :name, :created_at, :mentionable_level, :messageable_level, :visibility_level,
-                    :automatic_membership_email_domains, :automatic_membership_retroactive,
-                    :primary_group, :title, :grant_trust_level, :incoming_email]
+    GROUP_ATTRS = [:id, :name, :created_at, :automatic_membership_email_domains, :primary_group,
+                   :title, :grant_trust_level, :incoming_email, :bio_raw, :allow_membership_requests,
+                   :full_name, :default_notification_level, :visibility_level, :public_exit,
+                   :public_admission, :membership_request_template, :messageable_level, :mentionable_level,
+                   :members_visibility_level, :publish_read_state]
 
     USER_ATTRS = [:id, :email, :username, :name, :created_at, :trust_level, :active, :last_emailed_at]
 
@@ -39,6 +41,26 @@ module ImportExport
       self
     end
 
+    def export_groups(group_names)
+      data = []
+      groups = Group.all
+      groups = groups.where(name: group_names) if group_names.present?
+
+      groups.find_each do |group|
+        attrs = GROUP_ATTRS.inject({}) { |h, a| h[a] = group.public_send(a); h }
+        attrs[:user_ids] = group.users.pluck(:id)
+        data << attrs
+      end
+
+      data
+    end
+
+    def export_groups!
+      @export_data[:groups] = export_groups([])
+
+      self
+    end
+
     def export_category_groups
       groups = []
       group_names = []
@@ -53,13 +75,7 @@ module ImportExport
       group_names.uniq!
       return [] if group_names.empty?
 
-      Group.where(name: group_names).find_each do |group|
-        attrs = GROUP_ATTRS.inject({}) { |h, a| h[a] = group.public_send(a); h }
-        attrs[:user_ids] = group.users.pluck(:id)
-        groups << attrs
-      end
-
-      groups
+      export_groups(group_names)
     end
 
     def export_category_groups!
diff --git a/lib/import_export/group_exporter.rb b/lib/import_export/group_exporter.rb
new file mode 100644
index 0000000000..893320cfbb
--- /dev/null
+++ b/lib/import_export/group_exporter.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module ImportExport
+  class GroupExporter < BaseExporter
+
+    def initialize(include_group_users = false)
+      @include_group_users = include_group_users
+
+      @export_data = {
+        groups: []
+      }
+      @export_data[:users] = [] if @include_group_users
+    end
+
+    def perform
+      puts "Exporting all user groups...", ""
+      export_groups!
+      export_group_users! if @include_group_users
+
+      self
+    end
+
+    def default_filename_prefix
+      "groups-export"
+    end
+
+  end
+end
diff --git a/lib/tasks/export.rake b/lib/tasks/export.rake
index ab1b9138eb..1e58a3f9a8 100644
--- a/lib/tasks/export.rake
+++ b/lib/tasks/export.rake
@@ -16,3 +16,11 @@ task 'export:category_structure', [:include_group_users, :file_name] => [:enviro
   ImportExport.export_category_structure(args[:include_group_users], args[:file_name])
   puts "", "Done", ""
 end
+
+desc 'Export all user groups'
+task 'export:groups', [:include_group_users, :file_name] => [:environment] do |_, args|
+  require "import_export"
+
+  ImportExport.export_groups(args[:include_group_users], args[:file_name])
+  puts "", "Done", ""
+end
diff --git a/spec/fixtures/json/import-export.json b/spec/fixtures/json/import-export.json
index aaf292a1c2..f991e7f2c4 100644
--- a/spec/fixtures/json/import-export.json
+++ b/spec/fixtures/json/import-export.json
@@ -1,7 +1,7 @@
 {
   "groups":[
-    {"id":41,"name":"custom_group","created_at":"2017-10-26T15:33:46.328Z","mentionable_level":0,"messageable_level":0,"visibility_level":0,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"user_ids":[1]},
-    {"id":42,"name":"custom_group_import","created_at":"2017-10-26T15:33:46.328Z","mentionable_level":0,"messageable_level":0,"visibility_level":0,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"user_ids":[2]}
+    {"id":41,"name":"custom_group","created_at":"2017-10-26T15:33:46.328Z","automatic_membership_email_domains":"","primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"bio_raw":"This is a custom group","allow_membership_requests":false,"full_name":"Custom Group","default_notification_level":3,"visibility_level":0,"public_exit":false,"public_admission":false,"membership_request_template":"","messageable_level":0,"mentionable_level":0,"members_visibility_level":0,"publish_read_state":false,"user_ids":[1]},
+    {"id":42,"name":"custom_group_import","created_at":"2017-10-26T15:33:46.328Z","automatic_membership_email_domains":"","primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"bio_raw":"This is a custom group import","allow_membership_requests":false,"full_name":"Custom Group Import","default_notification_level":3,"visibility_level":0,"public_exit":false,"public_admission":false,"membership_request_template":"","messageable_level":0,"mentionable_level":0,"members_visibility_level":0,"publish_read_state":false,"user_ids":[2]}
   ],
   "categories":[
     {"id":8,"name":"Custom Category","color":"0088CC","created_at":"2017-10-26T15:32:44.083Z","user_id":1,"slug":"custom-category","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":3,"auto_close_based_on_last_post":false,"topic_template":"","all_topics_wiki":false,"permissions_params":{"custom_group":1,"everyone":2}},
diff --git a/spec/import_export/group_exporter_spec.rb b/spec/import_export/group_exporter_spec.rb
new file mode 100644
index 0000000000..1e2deb929c
--- /dev/null
+++ b/spec/import_export/group_exporter_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+require "import_export/group_exporter"
+
+describe ImportExport::GroupExporter do
+
+  before do
+    STDOUT.stubs(:write)
+  end
+
+  it 'exports all the groups' do
+    group = Fabricate(:group)
+    user = Fabricate(:user)
+    group_user = Fabricate(:group_user, group: group, user: user)
+    data = ImportExport::GroupExporter.new.perform.export_data
+
+    expect(data[:groups].map { |g| g[:id] }).to include(group.id)
+    expect(data[:users].blank?).to eq(true)
+  end
+
+  it 'exports all the groups with users' do
+    group = Fabricate(:group)
+    user = Fabricate(:user)
+    group_user = Fabricate(:group_user, group: group, user: user)
+    data = ImportExport::GroupExporter.new(true).perform.export_data
+
+    expect(data[:groups].map { |g| g[:id] }).to include(group.id)
+    expect(data[:users].map { |u| u[:id] }).to include(user.id)
+  end
+
+end
diff --git a/spec/import_export/importer_spec.rb b/spec/import_export/importer_spec.rb
index ea659e1191..6065448996 100644
--- a/spec/import_export/importer_spec.rb
+++ b/spec/import_export/importer_spec.rb
@@ -84,6 +84,20 @@ describe ImportExport::Importer do
         .and change { User.count }.by(2)
     end
 
+    it 'groups' do
+      data = import_data.dup
+      data[:categories] = nil
+      data[:topics] = nil
+      data[:users] = nil
+
+      expect {
+        import(data)
+      }.to change { Category.count }.by(0)
+        .and change { Group.count }.by(2)
+        .and change { Topic.count }.by(0)
+        .and change { User.count }.by(0)
+    end
+
     it 'all' do
       expect {
         import(import_data)

From 3e3ac704e174a51b057c4c0b618a1e6c796edcd9 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 19 Apr 2020 16:44:14 +0200
Subject: [PATCH 564/633] Remove unused translation

It isn't used anymore since a19e43fd3b83f9e2be632edaf69cc4ce01fe787b
---
 config/locales/server.en.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 64ed44da9b..51daf795cf 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1375,7 +1375,6 @@ en:
   dashboard:
     rails_env_warning: "Your server is running in %{env} mode."
     host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname."
-    gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. <a href="https://github.com/mperham/sidekiq" target="_blank">Learn about Sidekiq here</a>.'
     queue_size_warning: "The number of queued jobs is %{queue_size}, which is high. This could indicate a problem with the Sidekiq process(es), or you may need to add more Sidekiq workers."
     memory_warning: "Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended."

From cfe510cbcf7c3fa9a9407c17d8eba735a23ecc96 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 19 Apr 2020 18:54:10 +0200
Subject: [PATCH 565/633] FIX: prevents custom emoji to show double colons and
 set background img (#9471)

---
 app/assets/javascripts/discourse/components/emoji-picker.js     | 2 +-
 .../discourse/templates/components/emoji-picker.hbs.erb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js b/app/assets/javascripts/discourse/components/emoji-picker.js
index 90e2fefe13..e088f9c409 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js
@@ -434,7 +434,7 @@ export default Component.extend({
 
     this.$visibleSections.forEach(visibleSection => {
       const $unloadedEmojis = $(visibleSection).find(
-        "button.emoji[data-loaded!='1']"
+        "button.emoji:not(.custom)[data-loaded!='1']"
       );
       $.each($unloadedEmojis, (_, button) => {
         let offsetTop = button.offsetTop;
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
index f3504d33f0..ea5b7c125b 100644
--- a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
+++ b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
@@ -61,7 +61,7 @@
             {{#if emojis.length}}
               <div class='section-group'>
                 {{#each emojis as |emoji|}}
-                  <button type="button" class="emoji" tabindex="-1" title=":{{emoji.code}}:">
+                  <button type="button" class="custom emoji" tabindex="-1" title="{{emoji.code}}">
                     <img loading="lazy" class="emoji" src="{{emoji.src}}">
                   </button>
                 {{/each}}

From baae0e7446baba8a1c74460999904ade57879797 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 19 Apr 2020 20:21:58 +0200
Subject: [PATCH 566/633] FIX: Infinite loop in migrate_to_s3 rake task

---
 lib/file_store/to_s3_migration.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/file_store/to_s3_migration.rb b/lib/file_store/to_s3_migration.rb
index 01c69dc1ee..6792b94e4a 100644
--- a/lib/file_store/to_s3_migration.rb
+++ b/lib/file_store/to_s3_migration.rb
@@ -6,6 +6,8 @@ module FileStore
   ToS3MigrationError = Class.new(RuntimeError)
 
   class ToS3Migration
+    MISSING_UPLOADS_RAKE_TASK_NAME ||= 'posts:missing_uploads'
+
     def initialize(s3_options:, dry_run: false, migrate_to_multisite: false, skip_etag_verify: false)
 
       @s3_bucket = s3_options[:bucket]
@@ -85,8 +87,8 @@ module FileStore
         success = false
       end
 
-      Discourse::Application.load_tasks
-      Rake::Task['posts:missing_uploads']
+      Discourse::Application.load_tasks unless Rake::Task.task_defined?(MISSING_UPLOADS_RAKE_TASK_NAME)
+      Rake::Task[MISSING_UPLOADS_RAKE_TASK_NAME]
       count = DB.query_single(<<~SQL, Post::MISSING_UPLOADS, Post::MISSING_UPLOADS_IGNORED).first
         SELECT COUNT(1)
         FROM posts p

From c6b411f6c18efc41010afcb83f2a712f642d3a23 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 19 Apr 2020 20:24:27 +0200
Subject: [PATCH 567/633] FIX: Restore to S3 didn't work without env variables

The `uplaods:migrate_to_s3` rake task should always use the environment variables, because you usually don't want to break your site's uploads during the migration. But restoring a backup should work with site settings as well as environment variables, otherwise you can't restore uploads to S3 from the web interface.
---
 lib/file_store/s3_store.rb        | 2 +-
 lib/file_store/to_s3_migration.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 053b23aa32..6a26ebd7ee 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -198,7 +198,7 @@ module FileStore
       FileUtils.symlink(source_path, public_upload_path)
 
       FileStore::ToS3Migration.new(
-        s3_options: FileStore::ToS3Migration.s3_options_from_env,
+        s3_options: FileStore::ToS3Migration.s3_options_from_site_settings,
         migrate_to_multisite: Rails.configuration.multisite,
       ).migrate
 
diff --git a/lib/file_store/to_s3_migration.rb b/lib/file_store/to_s3_migration.rb
index 6792b94e4a..6f19f2d00f 100644
--- a/lib/file_store/to_s3_migration.rb
+++ b/lib/file_store/to_s3_migration.rb
@@ -21,7 +21,7 @@ module FileStore
     def self.s3_options_from_site_settings
       {
         client_options: S3Helper.s3_options(SiteSetting),
-        bucket: SiteSetting.s3_upload_bucket
+        bucket: SiteSetting.Upload.s3_upload_bucket
       }
     end
 

From 344ef5226cb26d0086dffd79b25f5cf8628aafd0 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 20 Apr 2020 13:30:04 +1000
Subject: [PATCH 568/633] FEATURE: Edit bookmark reminders from post and
 explicit delete button (#9455)

There is now an explicit "Delete Bookmark" button in the edit modal. A confirmation is shown before deleting.

Along with this, when the bookmarked post icon is clicked the modal is now shown instead of just deleting the bookmark. Also, the "Delete Bookmark" button from the user bookmark list now confirms the action.

Add a `d d` shortcut in the modal to delete the bookmark.
---
 .../discourse/controllers/bookmark.js         | 131 ++++++++++++------
 .../controllers/keyboard-shortcuts-help.js    |   4 +
 .../user-activity-bookmarks-with-reminders.js |   6 +-
 .../javascripts/discourse/models/post.js      |  81 +++++------
 .../javascripts/discourse/models/topic.js     |  10 +-
 .../discourse/templates/modal/bookmark.hbs    |   7 +-
 .../modal/keyboard-shortcuts-help.hbs         |   1 +
 app/controllers/bookmarks_controller.rb       |   6 +-
 app/controllers/posts_controller.rb           |  11 +-
 app/serializers/post_serializer.rb            |  18 +++
 config/locales/client.en.yml                  |   3 +
 lib/bookmark_manager.rb                       |   2 +
 spec/lib/bookmark_manager_spec.rb             |   9 +-
 spec/requests/posts_controller_spec.rb        |   2 +-
 test/javascripts/controllers/bookmark-test.js |   6 +-
 15 files changed, 192 insertions(+), 105 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index ec384d54ae..9f630ee913 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -41,15 +41,16 @@ const BOOKMARK_BINDINGS = {
   },
   "n m": { handler: "selectReminderType", args: [REMINDER_TYPES.NEXT_MONTH] },
   "c r": { handler: "selectReminderType", args: [REMINDER_TYPES.CUSTOM] },
-  "n r": { handler: "selectReminderType", args: [REMINDER_TYPES.NONE] }
+  "n r": { handler: "selectReminderType", args: [REMINDER_TYPES.NONE] },
+  "d d": { handler: "delete" }
 };
 
 export default Controller.extend(ModalFunctionality, {
   loading: false,
   errorMessage: null,
   selectedReminderType: null,
-  closeWithoutSaving: false,
-  isSavingBookmarkManually: false,
+  _closeWithoutSaving: false,
+  _savingBookmarkManually: false,
   onCloseWithoutSaving: null,
   customReminderDate: null,
   customReminderTime: null,
@@ -62,20 +63,20 @@ export default Controller.extend(ModalFunctionality, {
     this.setProperties({
       errorMessage: null,
       selectedReminderType: REMINDER_TYPES.NONE,
-      closeWithoutSaving: false,
-      isSavingBookmarkManually: false,
+      _closeWithoutSaving: false,
+      _savingBookmarkManually: false,
       customReminderDate: null,
-      customReminderTime: this.defaultCustomReminderTime(),
+      customReminderTime: this._defaultCustomReminderTime(),
       lastCustomReminderDate: null,
       lastCustomReminderTime: null,
       userTimezone: this.currentUser.resolvedTimezone()
     });
 
-    this.bindKeyboardShortcuts();
-    this.loadLastUsedCustomReminderDatetime();
+    this._bindKeyboardShortcuts();
+    this._loadLastUsedCustomReminderDatetime();
 
-    if (this.editingExistingBookmark()) {
-      this.initializeExistingBookmarkData();
+    if (this._editingExistingBookmark()) {
+      this._initializeExistingBookmarkData();
     }
   },
 
@@ -84,19 +85,19 @@ export default Controller.extend(ModalFunctionality, {
    * clicks the save or cancel button to mimic browser behaviour.
    */
   onClose() {
-    this.unbindKeyboardShortcuts();
-    this.restoreGlobalShortcuts();
-    if (!this.closeWithoutSaving && !this.isSavingBookmarkManually) {
-      this.saveBookmark().catch(e => this.handleSaveError(e));
+    this._unbindKeyboardShortcuts();
+    this._restoreGlobalShortcuts();
+    if (!this._closeWithoutSaving && !this._savingBookmarkManually) {
+      this._saveBookmark().catch(e => this._handleSaveError(e));
     }
-    if (this.onCloseWithoutSaving && this.closeWithoutSaving) {
+    if (this.onCloseWithoutSaving && this._closeWithoutSaving) {
       this.onCloseWithoutSaving();
     }
   },
 
-  initializeExistingBookmarkData() {
-    if (this.existingBookmarkHasReminder()) {
-      let parsedReminderAt = this.parseCustomDateTime(this.model.reminderAt);
+  _initializeExistingBookmarkData() {
+    if (this._existingBookmarkHasReminder()) {
+      let parsedReminderAt = this._parseCustomDateTime(this.model.reminderAt);
       this.setProperties({
         customReminderDate: parsedReminderAt.format("YYYY-MM-DD"),
         customReminderTime: parsedReminderAt.format("HH:mm"),
@@ -105,20 +106,20 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  editingExistingBookmark() {
+  _editingExistingBookmark() {
     return isPresent(this.model) && isPresent(this.model.id);
   },
 
-  existingBookmarkHasReminder() {
+  _existingBookmarkHasReminder() {
     return isPresent(this.model) && isPresent(this.model.reminderAt);
   },
 
-  loadLastUsedCustomReminderDatetime() {
+  _loadLastUsedCustomReminderDatetime() {
     let lastTime = localStorage.lastCustomBookmarkReminderTime;
     let lastDate = localStorage.lastCustomBookmarkReminderDate;
 
     if (lastTime && lastDate) {
-      let parsed = this.parseCustomDateTime(lastDate, lastTime);
+      let parsed = this._parseCustomDateTime(lastDate, lastTime);
 
       // can't set reminders in the past
       if (parsed < this.now()) {
@@ -133,7 +134,7 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  bindKeyboardShortcuts() {
+  _bindKeyboardShortcuts() {
     KeyboardShortcuts.pause(GLOBAL_SHORTCUTS_TO_PAUSE);
     Object.keys(BOOKMARK_BINDINGS).forEach(shortcut => {
       KeyboardShortcuts.addShortcut(shortcut, () => {
@@ -146,11 +147,11 @@ export default Controller.extend(ModalFunctionality, {
     });
   },
 
-  unbindKeyboardShortcuts() {
+  _unbindKeyboardShortcuts() {
     KeyboardShortcuts.unbind(BOOKMARK_BINDINGS);
   },
 
-  restoreGlobalShortcuts() {
+  _restoreGlobalShortcuts() {
     KeyboardShortcuts.unpause(GLOBAL_SHORTCUTS_TO_PAUSE);
   },
 
@@ -159,6 +160,11 @@ export default Controller.extend(ModalFunctionality, {
     return isPresent(existingReminderAt);
   },
 
+  @discourseComputed("model.id")
+  showDelete(id) {
+    return isPresent(id);
+  },
+
   @discourseComputed()
   showAtDesktop() {
     return (
@@ -247,8 +253,8 @@ export default Controller.extend(ModalFunctionality, {
     return !_.isEmpty(userTimezone);
   },
 
-  saveBookmark() {
-    const reminderAt = this.reminderAt();
+  _saveBookmark() {
+    const reminderAt = this._reminderAt();
     const reminderAtISO = reminderAt ? reminderAt.toISOString() : null;
 
     if (this.selectedReminderType === REMINDER_TYPES.CUSTOM) {
@@ -277,34 +283,54 @@ export default Controller.extend(ModalFunctionality, {
       id: this.model.id
     };
 
-    if (this.editingExistingBookmark()) {
+    if (this._editingExistingBookmark()) {
       return ajax("/bookmarks/" + this.model.id, {
         type: "PUT",
         data
       }).then(() => {
         if (this.afterSave) {
-          this.afterSave(reminderAtISO, this.selectedReminderType);
+          this.afterSave({
+            reminderAt: reminderAtISO,
+            reminderType: this.selectedReminderType,
+            id: this.model.id,
+            name: this.model.name
+          });
         }
       });
     } else {
-      return ajax("/bookmarks", { type: "POST", data }).then(() => {
+      return ajax("/bookmarks", { type: "POST", data }).then(response => {
         if (this.afterSave) {
-          this.afterSave(reminderAtISO, this.selectedReminderType);
+          this.afterSave({
+            reminderAt: reminderAtISO,
+            reminderType: this.selectedReminderType,
+            id: response.id,
+            name: this.model.name
+          });
         }
       });
     }
   },
 
-  parseCustomDateTime(date, time) {
+  _deleteBookmark() {
+    return ajax("/bookmarks/" + this.model.id, {
+      type: "DELETE"
+    }).then(response => {
+      if (this.afterDelete) {
+        this.afterDelete(response.topic_bookmarked);
+      }
+    });
+  },
+
+  _parseCustomDateTime(date, time) {
     let dateTime = isPresent(time) ? date + " " + time : date;
     return moment.tz(dateTime, this.userTimezone);
   },
 
-  defaultCustomReminderTime() {
+  _defaultCustomReminderTime() {
     return `0${START_OF_DAY_HOUR}:00`;
   },
 
-  reminderAt() {
+  _reminderAt() {
     if (!this.selectedReminderType) {
       return;
     }
@@ -329,9 +355,9 @@ export default Controller.extend(ModalFunctionality, {
       case REMINDER_TYPES.CUSTOM:
         this.set(
           "customReminderTime",
-          this.customReminderTime || this.defaultCustomReminderTime()
+          this.customReminderTime || this._defaultCustomReminderTime()
         );
-        const customDateTime = this.parseCustomDateTime(
+        const customDateTime = this._parseCustomDateTime(
           this.customReminderDate,
           this.customReminderTime
         );
@@ -385,8 +411,8 @@ export default Controller.extend(ModalFunctionality, {
     return this.startOfDay(this.now().add(2, "days"));
   },
 
-  handleSaveError(e) {
-    this.isSavingBookmarkManually = false;
+  _handleSaveError(e) {
+    this._savingBookmarkManually = false;
     if (typeof e === "string") {
       bootbox.alert(e);
     } else {
@@ -396,20 +422,35 @@ export default Controller.extend(ModalFunctionality, {
 
   actions: {
     saveAndClose() {
-      if (this.saving) {
+      if (this._saving || this._deleting) {
         return;
       }
 
-      this.saving = true;
-      this.isSavingBookmarkManually = true;
-      this.saveBookmark()
+      this._saving = true;
+      this._savingBookmarkManually = true;
+      this._saveBookmark()
         .then(() => this.send("closeModal"))
-        .catch(e => this.handleSaveError(e))
-        .finally(() => (this.saving = false));
+        .catch(e => this._handleSaveError(e))
+        .finally(() => (this._saving = false));
+    },
+
+    delete() {
+      this._deleting = true;
+      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
+        if (result) {
+          this._closeWithoutSaving = true;
+          this._deleteBookmark()
+            .then(() => {
+              this._deleting = false;
+              this.send("closeModal");
+            })
+            .catch(e => this._handleSaveError(e));
+        }
+      });
     },
 
     closeWithoutSavingBookmark() {
-      this.closeWithoutSaving = true;
+      this._closeWithoutSaving = true;
       this.send("closeModal");
     },
 
diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
index 85ee690151..a0d42ac061 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
@@ -170,6 +170,10 @@ export default Controller.extend(ModalFunctionality, {
         none: buildShortcut("bookmarks.none", {
           keys1: ["n", "r"],
           shortcutsDelimiter: "space"
+        }),
+        delete: buildShortcut("bookmarks.delete", {
+          keys1: ["d", "d"],
+          shortcutsDelimiter: "space"
         })
       },
       actions: {
diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
index a2176a7a2b..9611aceced 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
+++ b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
@@ -61,7 +61,11 @@ export default Controller.extend({
 
   actions: {
     removeBookmark(bookmark) {
-      return bookmark.destroy().then(() => this.loadItems());
+      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
+        if (result) {
+          return bookmark.destroy().then(() => this.loadItems());
+        }
+      });
     },
 
     editBookmark(bookmark) {
diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js
index f3ae53a606..550a1fbfac 100644
--- a/app/assets/javascripts/discourse/models/post.js
+++ b/app/assets/javascripts/discourse/models/post.js
@@ -336,48 +336,49 @@ const Post = RestModel.extend({
   },
 
   toggleBookmarkWithReminder() {
-    this.toggleProperty("bookmarked_with_reminder");
-    if (this.bookmarked_with_reminder) {
-      return new Promise(resolve => {
-        let controller = showModal("bookmark", {
-          model: {
-            postId: this.id
-          },
-          title: "post.bookmarks.create",
-          modalClass: "bookmark-with-reminder"
-        });
-        controller.setProperties({
-          onCloseWithoutSaving: () => {
-            this.toggleProperty("bookmarked_with_reminder");
-            resolve({ closedWithoutSaving: true });
-            this.appEvents.trigger("post-stream:refresh", { id: this.id });
-          },
-          afterSave: (reminderAtISO, reminderType) => {
-            this.setProperties({
-              "topic.bookmarked": true,
-              bookmark_reminder_at: reminderAtISO,
-              bookmark_reminder_type: reminderType
-            });
-            resolve({ closedWithoutSaving: false });
-            this.appEvents.trigger("post-stream:refresh", { id: this.id });
-          }
-        });
+    return new Promise(resolve => {
+      let controller = showModal("bookmark", {
+        model: {
+          postId: this.id,
+          id: this.bookmark_id,
+          reminderAt: this.bookmark_reminder_at,
+          name: this.bookmark_name
+        },
+        title: this.bookmark_id
+          ? "post.bookmarks.edit"
+          : "post.bookmarks.create",
+        modalClass: "bookmark-with-reminder"
       });
-    } else {
-      this.setProperties({
-        bookmark_reminder_at: null,
-        bookmark_reminder_type: null
-      });
-      return Post.destroyBookmark(this.id)
-        .then(result => {
-          this.set("topic.bookmarked", result.topic_bookmarked);
+      controller.setProperties({
+        onCloseWithoutSaving: () => {
+          resolve({ closedWithoutSaving: true });
+          this.appEvents.trigger("post-stream:refresh", { id: this.id });
+        },
+        afterSave: savedData => {
+          this.setProperties({
+            "topic.bookmarked": true,
+            bookmarked_with_reminder: true,
+            bookmark_reminder_at: savedData.reminderAt,
+            bookmark_reminder_type: savedData.reminderType,
+            bookmark_name: savedData.name,
+            bookmark_id: savedData.id
+          });
+          resolve({ closedWithoutSaving: false });
+          this.appEvents.trigger("post-stream:refresh", { id: this.id });
+        },
+        afterDelete: topicBookmarked => {
+          this.set("topic.bookmarked", topicBookmarked);
+          this.setProperties({
+            bookmark_reminder_at: null,
+            bookmark_reminder_type: null,
+            bookmark_name: null,
+            bookmark_id: null,
+            bookmarked_with_reminder: false
+          });
           this.appEvents.trigger("page:bookmark-post-toggled", this);
-        })
-        .catch(error => {
-          this.toggleProperty("bookmarked_with_reminder");
-          throw new Error(error);
-        });
-    }
+        }
+      });
+    });
   },
 
   updateActionsSummary(json) {
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index ce951d6edc..6ad8de27ec 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -461,6 +461,12 @@ const Topic = RestModel.extend({
             .then(() => {
               this.toggleProperty("bookmarked");
               this.set("bookmark_reminder_at", null);
+              let clearedBookmarkProps = {
+                bookmarked_with_reminder: false,
+                bookmark_id: null,
+                bookmark_name: null,
+                bookmark_reminder_at: null
+              };
               if (posts) {
                 const updated = [];
                 posts.forEach(post => {
@@ -472,11 +478,11 @@ const Topic = RestModel.extend({
                     this.siteSettings.enable_bookmarks_with_reminders &&
                     post.bookmarked_with_reminder
                   ) {
-                    post.set("bookmarked_with_reminder", false);
+                    post.setProperties(clearedBookmarkProps);
                     updated.push(post.id);
                   }
                 });
-                firstPost.set("bookmarked_with_reminder", false);
+                firstPost.setProperties(clearedBookmarkProps);
                 return updated;
               }
             })
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 8e20711ef3..3a5075ebc9 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -9,7 +9,7 @@
     {{/if}}
 
     <div class="control-group">
-      {{input value=model.name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
+      {{input id="bookmark-name" value=model.name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
     </div>
 
     {{#if showExistingReminderAt }}
@@ -100,6 +100,11 @@
     <div class="control-group">
       {{d-button label="bookmarks.save" class="btn-primary" action=(action "saveAndClose")}}
       {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}
+      {{#if showDelete}}
+        <div class="pull-right">
+          {{d-button icon="trash" class="btn-danger" action=(action "delete")}}
+        </div>
+      {{/if}}
     </div>
   {{/conditional-loading-spinner}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index f2d6b022e9..5299b52f37 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -69,6 +69,7 @@
           <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
           <li>{{html-safe shortcuts.bookmarks.custom}}</li>
           <li>{{html-safe shortcuts.bookmarks.none}}</li>
+          <li>{{html-safe shortcuts.bookmarks.delete}}</li>
         </ul>
       </section>
     {{/if}}
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index 4fd077d45e..f7fed51f59 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -15,7 +15,7 @@ class BookmarksController < ApplicationController
     )
 
     if bookmark_manager.errors.empty?
-      return render json: success_json
+      return render json: success_json.merge(id: bookmark.id)
     end
 
     render json: failed_json.merge(errors: bookmark_manager.errors.full_messages), status: 400
@@ -23,8 +23,8 @@ class BookmarksController < ApplicationController
 
   def destroy
     params.require(:id)
-    BookmarkManager.new(current_user).destroy(params[:id])
-    render json: success_json
+    result = BookmarkManager.new(current_user).destroy(params[:id])
+    render json: success_json.merge(result)
   end
 
   def update
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 5d62c6510f..50c4ead17f 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -511,15 +511,10 @@ class PostsController < ApplicationController
   def destroy_bookmark
     params.require(:post_id)
 
-    existing_bookmark = Bookmark.find_by(post_id: params[:post_id], user_id: current_user.id)
-    topic_bookmarked = false
+    bookmark_id = Bookmark.where(post_id: params[:post_id], user_id: current_user.id).pluck_first(:id)
+    result = BookmarkManager.new(current_user).destroy(bookmark_id)
 
-    if existing_bookmark.present?
-      topic_bookmarked = Bookmark.exists?(topic_id: existing_bookmark.topic_id, user_id: current_user.id)
-      existing_bookmark.destroy
-    end
-
-    render json: success_json.merge(topic_bookmarked: topic_bookmarked)
+    render json: success_json.merge(result)
   end
 
   def wiki
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index b78c90f4fb..ff880f14c3 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -51,7 +51,9 @@ class PostSerializer < BasicPostSerializer
              :bookmarked,
              :bookmarked_with_reminder,
              :bookmark_reminder_at,
+             :bookmark_id,
              :bookmark_reminder_type,
+             :bookmark_name,
              :raw,
              :actions_summary,
              :moderator?,
@@ -334,6 +336,14 @@ class PostSerializer < BasicPostSerializer
     include_bookmarked_with_reminder?
   end
 
+  def include_bookmark_name?
+    include_bookmarked_with_reminder?
+  end
+
+  def include_bookmark_id?
+    include_bookmarked_with_reminder?
+  end
+
   def post_bookmark
     return nil if !SiteSetting.enable_bookmarks_with_reminders? || @topic_view.blank?
     @post_bookmark ||= @topic_view.user_post_bookmarks.find { |bookmark| bookmark.post_id == object.id }
@@ -348,6 +358,14 @@ class PostSerializer < BasicPostSerializer
     Bookmark.reminder_types[post_bookmark.reminder_type].to_s
   end
 
+  def bookmark_name
+    post_bookmark&.name
+  end
+
+  def bookmark_id
+    post_bookmark&.id
+  end
+
   def include_display_username?
     SiteSetting.enable_names?
   end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9bd07e6819..947f19c3ba 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -311,6 +311,8 @@ en:
       created_with_reminder: "you've bookmarked this post with a reminder %{date}"
       created_with_at_desktop_reminder: "you've bookmarked this post and will be reminded next time you are at your desktop"
       remove: "Remove Bookmark"
+      delete: "Delete Bookmark"
+      confirm_delete: "Are you sure you want to delete this bookmark? If you set a reminder it will also be deleted."
       confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
       save: "Save"
       no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up <a href="%{basePath}/my/preferences/profile">in your profile</a>.'
@@ -3118,6 +3120,7 @@ en:
         next_business_day: "%{shortcut} Next business day"
         custom: "%{shortcut} Custom date and time"
         none: "%{shortcut} No reminder"
+        delete: "%{shortcut} Delete bookmark"
       actions:
         title: "Actions"
         bookmark_topic: "%{shortcut} Toggle bookmark topic"
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index 9da2dc257b..b56a129f10 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -44,6 +44,8 @@ class BookmarkManager
 
     bookmark.destroy
     clear_at_desktop_cache_if_required
+
+    { topic_bookmarked: Bookmark.exists?(topic_id: bookmark.topic_id, user: @user) }
   end
 
   def destroy_for_topic(topic)
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index de25969f2c..979f567433 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -123,8 +123,15 @@ RSpec.describe BookmarkManager do
   describe ".destroy" do
     let!(:bookmark) { Fabricate(:bookmark, user: user, post: post) }
     it "deletes the existing bookmark" do
-      subject.destroy(bookmark.id)
+      result = subject.destroy(bookmark.id)
       expect(Bookmark.exists?(id: bookmark.id)).to eq(false)
+      expect(result[:topic_bookmarked]).to eq(false)
+    end
+
+    it "returns a value indicating whether there are still other bookmarks in the topic for the user" do
+      Fabricate(:bookmark, user: user, post: Fabricate(:post, topic: post.topic))
+      result = subject.destroy(bookmark.id)
+      expect(result[:topic_bookmarked]).to eq(true)
     end
 
     context "if the bookmark is belonging to some other user" do
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 534bcdecd5..09cefae4a0 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -473,7 +473,7 @@ describe PostsController do
 
     context "when the user still has bookmarks in the topic" do
       before do
-        Fabricate(:bookmark, user: user, post: Fabricate(:post, topic: post.topic), topic: topic)
+        Fabricate(:bookmark, user: user, post: Fabricate(:post, topic: post.topic), topic: post.topic)
       end
       it "marks topic_bookmaked as true" do
         delete "/posts/#{post.id}/bookmark.json"
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js
index 7a68739289..67d918703b 100644
--- a/test/javascripts/controllers/bookmark-test.js
+++ b/test/javascripts/controllers/bookmark-test.js
@@ -201,7 +201,7 @@ QUnit.test(
     BookmarkController.customReminderDate = "2028-12-12";
     BookmarkController.selectedReminderType =
       BookmarkController.reminderTypes.CUSTOM;
-    const reminderAt = BookmarkController.reminderAt();
+    const reminderAt = BookmarkController._reminderAt();
     assert.equal(BookmarkController.customReminderTime, "08:00");
     assert.equal(
       reminderAt.toString(),
@@ -223,7 +223,7 @@ QUnit.test(
     localStorage.lastCustomBookmarkReminderDate = "2019-12-12";
     localStorage.lastCustomBookmarkReminderTime = "08:00";
 
-    BookmarkController.loadLastUsedCustomReminderDatetime();
+    BookmarkController._loadLastUsedCustomReminderDatetime();
 
     assert.equal(BookmarkController.lastCustomReminderDate, "2019-12-12");
     assert.equal(BookmarkController.lastCustomReminderTime, "08:00");
@@ -237,7 +237,7 @@ QUnit.test(
     localStorage.lastCustomBookmarkReminderDate = "2019-12-11";
     localStorage.lastCustomBookmarkReminderTime = "07:00";
 
-    BookmarkController.loadLastUsedCustomReminderDatetime();
+    BookmarkController._loadLastUsedCustomReminderDatetime();
 
     assert.equal(BookmarkController.lastCustomReminderDate, null);
     assert.equal(BookmarkController.lastCustomReminderTime, null);

From ee36382640560191a8a43e87b607ef00051e019b Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 20 Apr 2020 16:08:24 +1000
Subject: [PATCH 569/633] FEATURE: improve rendering of RSS feeds

- Eliminate superfluous "author wrote" block
- Eliminate block-quote for all posts
- Move participant count and reply count to 1 line
- Prioritize name over username if forum requests
- Use fabrication in list controller spec to speed up spec
---
 app/helpers/application_helper.rb     | 10 ++++++++++
 app/views/list/list.rss.erb           | 18 +++++-------------
 app/views/topics/show.rss.erb         | 15 ++++++---------
 config/locales/server.en.yml          | 10 +++++++---
 spec/requests/list_controller_spec.rb | 27 ++++++++++++++-------------
 5 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e9e68829ec..598d37a954 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -513,4 +513,14 @@ module ApplicationHelper
     !SiteSetting.invite_only &&
     !SiteSetting.enable_sso
   end
+
+  def rss_creator(user)
+    if user
+      if SiteSetting.prioritize_username_in_ux
+        "#{user.username}"
+      else
+        "#{user.name.presence || user.username }"
+      end
+    end
+  end
 end
diff --git a/app/views/list/list.rss.erb b/app/views/list/list.rss.erb
index 0895d208da..040ece9046 100644
--- a/app/views/list/list.rss.erb
+++ b/app/views/list/list.rss.erb
@@ -12,23 +12,15 @@
       <atom:link href="<%= @atom_link %>" rel="self" type="application/rss+xml" />
       <% @topic_list.topics.each do |topic| %>
         <% topic_url = topic.url -%>
-        <% username = topic.user ? topic.user.username : "" %>
-        <% name = topic.user ? topic.user.name : "" %>
         <item>
           <title><%= topic.title %></title>
-          <dc:creator><![CDATA[<%= "@#{username}#{" #{name}" if (name.present? && SiteSetting.enable_names?)}" -%>]]></dc:creator>
+          <dc:creator><![CDATA[<%= rss_creator(topic.user) -%>]]></dc:creator>
           <category><%= topic.category.name %></category>
           <description><![CDATA[
-            <% if username.present? %>
-            <p><%= t('author_wrote', author: link_to("@#{username}", "#{Discourse.base_url}/u/#{url_encode(topic.user.username_lower)}")).html_safe %></p>
-            <% end %>
-            <blockquote>
-              <%- if first_post = topic.ordered_posts.first %>
-              <%= first_post.cooked.html_safe %>
-              <%- end %>
-            </blockquote>
-            <p><%= t 'num_posts' %> <%= topic.posts_count %></p>
-            <p><%= t 'num_participants' %> <%= topic.participant_count %></p>
+            <%- if first_post = topic.ordered_posts.first %>
+            <%= first_post.cooked.html_safe %>
+            <%- end %>
+            <p><small><%= t 'rss_num_posts', count: topic.posts_count %> - <%= t 'rss_num_participants', count: topic.participant_count %></small></p>
             <p><%= link_to t('read_full_topic'), topic_url %></p>
           ]]></description>
           <link><%= topic_url %></link>
diff --git a/app/views/topics/show.rss.erb b/app/views/topics/show.rss.erb
index 2a71f1f163..7da14703cd 100644
--- a/app/views/topics/show.rss.erb
+++ b/app/views/topics/show.rss.erb
@@ -15,17 +15,14 @@
       <% next unless post.user %>
       <item>
         <title><%= @topic_view.title %></title>
-        <dc:creator><![CDATA[<%= "@#{post.user.username}#{" #{post.user.name}" if (post.user.name.present? && SiteSetting.enable_names?)}" -%>]]></dc:creator>
+        <dc:creator><![CDATA[<%= rss_creator(post.user) -%>]]></dc:creator>
         <description><![CDATA[
           <% post_url = Discourse.base_url + post.url %>
-          <p><%= t('author_wrote', author: link_to("@#{post.user.username}", "#{Discourse.base_url}/u/#{url_encode(post.user.username_lower)}")).html_safe %></p>
-          <blockquote>
-            <% if post.hidden %>
-              <%= t('flagging.user_must_edit').html_safe %>
-            <% else %>
-              <%= post.cooked.html_safe %>
-            <% end %>
-          </blockquote>
+          <% if post.hidden %>
+            <%= t('flagging.user_must_edit').html_safe %>
+          <% else %>
+            <%= post.cooked.html_safe %>
+          <% end %>
           <p><%= link_to t('read_full_topic'), post_url %></p>
         ]]></description>
         <link><%= post_url %></link>
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 51daf795cf..2e73efe552 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -352,9 +352,13 @@ en:
   topics_in_category: "Topics in the '%{category}' category"
   rss_posts_in_topic: "RSS feed of '%{topic}'"
   rss_topics_in_category: "RSS feed of topics in the '%{category}' category"
-  author_wrote: "%{author} wrote:"
-  num_posts: "Posts:"
-  num_participants: "Participants:"
+  rss_num_posts:
+    one: "%{count} post"
+    other: "%{count} posts"
+  rss_num_participants:
+    one: "%{count} participant"
+    other: "%{count} participants"
+
   read_full_topic: "Read full topic"
   private_message_abbrev: "Msg"
 
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 9702231805..83a46f3373 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -3,10 +3,10 @@
 require 'rails_helper'
 
 RSpec.describe ListController do
-  let(:topic) { Fabricate(:topic, user: user) }
-  let(:group) { Fabricate(:group) }
-  let(:user) { Fabricate(:user) }
-  let(:admin) { Fabricate(:admin) }
+  fab!(:user) { Fabricate(:user) }
+  fab!(:topic) { Fabricate(:topic, user: user) }
+  fab!(:group) { Fabricate(:group) }
+  fab!(:admin) { Fabricate(:admin) }
 
   before do
     admin  # to skip welcome wizard at home page `/`
@@ -73,12 +73,12 @@ RSpec.describe ListController do
     end
 
     it "shows correct title if topic list is set for homepage" do
-      get "/"
+      get "/latest"
 
       expect(response.body).to have_tag "title", text: "Discourse"
 
       SiteSetting.short_site_description = "Best community"
-      get "/"
+      get "/latest"
 
       expect(response.body).to have_tag "title", text: "Discourse - Best community"
     end
@@ -95,7 +95,7 @@ RSpec.describe ListController do
 
       get "/categories_and_latest.json"
       data = JSON.parse(response.body)
-      expect(data["topic_list"]["topics"].length).to eq(1)
+      expect(data["topic_list"]["topics"].length).to eq(2)
     end
   end
 
@@ -305,12 +305,11 @@ RSpec.describe ListController do
 
     it 'renders links correctly with subfolder' do
       set_subfolder "/forum"
-      post = Fabricate(:post, topic: topic, user: user)
+      _post = Fabricate(:post, topic: topic, user: user)
       get "/latest.rss"
       expect(response.status).to eq(200)
       expect(response.body).to_not include("/forum/forum")
       expect(response.body).to include("http://test.localhost/forum/t/#{topic.slug}")
-      expect(response.body).to include("http://test.localhost/forum/u/#{post.user.username}")
     end
 
     it 'renders top RSS' do
@@ -498,16 +497,18 @@ RSpec.describe ListController do
   end
 
   describe "topics_by" do
+    fab!(:topic2) { Fabricate(:topic, user: user) }
+    fab!(:user2) { Fabricate(:user) }
+
     before do
-      sign_in(Fabricate(:user))
-      Fabricate(:topic, user: user)
+      sign_in(user2)
     end
 
     it "should respond with a list" do
       get "/topics/created-by/#{user.username}.json"
       expect(response.status).to eq(200)
       json = JSON.parse(response.body)
-      expect(json["topic_list"]["topics"].size).to eq(1)
+      expect(json["topic_list"]["topics"].size).to eq(2)
     end
 
     it "should work with period in username" do
@@ -515,7 +516,7 @@ RSpec.describe ListController do
       get "/topics/created-by/#{user.username}", xhr: true
       expect(response.status).to eq(200)
       json = JSON.parse(response.body)
-      expect(json["topic_list"]["topics"].size).to eq(1)
+      expect(json["topic_list"]["topics"].size).to eq(2)
     end
   end
 

From 82f9dcf301f99d160a2dd36cddb1c14f7d187368 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 20 Apr 2020 11:37:59 +0200
Subject: [PATCH 570/633] Update translations

---
 .tx/config                                    |   6 -
 config/locales/client.ar.yml                  |  30 +-
 config/locales/client.be.yml                  |  11 +-
 config/locales/client.bg.yml                  |  19 +-
 config/locales/client.bs_BA.yml               |  21 +-
 config/locales/client.ca.yml                  |  38 +-
 config/locales/client.cs.yml                  |  20 +-
 config/locales/client.da.yml                  |  19 +-
 config/locales/client.de.yml                  |  27 +-
 config/locales/client.el.yml                  |  19 +-
 config/locales/client.es.yml                  |  66 +-
 config/locales/client.et.yml                  |  20 +-
 config/locales/client.fa_IR.yml               |  35 +-
 config/locales/client.fi.yml                  |  27 +-
 config/locales/client.fr.yml                  |  28 +-
 config/locales/client.gl.yml                  |  10 +-
 config/locales/client.he.yml                  | 130 +++-
 config/locales/client.hu.yml                  |  19 +-
 config/locales/client.hy.yml                  |  20 +-
 config/locales/client.id.yml                  |  13 +-
 config/locales/client.it.yml                  | 391 ++++++++---
 config/locales/client.ja.yml                  |  19 +-
 config/locales/client.ko.yml                  |  19 +-
 config/locales/client.lt.yml                  |  17 +-
 config/locales/client.lv.yml                  |  18 +-
 config/locales/client.nb_NO.yml               |  54 +-
 config/locales/client.nl.yml                  | 114 +++-
 config/locales/client.pl_PL.yml               | 161 ++++-
 config/locales/client.pt.yml                  |  20 +-
 config/locales/client.pt_BR.yml               |  42 +-
 config/locales/client.ro.yml                  |  19 +-
 config/locales/client.ru.yml                  | 222 +++++--
 config/locales/client.sk.yml                  |  15 +-
 config/locales/client.sl.yml                  |  20 +-
 config/locales/client.sq.yml                  |  10 +-
 config/locales/client.sr.yml                  |   9 +-
 config/locales/client.sv.yml                  | 118 +++-
 config/locales/client.sw.yml                  |  19 +-
 config/locales/client.te.yml                  |  13 +-
 config/locales/client.th.yml                  |  10 +-
 config/locales/client.tr_TR.yml               |  29 +-
 config/locales/client.uk.yml                  |  29 +-
 config/locales/client.ur.yml                  |  22 +-
 config/locales/client.vi.yml                  |  19 +-
 config/locales/client.zh_CN.yml               | 424 +++++++-----
 config/locales/client.zh_TW.yml               |  22 +-
 config/locales/server.ar.yml                  |  11 +-
 config/locales/server.be.yml                  | 469 ++++++++-----
 config/locales/server.bg.yml                  |  11 +-
 config/locales/server.bs_BA.yml               |  13 +-
 config/locales/server.ca.yml                  |  25 +-
 config/locales/server.cs.yml                  |  11 +-
 config/locales/server.da.yml                  |  14 +-
 config/locales/server.de.yml                  |  22 +-
 config/locales/server.el.yml                  |  14 +-
 config/locales/server.es.yml                  |  49 +-
 config/locales/server.et.yml                  |  11 +-
 config/locales/server.fa_IR.yml               |  15 +-
 config/locales/server.fi.yml                  |  19 +-
 config/locales/server.fr.yml                  |  55 +-
 config/locales/server.gl.yml                  |   4 +
 config/locales/server.he.yml                  |  61 +-
 config/locales/server.hu.yml                  |  12 +-
 config/locales/server.hy.yml                  |  16 +-
 config/locales/server.id.yml                  |   9 +-
 config/locales/server.it.yml                  | 368 ++++++-----
 config/locales/server.ja.yml                  |  14 +-
 config/locales/server.ko.yml                  |  14 +-
 config/locales/server.lt.yml                  |  10 +
 config/locales/server.lv.yml                  |   6 +
 config/locales/server.nb_NO.yml               |  16 +-
 config/locales/server.nl.yml                  |  47 +-
 config/locales/server.pl_PL.yml               | 309 ++++++++-
 config/locales/server.pt.yml                  |  15 +-
 config/locales/server.pt_BR.yml               |  14 +-
 config/locales/server.ro.yml                  |  17 +-
 config/locales/server.ru.yml                  |  28 +-
 config/locales/server.sk.yml                  |  13 +-
 config/locales/server.sl.yml                  |   7 +-
 config/locales/server.sq.yml                  |   6 +-
 config/locales/server.sr.yml                  |   3 +
 config/locales/server.sv.yml                  |  47 +-
 config/locales/server.sw.yml                  |  15 +-
 config/locales/server.te.yml                  |   9 +
 config/locales/server.th.yml                  |   3 +
 config/locales/server.tr_TR.yml               |  23 +-
 config/locales/server.uk.yml                  |  21 +-
 config/locales/server.ur.yml                  |  17 +-
 config/locales/server.vi.yml                  |  16 +-
 config/locales/server.zh_CN.yml               | 616 +++++++++---------
 config/locales/server.zh_TW.yml               |  17 +-
 .../config/locales/client.it.yml              |   2 +
 .../config/locales/client.ru.yml              |   2 +-
 .../config/locales/server.ar.yml              |   3 -
 .../config/locales/server.be.yml              |   2 -
 .../config/locales/server.bs_BA.yml           |   2 -
 .../config/locales/server.ca.yml              |   2 -
 .../config/locales/server.de.yml              |  17 +-
 .../config/locales/server.el.yml              |   2 -
 .../config/locales/server.es.yml              |   2 -
 .../config/locales/server.fa_IR.yml           |   2 -
 .../config/locales/server.fi.yml              |   4 +-
 .../config/locales/server.fr.yml              |   2 -
 .../config/locales/server.he.yml              |   2 +-
 .../config/locales/server.hy.yml              |   2 -
 .../config/locales/server.id.yml              |   3 -
 .../config/locales/server.it.yml              |  23 +-
 .../config/locales/server.ko.yml              |   2 -
 .../config/locales/server.nb_NO.yml           |   2 -
 .../config/locales/server.pl_PL.yml           |   6 +-
 .../config/locales/server.pt_BR.yml           |   2 -
 .../config/locales/server.ru.yml              |   2 -
 .../config/locales/server.sl.yml              |   2 -
 .../config/locales/server.sv.yml              |   2 +-
 .../config/locales/server.sw.yml              |   2 -
 .../config/locales/server.tr_TR.yml           |   2 -
 .../config/locales/server.ur.yml              |   2 -
 .../config/locales/server.zh_CN.yml           |  20 +-
 plugins/poll/config/locales/client.ca.yml     |   1 +
 plugins/poll/config/locales/client.de.yml     |   7 +
 plugins/poll/config/locales/client.it.yml     |  16 +
 plugins/poll/config/locales/server.de.yml     |   6 +
 plugins/poll/config/locales/server.it.yml     |   8 +
 plugins/poll/config/locales/server.zh_CN.yml  |   2 +-
 124 files changed, 3417 insertions(+), 1684 deletions(-)

diff --git a/.tx/config b/.tx/config
index 7167d96bc5..9163537384 100644
--- a/.tx/config
+++ b/.tx/config
@@ -62,12 +62,6 @@ source_file = plugins/discourse-details/config/locales/server.en.yml
 source_lang = en
 type = YML
 
-[discourse-org.corepluginnginx-performance-reportserveryml]
-file_filter = plugins/discourse-nginx-performance-report/config/locales/server.<lang>.yml
-source_file = plugins/discourse-nginx-performance-report/config/locales/server.en.yml
-source_lang = en
-type = YML
-
 [discourse-org.core-plugin-local-dates-client-yml]
 file_filter = plugins/discourse-local-dates/config/locales/client.<lang>.yml
 source_file = plugins/discourse-local-dates/config/locales/client.en.yml
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 8b7e95c922..baa28cb0cc 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -33,7 +33,6 @@ ar:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY h:mm a"
@@ -359,13 +358,17 @@ ar:
     bookmarks:
       created: "لقد وضعت علامة مرجعية علي هذا المنشور"
       not_bookmarked: "أشر هذا المكتوب"
-      created_with_reminder: "لقد أشرت هذا المكتوب بتذكير عند %{date}"
       remove: "أزل العلامة المرجعية"
       confirm_clear: "هل أنت متأكد من مسح جميع الاشعارات المرجعية من هذا الموضوع؟"
       save: "احفظ"
       no_timezone: 'لم تحدد منظقتك الزمنية بعد. لن تتمكن من تفعيل التذكيرات. حددها <a href="%{basePath}/my/preferences/profile">في ملفك الشخصي</a>.'
       reminders:
         at_desktop: "في المرة القادمة سأكون عند مكتبي"
+        later_today: "في وقت لاحق اليوم"
+        tomorrow: "غداً"
+        next_week: "الاسبوع القادم"
+        later_this_week: "في وقت لاحق هذا الاسبوع"
+        next_month: "الشهر القادم"
     drafts:
       resume: "أكمل"
       remove: "احذف"
@@ -435,6 +438,8 @@ ar:
           title: "قيد الانتظار"
         rejected:
           title: "مرفوض"
+        deleted:
+          title: "محذوف"
       types:
         reviewable_user:
           title: "مستخدم"
@@ -473,6 +478,7 @@ ar:
       days_visited_long: "أيام الزيارة"
       posts_read: "المقروءة"
       posts_read_long: "المنشورات المقروءة"
+      last_updated: "اخر تحديث"
       total_rows:
         zero: "لا أعضاء"
         one: "عضو واحد"
@@ -833,9 +839,6 @@ ar:
         success_staff: "لقد قمنا بأرسال بريدا إلكتروني الى عنوانك الحالي, رجاء اتبع تعليمات التأكيد."
       change_avatar:
         title: "غيّر صورة الملفك الشخصي"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>، من"
-        gravatar_title: "غير صورتك الشخصية على موقع Gravatar's."
-        refresh_gravatar_title: "حدث صورة Gravatar"
         letter_based: "صورة الملف الشخصي الافتراضية"
         uploaded_avatar: "صورة مخصصة"
         uploaded_avatar_empty: "اضافة صورة مخصصة"
@@ -1088,6 +1091,8 @@ ar:
         back: "الرجوع"
         again: "أعد المحاولة"
         fixed: "حمل الصفحة"
+    modal:
+      close: "أغلق"
     close: "اغلق"
     assets_changed_confirm: "حُدث الموقع لتوّه. أتريد تحديث الصفحة ورؤية أحدث إصدار؟"
     logout: "لقد سجلت خروج."
@@ -1249,7 +1254,6 @@ ar:
       filter_placeholder: بحث عن الرموز التعبيرية
       objects: اشياء
       flags: الأبلاغ
-      custom: الرموز التعبيرية المخصصة
       recent: تم استخدامه مؤخراً
       default_tone: لون البشرة إفتراضي
       light_tone: لون البشرة أبيض
@@ -1257,6 +1261,7 @@ ar:
       medium_tone: لون بشرة اسمر
       medium_dark_tone: لون البشرة اسمر قاتم
       dark_tone: لون البشرة داكن
+      default: الرموز التعبيرية المخصصة
     composer:
       emoji: "الرموز التعبيرية :)"
       more_emoji: "أكثر..."
@@ -1350,6 +1355,7 @@ ar:
       mentioned: "<span>{{username}}</span>{{description}}"
       group_mentioned: "<span>{{username}}</span>{{description}} "
       quoted: "<span>{{username}}</span>{{description}} "
+      bookmark_reminder: "<span>{{username}}</span>{{description}} "
       replied: "<span>{{username}}</span>{{description}} "
       posted: "<span>{{username}}</span>{{description}} "
       edited: "<span>{{username}}</span>{{description}} "
@@ -2053,6 +2059,7 @@ ar:
             title: "اظهر جزء الـ HTML من رسالة البريد الالكتروني"
             button: "HTML"
       bookmarks:
+        created: "أُنشئ في"
         name: "الإسم"
     category:
       can: "قادر علي&hellip;"
@@ -2621,7 +2628,11 @@ ar:
           view_graph: "رسم بياني"
           refresh_report: "تحديث التقرير "
           groups: "كل المجموعات"
+          total: "مجموع الوقت الكلي"
+          no_data: "لا توجد بيانات للعرض"
           filters:
+            file-extension:
+              label: إمتداد الملف
             group:
               label: المجموعة
             category:
@@ -2634,6 +2645,9 @@ ar:
           title: "مجموعة جديدة"
           create: "إنشاء:"
           name:
+            too_short: "إسم المجموعة قصير جداً"
+            too_long: "إسم المجموعة طويل جداً"
+            checking: "التأكد من توفر إسم المجموعة"
             available: "اسم المجموعة متاح"
             not_available: "اسم المجموعة غير متاح"
             blank: "يجب تحديد اسم للمجموعة"
@@ -3160,7 +3174,6 @@ ar:
           active: "النشطون"
           staff: "الطاقم"
           suspended: "موقوف"
-          suspect: "المريبون"
         approved: "موافقة؟"
         titles:
           active: "الأعضاء النشطون"
@@ -3175,7 +3188,6 @@ ar:
           admins: "الأعضاء المدراء"
           moderators: "المشرفون"
           suspended: "أعضاء موقوفين"
-          suspect: "الأعضاء المريبون"
         not_verified: "لم يتم التحقق"
         check_email:
           title: "اكشف عنوان البريد الإلكتروني لهذا العضو"
@@ -3196,6 +3208,7 @@ ar:
         suspended_until: "(حتى %{until})"
         cant_suspend: "لا يمكن ايقاف هذا العضو"
         delete_all_posts: "احذف كل مشاركاته"
+        penalty_post_actions: "ما الذي تريد فعله بالمشاركة المرتبطة؟"
         penalty_post_delete: "حذف الموضوع"
         penalty_post_edit: "تعديل الموضوع"
         delete_all_posts_confirm_MF: "أنت على وشك {POSTS, plural, zero {عدم حذف شيء} one {حذف مشاركة واحدة} two {حذف مشاركتين} few {حذف # مشاركات} many {حذف # مشاركة} other {حذف # مشاركة}}{TOPICS, plural, zero {} one { وموضوع واحد} two { وموضوعين} few { و# مواضيع} many {و# موضوعا} other {و# موضوع}}. أمتأكد؟"
@@ -3492,6 +3505,7 @@ ar:
         help: "أضف رموز تعبيرية جديدة التي سوف تكون متاحة للكل . (PROTIP: drag & drop multiple files at once)"
         add: "أضافة وجه تعبيري جديد ؟"
         name: "الأسم"
+        group: "المجموعة"
         image: "صورة"
         delete_confirm: "أمتأكّد من حذف الإيموجي :%{name}: هذا؟"
       embedding:
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 0023ffd49c..0748fbdb2b 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -165,6 +165,8 @@ be:
       created: "вы дадалі гэты паведамленне ў закладкі"
       remove: "выдаліць закладку"
       save: "Захаваць"
+      reminders:
+        tomorrow: "заўтра"
     drafts:
       remove: "выдаліць"
       abandon:
@@ -277,6 +279,7 @@ be:
         title: "Дадаць удзельнікаў"
       requests:
         reason: "прычына"
+        handle: "звяртацца з просьбай аб членстве"
       manage:
         name: "Імя"
         full_name: "поўнае Імя"
@@ -475,8 +478,6 @@ be:
         error: "Пры змяненні адраса электроннай пошты адбылася памылка. Магчыма, гэты адрас ужо выкарыстоўваецца?"
         success: "Мы надсилалы ліст на гэтую скрыню. Выканайце інструкцыі па пидтердження."
       change_avatar:
-        gravatar_title: "Змяніць аватарку на сайце Gravatar"
-        refresh_gravatar_title: "Абнавіць мой Gravatar"
         letter_based: "Ваша выява дададзена сістэмай"
         uploaded_avatar: "Іншая выява"
         uploaded_avatar_empty: "Дадаць малюнак"
@@ -628,6 +629,8 @@ be:
         back: "вярнуцца"
         again: "Паспрабаваць яшчэ раз"
         fixed: "загрузка Старонкі"
+    modal:
+      close: "схаваць"
     close: "зачыніць"
     refresh: "абнавіць"
     read_only_mode:
@@ -1043,6 +1046,7 @@ be:
           side_by_side_markdown:
             title: "Паказаць непасрэдныя адрозненні побач"
       bookmarks:
+        created: "створаны"
         name: "Імя"
     category:
       can: "можа&hellip;"
@@ -1637,13 +1641,11 @@ be:
           staff: "персанал"
           suspended: "прыпыненыя"
           silenced: "глушыцелем"
-          suspect: "Магчыма крэмлебот"
         approved: "Адобрана?"
         titles:
           active: "Актыўныя карыстальнікі"
           new: "Новыя карыстальнікі"
           staff: "персанал"
-          suspect: "Крэмлеботы і тролі"
       user:
         suspend_reason: "прычына"
         silence_reason: "прычына"
@@ -1823,6 +1825,7 @@ be:
       emoji:
         title: "Абразкі"
         name: "Імя"
+        group: "Група"
         image: "Выява"
       embedding:
         confirm_delete: "Вы ўпэўненыя, што жадаеце выдаліць гэты хост?"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 9f1e68be00..cdc57a506d 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -26,9 +26,9 @@ bg:
         thousands: "{{number}}k "
         millions: "{{number}}M "
     dates:
-      time: "h:mm a"
+      time: "HH:mm"
+      time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -261,10 +261,10 @@ bg:
       save: "Запази"
       reminders:
         later_today: "По-късно днес"
-        next_business_day: "Следващият работен ден"
         tomorrow: "Утре"
-        next_week: "Следващата седмица"
-        next_month: "Следващият месец"
+        next_week: "Следваща седмица"
+        later_this_week: "По-късно тази седмица"
+        next_month: "Следващия месец"
     drafts:
       resume: "Продължи"
       remove: "Премахване"
@@ -746,9 +746,6 @@ bg:
         success_staff: "Изпратихме съобщение на този адрес. Моля, следвайте инструкциите за потвърждаване."
       change_avatar:
         title: "Сменете аватара на вашия профил "
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, базиран на"
-        gravatar_title: "Промени вашият аватар на сайта на Граватар"
-        refresh_gravatar_title: "Опреснете Gravatar"
         letter_based: "Системен аватар"
         uploaded_avatar: "Собствено изображение"
         uploaded_avatar_empty: "Добавете собствено изображение"
@@ -967,6 +964,8 @@ bg:
         back: "Назад"
         again: "Опитайте отново"
         fixed: "Заредете страницата"
+    modal:
+      close: "затвори"
     close: "Затвори"
     assets_changed_confirm: "Страницата беше обновена. Презаредете, за да видите последната версия."
     logout: "Вие бяхте отписан."
@@ -1679,6 +1678,7 @@ bg:
           side_by_side_markdown:
             title: "Покажи разликите на неподправения източник side-by-side "
       bookmarks:
+        created: "Създадени"
         name: "Име"
     category:
       can: "can&hellip;"
@@ -2541,7 +2541,6 @@ bg:
           active: "Активни"
           staff: "Персонал"
           suspended: "Отстранени"
-          suspect: "Съмнителен "
         approved: "Одобрен?"
         titles:
           active: "Активни потребители"
@@ -2556,7 +2555,6 @@ bg:
           admins: "Админи"
           moderators: "Модератори"
           suspended: "Отстранени"
-          suspect: "Съмнителни потребители "
         not_verified: "Непроверен "
         check_email:
           title: "Разкрий имейла на този потребител"
@@ -2834,6 +2832,7 @@ bg:
         help: "Добави нови емотикони, които ще бъдат достъпни до всички. (Съвет: Може да дръпнете и пуснете много файлове наведнъж). "
         add: "Добави нова емотикона "
         name: "Име "
+        group: "Група"
         image: "Изображение "
         delete_confirm: "Сигурни ли сте че искате да изтриете тази :%{name}% емотикона? "
       embedding:
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index a93fe0eb6b..951ae74885 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -29,7 +29,6 @@ bs_BA:
     dates:
       time: "HH: mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -287,17 +286,16 @@ bs_BA:
     bookmarks:
       created: "zabilježili ste ovu stranicu"
       not_bookmarked: "sačuvaj ovaj post"
-      created_with_reminder: "postavili ste zabilješku na ovu objavu s podsjetnikom %{date}"
       remove: "Ukloni zabilješku"
       confirm_clear: "Dali ste sigurni dali želite izbrisati sve sačuvane stvari iz ove teme?"
       save: "Sačuvaj"
       no_timezone: 'Još uvijek niste postavili vremensku zonu, tako da nećete biti u mogućnosti koristiti podsjetnike. Postavite vremensku zonu <a href="%{basePath}/my/preferences/profile">na vašem profilu</a>.'
       reminders:
         at_desktop: "Sljedeći put sam za svojim desktop kompjuterom"
-        later_today: "Danas, malo kasnije"
-        next_business_day: "Sljedeći radni dan"
-        tomorrow: "Sutradan"
+        later_today: "Kasnije danas"
+        tomorrow: "Sutra"
         next_week: "Sljedeće sedmice"
+        later_this_week: "Kasnije ove sedmice"
         next_month: "Sljedeći mjesec"
         custom: "Precizno vrijeme i datum"
     drafts:
@@ -1006,10 +1004,6 @@ bs_BA:
         success_staff: "Poslali smo email na vašu trenutnu email adresu. Molimo vas da tamo slijedite instrukcije za potvrdu aktivacije."
       change_avatar:
         title: "Promjeni sliku"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baziran na"
-        gravatar_title: "Promjenite vaš avatar na Gravatar web stranici."
-        gravatar_failed: "Nismo mogli pronaći Gravatar s tom adresom e-pošte."
-        refresh_gravatar_title: "Osvježi Gravatar"
         letter_based: "Avatar dodjeljen od sistema"
         uploaded_avatar: "Vaša slika"
         uploaded_avatar_empty: "Dodajte vašu sliku"
@@ -1302,6 +1296,8 @@ bs_BA:
         back: "Idi nazad"
         again: "Pokušaj ponovo"
         fixed: "Učitaj stranicu"
+    modal:
+      close: "zatvori"
     close: "Zatvori"
     assets_changed_confirm: "Ovaj sajt je upravo unaprijeđen. Osvježiti odmah stranicu za novu verziju?"
     logout: "Izlogovani ste."
@@ -1523,7 +1519,6 @@ bs_BA:
       objects: Objekti
       symbols: Simboli
       flags: Prijave
-      custom: Sopstveni emotikoni
       recent: Skoro korišteno
       default_tone: Bez tona
       light_tone: Svijetli ton
@@ -1531,6 +1526,7 @@ bs_BA:
       medium_tone: Srednji ton
       medium_dark_tone: Srednje tamni ton
       dark_tone: Tamni ton
+      default: Sopstveni emotikoni
     shared_drafts:
       title: "Dijeljene skice"
       notice: "Ova tema je vidljiva onima koji mogu da vide <b>{{category}}</b> kategoriju."
@@ -1681,6 +1677,7 @@ bs_BA:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2463,6 +2460,7 @@ bs_BA:
             title: "Prikažite html dio e-maila"
             button: "HTML"
       bookmarks:
+        created: "Kreiran"
         name: "Ime"
     category:
       can: "can&hellip; "
@@ -3841,7 +3839,6 @@ bs_BA:
           staff: "Staff"
           suspended: "Suspended"
           silenced: "Stišano"
-          suspect: "Osumnjičeni"
           staged: "Priređen"
         approved: "Approved?"
         titles:
@@ -3858,7 +3855,6 @@ bs_BA:
           moderators: "Moderators"
           silenced: "Stišani korisnici"
           suspended: "Suspended Users"
-          suspect: "Osumnjičeni korisnici"
           staged: "Upućeni korisnici"
         not_verified: "Not verified"
         check_email:
@@ -4201,6 +4197,7 @@ bs_BA:
         help: "Dodajte novi emotikon koji će biti dostupan svima. (PROTIP: povlačenje i ispuštanje više datoteka odjednom)"
         add: "Dodaj novi emoji"
         name: "Ime"
+        group: "Grupa"
         image: "Slika"
         delete_confirm: "Jeste li sigurni da želite izbrisati: %{name}: emoji?"
       embedding:
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 2eaf662830..87c1130152 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -28,7 +28,6 @@ ca:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY HH:mm"
@@ -152,6 +151,7 @@ ca:
       banner:
         enabled: "convertit en bàner %{when}. Apareixerà a dalt de cada pàgina fins que sigui descartat per l'usuari."
         disabled: "ha suprimit aquest bàner %{when}. No apareixerà més a dalt de cada pàgina."
+    topic_admin_menu: "accions del tema"
     wizard_required: "Us donem la benvinguda al vostre nou Discourse! Comencem amb <a href='%{url}' data-auto-route='true'>l'assistent de configuració</a> ✨"
     emails_are_disabled: "Tots els correus sortints han estat globalment inhabilitats per un administrador. No s'enviarà cap notificació de cap mena per correu electrònic."
     bootstrap_mode_enabled: "Per a facilitar el llançament del vostre lloc web nou, esteu en mode d'arrencada. Tots els usuaris nous tindran el nivell de confiança 1 i tindran activitats els correus de resum diari. Això es desactivarà automàticament quan s'hi hagin unit %{min_users} usuaris."
@@ -264,6 +264,12 @@ ca:
       remove: "Elimina preferit"
       confirm_clear: "Esteu segur que voleu eliminar tots els preferits d'aquest tema?"
       save: "Desa"
+      reminders:
+        later_today: "Més tard avui"
+        tomorrow: "Demà"
+        next_week: "La setmana que ve"
+        later_this_week: "Més avant aquesta setmana"
+        next_month: "El mes que ve"
     drafts:
       resume: "Reprèn"
       remove: "Elimina"
@@ -309,6 +315,9 @@ ca:
       install_banner: "Voleu <a href>instal·lar %{title} en aquest dispositiu?</a>"
     choose_topic:
       none_found: "No s'ha trobat temes."
+      title:
+        search: "Cerca un tema"
+        placeholder: "escriviu el títol, l’URL o l’identificador del tema aquí"
     choose_message:
       none_found: "No s'han trobat missatges."
     review:
@@ -519,6 +528,7 @@ ca:
         deny: "Denega"
         denied: "denegat"
         undone: "sol·licitud revertida"
+        handle: "gestiona la sol·licitud d'afiliació"
       manage:
         title: "Gestiona"
         name: "Nom"
@@ -559,6 +569,7 @@ ca:
       leave: "Abandona"
       request: "Sol·licita"
       message: "Missatge"
+      allow_membership_requests: "Permet als usuaris d'enviar sol·licituds d'afiliació als propietaris del grup (requereix un grup visible públicament)"
       membership_request_template: "Plantilla personalitzada que es mostra als usuaris quan envien una sol·licitud d'afiliació"
       membership_request:
         submit: "Envia sol·licitud"
@@ -940,10 +951,10 @@ ca:
         success_staff: "S'ha enviat un missatge a la vostra adreça actual. Seguiu les instruccions de confirmació."
       change_avatar:
         title: "Canvia la foto de perfil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basat en"
-        gravatar_title: "Canvieu l'avatar en el lloc web de Gravatar"
-        gravatar_failed: "No s'ha pogut trobar un Gravatar amb aquesta adreça de correu."
-        refresh_gravatar_title: "Actualitza el Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, basat en"
+        gravatar_title: "Canvieu el vostre avatar en el lloc web de {{gravatarName}}"
+        gravatar_failed: "No hem trobat un {{gravatarName}} amb aquesta adreça de correu electrònic."
+        refresh_gravatar_title: "Actualitzeu el vostre {{gravatarName}}"
         letter_based: "Foto de perfil assignada pel sistema"
         uploaded_avatar: "Foto personalitzada"
         uploaded_avatar_empty: "Afegeix una foto personalitzada"
@@ -1090,6 +1101,7 @@ ca:
         search: "escriu aquí per a cercar invitacions..."
         title: "Invitacions"
         user: "Usuari convidat"
+        sent: "Darrer enviat"
         none: "Cap invitació per a mostrar."
         truncated:
           one: "Mostrant la primera invitació."
@@ -1222,6 +1234,8 @@ ca:
         back: "Vés enrere"
         again: "Torna-ho a intentar"
         fixed: "Carrega la pàgina"
+    modal:
+      close: "tanca"
     close: "Tanca"
     assets_changed_confirm: "El lloc web s'ha actualitzat. Voleu tornar a carregar la pàgina per a la versió més recent?"
     logout: "Heu tancat la sessió."
@@ -1300,6 +1314,8 @@ ca:
       reset: "Restableix la contrasenya"
       complete_username: "Si hi ha algun compte que correspongui a l'usuari <b>%{username}</b>, hauríeu de rebre aviat un correu amb instruccions per a restablir la contrasenya."
       complete_email: "Si hi ha algun compte que correspon a l'adreça <b>%{email}</b>, hauríeu de rebre aviat un correu amb instruccions per a restablir la contrasenya."
+      complete_username_found: "Hem trobat un compte que correspon al nom d'usuari <b>%{username}</b>. Hauríeu de rebre un correu amb instruccions per a restablir la contrasenya."
+      complete_email_found: "Hem trobat un compte que correspon a l'adreça <b>%{email}</b>. Hauríeu de rebre aviat un correu amb instruccions per a restablir la contrasenya."
       complete_username_not_found: "No hi ha cap compte que coincideixi amb el nom d'usuari <b>%{username}</b>"
       complete_email_not_found: "Cap compte no coincideix amb <b>%{email}</b>"
       help: "No arriba el correu? Comproveu primer la carpeta de correu brossa. <p>No esteu segur de quina adreça heu fet servir? Introduïu una adreça i us farem saber si existeix.</p> <p>Si ja no teniu accés a l'adreça del vostre compte, poseu-vos en contacte amb <a href='%{basePath}/about'>el nostre equip responsable</a></p>."
@@ -1448,7 +1464,6 @@ ca:
       objects: Objectes
       symbols: Símbols
       flags: Banderes
-      custom: Emojis personalitzats
       recent: Usats recentment
       default_tone: Sense to de pell
       light_tone: To de pell clar
@@ -1456,6 +1471,7 @@ ca:
       medium_tone: To de pell mitjà
       medium_dark_tone: To de pell fosc mitjà
       dark_tone: To de pell fosc
+      default: Emojis personalitzats
     shared_drafts:
       title: "Esborranys compartits"
       notice: "Aquest tema sols és visible per als qui poden veure la categoria <b>{{category}}</b>."
@@ -1521,6 +1537,7 @@ ca:
       view_new_post: "Mostra la nova publicació."
       saving: "Desant"
       saved: "Desat!"
+      saved_draft: "Publica l'esborrany en curs. Toqueu per a continuar."
       uploading: "Carregant..."
       show_preview: "mostra la previsualització &raquo; "
       hide_preview: "&laquo; amaga la previsualització"
@@ -1603,6 +1620,7 @@ ca:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2305,6 +2323,9 @@ ca:
           notify_moderators: "s'ha notificat els moderadors"
           notify_user: "ha enviat un missatge"
           bookmark: "marcat com a preferit"
+          like:
+            one: "ha fet 'M'agrada' "
+            other: "han fet 'M'agrada' "
           like_capped:
             one: "i {{count}}més han dit que els agrada"
             other: "i {{count}}més han dit que els agrada"
@@ -2358,6 +2379,7 @@ ca:
             title: "Mostra la part HTML del correu electrònic"
             button: "HTML"
       bookmarks:
+        created: "Creat"
         name: "Nom"
     category:
       can: "pot&hellip; "
@@ -3750,7 +3772,6 @@ ca:
           staff: "Equip responsable"
           suspended: "Suspesos"
           silenced: "Silenciat"
-          suspect: "Sospitós"
           staged: "Fictici"
         approved: "Aprovat?"
         titles:
@@ -3767,7 +3788,6 @@ ca:
           moderators: "Moderadors"
           silenced: "Usuaris silenciats"
           suspended: "Usuaris suspesos"
-          suspect: "Usuaris sospitosos"
           staged: "Usuaris ficticis"
         not_verified: "No verificat"
         check_email:
@@ -4118,6 +4138,7 @@ ca:
         help: "Afegeix un nou emoji que estarà disponible per a tothom. (CONSELL: arrossegueu i deixeu anar molts fitxers de cop)"
         add: "Afegeix emoji nou"
         name: "Nom"
+        group: "Grup"
         image: "Imatge"
         delete_confirm: "Esteu segur que voleu suprimir l'emoji :%{name}:?"
       embedding:
@@ -4144,7 +4165,6 @@ ca:
         save: "Desa la configuració d'incrustacions"
       permalink:
         title: "Enllaços permanents"
-        description: "Tingueu en compte que sols s'aplica a fonts externes. Els enllaços publicats en el vostre fòrum no seran redirigits."
         url: "URL"
         topic_id: "ID de tema"
         topic_title: "Tema"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 6353c5eb02..ce4c780729 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -30,7 +30,6 @@ cs:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM, H:mm"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. M. YYYY, H:mm"
@@ -293,6 +292,12 @@ cs:
       remove: "Odstranit záložku"
       confirm_clear: "Opravdu chcete odstranit všechny své záložky z tohoto tématu?"
       save: "Uložit"
+      reminders:
+        later_today: "Později během dnešního dne"
+        tomorrow: "Zítra"
+        next_week: "Další týden"
+        later_this_week: "Později během tohoto týdne"
+        next_month: "Další měsíc"
     drafts:
       resume: "Pokračovat"
       remove: "Odstranit"
@@ -799,10 +804,6 @@ cs:
         success_staff: "Na vaši aktuální adresu jsme zaslali email. Následujte prosím instrukce v tomto emailu."
       change_avatar:
         title: "Změňte si svůj profilový obrázek"
-        gravatar: "Založeno na <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>u"
-        gravatar_title: "Změňte si avatar na webových stránkách Gravatar"
-        gravatar_failed: "Nemohli sme najít Gravatar asociován s touto email adresou."
-        refresh_gravatar_title: "Obnovit Gravatar"
         letter_based: "Systémem přidělený profilový obrázek"
         uploaded_avatar: "Vlastní obrázek"
         uploaded_avatar_empty: "Přidat vlastní obrázek"
@@ -1075,6 +1076,8 @@ cs:
         back: "Zpět"
         again: "Zkusit znovu"
         fixed: "Nahrávám"
+    modal:
+      close: "zavřít"
     close: "Zavřít"
     assets_changed_confirm: "Tento web se právě aktualizoval. Chcete obnovit stránku a mít nejnovější verzi?"
     logout: "Byli jste odhlášeni."
@@ -1272,7 +1275,6 @@ cs:
       filter_placeholder: Hledat emoji
       objects: Objekty
       flags: Nahlášení
-      custom: Vlastní emoji
       recent: Nedávno použité
       default_tone: Bez barvy pleti
       light_tone: Světlá pleť
@@ -1280,6 +1282,7 @@ cs:
       medium_tone: Mírně hnědá pleť
       medium_dark_tone: Hnědá pleť
       dark_tone: Černá pleť
+      default: Vlastní emoji
     shared_drafts:
       title: "Sdílené koncepty"
       notice: "Toto téma uvidí pouze uživatelé, kteří mohou vidět kategorii <b>{{category}}</b>"
@@ -1423,6 +1426,7 @@ cs:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2156,6 +2160,7 @@ cs:
             title: "Zobrazit html část emailu"
             button: "HTML"
       bookmarks:
+        created: "Vytvořený"
         name: "Jméno"
     category:
       can: "smí&hellip; "
@@ -3324,7 +3329,6 @@ cs:
           staff: "Redakce"
           suspended: "Zakázaní"
           silenced: "Ztišení"
-          suspect: "Podezřelí"
           staged: "Staged"
         approved: "Schválen?"
         titles:
@@ -3341,7 +3345,6 @@ cs:
           moderators: "Moderátoři"
           silenced: "Ztišení uživatelé"
           suspended: "Zakázaní uživatelé"
-          suspect: "Podezřelí uživatelé"
         not_verified: "Neověřeno"
         check_email:
           title: "Odhal emailovou adresu tohoto uživatele"
@@ -3671,6 +3674,7 @@ cs:
         help: "Vložte nové emoji, které bude dostupné pro všechny na fóru. (Protip: můžete přetáhnout několik souborů najednou.)"
         add: "Vložit nový Emoji"
         name: "Název"
+        group: "Skupina"
         image: "Obrázek"
         delete_confirm: "Určitě chcete smazat :%{name}: emoji?"
       embedding:
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index e4435f7242..827fb87e22 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -28,7 +28,6 @@ da:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM, HH:mm"
       long_no_year_no_time: "D. MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY HH:mm"
@@ -265,9 +264,11 @@ da:
       confirm_clear: "Er du sikker på, at du vil rydde alle dine bogmærker fra dette emne?"
       save: "Gem"
       reminders:
+        later_today: "Senere i dag"
         tomorrow: "I morgen"
         next_week: "Næste uge"
-        next_month: "Næste måned"
+        later_this_week: "Senere på ugen"
+        next_month: "Næste Månede"
         custom: "Valgfri dato og tid"
     drafts:
       resume: "Genoptag"
@@ -947,10 +948,6 @@ da:
         success_staff: "Vi har sendt en email til din nuværende adresse. Følg bekræftelsesinstruktionerne."
       change_avatar:
         title: "Skift dit profilbillede"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseret på"
-        gravatar_title: "Skift din avatar på Gravatar's site"
-        gravatar_failed: "Vi kunne ikke finde en Gravatar med den emailadresse"
-        refresh_gravatar_title: "Gendindlæs dit profil billede"
         letter_based: "System tildelt profilbillede"
         uploaded_avatar: "Brugerdefineret profil billede"
         uploaded_avatar_empty: "Tilføj et brugerdefineret profil billede"
@@ -1226,6 +1223,8 @@ da:
         back: "Gå tilbage"
         again: "Prøv igen"
         fixed: "Indlæs side"
+    modal:
+      close: "luk"
     close: "Luk"
     assets_changed_confirm: "Dette site er lige blevet opdateret. Vil du opdatere nu til den seneste version?"
     logout: "Du er blevet logget ud."
@@ -1440,7 +1439,6 @@ da:
       objects: Objekter
       symbols: Symboler
       flags: Markeringer
-      custom: Brugerdefineret humørikoner
       recent: For nylig brugt
       default_tone: Ingen hudfarve
       light_tone: Lys hudfarve
@@ -1448,6 +1446,7 @@ da:
       medium_tone: Medium hudfarve
       medium_dark_tone: Medium mørk hudfarve
       dark_tone: Mørk skin tone
+      default: Brugerdefineret humørikoner
     shared_drafts:
       title: "Delte kladder"
       notice: "Dette emne er kun synligt for dem, der kan se kategorien <b>{{category}}</b> ."
@@ -1593,6 +1592,7 @@ da:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2343,6 +2343,7 @@ da:
             title: "Vis html-delen af e-mailen"
             button: "HTML"
       bookmarks:
+        created: "Oprettet"
         name: "Navn"
     category:
       can: "kan&hellip; "
@@ -3695,7 +3696,6 @@ da:
           staff: "Personale"
           suspended: "Suspenderet"
           silenced: "Mådeholdt (silenced)"
-          suspect: "Mistænkt"
           staged: "Iscenesat"
         approved: "Godkendt?"
         titles:
@@ -3712,7 +3712,6 @@ da:
           moderators: "Moderatorer"
           silenced: "Mådeholdte (silenced) brugere "
           suspended: "Suspenderede brugere"
-          suspect: "Mistænkte brugere"
           staged: "Iscenesatte brugere"
         not_verified: "Ikke verificeret"
         check_email:
@@ -4061,6 +4060,7 @@ da:
         help: "Tilføj en ny emoji, som vil være tilgængelig for alle. (PROTIP: drag & drop flere filer på én gang)"
         add: "Tilføj ny emoji"
         name: "Navn"
+        group: "Gruppe"
         image: "Billede"
         delete_confirm: "Er du sikker på du vil slette emojien: %{name} ?"
       embedding:
@@ -4087,7 +4087,6 @@ da:
         save: "Gem indlejrings-indstillinger"
       permalink:
         title: "Permalinks"
-        description: "Bemærk, at dette kun gælder for eksterne kilder. Links, der er lagt ud på dit forum, bliver ikke omdirigeret."
         url: "URL"
         topic_id: "Emne ID"
         topic_title: "Emne"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 26b948f584..6b589d8154 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -29,7 +29,6 @@ de:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM, [um] HH:mm"
       long_no_year_no_time: "D. MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY [um] HH:mm"
@@ -264,7 +263,6 @@ de:
     bookmarks:
       created: "du hast ein Lesezeichen zu diesem Beitrag hinzugefügt"
       not_bookmarked: "Lesezeichen auf diesen Beitrag setzen"
-      created_with_reminder: "Du hast diesem Beitrag ein Lesezeichen hinzugefügt mit einer Erinnerung am %{date}"
       remove: "Lesezeichen entfernen"
       confirm_clear: "Bist du sicher, dass du alle Lesezeichen in diesem Thema entfernen möchtest? "
       save: "Speichern"
@@ -272,9 +270,9 @@ de:
       reminders:
         at_desktop: "Nächstes mal wenn ich an meinem PC bin"
         later_today: "Im Laufe des Tages"
-        next_business_day: "Nächster Geschäftstag"
         tomorrow: "Morgen"
         next_week: "Nächste Woche"
+        later_this_week: "Später in dieser Woche"
         next_month: "Nächster Monat"
         custom: "Eigenes Datum und Zeit"
     drafts:
@@ -539,6 +537,7 @@ de:
         deny: "ablehnen"
         denied: "abgelehnt"
         undone: "Anfrage zurückgenommen"
+        handle: "Mitgliedschaftsanfrage bearbeiten"
       manage:
         title: "Verwalten"
         name: "Name"
@@ -816,7 +815,7 @@ de:
           Diese Einstellung überschreibt die Aktivitäts-Übersicht.<br />
           Stummgeschaltete Themen und Kategorien werden in diese E-Mails nicht eingeschlossen.
         individual: "Für jeden Beitrag eine E-Mail senden"
-        individual_no_echo: "Sende für alle fremden Beträge eine Email"
+        individual_no_echo: "Sende für alle fremden Beträge eine E-Mail"
         many_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa {{dailyEmailEstimate}} pro Tag)"
         few_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa 2 pro Tag)"
         warning: "Mailinglisten-Modus aktiviert. Einstellungen zur Benachrichtigung per E-Mail werden nicht berücksichtigt."
@@ -967,10 +966,6 @@ de:
         success_staff: "Wir haben eine E-Mail an deine aktuelle Adresse geschickt. Bitte folge den Bestätigungsanweisungen."
       change_avatar:
         title: "Ändere dein Profilbild"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basierend auf"
-        gravatar_title: "Ändere deinen Avatar auf der Gravatar-Webseite"
-        gravatar_failed: "Wir konnten kein Gravatar für diese E-Mail-Adresse finden."
-        refresh_gravatar_title: "Deinen Gravatar aktualisieren"
         letter_based: "ein vom System zugewiesenes Profilbild"
         uploaded_avatar: "Eigenes Bild"
         uploaded_avatar_empty: "Eigenes Bild hinzufügen"
@@ -1231,7 +1226,7 @@ de:
       stream:
         posted_by: "Verfasst von"
         sent_by: "Gesendet von"
-        private_message: "Nachricht"
+        private_message: "Senden"
         the_topic: "das Thema"
     loading: "Wird geladen…"
     errors:
@@ -1253,6 +1248,8 @@ de:
         back: "Zurück"
         again: "Erneut versuchen"
         fixed: "Seite laden"
+    modal:
+      close: "Schließen"
     close: "Schließen"
     assets_changed_confirm: "Diese Website wurde gerade aktualisiert. Neu laden für die neuste Version?"
     logout: "Du wurdest abgemeldet."
@@ -1484,7 +1481,6 @@ de:
       objects: Objekte
       symbols: Symbole
       flags: Flaggen
-      custom: Benutzerdefinierte Emojis
       recent: Zuletzt verwendet
       default_tone: Keine Hautfarbe
       light_tone: Helle Hautfarbe
@@ -1492,6 +1488,7 @@ de:
       medium_tone: Mittlere Hautfarbe
       medium_dark_tone: Mittel-dunkle Hautfarbe
       dark_tone: Dunkle Hautfarbe
+      default: Benutzerdefinierte Emojis
     shared_drafts:
       title: "Gemeinsame Vorlagen"
       notice: "Das Thema ist nur sichtbar für die, die die <b>{{category}}</b>-Kategorie sehen können."
@@ -1641,6 +1638,7 @@ de:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2417,9 +2415,8 @@ de:
             button: "HTML"
       bookmarks:
         create: "Lesezeichen erstellen"
+        created: "Erstellt"
         name: "Name"
-        name_placeholder: "Gib dem Lesezeichen einen Namen, um dein Gedächtnis zu unterstützen"
-        set_reminder: "Erstelle eine Erinnerung"
         actions:
           delete_bookmark:
             name: "Lesezeichen löschen"
@@ -3585,7 +3582,7 @@ de:
         refresh: "Aktualisieren"
         send_digest_label: "Sende das Ergebnis an:"
         send_digest: "Senden"
-        sending_email: "Sende Email..."
+        sending_email: "Sende E-Mail..."
         format: "Format"
         html: "HTML"
         text: "Text"
@@ -3846,7 +3843,6 @@ de:
           staff: "Team"
           suspended: "Gesperrt"
           silenced: "Stummgeschaltet"
-          suspect: "Verdächtig"
           staged: "Vorbereitet"
         approved: "Genehmigt?"
         titles:
@@ -3863,7 +3859,6 @@ de:
           moderators: "Moderatoren"
           silenced: "Stummgeschaltete Benutzer"
           suspended: "Gesperrte Benutzer"
-          suspect: "Verdächtige Benutzer"
           staged: "Vorbereite Benutzer"
         not_verified: "Nicht überprüft"
         check_email:
@@ -4222,6 +4217,7 @@ de:
         help: "Neues Emoji hinzufügen, das für alle verfügbar sein wird. (Tipp: per Drag & Drop kannst du gleichzeitig mehrere Dateien hinzufügen)"
         add: "Neues Emoji hinzufügen"
         name: "Name"
+        group: "Gruppe"
         image: "Bild"
         delete_confirm: "Möchtest du wirklich das :%{name}: Emoji löschen?"
       embedding:
@@ -4248,7 +4244,6 @@ de:
         save: "Einbettungseinstellungen speichern"
       permalink:
         title: "Permanentlinks"
-        description: "Bitte beachte: dies trifft nur auf externe Quellen zu, in deinem Forum gepostete Links werden nicht umgeleitet."
         url: "URL"
         topic_id: "Themen-ID"
         topic_title: "Thema"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 810484e771..0d5e89c6d5 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -28,7 +28,6 @@ el:
     dates:
       time: "ΗΗ:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM, HH:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -231,6 +230,12 @@ el:
       created: "έχεις προσθέσει σελιδοδείκτη σε αυτή την ανάρτηση"
       remove: "Αφαίρεση Σελιδοδείκτη"
       save: "Αποθήκευση"
+      reminders:
+        later_today: "Αργότερα σήμερα"
+        tomorrow: "Αύριο"
+        next_week: "Την άλλη εβδομάδα"
+        later_this_week: "Αργότερα αυτή την εβδομάδα"
+        next_month: "Τον άλλο μήνα"
     drafts:
       remove: "Αναίρεση Πρόσκλησης"
       abandon:
@@ -661,9 +666,6 @@ el:
         success_staff: "Στείλαμε ένα email στην τρέχουσα διεύθυνσή σας. Παρακαλούμε ακολουθήστε τις οδηγίες επικύρωσης."
       change_avatar:
         title: "Αλλαγή της φωτογραφίας του προφίλ σου"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, που βασίζεται σε"
-        gravatar_title: "Άλλαξε το άβατάρ σου στην ιστοσελίδα Gravatar "
-        refresh_gravatar_title: "Ανανέωσε το Gravatar σου"
         letter_based: "Εικόνα προφίλ που ανέθεσε το σύστημα"
         uploaded_avatar: "Προσαρμοσμένη εικόνα"
         uploaded_avatar_empty: "Πρόσθεσε μια δική σου εικόνα"
@@ -895,6 +897,8 @@ el:
         back: "Πίσω"
         again: "Δοκίμασε ξανά"
         fixed: "Φόρτωση Σελίδας"
+    modal:
+      close: "κλείσιμο"
     close: "Κλείσιμο"
     assets_changed_confirm: "Αυτή η ιστοσελίδα μόλις ενημερώθηκε. Να ανανεωθεί τώρα για να φανεί η τελευταία έκδοση;"
     logout: "Αποσυνδέθηκες."
@@ -1055,7 +1059,6 @@ el:
       filter_placeholder: Αναζήτηση για emoji
       objects: Αντικείμενα
       flags: Σημάνσεις
-      custom: Προσαρμοσμένα emojis
       recent: Πρόσφατα χρησιμοποιημένα
       default_tone: Χωρίς απόχρωση επιδερμίδας
       light_tone: Λευκή απόχρωση επιδερμίδας
@@ -1063,6 +1066,7 @@ el:
       medium_tone: Μέτρια απόχρωση επιδερμίδας
       medium_dark_tone: Σκουρόχρωμη απόχρωση επιδερμίδας
       dark_tone: Σκούρη απόχρωση επιδερμίδας
+      default: Προσαρμοσμένα emojis
     composer:
       emoji: "Emoji :)"
       more_emoji: "περισσότερα..."
@@ -1152,6 +1156,7 @@ el:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1769,6 +1774,7 @@ el:
             title: "Εμφάνιση του τμήματος html του email"
             button: "HTML"
       bookmarks:
+        created: "Δημιουργήθηκε"
         name: "Όνομα"
     category:
       can: "μπορεί&hellip; "
@@ -2818,7 +2824,6 @@ el:
           staff: "Συνεργάτες"
           suspended: "Αποβλημένοι"
           silenced: "Σιγήθηκαν"
-          suspect: "Ύποπτο"
         approved: "Εγκεκριμένο;"
         titles:
           active: "Ενεργοί Χρήστες"
@@ -2834,7 +2839,6 @@ el:
           moderators: "Συντονιστές"
           silenced: "Σιγημένοι Χρήστες"
           suspended: "Αποβλημένοι Χρήστες"
-          suspect: "Ύποπτοι χρήστες"
         not_verified: "Μη επαληθευμένος"
         check_email:
           title: "Εμφάνισε το email αυτού του χρήστη"
@@ -3146,6 +3150,7 @@ el:
         help: "Πρόσθεσε ένα νέο emoji που θα είναι διαθέσιμο σε όλους. (Συμβουλή: μπορείς να σύρεις πολλά αρχεία ταυτόχρονα)"
         add: "Προσθήκη νέου emoji"
         name: "Όνομα"
+        group: "Ομάδα"
         image: "Εικόνα"
         delete_confirm: "Είσαι σίγουρος ότι θέλεις να διαγράψεις το emoji :%{name}:;"
       embedding:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 8a417d3868..401ee44dff 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -29,7 +29,6 @@ es:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -264,19 +263,22 @@ es:
     bookmarks:
       created: "has marcado esta publicación"
       not_bookmarked: "marcar esta publicación"
-      created_with_reminder: "Guardaste esta publicación en marcadores con un recordatorio el %{date}"
+      created_with_at_desktop_reminder: "guardaste esta publicación en marcadores y se te recordará la próxima vez que estés en tu computadora"
       remove: "Eliminar marcador"
       confirm_clear: "¿Estás seguro de que deseas eliminar todos tus marcadores en este tema?"
       save: "Guardar"
       no_timezone: 'No has establecido una zona horaria todavía. No podrás establecer recordatorios. Puedes elegir una <a href="%{basePath}/my/preferences/profile">en tu perfil</a>.'
+      invalid_custom_datetime: "La fecha y hora que suministraste es inválida. Por favor, intenta de nuevo."
+      list_permission_denied: "No tienes permiso para ver los marcadores de este usuario."
       reminders:
         at_desktop: "La próxima vez que esté en mi ordenador"
-        later_today: "Más tarde hoy"
-        next_business_day: "El próximo día hábil"
+        later_today: "Más tarde durante el día de hoy"
         tomorrow: "Mañana"
-        next_week: "La próxima semana"
-        next_month: "El mes que viene"
+        next_week: "Próxima semana"
+        later_this_week: "Esta misma semana"
+        next_month: "Próximo mes"
         custom: "Fecha y hora personalizadas"
+        none: "No se necesita recordatorio"
     drafts:
       resume: "Reanudar"
       remove: "Eliminar"
@@ -539,6 +541,7 @@ es:
         deny: "Denegar"
         denied: "denegado"
         undone: "solicitud deshecha"
+        handle: "atender solicitud de membresía"
       manage:
         title: "Gestionar"
         name: "Nombre"
@@ -766,6 +769,7 @@ es:
         clear:
           title: "Quitar filtros"
           warning: "¿Estás seguro de que quieres eliminar tu tema destacado?"
+      use_current_timezone: "Usar zona horaria actual"
       profile_hidden: "El perfil público de este usuario está oculto."
       expand_profile: "Expandir"
       collapse_profile: "Contraer"
@@ -866,6 +870,7 @@ es:
         deleted_posts: "publicaciones eliminadas"
         suspensions: "suspensiones"
         warnings_received: "avisos"
+        rejected_posts: "publicaciones rechazadas"
       messages:
         all: "Todos"
         inbox: "Bandeja de entrada"
@@ -941,6 +946,7 @@ es:
           title: "Autenticación basada en tokens"
           add: "Nuevo autenticador"
           default_name: "Mi autenticador"
+          name_and_code_required_error: "Debes introducir un nombre y un código de tu aplicación de autentificación."
         security_key:
           register: "Registrar"
           title: "Claves de seguridad"
@@ -951,6 +957,7 @@ es:
           edit: "Editar clave de seguridad"
           edit_description: "Nombre de la clave de seguridad"
           delete: "Eliminar"
+          name_required_error: "Debes introducir un nombre para tu llave de seguridad."
       change_about:
         title: "Cambiar «Acerca de mí»"
         error: "Ha ocurrido un error al cambiar este valor."
@@ -967,10 +974,10 @@ es:
         success_staff: "Hemos enviado un correo electrónico a tu dirección actual. Por favor, sigue las instrucciones de confirmación."
       change_avatar:
         title: "Cambiar tu imagen de perfil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basado en"
-        gravatar_title: "Cambia tu avatar en el sitio web de Gravatar"
-        gravatar_failed: "No hemos encontrado ningún Gravatar con esta dirección de correo electrónico."
-        refresh_gravatar_title: "Actualizar tu Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, basado en"
+        gravatar_title: "Cambia tu avatar en la pagina web de {{gravatarName}}"
+        gravatar_failed: "No pudimos encontrar un {{gravatarName}} con esa dirección de correo electrónico."
+        refresh_gravatar_title: "Actualiza tu {{gravatarName}}"
         letter_based: "Imagen de perfil asignada por el sistema"
         uploaded_avatar: "Foto personalizada"
         uploaded_avatar_empty: "Agrega una foto personalizada"
@@ -1033,6 +1040,9 @@ es:
         any: "cualquiera"
       password_confirmation:
         title: "Ingresa de nuevo la contraseña"
+      invite_code:
+        title: "Código de invitación"
+        instructions: "El registro de la cuenta requiere un código de invitación"
       auth_tokens:
         title: "Dispositivos utilizados recientemente"
         ip: "IP"
@@ -1253,6 +1263,8 @@ es:
         back: "Volver atrás"
         again: "Intentar de nuevo"
         fixed: "Cargar página"
+    modal:
+      close: "cerrar"
     close: "Cerrar"
     assets_changed_confirm: "Este sitio acaba de ser actualizado. ¿Quieres cargar la página de nuevo para ver la última versión?"
     logout: "Has cerrado sesión."
@@ -1261,6 +1273,12 @@ es:
       enabled: "Este sitio está en modo de solo lectura. Puedes continuar navegando pero algunas acciones como responder o dar me gusta no están disponibles por ahora."
       login_disabled: "Iniciar sesión está desactivado mientras el foro se encuentre en modo de solo lectura."
       logout_disabled: "Cerrar sesión está desactivado mientras el sitio se encuentre en modo de solo lectura."
+    too_few_topics_and_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}} y {currentPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}} y {requiredPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Solo los miembros del staff pueden ver este mensaje.
+    too_few_topics_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}}. Solo los miembros del staff pueden ver este mensaje.
+    too_few_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Solo los miembros del staff pueden ver este mensaje.
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} otros {# errors/hour}}</a> alcanzó el límite de la configuración del sitio de {limit, plural, one {# error/hour} otros {# errors/hour}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} otros {# errors/minute}}</a> alcanzó el límite de la configuración del sitio de {limit, plural, one {# error/minute} otros {# errors/minute}}."
@@ -1482,7 +1500,6 @@ es:
       objects: Objetos
       symbols: Símbolos
       flags: Banderas
-      custom: Emojis personalizados
       recent: "Usados recientemente "
       default_tone: Sin tono de piel
       light_tone: Tono de piel claro
@@ -1490,6 +1507,7 @@ es:
       medium_tone: Tono de piel medio
       medium_dark_tone: Tono de piel medio oscuro
       dark_tone: Tono de piel oscuro
+      default: Emojis personalizados
     shared_drafts:
       title: "Borradores Compartidos"
       notice: "Este tema es visible solamente por quienes pueden ver la categoría <b>{{category}}</b>."
@@ -1639,6 +1657,7 @@ es:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1689,6 +1708,7 @@ es:
         posted: "nueva publicación"
         moved_post: "publicación movida"
         linked: "enlazado"
+        bookmark_reminder: "recordatorio de marcador"
         granted_badge: "medalla concedida"
         invited_to_topic: "invitado al tema"
         group_mentioned: "grupo mencionado"
@@ -1917,6 +1937,7 @@ es:
       group_request_sent: "Tu solicitud de membresía al grupo fue enviada. Se te informará cuando seas aceptado."
       unread_indicator: "Ningún miembro ha leído todavía la última publicación de este tema."
       read_more_MF: "Hay { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 no leído</a> } other { <a href='{basePath}/unread'># no leídos</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{y } false { } other{}} <a href='{basePath}/new'>1 nuevo</a> tema} other { {BOTH, select, true{y } false { } other{}} <a href='{basePath}/new'># nuevos</a> temas} } restantes, o {CATEGORY, select, true {explora otros temas en {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Ver todas las categorías
       view_latest_topics: ver los temas recientes
       suggest_create_topic: "¿Por qué no creas un tema?"
@@ -1927,6 +1948,7 @@ es:
         title: "Temporizador de temas"
         save: "Configurar temporizador"
         num_of_hours: "Número de horas:"
+        num_of_days: "Número de días:"
         remove: "Quitar temporizador"
         publish_to: "Publicar en:"
         when: "Cuando:"
@@ -1969,6 +1991,8 @@ es:
         title: "Hacer bump al tema automaticamente"
       reminder:
         title: "Recordarme"
+      auto_delete_replies:
+        title: "Eliminar respuestas automáticamente"
       status_update_notice:
         auto_open: "Este tema se abrirá automáticamente %{timeLeft}."
         auto_close: "Este tema se cerrará automáticamente %{timeLeft}."
@@ -1977,6 +2001,7 @@ es:
         auto_delete: "Este tema se eliminará automáticamente %{timeLeft}."
         auto_bump: "La fecha de este tema se actualizará %{timeLeft}."
         auto_reminder: "Te recordaremos sobre este tema %{timeLeft}."
+        auto_delete_replies: "Respuestas en este tema serán eliminadas automáticamente después de %{duration}."
       auto_close_title: "Configuración de cierre automático"
       auto_close_immediate:
         one: "El último post se publicó hace %{count} hora, por lo que el tema se cerrará inmediatamente."
@@ -2196,6 +2221,9 @@ es:
         instructions:
           one: "Por favor escoge el nuevo dueño del post de <b>@{{old_user}}</b>"
           other: "Por favor, escoge el nuevo dueño de las {{count}} publicaciones de <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Por favor, escoge un nuevo propietario para la publicación."
+          other: "Por favor, escoge un nuevo propietario para las {{count}} publicaciones"
       change_timestamp:
         title: "Cambiar marca horaria..."
         action: "cambiar marca horaria"
@@ -2415,9 +2443,10 @@ es:
             button: "HTML"
       bookmarks:
         create: "Crear marcador"
+        created: "Creado"
         name: "Nombre"
-        name_placeholder: "Ponle un nombre a la publicación que has guardado en marcadores para ayudarte a recordarla"
-        set_reminder: "Establecer un recordatorio"
+        name_placeholder: "¿Para qué es este marcador?"
+        set_reminder: "Recuérdame"
         actions:
           delete_bookmark:
             name: "Eliminar marcador"
@@ -2805,6 +2834,10 @@ es:
         print: "%{shortcut} Imprimir tema"
         defer: "%{shortcut} Aplazar el tema"
         topic_admin_actions: "%{shortcut} Abrir acciones de administrador del tema"
+      search_menu:
+        title: "Buscar Menu"
+        prev_next: "%{shortcut} Mover selección arriba y abajo"
+        insert_url: "%{shortcut} Insertar selección dentro del editor abierto"
     badges:
       earned_n_times:
         one: "Ganó esta medalla %{count} vez"
@@ -3848,7 +3881,6 @@ es:
           staff: "Staff"
           suspended: "Suspendidos"
           silenced: "Silenciados"
-          suspect: "Sospechosos"
           staged: "Temporal"
         approved: "¿Aprobado/s?"
         titles:
@@ -3865,7 +3897,6 @@ es:
           moderators: "Moderadores"
           silenced: "Usuarios silenciados"
           suspended: "Usuarios suspendidos"
-          suspect: "Usuarios sospechosos"
           staged: "Usuarios temporales"
         not_verified: "No verificado"
         check_email:
@@ -3996,6 +4027,7 @@ es:
           threshold_reached: "Se recibieron demasiados rebotes desde ese correo electrónico."
         trust_level_change_failed: "Hubo un problema al cambiar el nivel de confianza del usuario."
         suspend_modal_title: "Suspender Usuario"
+        confirm_cancel_penalty: "¿Seguro que quieres descartar la falta?"
         trust_level_2_users: "Usuarios con nivel de confianza 2"
         trust_level_3_requirements: "Requerimientos para nivel de confianza 3"
         trust_level_locked_tip: "el nivel de confianza esta bloqueado, el sistema no promoverá o degradara al usuario."
@@ -4225,6 +4257,7 @@ es:
         help: "Añade emojis nuevos que estarán disponibles para todos. (CONSEJO: arrasta varios archivos a la vez)"
         add: "Añadir emoji nuevo"
         name: "Nombre"
+        group: "Grupo"
         image: "Imagen"
         delete_confirm: "¿Estás seguro de que quieres eliminar el emoji :%{name}:?"
       embedding:
@@ -4251,7 +4284,7 @@ es:
         save: "Guardar ajustes de insertado"
       permalink:
         title: "Enlaces permanentes"
-        description: "Ten en cuenta que esto solo se aplica a fuentes externas, los enlaces publicados en tu foro no se redirigirán."
+        description: "Redirecciones para solicitar URL no conocidas por el foro."
         url: "URL"
         topic_id: "ID del tema"
         topic_title: "Tema"
@@ -4260,6 +4293,7 @@ es:
         category_id: "ID de la categoría"
         category_title: "Categoría"
         external_url: "URL externa"
+        destination: "Destino"
         delete_confirm: "¿Estás seguro de que quieres eliminar este enlace permanente?"
         form:
           label: "Nuevo:"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index ab3c11c8dc..9b7097c953 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -28,7 +28,6 @@ et:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM, hh:mm"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D. MMMM, YYYY hh:mm"
@@ -234,6 +233,12 @@ et:
       not_bookmarked: "lisa sellele postitusele järjehoidja"
       remove: "Eemalda järjehoidja"
       save: "Salvesta"
+      reminders:
+        later_today: "Täna hiljem"
+        tomorrow: "Homme"
+        next_week: "Järgmisel nädalal"
+        later_this_week: "iljem sel nädalal"
+        next_month: "Järgmisel kuul"
     drafts:
       resume: "Taasta"
       remove: "Eemalda"
@@ -702,10 +707,6 @@ et:
         success: "Saatsime sellele aadressile meili. Palun järgi seal olevaid juhiseid."
       change_avatar:
         title: "Muuda oma profiilipilti"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseerub"
-        gravatar_title: "Oma avatari muuda Gravatar'i veebilehel"
-        gravatar_failed: "Selle e-posti aadressi küljest Gravatari ei leitud."
-        refresh_gravatar_title: "Värskenda oma Gravatar'i"
         letter_based: "Süsteemi poolt määratud profiilipilt"
         uploaded_avatar: "Individuaalne pilt"
         uploaded_avatar_empty: "Lisage individuaalne pilt"
@@ -955,6 +956,8 @@ et:
         back: "Mine tagasi"
         again: "Proovi uuesti"
         fixed: "Lae lehekülg"
+    modal:
+      close: "Sulge"
     close: "Sulge"
     assets_changed_confirm: "See sait on just uuendatud. Värskendan nüüd viimasele versioonile?"
     logout: "Sind logiti välja."
@@ -1115,7 +1118,6 @@ et:
       filter_placeholder: Otsi emojit
       objects: Objektid
       flags: Tähised
-      custom: Kohandatud emoji
       recent: Viimati kasutatud
       default_tone: Nahatooni pole
       light_tone: Hele nahatoon
@@ -1123,6 +1125,7 @@ et:
       medium_tone: Keskmine nahatoon
       medium_dark_tone: Keskmiselt tume nahatoon
       dark_tone: Tume nahatoon
+      default: Kohandatud emoji
     shared_drafts:
       destination_category: "Sihtkategooria"
       publishing: "Teema avaldamine..."
@@ -1236,6 +1239,7 @@ et:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1842,6 +1846,7 @@ et:
           html_part:
             button: "HTML"
       bookmarks:
+        created: "Loodud"
         name: "Nimi"
     category:
       can: "saab&hellip; "
@@ -2875,7 +2880,6 @@ et:
           staff: "Meeskond"
           suspended: "Peatatud"
           silenced: "Vaigistatud"
-          suspect: "Kahtlane"
         approved: "Heakskiidetud?"
         titles:
           active: "Aktiivsed kasutajad"
@@ -2891,7 +2895,6 @@ et:
           moderators: "Moderaatorid"
           silenced: "Vaigistatud kasutajad"
           suspended: "Peatatud kasutajad"
-          suspect: "Kahtlased kasutajad"
         not_verified: "Ei ole kontrollitud"
         check_email:
           title: "Näita selle kasutaja meiliaadressi"
@@ -3190,6 +3193,7 @@ et:
         help: "Lisa uued emotikonid kõigile kasutamiseks. (PRO-vihje: pukseeri korraga mitu faili)"
         add: "Lisa uus emotikon"
         name: "Nimi"
+        group: "Grupp"
         image: "Pilt"
         delete_confirm: "Oled Sa kindel, et soovid kustutada :%{name}: emotikoni?"
       embedding:
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index cc5a914031..e5a524cf7a 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -26,10 +26,9 @@ fa_IR:
         thousands: "{{number}} هزار"
         millions: "{{number}} میلیون"
     dates:
-      time: "h:mm a"
-      time_short_day: "h:mm a"
+      time: "HH:mm"
+      time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -42,16 +41,16 @@ fa_IR:
       long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
       wrap_ago: "%{date} پیش"
       tiny:
-        half_a_minute: "< 1 دقیقه"
+        half_a_minute: "1 دقیقه پیش"
         less_than_x_seconds:
           one: "< %{count} ثانیه"
-          other: "< %{count} ثانیه"
+          other: "%{count} ثانیه پیش"
         x_seconds:
           one: "%{count} ثانیه"
           other: "%{count} ثانیه"
         less_than_x_minutes:
           one: "< %{count} دقیقه"
-          other: "< %{count} دقیقه"
+          other: "%{count} دقیقه پیش"
         x_minutes:
           one: "%{count} دقیقه"
           other: "%{count} دقیقه"
@@ -73,7 +72,7 @@ fa_IR:
         almost_x_years:
           one: "%{count} سال"
           other: "%{count} سال"
-        date_month: "MMM D"
+        date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
@@ -264,18 +263,17 @@ fa_IR:
     bookmarks:
       created: "شما این نوشته را نشانک زده‌اید"
       not_bookmarked: "این نوشته را نشانک بزنید"
-      created_with_reminder: "شما بر روی این پست نشانک همراه با یادآوری گذاشته اید در %{date}"
       remove: "پاک کردن نشانک"
       confirm_clear: "آیا مطمئنید می‌خواهید همه‌ی نشانک‌های خود را از این موضوع پاک کنید؟"
       save: "ذخیره"
       no_timezone: 'شما هنوز منطقه زمانی مشخص نکرده اید. شما قادر به تنظیم کردن یادآوری نیستید. یکی را در <a href="%{basePath}/my/preferences/profile"> پروفایل تان </a> تنظیم کنید.'
       reminders:
         at_desktop: "بار آینده من پشت میزم هستم"
-        later_today: "امروز کمی بعد"
-        next_business_day: "روز کاری آینده"
+        later_today: "امروز"
         tomorrow: "فردا"
-        next_week: "هفته ی آینده"
-        next_month: "ماه آینده"
+        next_week: "هفته بعد"
+        later_this_week: "این هفته"
+        next_month: "ماه بعد"
         custom: "درج تاریخ و ساعت"
     drafts:
       resume: "از سر گیری"
@@ -965,10 +963,6 @@ fa_IR:
         success_staff: "یک ایمیل به آدرس کنونی شما ارسال کردیم. لطفا دستورالعمل آن را دنبال کنید."
       change_avatar:
         title: "عکس نمایه خود را تغییر دهید"
-        gravatar: "بر‌اساس <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "تصویرتان را در سایت Gravatar تغییر دهید"
-        gravatar_failed: "هیچ گراواتاری با این آدرس ایمیل پیدا نکردیم"
-        refresh_gravatar_title: "تازه‌سازی Gravatar شما"
         letter_based: "سیستم تصویر پرفایل را اختصاص داده است"
         uploaded_avatar: "تصویر سفارشی"
         uploaded_avatar_empty: "افزودن تصویر سفارشی"
@@ -1246,6 +1240,8 @@ fa_IR:
         back: "برگشت"
         again: "تلاش دوباره"
         fixed: "بارگذاری برگه"
+    modal:
+      close: "بسته"
     close: "بستن"
     assets_changed_confirm: "این وب سایت به روز رسانی شده است. برای دیدن آخرین نسخه تازه‌سازی می‌کنید؟"
     logout: "شما از سایت خارج شده‌اید."
@@ -1462,7 +1458,6 @@ fa_IR:
       objects: اشیا
       symbols: نشانه ها
       flags: پرچم‌ها
-      custom: ایموجی های مخصوص
       recent: اخیرا استفاده شده
       default_tone: بدون رنگ خاص
       light_tone: رنگ پوست روشن
@@ -1470,6 +1465,7 @@ fa_IR:
       medium_tone: رنگ پوست روشن
       medium_dark_tone: رنگ پوست روشن تیره
       dark_tone: رنگ پوست تیره
+      default: ایموجی های مخصوص
     shared_drafts:
       title: "درفت مشترک"
       notice: "این موضوع فقط برای افرادی که به دسته بندی <b>{{category}}</b>دسترسی دارند نمایش داده می‌شود."
@@ -1613,6 +1609,7 @@ fa_IR:
       mentioned: "<span>{{username}}</span>{{description}}"
       group_mentioned: "<span>{{username}}</span>{{description}}"
       quoted: "<span>{{username}}</span>{{description}}"
+      bookmark_reminder: "<span>{{username}}</span>{{description}}"
       replied: "<span>{{username}}</span>{{description}}"
       posted: "<span>{{username}}</span>{{description}}"
       edited: "<span>{{username}}</span>{{description}}"
@@ -2335,6 +2332,7 @@ fa_IR:
             title: "نمایش قسمت HTML ایمیل"
             button: "HTML"
       bookmarks:
+        created: "ساخته شده"
         name: "نام"
     category:
       can: "can&hellip; "
@@ -3534,7 +3532,6 @@ fa_IR:
           active: "فعال"
           staff: "همکاران"
           suspended: "تعلیق شد "
-          suspect: "مشکوک"
           staged: "کاربر از راه دور"
         approved: "تایید شده ؟"
         titles:
@@ -3550,7 +3547,6 @@ fa_IR:
           admins: "مدیران ارشد"
           moderators: "مدیران"
           suspended: "کاربران تعلیق شده"
-          suspect: "کاربران مشکوک"
         not_verified: "تایید نشده"
         check_email:
           title: "ایمیل این کاربران را قابل رویت کن"
@@ -3850,6 +3846,7 @@ fa_IR:
         help: "اضافه کردن شکلک های جدید که در دسترس همگان خواهد بود.(PROTIP: کشیدن و رها کردن چند فایل در یک بار)"
         add: "افزودن شکلک جدید"
         name: "نام"
+        group: "گروه"
         image: "تصویر"
         delete_confirm: "آیا مطمئنید که می‌خواهید شکلک :{name}%: را پاک کنید؟"
       embedding:
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index c64a976e1f..4841845a94 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -29,7 +29,6 @@ fi:
       time: "H:mm"
       time_short_day: "ddd HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM[ta], H:mm"
       long_no_year_no_time: "D. MMMM[ta]"
       full_no_year_no_time: "Do MMMM[ta]"
       long_with_year: "D. MMMM[ta] YYYY H:mm"
@@ -264,19 +263,23 @@ fi:
     bookmarks:
       created: "olet lisännyt tämän viestin kirjanmerkkeihisi"
       not_bookmarked: "lisää viesti kirjanmerkkeihin"
-      created_with_reminder: "olet kirjanmerkinnyt tämän viestin ja siitä muistutetaan %{date}"
+      created_with_at_desktop_reminder: "kirjanmerkitsit tämän viestin ja sinua muistutetaan siitä kun seuraavan kerran olet työpöytäympäristössäsi"
       remove: "Poista kirjanmerkki"
       confirm_clear: "Haluatko varmasti poistaa kaikki kirjanmerkkisi tästä ketjusta?"
       save: "Tallenna"
       no_timezone: 'Et ole valinnut aikavyöhykettä, joten et voi asettaa muistutuksia. Aseta se  <a href="%{basePath}/my/preferences/profile">profiilisivullasi</a>.'
+      invalid_custom_datetime: "Antamasi päivämäärä ja kellonaika ei kelpaa, yritä uudelleen."
+      list_permission_denied: "Et voi nähdä tämän käyttäjän kirjanmerkkejä."
       reminders:
         at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
-        later_today: "Myöhemmin tänään "
+        later_today: "Myöhemmin tänään"
         next_business_day: "Seuraavana arkipäivänä"
         tomorrow: "Huomenna"
         next_week: "Ensi viikolla"
+        later_this_week: "Myöhemmin tällä viikolla"
         next_month: "Ensi kuussa"
         custom: "Valitse päivämäärä ja kellonaika"
+        none: "Muistutus ei tarpeen"
     drafts:
       resume: "Jatka"
       remove: "Poista"
@@ -539,6 +542,7 @@ fi:
         deny: "Hylkää"
         denied: "hylättiin"
         undone: "pyyntö peruttu"
+        handle: "käsittele jäsenyyshakemus"
       manage:
         title: "Hallinnoi"
         name: "Nimi"
@@ -866,6 +870,7 @@ fi:
         deleted_posts: "poistettua viestiä"
         suspensions: "hyllytyksiä"
         warnings_received: "varoituksia"
+        rejected_posts: "hylättyjä viestejä"
       messages:
         all: "Kaikki"
         inbox: "Saapuneet"
@@ -967,10 +972,6 @@ fi:
         success_staff: "Lähetimme sähköpostia nykyiseen osoitteeseesi. Noudata vahvistusohjeita."
       change_avatar:
         title: "Vaihda profiilikuvasi"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, osoitteesta"
-        gravatar_title: "Vaihda profiilikuvasi Gravatar-sivustolla"
-        gravatar_failed: "Tällä sähköpostiosoitteella ei löytynyt Gravataria."
-        refresh_gravatar_title: "Päivitä Gravatar"
         letter_based: "Sivuston luoma profiilikuva"
         uploaded_avatar: "Oma kuva"
         uploaded_avatar_empty: "Lisää oma kuva"
@@ -1252,6 +1253,8 @@ fi:
         back: "Mene takaisin"
         again: "Yritä uudestaan"
         fixed: "Lataa sivu"
+    modal:
+      close: "sulje"
     close: "Sulje"
     assets_changed_confirm: "Sivustolla on tehty päivityksiä. Ladataanko uudelleen?"
     logout: "Sinut kirjattiin ulos."
@@ -1481,7 +1484,6 @@ fi:
       objects: Esineet
       symbols: Symbolit
       flags: Liputukset
-      custom: Mukautetut emojit
       recent: Hiljattain käytetyt
       default_tone: Ei ihonsävyä
       light_tone: Vaalea ihonväri
@@ -1489,6 +1491,7 @@ fi:
       medium_tone: Ruskea ihonväri
       medium_dark_tone: Tummanruskea ihonväri
       dark_tone: Tumma ihonväri
+      default: Mukautetut emojit
     shared_drafts:
       title: "Jaetut luonnokset"
       notice: "Tämä ketju näkyy vain niille, jotka näkevät <b>{{category}}</b> -alueen."
@@ -1638,6 +1641,7 @@ fi:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2414,9 +2418,8 @@ fi:
             button: "HTML"
       bookmarks:
         create: "Luo kirjanmerkki"
+        created: "Luotu"
         name: "Nimi"
-        name_placeholder: "Anna kirjanmerkille nimi muistisi virkistämiseksi"
-        set_reminder: "Aseta muistutus"
         actions:
           delete_bookmark:
             name: "Poista kirjanmerkki"
@@ -3847,7 +3850,6 @@ fi:
           staff: "Henkilökunta"
           suspended: "Hyllytetyt"
           silenced: "Hiljennetty"
-          suspect: "Epäilty"
           staged: "Esikäyttäjät"
         approved: "Hyväksytty?"
         titles:
@@ -3864,7 +3866,6 @@ fi:
           moderators: "Valvojat"
           silenced: "Hiljennetyt käyttäjät"
           suspended: "Hyllytetyt käyttäjät"
-          suspect: "Epäillyt käyttäjät"
           staged: "Esikäyttäjät"
         not_verified: "Todentamaton"
         check_email:
@@ -4222,6 +4223,7 @@ fi:
         help: "Lisää uusi emoji joka on kaikkien käytettävissä. (Voit raahata useita tiedostoja kerralla)"
         add: "Lisää uusi emoji"
         name: "Nimi"
+        group: "Ryhmä"
         image: "Kuva"
         delete_confirm: "Oletko varma, että haluat poistaa emojin :%{name}:?"
       embedding:
@@ -4248,7 +4250,6 @@ fi:
         save: "Tallenna upotusasetukset"
       permalink:
         title: "Ikilinkit"
-        description: "Huomioi että tämä vaikuttaa vain ulkoisiin lähteisiin, palstallesi laitettuja linkkejä ei uudelleenohjata."
         url: "URL"
         topic_id: "Ketjun ID"
         topic_title: "Ketju"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index dec75c46b7..3caf174072 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -29,7 +29,6 @@ fr:
       time: "HH:mm"
       time_short_day: "ddd [à] HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "DD MMM YYYY H:mm"
@@ -264,18 +263,18 @@ fr:
     bookmarks:
       created: "vous avez mis un signet à ce message"
       not_bookmarked: "mettre un signet à ce message"
-      created_with_reminder: "Vous avez épinglé cette contribution avec un rappel au %{date}"
       remove: "Retirer le signet"
       confirm_clear: "Êtes-vous sûr de vouloir retirer tous les signets de ce sujet ?"
       save: "Sauvegarder"
       no_timezone: 'Vous n&#39;avez pas encore défini de fuseau horaire. Vous ne pourrez pas définir de rappels. Configurez-en un <a href="%{basePath}/my/preferences/profile">dans votre profil</a>.'
       reminders:
         at_desktop: "La prochaine fois je suis à mon bureau"
-        later_today: "Plus tard dans la journée"
-        next_business_day: "Prochain jour ouvré"
+        later_today: "Plus tard aujourd'hui"
         tomorrow: "Demain"
-        next_week: "La semaine prochaine"
-        next_month: "Le mois prochain"
+        next_week: "Semaine prochaine"
+        later_this_week: "Plus tard cette semaine"
+        start_of_next_business_week: "Lundi prochain"
+        next_month: "Mois prochai"
         custom: "Date et heure personnalisés"
     drafts:
       resume: "Reprendre"
@@ -539,6 +538,7 @@ fr:
         deny: "Refuser"
         denied: "refusé"
         undone: "requête annulée"
+        handle: "Gérer demande d'adhésion"
       manage:
         title: "Gérer"
         name: "Nom"
@@ -968,10 +968,6 @@ fr:
         success_staff: "Nous avons envoyé un courriel à votre adresse actuelle. Merci de suivre les instructions."
       change_avatar:
         title: "Modifier votre image de profil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basé sur"
-        gravatar_title: "Modifier votre avatar sur le site de Gravatar"
-        gravatar_failed: "Impossible de récupérer le Gravatar associé à cette adresse courriel."
-        refresh_gravatar_title: "Actualiser votre Gravatar"
         letter_based: "Image de profil attribuée par le système"
         uploaded_avatar: "Avatar personnalisé"
         uploaded_avatar_empty: "Ajouter un avatar personnalisé"
@@ -1254,6 +1250,8 @@ fr:
         back: "Retour"
         again: "Réessayer"
         fixed: "Charger la page"
+    modal:
+      close: "fermer"
     close: "Fermer"
     assets_changed_confirm: "Ce site vient d'être mis à jour. Rafraîchir maintenant pour accéder à la nouvelle version ?"
     logout: "Vous avez été déconnecté."
@@ -1483,7 +1481,6 @@ fr:
       objects: Objets
       symbols: Symboles
       flags: Drapeaux
-      custom: Emojis personnalisés
       recent: Utilisés récemment
       default_tone: Aucun teint
       light_tone: Teint clair
@@ -1491,6 +1488,7 @@ fr:
       medium_tone: Teint moyen
       medium_dark_tone: Teint légèrement foncé
       dark_tone: Teint foncé
+      default: Emojis personnalisés
     shared_drafts:
       title: "Ébauches partagées"
       notice: "Ce sujet n'est visible que pour ceux qui peuvent voir la catégorie <b>{{category}}</b>."
@@ -1639,6 +1637,7 @@ fr:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2415,9 +2414,8 @@ fr:
             button: "HTML"
       bookmarks:
         create: "Ajouter un signet"
+        created: "Créé"
         name: "Nom"
-        name_placeholder: "Nommez le signet pour alléger votre mémoire"
-        set_reminder: "Ajouter un rappel"
         actions:
           delete_bookmark:
             name: "Supprimer le signet"
@@ -3849,7 +3847,6 @@ fr:
           staff: "Responsables"
           suspended: "Suspendus"
           silenced: "Sous silence"
-          suspect: "Suspects"
           staged: "Distant"
         approved: "Approuvé ?"
         titles:
@@ -3866,7 +3863,6 @@ fr:
           moderators: "Modérateurs"
           silenced: "Utilisateurs sous silence"
           suspended: "Utilisateurs suspendus"
-          suspect: "Utilisateurs suspects"
           staged: "Utilisateurs distants"
         not_verified: "Non verifié"
         check_email:
@@ -4223,6 +4219,7 @@ fr:
         help: "Ajouter un nouvel emoji qui sera disponible pour tout le monde. (Conseil : glisser-déposer plusieurs fichiers en même temps)"
         add: "Ajouter un nouvel emoji"
         name: "Nom"
+        group: "Groupe"
         image: "Image"
         delete_confirm: "Êtes-vous sûr de vouloir supprimer l'emoji :%{name}: ?"
       embedding:
@@ -4249,7 +4246,6 @@ fr:
         save: "Sauvegarder les paramètres d'intégration"
       permalink:
         title: "Permaliens"
-        description: "Veuillez noter que ceci s'applique uniquement aux sources externes, les liens postés sur votre forum ne seront pas redirigés."
         url: "URL"
         topic_id: "ID sujet"
         topic_title: "Sujet"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 7003482704..6b0a735b28 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -28,7 +28,6 @@ gl:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMMM"
       long_with_year: "D MMM, YYYY h:mm a"
@@ -528,9 +527,6 @@ gl:
         success: "Enviamos un correo electrónico a ese enderezo. Sigue as instrucións de confirmación."
       change_avatar:
         title: "Cambia a foto do perfil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseado en"
-        gravatar_title: "Cambia o avatar no sitio web de Gravatar"
-        refresh_gravatar_title: "Actualiza o teu Gravatar"
         letter_based: "Imaxe do perfil asignada polo sistema"
         uploaded_avatar: "Imaxe personalizada"
         uploaded_avatar_empty: "Engadir unha imaxe personalizada"
@@ -714,6 +710,8 @@ gl:
         back: "Volver"
         again: "Tentar de novo"
         fixed: "Cargar páxina"
+    modal:
+      close: "pechar"
     close: "Pechar"
     assets_changed_confirm: "Este sitio acaba de actualizarse. Queres recargar a páxina para ter a última versión?"
     logout: "Fuches desconectado."
@@ -1349,6 +1347,7 @@ gl:
           side_by_side_markdown:
             title: "Amosar a fonte crúa coas diferenzas comparadas"
       bookmarks:
+        created: "Creado"
         name: "Nome"
     category:
       can: "podes&hellip; "
@@ -2114,7 +2113,6 @@ gl:
           active: "Activo"
           staff: "Equipo"
           suspended: "Suspendido"
-          suspect: "Sospeitoso"
         approved: "Aprobado?"
         titles:
           active: "Usuarios activos"
@@ -2129,7 +2127,6 @@ gl:
           admins: "Usuarios administradores"
           moderators: "Moderadores"
           suspended: "Usuarios suspendidos"
-          suspect: "Usuarios sospeitosos"
         not_verified: "Sen verificar"
         check_email:
           title: "Amosar o enderezo de correo-e deste usuario"
@@ -2396,6 +2393,7 @@ gl:
         help: "Engade novo emoji que estará dispoñíbel para todos. (Suxestión: arrastra e solta múltiples ficheiros dunha vez)"
         add: "Engadir novo Emoji"
         name: "Nome"
+        group: "Grupo"
         image: "Imaxe"
         delete_confirm: "Confirmas a eliminación do emoji :%{name}:?"
       embedding:
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index d8390f7145..c68dd6d67c 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -31,7 +31,7 @@ he:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D בMMM, ‏HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D בMMM"
       full_no_year_no_time: "Do בMMMM"
       long_with_year: "D בMMM ‏YYYY ‏HH:mm"
@@ -309,22 +309,34 @@ he:
       help:
         bookmark: "יש ללחוץ כדי ליצור סימנייה לפוסט הראשון בנושא זה"
         unbookmark: "יש ללחוץ כדי להסיר את כל הסימניות בנושא זה"
+        unbookmark_with_reminder: "יש ללחוץ כדי להסיר את כל הסימניות והתזכורות בנושא הזה. יש לך תזכורת שמוגדרת ל־%{reminder_at} עבור הנושא הזה."
     bookmarks:
       created: "פוסט זה נוסף לסימניות"
       not_bookmarked: "סמנו פוסט זה עם סימנייה"
-      created_with_reminder: "סימנת את הפוסט הזה עם תזכורת ב־%{date}"
+      created_with_reminder: "סימנת את הפוסט הזה עם תזכורת %{date}"
+      created_with_at_desktop_reminder: "סימנת את הפוסט הזה ותישלח לך תזכורת בעת השימוש הבא בשולחן העבודה שלך"
       remove: "הסרה מהסימניות"
       confirm_clear: "לנקות את כל הסימניות מנושא זה?"
       save: "שמירה"
       no_timezone: 'עדיין לא הגדרת אזור זמן. לא תהיה לך אפשרות להגדיר תזכורות. ניתן להגדיר אותו <a href="%{basePath}/my/preferences/profile">בפרופיל שלך</a>.'
+      invalid_custom_datetime: "התאריך והשעה שסיפקת שגויים, נא לנסות שוב."
+      list_permission_denied: "אין לך הרשאה לצפות בסימניות של המשתמש הזה."
       reminders:
         at_desktop: "בשימוש הבא דרך שולחן העבודה"
-        later_today: "המשך היום"
-        next_business_day: "ביום העסקים הבא"
+        later_today: "בהמשך היום"
+        next_business_day: "יום העסקים הבא"
         tomorrow: "מחר"
         next_week: "בשבוע הבא"
-        next_month: "בחודש הבא"
+        later_this_week: "בהמשך השבוע"
+        start_of_next_business_week: "יום שני הבא"
+        next_month: "חודש הבא"
         custom: "תאריך ושעה מותאמים אישית"
+        last_custom: "האחרון"
+        none: "לא נדרשת תזכורת"
+        today_with_time: "היום ב־%{time}"
+        tomorrow_with_time: "מחר ב־%{time}"
+        at_time: "ב־%{date_time}"
+        existing_reminder: "הגדרת תזכורת שתישלח עבור הסימנייה הזאת"
     drafts:
       resume: "המשך"
       remove: "הסרה"
@@ -584,6 +596,7 @@ he:
       days_visited_long: "ימים לביקור"
       posts_read: "נקראו"
       posts_read_long: "פוסטים שנקראו"
+      last_updated: "עדכון אחרון:"
       total_rows:
         one: "משתמש/ת %{count}"
         two: "%{count} משתמשים"
@@ -611,6 +624,7 @@ he:
         deny: "דחייה"
         denied: "נדחה"
         undone: "הבקשה נמשכה"
+        handle: "טיפול בבקשות חברות"
       manage:
         title: "ניהול"
         name: "שם"
@@ -846,6 +860,7 @@ he:
         clear:
           title: "ניקוי"
           warning: "למחוק את הנושאים המומלצים שלך?"
+      use_current_timezone: "להשתמש באזור הזמן הנוכחי"
       profile_hidden: "הפרופיל הציבורי של משתמש זה מוסתר"
       expand_profile: "הרחב"
       collapse_profile: "הקטן"
@@ -946,6 +961,7 @@ he:
         deleted_posts: "פוסטים שנמחקו"
         suspensions: "השעיות"
         warnings_received: "אזהרות"
+        rejected_posts: "פוסטים שנדחו"
       messages:
         all: "הכל"
         inbox: "דואר נכנס"
@@ -972,6 +988,7 @@ he:
         success: "(דואר אלקטרוני נשלח)"
         in_progress: "(שולח דואר אלקטרוני)"
         error: "(שגיאה)"
+        emoji: "אמוג׳י של מנעול"
         action: "שלח דואר אלקטרוני לשחזור סיסמה"
         set_password: "הזן סיסמה"
         choose_new: "בחרו סיסמה חדשה"
@@ -1021,6 +1038,7 @@ he:
           title: "מאמתים מבוססי אסימונים"
           add: "מאמת חדש"
           default_name: "המאמת שלי"
+          name_and_code_required_error: "עליך לספק שם וקוד מיישומון האימות שלך."
         security_key:
           register: "הרשמה"
           title: "מפתחות אבטחה"
@@ -1031,6 +1049,7 @@ he:
           edit: "עריכת מפתח אבטחה"
           edit_description: "שם מפתח אבטחה"
           delete: "מחיקה"
+          name_required_error: "עליך לציין שם למפתח האבטחה שלך."
       change_about:
         title: "שינוי בנוגע אליי"
         error: "ארעה שגיאה בשינוי ערך זה."
@@ -1047,10 +1066,10 @@ he:
         success_staff: "שלחנו דואר אלקטרוני לכתובת הדואר הזו. אנא עיקבו אחרי הוראות האישור."
       change_avatar:
         title: "שינוי תמונת הפרופיל"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, מבוסס על"
-        gravatar_title: "החלפת הדמות שלך ב־Gravatar"
-        gravatar_failed: "לא נמצא אווטר עם כתובת הדאו\"ל הזו."
-        refresh_gravatar_title: "רענון דמות ה־Gravatar שלך"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, מבוסס על"
+        gravatar_title: "החלפת הדמות שלך באתר {{gravatarName}}"
+        gravatar_failed: "לא הצלחנו למצוא {{gravatarName}} עם כתובת הדוא״ל הזו."
+        refresh_gravatar_title: "רענון ה־{{gravatarName}} שלך"
         letter_based: "תמונת פרופיל משובצת מהמערכת"
         uploaded_avatar: "תמונה אישית"
         uploaded_avatar_empty: "הוסיפו תמונה אישית"
@@ -1115,6 +1134,9 @@ he:
         any: "כלשהו"
       password_confirmation:
         title: "סיסמה שוב"
+      invite_code:
+        title: "קוד הזמנה"
+        instructions: "רישום חשבון דורש קוד הזמנה"
       auth_tokens:
         title: "מכשירים שהיו בשימוש לאחרונה"
         ip: "IP"
@@ -1353,6 +1375,9 @@ he:
         back: "חזרה"
         again: "ניסיון נוסף"
         fixed: "טעינת עמוד"
+    modal:
+      close: "סגירה"
+      dismiss_error: "התעלמות מהשגיאה"
     close: "סגור"
     assets_changed_confirm: "האתר עבר עדכון. תרצו לרענן לגרסה המתקדמת ביותר?"
     logout: "יצאת מהמערכת."
@@ -1361,6 +1386,12 @@ he:
       enabled: "אתר זה נמצא במצב קריאה בלבד. אנא המשיכו לשוטט, אך תגובות, לייקים, ופעולות נוספות כרגע אינם מאופשרים."
       login_disabled: "הכניסה מנוטרלת בזמן שהאתר במצב קריאה בלבד."
       logout_disabled: "היציאה מנוטרלת בזמן שהאתר במצב של קריאה בלבד."
+    too_few_topics_and_posts_notice_MF: >-
+      הבה <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">נתחיל להתדיין!</a> כרגע יש {currentTopics, plural, one {נושא <strong>אחד</strong>} other {<strong>#</strong> נושאים}} ו{currentPosts, plural, one {פוסט <strong>אחד</strong>} other {־<strong>#</strong> פוסטים}}. המבקרים זקוקים ליותר מכך כדי לקרוא ולהיות מעורבים – אנו ממליצים על {requiredTopics, plural, one {נושא<strong>אחד</strong>} other {<strong>#</strong> נושאים}} ו{requiredPosts, plural, one {פוסט <strong>אחד</strong>} other {־<strong>#</strong> פוסטים}} לפחות. רק חברי הסגל יכולים לראות את ההודעה הזאת.
+    too_few_topics_notice_MF: >-
+      הבה <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">נתחיל להתדיין!</a> כרגע יש {currentTopics, plural, one {נושא <strong>אחד</strong>} other {<strong>#</strong> נושאים}}. המבקרים זקוקים ליותר מכך כדי לקרוא ולהיות מעורבים – אנו ממליצים על {requiredTopics, plural, one {נושא<strong>אחד</strong>} other {<strong>#</strong> נושאים}} לפחות. רק חברי הסגל יכולים לראות את ההודעה הזאת.
+    too_few_posts_notice_MF: >-
+      הבה <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">נתחיל להתדיין!</a> כרגע יש {currentPosts, plural, one {פוסט <strong>אחד</strong>} other {<strong>#</strong> פוסטים}}. המבקרים זקוקים ליותר מכך כדי לקרוא ולהיות מעורבים – אנו ממליצים על {requiredPosts, plural, one {פוסט <strong>אחד</strong>} other {<strong>#</strong> פוסטים}} לפחות. רק חברי הסגל יכולים לראות את ההודעה הזאת.
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {שגיאה אחת בשעה הגיעה} other {# שגיאות בשעה הגיעו}}</a> למגבלת האתר שהיא {limit, plural, one {שגיאה אחת בשעה} other {# שגיאות בשעה}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {שגיאה אחת בדקה הגיעה} other {# שגיאות בדקה הגיעו}}</a> למגבלת האתר שהיא {limit, plural, one {שגיאה אחת בדקה} other {# שגיאות בדקה}}."
@@ -1443,6 +1474,7 @@ he:
     email_login:
       link_label: "נא לשלוח לי קישור לכניסה בדוא״ל"
       button_label: "עם דוא״ל"
+      emoji: "אמוג׳י של מנעול"
       complete_username: "אם קיים חשבון שמתאים לשם המשתמש <b>%{username}</b>, בקרוב אמורה להגיע אליך הודעה בדוא״ל עם קישור כניסה למערכת."
       complete_email: "אם קיים חשבון שמתאים ל־<b>%{email}</b>, בקרוב אמורה להגיע אליך הודעה בדוא״ל עם קישור כניסה למערכת."
       complete_username_found: "נמצא חשבון תואם לשם המשתמש <b>%{username}</b>, בקרוב תגיע אליך הודעה בדוא״ל עם קישור לכניסה."
@@ -1520,6 +1552,7 @@ he:
         backup_code: "להשתמש בקוד גיבוי במקום"
     invites:
       accept_title: "הזמנה"
+      emoji: "אמוג׳י של מעטפה"
       welcome_to: "ברוך בואך אל %{site_name}!"
       invited_by: "הוזמנתם על ידי:"
       social_login_available: "מעתה יתאפשר לך להיכנס עם כל כניסה מרשת חברתית בעזרת כתובת הדוא״ל הזאת."
@@ -1588,7 +1621,6 @@ he:
       objects: עצמים
       symbols: סמלים
       flags: דגלים
-      custom: אמוג׳ים מותאמים
       recent: בשימוש לאחרונה
       default_tone: ללא גוון עור
       light_tone: גוון עור בהיר
@@ -1596,6 +1628,7 @@ he:
       medium_tone: גוון עור בינוני
       medium_dark_tone: גוון עור כהה בינוני
       dark_tone: גוון עור כהה
+      default: אמוג׳ים מותאמים
     shared_drafts:
       title: "טיוטות משותפות"
       notice: "הנושא הזה ניתן לצפייה עבור מי שיכולים לצפות בקטגורית <b>{{category}}</b>."
@@ -1743,6 +1776,11 @@ he:
           two: "{{count}} הודעות שלא נקראו"
           many: "{{count}} הודעות שלא נקראו"
           other: "{{count}} הודעות שלא קראו"
+        high_priority:
+          one: "הודעה אחת (%{count}) בדחיפות גבוהה שלא נקראה"
+          two: "%{count} הודעות בדחיפות גבוהה שלא נקראו"
+          many: "%{count} הודעות בדחיפות גבוהה שלא נקראו"
+          other: "%{count} הודעות בדחיפות גבוהה שלא נקראו"
       title: "התראות אזכור @שם, תגובות לפוסטים ולנושאים שלך, הודעות, וכו׳"
       none: "לא ניתן לטעון כעת התראות."
       empty: "לא נמצאו התראות."
@@ -1751,6 +1789,7 @@ he:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1807,6 +1846,8 @@ he:
         posted: "פוסט חדש"
         moved_post: "פוסט הועבר"
         linked: "מקושר"
+        bookmark_reminder: "תזכורת סימון"
+        bookmark_reminder_with_name: "תזכורת סימון - %{name}"
         granted_badge: "הוענק עיטור"
         invited_to_topic: "הוזמן לנושא"
         group_mentioned: "קבוצה אוזכרה"
@@ -2053,6 +2094,7 @@ he:
       group_request_sent: "בקשת החברות שלך נשלחה לקבוצה הזו. ניידע אותך כשהיא תתקבל."
       unread_indicator: "אף אחד מהחברים לא קרא את הפוסט האחרון של הנושא הזה עדיין."
       read_more_MF: "יש { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 שלא נקרא</a> } other { <a href='{basePath}/unread'># שלא נקראו</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ו} false {} other{}} נושא חדש <a href='{basePath}/new'>אחד</a>} other { {BOTH, select, true{ו} false {} other{}} <a href='{basePath}/new'>#</a> נושאים חדשים} } נותרים, או {CATEGORY, select, true {עיין בנושאים אחרים ב־{catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: עיינו בכל הקטגוריות
       view_latest_topics: הצגת נושאים אחרונים
       suggest_create_topic: "למה לא ליצור נושא חדש?"
@@ -2063,6 +2105,7 @@ he:
         title: "שעון עצר לנושא"
         save: "קביעת שעון עצר"
         num_of_hours: "מספר שעות:"
+        num_of_days: "מספר הימים:"
         remove: "הסרת שעון עצר"
         publish_to: "פרסום ל:"
         when: "מתי:"
@@ -2105,6 +2148,8 @@ he:
         title: "נושא מוקפץ אוטומטית"
       reminder:
         title: "תזכורת"
+      auto_delete_replies:
+        title: "למחוק תגובות אוטומטית"
       status_update_notice:
         auto_open: "נושא זה ייפתח אוטומטית %{timeLeft}."
         auto_close: "נושא זו ייסגר אוטומטית %{timeLeft}."
@@ -2113,6 +2158,7 @@ he:
         auto_delete: "נושא זה יימחק אוטומטית %{timeLeft}."
         auto_bump: "נושא זה יוקפץ אוטומטית %{timeLeft}."
         auto_reminder: "תישלח אליך תזכורת בנוגע לנושא זה %{timeLeft}."
+        auto_delete_replies: "תגובות על נושא זה נמחקות אוטומטית לאחר %{duration}."
       auto_close_title: "הגדרות סגירה אוטומטית"
       auto_close_immediate:
         one: "הפוסט האחרון בנושא הוא כבר בן שעה, אז הנושא ייסגר מיידית."
@@ -2340,6 +2386,18 @@ he:
         title: "ניזוג פוסטים שנבחרו"
         action: "מיזוג פוסטים שנבחרו"
         error: "ארעה שגיאה במיזוג הפוסטים שנבחרו."
+      publish_page:
+        title: "פרסום עמוד"
+        publish: "פרסום"
+        description: "כאשר נושא מפורסם כעמוד, ניתן לשתף את הכתובת שלו והיא תוצג בסגנון עצמאי."
+        slug: "מזהה ייצוגי"
+        publish_url: "העמוד שלך פורסם ב־:"
+        topic_published: "הנושא שלך פורסם ב־:"
+        preview_url: "העמוד שלך יפורסם ב־:"
+        invalid_slug: "אין לך אפשרות לפרסם את העמוד הזה, עמך הסליחה."
+        unpublish: "משיכת הפרסום"
+        unpublished: "פרסום העמוד שלך נמשך ואין זמין עוד."
+        publishing_settings: "הגדרות פרסום"
       change_owner:
         title: "שנה בעלים"
         action: "שנה בעלות"
@@ -2350,6 +2408,11 @@ he:
           two: "אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>@{{old_user}}</b>."
           many: "אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>@{{old_user}}</b>."
           other: "אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>@{{old_user}}</b>."
+        instructions_without_old_user:
+          one: "נא לבחור בעלים חדש לפוסט"
+          two: "נא לבחור בעלים חדש ל־{{count}} הפוסטים"
+          many: "נא לבחור בעלים חדש ל־{{count}} הפוסטים"
+          other: "נא לבחור בעלים חדש ל־{{count}} הפוסטים"
       change_timestamp:
         title: "שינוי חותמת זמן..."
         action: "שינוי חותמת זמן"
@@ -2493,6 +2556,7 @@ he:
         convert_to_moderator: "הוספת צבע סגל"
         revert_to_regular: "הסרת צבע סגל"
         rebake: "בנייה מחודשת של HTML"
+        publish_page: "פרסום עמוד"
         unhide: "הסרת הסתרה"
         change_owner: "שינוי בעלות"
         grant_badge: "הענקת עיטור"
@@ -2601,13 +2665,18 @@ he:
             button: "HTML"
       bookmarks:
         create: "יצירת סימנייה"
+        edit: "עריכת סימנייה"
+        created: "נוצר"
         name: "שם"
-        name_placeholder: "יש לתת שם לסימנייה כדי לאמן את הזיכרון"
-        set_reminder: "הגדרת תזכורת"
+        name_placeholder: "עבור מה הסימנייה?"
+        set_reminder: "להזכיר לי"
         actions:
           delete_bookmark:
             name: "מחיקת סימנייה"
             description: "הסרת הסימנייה מהפרופיל שלך והפסקת התזכורות לסימנייה"
+          edit_bookmark:
+            name: "עריכת סימנייה"
+            description: "עריכת שם הסימנייה או החלפת מועד התזכורת"
     category:
       can: "יכול&hellip; "
       none: "(ללא קטגוריה)"
@@ -2999,6 +3068,18 @@ he:
         title: "חיבור"
         return: "%{shortcut} חזרה לכתיבת פוסט"
         fullscreen: "%{shortcut} כתיבת פוסט במסך מלא"
+      bookmarks:
+        title: "ניהול סימניות"
+        enter: "%{shortcut} שמירה וסגירה"
+        later_today: "%{shortcut} בהמשך היום"
+        later_this_week: "%{shortcut} בהמשך השבוע"
+        tomorrow: "%{shortcut} מחר"
+        next_week: "%{shortcut} שבוע הבא"
+        next_month: "%{shortcut} חודש הבא"
+        next_business_week: "%{shortcut} תחילת שבוע הבא"
+        next_business_day: "%{shortcut} יום העסקים הבא"
+        custom: "%{shortcut} בחירת שעה ותאריך"
+        none: "%{shortcut} ללא תזכורת"
       actions:
         title: "פעולות"
         bookmark_topic: "%{shortcut} סמנו/בטלו-סימנייה של נושא"
@@ -3021,6 +3102,10 @@ he:
         print: "%{shortcut} הדפסת נושא"
         defer: "%{shortcut} לדחות נושא לאחר כך"
         topic_admin_actions: "%{shortcut} פתיחת פעולות ניהול לנושא"
+      search_menu:
+        title: "תפריט חיפוש"
+        prev_next: "%{shortcut} העברת הבחירה למעלה ולמטה"
+        insert_url: "%{shortcut} הוספת הבחירה לחלון כתיבת ההודעה הפתוח"
     badges:
       earned_n_times:
         one: "עיטור זה הוענק פעם אחת (%{count})"
@@ -3456,6 +3541,9 @@ he:
         notification_event:
           name: "אירוע התראה"
           details: "כשמשתמש מקבל התראה בהזנה שלו."
+        user_badge_event:
+          name: "אירוע הענקת עיטור"
+          details: "כמשתמש מקבל עיטור."
         delivery_status:
           title: "מצב שליחה"
           inactive: "לא פעיל"
@@ -3609,6 +3697,7 @@ he:
           theme_name: "שם ערכת העיצוב"
           component_name: "שם רכיב"
           themes_intro: "נא לבחור בערכת עיצוב קיימת או להתקין חדשה כדי להתחיל"
+          themes_intro_emoji: "אמוג׳י של אומנית"
           beginners_guide_title: "המדריך למתחילים בערכות העיצוב של Discourse"
           developers_guide_title: "המדריך למפתחי ערכות עיצוב של Discourse"
           browse_themes: "עיון בערכות העיצוב של הקהילה"
@@ -3837,6 +3926,7 @@ he:
         format: "פורמט"
         html: "html"
         text: "טקסט"
+        html_preview: "תצוגה מקדימה של תוכן הדוא״ל"
         last_seen_user: "משתמש שנראה לאחרונה:"
         no_result: "לא נמצאו תוצאות לתמצית."
         reply_key: "מפתח תגובה"
@@ -3991,6 +4081,8 @@ he:
             api_key_update: "עודכן מפתח api"
             api_key_destroy: "הושמד מפתח api"
             override_upload_secure_status: "דריסת מצב העלאה בטוח"
+            page_published: "העמוד פורסם"
+            page_unpublished: "פרסום העמוד נמשך"
         screened_emails:
           title: "הודעות דואר מסוננות"
           description: "כשמישהו מנסה ליצור חשבון חדש, כתובות הדואר האלקטרוני הבאות ייבדקו וההרשמה תחסם או שיבוצו פעולות אחרות."
@@ -4096,7 +4188,6 @@ he:
           staff: "סגל"
           suspended: "מושעים"
           silenced: "מושתק"
-          suspect: "חשודים"
           staged: "מבוים"
         approved: "מאושר?"
         titles:
@@ -4113,7 +4204,6 @@ he:
           moderators: "מפקחים"
           silenced: "משתמשים מושתקים"
           suspended: "משתמשים מושעים"
-          suspect: "משתמשים חשודים"
           staged: "משתמשים מבוימים"
         not_verified: "לא מאומת"
         check_email:
@@ -4159,7 +4249,7 @@ he:
         moderator: "פיקוח?"
         admin: "מנהל ראשי?"
         suspended: "מושעה?"
-        staged: "מועמד?"
+        staged: "מבוים?"
         show_admin_profile: "מנהל ראשי"
         show_public_profile: "הצג פרופיל פומבי"
         impersonate: "התחזה"
@@ -4243,13 +4333,14 @@ he:
         deactivate_explanation: "חשבון משתמש מנוטרל נדרש לוודא דואר אלקטרוני מחדש."
         suspended_explanation: "משתמש מושעה לא יכול להיכנס."
         silence_explanation: "משתמש מושתק לא יכול לפרסם או לפתוח נושאים."
-        staged_explanation: "משתמש מועמד יכול לפרסם לנושאים מסוימים רק דרך דוא״ל."
+        staged_explanation: "משתמש מבוים יכול לפרסם לנושאים מסוימים רק דרך דוא״ל."
         bounce_score_explanation:
           none: "לא התקבלו החזרות לאחרונה מהדוא״ל הזה."
           some: "מספר החזרות התקבלו לאחרונה מהדוא״ל הזה."
           threshold_reached: "התקבלו יותר מדי החזרות מהדוא״ל הזה."
         trust_level_change_failed: "הייתה בעיה בשינוי דרגת האמון של המשתמש."
         suspend_modal_title: "השעה משתמש"
+        confirm_cancel_penalty: "להתעלם מהעונש?"
         trust_level_2_users: "משתמשים בדרגת אמון 2"
         trust_level_3_requirements: "דרישות דרגת אמון 3"
         trust_level_locked_tip: "רמות האמון נעולה, המערכת לא תקדם או או תנמיך משתמשים"
@@ -4467,6 +4558,7 @@ he:
             with_time: "<span class=\"username\">%{username}</span> ב <span class=\"time\">%{time}</span>"
         badge_intro:
           title: "נא לבחור בעיטור קיים או ליצור אחד חדש כדי להתחיל"
+          emoji: "אמוג׳י של סטודנטית"
           what_are_badges_title: "מה הם עיטורים?"
           badge_query_examples_title: "דוגמאות לתשאול עיטורים"
         mass_award:
@@ -4483,7 +4575,9 @@ he:
         help: "הוספת אמוג׳י חדשים שיהיו זמינים לכולם. (עצה למקצוענים: עדיף לגרור לכאן כמה קבצים בבת אחת)"
         add: "הוספת אמוג׳י חדש"
         name: "שם"
+        group: "קבוצה"
         image: "תמונה"
+        alt: "תצוגה מקדימה של אמוג׳י מותאם"
         delete_confirm: "להסיר את האמוג׳י :%{name}:?"
       embedding:
         get_started: "כדי להטמיע את Discourse באתר אחר, יש להתחיל בהוספת השרת שלו."
@@ -4503,13 +4597,14 @@ he:
         embed_post_limit: "מספר מקסימלי של פרסומים להטמעה."
         embed_title_scrubber: "ביטוי רגולרי שמשמש כדי לנקות את הכותרת של פוסטים"
         embed_truncate: "חיתוך הפרסומים המוטמעים."
+        embed_unlisted: "נושאים שיובאו לא יופיעו ברשימה עד שתתווסף אליהם תגובה."
         embed_whitelist_selector: "בוררי CSS לאלמנטים שיותר להטמיע."
         embed_blacklist_selector: "בוררי CSS לאלמנטים שיוסרו מן ההטמעות."
         embed_classname_whitelist: "שמות מחלקות CSS מאושרות"
         save: "שמירת הגדרות הטמעה"
       permalink:
         title: "קישורים קבועים"
-        description: "נא לשים לב שהגדרה זו חלה רק על מקורות חיצוניים, קישורים שפורסמו בפורום שלך לא יופנו."
+        description: "הפניות להחיל על כתובות שאינן מוכרות לפורום."
         url: "כתובת"
         topic_id: "מזהה נושא"
         topic_title: "נושא"
@@ -4518,6 +4613,7 @@ he:
         category_id: "מזהה לקטגוריה"
         category_title: "קטגוריה"
         external_url: "כתובת חיצונית"
+        destination: "יעד"
         delete_confirm: " להסיר את הקישור הקבוע?"
         form:
           label: "חדש:"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index d93084fe01..84a82870ae 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -28,7 +28,6 @@ hu:
     dates:
       time: "h:mm a"
       timeline_date: "YYYY MMMM"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMM DD"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -265,6 +264,12 @@ hu:
       remove: "Könyvjelző eltávolítása"
       confirm_clear: "Biztos, hogy törli az összes könyvjelzőjétt ebből a témából?"
       save: "Mentés"
+      reminders:
+        later_today: "A mai nap folyamán"
+        tomorrow: "Holnap"
+        next_week: "Jövő héten"
+        later_this_week: "A hét folyamán"
+        next_month: "Jövő hónapban"
     drafts:
       resume: "Folytatás"
       remove: "Eltávolítás"
@@ -900,9 +905,6 @@ hu:
         success_staff: "Küldtünk egy üzenetet az email címedre. Kérlek, kövesd az utasításokat fiókod érvényesítéséhez!"
       change_avatar:
         title: "Profilkép megváltoztatása"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, alapján"
-        gravatar_title: "Az avatar megváltoztatása a Gravatar weboldalon"
-        refresh_gravatar_title: "Gravatar frissítése"
         letter_based: "A rendszer által adott profilkép"
         uploaded_avatar: "Egyéni kép"
         uploaded_avatar_empty: "Egyéni kép hozzáadása"
@@ -1154,6 +1156,8 @@ hu:
         back: "Visszalépés"
         again: "Újrapróbál"
         fixed: "Oldal betöltése"
+    modal:
+      close: "bezárás"
     close: "Bezárás"
     assets_changed_confirm: "Az oldal frissítve lett. Frissíts a legújabb verzióért "
     logout: "Kijelentkeztél."
@@ -1325,7 +1329,6 @@ hu:
       filter_placeholder: Emodzsi keresése
       objects: Tárgyak
       flags: Jelölések
-      custom: Egyéni emodzsik
       recent: Nemrég használt
       default_tone: Nincs bőrszín
       light_tone: Világos bőrszín
@@ -1333,6 +1336,7 @@ hu:
       medium_tone: Közepes bőrszín
       medium_dark_tone: Közepesen sötét bőrszín
       dark_tone: Sötét bőrszín
+      default: Egyéni emodzsik
     shared_drafts:
       title: "Megosztott vázlatok"
       notice: "Ez a téma azoknak látható akik látják a <b>{{category}}</b>kategóriát"
@@ -1455,6 +1459,7 @@ hu:
       mentioned: "<span>{{username}}</span>{{description}}"
       group_mentioned: "<span>{{username}} </span>{{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1962,6 +1967,7 @@ hu:
             title: "A html rész mutatása az e-mailnak"
             button: "HTML"
       bookmarks:
+        created: "Létrehozott"
         name: "Név"
     category:
       none: "(nincs kategória)"
@@ -2930,7 +2936,6 @@ hu:
           staff: "Személyzet"
           suspended: "Felfüggesztett"
           silenced: "Némított"
-          suspect: "Meggyanúsítás"
           staged: "Lépcsőzetes"
         approved: "Jóváhagyott?"
         titles:
@@ -2947,7 +2952,6 @@ hu:
           moderators: "Moderátorok"
           silenced: "Némított felhasználók"
           suspended: "Felfüggesztett felhasználok"
-          suspect: "Megfigyelt felhasználok"
         not_verified: "Nincs megerősítve"
         check_email:
           title: "A felhasználó email címének megjelenítése"
@@ -3161,6 +3165,7 @@ hu:
         help: "Adjon hozzá egy új emodzsit, amely mindenki számára elérhető lesz. (PROTIP: fogjon és vigyen több fájlt egyszerre)"
         add: "Új emodzsi hozzáadása"
         name: "Név"
+        group: "Csoport"
         image: "Kép"
         delete_confirm: "Biztos, hogy törli a(z) :%{name}: emodzsit?"
       embedding:
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 072bd750b9..ea8fefb9ca 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -28,7 +28,6 @@ hy:
     dates:
       time: "h:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -262,6 +261,12 @@ hy:
       remove: "Հեռացնել էջանշանը"
       confirm_clear: "Դուք համոզվա՞ծ եք, որ ցանկանում եք հեռացնել այս թեմայի բոլոր էջանշանները:"
       save: "Պահպանել"
+      reminders:
+        later_today: "Այսօր, մի փոքր ուշ"
+        tomorrow: "Վաղը"
+        next_week: "Հաջորդ շաբաթ"
+        later_this_week: "Այս շաբաթ, մի փոքր ավելի ուշ"
+        next_month: "Հաջորդ ամիս"
     drafts:
       resume: "Վերսկսել"
       remove: "Ջնջել"
@@ -790,10 +795,6 @@ hy:
         success_staff: "Մենք ուղարկել ենք էլ. նամակ Ձեր ընթացիկ հասցեին: Խնդրում ենք հետևել հաստատման հրահանգներին:"
       change_avatar:
         title: "Փոխել Ձեր պրոֆիլի նկարը"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, հիմնված"
-        gravatar_title: "Փոխեք Ձեր անձնապատրկեը Gravatar-ի կայքում"
-        gravatar_failed: "Մենք չկարողացանք գտնել Gravatar այդ էլ. հասցեով:"
-        refresh_gravatar_title: "Թարմացնել Ձեր Gravatar-ը"
         letter_based: "Համակարգի կողմից դրված պրոֆիլի նկար"
         uploaded_avatar: "Անհատական նկար"
         uploaded_avatar_empty: "Ավելացնել անհատական նկար"
@@ -1061,6 +1062,8 @@ hy:
         back: "Վերադառնալ"
         again: "Կրկին Փորձել"
         fixed: "Բեռնել էջը"
+    modal:
+      close: "փակել"
     close: "Փակել"
     assets_changed_confirm: "Այս կայքը հենց նոր թարմացվել է: Թարմացնե՞լ էջը հիմա՝ ամենավերջին տարբերակն ստանալու համար:"
     logout: "Դուք դուրս եք գրվել:"
@@ -1263,7 +1266,6 @@ hy:
       objects: Օբյեկտներ
       symbols: Նշաններ
       flags: Դրոշներ
-      custom: Մասնավոր էմոջիներ
       recent: Վերջերս օգտագործված
       default_tone: Առանց շերտի գույնի
       light_tone: Շերտի բաց գույնով
@@ -1271,6 +1273,7 @@ hy:
       medium_tone: Շերտի միջին գույն
       medium_dark_tone: Շերտի միջինից մուգ գույն
       dark_tone: Շերտի մուգ գույն
+      default: Մասնավոր էմոջիներ
     shared_drafts:
       title: "Կիսված Սևագրեր"
       notice: "Այս թեման տեսանելի է միայն նրանց, ովքեր կարող են տեսնել <b>{{category}}</b> կատեգորիան:"
@@ -1411,6 +1414,7 @@ hy:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2119,6 +2123,7 @@ hy:
             title: "Ցուցադրել էլ. նամակի html մասը"
             button: "HTML"
       bookmarks:
+        created: "Ստեղծված"
         name: "Անուն"
     category:
       can: "կարող է&hellip; "
@@ -3405,7 +3410,6 @@ hy:
           staff: "Անձնակազմ"
           suspended: "Սառեցված"
           silenced: "Լռեցված"
-          suspect: "Կասկացել"
           staged: "Աստիճանավորված (Staged)"
         approved: "Հաստատվա՞ծ"
         titles:
@@ -3422,7 +3426,6 @@ hy:
           moderators: "Մոդերատորներ"
           silenced: "Լռեցված Օգտատերեր"
           suspended: "Սառեցված Օգտատերեր"
-          suspect: "Կասկածել Օգտատերերին(Suspect Users)"
           staged: "Աստիճանավորված Օգտատերեր"
         not_verified: "Չհաստատված"
         check_email:
@@ -3765,6 +3768,7 @@ hy:
         help: "Ավելացրեք նոր էմոջի, որը հասանելի կլինի բոլորին: (ՀՈՒՇՈՒՄ՝ քաշեք և գցեք բազմակի ֆայլեր միանգամից)"
         add: "Ավելացնել Նոր Էմոջի"
         name: "Անուն"
+        group: "Խումբ"
         image: "Նկար"
         delete_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել :%{name}: էմոջին:"
       embedding:
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 81216edbec..50d931693a 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -28,7 +28,6 @@ id:
       time: "h:mm a"
       time_short_day: "ddd, HH: mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "BBB D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -240,18 +239,12 @@ id:
     bookmarks:
       created: "Anda telah menandai post ini"
       not_bookmarked: "tandai pos ini"
-      created_with_reminder: "anda telah menandai pos ini dengan pengingat pada %{date}"
       remove: "Hilangkan penandaan"
       confirm_clear: "Yakin ingin menghapus semua penandaan Anda dari topik ini?"
       save: "Simpan"
       no_timezone: 'Anda belum menetapkan zona waktu. Anda tidak akan dapat mengatur pengingat. Tetapkan satu <a href="%{basePath}/my/preferences/profile">di profil Anda</a> .'
       reminders:
         at_desktop: "Lain kali saat saya di depan komputer"
-        later_today: "Nanti <br/> {{date}}"
-        next_business_day: "Hari kerja berikutnya <br/> {{date}}"
-        tomorrow: "Besok <br/> {{date}}"
-        next_week: "Minggu depan <br/> {{date}}"
-        next_month: "Bulan depan <br/> {{date}}"
         custom: "Tanggal dan waktu tersuai"
     drafts:
       resume: "Lanjut"
@@ -836,9 +829,6 @@ id:
         success: "Kami telah mengirimkan surel kepada alamat itu. Silahkan mengikuti petunjuk konfirmasi didalamnya."
       change_avatar:
         title: "Ganti gambar profil anda"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, berdasarkan "
-        gravatar_title: "Ganti avatar anda di website Gravatar"
-        refresh_gravatar_title: "Segarkan Gravatas kamu"
         uploaded_avatar: "Gambar kustom"
         uploaded_avatar_empty: "Tambah gambar kustom"
         upload_title: "Unggah gambar anda"
@@ -1052,6 +1042,8 @@ id:
         back: "Kembali"
         again: "Coba Lagi"
         fixed: "Mengakses Halaman"
+    modal:
+      close: "tutup"
     close: "Tutup"
     logout: "Anda telah keluar."
     refresh: "Segarkan"
@@ -1419,6 +1411,7 @@ id:
         controls:
           first: "Revisi pertama"
       bookmarks:
+        created: "Dibuat"
         name: "Nama"
     category:
       edit: "Ubah"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index cc6521b9d7..4173610a3c 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -29,7 +29,7 @@ it:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, h:mm a"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY h:mm a"
@@ -124,7 +124,7 @@ it:
       email: "Invia questo collegamento per email"
     action_codes:
       public_topic: "ha reso questo argomento pubblico %{when}"
-      private_topic: "ha reso questo argomento privato %{when}"
+      private_topic: "ha reso questo argomento un messaggio personale %{when}"
       split_topic: "ha separato questo argomento %{when}"
       invited_user: "ha invitato %{who} %{when}"
       invited_group: "ha invitato %{who} %{when}"
@@ -153,11 +153,11 @@ it:
       banner:
         enabled: "lo ha reso un annuncio il %{when}. Apparirà in cima ad ogni pagina finché non verrà chiuso dall'utente. "
         disabled: "ha rimosso questo banner il %{when}. Non apparirà più in cima ad ogni pagina."
-      forwarded: "inoltrato l&#39;e-mail qui sopra"
+      forwarded: "inoltrato l'email qui sopra"
     topic_admin_menu: "azioni argomento"
     wizard_required: "Benvenuto al tuo nuovo Discourse! Inizia la <a href='%{url}' data-auto-route='true'>procedura guidata di configurazione</a> ✨"
     emails_are_disabled: "Tutte le email in uscita sono state disabilitate a livello globale da un amministratore. Non sarà inviato nessun tipo di notifica via email."
-    bootstrap_mode_enabled: "Per aiutarti ad avviare il tuo nuovo sito, adesso sei in modalità bootstrap. Tutti i nuovi utenti saranno automaticamente promossi al livello di esperienza 1 e riceveranno il riepilogo quotidiano degli aggiornamenti via email. Questa modalità sarà disattivata automaticamente quando avrai più di %{min_users}utenti iscritti."
+    bootstrap_mode_enabled: "Per aiutarti ad avviare il tuo nuovo sito, adesso sei in modalità bootstrap. A tutti i nuovi utenti verrà assegnato il livello di esperienza 1 e le email riepilogative giornaliere saranno abilitate. Questa modalità sarà disattivata automaticamente quando avrai più di %{min_users} utenti iscritti."
     bootstrap_mode_disabled: "La modalità bootstrap sarà disattivata entro 24 ore."
     themes:
       default_description: "Default"
@@ -261,22 +261,34 @@ it:
       help:
         bookmark: "Clicca per aggiungere un segnalibro al primo messaggio di questo argomento"
         unbookmark: "Clicca per rimuovere tutti i segnalibri a questo argomento"
+        unbookmark_with_reminder: "Fare clic per rimuovere tutti i segnalibri e i promemoria in questo argomento. Hai un promemoria impostato %{reminder_at} per questo argomento."
     bookmarks:
       created: "hai inserito questo messaggio nei segnalibri"
       not_bookmarked: "aggiungi ai segnalibri"
-      created_with_reminder: "hai aggiunto questo messaggio ai segnalibri con un promemoria il%{date}"
+      created_with_reminder: "hai aggiunto un segnalibro a questo post con un promemoria %{date}"
+      created_with_at_desktop_reminder: "hai aggiunto un segnalibro a questo post e ti verrà ricordato la prossima volta che sarai sul desktop"
       remove: "Rimuovi Segnalibro"
       confirm_clear: "Sei certo di voler rimuovere tutti i segnalibri da questo argomento?"
       save: "Salva"
       no_timezone: 'Non hai ancora impostato un fuso orario. Non sarai in grado di impostare promemoria. Creane uno <a href="%{basePath}/my/preferences/profile">nel tuo profilo</a> .'
+      invalid_custom_datetime: "La data e l'ora fornite non sono valide, riprova."
+      list_permission_denied: "Non sei autorizzato a visualizzare i segnalibri di questo utente."
       reminders:
         at_desktop: "La prossima volta che sarò al mio desktop"
-        later_today: "Più tardi, oggi <br/> {{date}}"
-        next_business_day: "Il prossimo giorno lavorativo <br/> {{date}}"
-        tomorrow: "Domani <br/> {{date}}"
-        next_week: "La prossima settimana <br/> {{date}}"
-        next_month: "Il prossimo mese <br/> {{date}}"
+        later_today: "Più tardi oggi"
+        next_business_day: "Il prossimo giorno lavorativo"
+        tomorrow: "Domani"
+        next_week: "La prossima settimana"
+        later_this_week: "Più tardi questa settimana"
+        start_of_next_business_week: "Il prossimo Lunedì"
+        next_month: "Il prossimo mese"
         custom: "Data e ora personalizzate"
+        last_custom: "Ultimo"
+        none: "Nessun promemoria necessario"
+        today_with_time: "oggi alle %{time}"
+        tomorrow_with_time: "domani alle %{time}"
+        at_time: "a %{date_time}"
+        existing_reminder: "È stato impostato un promemoria per questo segnalibro che verrà inviato"
     drafts:
       resume: "Riprendi"
       remove: "Rimuovi"
@@ -455,7 +467,7 @@ it:
         pending:
           title: "In attesa"
         approved:
-          title: "Approvato:"
+          title: "Approvato"
         rejected:
           title: "Rifiutate"
         ignored:
@@ -514,6 +526,7 @@ it:
       days_visited_long: "Giorni Frequenza"
       posts_read: "Letti"
       posts_read_long: "Messaggi Letti"
+      last_updated: "Ultimo aggiornamento:"
       total_rows:
         one: "%{count} utente"
         other: "%{count} utenti"
@@ -539,6 +552,7 @@ it:
         deny: "Nega"
         denied: "negato"
         undone: "richiesta annullata"
+        handle: "gestisci le richieste di iscrizione"
       manage:
         title: "Gestisci"
         name: "Nome"
@@ -623,11 +637,11 @@ it:
         remove_member: "Rimuovi Membro"
         remove_member_description: "Rimuovi <b>%{username}</b> da questo gruppo"
         make_owner: "Assegna Proprietà"
-        make_owner_description: "Fai di <b>%{username}</b> un proprietario di questo gruppo"
+        make_owner_description: "Rendi <b>%{username}</b> un proprietario di questo gruppo"
         remove_owner: "Rimuovi come Proprietario"
-        remove_owner_description: "Rimuovi <b>%{username}</b>come proprietario di questo gruppo "
+        remove_owner_description: "Rimuovi <b>%{username}</b> come proprietario di questo gruppo "
         owner: "Proprietario"
-        forbidden: "Non puoi ancora visualizzare i membri."
+        forbidden: "Non puoi visualizzare i membri."
       topics: "Argomenti"
       posts: "Messaggi"
       mentions: "Menzioni"
@@ -648,7 +662,7 @@ it:
           description: "Verrai avvertito per ogni nuovo invio in qualsiasi messaggio, e verrà mostrato il conteggio delle nuove risposte."
         watching_first_post:
           title: "Osservando Primo Messaggio"
-          description: "Verrai avvertito di tutti i nuovi messaggi in questo gruppo, ma non delle risposte ai messaggi."
+          description: "Riceverai una notifica per tutti i nuovi messaggi in questo gruppo, ma non per le risposte ai messaggi."
         tracking:
           title: "Seguendo"
           description: "Verrai avvertito se qualcuno menziona il tuo @nome o ti risponde, e verrà mostrato un conteggio delle nuove risposte."
@@ -766,6 +780,7 @@ it:
         clear:
           title: "Pulisci"
           warning: "Sei sicuro di voler cancellare l&#39;argomento in primo piano?"
+      use_current_timezone: "Usa Fuso Orario Corrente"
       profile_hidden: "Il profilo pubblico di questo utente è nascosto."
       expand_profile: "Espandi"
       collapse_profile: "Raggruppa"
@@ -786,14 +801,14 @@ it:
         enable: "Abilita Notifiche"
         each_browser_note: "Nota: devi modificare questa impostazione per ogni browser che utilizzi."
         consent_prompt: "Desideri ricevere notifiche in tempo reale quando qualcuno risponde a un tuo messaggio?"
-      dismiss: "Nascondi"
-      dismiss_notifications: "Nascondi tutti"
+      dismiss: "Ignora"
+      dismiss_notifications: "Ignora tutti"
       dismiss_notifications_tooltip: "Imposta tutte le notifiche non lette come lette "
       first_notification: "La tua prima notifica! Selezionala per iniziare."
       dynamic_favicon: "Mostra il contatore sull'icona del browser"
       theme_default_on_all_devices: "Rendi questo il tema di default su tutti i miei dispositivi."
-      text_size_default_on_all_devices: "Rendi questa dimensione del testo il default su tutti i miei dispositivi"
-      allow_private_messages: "Consenti agli altri utenti di inviarmi messaggi privati"
+      text_size_default_on_all_devices: "Rendi questa dimensione del testo di default su tutti i miei dispositivi"
+      allow_private_messages: "Consenti agli altri utenti di inviarmi messaggi personali"
       external_links_in_new_tab: "Apri tutti i link esterni in nuove schede"
       enable_quoting: "Abilita \"rispondi quotando\" per il testo evidenziato"
       enable_defer: "Abilita il rinvio per contrassegnare gli argomenti come non letti"
@@ -822,7 +837,7 @@ it:
         warning: "Modalità Mailing List attiva. Le impostazioni per la notifica via email verranno ignorate."
       tag_settings: "Etichette"
       watched_tags: "Osservate"
-      watched_tags_instructions: "Osserverai automaticamente tutti gli argomenti con questi tag. Verrai notificato di tutti i nuovi messaggi e argomenti, e accanto all'argomento apparirà anche un conteggio dei nuovi messaggi."
+      watched_tags_instructions: "Osserverai automaticamente tutti gli argomenti con questi tag. Verrai avvertito di tutti i nuovi messaggi e argomenti, e accanto all'argomento apparirà anche un conteggio dei nuovi messaggi."
       tracked_tags: "Seguite"
       tracked_tags_instructions: "Seguirai automaticamente tutti gli argomenti con queste etichette. Accanto all'argomento apparirà il conteggio dei nuovi messaggi."
       muted_tags: "Silenziati"
@@ -837,7 +852,7 @@ it:
       watched_first_post_tags_instructions: "Riceverai la notifica per il primo messaggio di ogni nuovo argomento con queste etichette."
       muted_categories: "Silenziate"
       muted_categories_instructions: "Non riceverai notifiche riguardanti i contenuti di queste categorie, e non appariranno nelle pagine delle Categorie o dei Recenti."
-      muted_categories_instructions_dont_hide: "Non riceverai alcuna notifica riguardante nuovi argomenti in queste categorie."
+      muted_categories_instructions_dont_hide: "Non riceverai alcuna notifica relativa a nuovi argomenti in queste categorie."
       no_category_access: "Come moderatore hai accesso limitato alla categoria, il salvataggio è disabilitato."
       delete_account: "Cancella il mio account"
       delete_account_confirm: "Sei sicuro di voler cancellare il tuo account in modo permanente? Questa azione non può essere annullata!"
@@ -866,6 +881,7 @@ it:
         deleted_posts: "messaggi cancellati"
         suspensions: "sospensioni"
         warnings_received: "avvisi"
+        rejected_posts: "messaggi rifiutati"
       messages:
         all: "Tutti"
         inbox: "In arrivo"
@@ -892,6 +908,7 @@ it:
         success: "(email inviata)"
         in_progress: "(invio email in corso)"
         error: "(errore)"
+        emoji: "blocca emoji"
         action: "Invia l'email per il ripristino della password"
         set_password: "Imposta Password"
         choose_new: "Scegli una nuova password"
@@ -918,9 +935,9 @@ it:
         confirm_password_description: "Per favore conferma la tua password per continuare"
         name: "Nome"
         label: "Codice"
-        rate_limit: "Per favore, attendi prima di provare un altro codice di autenticazione."
+        rate_limit: "Attendi prima di provare un altro codice di autenticazione."
         enable_description: |
-          Scansiona il QR code con una delle app supportate (<a href="https://www.google.com/search?q=authenticator+apps+for+android" target="_blank">Android</a> – <a href="https://www.google.com/search?q=authenticator+apps+for+ios" target="_blank">iOS</a> e inserisci il tuo codice di autenticazione
+          Scansiona il QR code con una delle app supportate (<a href="https://www.google.com/search?q=authenticator+apps+for+android" target="_blank">Android</a> – <a href="https://www.google.com/search?q=authenticator+apps+for+ios" target="_blank">iOS</a> e inserisci il tuo codice di autenticazione.
         disable_description: "Inserisci il codice di autenticazione dalla tua app"
         show_key_description: "Inserisci manualmente"
         short_description: |
@@ -941,6 +958,7 @@ it:
           title: "Authenticator basati su Token"
           add: "Nuovo Authenticator"
           default_name: "Il mio Authenticator"
+          name_and_code_required_error: "Devi fornire un nome e il codice dalla tua app di autenticazione."
         security_key:
           register: "Registrare"
           title: "Security Keys"
@@ -951,6 +969,7 @@ it:
           edit: "Modifica Security Key"
           edit_description: "Nome Security Key"
           delete: "Elimina"
+          name_required_error: "Devi fornire un nome per la Security Key"
       change_about:
         title: "Modifica i dati personali"
         error: "Si è verificato un errore durante la modifica del valore."
@@ -967,18 +986,18 @@ it:
         success_staff: "Abbiamo inviato una email al tuo indirizzo corrente. Segui le istruzioni di conferma."
       change_avatar:
         title: "Cambia l'immagine del tuo profilo"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basato su"
-        gravatar_title: "Cambia il tuo avatar sul sito Gravatar"
-        gravatar_failed: "Non è stato trovato alcun Gravatar abbinato a questa email."
-        refresh_gravatar_title: "Ricarica il tuo Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, basato su"
+        gravatar_title: "Cambia il tuo avatar sul sito {{gravatarName}}"
+        gravatar_failed: "Non è stato trovato alcun {{gravatarName}} abbinato a questa email. "
+        refresh_gravatar_title: "Ricarica il tuo {{gravatarName}}"
         letter_based: "Immagine del profilo assegnata dal sistema"
         uploaded_avatar: "Immagine personalizzata"
         uploaded_avatar_empty: "Aggiungi un'immagine personalizzata"
         upload_title: "Carica la tua foto"
         image_is_not_a_square: "Attenzione: abbiamo ritagliato l'immagine; la larghezza e l'altezza non erano uguali."
       change_profile_background:
-        title: "Testata Profilo "
-        instructions: "Le testate dei profili saranno centrate e avranno una larghezza predefinita di 1110 px."
+        title: "Intestazione Profilo "
+        instructions: "Le intestazioni dei profili saranno centrate e avranno una larghezza predefinita di 1110 px."
       change_card_background:
         title: "Sfondo Scheda Utente"
         instructions: "Le immagini di sfondo saranno centrate e per difetto avranno un'ampiezza di 590px."
@@ -990,7 +1009,7 @@ it:
         primary: "Email principale"
         secondary: "Email secondaria"
         no_secondary: "Nessuna email secondaria"
-        sso_override_instructions: "L'e-mail può essere aggiornato dal provider SSO."
+        sso_override_instructions: "L'email può essere aggiornata dal provider SSO."
         instructions: "Mai mostrato pubblicamente"
         ok: "Ti invieremo una email di conferma"
         invalid: "Inserisci un indirizzo email valido"
@@ -1033,6 +1052,9 @@ it:
         any: "qualunque"
       password_confirmation:
         title: "Ripeti la password"
+      invite_code:
+        title: "Codice Invito"
+        instructions: "La registrazione dell'account richiede un codice di invito"
       auth_tokens:
         title: "Dispositivi utilizzati di recente"
         ip: "IP"
@@ -1079,7 +1101,7 @@ it:
         always: "sempre"
         never: "mai"
       email_digests:
-        title: "Quando non visito il sito da un po', inviami un'email con il riepiloglo degli argomenti e delle risposte più popolari"
+        title: "Quando non visito il sito, inviami un'email riepilogativa degli argomenti e delle risposte di successo"
         every_30_minutes: "ogni 30 minuti"
         every_hour: "ogni ora"
         daily: "ogni giorno"
@@ -1087,12 +1109,12 @@ it:
         every_month: "ogni mese"
         every_six_months: "ogni sei mesi"
       email_level:
-        title: "Inviami una email quando qualcuno mi cita, risponde ai miei messaggi, menziona il mio @nomeutente, o mi invita in un argomento."
+        title: "Inviami una email quando qualcuno mi cita, risponde ad un mio messaggio, menziona il mio @nomeutente, o mi invita in un argomento."
         always: "sempre"
         only_when_away: "solo quando non collegato"
         never: "mai"
       email_messages_level: "Inviami una email quando qualcuno mi manda un messaggio"
-      include_tl0_in_digests: "Includi contenuti dei nuovi utenti nelle email di riepilogo"
+      include_tl0_in_digests: "Includi contenuti dei nuovi utenti nelle email riepilogative"
       email_in_reply_to: "Nelle email includi un estratto delle risposte al messaggio"
       other_settings: "Altro"
       categories_settings: "Categorie"
@@ -1253,6 +1275,9 @@ it:
         back: "Torna Indietro"
         again: "Riprova"
         fixed: "Carica Pagina"
+    modal:
+      close: "chiudi"
+      dismiss_error: "Ignora errore"
     close: "Chiudi"
     assets_changed_confirm: "Questo sito è stato aggiornato. Aggiornare ora alla nuova versione?"
     logout: "Sei stato disconnesso."
@@ -1261,6 +1286,12 @@ it:
       enabled: "Questo sito è in modalità di sola lettura. Puoi continuare a navigare nel sito, ma le risposte, i \"Mi piace\" e altre azioni sono per il momento disabilitate."
       login_disabled: "La connessione è disabilitata quando il sito è in modalità di sola lettura."
       logout_disabled: "La disconnessione è disabilitata quando il sito è in modalità di sola lettura."
+    too_few_topics_and_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Cominciamo la discussione!</a> {currentTopics, plural, one {C'è <strong>#</strong> argomento} other {Ci sono <strong>#</strong> argomenti}} e {currentPosts, plural, one {<strong>#</strong> messaggio} other {<strong>#</strong> messaggi}}.  I visitatori hanno bisogno di più per leggere e rispondere: – consigliamo almeno {requiredTopics, plural, one {<strong>#</strong> argomento} other {<strong>#</strong> argomenti}} and {requiredPosts, plural, one {<strong>#</strong> messaggio} other {<strong>#</strong> messaggi}}. Solo lo staff può vedere questo messaggio.
+    too_few_topics_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Cominciamo la discussione!</a> {currentTopics, plural, one {C'è <strong>#</strong> argomento} other {Ci sono<strong>#</strong> argomenti}}.  I visitatori hanno bisogno di più per leggere e rispondere: – consigliamo almeno {requiredTopics, plural, one {<strong>#</strong> argomento} other {<strong>#</strong> argomenti}}. Solo lo staff può vedere questo messaggio.
+    too_few_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Cominciamo la discussione!</a> {currentPosts, plural, one {C'è <strong>#</strong> messaggio} other {Ci sono <strong>#</strong> messaggi}}.  I visitatori hanno bisogno di più per leggere e rispondere: – consigliamo almeno {requiredPosts, plural, one {<strong>#</strong> messaggio} other {<strong>#</strong> messaggi}}. Solo lo staff può vedere questo messaggio.
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} altro {# errors/hour}}</a> il limite impostato di {limit, plural, one {# error/hour} altro {# errors/hour}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} altro {# errors/minute}}</a> raggiunto il limite impostato di {limit, plural, one {# error/minute} altro {# errors/minute}}."
@@ -1321,31 +1352,34 @@ it:
     trust_level: "Livello Esperienza"
     search_hint: "nome utente, email o indirizzo IP"
     create_account:
-      disclaimer: "Registrandoti accetti il <a href='{{privacy_link}}' target='blank'>regolamento sulla Privacy</a> e <a href='{{tos_link}}' target='blank'>i termini del servizio</a>."
+      disclaimer: "Registrandoti accetti il <a href='{{privacy_link}}' target='blank'>regolamento sulla Privacy</a> e <a href='{{tos_link}}' target='blank'>i termini di servizio</a>."
       title: "Crea Nuovo Account"
       failed: "Qualcosa non ha funzionato. Forse questa email è già registrata, prova a usare il link di recupero password"
     forgot_password:
       title: "Reimposta Password"
       action: "Ho dimenticato la password"
       invite: "Inserisci il nome utente o l'indirizzo email. Ti manderemo un'email per l'azzeramento della password."
-      reset: "Azzera Password"
+      reset: "Reimposta Password"
       complete_username: "Se un account corrisponde al nome utente <b>%{username}</b>, a breve dovresti ricevere un'email con le istruzioni per ripristinare la tua password."
       complete_email: "Se un account corrisponde a <b>%{email}</b>, a breve dovresti ricevere un'email contenente le istruzioni per ripristinare la password."
+      complete_username_found: "C'è un account che corrisponde al nome utente <b>%{username}</b>. A breve dovresti ricevere una email con le istruzioni per reimpostare la tua password. "
+      complete_email_found: "C'è un account che corrisponde a <b>%{email}</b>. A breve dovresti ricevere una email con le istruzioni per reimpostare la tua password. "
       complete_username_not_found: "Nessun account corrisponde al nome utente <b>%{username}</b>"
-      complete_email_not_found: "Nessun account corrisponde alla email <b>%{email}</b>"
+      complete_email_not_found: "Nessun account corrisponde a <b>%{email}</b>"
       help: "Le email non arrivano? Per prima cosa assicurati di controllare la cartella spam.<p>Non sei sicuro di quale indirizzo email hai usato? Inserisci un indirizzo email e ti faremo sapere se esiste.</p><p>Se non hai più accesso all'indirizzo email del tuo account, per favore contatta <a href='%{basePath}/about'>il nostro staff.</a></p>"
       button_ok: "OK"
       button_help: "Aiuto"
     email_login:
       link_label: "Inviami un link di accesso"
       button_label: "con email"
-      complete_username: "Se un account corrisponde al nome utente <b>%{username}</b> , a breve dovresti ricevere un'email con un link di accesso."
-      complete_email: "Se un account corrisponde a <b>%{email}</b>, a breve dovresti ricevere un'email con un link di accesso. "
+      emoji: "emoji lock"
+      complete_username: "Se un account corrisponde al nome utente <b>%{username}</b> , a breve dovresti ricevere un'email con un collegamento per l'accesso."
+      complete_email: "Se un account corrisponde a <b>%{email}</b>, a breve dovresti ricevere un'email con un collegamento per l'accesso."
       complete_username_found: "Abbiamo trovato un account che corrisponde al nome utente <b>%{username}</b>, a breve dovresti ricevere un'email con un collegamento per l'accesso."
-      complete_email_found: "Abbiamo trovato un account che corrisponde a <b>%{email}</b>. A breve dovresti ricevere una email con un link di login."
+      complete_email_found: "Abbiamo trovato un account che corrisponde a <b>%{email}</b>, a breve dovresti ricevere una email con un collegamento per l'accesso."
       complete_username_not_found: "Nessun account con nome utente <b>%{username}</b>"
       complete_email_not_found: "Nessun account con email <b>%{email}</b>"
-      confirm_title: "Procedi su %{site_name}."
+      confirm_title: "Procedi su %{site_name}"
       logging_in_as: "Accesso come %{email}"
       confirm_button: Completa l'accesso
     login:
@@ -1368,7 +1402,7 @@ it:
       caps_lock_warning: "Il Blocco Maiuscole è attivo"
       error: "Errore sconosciuto"
       cookies_error: "Sembra che il tuo browser abbia i cookie disabilitati. Potresti non riuscire a connetterti senza abilitarli."
-      rate_limit: "Per favore attendi prima di provare nuovamente la connessione."
+      rate_limit: "Attendi prima di provare nuovamente a connetterti."
       blank_username: "Per favore, inserisci la tua email o il tuo nome utente."
       blank_username_or_password: "Per favore inserisci la tua email o il tuo nome utente, e la password."
       reset_password: "Azzera Password"
@@ -1387,8 +1421,8 @@ it:
       change_email: "Cambia Indirizzo Email"
       provide_new_email: "Fornisci un nuovo indirizzo e invieremo nuovamente la tua email di conferma."
       submit_new_email: "Aggiorna Indirizzo Email"
-      sent_activation_email_again: "Ti abbiamo mandato un'altra email di attivazione su <b>{{currentEmail}}</b>. Potrebbero essere necessari alcuni minuti di attesa; assicurati di controllare anche la cartella dello spam."
-      sent_activation_email_again_generic: "Abbiamo inviato un'altra email di attivazione. Potrebbero passare alcuni minuti prima che arrivi; assicurati di controllare la tua cartella dello spam."
+      sent_activation_email_again: "Ti abbiamo mandato un'altra email di attivazione su <b>{{currentEmail}}</b>. Potrebbero essere necessari alcuni minuti di attesa; assicurati di controllare anche la cartella  spam."
+      sent_activation_email_again_generic: "Abbiamo inviato un'altra email di attivazione. Potrebbero passare alcuni minuti prima che arrivi; assicurati di controllare la tua cartella spam."
       to_continue: "Per favore Connettiti"
       preferences: "Devi essere connesso per cambiare le tue impostazioni."
       forgot: "Non ricordo i dettagli del mio account"
@@ -1416,6 +1450,7 @@ it:
         backup_code: "Utilizza un codice di backup"
     invites:
       accept_title: "Invito"
+      emoji: "emoji envelope"
       welcome_to: "Benvenuto su %{site_name}!"
       invited_by: "Sei stato invitato da:"
       social_login_available: "Sarai anche in grado di accedere con qualsiasi login social usando questa email."
@@ -1450,7 +1485,7 @@ it:
     conditional_loading_section:
       loading: In caricamento...
     category_row:
-      topic_count: "{{count}} Argomenti in questa categoria"
+      topic_count: "{{count}} argomenti in questa categoria"
     select_kit:
       default_header_text: Selezione...
       no_content: Nessun risultato trovato
@@ -1463,9 +1498,12 @@ it:
       min_content_not_reached:
         one: "Seleziona almeno {{count}} elemento."
         other: "Seleziona almeno {{count}} elementi."
+      invalid_selection_length: "La selezione deve contenere almeno {{count}} caratteri."
     date_time_picker:
       from: Da
       to: A
+      errors:
+        to_before_from: "La data di fine deve essere successiva alla data di inizio."
     emoji_picker:
       filter_placeholder: Ricerca per emoji
       smileys_&_emotion: Smileys ed Emotion
@@ -1476,8 +1514,7 @@ it:
       activities: Attività
       objects: Oggetti
       symbols: Simboli
-      flags: Segnalazioni
-      custom: Emoji personalizzate
+      flags: Bandiere
       recent: Usate recentemente
       default_tone: Nessun tono della pelle
       light_tone: Tono della pelle chiaro
@@ -1485,6 +1522,7 @@ it:
       medium_tone: Tono della pelle medio
       medium_dark_tone: Tono della pelle medio scuro
       dark_tone: Tono della pelle scuro
+      default: Emoji personalizzate
     shared_drafts:
       title: "Bozze condivise"
       notice: "L'argomento è visibile solo a chi può vedere la categoria <b>{{category}}</b>."
@@ -1507,7 +1545,7 @@ it:
       similar_topics: "Il tuo argomento è simile a..."
       drafts_offline: "bozze offline"
       edit_conflict: "modifica conflitto"
-      group_mentioned_limit: "<b>Attenzione!</b> Hai menzionato <a href='{{group_link}}'>{{group}}</a>, tuttavia questo gruppo ha più membri del limite per le menzioni configurato dagli amministratori di {{max}} utenti. Nessuna notifica verrà inviata. "
+      group_mentioned_limit: "<b>Attenzione!</b> Hai menzionato <a href='{{group_link}}'>{{group}}</a>, tuttavia questo gruppo ha più membri del limite per le menzioni di {{max}} utenti  configurato dagli amministratori . Nessuna notifica verrà inviata. "
       group_mentioned:
         one: "Menzionando {{group}}, verrà notificata <a href='{{group_link}}'>%{count} persona</a> – sei sicuro?"
         other: "Menzionando {{group}}, verranno notificate <a href='{{group_link}}'>{{count}} persone</a> – sei sicuro?"
@@ -1525,7 +1563,7 @@ it:
         try_like: "Hai provato ad usare il pulsante {{heart}} ?"
         category_missing: "Devi scegliere una categoria"
         tags_missing: "Devi scegliere almeno {{count}} etichette"
-        topic_template_not_modified: "Aggiungi dettagli e specificità al tuo Argomento modificando il modello di Argomento."
+        topic_template_not_modified: "Aggiungi dettagli e specificità al tuo argomento modificando il modello di argomento."
       save_edit: "Salva Modifiche"
       overwrite_edit: "Sovrascrivi modifica"
       reply_original: "Rispondi all'Argomento Originale"
@@ -1550,6 +1588,7 @@ it:
       view_new_post: "Visualizza il tuo nuovo messaggio."
       saving: "Salvataggio"
       saved: "Salvato!"
+      saved_draft: "Bozza del messaggio in corso. Tocca per riprendere."
       uploading: "In caricamento..."
       show_preview: "visualizza anteprima &raquo;"
       hide_preview: "&laquo; nascondi anteprima"
@@ -1564,7 +1603,7 @@ it:
       link_description: "inserisci qui la descrizione del collegamento"
       link_dialog_title: "Inserisci il collegamento"
       link_optional_text: "titolo opzionale"
-      link_url_placeholder: "Incolla un URL o digita per cercare Argomenti"
+      link_url_placeholder: "Incolla un URL o digita per cercare argomenti"
       quote_title: "Citazione"
       quote_text: "Citazione"
       code_title: "Testo preformattato"
@@ -1598,7 +1637,8 @@ it:
           desc: Rispondi a uno specifico messaggio
         reply_as_new_topic:
           label: Rispondi con un argomento correlato
-          desc: Crea un nuovo Argomento collegato a questo Argomento
+          desc: Crea un nuovo argomento collegato a questo argomento
+          confirm: "È stata salvata una nuova bozza di argomento, che verrà sovrascritta se si crea un argomento collegato."
         reply_as_private_message:
           label: Nuovo messaggio
           desc: Crea un nuovo messaggio personale
@@ -1624,6 +1664,9 @@ it:
         message:
           one: "%{count} messaggio non letto"
           other: "{{count}} messaggi non letti"
+        high_priority:
+          one: "%{count} notifica ad alta priorità non letta"
+          other: "%{count} notifiche ad alta priorità non lette"
       title: "notifiche di menzioni @nome, risposte ai tuoi messaggi e argomenti ecc."
       none: "Impossibile caricare le notifiche al momento."
       empty: "Nessuna notifica trovata."
@@ -1632,6 +1675,7 @@ it:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1642,7 +1686,7 @@ it:
         other: "<span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}"
       liked_consolidated_description:
         one: "ha messo \"mi piace\" ad {{count}} tuo messaggio"
-        other: "ha messo \"mi piace\" ad {{count}} dei tuoi messaggi"
+        other: "ha messo \"mi piace\" a {{count}} dei tuoi messaggi"
       liked_consolidated: "<span>{{username}}</span> {{description}}"
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
@@ -1682,6 +1726,8 @@ it:
         posted: "nuovo messaggio"
         moved_post: "messaggio spostato"
         linked: "linkato"
+        bookmark_reminder: "promemoria segnalibro"
+        bookmark_reminder_with_name: "promemoria segnalibro - %{name}"
         granted_badge: "distintivo assegnato"
         invited_to_topic: "invitato ad un Argomento"
         group_mentioned: "gruppo menzionato"
@@ -1735,7 +1781,7 @@ it:
       context:
         user: "Cerca messaggi di @{{username}}"
         category: "Cerca nella categoria #{{category}}"
-        tag: "Cerca l'etichetta # {{tag}}"
+        tag: "Cerca l'etichetta #{{tag}}"
         topic: "Cerca in questo argomento"
         private_messages: "Cerca messaggi"
       advanced:
@@ -1755,10 +1801,11 @@ it:
           title: cerca solo nel titolo
           likes: su cui ho messo "Mi Piace"
           posted: ho pubblicato in
+          created: ho creato
           watching: sto osservando
           tracking: sto seguendo
           private: nei miei messaggi privati
-          bookmarks: Aggiunti ai segnalibri
+          bookmarks: ho aggiunto ai segnalibri
           first: sono il primissimo post
           pinned: sono appuntati
           unpinned: non sono appuntati
@@ -1771,6 +1818,7 @@ it:
           label: In cui gli argomenti
           open: sono aperti
           closed: sono chiusi
+          public: sono pubblici
           archived: sono archiviati
           noreplies: hanno zero risposte
           single_user: contengono un singolo utente
@@ -1790,7 +1838,7 @@ it:
     topics:
       new_messages_marker: "ultima visita"
       bulk:
-        select_all: "Seleziona Tutti"
+        select_all: "Seleziona Tutto"
         clear_all: "Deseleziona Tutto"
         unlist_topics: "Rendi invisibili"
         relist_topics: "Ripubblica Argomenti"
@@ -1858,6 +1906,13 @@ it:
       defer:
         help: "Contrassegna come non letto"
         title: "Rinvia"
+      feature_on_profile:
+        help: "Aggiungi un collegamento a questo argomento sulla tua scheda utente e sul tuo profilo"
+        title: "Feature Sul Profilo"
+      remove_from_profile:
+        warning: "Il tuo profilo ha già un argomento in primo piano. Se continui, questo argomento sostituirà l'argomento esistente."
+        help: "Rimuovi il collegamento a questo argomento dal tuo profilo utente"
+        title: "Rimuovi Dal Profilo"
       list: "Argomenti"
       new: "nuovo argomento"
       unread: "non letto"
@@ -1898,8 +1953,10 @@ it:
       read_more: "Vuoi saperne di più? {{catLink}} o {{latestLink}}."
       group_request: "Per vedere questo Argomento devi richiedere l&#39;iscrizioneal gruppo `{{name}}`"
       group_join: "È necessario iscriversi al gruppo `{{name}}` per visualizzare questo Argomento"
+      group_request_sent: "La tua richiesta di iscrizione al gruppo è stata inviata. Sarai informato quando sarà accettato."
       unread_indicator: "Nessun utente ha ancora letto l&#39;ultimo post di questo Argomento."
       read_more_MF: "{ UNREAD, plural, =0 {} one { C'è <a href='{basePath}/unread'>1 argomento non letto</a> } other { Ci sono <a href='{basePath}/unread'># argomenti non letti</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {è } other{}} <a href='{basePath}/new'>1 nuovo</a> argomento} other { {BOTH, select, true{e } false {Ci sono } other{}} <a href='{basePath}/new'># nuovi</a> argomenti} } restanti, o {CATEGORY, select, true {visualizza altri argomenti in {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Scorri tutte le categorie
       view_latest_topics: visualizza gli argomenti più recenti
       suggest_create_topic: "Perché non crei un argomento?"
@@ -1910,6 +1967,7 @@ it:
         title: "Timer Argomento"
         save: "Imposta Timer"
         num_of_hours: "Numero di ore:"
+        num_of_days: "Numero di giorni:"
         remove: "Rimuovi Timer"
         publish_to: "Pubblica Su:"
         when: "Quando:"
@@ -1952,6 +2010,8 @@ it:
         title: "Riproponi automaticamente l’argomento"
       reminder:
         title: "Ricordamelo"
+      auto_delete_replies:
+        title: "Elimina Automaticamente Risposte"
       status_update_notice:
         auto_open: "Questo argomento verrà automaticamente aperto %{timeLeft}"
         auto_close: "Questo argomento si chiuderà automaticamente in %{timeLeft}."
@@ -1960,6 +2020,7 @@ it:
         auto_delete: "Questo argomento verrà automaticamente cancellato %{timeLeft}."
         auto_bump: "Questo argomento sarà riproposto automaticamente %{timeLeft}."
         auto_reminder: "Questo argomento ti verrà ricordato %{timeLeft}."
+        auto_delete_replies: "Le risposte in questo argomento vengono automaticamente cancellate dopo %{duration}."
       auto_close_title: "Impostazioni di auto-chiusura"
       auto_close_immediate:
         one: "L'ultimo messaggio nell'argomento ha già %{count} ora, per cui l'argomento verrà chiuso immediatamente."
@@ -2171,6 +2232,18 @@ it:
         title: "Unisci Messaggi Selezionati"
         action: "unisci messaggi selezionati"
         error: "Si è verificato un errore nell'unire i messaggi selezionati."
+      publish_page:
+        title: "Pubblicazione Pagine"
+        publish: "Pubblica"
+        description: "Quando un argomento viene pubblicato come pagina, l'URL può essere condiviso e verrà visualizzato con uno stile personalizzato."
+        slug: "Abbreviazione"
+        publish_url: "La tua pagina è stata pubblicata su:"
+        topic_published: "Il tuo argomento è stato pubblicato su:"
+        preview_url: "La tua pagina sarà pubblicata su:"
+        invalid_slug: "Spiacenti, non puoi pubblicare questa pagina."
+        unpublish: "Non pubblicato"
+        unpublished: "La tua pagina non è stata pubblicata e non è più accessibile."
+        publishing_settings: "Impostazioni di Pubblicazione"
       change_owner:
         title: "Cambia Proprietario"
         action: "cambia proprietà"
@@ -2178,7 +2251,10 @@ it:
         placeholder: "nome utente del nuovo proprietario"
         instructions:
           one: "Per favore, scegli un nuovo proprietario per il messaggio che apparteneva a <b>@{{old_user}}</b>"
-          other: "Per favore, scegli un nuovo proprietario per i {{count}} messaggio che appartenevano a <b>@{{old_user}}</b>"
+          other: "Per favore, scegli un nuovo proprietario per i {{count}} messaggi che appartenevano a <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Scegli un nuovo proprietario per il messaggio"
+          other: "Scegli un nuovo proprietario per i {{count}} messaggi"
       change_timestamp:
         title: "Cambia Marca Temporale..."
         action: "cambia marca temporale"
@@ -2304,6 +2380,7 @@ it:
         convert_to_moderator: "Aggiungi Colore Staff"
         revert_to_regular: "Rimuovi Colore Staff"
         rebake: "Ricrea HTML"
+        publish_page: "Pubblicazione Pagine"
         unhide: "Mostra nuovamente"
         change_owner: "Cambia Proprietà"
         grant_badge: "Assegna Distintivo"
@@ -2335,9 +2412,18 @@ it:
           notify_moderators: "hanno informato i moderatori"
           notify_user: "hanno inviato un messaggio"
           bookmark: "l'hanno aggiunto ai segnalibri"
+          like:
+            one: "ha messo \"Mi piace\""
+            other: "ha messo \"Mi piace\""
+          read:
+            one: "ha letto"
+            other: "ha letto"
           like_capped:
             one: "e a {{count}} persona è piaciuto"
             other: "e ad altre {{count}} persone è piaciuto"
+          read_capped:
+            one: "e {{count}} ha letto"
+            other: "e altri {{count}} hanno letto"
         by_you:
           off_topic: "L'hai segnalato come fuori tema"
           spam: "L'hai segnalato come spam"
@@ -2388,7 +2474,19 @@ it:
             title: "Mostra la parte html della email"
             button: "HTML"
       bookmarks:
+        create: "Crea un segnalibro"
+        edit: "Modifica Segnalibro"
+        created: "Creazione"
         name: "Nome"
+        name_placeholder: "A cosa serve questo segnalibro?"
+        set_reminder: "Ricordamelo"
+        actions:
+          delete_bookmark:
+            name: "Cancella segnalibro"
+            description: "Rimuove il segnalibro dal tuo profilo e interrompe tutti i promemoria per il segnalibro"
+          edit_bookmark:
+            name: "Modifica Segnalibro"
+            description: "Modifica il nome del segnalibro o modifica la data e l'ora del promemoria"
     category:
       can: "può&hellip;"
       none: "(nessuna categoria)"
@@ -2404,7 +2502,7 @@ it:
       tags_allowed_tags: "Limita queste Etichette a questa Categoria:"
       tags_allowed_tag_groups: "Limita questi gruppi di Etichette a questa Categoria:"
       tags_placeholder: "Elenco (opzionale) delle etichette permesse"
-      tags_tab_description: "Le etichette e i gruppi di etichette sopra specificati saranno disponibili solo in questa categoria, e nelle altre categorie che li specificano. Non saranno disponibili per l'uso in altre categorie."
+      tags_tab_description: "Le etichette e i gruppi di etichette sopra specificati saranno disponibili solo in questa categoria e nelle altre categorie che li specificano. Non saranno disponibili per l'uso in altre categorie."
       tag_groups_placeholder: "Elenco (opzionale) dei gruppi di etichette permessi"
       manage_tag_groups_link: "Gestisci qui i gruppi di Etichette."
       allow_global_tags_label: "Consenti anche ulteriori Etichette"
@@ -2441,7 +2539,7 @@ it:
       special_warning: "Attenzione: questa è una categoria predefinita e le impostazioni di sicurezza ne vietano la modifica. Se non vuoi usare questa categoria, cancellala invece di modificarla."
       uncategorized_security_warning: "Questa è una Categoria speciale. È utilizzata come area di parcheggio per gli Argomenti senza Categoria. Non può avere impostazioni di sicurezza."
       uncategorized_general_warning: 'Questa è una Categoria speciale. È usata come Categoria predefinita per i nuovi Argomenti senza una Categoria selezionata. Se vuoi prevenire questo comportamento e forzare la scelta di una Categoria, <a href="%{settingLink}">per favore disabilita l''impostazione qui</a>. Se vuoi cambiare il nome o la descrizione, vai a <a href="%{customizeLink}">Personalizza / Contenuto Testuale</a>.'
-      pending_permission_change_alert: "Non hai aggiunto %{group} a questa categoria; fai clic su questo pulsante per aggiungerli."
+      pending_permission_change_alert: "Non hai aggiunto %{group} a questa categoria; fai clic su questo pulsante per aggiungerlo."
       images: "Immagini"
       email_in: "Indirizzo email personalizzato:"
       email_in_allow_strangers: "Accetta email da utenti anonimi senza alcun account"
@@ -2461,7 +2559,7 @@ it:
       reviewable_by_group: "Oltre che dallo staff, i messaggi e le segnalazioni in questa categoria possono essere revisionati da:"
       review_group_name: "nome gruppo"
       require_topic_approval: "Richiedi l'approvazione di un moderatore per tutti i nuovi argomenti"
-      require_reply_approval: "Richiedi l'approvazione di un moderatore per tutti i nuovi argomenti"
+      require_reply_approval: "Richiedi l'approvazione di un moderatore per tutte le nuove risposte"
       this_year: "quest'anno"
       position: "Posizione nella pagina delle Categorie:"
       default_position: "Posizione di default"
@@ -2469,7 +2567,7 @@ it:
       position_disabled_click: 'attiva l''impostazione "posizione fissa delle categorie".'
       minimum_required_tags: "Numero minimo di etichette richieste per argomento:"
       parent: "Categoria Superiore"
-      num_auto_bump_daily: "Numero di argomenti da riproporre automaticamente ogni giorno:"
+      num_auto_bump_daily: "Numero di argomenti aperti da riproporre automaticamente ogni giorno:"
       navigate_to_first_post_after_read: "Vai al primo messaggio dopo che gli argomenti vengono letti"
       notifications:
         watching:
@@ -2542,13 +2640,13 @@ it:
       custom_message:
         at_least:
           one: "inserisci almeno %{count} carattere"
-          other: "inserisci almeno {{n}} caratteri"
+          other: "inserisci almeno {{count}} caratteri"
         more:
           one: "%{count} mancante..."
           other: "{{count}} mancanti..."
         left:
           one: "%{count} mancante"
-          other: "{{count}} mancanti..."
+          other: "{{count}} rimanenti..."
     flagging_topic:
       title: "Grazie per aiutarci a mantenere la nostra comunità civile!"
       action: "Segnala Argomento"
@@ -2560,7 +2658,7 @@ it:
       links_shown: "mostra altri collegamenti..."
       clicks:
         one: "%{count} click"
-        other: "%{count} click"
+        other: "%{count} clic"
     post_links:
       about: "espandi altri collegamenti per questo messaggio"
       title:
@@ -2589,8 +2687,8 @@ it:
       unlisted:
         help: "Questo argomento è invisibile; non verrà mostrato nella liste di argomenti ed è possibile accedervi solo tramite collegamento diretto"
       personal_message:
-        title: "Questo Argomento è un Messaggio Personale"
-        help: "Questo Argomento è un Messaggio Personale"
+        title: "Questo argomento è un messaggio personale"
+        help: "Questo argomento è un messaggio personale"
     posts: "Messaggi"
     posts_long: "ci sono {{number}} messaggi in questo argomento"
     posts_likes_MF: |
@@ -2699,6 +2797,7 @@ it:
       download: "scarica"
       previous: "Precedente (tasto freccia a sinistra)"
       next: "Successivo (tasto freccia a destra)"
+      counter: "%curr% di %total%"
       close: "Chiudi (Esc)"
       content_load_error: 'Caricamento <a href="%url%">del contenuto</a> non riuscito.'
       image_load_error: 'Caricamento <a href="%url%">dell''immagine</a> non riuscito.'
@@ -2745,6 +2844,18 @@ it:
         title: "Scrittura"
         return: "%{shortcut} Ritorna al composer"
         fullscreen: "%{shortcut} Composer a tutto schermo"
+      bookmarks:
+        title: "Aggiungendo segnalibro"
+        enter: "%{shortcut} Salva e chiudi"
+        later_today: "%{shortcut}Più tardi oggi"
+        later_this_week: "%{shortcut} Più tardi questa settimana"
+        tomorrow: "%{shortcut} Domani"
+        next_week: "%{shortcut}La prossima settimana "
+        next_month: "%{shortcut} Il prossimo mese"
+        next_business_week: "%{shortcut} Inizio della prossima settimana"
+        next_business_day: "%{shortcut} Il prossimo giorno lavorativo"
+        custom: "%{shortcut} Data e ora personalizzate"
+        none: "%{shortcut} Nessun promemoria"
       actions:
         title: "Azioni"
         bookmark_topic: "%{shortcut} Aggiungi/togli argomento nei segnalibri"
@@ -2765,6 +2876,12 @@ it:
         mark_tracking: "%{shortcut} Segui argomento"
         mark_watching: "%{shortcut} Osserva argomento"
         print: "%{shortcut} Stampa argomento"
+        defer: "%{shortcut} Rinvia argomento"
+        topic_admin_actions: "%{shortcut} Apri le azioni amministrative sull'argomento"
+      search_menu:
+        title: "Menu Cerca"
+        prev_next: "%{shortcut} Sposta la selezione su e giù"
+        insert_url: "%{shortcut} Inserisci la selezione nel compositore aperto"
     badges:
       earned_n_times:
         one: "Guadagnato questo distintivo %{count} volta"
@@ -2806,14 +2923,23 @@ it:
       tags: "Etichette"
       choose_for_topic: "etichette facoltative"
       info: "Info"
+      default_info: "Questa etichetta non è limitata a nessuna categoria e non ha sinonimi."
+      category_restricted: "Questa etichetta è limitata a categorie a cui non sei autorizzato ad accedere."
       synonyms: "Sinonimi"
+      synonyms_description: "Quando vengono utilizzate le seguenti etichette, verranno sostituite con <b>%{base_tag_name}</b>."
+      tag_groups_info:
+        one: 'Questa etichetta appartiene al gruppo "{{tag_groups}}".'
+        other: "Questa etichetta appartiene a questi gruppi: {{tag_groups}}."
       category_restrictions:
         one: "Può essere utilizzato solo in questa categoria:"
         other: "Può essere utilizzato solo in queste categorie:"
       edit_synonyms: "Gestisci sinonimi"
       add_synonyms_label: "Aggiungi sinonimi:"
       add_synonyms: "Aggiungi"
-      add_synonyms_failed: "Le seguenti etichette non possono essere aggiunte come sinonimi: <b>%{tag_names}</b> . Assicurati che non abbiano sinonimi e non siano sinonimi di un'altra etichetta."
+      add_synonyms_explanation:
+        one: "Qualsiasi posto che attualmente utilizza questa etichetta verrà modificato per utilizzare invece <b>%{tag_name}</b>. Sei sicuro di voler apportare questa modifica?"
+        other: "Qualsiasi posto che attualmente utilizza queste etichette verrà modificato per utilizzare invece <b>%{tag_name}</b>. Sei sicuro di voler apportare questa modifica?"
+      add_synonyms_failed: "Le seguenti etichette non possono essere aggiunte come sinonimi: <b>%{tag_names}</b>. Assicurati che non abbiano sinonimi e non siano sinonimi di un'altra etichetta."
       remove_synonym: "Rimuovi sinonimo"
       delete_synonym_confirm: 'Sei sicuro di voler eliminare il sinonimo &quot;%{tag_name}&quot;?'
       delete_tag: "Cancella Etichetta"
@@ -2823,7 +2949,7 @@ it:
       delete_confirm_no_topics: "Sei sicuro di voler eliminare questa etichetta?"
       delete_confirm_synonyms:
         one: "Anche il suo sinonimo verrà eliminato."
-        other: "I sinonimi {{count}} verranno a loro volta eliminati."
+        other: "I {{count}} sinonimi verranno a loro volta eliminati."
       rename_tag: "Rinomina Etichetta"
       rename_instructions: "Scegli un altro nome per l'etichetta:"
       sort_by: "Ordina per:"
@@ -2832,17 +2958,17 @@ it:
       manage_groups: "Gestisci Gruppi Etichette"
       manage_groups_description: "Definisci gruppi per organizzare le etichette"
       upload: "Carica Etichette"
-      upload_description: "Carica un file csv per creare Etichette in modo massivo"
+      upload_description: "Carica un file csv per creare Etichette in massa"
       upload_instructions: "Uno per riga, indicando opzionalmente un Gruppo di Etichette con il formato 'nome_etichetta,gruppo_etichetta'"
       upload_successful: "Etichette caricate con successo"
       delete_unused_confirmation:
         one: "%{count} Etichetta sarà eliminata: %{tags}"
-        other: "%{count} Etichette saranno eliminate: %{tags}"
+        other: "%{count} etichette saranno eliminate: %{tags}"
       delete_unused_confirmation_more_tags:
         one: "%{tags} e %{count} altra"
         other: "%{tags} e %{count} altre"
-      delete_unused: "Elimina Etichette non utilizzate"
-      delete_unused_description: "Elimina tutte le Etichette che non sono usate in alcun Argomento o Messaggio Personale"
+      delete_unused: "Elimina Etichette Inutilizzate"
+      delete_unused_description: "Elimina tutte le etichette che non sono usate in alcun argomento o messaggio personale"
       cancel_delete_unused: "Annulla"
       filters:
         without_category: "%{filter} %{tag} argomenti"
@@ -2901,7 +3027,7 @@ it:
           top: "Non ci sono ulteriori argomenti popolari."
           bookmarks: "Non ci sono ulteriori argomenti nei segnalibri."
     invite:
-      custom_message: "Rendi il tuo l'invito un po' più personale scrivendo un <a href>messaggio personalizzato</a>."
+      custom_message: "Rendi il tuo invito un po' più personale scrivendo un <a href>messaggio personalizzato</a>."
       custom_message_placeholder: "Inserisci il tuo messaggio personalizzato"
       custom_message_template_forum: "Ehi, unisciti a questo forum!"
       custom_message_template_topic: "Ehi, credo che questo argomento ti possa interessare!"
@@ -2919,7 +3045,7 @@ it:
           only_muted: "quando usato da solo o con altre etichette silenziate"
           never: "mai"
       reports:
-        title: "Lista dei rapporti disponibili"
+        title: "Elenco dei rapporti disponibili"
       dashboard:
         title: "Cruscotto"
         last_updated: "Cruscotto aggiornato:"
@@ -2971,7 +3097,7 @@ it:
         disabled: Disabilitato
         timeout_error: "Spiacenti, la ricerca sta impiegando troppo tempo, per favore scegli un intervallo più breve"
         exception_error: "Spiacenti, si è verificato un errore nell'esecuzione della query"
-        too_many_requests: Hai eseguito questa operazione troppe volte. Attendi qualche istante prima di riprovare.
+        too_many_requests: Hai eseguito questa operazione troppe volte. Attendi prima di riprovare.
         not_found_error: "Spiacenti, questo rapporto non esiste"
         filter_reports: Filtra rapporti
         reports:
@@ -2997,7 +3123,7 @@ it:
           no_data: "Non ci sono dati da mostrare."
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">Cerca nei log</a>'
-            disabled: 'Il rapporto sulle ricerche di tendenza è disabilitato. Attiva l''opzione<a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a>per iniziare a raccogliere i dati.'
+            disabled: 'Il rapporto sulle ricerche di tendenza è disabilitato. Attiva l''opzione <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a> per iniziare a raccogliere i dati.'
           filters:
             file-extension:
               label: Estensione file
@@ -3081,12 +3207,27 @@ it:
         created: Creazione
         updated: Aggiornato
         last_used: Ultimo uso
+        never_used: (mai)
         generate: "Genera"
+        undo_revoke: "Annullare Revoca"
         revoke: "Revoca"
         all_users: "Tutti gli Utenti"
+        active_keys: "Chiavi API Attive"
+        manage_keys: Gestisci Chiavi
         show_details: Dettagli
         description: Descrizione
+        no_description: (nessuna descrizione)
+        all_api_keys: Tutte le Chiavi API
+        user_mode: Livello Esperienza
+        impersonate_all_users: Impersona qualsiasi utente
+        single_user: "Utente Singolo"
+        user_placeholder: Inserisci nome utente
+        description_placeholder: "A cosa servirà questa chiave?"
         save: Salva
+        new_key: Nuova Chiave API
+        revoked: Revocata
+        delete: Cancellata Permanentemente
+        not_shown_again: Questa chiave non verrà più visualizzata. Assicurati di prenderne una copia prima di continuare.
         continue: Continua
       web_hooks:
         title: "Webhook"
@@ -3142,13 +3283,19 @@ it:
           details: "Quando un'Etichetta viene creata, aggiornata o distrutta."
         flag_event:
           name: "Evento di Segnalazione"
-          details: "Quando una Segnalazione viene creata, approvata, disapprovata o ignorata."
+          details: "Quando una segnalazione viene creata, approvata, rifiutata o ignorata."
         queued_post_event:
           name: "Evento approvazione messaggio"
           details: "Quando un nuovo messaggio accodato viene creato, approvato o respinto."
         reviewable_event:
           name: "Evento revisionabile"
           details: "Quando un nuovo elemento è pronto per la revisione e quando il suo stato viene aggiornato."
+        notification_event:
+          name: "Evento Notifica"
+          details: "Quando un utente riceve una notifica nel proprio feed."
+        user_badge_event:
+          name: "Evento Assegnazione Distintivo"
+          details: "Quando un utente riceve un distintivo."
         delivery_status:
           title: "Stato di Consegna"
           inactive: "Non attivo"
@@ -3238,7 +3385,7 @@ it:
             title: "Rimuovi il backup"
             confirm: "Sicuro di voler distruggere questo backup?"
           restore:
-            is_disabled: "Il ripristino è disabilitato nelle opzioni del sito."
+            is_disabled: "Il ripristino è disabilitato nelle impostazioni del sito."
             label: "Ripristina"
             title: "Ripristina il backup"
             confirm: "Sei sicuro di voler ripristinare questo backup?"
@@ -3298,6 +3445,7 @@ it:
           theme_name: "Nome del Tema"
           component_name: "Nome del Componente"
           themes_intro: "Seleziona un tema esistente o installane uno nuovo per iniziare"
+          themes_intro_emoji: "emoji woman artist"
           beginners_guide_title: "Guida per principianti all'uso dei Temi di Discourse"
           developers_guide_title: "Guida per sviluppatori ai Temi di Discourse"
           browse_themes: "Sfoglia i temi della comunità"
@@ -3327,14 +3475,16 @@ it:
           color_scheme_select: "Seleziona i colori da usare nel tema"
           custom_sections: "Sezioni personalizzate:"
           theme_components: "Componenti Tema"
+          add_all_themes: "Aggiungi tutti i temi"
           convert: "Converti"
-          convert_component_alert: "Non hai ancora salvato le tue modifiche. Sei sicuro di volerle abbandonare e passare ad altro?"
+          convert_component_alert: "Sei sicuro di voler convertire questo Componente in Tema? Verrà rimosso come Componente da %{relatives}."
           convert_component_tooltip: "Converti questo Componente in Tema"
           convert_theme_alert: "Sei sicuro di voler convertire questo Tema in Componente? Sarà rimosso come Tema Padre da %{relatives}."
           convert_theme_tooltip: "Converti questo Tema in Componente"
           inactive_themes: "Temi non attivi:"
           inactive_components: "Componenti inutilizzati:"
           broken_theme_tooltip: "Questo tema presenta errori nel codice CSS, HTML o YAML"
+          disabled_component_tooltip: "Questo Componente è stato disabilitato"
           default_theme_tooltip: "Questo è il tema di default del sito"
           updates_available_tooltip: "Sono disponibili aggiornamenti per questo tema"
           and_x_more: "ed altri {{count}}."
@@ -3352,14 +3502,19 @@ it:
           upload: "Carica"
           select_component: "Seleziona un componente..."
           unsaved_changes_alert: "Non hai ancora salvato le tue modifiche. Sei sicuro di volerle abbandonare e passare ad altro?"
+          unsaved_parent_themes: "Non hai assegnato il Componente ai Temi, vuoi andare avanti?"
           discard: "Annulla"
           stay: "Resta"
           css_html: "CSS/HTML personalizzato"
           edit_css_html: "Modifica CSS/HTML"
           edit_css_html_help: "Non hai modificato nessun CSS o HTML"
           delete_upload_confirm: "Elimina questo caricamento? (Il CSS del tema potrebbe non funzionare!)"
+          component_on_themes: "Includi Componente in questi Temi"
+          included_components: "Includi Componenti"
+          add_all: "Aggiungi tutti"
           import_web_tip: "Repository contenente il tema"
           import_web_advanced: "Avanzate..."
+          import_file_tip: "File .tar.gz, .zip, o .dcstyle.json contenente il tema"
           is_private: "Il tema è in un repository git privato"
           remote_branch: "Nome del branch (opzionale)"
           public_key: "Concedi l'accesso al repository alla seguente chiave pubblica:"
@@ -3376,10 +3531,12 @@ it:
           source_url: "Fonte"
           enable: "Abilita"
           disable: "Disabilita"
+          disabled: "Questo componente è stato disabilitato."
+          disabled_by: "Questo componente è stato disabilitato da"
           required_version:
             error: "Questo tema è stato disattivato automaticamente perché non compatibile con questa versione di Discourse."
-            minimum: "Richiede Discourse versione {{version}} o superiore."
-            maximum: "Richiede Discourse versione {{version}} or inferiore."
+            minimum: "Richiede versione {{version}} o superiore di Discourse."
+            maximum: "Richiede versione {{version}} o inferiore di Discourse."
           component_of: "Componente di:"
           update_to_latest: "Aggiorna all'ultima versione"
           check_for_updates: "Controllo Aggiornamenti"
@@ -3392,9 +3549,10 @@ it:
           empty: "Nessun elemento"
           commits_behind:
             one: "Il tema è indietro di %{count} aggiornamento!"
-            other: "Il tema è indietro di {{count}} aggiornamenti!"
+            other: "Il tema è indietro di {{count}} commit!"
           compare_commits: "(Vedi i nuovi commit)"
           repo_unreachable: "Impossibile accedere al Git repository di questo tema. Messaggio di errore:"
+          imported_from_archive: "Questo tema è stato importato da un file .zip"
           scss:
             text: "CSS"
             title: "Inserire il CSS personalizzato, accettiamo tutti gli stili validi di CSS e SCSSpersonalizzato"
@@ -3464,8 +3622,19 @@ it:
           love:
             name: "amo"
             description: "Il colore del bottone \"Mi piace\"."
+        robots:
+          title: "Sostituisci il file robots.txt del tuo sito:"
+          warning: "Questo sostituirà in modo permanente tutte le impostazioni del sito correlate."
+          overridden: Il file robots.txt predefinito del tuo sito è sovrascritto.
         email_style:
+          title: "Stile Email"
+          heading: "Personalizza Stile Email"
+          html: "Modello HTML"
           css: "CSS"
+          reset: "Ripristina le impostazioni di default"
+          reset_confirm: "Sei sicuro di voler ripristinare il %{fieldName} predefinito e perdere tutte le modifiche?"
+          save_error_with_reason: "Le tue modifiche non sono state salvate. %{error}"
+          instructions: "Personalizza il modello in cui vengono visualizzate tutte le email html e personalizza con CSS."
       email:
         title: "Email"
         settings: "Impostazioni"
@@ -3495,7 +3664,7 @@ it:
         send_test: "Invia una email di prova"
         sent_test: "inviata!"
         delivery_method: "Metodo di consegna"
-        preview_digest_desc: "Vedi in anteprima il contenuto delle email di riepilogo inviate agli utenti inattivi."
+        preview_digest_desc: "Vedi in anteprima il contenuto delle email riepilogative inviate agli utenti inattivi."
         refresh: "Aggiorna"
         send_digest_label: "Invia questo risultato a:"
         send_digest: "Invia"
@@ -3503,6 +3672,7 @@ it:
         format: "Formato"
         html: "html"
         text: "testo"
+        html_preview: "Anteprima Contenuto Email"
         last_seen_user: "Ultimo Utente Visto:"
         no_result: "Nessun risultato trovato per il riepilogo. "
         reply_key: "Chiave di risposta"
@@ -3616,7 +3786,7 @@ it:
             deleted_unused_tags: "Etichette inutilizzate eliminate"
             renamed_tag: "etichetta rinominata"
             revoke_email: "revoca email"
-            lock_trust_level: "C"
+            lock_trust_level: "blocca livello di esperienza"
             unlock_trust_level: "sblocca livello di esperienza"
             activate_user: "attiva utente"
             deactivate_user: "disattiva utente"
@@ -3639,7 +3809,7 @@ it:
             merge_user: "unisci utente"
             entity_export: "esporta entità"
             change_name: "cambia nome"
-            topic_timestamps_changed: "Marche temprali dell'Argomento modificate"
+            topic_timestamps_changed: "marche temporali dell'Argomento modificate"
             approve_user: "utente approvato"
             web_hook_create: "crea webhook"
             web_hook_update: "aggiorna webhook"
@@ -3648,6 +3818,17 @@ it:
             embeddable_host_create: "crea host incorporabile"
             embeddable_host_update: "aggiorna host incorporabile"
             embeddable_host_destroy: "distruggi host incorporabile"
+            change_theme_setting: "cambia l'impostazione del tema"
+            disable_theme_component: "disabilita il componente del tema"
+            enable_theme_component: "abilita il componente del tema"
+            revoke_title: "revoca titolo"
+            change_title: "cambia titolo"
+            api_key_create: "crea chiave api"
+            api_key_update: "aggiorna chiave api"
+            api_key_destroy: "distruggi chiave api"
+            override_upload_secure_status: "sovrascrivere stato caricamento sicuro"
+            page_published: "pagina pubblicata"
+            page_unpublished: "pagina non pubblicata"
         screened_emails:
           title: "Email Scansionate"
           description: "Quando qualcuno cerca di creare un nuovo account, verrando controllati i seguenti indirizzi email e la registrazione viene bloccata, o eseguita qualche altra azione."
@@ -3687,7 +3868,7 @@ it:
             all_search_types: "Tutti i tipi di ricerca"
             header: "Intestazione"
             full_page: "Pagina completa"
-            click_through_only: "Tutti (solo click)"
+            click_through_only: "Tutti (solo frequenza clic)"
           header_search_results: "Risultati ricerca nell'Header"
         logster:
           title: "Log Errori"
@@ -3699,6 +3880,10 @@ it:
         one_word_per_line: "Una parola per riga"
         download: Scarica
         clear_all: Deseleziona Tutto
+        clear_all_confirm_block: "Sei sicuro di voler cancellare tutte le parole osservate per l'azione Blocca?"
+        clear_all_confirm_censor: "Sei sicuro di voler cancellare tutte le parole osservate per l'azione Censura?"
+        clear_all_confirm_flag: "Sei sicuro di voler cancellare tutte le parole osservate per l'azione Segnala?"
+        clear_all_confirm_require_approval: "Sei sicuro di voler cancellare tutte le parole osservate per l'azione Richiede Approvazione?"
         word_count:
           one: "%{count} word"
           other: "%{count} parole"
@@ -3719,9 +3904,13 @@ it:
           add: "Aggiungi"
           success: "Successo"
           exists: "Già esistente"
+          upload: "Aggiungi dal file"
           upload_successful: "Caricamento andato a buon fine. Le parole sono state aggiunte."
         test:
           button_label: "Test"
+          modal_title: "Testa Parole Osservate '%{action}'"
+          description: "Inserisci il testo qui sotto per verificare la corrispondenza con le parole osservate"
+          found_matches: "Trovate corrispondenze:"
           no_matches: "Nessun risultato trovato"
       impersonate:
         title: "Impersona"
@@ -3743,7 +3932,6 @@ it:
           staff: "Staff"
           suspended: "Sospesi"
           silenced: "Silenziato"
-          suspect: "Sospetti"
           staged: "Temporanei"
         approved: "Approvato?"
         titles:
@@ -3760,7 +3948,6 @@ it:
           moderators: "Moderatori"
           silenced: "Utenti Silenziati"
           suspended: "Utenti Sospesi"
-          suspect: "Utenti Sospetti"
           staged: "Utenti temporanei"
         not_verified: "Non verificato"
         check_email:
@@ -3798,7 +3985,7 @@ it:
         penalty_count: "Conteggio Penalità"
         clear_penalty_history:
           title: "Cancella la storia delle penalizzazioni"
-          description: "Utenti con penalizzazioni non possono accedere al Livello Esperienza 3"
+          description: "utenti con penalizzazioni non possono accedere al Livello Esperienza 3"
         delete_all_posts_confirm_MF: "Stai per cancellare {POSTS, plural, one {1 messaggio} other {# messaggi}} e {TOPICS, plural, one {1 argomento} other {# argomenti}}. Sei sicuro?"
         silence: "Silenzio"
         unsilence: "Non in silenzio"
@@ -3817,12 +4004,12 @@ it:
         revoke_admin: "Revoca privilegi di amministrazione"
         grant_admin: "Assegna privilegi di amministrazione"
         grant_admin_confirm: "Ti abbiamo inviato una email per verificare il nuovo amministratore. Per favore aprila e segui le istruzioni."
-        revoke_moderation: "Revoca privilegi di moderazione"
+        revoke_moderation: "Revoca diritti di moderazione"
         grant_moderation: "Assegna diritti di moderazione"
         unsuspend: "Riabilita"
         suspend: "Sospendi"
         show_flags_received: "Mostra le Segnalazioni ricevute"
-        flags_received_by: "Segnalazione ricevuta da %{username}"
+        flags_received_by: "Segnalazioni ricevutr da %{username}"
         flags_received_none: "Questo utente non ha ricevuto segnalazioni."
         reputation: Reputazione
         permissions: Permessi
@@ -3859,7 +4046,7 @@ it:
         cant_delete_all_too_many_posts:
           one: "Non posso cancellare tutti i post perché l'utente ha più di %{count} post. (delete_all_posts_max.)"
           other: "Impossibile cancellare tutti i messaggi perché l'utente ha più di %{count} messaggi. (delete_all_posts_max.)"
-        delete_confirm: "E' genericamente preferibile anonimizzare un utente inveche che eliminarlo, per evitare di rimuovere contenuti dalle discussioni esistenti.<br><br>Sei sicuro di voler eliminare questo utente? Questa modifica è permanente."
+        delete_confirm: "E' preferibile anonimizzare un utente invece che eliminarlo, per evitare di rimuovere contenuti dalle discussioni esistenti.<br><br> Sei sicuro di voler eliminare questo utente? Questa modifica è permanente!"
         delete_and_block: "Elimina e <b>blocca</b> questa email e indirizzo IP"
         delete_dont_block: "Elimina soltanto"
         deleting_user: "Cancellazione utente..."
@@ -3891,6 +4078,7 @@ it:
           threshold_reached: "Quella email ha ricevuto troppi errori di ritorno."
         trust_level_change_failed: "C'è stato un problema nel cambio di livello di esperienza di questo utente. "
         suspend_modal_title: "Sospendi Utente"
+        confirm_cancel_penalty: "Sei sicuro di voler scartare la penalità?"
         trust_level_2_users: "Utenti con Livello Esperienza 2"
         trust_level_3_requirements: "Requisiti per Livello Esperienza 3"
         trust_level_locked_tip: "il livello di esperienza è bloccato, il sistema non promuoverà né degraderà l'utente"
@@ -3917,6 +4105,8 @@ it:
           likes_received: "Mi piace - Ricevuti"
           likes_received_days: "\"Mi piace\" Ricevuti: singoli giorni"
           likes_received_users: "\"Mi piace\" Ricevuti: singoli utenti"
+          suspended: "Sospeso (ultimi 6 mesi)"
+          silenced: "Silenziato (ultimi 6 mesi)"
           qualifies: "Requisiti soddisfatti per il livello di esperienza 3."
           does_not_qualify: "Mancano i requisiti per il livello esperienza 3."
           will_be_promoted: "Verrà presto promosso."
@@ -4028,7 +4218,9 @@ it:
         secret_list:
           invalid_input: "I campi di input non possono essere vuoti o contenere il carattere barra verticale."
         default_categories:
+          modal_description: "Desideri applicare questa modifica storicamente? Questo cambierà le preferenze per %{count} utenti esistenti."
           modal_yes: "Sì"
+          modal_no: "No, applica le modifiche solo da adesso in avanti"
       badges:
         title: Distintivi
         new_badge: Nuovo Distintivo
@@ -4049,7 +4241,7 @@ it:
         delete: Cancella
         delete_confirm: "Sei sicuro di voler cancellare questo distintivo?"
         revoke: Revoca
-        reason: Motivazione
+        reason: Motivo
         expand: Espandi &hellip;
         revoke_confirm: "Sei sicuro di voler revocare questo distintivo?"
         edit_badges: Modifica Distintivi
@@ -4065,6 +4257,7 @@ it:
         enabled: Attiva distintivo
         icon: Icona
         image: Immagine
+        icon_help: "Inserisci il nome di un'icona Font Awesome (usa il prefisso 'far-' per le icone Regular e 'fab-' per le icone Brands)"
         image_help: "Inserisci l'URL dell'immagine (sovrascrive il campo icona, se entrambi sono impostati)"
         query: Query Distintivo (SQL)
         target_posts: Interroga i messaggi destinazione
@@ -4099,14 +4292,26 @@ it:
             with_time: "<span class=\"username\">%{username}</span> in data <span class=\"time\">%{time}</span>"
         badge_intro:
           title: "Seleziona un Distintivo esistente o creane uno nuovo per iniziare"
+          emoji: "emoji woman student"
           what_are_badges_title: "Cosa sono i Distintivi?"
           badge_query_examples_title: "Esempi di Query Distintivo"
+        mass_award:
+          title: Assegna in Massa
+          description: Assegna lo stesso distintivo a più utenti contemporaneamente.
+          no_badge_selected: Seleziona un distintivo per iniziare.
+          perform: "Assegna Distintivo agli Utenti"
+          upload_csv: Carica un CSV con indirizzi email o nomi utente degli utenti
+          aborted: Carica un CSV contenente indirizzi email o i nomi utente degli utenti
+          success: Il tuo CSV è stato ricevuto e gli utenti riceveranno il loro distintivo a breve.
+          replace_owners: Rimuovi il distintivo dai precedenti proprietari
       emoji:
         title: "Emoji"
         help: "Aggiungi nuovi emoji da mettere a disposizione per tutti. (Suggerimento: trascina e rilascia più file in una volta sola)"
         add: "Aggiungi Nuovo Emoji"
         name: "Nome"
+        group: "Gruppo"
         image: "Immagine"
+        alt: "anteprima emoji personalizzata"
         delete_confirm: "Sicuro di voler cancellare l'emoji :%{name}:?"
       embedding:
         get_started: "Se lo desideri, puoi incorporare Discourse in un altro sito web. Comincia aggiungendo il nome dell'host"
@@ -4126,13 +4331,14 @@ it:
         embed_post_limit: "Numero massimo di messaggi da includere"
         embed_title_scrubber: "Espressione regolare usata per ripulire i titoli dei messaggi"
         embed_truncate: "Tronca i messaggi incorporati"
+        embed_unlisted: "Gli argomenti importati non saranno visibili fino a quando non ci sarà una risposta."
         embed_whitelist_selector: "Selettore CSS per gli elementi da permettere negli embed"
         embed_blacklist_selector: "Selettore CSS per gli elementi da rimuovere dagli embed"
         embed_classname_whitelist: "Classi CSS permesse"
         save: "Salva Impostazioni Inclusione"
       permalink:
         title: "Collegamenti permanenti"
-        description: "Nota bene: ciò si applica solo alle fonti esterne, i collegamenti inviati sul tuo forum non saranno rediretti."
+        description: "Reindirizzamenti da applicare per URL non conosciuti dal forum."
         url: "URL"
         topic_id: "ID dell'argomento"
         topic_title: "Argomento"
@@ -4141,6 +4347,7 @@ it:
         category_id: "ID della categoria"
         category_title: "Categoria"
         external_url: "URL esterna"
+        destination: "Destinazione"
         delete_confirm: "Sei sicuro di voler cancellare questo collegamento permanente?"
         form:
           label: "Nuovo:"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index cda1e3e757..354e190ea3 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -27,7 +27,6 @@ ja:
     dates:
       time: "H:mm"
       timeline_date: "YYYY年M月"
-      long_no_year: "M月D日, H:mm"
       long_no_year_no_time: "M月D日"
       full_no_year_no_time: "M月D日"
       long_with_year: "YYYY年M月D日 H:mm"
@@ -240,6 +239,12 @@ ja:
       remove: "ブックマークを削除"
       confirm_clear: "このトピックのすべてのブックマークをクリアしますか?"
       save: "保存"
+      reminders:
+        later_today: "今日中"
+        tomorrow: "明日"
+        next_week: "来週"
+        later_this_week: "今週中"
+        next_month: "来月"
     drafts:
       resume: "続ける"
       remove: "削除"
@@ -816,9 +821,6 @@ ja:
         success_staff: "現在のメールアドレスにメールを送信しました。メールに従い手続きをおこなってください。"
       change_avatar:
         title: "プロフィール画像を変更"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>から取得、基準は"
-        gravatar_title: "Gravatarのアバターを変更"
-        refresh_gravatar_title: "Gravatarを更新する"
         letter_based: "システムプロフィール画像"
         uploaded_avatar: "カスタム画像"
         uploaded_avatar_empty: "カスタム画像を追加"
@@ -1066,6 +1068,8 @@ ja:
         back: "戻る"
         again: "やり直す"
         fixed: "ページロード"
+    modal:
+      close: "閉じる"
     close: "閉じる"
     assets_changed_confirm: "Discourseがアップデートされました。ページを更新して最新のバージョンにしますか？"
     logout: "ログアウトしました"
@@ -1244,7 +1248,6 @@ ja:
       objects: オブジェクト
       symbols: シンボル
       flags: 旗
-      custom: カスタム絵文字
       recent: 最近使ったもの
       default_tone: スキントーンなし
       light_tone: ライトスキントーン
@@ -1252,6 +1255,7 @@ ja:
       medium_tone: ミディアムスキントーン
       medium_dark_tone: ミディアムダークスキントーン
       dark_tone: ダークスキントーン
+      default: カスタム絵文字
     shared_drafts:
       confirm_publish: "この下書きを公開してもよろしいですか？"
       publishing: "トピック公開中..."
@@ -1359,6 +1363,7 @@ ja:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1962,6 +1967,7 @@ ja:
             title: "メールのHTML部分を表示"
             button: "HTML"
       bookmarks:
+        created: "作成者"
         name: "名前"
     category:
       can: "can&hellip; "
@@ -2845,7 +2851,6 @@ ja:
           active: "アクティブ"
           staff: "スタッフ"
           suspended: "凍結中"
-          suspect: "マーク中"
           staged: "段階"
         approved: "承認?"
         titles:
@@ -2861,7 +2866,6 @@ ja:
           admins: "管理者ユーザ"
           moderators: "モデレータ"
           suspended: "凍結中のユーザ"
-          suspect: "マーク中のユーザ"
         not_verified: "検証されていません"
         check_email:
           title: "メールアドレスを表示する"
@@ -3154,6 +3158,7 @@ ja:
         help: "各ユーザが利用できる絵文字を追加します。 (ちょっとしたコツ: ドラッグアンドドロップで複数のファイルを一度にアップロードできます)"
         add: "新しい絵文字を追加"
         name: "名前"
+        group: "グループ"
         image: "画像"
         delete_confirm: "Are you sure you want to delete the :%{name}: emoji?"
       embedding:
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index ad53763b2a..41bdcbe873 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -27,7 +27,6 @@ ko:
     dates:
       time: "a h:mm"
       timeline_date: "YYYY MMM"
-      long_no_year: "M D a, h:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "YYYY MMM D a h:mm"
@@ -239,6 +238,12 @@ ko:
       remove: "북마크 삭제"
       confirm_clear: "이 토픽의 모든 북마크를 지우시겠습니까?"
       save: "저장"
+      reminders:
+        later_today: "오늘 늦게"
+        tomorrow: "내일"
+        next_week: "다음 주"
+        later_this_week: "이번 주 후반"
+        next_month: "다음 달"
     drafts:
       resume: "이력서"
       remove: "삭제"
@@ -757,9 +762,6 @@ ko:
         success_staff: "현재 주소로 이메일을 보냈습니다. 확인 절차에 따라 진행해 주세요."
       change_avatar:
         title: "프로필 사진 변경"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a> 기반"
-        gravatar_title: "Gravata 웹사이트에서 아바타 바꾸기"
-        refresh_gravatar_title: "Gravatar 새로고침"
         letter_based: "자동 생성된 아바타"
         uploaded_avatar: "커스텀 사진"
         uploaded_avatar_empty: "커스텀 사진 추가"
@@ -995,6 +997,8 @@ ko:
         back: "뒤로가기"
         again: "다시시도"
         fixed: "페이지 열기"
+    modal:
+      close: "닫기"
     close: "닫기"
     assets_changed_confirm: "사이트가 업데이트 되었습니다. 새로고침하시겠습니까?"
     logout: "로그아웃 되었습니다."
@@ -1158,7 +1162,6 @@ ko:
       filter_placeholder: 이모지 찾기
       objects: 사물
       flags: 신고들
-      custom: 커스텀 emoji
       recent: 최근 사용
       default_tone: 피부색 없음
       light_tone: 밝은 피부색
@@ -1166,6 +1169,7 @@ ko:
       medium_tone: 중간 피부색
       medium_dark_tone: 약간 어두운 피부색
       dark_tone: 어두운 피부색
+      default: 커스텀 emoji
     composer:
       emoji: "이모지 :)"
       more_emoji: "더보기..."
@@ -1262,6 +1266,7 @@ ko:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}} "
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}} "
@@ -1874,6 +1879,7 @@ ko:
             title: "이메일 HTML 파트 보이기"
             button: "HTML"
       bookmarks:
+        created: "생성일자"
         name: "이름"
     category:
       can: "허용"
@@ -2961,7 +2967,6 @@ ko:
           active: "활성화 사용자"
           staff: "스태프"
           suspended: "접근 금지 사용자"
-          suspect: "의심스러운 사용자"
           staged: "격리됨"
         approved: "승인?"
         titles:
@@ -2977,7 +2982,6 @@ ko:
           admins: "관리자"
           moderators: "운영자"
           suspended: "접근 금지된 사용자들"
-          suspect: "의심스러운 사용자들"
         not_verified: "확인되지 않은"
         check_email:
           title: "사용자의 이메일 주소 표시"
@@ -3297,6 +3301,7 @@ ko:
         help: "모든 사람이 쓸 수 있는 이모지를 추가합니다. (팁: 여러개 파일을 한 번에 드래그 & 드롭할 수 있어요)"
         add: "새 이모지 추가"
         name: "이름"
+        group: "그룹"
         image: "이미지"
         delete_confirm: "정말로 :%{name}: 이모지를 삭제할까요?"
       embedding:
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 23861ae56e..6b5d731529 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -30,7 +30,6 @@ lt:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMMM D, H:mm"
       long_no_year_no_time: "MMMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "YYYY MMMM D H:mm"
@@ -287,6 +286,12 @@ lt:
       created: "jūs pažymėjot šį įrašą"
       remove: "Pašalinti Žymę"
       save: "Saugoti"
+      reminders:
+        later_today: "Šiandien vėliau"
+        tomorrow: "Rytoj"
+        next_week: "Kitą savaitę"
+        later_this_week: "Šia savaitę vėliau"
+        next_month: "Kitą mėnesį"
     drafts:
       resume: "Grįžti"
       remove: "Pašalinti"
@@ -755,9 +760,6 @@ lt:
         success: "Mes išsiunteme laišką nurodytu el. pašto adresu. Prašome sekti patvirtinimo instrukcijas."
       change_avatar:
         title: "Pakeisti profilio nuotrauką"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, paremtas"
-        gravatar_title: "Pakeisti paskyrą Gravatar'o puslapyje"
-        refresh_gravatar_title: "Atnaujinti Gravatar'ą"
         letter_based: "Sistema pridėjo profilio nuotrauką"
         uploaded_avatar: "Paveiksliukas"
         uploaded_avatar_empty: "Pridėti paveiksliuką"
@@ -974,6 +976,8 @@ lt:
         back: "Grįžti Atgal"
         again: "Bandyti dar kartą"
         fixed: "Užkrauti Puslapį"
+    modal:
+      close: "uždaryti"
     close: "Uždaryti"
     assets_changed_confirm: "Ši svetainė ka tik buvo atnaujinta. Perkrauti, kad matytumėte naujausią versiją?"
     logout: "Jūs buvote atjungtas nuo sistemos."
@@ -1246,6 +1250,7 @@ lt:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1872,6 +1877,7 @@ lt:
           html_part:
             button: "HTML"
       bookmarks:
+        created: "Sukurta"
         name: "Vardas"
     category:
       can: "galimas&hellip;"
@@ -2821,7 +2827,6 @@ lt:
           active: "Aktyvūs"
           staff: "Komanda"
           suspended: "Sustabdyti"
-          suspect: "Įtartini"
         approved: "Patvirtinta?"
         titles:
           active: "Aktyvūs vartotojai"
@@ -2837,7 +2842,6 @@ lt:
           moderators: "Moderatoriai"
           silenced: "Nutildyti nariai"
           suspended: "Sustabdyti vartotojai"
-          suspect: "Įtartini Vartotojai"
         not_verified: "Nepatvirtinta"
         check_email:
           title: "Atskleisk šio vartotojo el. pašto adresą"
@@ -3130,6 +3134,7 @@ lt:
         help: "Pridėti naują šypsenėlę, kurią galės matyti visi (patarimas: kelis failus kelk tuo pačiu metu)"
         add: "Pridėti Naują Šypsenėlę"
         name: "Vardas"
+        group: "Grupė"
         image: "Paveiksliukas"
         delete_confirm: "Ar tikrai nori ištrinti :%{name}: šypsenėlę?"
       embedding:
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 76235f9292..76d77a879a 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -29,7 +29,6 @@ lv:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, hh:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY hh:mm"
@@ -252,6 +251,12 @@ lv:
       created: "tu esi pievienojies šim ierakstam grāmatzīmi"
       remove: "Noņemt grāmatzīmi"
       save: "Saglabāt"
+      reminders:
+        later_today: "Vēlāk šodien"
+        tomorrow: "Rītdien"
+        next_week: "Nākamā nedēļā"
+        later_this_week: "Vēlāk šonedēļ"
+        next_month: "Nākamā mēnesī"
     drafts:
       resume: "Turpināt"
       remove: "Atcelt"
@@ -679,9 +684,6 @@ lv:
         success: "Mēs aizsūtījām e-pastu uz šo adresi. Lūdzu sekojiet apstiprināšanas instrukcijām vēstulē."
       change_avatar:
         title: "Nomainīt savu profila bildi"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, balstīts uz"
-        gravatar_title: "Nomainiet jūsu avatāra attēlu Gravatar lapā"
-        refresh_gravatar_title: "Atjaunot jūsu Gravatar attēlu"
         letter_based: "Sistēmas piešķirtais profila attēls"
         uploaded_avatar: "Savs attēls"
         uploaded_avatar_empty: "Pievienot savu attēlu"
@@ -917,6 +919,8 @@ lv:
         back: "Atgriezties"
         again: "Mēģināt vēlreiz"
         fixed: "Ielādēt lapu"
+    modal:
+      close: "aizvērt"
     close: "Aizvērt"
     assets_changed_confirm: "Šī vietne tikko bija atjaunota. Pārlādēt lapu, lai pārietu uz jaunāko versiju?"
     logout: "Jūs izgājāt."
@@ -1077,7 +1081,6 @@ lv:
       objects: Priekšmeti
       symbols: Simboli
       flags: Sūdzības
-      custom: Lietotāja emoji
       recent: Nesen izmantotie
       default_tone: Noklusējuma ādas krāsa
       light_tone: Gaiša ādas krāsa
@@ -1085,6 +1088,7 @@ lv:
       medium_tone: Vidēja ādas krāsa
       medium_dark_tone: Vidēji tumša ādas krāsa
       dark_tone: Tumša ādas krāsa
+      default: Lietotāja emoji
     composer:
       emoji: "Emoji :)"
       more_emoji: "vairāk..."
@@ -1763,6 +1767,7 @@ lv:
             title: "Parādīt e-pasta html daļu"
             button: "HTML"
       bookmarks:
+        created: "Radīts"
         name: "Vārds"
     category:
       can: "var&hellip;"
@@ -2713,7 +2718,6 @@ lv:
           active: "Aktīvi"
           staff: "Personāls"
           suspended: "Apturēts"
-          suspect: "Novērot"
         approved: "Apstiprināt?"
         titles:
           active: "Aktīvi lietotāji"
@@ -2728,7 +2732,6 @@ lv:
           admins: "Administratori"
           moderators: "Moderātori"
           suspended: "Atceltie lietotāji"
-          suspect: "Novēroti (suspect) lietotāji"
         not_verified: "Nav apstiprināts"
         check_email:
           title: "Atklāt šī lietotāja e-pasta adresi"
@@ -3024,6 +3027,7 @@ lv:
         help: "Pievienot jaunu smaidiņu, kas būs pieejams visiem."
         add: "Pievienot Jaunu Smaidiņu"
         name: "Nosaukums"
+        group: "Grupa"
         image: "Attēls"
         delete_confirm: "Vai tiešām vēlies dzēst šo :%{name}: smaidiņu?"
       embedding:
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 53162f8a7e..c0f94aba48 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -28,7 +28,6 @@ nb_NO:
     dates:
       time: "LT"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, LT"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D MMM YYYY LT"
@@ -95,6 +94,12 @@ nb_NO:
         x_days:
           one: "%{count} dag siden"
           other: "%{count} dager siden"
+        x_months:
+          one: "%{count} måned siden"
+          other: "%{count} måneder siden"
+        x_years:
+          one: "%{count} år siden"
+          other: "%{count} år siden"
       later:
         x_days:
           one: "%{count} dag senere"
@@ -146,12 +151,15 @@ nb_NO:
       banner:
         enabled: "gjorde dette til et banner %{when}. Det vil vises på toppen av hver side inntil brukeren lukker det."
         disabled: "fjernet dette banneret %{when}. Det vil ikke lenger vises på toppen av hver side."
+      forwarded: "videresendte e-posten voer"
+    topic_admin_menu: "handlinger for tråd"
     wizard_required: "Velkommen til ditt nye Discourse! Kom i gang med <a href='%{url}' data-auto-route='true'>oppstartsveiviseren</a> ✨"
     emails_are_disabled: "All utgående e-post har blitt deaktivert globalt av en administrator. Ingen e-postvarslinger vil bli sendt."
     bootstrap_mode_enabled: "For å gjøre lansering av siden enklere er den nå i oppstartsmodus. Alle nye brukere tildeles tillitsnivå 1 og får daglige oppsummeringer på e-post aktivert. Oppstartsmodus vil bli automatisk slått av når %{min_users} brukere har registrert seg."
     bootstrap_mode_disabled: "Oppstartsmodus vil bli deaktivert i løpet av 24 timer."
     themes:
       default_description: "Forvalg"
+      broken_theme_alert: "Du kan oppleve at siden din ikke fungerer fordi temaet eller komponenten %{theme} har feil. Deaktiver temaet eller komponenten her: %{path}."
     s3:
       regions:
         ap_northeast_1: "Asia/Stillehavsregionen (Tokyo)"
@@ -159,6 +167,7 @@ nb_NO:
         ap_south_1: "Asia/Stillehavsregionen (Mumbai)"
         ap_southeast_1: "Asia/Stillehavsregionen (Singapore)"
         ap_southeast_2: "Asia/Stillehavsregionen (Sydney)"
+        ca_central_1: "Kanada (sentralregion)"
         cn_north_1: "Kina (Beijing)"
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Irland)"
@@ -248,7 +257,17 @@ nb_NO:
       created: "du har bokmerket dette innlegget"
       not_bookmarked: "bokmerk dette innlegget"
       remove: "Fjern bokmerke"
+      confirm_clear: "Er du sikker på at du vil fjerne alle favoritter fra dette emnet?"
       save: "Lagre"
+      no_timezone: 'Du har ikke ennå satt tidssone. Du vil ikke kunne sette påminnelser. Sett tidssone <a href="%{basePath}/my/preferences/profile">i profilen din</a>.'
+      reminders:
+        at_desktop: "Neste gang jeg er på datamaskinen min"
+        later_today: "Senere i dag"
+        tomorrow: "I morgen"
+        next_week: "Neste uke"
+        later_this_week: "Senere denne uken"
+        next_month: "Neste måned"
+        custom: "Egendefinert dato og tid"
     drafts:
       resume: "Fortsett"
       remove: "Fjern"
@@ -256,6 +275,7 @@ nb_NO:
       new_private_message: "Nytt privat emneutkast"
       topic_reply: "Svarutkast"
       abandon:
+        confirm: "Du har allerede åpnet et annet utkast i dette emnet. Er du sikker på at du vil forkaste utkastet?"
         yes_value: "Ja"
         no_value: "Nei"
     topic_count_latest:
@@ -293,13 +313,33 @@ nb_NO:
       install_banner: "Ønsker du å <a href>installere %{title} på denne enheten</a>?"
     choose_topic:
       none_found: "Ingen emner funnet."
+      title:
+        search: "Søk etter emne"
+        placeholder: "skriv tittel, URL eller ID her"
     choose_message:
       none_found: "Ingen meldinger funnet."
+      title:
+        search: "Søk etter melding"
+        placeholder: "Skriv tittel, URL eller ID her"
     review:
       order_by: "Sorter etter"
       in_reply_to: "i svar til"
       explain:
+        why: "forklar hvorfor dette elementet ble plassert i køen"
+        formula: "Formel"
+        subtotal: "Delsum"
         total: "Total"
+        min_score_visibility: "Minimal score for synlighet"
+        score_to_hide: "Score for å skjule innlegg"
+        take_action_bonus:
+          name: "gjøre handling"
+          title: "Når en administrator velger å gjøre en handling, får flagget en bonus."
+        user_accuracy_bonus:
+          name: "nøyaktighet for bruker"
+          title: "Brukere som historisk gir gode flagg får bonus."
+        trust_level_bonus:
+          name: "tillitsnivå"
+          title: "Elementer opprettet av brukere med høyere tillitsrangering har høyere score"
       awaiting_approval: "Venter på godkjenning"
       delete: "Slett"
       settings:
@@ -775,9 +815,6 @@ nb_NO:
         success_staff: "Vi har sendt en e-post til den gjeldende adressen. Følg bekreftelsesinstruksjonene."
       change_avatar:
         title: "Bytt profilbilde"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basert på"
-        gravatar_title: "Endre din avatar på Gravatars nettside"
-        refresh_gravatar_title: "Oppdater din Gravatar"
         letter_based: "Systemtildelt profilbilde"
         uploaded_avatar: "Egendefinert bilde"
         uploaded_avatar_empty: "Legg til egendefinert bilde"
@@ -1021,6 +1058,8 @@ nb_NO:
         back: "Gå tilbake"
         again: "Prøv igjen"
         fixed: "Last side"
+    modal:
+      close: "lukk"
     close: "Lukk"
     assets_changed_confirm: "Dette nettstedet ble nettopp oppdatert. Last inn siden på nytt nå for siste versjon?"
     logout: "Du ble logget ut"
@@ -1203,7 +1242,6 @@ nb_NO:
       filter_placeholder: Søk etter emoji
       objects: Objekter
       flags: Flagg
-      custom: Egendefinerte emoji-er
       recent: Nylig brukt
       default_tone: Ingen hudtone
       light_tone: Lys hudtone
@@ -1211,6 +1249,7 @@ nb_NO:
       medium_tone: Middels hudtone
       medium_dark_tone: Middels mørk hudtone
       dark_tone: Mørk hudtone
+      default: Egendefinerte emoji-er
     shared_drafts:
       title: "Delte kladder"
       notice: "Dette emnet er kun synlig for dem som kan se <b>{{category}}</b>-kategorien."
@@ -1345,6 +1384,7 @@ nb_NO:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2018,6 +2058,7 @@ nb_NO:
             title: "Vis HTML-delen av e-posten"
             button: "HTML"
       bookmarks:
+        created: "Opprettet"
         name: "Navn"
     category:
       can: "kan&hellip;"
@@ -3192,7 +3233,6 @@ nb_NO:
           staff: "Stab"
           suspended: "Utestengt"
           silenced: "Dempet"
-          suspect: "Mistenkt"
           staged: "Arrangert"
         approved: "Godkjent?"
         titles:
@@ -3209,7 +3249,6 @@ nb_NO:
           moderators: "Moderatorer"
           silenced: "Dempede brukere"
           suspended: "Utestengte brukere"
-          suspect: "Mistenkte brukere"
           staged: "Arrangerte brukere"
         not_verified: "Uverifisert"
         check_email:
@@ -3542,6 +3581,7 @@ nb_NO:
         help: "Legg til en ny emoji som vil være tilgjengelig for alle. (PROFFTIPS: Dra og slipp flere filer samtidig)"
         add: "Legg til ny Emoji"
         name: "Navn"
+        group: "Gruppe"
         image: "Bilde"
         delete_confirm: "Sikker på at du vil slette: %{name}: emoji?"
       embedding:
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 183ec2ebb6..d1e2f90282 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -261,22 +261,34 @@ nl:
       help:
         bookmark: "Klik om een bladwijzer voor het eerste bericht van dit topic te maken"
         unbookmark: "Klik om alle bladwijzers in dit topic te verwijderen"
+        unbookmark_with_reminder: "Klik om alle bladwijzers en herinneringen in dit topic te verwijderen. U hebt voor dit topic een herinnering ingesteld voor %{reminder_at}."
     bookmarks:
       created: "u hebt een bladwijzer voor dit bericht gemaakt"
       not_bookmarked: "bladwijzer voor dit bericht maken"
-      created_with_reminder: "u hebt een bladwijzer voor dit bericht gemaakt met een herinnering op %{date}"
+      created_with_reminder: "u hebt een bladwijzer voor dit bericht gemaakt met een herinnering voor %{date}"
+      created_with_at_desktop_reminder: "u hebt een bladwijzer voor dit bericht gemaakt en wordt de volgende keer dat u uw computer gebruikt herinnerd"
       remove: "Bladwijzer verwijderen"
       confirm_clear: "Weet u zeker dat u alle bladwijzers van dit topic wilt verwijderen?"
       save: "Opslaan"
       no_timezone: 'U hebt nog geen tijdzone ingesteld. Hierdoor kunt u geen herinneringen instellen. Stel er een in <a href="%{basePath}/my/preferences/profile">in uw profiel</a>.'
+      invalid_custom_datetime: "De datum en tijd die u hebt opgegeven is ongeldig, probeer het opnieuw."
+      list_permission_denied: "U hebt geen toestemming om de bladwijzers van deze gebruiker te bekijken."
       reminders:
         at_desktop: "De volgende keer vanaf mijn computer"
         later_today: "Later vandaag"
         next_business_day: "Volgende werkdag"
         tomorrow: "Morgen"
         next_week: "Volgende week"
+        later_this_week: "Later deze week"
+        start_of_next_business_week: "Volgende maandag"
         next_month: "Volgende maand"
         custom: "Aangepaste datum en tijd"
+        last_custom: "Afgelopen"
+        none: "Geen herinnering nodig"
+        today_with_time: "vandaag om %{time}"
+        tomorrow_with_time: "morgen om %{time}"
+        at_time: "op %{date_time}"
+        existing_reminder: "U hebt een herinnering voor deze bladwijzer ingesteld die wordt verzonden"
     drafts:
       resume: "Hervatten"
       remove: "Verwijderen"
@@ -514,6 +526,7 @@ nl:
       days_visited_long: "Dagen bezocht"
       posts_read: "Gelezen"
       posts_read_long: "Berichten gelezen"
+      last_updated: "Laatst bijgewerkt:"
       total_rows:
         one: "%{count} gebruiker"
         other: "%{count} gebruikers"
@@ -539,6 +552,7 @@ nl:
         deny: "Weigeren"
         denied: "geweigerd"
         undone: "aanvraag ongedaan gemaakt"
+        handle: "lidmaatschapsaanvraag behandelen"
       manage:
         title: "Beheren"
         name: "Naam"
@@ -719,7 +733,7 @@ nl:
       other_accounts: "Andere accounts met dit IP-adres:"
       delete_other_accounts: "%{count} verwijderen"
       username: "gebruikersnaam"
-      trust_level: "VN"
+      trust_level: "TL"
       read_time: "leestijd"
       topics_entered: "topics ingevoerd"
       post_count: "# berichten"
@@ -766,6 +780,7 @@ nl:
         clear:
           title: "Wissen"
           warning: "Weet u zeker dat u uw aanbevolen topic wilt wissen?"
+      use_current_timezone: "Huidige tijdzone gebruiken"
       profile_hidden: "Het openbare profiel van deze gebruiker is verborgen."
       expand_profile: "Uitvouwen"
       collapse_profile: "Samenvouwen"
@@ -866,6 +881,7 @@ nl:
         deleted_posts: "verwijderde berichten"
         suspensions: "schorsingen"
         warnings_received: "waarschuwingen"
+        rejected_posts: "geweigerde berichten"
       messages:
         all: "Alle"
         inbox: "Postvak IN"
@@ -892,6 +908,7 @@ nl:
         success: "(e-mail verzonden)"
         in_progress: "(e-mail wordt verzonden)"
         error: "(fout)"
+        emoji: "slot-emoji"
         action: "E-mail voor wachtwoordherinitialisatie verzenden"
         set_password: "Wachtwoord instellen"
         choose_new: "Kies een nieuw wachtwoord"
@@ -927,7 +944,7 @@ nl:
           Bescherm uw account met beveiligingscodes voor eenmalig gebruik.
         extended_description: |
           Twee-factor-authenticatie voegt extra beveiliging toe aan uw account door naast uw wachtwoord een eenmalige code te vereisen. Tokens kunnen op <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a>- en <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>-apparaten worden gegenereerd.
-        oauth_enabled_warning: "Hou er rekening mee dat sociale aanmeldingen worden uitgeschakeld als u twee-factor-authenticatie op uw account inschakelt."
+        oauth_enabled_warning: "Houd er rekening mee dat sociale aanmeldingen worden uitgeschakeld zodra twee-factor-authenticatie op uw account is ingeschakeld."
         use: "Authenticator-app gebruiken"
         enforced_notice: "U dient twee-factor-authenticatie in te schakelen voordat u deze website bezoekt."
         disable: "uitschakelen"
@@ -941,6 +958,7 @@ nl:
           title: "Op tokens gebaseerde authenticators"
           add: "Nieuwe authenticator"
           default_name: "Mijn authenticator"
+          name_and_code_required_error: "U moet een naam en de code van uw authenticator-app opgeven."
         security_key:
           register: "Registreren"
           title: "Beveiligingssleutels"
@@ -951,6 +969,7 @@ nl:
           edit: "Beveiligingssleutel bewerken"
           edit_description: "Naam van beveiligingssleutel"
           delete: "Verwijderen"
+          name_required_error: "U moet een naam voor uw beveiligingssleutel opgeven."
       change_about:
         title: "Over mij wijzigen"
         error: "Er is een fout opgetreden bij het wijzigen van deze waarde."
@@ -967,10 +986,10 @@ nl:
         success_staff: "Er is een e-mail naar uw huidige adres verzonden. Volg de bevestigingsinstructies."
       change_avatar:
         title: "Uw profielafbeelding wijzigen"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, gebaseerd op"
-        gravatar_title: "Wijzig uw avatar op de website van Gravatar"
-        gravatar_failed: "We konden geen Gravatar voor dat e-mailadres vinden."
-        refresh_gravatar_title: "Uw gravatar vernieuwen"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, gebaseerd op"
+        gravatar_title: "Wijzig uw avatar op de website van {{gravatarName}}"
+        gravatar_failed: "We konden geen {{gravatarName}} voor dat e-mailadres vinden."
+        refresh_gravatar_title: "Uw {{gravatarName}} vernieuwen"
         letter_based: "Door systeem toegekende profielafbeelding"
         uploaded_avatar: "Eigen afbeelding"
         uploaded_avatar_empty: "Een eigen afbeelding toevoegen"
@@ -1033,6 +1052,9 @@ nl:
         any: "alle"
       password_confirmation:
         title: "Nogmaals het wachtwoord"
+      invite_code:
+        title: "Uitnodigingscode"
+        instructions: "Accountregistratie vereist een uitnodigingscode"
       auth_tokens:
         title: "Onlangs gebruikte apparaten"
         ip: "IP"
@@ -1253,6 +1275,9 @@ nl:
         back: "Terug"
         again: "Opnieuw proberen"
         fixed: "Pagina laden"
+    modal:
+      close: "sluiten"
+      dismiss_error: "Fout negeren"
     close: "Sluiten"
     assets_changed_confirm: "Deze website is zojuist bijgewerkt. Nu vernieuwen om de nieuwste versie te laden?"
     logout: "U bent afgemeld."
@@ -1347,6 +1372,7 @@ nl:
     email_login:
       link_label: "Een koppeling voor aanmelding e-mailen"
       button_label: "via e-mail"
+      emoji: "slot-emoji"
       complete_username: "Als een account overeenkomt met de gebruikersnaam <b>%{username}</b>, zou u spoedig een e-mail met een koppeling voor aanmelding moeten ontvangen."
       complete_email: "Als een account overeenkomt met <b>%{email}</b>, zou u spoedig een e-mail met een koppeling voor aanmelding moeten ontvangen."
       complete_username_found: "We hebben een account gevonden die overeenkomt met de gebruikersnaam <b>%{username}</b>. U zou spoedig een e-mail met een koppeling voor aanmelding moeten ontvangen."
@@ -1424,6 +1450,7 @@ nl:
         backup_code: "Een back-upcode gebruiken"
     invites:
       accept_title: "Uitnodiging"
+      emoji: "envelop-emoji"
       welcome_to: "Welkom bij %{site_name}!"
       invited_by: "U bent uitgenodigd door:"
       social_login_available: "U kunt zich ook aanmelden met een willekeurige sociale aanmelding die dat e-mailadres gebruikt."
@@ -1488,7 +1515,6 @@ nl:
       objects: Objecten
       symbols: Symbolen
       flags: Vlaggen
-      custom: Eigen emoji
       recent: Onlangs gebruikt
       default_tone: Geen huidskleur
       light_tone: Lichte huidskleur
@@ -1496,6 +1522,7 @@ nl:
       medium_tone: Gemiddelde huidskleur
       medium_dark_tone: Donker gemiddelde huidskleur
       dark_tone: Donkere huidskleur
+      default: Eigen emoji
     shared_drafts:
       title: "Gedeelde concepten"
       notice: "Dit topic is alleen zichtbaar voor degenen die de categorie <b>{{category}}</b> kunnen zien."
@@ -1637,6 +1664,9 @@ nl:
         message:
           one: "%{count} ongelezen bericht"
           other: "{{count}} ongelezen berichten"
+        high_priority:
+          one: "%{count} ongelezen melding met hoge prioriteit"
+          other: "%{count} ongelezen meldingen met hoge prioriteit"
       title: "meldingen van @naam-vermeldingen, antwoorden op uw berichten en topics, berichten, etc."
       none: "Meldingen kunnen momenteel niet worden geladen."
       empty: "Geen meldingen gevonden."
@@ -1645,6 +1675,7 @@ nl:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1695,6 +1726,8 @@ nl:
         posted: "nieuw bericht"
         moved_post: "bericht verplaatst"
         linked: "gekoppeld"
+        bookmark_reminder: "bladwijzerherinnering"
+        bookmark_reminder_with_name: "bladwijzerherinnering - %{name}"
         granted_badge: "badge toegekend"
         invited_to_topic: "uitgenodigd voor topic"
         group_mentioned: "groep genoemd"
@@ -1923,6 +1956,7 @@ nl:
       group_request_sent: "Uw lidmaatschapsaanvraag voor de groep is verstuurd. U ontvangt een melding zodra deze is geaccepteerd."
       unread_indicator: "Nog geen enkel lid heeft het laatste bericht van dit topic gelezen."
       read_more_MF: "Er { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 ongelezen</a> } other { zijn <a href='{basePath}/unread'># ongelezen</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 nieuw</a> topic} other { {BOTH, select, true{and } false {zijn } other{}} <a href='{basePath}/new'># nieuwe</a> topics} } over, of {CATEGORY, select, true {blader door andere topics in {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Alle categorieën bekijken
       view_latest_topics: nieuwste topics bekijken
       suggest_create_topic: "Waarom maakt u geen topic aan?"
@@ -1933,6 +1967,7 @@ nl:
         title: "Topictimer"
         save: "Timer instellen"
         num_of_hours: "Aantal uren:"
+        num_of_days: "Aantal dagen:"
         remove: "Timer verwijderen"
         publish_to: "Publiceren naar:"
         when: "Wanneer:"
@@ -1975,6 +2010,8 @@ nl:
         title: "Topic automatisch bumpen"
       reminder:
         title: "Mij herinneren"
+      auto_delete_replies:
+        title: "Antwoorden automatisch verwijderen"
       status_update_notice:
         auto_open: "Dit topic wordt %{timeLeft} automatisch geopend."
         auto_close: "Dit topic wordt %{timeLeft} automatisch gesloten."
@@ -1983,6 +2020,7 @@ nl:
         auto_delete: "Dit topic wordt %{timeLeft} automatisch verwijderd."
         auto_bump: "Dit topic wordt %{timeLeft} automatisch gebumpt."
         auto_reminder: "U wordt %{timeLeft} aan dit topic herinnerd."
+        auto_delete_replies: "Antwoorden op dit topic worden na %{duration} automatisch verwijderd."
       auto_close_title: "Instellingen voor automatisch sluiten"
       auto_close_immediate:
         one: "Het laatste bericht in dit topic is al %{count} uur oud, dus het topic wordt meteen gesloten."
@@ -2194,6 +2232,18 @@ nl:
         title: "Geselecteerde berichten samenvoegen"
         action: "geselecteerde berichten samenvoegen"
         error: "Er is een fout opgetreden bij het samenvoegen van de geselecteerde berichten."
+      publish_page:
+        title: "Pagina's publiceren"
+        publish: "Publiceren"
+        description: "Wanneer een topic als een pagina wordt gepubliceerd, kan de URL ervan worden gedeeld en wordt deze met aangepaste stijlen weergegeven."
+        slug: "Slug"
+        publish_url: "Uw pagina is gepubliceerd op:"
+        topic_published: "Uw topic is gepubliceerd op:"
+        preview_url: "Uw pagina wordt gepubliceerd op:"
+        invalid_slug: "Sorry, u kunt deze pagina niet publiceren."
+        unpublish: "Publicatie ongedaan maken"
+        unpublished: "Uw pagina is niet meer gepubliceerd en niet meer toegankelijk."
+        publishing_settings: "Publicatie-instellingen"
       change_owner:
         title: "Eigenaar wijzigen"
         action: "eigendom wijzigen"
@@ -2202,6 +2252,9 @@ nl:
         instructions:
           one: "Kies een nieuwe eigenaar voor het bericht van <b>@{{old_user}}</b>"
           other: "Kies een nieuwe eigenaar voor de {{count}} berichten van <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Kies een nieuwe eigenaar voor het bericht"
+          other: "Kies een nieuwe eigenaar voor de {{count}} berichten"
       change_timestamp:
         title: "Tijdstempel wijzigen..."
         action: "tijdstempel wijzigen"
@@ -2327,6 +2380,7 @@ nl:
         convert_to_moderator: "Stafkleur toevoegen"
         revert_to_regular: "Stafkleur verwijderen"
         rebake: "HTML opnieuw opbouwen"
+        publish_page: "Pagina's publiceren"
         unhide: "Tonen"
         change_owner: "Eigendom wijzigen "
         grant_badge: "Badge toekennen"
@@ -2421,13 +2475,18 @@ nl:
             button: "HTML"
       bookmarks:
         create: "Bladwijzer maken"
+        edit: "Bladwijzer bewerken"
+        created: "Gemaakt"
         name: "Naam"
-        name_placeholder: "Geef de bladwijzer een naam als geheugensteuntje"
-        set_reminder: "Een herinnering instellen"
+        name_placeholder: "Waar is deze bladwijzer voor?"
+        set_reminder: "Mij herinneren"
         actions:
           delete_bookmark:
             name: "Bladwijzer verwijderen"
             description: "Verwijdert de bladwijzer uit uw profiel en stopt alle herinneringen voor de bladwijzer"
+          edit_bookmark:
+            name: "Bladwijzer bewerken"
+            description: "De bladwijzernaam bewerken of de herinneringsdatum en -tijd wijzigen"
     category:
       can: "kan&hellip; "
       none: "(geen categorie)"
@@ -2789,6 +2848,18 @@ nl:
         title: "Opstellen"
         return: "%{shortcut} Terug naar editor"
         fullscreen: "%{shortcut} Editor in volledig scherm"
+      bookmarks:
+        title: "Bladwijzers maken"
+        enter: "%{shortcut} Opslaan en sluiten"
+        later_today: "%{shortcut} Later vandaag"
+        later_this_week: "%{shortcut} Later deze week"
+        tomorrow: "%{shortcut} Morgen"
+        next_week: "%{shortcut} Volgende week"
+        next_month: "%{shortcut} Volgende maand"
+        next_business_week: "%{shortcut} Begin volgende week"
+        next_business_day: "%{shortcut} Volgende werkdag"
+        custom: "%{shortcut} Aangepaste datum en tijd"
+        none: "%{shortcut} Geen herinnering"
       actions:
         title: "Acties"
         bookmark_topic: "%{shortcut} Bladwijzer voor topic in-/uitschakelen"
@@ -2811,6 +2882,10 @@ nl:
         print: "%{shortcut} Topic afdrukken"
         defer: "%{shortcut} Topic negeren"
         topic_admin_actions: "%{shortcut} Beheeracties voor topic openen"
+      search_menu:
+        title: "Menu Zoeken"
+        prev_next: "%{shortcut} Selectie omhoog en omlaag verplaatsen"
+        insert_url: "%{shortcut} Selectie in open editorvenster invoegen"
     badges:
       earned_n_times:
         one: "Deze badge is %{count} keer verdiend"
@@ -3222,6 +3297,9 @@ nl:
         notification_event:
           name: "Meldingsgebeurtenis"
           details: "Wanneer een gebruiker een melding in zijn of haar feed ontvangt."
+        user_badge_event:
+          name: "Badgetoekenningsgebeurtenis"
+          details: "Wanneer een gebruiker een badge ontvangt."
         delivery_status:
           title: "Afleveringsstatus"
           inactive: "Inactief"
@@ -3371,6 +3449,7 @@ nl:
           theme_name: "Themanaam"
           component_name: "Onderdeelnaam"
           themes_intro: "Selecteer een bestaand of installeer een nieuw thema om te beginnen"
+          themes_intro_emoji: "kunstenares-emoji"
           beginners_guide_title: "Beginnersgids voor het gebruik van Discourse-thema's"
           developers_guide_title: "Ontwikkelaarsgids voor Discourse-thema's"
           browse_themes: "Gemeenschapsthema's verkennen"
@@ -3597,6 +3676,7 @@ nl:
         format: "Indeling"
         html: "html"
         text: "tekst"
+        html_preview: "Voorbeeld van e-mailinhoud"
         last_seen_user: "Laatst geziene gebruiker:"
         no_result: "Geen resultaten gevonden voor samenvatting."
         reply_key: "Antwoordsleutel"
@@ -3751,6 +3831,8 @@ nl:
             api_key_update: "api-sleutel bijwerken"
             api_key_destroy: "api-sleutel verwijderen"
             override_upload_secure_status: "status beveiligd uploaden negeren"
+            page_published: "pagina gepubliceerd"
+            page_unpublished: "pagina niet gepubliceerd"
         screened_emails:
           title: "Gecontroleerde e-mails"
           description: "Als iemand een nieuwe account probeert aan te maken, worden de volgende e-mailadressen gecontroleerd en de registratie geblokkeerd, of een andere actie uitgevoerd."
@@ -3854,7 +3936,6 @@ nl:
           staff: "Stafleden"
           suspended: "Geschorst"
           silenced: "Gedempt"
-          suspect: "Verdacht"
           staged: "Staged"
         approved: "Goedgekeurd?"
         titles:
@@ -3871,7 +3952,6 @@ nl:
           moderators: "Moderators"
           silenced: "Gedempte gebruikers"
           suspended: "Geschorste gebruikers"
-          suspect: "Verdachte gebruikers"
           staged: "Staged gebruikers"
         not_verified: "Niet geverifieerd"
         check_email:
@@ -3909,7 +3989,7 @@ nl:
         penalty_count: "Aantal minpunten"
         clear_penalty_history:
           title: "Minpuntengeschiedenis wissen"
-          description: "gebruikers met minpunten kunnen geen VN3 bereiken"
+          description: "gebruikers met minpunten kunnen geen TL3 bereiken"
         delete_all_posts_confirm_MF: "U gaat {POSTS, plural, one {1 bericht} other {# berichten}} en {TOPICS, plural, one {1 topic} other {# topics}} verwijderen. Weet u het zeker?"
         silence: "Dempen"
         unsilence: "Dempen opheffen"
@@ -4002,6 +4082,7 @@ nl:
           threshold_reached: "Er zijn te veel bounceberichten van dat e-mailadres ontvangen."
         trust_level_change_failed: "Er is een probleem opgetreden bij het wijzigen van het vertrouwensniveau van de gebruiker."
         suspend_modal_title: "Gebruiker schorsen"
+        confirm_cancel_penalty: "Weet u zeker dat u het minpunt wilt negeren?"
         trust_level_2_users: "Gebruikers met vertrouwensniveau 2"
         trust_level_3_requirements: "Vereisten voor vertrouwensniveau 3"
         trust_level_locked_tip: "vertrouwensniveau is vergrendeld; het systeem zal geen gebruikers promoveren of degraderen"
@@ -4215,6 +4296,7 @@ nl:
             with_time: "<span class=\"username\">%{username}</span> om <span class=\"time\">%{time}</span>"
         badge_intro:
           title: "Selecteer een bestaande badge of maak een nieuwe om te beginnen"
+          emoji: "studente-emoji"
           what_are_badges_title: "Wat zijn badges?"
           badge_query_examples_title: "Voorbeelden van badgequery's"
         mass_award:
@@ -4231,7 +4313,9 @@ nl:
         help: "Nieuwe emoji toevoegen die voor iedereen beschikbaar zal zijn. (PROTIP: versleep meerdere bestanden tegelijk)"
         add: "Nieuwe emoji toevoegen"
         name: "Naam"
+        group: "Groep"
         image: "Afbeelding"
+        alt: "voorbeeld van eigen emoji"
         delete_confirm: "Weet u zeker dat u de emoji :%{name}: wilt verwijderen?"
       embedding:
         get_started: "Als u Discourse in een andere website wilt inbedden, begin dan door de host ervan toe te voegen."
@@ -4251,13 +4335,14 @@ nl:
         embed_post_limit: "Maximale aantal berichten om in te bedden"
         embed_title_scrubber: "Reguliere expressie voor het afleiden van de titels van berichten"
         embed_truncate: "Ingebedde berichten inkorten"
+        embed_unlisted: "Geïmporteerde topics worden onzichtbaar totdat er antwoord is."
         embed_whitelist_selector: "CSS-selector voor elementen die bij inbedding worden toegestaan"
         embed_blacklist_selector: "CSS-selector voor elementen die bij inbedding worden verwijderd"
         embed_classname_whitelist: "Toegestane CSS-klassenamen"
         save: "Inbeddingsinstellingen opslaan"
       permalink:
         title: "Permalinks"
-        description: "Houd er rekening mee dat dit alleen van toepassing is op externe bronnen; op uw forum geplaatste koppelingen worden niet omgeleid."
+        description: "Toe te passen omleiding voor URL's die voor het forum niet bekend zijn."
         url: "URL"
         topic_id: "Topic-ID"
         topic_title: "Topic"
@@ -4266,6 +4351,7 @@ nl:
         category_id: "Categorie-ID"
         category_title: "Categorie"
         external_url: "Externe URL"
+        destination: "Bestemming"
         delete_confirm: "Weet u zeker dat u deze permalink wilt verwijderen?"
         form:
           label: "Nieuw:"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 0e170d8ca8..1612f8fc56 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -29,8 +29,9 @@ pl_PL:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
+      time_short_day: "ddd, GG: mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, H:mm"
+      long_no_year: "D MMM, GG: mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY H:mm"
@@ -196,6 +197,8 @@ pl_PL:
       banner:
         enabled: "ustawił ten baner %{when}. Będzie widoczny na górze każdej strony, póki nie zostanie ukryty przez użytkownika."
         disabled: "Ten temat nie jest już banerem. Nie będzie dalej wyświetlany na górze każdej strony."
+      forwarded: "przekazano powyższy email"
+    topic_admin_menu: "akcje tematu"
     wizard_required: "Witaj na Twoim na nowym forum Discourse! Zacznijmy od <a href='%{url}' data-auto-route='true'>kreatora ustawień</a> ✨"
     emails_are_disabled: "Wysyłanie e-maili zostało globalnie wyłączone przez administrację. Powiadomienia e-mail nie będą dostarczane."
     bootstrap_mode_enabled: "Aby ułatwić uruchomienie Twojej strony, jesteś w trybie bootstrap. Wszyscy nowi użytkownicy otrzymają poziom zaufania 1 i będą otrzymywać codzienne wiadomości e-mail z podsumowaniem aktywności na forum. To zostanie automatycznie wyłączone, kiedy %{min_users} osób dołączy."
@@ -309,9 +312,25 @@ pl_PL:
     bookmarks:
       created: "zakładka dodana"
       not_bookmarked: "dodaj do zakładek"
+      created_with_at_desktop_reminder: "zakładka tego posta została dodana do zakładek, a następnym razem zostaniesz o tym powiadomiony"
       remove: "Usuń zakładkę"
       confirm_clear: "Czy na pewno chcesz usunąć wszystkie swoje zakładki ustawione w tym temacie?"
       save: "Zapisz"
+      no_timezone: 'Nie ustawiłeś jeszcze strefy czasowej. Nie będziesz mógł ustawić przypomnień. Skonfiguruj jeden <a href="%{basePath}/my/preferences/profile">w swoim profilu</a> .'
+      invalid_custom_datetime: "Podana data i godzina są nieprawidłowe, spróbuj ponownie."
+      list_permission_denied: "Nie masz uprawnień do przeglądania zakładek tego użytkownika."
+      reminders:
+        at_desktop: "Następnym razem będę na swoim pulpicie"
+        later_today: "Później dzisiaj"
+        next_business_day: "Następny dzień roboczy"
+        tomorrow: "Jutro"
+        next_week: "Następny tydzień"
+        later_this_week: "Później w tym tygodniu"
+        start_of_next_business_week: "Następny poniedziałek"
+        next_month: "Następny miesiąc"
+        custom: "Niestandardowa data i godzina"
+        last_custom: "Ostatni, ubiegły, zeszły"
+        none: "Przypomnienie nie jest potrzebne"
     drafts:
       resume: "Kontynuuj"
       remove: "Usuń"
@@ -363,8 +382,14 @@ pl_PL:
       install_banner: "Czy chcesz <a href>zainstalować %{title} na tym urządzeniu?</a>"
     choose_topic:
       none_found: "Nie znaleziono tematów."
+      title:
+        search: "Wyszukaj temat"
+        placeholder: "wpisz tytuł tematu, adres URL lub identyfikator tutaj"
     choose_message:
       none_found: "Nie znaleziono wiadomości."
+      title:
+        search: "Wyszukaj wiadomość"
+        placeholder: "wpisz tutaj tytuł wiadomości, adres URL lub identyfikator"
     review:
       order_by: "Segreguj według:"
       in_reply_to: "w odpowiedzi na"
@@ -387,7 +412,9 @@ pl_PL:
           title: "Przedmioty, które można przeglądać, tworzone przez użytkowników o wyższym poziomie zaufania, mają wyższy wynik."
         type_bonus:
           name: "bonus typu"
+          title: "Niektóre rodzaje przeglądalne mogą otrzymać premię od pracowników, aby nadać im wyższy priorytet."
       claim_help:
+        optional: "Możesz zgłosić roszczenie do tego elementu, aby uniemożliwić innym jego sprawdzenie."
         required: "Musisz przejąć tę pozycję, zanim będziesz mógł je przejrzeć."
         claimed_by_you: "Przejąłeś tę pozycję i możesz ją teraz przejrzeć."
         claimed_by_other: "Ten przedmiot może być sprawdzony tylko przez <b>{{username}}</b> ."
@@ -422,11 +449,17 @@ pl_PL:
       deleted_user: "(użytkownik usunięty)"
       user:
         bio: "Biografia"
+        website: "Stronie internetowej"
         username: "Nazwa użytkownika"
         email: "Email"
         name: "Imię"
         fields: "Pola"
       user_percentage:
+        summary:
+          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flaga ogółem)"
+          few: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flagi ogółem)"
+          many: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flagi ogółem)"
+          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flagi ogółem)"
         agreed:
           one: "{{count}}% zgadza się"
           few: "{{count}}% zgadza się"
@@ -557,6 +590,7 @@ pl_PL:
       days_visited_long: "Dni Odwiedzin"
       posts_read: "Przeczytane"
       posts_read_long: "Przeczytane wpisy"
+      last_updated: "Ostatnio zaktualizowany:"
       total_rows:
         one: "%{count} użytkownik"
         few: "%{count} użytkownicy"
@@ -584,6 +618,7 @@ pl_PL:
         deny: "Odrzuć"
         denied: "odrzucony"
         undone: "prośba cofnięta"
+        handle: "obsłuż prośby o członkostwo "
       manage:
         title: "Zarządzaj"
         name: "Nazwa"
@@ -624,6 +659,8 @@ pl_PL:
       leave: "Opuść"
       request: "Wniosek"
       message: "Wiadomość"
+      confirm_leave: "Czy na pewno chcesz opuścić tę grupę?"
+      allow_membership_requests: "Zezwalaj użytkownikom na wysyłanie wniosków o członkostwo do właścicieli grup (wymaga publicznie widocznej grupy)"
       membership_request_template: "Wyświetl niestandardowy szablon użytkownikom, w momencie wysyłania wniosku o członkostwo."
       membership_request:
         submit: "Złóż wniosek"
@@ -797,18 +834,27 @@ pl_PL:
         ignore_duration_username: "Nazwa użytkownika"
         ignore_duration_when: "Oczekiwanie"
         ignore_duration_save: "Ignoruj"
+        ignore_duration_note: "Pamiętaj, że wszystkie ignorowania są automatycznie usuwane po upływie czasu ignorowania."
         ignore_duration_time_frame_required: "Wybierz przedział czasowy"
         ignore_no_users: "Nie posiadasz ignorowanych użytkowników."
         ignore_option: "Zignorowany"
+        ignore_option_title: "Nie będziesz otrzymywać powiadomień związanych z tym użytkownikiem, a wszystkie ich tematy i odpowiedzi będą ukryte."
         add_ignored_user: "Dodaj..."
         mute_option: "Wyciszenie"
+        mute_option_title: "Nie będziesz otrzymywać żadnych powiadomień związanych z tym użytkownikiem."
         normal_option: "Normalny"
+        normal_option_title: "Zostaniesz powiadomiony, jeśli ten użytkownik odpowie ci, zacytuje lub o tobie wspomni."
       activity_stream: "Aktywność"
       preferences: "Ustawienia"
       feature_topic_on_profile:
+        open_search: "Wybierz nowy temat"
+        title: "Wybierz temat"
+        search_label: "Wyszukaj temat według tytułu"
         save: "Zapisz"
         clear:
           title: "Wyczyść"
+          warning: "Czy na pewno chcesz wyczyścić polecany temat?"
+      use_current_timezone: "Użyj aktualnej strefy czasowej"
       profile_hidden: "Publiczny profil użytkownika jest ukryty."
       expand_profile: "Rozwiń"
       collapse_profile: "Zwiń"
@@ -841,6 +887,7 @@ pl_PL:
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
       enable_defer: "Włącz odroczenie, aby oznaczyć tematy jako nieprzeczytane"
       change: "zmień"
+      featured_topic: "Wyróżniony temat"
       moderator: "{{user}} jest moderatorem"
       admin: "{{user}} jest adminem"
       moderator_tooltip: "Ten użytkownik jest moderatorem"
@@ -907,6 +954,7 @@ pl_PL:
         deleted_posts: "usunięte wpisy"
         suspensions: "zawieszone"
         warnings_received: "otrzymanych ostrzeżeń"
+        rejected_posts: "odrzucone posty"
       messages:
         all: "Wszystkie"
         inbox: "Skrzynka odbiorcza"
@@ -943,11 +991,15 @@ pl_PL:
         disable: "Wyłącz"
         enable: "Włącz"
         enable_long: "Włącz kody zapasowe"
+        manage: "Zarządzaj kodami zapasowymi. Pozostały Ci kody zapasowe <strong>{{count}}</strong> ."
         copied_to_clipboard: "Skopiowane do schowka"
         copy_to_clipboard_error: "Wystąpił błąd w trakcie kopiowania do schowka"
+        remaining_codes: "Pozostały Ci kody zapasowe <strong>{{count}}</strong> ."
         use: "Używaj kodu zapasowego"
+        enable_prerequisites: "Przed wygenerowaniem kodów zapasowych należy włączyć główny drugi czynnik."
         codes:
           title: "Wygenerowano kody zapasowe"
+          description: "Każdy z tych kodów zapasowych można użyć tylko raz. Trzymaj je w bezpiecznym, ale dostępnym miejscu."
       second_factor:
         title: "Dwuskładnikowe uwierzytelnianie"
         enable: "Zarządzaj autentykacją dwuetapową"
@@ -967,19 +1019,27 @@ pl_PL:
         enforced_notice: "Aby uzyskać dostęp do tej witryny, musisz włączyć uwierzytelnianie dwuskładnikowe."
         disable: "Wyłącz"
         disable_title: "Wyłącz drugi czynnik"
+        disable_confirm: "Czy na pewno chcesz wyłączyć wszystkie drugie czynniki?"
         edit: "Edytuj"
+        edit_title: "Edytuj drugi czynnik"
+        edit_description: "Nazwa drugiego czynnika"
+        enable_security_key_description: "Po przygotowaniu fizycznego klucza bezpieczeństwa naciśnij przycisk Zarejestruj poniżej."
         totp:
           title: "Uwierzytelnianie oparte na tokenach"
           add: "Nowy Authenticator"
           default_name: "Mój Authenticator"
+          name_and_code_required_error: "Musisz podać nazwę i kod z aplikacji uwierzytelniającej."
         security_key:
           register: "Zarejestruj"
           title: "Klucze bezpieczeństwa"
           add: "Zarejestruj klucz bezpieczeństwa"
           default_name: "Główny klucz bezpieczeństwa"
+          not_allowed_error: "Upłynął limit czasu procesu rejestracji klucza bezpieczeństwa lub został on anulowany."
+          already_added_error: "Ten klucz bezpieczeństwa został już zarejestrowany. Nie musisz go ponownie rejestrować."
           edit: "Edytuj Klucz Bezpieczeństwa"
           edit_description: "Nazwa klucza bezpieczeństwa"
           delete: "Usuń"
+          name_required_error: "Musisz podać nazwę swojego klucza bezpieczeństwa."
       change_about:
         title: "Zmień O mnie"
         error: "Wystąpił błąd podczas zmiany tej wartości."
@@ -996,9 +1056,10 @@ pl_PL:
         success_staff: "Wysłaliśmy wiadomość na bieżący adres. Proszę przestrzegać informacji dotyczących potwierdzenia adresu."
       change_avatar:
         title: "Zmień swój awatar"
-        gravatar: "bazujący na <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "Zmień swój awatar na stronie serwisu Gravatar"
-        refresh_gravatar_title: "Zaktualizuj swój Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a> , na podstawie"
+        gravatar_title: "Zmień swój awatar na stronie {{gravatarName}}"
+        gravatar_failed: "Nie mogliśmy znaleźć {{gravatarName}} z tym adresem e-mail."
+        refresh_gravatar_title: "Odśwież swój {{gravatarName}}"
         letter_based: "Awatar przyznany przez system"
         uploaded_avatar: "Zwyczajny obrazek"
         uploaded_avatar_empty: "Dodaj zwyczajny obrazek"
@@ -1006,9 +1067,13 @@ pl_PL:
         image_is_not_a_square: "Uwaga: grafika została przycięta ponieważ jej wysokość i szerokość nie były równe. "
       change_profile_background:
         title: "Nagłówek profilu"
+        instructions: "Nagłówki profilu zostaną wyśrodkowane i będą miały domyślną szerokość 1110 pikseli."
       change_card_background:
         title: "Tło karty użytkownika"
         instructions: "Tło karty użytkownika est wycentrowane i posiada domyślną szerokość 590px."
+      change_featured_topic:
+        title: "Wyróżniony temat"
+        instructions: "Link do tego tematu będzie na twojej karcie użytkownika i profilu."
       email:
         title: "Email"
         primary: "Podstawowy adres email"
@@ -1059,6 +1124,9 @@ pl_PL:
         any: "każdy"
       password_confirmation:
         title: "Powtórz hasło"
+      invite_code:
+        title: "Zaproś kod"
+        instructions: "Rejestracja konta wymaga kodu zaproszenia"
       auth_tokens:
         title: "Ostatnio używane urządzenia"
         ip: "IP"
@@ -1146,6 +1214,7 @@ pl_PL:
         search: "wpisz aby szukać zaproszeń…"
         title: "Zaproszenia"
         user: "Zaproszony(-a) użytkownik(-czka)"
+        sent: "Ostatni wysłany"
         none: "Brak zaproszeń do wyświetlenia."
         truncated:
           one: "Wyświetlanie pierwszego zaproszenia."
@@ -1296,6 +1365,9 @@ pl_PL:
         back: "Cofnij"
         again: "Spróbuj ponownie"
         fixed: "Załaduj stronę"
+    modal:
+      close: "zamknij"
+      dismiss_error: "Odrzuć błąd"
     close: "Zamknij"
     assets_changed_confirm: "Serwis został zmieniony, czy pozwolisz na przeładowanie strony w celu aktualizacji do najnowszej wersji?"
     logout: "Nastąpiło wylogowanie."
@@ -1304,6 +1376,17 @@ pl_PL:
       enabled: "Strona jest w trybie tylko-do-odczytu. Możesz nadal przeglądać serwis, ale operacje takie jak postowanie, lajkowanie i inne są wyłączone."
       login_disabled: "Logowanie jest zablokowane, gdy strona jest w trybie tylko do odczytu."
       logout_disabled: "Wylogowanie jest zablokowane gdy strona jest w trybie tylko do odczytu."
+    too_few_topics_and_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Rozpocznijmy dyskusję!</a> Jest {currentTopics, liczba mnoga, jeden {jest <strong>#</strong> tematem} inny {are <strong>#</strong> topics}} i {currentPosts, liczba mnoga, jeden { <strong>#</strong> post} inne { <strong>#</strong> posty}}. Odwiedzający potrzebują więcej do przeczytania i odpowiedzi - zalecamy co najmniej {wymaganeTopiki, liczba mnoga, jeden { <strong>#</strong> temat} inne { <strong>#</strong> tematy}} i {wymaganePosty, liczba mnoga, jeden { <strong>#</strong> post} inne { <strong>#</strong> posty}}. Tylko pracownicy mogą zobaczyć tę wiadomość.
+    too_few_topics_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Rozpocznijmy dyskusję!</a> Jest {currentTopics, liczba mnoga, jeden {is <strong>#</strong> topic} other {are <strong>#</strong> topics}}. Odwiedzający potrzebują więcej do przeczytania i udzielenia odpowiedzi - zalecamy co najmniej {wymaganeTopiki, liczba mnoga, jeden { <strong>#</strong> temat} inny { <strong>#</strong> tematy}}. Tylko pracownicy mogą zobaczyć tę wiadomość.
+    too_few_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Rozpocznijmy dyskusję!</a> Jest {currentPosts, liczba mnoga, jeden {is <strong>#</strong> post} other {are <strong>#</strong> posts}}. Odwiedzający potrzebują więcej do przeczytania i odpowiedzi - zalecamy co najmniej {wymaganePosty, liczba mnoga, jeden { <strong>#</strong> post} inny { <strong>#</strong> posty}}. Tylko pracownicy mogą zobaczyć tę wiadomość.
+    logs_error_rate_notice:
+      reached_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / godzina} inne {# błędy / godzina}}</a> osiągnęła limit ustawienia witryny w wysokości {limit, liczba mnoga, jeden {# błąd / godzina} inne {# błędy / godzina}}."
+      reached_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / minuta} inna {# błędy / minuta}}</a> osiągnęła limit ustawienia witryny w wysokości {limit, liczba mnoga, jeden {# błąd / minuta} inne {# błędy / minuta}}."
+      exceeded_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / godzina} inny {# błędy / godzina}}</a> przekroczył limit ustawienia witryny o {limit, liczba mnoga, jeden {# błąd / godzina} inne {# błędy / godzina}}."
+      exceeded_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / minuta} inna {# błędy / minuta}}</a> przekroczyła limit ustawienia witryny o {limit, liczba mnoga, jeden {# błąd / minuta} inne {# błędy / minuta}}."
     learn_more: "dowiedz się więcej…"
     all_time: "łącznie"
     all_time_desc: "łącznie utworzonych tematów"
@@ -1371,6 +1454,8 @@ pl_PL:
       reset: "Resetuj hasło"
       complete_username: "Jeśli jakieś mamy konto o nazwie użytkownika <b>%{username}</b>, za chwilę zostanie wysłana wiadomość z instrukcją jak ustawić nowe hasło."
       complete_email: "Jeśli jakieś konto użytkownika posiada adres <b>%{email}</b>, za chwilę zostanie wysłana wiadomość z instrukcją jak ustawić nowe hasło."
+      complete_username_found: "Znaleźliśmy konto pasujące do nazwy użytkownika <b>%{username}</b> . Powinieneś otrzymać wiadomość e-mail z instrukcjami, jak szybko zresetować hasło."
+      complete_email_found: "Znaleźliśmy konto pasujące do <b>%{email}</b> . Powinieneś otrzymać wiadomość e-mail z instrukcjami, jak szybko zresetować hasło."
       complete_username_not_found: "Nie znaleziono konta o nazwie <b>%{username}</b>"
       complete_email_not_found: "Nie znaleziono konta przypisanego do <b>%{email}</b>"
       help: "Email nie dotarł? Upewnij się najpierw czy sprawdziłeś folder spam.<p>Nie jesteś pewny jaki email został użyty? Wprowadz adres tutaj, a dowiemy się czy taki istnieje.</p><p>Jeśli nie masz już dostępu do adresu email zapisanego na twoim koncie, skontaktuj się z <a href='%{basePath}/about'>naszym pomocnym zespołem.</a></p>"
@@ -1381,6 +1466,8 @@ pl_PL:
       button_label: "z e-mailem"
       complete_username: "Jeśli konto pasuje do nazwy użytkownika <b>%{username}</b> , <b>wkrótce</b> otrzymasz wiadomość e-mail z linkiem do logowania."
       complete_email: "Jeśli konto pasuje do <b>%{email}</b> , <b>wkrótce</b> otrzymasz wiadomość e-mail z linkiem do logowania."
+      complete_username_found: "Znaleźliśmy konto pasujące do nazwy użytkownika <b>%{username}</b> , <b>wkrótce</b> otrzymasz wiadomość e-mail z linkiem do logowania."
+      complete_email_found: "Znaleźliśmy konto pasujące do <b>%{email}</b> , <b>wkrótce</b> otrzymasz wiadomość e-mail z linkiem do logowania."
       complete_username_not_found: "Nie znaleziono konta o nazwie <b>%{username}</b>"
       complete_email_not_found: "Nie znaleziono konta przypisanego do <b>%{email}</b>"
       confirm_title: "Przejdź do %{site_name}"
@@ -1396,12 +1483,16 @@ pl_PL:
       second_factor_backup_title: "Kod zapasowy weryfikacji dwuskładnikowej"
       second_factor_backup_description: "Proszę wprowadź jeden ze swoich zapasowych kodów:"
       second_factor: "Zaloguj się przy użyciu aplikacji Authenticator"
+      security_key_description: "Po przygotowaniu fizycznego klucza bezpieczeństwa naciśnij przycisk Uwierzytelnij za pomocą klucza bezpieczeństwa poniżej."
       security_key_alternative: "Spróbuj w inny sposób"
       security_key_authenticate: "Uwierzytelnij się za pomocą klucza bezpieczeństwa"
       security_key_not_allowed_error: "Upłynął limit czasu procesu uwierzytelniania klucza bezpieczeństwa lub został on anulowany."
+      security_key_no_matching_credential_error: "W podanym kluczu zabezpieczeń nie znaleziono zgodnych poświadczeń."
+      security_key_support_missing_error: "Twoje obecne urządzenie lub przeglądarka nie obsługuje używania kluczy bezpieczeństwa. Proszę użyć innej metody."
       email_placeholder: "adres email lub nazwa użytkownika"
       caps_lock_warning: "Caps Lock jest włączony"
       error: "Nieznany błąd"
+      cookies_error: "Wygląda na to, że masz wyłączoną obsługę plików cookie. Możesz nie być w stanie zalogować się bez uprzedniego włączenia ich."
       rate_limit: "Poczekaj, zanim ponowisz próbę logowania."
       blank_username: "Podaj swój adres e-mail lub nazwę użytkownika."
       blank_username_or_password: "Podaj swój email lub nazwę użytkownika i hasło"
@@ -1416,11 +1507,13 @@ pl_PL:
       not_allowed_from_ip_address: "Nie możesz się zalogować z tego adresu IP."
       admin_not_allowed_from_ip_address: "Nie możesz się zalogować jako admin z tego adresu IP."
       resend_activation_email: "Kliknij tutaj, aby ponownie wysłać email z aktywacją konta."
+      omniauth_disallow_totp: "Twoje konto ma włączone uwierzytelnianie dwuskładnikowe. Zaloguj się za pomocą swojego hasła."
       resend_title: "Wyślij ponownie Email aktywacyjny"
       change_email: "Zmień Adres Email"
       provide_new_email: "Wprowadź nowy adres Email. Wyślemy na niego mail potwierdzający."
       submit_new_email: "Zaktualizuj adres Email"
       sent_activation_email_again: "Wysłaliśmy do ciebie kolejny email z aktywacją konta na <b>{{currentEmail}}</b>. Zanim dotrze, może minąć kilka minut; pamiętaj, żeby sprawdzić folder ze spamem."
+      sent_activation_email_again_generic: "Wysłaliśmy kolejny e-mail aktywacyjny. Przybycie może potrwać kilka minut; koniecznie sprawdź folder ze spamem."
       to_continue: "Zaloguj się"
       preferences: "Musisz się zalogować, aby zmieniać swoje ustawienia."
       forgot: "Nie pamiętam konta"
@@ -1463,6 +1556,7 @@ pl_PL:
       apple_international: "Apple/Międzynarodowy"
       google: "Google"
       twitter: "Twitter"
+      emoji_one: "JoyPixels (wcześniej EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1471,6 +1565,8 @@ pl_PL:
       categories_with_featured_topics: "Kategorie z wybranymi tematami"
       categories_and_latest_topics: "Kategorie i ostatnie tematy"
       categories_and_top_topics: "Kategorie i najlepsze tematy"
+      categories_boxes: "Pudełka z podkategoriami"
+      categories_boxes_with_topics: "Pudełka z polecanymi tematami"
     shortcut_modifier_key:
       shift: "Shift"
       ctrl: "Ctrl"
@@ -1496,9 +1592,12 @@ pl_PL:
         few: "Wybierz co najmniej {{count}} elementy."
         many: "Wybierz co najmniej {{count}} elementów."
         other: "Wybierz co najmniej {{count}} elementów."
+      invalid_selection_length: "Zaznaczenie musi zawierać co najmniej {{count}} znaków."
     date_time_picker:
       from: Od
       to: Do
+      errors:
+        to_before_from: "Do daty musi być późniejsza niż data."
     emoji_picker:
       filter_placeholder: Szukaj emoji
       smileys_&_emotion: Emotikony i emocje
@@ -1510,7 +1609,6 @@ pl_PL:
       objects: Obiekty
       symbols: Symbolika
       flags: Flagi
-      custom: Spersonalizowane emoji
       recent: Ostatnio używane
       default_tone: Brak koloru skóry
       light_tone: Jasny kolor skóry
@@ -1518,6 +1616,7 @@ pl_PL:
       medium_tone: Średni kolor skóry
       medium_dark_tone: Średnio ciemny kolor skóry
       dark_tone: Ciemny kolor skóry
+      default: Spersonalizowane emoji
     shared_drafts:
       title: "Udostępnione projekty"
       notice: "Ten temat jest widoczny tylko użytkowników mających dostęp do kategorii <b>{{category}}</b>."
@@ -1539,6 +1638,8 @@ pl_PL:
       saved_local_draft_tip: "zapisano lokalnie"
       similar_topics: "Twój temat jest podobny do…"
       drafts_offline: "szkice offline"
+      edit_conflict: "edytuj konflikt"
+      group_mentioned_limit: "<b>Ostrzeżenie!</b> Wspomniałeś o <a href='{{group_link}}'>{{group}}</a> , jednak ta grupa ma więcej członków niż skonfigurowany przez administratora limit wzmianek dla użytkowników {{max}}. Nikt nie zostanie powiadomiony."
       group_mentioned:
         one: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>%{count} osobę</a> – czy jesteś pewien?"
         few: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osoby</a> – czy jesteś pewien?"
@@ -1558,7 +1659,9 @@ pl_PL:
         try_like: "Czy wypróbowałeś przycisk {{heart}}?"
         category_missing: "Musisz wybrać kategorię"
         tags_missing: "Musisz wybrać co najmniej {{count}} tagów"
+        topic_template_not_modified: "Dodaj szczegóły i szczegóły do swojego tematu, edytując szablon tematu."
       save_edit: "Zapisz zmiany"
+      overwrite_edit: "Zastąp edycję"
       reply_original: "Odpowiedz na Oryginalny Temat"
       reply_here: "Odpowiedz tutaj"
       reply: "Odpowiedz"
@@ -1581,6 +1684,7 @@ pl_PL:
       view_new_post: "Zobacz Twój nowy wpis."
       saving: "Zapisywanie"
       saved: "Zapisano!"
+      saved_draft: "Publikowanie wersji roboczej w toku. Stuknij, aby wznowić."
       uploading: "Wczytuję…"
       show_preview: "pokaż podgląd &raquo;"
       hide_preview: "&laquo; schowaj podgląd"
@@ -1608,6 +1712,11 @@ pl_PL:
       list_item: "Element listy"
       toggle_direction: "Zmień kierunek"
       help: "Pomoc formatowania Markdown"
+      collapse: "zminimalizuj panel kompozytora"
+      open: "otwórz panel kompozytora"
+      abandon: "zamknij kompozytora i odrzuć wersję roboczą"
+      enter_fullscreen: "wprowadź kompozytora na pełnym ekranie"
+      exit_fullscreen: "zamknij kompozytora na pełnym ekranie"
       modal_ok: "OK"
       modal_cancel: "Anuluj"
       cant_send_pm: "Przepraszamy, niestety nie możesz wysłać prywatnej wiadomości do %{username}."
@@ -1617,12 +1726,15 @@ pl_PL:
       admin_options_title: "Opcjonalne ustawienia zespołu dla tego tematu"
       composer_actions:
         reply: Odpowiedź
+        draft: Wersja robocza
         edit: Edycja
         reply_to_post:
+          label: "Odpowiedz na post %{postNumber} przez %{postUsername}"
           desc: Odpowiedz na określony post
         reply_as_new_topic:
           label: Odpowiedz jako powiązany temat
           desc: Utwórz nowy temat powiązany z tym tematem
+          confirm: "Zapisano nową wersję roboczą tematu, która zostanie zastąpiona, jeśli utworzysz połączony temat."
         reply_as_private_message:
           label: Nowa wiadomość
           desc: Utwórz nową osobistą wiadomość
@@ -1634,6 +1746,12 @@ pl_PL:
           desc: Szepty są widoczne tylko dla pracowników
         create_topic:
           label: "Nowy temat"
+        shared_draft:
+          label: "Udostępniony projekt"
+          desc: "Opracuj temat, który będzie widoczny tylko dla personelu"
+        toggle_topic_bump:
+          label: "Przełącz wypukłość tematu"
+          desc: "Odpowiedz bez zmiany ostatniej daty odpowiedzi"
     notifications:
       tooltip:
         regular:
@@ -1646,12 +1764,20 @@ pl_PL:
           few: "Nieodczytane wiadomości: {{count}}"
           many: "Nieodczytane wiadomości: {{count}}"
           other: "Nieodczytane wiadomości: 1"
+        high_priority:
+          one: "%{count} nieprzeczytane powiadomienie o wysokim priorytecie"
+          few: "%{count} nieprzeczytane powiadomienie o wysokim priorytecieis"
+          many: "%{count} nieprzeczytane powiadomienie o wysokim priorytecieis"
+          other: "%{count} nieprzeczytane powiadomienie o wysokim priorytecieis"
       title: "powiadomienia o wywołanej @nazwie, odpowiedzi do twoich wpisów i tematów, prywatne wiadomości, itp"
       none: "Nie udało się załadować listy powiadomień."
       empty: "Nie znaleziono powiadomień."
+      post_approved: "Twój post został zatwierdzony"
+      reviewable_items: "przedmioty wymagające przeglądu"
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1678,6 +1804,7 @@ pl_PL:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nowy temat</span> {{description}}"
       membership_request_accepted: "Członkostwo zaakceptowane w „{{group_name}}”"
+      membership_request_consolidated: "{{count}} otwarte wnioski o członkostwo dla „{{group_name}}”"
       group_message_summary:
         one: "masz {{count}} wiadomość w skrzynce odbiorczej {{group_name}}"
         few: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
@@ -1696,15 +1823,19 @@ pl_PL:
         confirm_body: "Powodzenie! Powiadomienia zostały włączone."
         custom: "Powiadomienie od {{username}} na %{site_title}"
       titles:
+        mentioned: "wzmiankowany"
         replied: "nowa odpowiedź"
         quoted: "zacytowany"
         edited: "edytowane"
         liked: "nowe polubienie"
         private_message: "nowa prywatna wiadomość"
+        invited_to_private_message: "zaproszony na prywatną wiadomość"
         invitee_accepted: "zaproszenie przyjęte"
         posted: "nowy post"
         moved_post: "post został przeniesiony"
         linked: "połączony"
+        bookmark_reminder: "przypomnienie o zakładce"
+        bookmark_reminder_with_name: "przypomnienie o zakładce - %{name}"
         granted_badge: "przyznana odznaka"
         invited_to_topic: "zaproszony do tematu"
         group_mentioned: "wspomniana grupa"
@@ -1713,6 +1844,7 @@ pl_PL:
         topic_reminder: "przypomnienie tematu"
         liked_consolidated: "nowe polubienia"
         post_approved: "post zatwierdzony"
+        membership_request_consolidated: "nowe wnioski o członkostwo"
     upload_selector:
       title: "Dodaj obraz"
       title_with_attachments: "Dodaj obraz lub plik"
@@ -1759,6 +1891,7 @@ pl_PL:
       context:
         user: "Szukaj wpisów @{{username}}"
         category: "Szukaj w kategorii #{{category}}"
+        tag: "Wyszukaj znacznik # {{tag}}"
         topic: "Szukaj w tym temacie"
         private_messages: "Wyszukiwanie wiadomości"
       advanced:
@@ -1778,6 +1911,7 @@ pl_PL:
           title: Dopasowanie tylko w tytule
           likes: Lubię
           posted: Opublikowałem w
+          created: ja stworzyłem
           watching: Obserwuję
           tracking: Śledzę
           private: W moich wiadomościach
@@ -1794,6 +1928,7 @@ pl_PL:
           label: Tematy gdzie
           open: są otwarte
           closed: są zamknięte
+          public: są publiczne
           archived: są archiwizowane
           noreplies: ma zero odpowiedzi
           single_user: zawierają użytkownika
@@ -1885,6 +2020,13 @@ pl_PL:
       defer:
         help: "Oznacz jako nieprzeczytane"
         title: "Zignoruj"
+      feature_on_profile:
+        help: "Dodaj link do tego tematu na karcie użytkownika i profilu"
+        title: "Funkcja na profilu"
+      remove_from_profile:
+        warning: "Twój profil ma już polecany temat. Jeśli będziesz kontynuować, ten temat zastąpi istniejący."
+        help: "Usuń link do tego tematu w swoim profilu użytkownika"
+        title: "Usuń z profilu"
       list: "Tematy"
       new: "nowy temat"
       unread: "nieprzeczytane"
@@ -1940,6 +2082,7 @@ pl_PL:
       group_request_sent: "Twoja prośba o członkostwo w grupie została wysłana. Zostaniesz poinformowany, kiedy zostanie zaakceptowane."
       unread_indicator: "Nikt jeszcze nie czytał ostatniego postu w tym temacie."
       read_more_MF: "Masz do zobaczenia { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 nieprzeczytany</a> } other { are <a href='{basePath}/unread'># nieprzeczytanych</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 nowy</a> temat} other { {BOTH, select, true{and } false {} other{}} <a href='{basePath}/new'># nowych</a> tematów} }, lub {CATEGORY, select, true {przeglądaj inne tematy w {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT} {LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Przeglądaj wszystkie kategorie
       view_latest_topics: pokaż aktualne tematy
       suggest_create_topic: "Może rozpoczniesz temat?"
@@ -1947,11 +2090,14 @@ pl_PL:
       jump_reply_down: przeskocz do późniejszej odpowiedzi
       deleted: "Temat został usunięty"
       topic_status_update:
+        title: "Timer tematów"
         save: "Ustaw czas"
         num_of_hours: "Liczba godzin:"
+        num_of_days: "Liczba dni:"
         remove: "Usuń czas"
         publish_to: "Opublikuj do:"
         when: "Kiedy:"
+        public_timer_types: Timery tematów
         time_frame_required: Wybierz przedział czasowy
       auto_update_input:
         none: "Wybierz przedział czasowy"
@@ -2449,6 +2595,7 @@ pl_PL:
             title: "Pokaż część html emaila"
             button: "HTML"
       bookmarks:
+        created: "Utworzono"
         name: "Imię"
     category:
       can: "może&hellip; "
@@ -3854,7 +4001,6 @@ pl_PL:
           staff: "Zespół"
           suspended: "Zawieszeni"
           silenced: "Wyciszony"
-          suspect: "Podejrzani"
           staged: "Wystawiany na scenie"
         approved: "Zatwierdzam?"
         titles:
@@ -3871,7 +4017,6 @@ pl_PL:
           moderators: "Moderatoratorzy"
           silenced: "Wyciszeni użytkownicy"
           suspended: "Zawieszone konta"
-          suspect: "Podejrzani użytkownicy"
           staged: "Wystawieni użytkownicy"
         not_verified: "Niezweryfikowany"
         check_email:
@@ -4228,6 +4373,7 @@ pl_PL:
         help: "Dodawanie nowych emoji. (PROTIP: przeciągnij i upuść wiele plików)"
         add: "Dodaj nowe Emoji"
         name: "Nazwa"
+        group: "Grupa"
         image: "Grafika"
         delete_confirm: "Jesteś pewny(-a), że chcesz usunąć emoji :%{name}: ?"
       embedding:
@@ -4254,7 +4400,6 @@ pl_PL:
         save: "Zapisz"
       permalink:
         title: "Permalinki"
-        description: "Zwróć uwagę na to, że to ustawienie zastosowane zostanie wyłącznie do zewnętrznych źródeł, linki umieszczone na forum nie ulegną przekierowaniu."
         url: "URL"
         topic_id: "ID tematu"
         topic_title: "Temat"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 7a8e4cb363..de71481603 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -28,7 +28,6 @@ pt:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM, hh:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "DD MMM YYYY hh:mm"
@@ -255,6 +254,12 @@ pt:
       remove: "Remover Marcador"
       confirm_clear: "De certeza que pretende remover todos os marcadores deste tópico?"
       save: "Guardar"
+      reminders:
+        later_today: "Hoje, mais tarde"
+        tomorrow: "Amanhã"
+        next_week: "Próxima semana"
+        later_this_week: "No final desta semana"
+        next_month: "Próximo mês"
     drafts:
       resume: "Continuar"
       remove: "Remover"
@@ -778,10 +783,6 @@ pt:
         success_staff: "Nós enviámos uma mensagem para o seu endereço atual. Por favor, siga as instruções de confirmação."
       change_avatar:
         title: "Alterar a sua imagem de perfil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseado em"
-        gravatar_title: "Mude o seu avatar no sítio Gravatar"
-        gravatar_failed: "Não conseguimos encontrar um Gravatar com esse endereço de email."
-        refresh_gravatar_title: "Atualize o seu Gravatar"
         letter_based: "Imagem de perfil atribuída pelo sistema"
         uploaded_avatar: "Foto personalizada"
         uploaded_avatar_empty: "Adicionar foto personalizada"
@@ -1047,6 +1048,8 @@ pt:
         back: "Voltar Atrás"
         again: "Tentar Novamente"
         fixed: "Carregar Página"
+    modal:
+      close: "fechar"
     close: "Fechar"
     assets_changed_confirm: "Este site acabou se ser atualizado. Recarregar agora para a versão mais recente?"
     logout: "A sua sessão foi encerrada."
@@ -1245,7 +1248,6 @@ pt:
       objects: Objetos
       symbols: Símbolos
       flags: Bandeiras
-      custom: Emojis Personalizados
       recent: Utilizado recentemente
       default_tone: Sem tom de pele
       light_tone: Tom de pele claro
@@ -1253,6 +1255,7 @@ pt:
       medium_tone: Tom de pele médio
       medium_dark_tone: Tom de pele meio escuro
       dark_tone: Tom de pele escuro
+      default: Emojis Personalizados
     shared_drafts:
       title: "Rascunhos Partilhados"
       notice: "Este tópico só está visível aos utilizadores que conseguem ver a categoria <b>{{category}}</b>."
@@ -1393,6 +1396,7 @@ pt:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span>{{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2043,6 +2047,7 @@ pt:
           html_part:
             button: "HTML"
       bookmarks:
+        created: "Criado"
         name: "Nome"
     category:
       can: "pode&hellip; "
@@ -2995,7 +3000,6 @@ pt:
           active: "Ativo"
           staff: "Pessoal"
           suspended: "Suspenso"
-          suspect: "Suspeito"
           staged: "Não Confirmado"
         approved: "Aprovado?"
         titles:
@@ -3011,7 +3015,6 @@ pt:
           admins: "Utilizadores da Administração"
           moderators: "Moderadores"
           suspended: "Utilizadores Suspensos"
-          suspect: "Utilizadores Suspeitos"
         not_verified: "Não verificado"
         check_email:
           title: "Revelar o endereço de email deste utilizador"
@@ -3302,6 +3305,7 @@ pt:
         help: "Adicionar novo emoji que irá estar disponível para todos. (PROTIP: arraste múltiplos ficheiros de uma só vez)"
         add: "Adicionar Novo Emoji"
         name: "Nome"
+        group: "Grupo"
         image: "Imagem"
         delete_confirm: "Tem a certeza que deseja eliminar o emoji :%{name}:?"
       embedding:
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index c2100cc36d..694ec3e025 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -26,15 +26,14 @@ pt_BR:
         thousands: "{{number}}k"
         millions: "{{number}}M"
     dates:
-      time: "H:mm"
+      time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, H:mm"
       long_no_year_no_time: "D MMM"
-      full_no_year_no_time: "D de MMMM"
+      full_no_year_no_time: "D [de] MMMM"
       long_with_year: "D MMM, YYYY H:mm"
       long_with_year_no_time: "D MMM, YYYY"
-      full_with_year_no_time: "D de MMMM, YYYY"
+      full_with_year_no_time: "D [de] MMMM, YYYY"
       long_date_with_year: "D MMM, 'YY LT"
       long_date_without_year: "D MMM, LT"
       long_date_with_year_without_time: "D MMM, 'YY"
@@ -153,6 +152,7 @@ pt_BR:
       banner:
         enabled: "tornou isto um banner %{when}. Isto será mostrado no topo de todas as páginas até que seja descartado pelo usuário."
         disabled: "removeu este banner %{when}. Ele não vai mais aparecer no topo de todas as páginas."
+      forwarded: "encaminhado o e-mail acima"
     topic_admin_menu: "ações de tópico"
     wizard_required: "Bem vindo ao seu novo Discourse! Vamos começar com o <a href='%{url}' data-auto-route='true'>assistente de configuração</a> ✨"
     emails_are_disabled: "Todo o envio de e-mail foi globalmente desabilitado por um administrador. Nenhum e-mail de notificações de qualquer tipo será enviado."
@@ -263,19 +263,22 @@ pt_BR:
     bookmarks:
       created: "você marcou esta postagem como favorita"
       not_bookmarked: "marcar postagem como favorita"
-      created_with_reminder: "você marcou esta postagem como favorito com um lembrete em %{date}"
+      created_with_at_desktop_reminder: "você marcou esta postagem como favorita e será lembrado na próxima vez em que estiver em sua área de trabalho"
       remove: "Remover Favorito"
       confirm_clear: "Você tem certeza de que deseja apagar todos os seus favoritos deste tópico?"
       save: "Salvar"
       no_timezone: 'Você ainda não definiu um fuso horário. VOcê não poderá definir lembretes. Configure um <a href="%{basePath}/my/preferences/profile">no seu perfil</a>.'
+      invalid_custom_datetime: "A data e a hora que você forneceu são inválidas, por favor tente novamente."
+      list_permission_denied: "Você não tem permissão para visualizar os favoritos deste usuário."
       reminders:
         at_desktop: "Da próxima vez que estiver na minha área de trabalho"
-        later_today: "Hoje mais tarde"
-        next_business_day: "Próximo dia comercial"
+        later_today: "Mais tarde hoje"
         tomorrow: "Amanhã"
         next_week: "Próxima semana"
+        later_this_week: "Mais tarde nesta semana"
         next_month: "Próximo mês"
         custom: "Data e hora personalizadas"
+        none: "Nenhum lembrete necessário"
     drafts:
       resume: "Resumir"
       remove: "Remova"
@@ -386,6 +389,7 @@ pt_BR:
       deleted_user: "(usuário excluído)"
       user:
         bio: "Bio"
+        website: "Website"
         username: "Nome de Usuário"
         email: "E-mail"
         name: "Nome"
@@ -537,6 +541,7 @@ pt_BR:
         deny: "Negar"
         denied: "negado"
         undone: "solicitação desfeita"
+        handle: "tratar pedido de associação"
       manage:
         title: "Gerenciar"
         name: "Nome"
@@ -577,6 +582,8 @@ pt_BR:
       leave: "Sair"
       request: "Solicitar"
       message: "Mensagem"
+      confirm_leave: "Tem certeza de que deseja sair desse grupo?"
+      allow_membership_requests: "Permitir que usuários enviem pedidos de adesão a donos do grupo (Requer grupo visível ao público)"
       membership_request_template: "Modelo personalizado para exibir aos usuários ao enviar uma solicitação de associação"
       membership_request:
         submit: "Enviar Solicitação"
@@ -862,6 +869,7 @@ pt_BR:
         deleted_posts: "postagens excluídas"
         suspensions: "suspensões"
         warnings_received: "avisos"
+        rejected_posts: "postagens rejeitadas"
       messages:
         all: "Todas"
         inbox: "Caixa de entrada"
@@ -937,6 +945,7 @@ pt_BR:
           title: "Autenticadores Baseados em Token"
           add: "Novo Autenticador"
           default_name: "Meu Autenticador"
+          name_and_code_required_error: "Você deve fornecer um nome e o código do seu aplicativo de autenticação."
         security_key:
           register: "Registro"
           title: "Chaves de Segurança"
@@ -947,6 +956,7 @@ pt_BR:
           edit: "Editar Chave de Segurança"
           edit_description: "Nome da Chave de Segurança"
           delete: "Excluir"
+          name_required_error: "Você deve fornecer um nome para sua chave de segurança."
       change_about:
         title: "Modificar Sobre Mim"
         error: "Houve um erro ao alterar este valor."
@@ -963,10 +973,6 @@ pt_BR:
         success_staff: "Enviamos um e-mail para o seu endereço atual. Por favor, siga as instruções de confirmação."
       change_avatar:
         title: "Alterar sua imagem de perfil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseado em"
-        gravatar_title: "Alterar seu avatar no site do Gravatar"
-        gravatar_failed: "Não conseguimos encontrar um Gravatar com este endereço de e-mail."
-        refresh_gravatar_title: "Atualizar seu Gravatar"
         letter_based: "Imagem de perfil atribuída pelo sistema"
         uploaded_avatar: "Imagem personalizada"
         uploaded_avatar_empty: "Adicionar uma imagem personalizada"
@@ -1029,6 +1035,8 @@ pt_BR:
         any: "qualquer"
       password_confirmation:
         title: "Senha Novamente"
+      invite_code:
+        title: "Código de convite"
       auth_tokens:
         title: "Dispositivos Usados Recentemente"
         ip: "IP"
@@ -1249,6 +1257,8 @@ pt_BR:
         back: "Voltar"
         again: "Tentar Novamente"
         fixed: "Carregar Página"
+    modal:
+      close: "fechar"
     close: "Fechar"
     assets_changed_confirm: "Este site acabou de ser atualizado. Atualizar a página agora para ver a última versão?"
     logout: "Você foi desconectado."
@@ -1475,7 +1485,6 @@ pt_BR:
       objects: Objetos
       symbols: Símbolos
       flags: Sinalizações
-      custom: Emojis personalizados
       recent: Usados recentemente
       default_tone: Sem tom de pele
       light_tone: Tom de pele claro
@@ -1483,6 +1492,7 @@ pt_BR:
       medium_tone: Tom de pele médio
       medium_dark_tone: Tom de pele médio escuro
       dark_tone: Tom de pele escuro
+      default: Emojis personalizados
     shared_drafts:
       title: "Rascunhos Compartilhados"
       notice: "Este tópico só é visível para aqueles que podem ver a categoria <b>{{category}}</b>."
@@ -1630,6 +1640,7 @@ pt_BR:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2406,9 +2417,8 @@ pt_BR:
             button: "HTML"
       bookmarks:
         create: "Criar marcador"
+        created: "Criado"
         name: "Nome"
-        name_placeholder: "Nomeie o marcador para ajudar a melhorar sua memória"
-        set_reminder: "Definir um lembrete"
     category:
       can: "pode&hellip; "
       none: "(sem categoria)"
@@ -3831,7 +3841,6 @@ pt_BR:
           staff: "Equipe"
           suspended: "Suspenso"
           silenced: "Silenciado"
-          suspect: "Suspeito"
           staged: "Encenado"
         approved: "Aprovado?"
         titles:
@@ -3848,7 +3857,6 @@ pt_BR:
           moderators: "Moderadores"
           silenced: "Usuários Silenciados"
           suspended: "Usuários Suspensos"
-          suspect: "Usuários suspeitos"
           staged: "Usuários em etapas"
         not_verified: "Não verificado"
         check_email:
@@ -4199,6 +4207,7 @@ pt_BR:
         help: "Adicionar novo emoji que estará disponível para todos. (DICA: arraste & solte diversos arquivos de uma vez)"
         add: "Adicionar Novo Emoji"
         name: "Nome"
+        group: "Grupo"
         image: "Imagem"
         delete_confirm: "Tem certeza que deseja excluir o emoji :%{name}: ?"
       embedding:
@@ -4225,7 +4234,6 @@ pt_BR:
         save: "Salvar Configurações de Incorporação"
       permalink:
         title: "Links permanentes"
-        description: "Por favor note que isto só se aplica a fontes externas, links postados no seu fórum não serão redirecionados."
         url: "URL"
         topic_id: "ID do Tópico"
         topic_title: "Tópico"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index b5352de22d..7bc7fb4b44 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -29,7 +29,6 @@ ro:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM, HH:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM "
       long_with_year: "DD MMM YYYY HH:mm"
@@ -260,6 +259,12 @@ ro:
       created: "Ai pus semn de carte pe acest mesaj"
       remove: "Șterge semn de carte"
       save: "Salvează"
+      reminders:
+        later_today: "Mai târziu azi"
+        tomorrow: "Mâine"
+        next_week: "Săptămâna viitoare"
+        later_this_week: "Mai târziu săptămâna asta"
+        next_month: "Luna viitoare"
     drafts:
       resume: "Reluați"
       remove: "Eliminați"
@@ -734,9 +739,6 @@ ro:
         success_staff: "Ți-am trimis un email la adresa curentă. Urmează instrucțiunile de confirmare."
       change_avatar:
         title: "Schimbă poza de profil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, bazat pe"
-        gravatar_title: "Schimbă-ți avatarul de pe site-ul Gravatar."
-        refresh_gravatar_title: "Reactualizează Gravatarul"
         letter_based: "Poză de profil atribuită de sistem."
         uploaded_avatar: "Poză preferată"
         uploaded_avatar_empty: "Adaugă poza preferată"
@@ -979,6 +981,8 @@ ro:
         back: "Înapoi"
         again: "Încearcă din nou"
         fixed: "Încărcare pagină"
+    modal:
+      close: "Închide"
     close: "Închide"
     assets_changed_confirm: "Acest site tocmai a fost actualizat. Reîmprospătați pentru cea mai nouă versiune?"
     logout: "Aţi fost deconectat."
@@ -1141,8 +1145,8 @@ ro:
       filter_placeholder: Caută emoji
       objects: Obiecte
       flags: Marcaje de avertizare
-      custom: Emojii personalizate
       recent: Folosite recent
+      default: Emojii personalizate
     shared_drafts:
       notice: "Această discuție este vizibilă doar pentru cei care pot accesa categoria <b>{{category}}</b>."
       publishing: "Se postează discuția ..."
@@ -1256,6 +1260,7 @@ ro:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1906,6 +1911,7 @@ ro:
             title: "Arată partea HTML a emailului"
             button: "HTML"
       bookmarks:
+        created: "Creat"
         name: "Nume"
     category:
       can: "can&hellip; "
@@ -2956,7 +2962,6 @@ ro:
           active: "Activi"
           staff: "Membrii echipei"
           suspended: "Suspendați"
-          suspect: "Suspecți"
           staged: "Pus în scenă"
         approved: "Aprobați?"
         titles:
@@ -2972,7 +2977,6 @@ ro:
           admins: "Administratori"
           moderators: "Moderatori"
           suspended: "Utilizatori suspendați"
-          suspect: "Utilizatori suspecţi"
         not_verified: "Neverificat"
         check_email:
           title: "Arată adresa de email a acestui utilizator"
@@ -3277,6 +3281,7 @@ ro:
         help: "Adaugă un nou \"emoji\" care va fi disponibil pentru toţi. (PROTIP: trage şi adaugă mai multe fişiere odată)"
         add: "Adaugă un emoji nou"
         name: "Nume"
+        group: "Grup"
         image: "Imagine"
         delete_confirm: "Ești sigur că vrei să ștergi emoji-ul :%{name}:?"
       embedding:
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index de1b818d13..26af4e1697 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -198,7 +198,7 @@ ru:
         enabled: "Создал баннер %{when}. Он будет отображаться вверху каждой страницы пока пользователь не закроет его."
         disabled: "Удалил баннер %{when}. Он больше не будет отображаться в верхней части каждой страницы."
       forwarded: "переадресовал вышеуказанное письмо"
-    topic_admin_menu: "действия по теме"
+    topic_admin_menu: "Действия администратора над темой"
     wizard_required: "Добро пожаловать в ваш новый Discourse! Начните с <a href='%{url}' data-auto-route='true'>мастера настройки</a> ✨"
     emails_are_disabled: "Все исходящие письма были глобально отключены администратором. Уведомления любого вида не будут отправляться на почту."
     bootstrap_mode_enabled: "Чтобы облегчить развитие вашего нового сайта в самом начале, был включен режим запуска. В этом режиме, всем новым пользователям будет автоматически присвоен 1-й уровень доверия при регистрации и включена ежедневная почтовая рассылка сводки новостей. Режим запуска будет выключен автоматически, как только количество зарегистрированных пользователей достигнет %{min_users}."
@@ -250,7 +250,7 @@ ru:
       few: "ссылки"
       many: "ссылок"
       other: "ссылок"
-    faq: "Вопрос-ответ"
+    faq: "Правила"
     guidelines: "Руководство"
     privacy_policy: "Политика конфиденциальности"
     privacy: "Политика конфиденциальности"
@@ -287,7 +287,7 @@ ru:
       pm_title: "Похожие сообщения"
     about:
       simple_title: "Информация"
-      title: "Информация про %{title}"
+      title: "Информация о %{title}"
       stats: "Статистика сайта"
       our_admins: "Наши администраторы"
       our_moderators: "Наши модераторы"
@@ -299,7 +299,7 @@ ru:
       like_count: "Симпатии"
       topic_count: "Темы"
       post_count: "Сообщения"
-      user_count: "Пользователей"
+      user_count: "Пользователи"
       active_user_count: "Активные пользователи"
       contact: "Контакты"
       contact_info: "В случае возникновения критической ошибки или срочного дела, касающегося этого сайта, свяжитесь с нами по адресу %{contact_info}."
@@ -309,22 +309,34 @@ ru:
       help:
         bookmark: "Добавить в закладки первое сообщение этой темы"
         unbookmark: "Удалить все закладки в этой теме"
+        unbookmark_with_reminder: "Нажмите для удаления всех закладок и напоминаний в этой теме. У вас уже есть напоминание для этой темы, настроенное на %{reminder_at}."
     bookmarks:
       created: "Вы добавили это сообщение в закладки"
       not_bookmarked: "Добавить сообщение в закладки"
-      created_with_reminder: "вы добавили это сообщение в закладки с последующим напоминанием %{date}"
+      created_with_reminder: "Вы добавили это сообщение в закладки с последующим напоминанием %{date}"
+      created_with_at_desktop_reminder: "Вы добавили это сообщение в закладки с последующим напоминанием, когда вы откроете это сообщение на настольном компьютере"
       remove: "Удалить закладку"
       confirm_clear: "Вы действительно хотите удалить все ваши закладки из этой темы?"
       save: "Сохранить"
-      no_timezone: 'Укажите ваш часовой пояс <a href="%{basePath}/my/preferences/profile">в настройках своей учетной записи</a>, чтобы активировать функцию напоминаний.'
+      no_timezone: 'Укажите ваш часовой пояс <a href="%{basePath}/my/preferences/profile">в настройках своей учётной записи</a>, чтобы активировать функцию напоминаний.'
+      invalid_custom_datetime: "Неверно указаны дата и время, попробуйте ещё раз."
+      list_permission_denied: "У вас недостаточно прав для просмотра закладок этого пользователя."
       reminders:
-        at_desktop: "При следующем посещении форума"
-        later_today: "На сегодня, но чуть позже"
+        at_desktop: "При следующем посещении форума через настольный компьютер"
+        later_today: "Сегодня, но позже"
         next_business_day: "На следующий рабочий день"
-        tomorrow: "На завтра"
-        next_week: "На следующую неделю"
-        next_month: "На следующий месяц"
+        tomorrow: "Завтра"
+        next_week: "На следующей неделе"
+        later_this_week: "Позже на этой неделе"
+        start_of_next_business_week: "В следующий понедельник"
+        next_month: "В следующем месяце"
         custom: "Установить дату и время напоминания"
+        last_custom: "Использовать ранее установленную дату и время"
+        none: "Не настраивать напоминание"
+        today_with_time: "сегодня в %{time}"
+        tomorrow_with_time: "завтра в %{time}"
+        at_time: "в %{date_time}"
+        existing_reminder: "Для этой закладки уже настроено напоминание, которое будет отправлено"
     drafts:
       resume: "Продолжить"
       remove: "Удалить"
@@ -388,7 +400,7 @@ ru:
       order_by: "Сортировать по"
       in_reply_to: "в ответе"
       explain:
-        why: "объяснить, почему этот элемент оказался в очереди"
+        why: "Объяснить, почему этот элемент оказался в очереди"
         title: "Обзорная оценка"
         formula: "Формула"
         subtotal: "Промежуточный итог"
@@ -426,14 +438,14 @@ ru:
           title: "Обзорные приоритеты"
       moderation_history: "История модерации"
       view_all: "Посмотреть все"
-      grouped_by_topic: "Сгруппированные по темам"
+      grouped_by_topic: "Группировать по темам"
       none: "Нет элементов для премодерации."
       view_pending: "просмотр в ожидании"
       topic_has_pending:
         one: "В этой теме <b>%{count}</b> сообщение ожидает проверки"
-        few: "В этой теме <b>{{count}}</b> сообщения ожидает проверки"
-        many: "В этой теме <b>{{count}}</b> сообщений ожидает проверки"
-        other: "В этой теме <b>{{count}}</b> сообщений ожидает проверки"
+        few: "В этой теме <b>{{count}}</b> сообщения ожидают проверки"
+        many: "В этой теме <b>{{count}}</b> сообщений ожидают проверки"
+        other: "В этой теме <b>{{count}}</b> сообщений ожидают проверки"
       title: "Премодерация"
       topic: "Тема:"
       filtered_topic: "Вы отфильтровали для просмотра содержимое в одной теме."
@@ -443,7 +455,7 @@ ru:
       deleted_user: "(пользователь удален)"
       user:
         bio: "О себе"
-        website: "Вебсайт"
+        website: "Веб-сайт"
         username: "Псевдоним"
         email: "Email"
         name: "Имя"
@@ -500,10 +512,10 @@ ru:
         status: "Статус"
         category: "Раздел"
         orders:
-          priority: "Приоритет"
-          priority_asc: "Приоритет (обратный)"
-          created_at: "Создан в"
-          created_at_asc: "Созданные в (обратный)"
+          priority: "Приоритету"
+          priority_asc: "Приоритету (обратная сортировка)"
+          created_at: "Дате создания"
+          created_at_asc: "Дате создания (обратная сортировка)"
         priority:
           title: "Минимальный приоритет:"
           low: "(любой)"
@@ -523,21 +535,21 @@ ru:
         pending:
           title: "В ожидании"
         approved:
-          title: "Одобренный"
+          title: "Одобренные"
         rejected:
-          title: "Отклонено"
+          title: "Отклонённые"
         ignored:
-          title: "Игнорируемый"
+          title: "Проигнорированные"
         deleted:
-          title: "Удалено"
+          title: "Удалённые"
         reviewed:
-          title: "(все рассмотрено)"
+          title: "(все рассмотренные)"
         all:
-          title: "(всё)"
+          title: "(все)"
       types:
         reviewable_flagged_post:
           title: "Сообщение отмечено как ЖАЛОБА"
-          flagged_by: "Отмечено"
+          flagged_by: "Кем отмечено"
         reviewable_queued_topic:
           title: "Тема в очереди"
         reviewable_queued_post:
@@ -582,8 +594,9 @@ ru:
       no_results: "Ничего не найдено."
       days_visited: "Посещений"
       days_visited_long: "Дней посещения"
-      posts_read: "Прочитано сообщений"
+      posts_read: "Прочитано"
       posts_read_long: "Прочитано сообщений"
+      last_updated: "Последнее обновление"
       total_rows:
         one: "%{count} пользователь"
         few: "%{count} пользователя"
@@ -611,6 +624,7 @@ ru:
         deny: "Отрицать"
         denied: "отказано"
         undone: "запрос отменен"
+        handle: "обрабатывать запрос на вступление"
       manage:
         title: "Управление"
         name: "Имя"
@@ -743,7 +757,7 @@ ru:
       flair_preview_image: "Изображение предпросмотра"
     user_action_groups:
       "1": "Мои симпатии"
-      "2": "Получил симпатий"
+      "2": "Симпатии"
       "3": "Закладки"
       "4": "Темы"
       "5": "Сообщения"
@@ -846,6 +860,7 @@ ru:
         clear:
           title: "Очистить"
           warning: "Перестать считать эту тему избранной?"
+      use_current_timezone: "Использовать автоопределение часового пояса."
       profile_hidden: "Публичный профиль пользователя скрыт"
       expand_profile: "Развернуть"
       collapse_profile: "Свернуть"
@@ -946,6 +961,7 @@ ru:
         deleted_posts: "удалённые сообщения"
         suspensions: "приостановки"
         warnings_received: "предупреждения"
+        rejected_posts: "отклонённые сообщения"
       messages:
         all: "Все"
         inbox: "Входящие"
@@ -972,6 +988,7 @@ ru:
         success: "(письмо отправлено)"
         in_progress: "(отправка письма)"
         error: "(ошибка)"
+        emoji: "lock emoji"
         action: "Отправить письмо для сброса пароля"
         set_password: "Установить пароль"
         choose_new: "Выберите новый пароль"
@@ -1018,9 +1035,10 @@ ru:
         edit_description: "Имя второго фактора"
         enable_security_key_description: "Когда вы подготовите свой физический ключ безопасности, нажмите кнопку <b>Регистрация</b> ниже."
         totp:
-          title: "Token-Based аутентификация"
+          title: "Токен-аутентификация"
           add: "Новый аутентификатор"
           default_name: "Мой аутентификатор"
+          name_and_code_required_error: "Вы должны указать токен и его имя"
         security_key:
           register: "Зарегистрироваться"
           title: "Ключи безопасности"
@@ -1031,6 +1049,7 @@ ru:
           edit: "Изменить ключ безопасности"
           edit_description: "Имя ключа безопасности"
           delete: "Удалить"
+          name_required_error: "Вы должны указать имя ключа безопасности"
       change_about:
         title: "Изменить информацию обо мне"
         error: "При изменении значения произошла ошибка."
@@ -1046,22 +1065,22 @@ ru:
         success: "На указанную почту отправлено письмо с инструкциями."
         success_staff: "Мы отправили письмо на ваш текущий адрес электронной почты. Пожалуйста, следуйте инструкциям по подтверждению."
       change_avatar:
-        title: "Изменить фон профиля"
-        gravatar: "На основе <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "Измените свой аватар на сайте Gravatar"
-        gravatar_failed: "Мы не смогли найти Gravatar с этим адресом электронной почты."
-        refresh_gravatar_title: "Обновить ваш Gravatar"
-        letter_based: "Фон профиля по умолчанию"
+        title: "Изменить аватар"
+        gravatar: "На основе <a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>"
+        gravatar_title: "Изменить аватар на граватар {{gravatarName}}"
+        gravatar_failed: "Мы не можем найти граватар {{gravatarName}} по указанному адресу электронной почты."
+        refresh_gravatar_title: "Обновить граватар {{gravatarName}}"
+        letter_based: "Аватар по умолчанию"
         uploaded_avatar: "Собственный аватар"
         uploaded_avatar_empty: "Добавить собственный аватар"
         upload_title: "Загрузка собственного аватара"
         image_is_not_a_square: "Внимание: мы обрезали ваше изображение; ширина и высота не равны друг другу."
       change_profile_background:
         title: "Шапка профиля"
-        instructions: "Шапка профиля будут отцентрирована и по-умолчанию имеют ширину 1110 пикселей."
+        instructions: "Шапка профиля будет отцентрирована и по умолчанию имеет ширину 1110 пикселей."
       change_card_background:
         title: "Фон карточки пользователя"
-        instructions: "Картинки фона будут отцентрированы и по-умолчанию имеют ширину 590 пикселей."
+        instructions: "Картинка фона будет отцентрирована и по умолчанию имеет ширину 590 пикселей."
       change_featured_topic:
         title: "Избранная тема"
         instructions: "Ссылка на эту тему будет отображаться в карточке пользователя и в вашем профиле."
@@ -1115,6 +1134,9 @@ ru:
         any: "любой"
       password_confirmation:
         title: "Пароль ещё раз"
+      invite_code:
+        title: "Код приглашения"
+        instructions: "Для регистрации учётной записи требуется код приглашения"
       auth_tokens:
         title: "Недавно использованные устройства"
         ip: "IP"
@@ -1296,23 +1318,23 @@ ru:
           many: "закладок"
           other: "закладок"
         top_replies: "Лучшие сообщения"
-        no_replies: "Пока не написал ни одного сообщения."
+        no_replies: "Пока не написано ни одного сообщения."
         more_replies: "... другие сообщения"
         top_topics: "Лучшие темы"
-        no_topics: "Пока не создал ни одной темы."
+        no_topics: "Пока не создано ни одной темы."
         more_topics: "... другие темы"
         top_badges: "Самые престижные награды"
-        no_badges: "Еще не получил ни одной награды."
+        no_badges: "Еще не получено ни одной награды."
         more_badges: "... другие награды"
         top_links: "Лучшие ссылки"
         no_links: "Пока нет ссылок."
         most_liked_by: "Поклонники"
         most_liked_users: "Фавориты"
         most_replied_to_users: "Самые активные собеседники"
-        no_likes: "Пока ни одной симпатии."
+        no_likes: "Пока нет симпатий."
         top_categories: "Лучшие разделы"
-        topics: "Темы"
-        replies: "Отвечает"
+        topics: "Тем"
+        replies: "Ответов"
       ip_address:
         title: "Последний IP-адрес"
       registration_ip_address:
@@ -1353,6 +1375,9 @@ ru:
         back: "Вернуться"
         again: "Попытаться ещё раз"
         fixed: "Загрузить страницу"
+    modal:
+      close: "закрыть"
+      dismiss_error: "Отклонить ошибку"
     close: "Закрыть"
     assets_changed_confirm: "Сайт только что был обновлён. Перезагрузить страницу для перехода к новой версии?"
     logout: "Вы вышли."
@@ -1449,6 +1474,7 @@ ru:
     email_login:
       link_label: "Напишите мне ссылку для входа "
       button_label: "E-mail"
+      emoji: "lock emoji"
       complete_username: "Если учетная запись совпадает с именем пользователя <b>%{username}</b>, вы должны получить электронное письмо со ссылкой для входа в систему в ближайшее время."
       complete_email: "Если данные аккаунта совпадают с <b>%{email}</b>, вы должны получить электронное письмо со ссылкой для входа в систему в ближайшее время."
       complete_username_found: "Мы нашли учетную запись, которая соответствует имени пользователя <b>%{username}</b>, в ближайшее время вы получите электронное письмо со ссылкой для входа."
@@ -1526,6 +1552,7 @@ ru:
         backup_code: "Вместо этого используйте резервный код"
     invites:
       accept_title: "Приглашение"
+      emoji: "envelope emoji"
       welcome_to: "Добро пожаловать на %{site_name}!"
       invited_by: "Вы были приглашены:"
       social_login_available: "Вы также сможете входить через социальные сети, используя этот адрес электронной почты."
@@ -1591,17 +1618,17 @@ ru:
       food_&_drink: Еда и напитки
       travel_&_places: Путешествия и места
       activities: Деятельность
-      objects: Objects
+      objects: Объекты
       symbols: Атрибутика
       flags: Флаги
-      custom: Пользовательские смайлы
       recent: Недавно использованные
-      default_tone: Нет скина
+      default_tone: Скин без тона
       light_tone: Светлый тон скина
-      medium_light_tone: Средний светлый тон скина
+      medium_light_tone: Средне-светлый тон скина
       medium_tone: Средний тон скина
-      medium_dark_tone: Средний темный тон скина
+      medium_dark_tone: Средне-темный тон скина
       dark_tone: Темный оттенок скина
+      default: Пользовательские смайлы
     shared_drafts:
       title: "Общие черновики"
       notice: "Эти темы видны только тем, кому доступен раздел <b>{{category}}</b>."
@@ -1749,6 +1776,11 @@ ru:
           few: "{{count}} непрочитанных сообщения"
           many: "{{count}} непрочитанных сообщений"
           other: "{{count}} непрочитанных сообщений"
+        high_priority:
+          one: "%{count} непрочитанное уведомление с высоким приоритетом"
+          few: "%{count} непрочитанных уведомления с высоким приоритетом"
+          many: "%{count} непрочитанных уведомлений с высоким приоритетом"
+          other: "%{count} непрочитанных уведомлений с высоким приоритетом"
       title: "уведомления об упоминании вашего @псевдонима, ответах на ваши сообщения и темы, сообщения и т.д."
       none: "Уведомления не могут быть загружены."
       empty: "Уведомления не найдены."
@@ -1757,6 +1789,7 @@ ru:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1769,7 +1802,7 @@ ru:
         other: "<span>{{username}}, {{username2}} и {{count}} других</span> {{description}}"
       liked_consolidated_description:
         one: "Понравилось {{count}} ваше сообщение"
-        few: "Понравилось {{count}} ваших сообщений"
+        few: "Понравилось {{count}} ваших сообщения"
         many: "Понравилось {{count}} ваших сообщений"
         other: "Понравилось {{count}} ваших сообщений"
       liked_consolidated: "<span>{{username}}</span> {{description}}"
@@ -1813,6 +1846,8 @@ ru:
         posted: "Новое сообщение"
         moved_post: "Сообщение перемещено"
         linked: "связанный"
+        bookmark_reminder: "Напоминание о закладке"
+        bookmark_reminder_with_name: "Напоминание о закладке - %{name}"
         granted_badge: "награда получена"
         invited_to_topic: "приглашен в тему"
         group_mentioned: "упомянутая группа"
@@ -2039,10 +2074,10 @@ ru:
         many: "У вас {{count}} непрочитанных старых сообщений в этой теме"
         other: "У вас {{count}} непрочитанных старых сообщений в этой теме"
       new_posts:
-        one: "В этой теме {{count}} новое сообщение с её последнего просмотра вами"
-        few: "В этой теме {{count}} новых сообщения с её последнего просмотра вами"
-        many: "В этой теме {{count}} новых сообщений с её последнего просмотра вами"
-        other: "В этой теме {{count}} новых сообщений с её последнего просмотра вами"
+        one: "В этой теме {{count}} новое сообщение с вашего последнего просмотра"
+        few: "В этой теме {{count}} новых сообщения с вашего последнего просмотра"
+        many: "В этой теме {{count}} новых сообщений с вашего последнего просмотра"
+        other: "В этой теме {{count}} новых сообщений с вашего последнего просмотра"
       likes:
         one: "В теме {{count}} лайк"
         few: "В теме {{count}} лайка"
@@ -2058,9 +2093,10 @@ ru:
       group_join: "Вам нужно присоединиться к группе `{{name}}` чтобы увидеть эту тему."
       group_request_sent: "Ваш запрос на членство в группе был отправлен. Вам сообщат, когда  будет одобрено."
       unread_indicator: "Никто еще не дочитал до конца этой темы."
-      read_more_MF: "У вас осталось { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 непрочитанная</a> } few { <a href='{basePath}/unread'>1 непрочитанные</a> } other { <a href='{basePath}/unread'># непрочитанных</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'>1 новая</a> тема} other { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'># новых</a> тем} }, вы также можете {CATEGORY, select, true {посмотреть другие темы в разделе {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "У вас осталось { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 непрочитанная</a> } few { <a href='{basePath}/unread'># непрочитанные</a> } other { <a href='{basePath}/unread'># непрочитанных</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'>1 новая</a> тема} few { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'># новые</a> темы} other { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'># новых</a> тем} }, вы также можете {CATEGORY, select, true {посмотреть другие темы в разделе {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Просмотреть все разделы
-      view_latest_topics: посмотреть последние темы
+      view_latest_topics: посмотреть последние темы.
       suggest_create_topic: "Почему бы вам не создать новую тему?"
       jump_reply_up: Перейти к более ранним ответам
       jump_reply_down: Перейти к более поздним ответам
@@ -2069,6 +2105,7 @@ ru:
         title: "Таймер темы"
         save: "Установить таймер"
         num_of_hours: "Количество часов:"
+        num_of_days: "Количество дней:"
         remove: "Удалить таймер"
         publish_to: "Опубликовать в:"
         when: "Когда:"
@@ -2077,7 +2114,7 @@ ru:
         time_frame_required: "Пожалуйста, выберите временные рамки"
       auto_update_input:
         none: "Выбор таймфрейма"
-        later_today: "Позже сегодня"
+        later_today: "Сегодня, но позже"
         tomorrow: "Завтра"
         later_this_week: "Позже на этой неделе"
         this_weekend: "В эти выходные"
@@ -2111,6 +2148,8 @@ ru:
         title: "Автоматическое поднятие темы"
       reminder:
         title: "Напомнить мне"
+      auto_delete_replies:
+        title: "Автоматическое удаление ответов"
       status_update_notice:
         auto_open: "Эта тема автоматически откроется через %{timeLeft}."
         auto_close: "Эта тема автоматически закроется через %{timeLeft}."
@@ -2119,6 +2158,7 @@ ru:
         auto_delete: "Эта тема будет автоматически удалена через %{timeLeft}."
         auto_bump: "Эта тема будет автоматически поднята %{timeLeft}."
         auto_reminder: "Вам придёт напоминание об этой теме через %{timeLeft}."
+        auto_delete_replies: "Ответы в этой теме автоматически удаляются после %{duration}."
       auto_close_title: "Настройки закрытия темы"
       auto_close_immediate:
         one: "Последнее сообщение в этой теме отправлено %{count} час назад, поэтому данная тема будет закрыта незамедлительно."
@@ -2346,6 +2386,18 @@ ru:
         title: "Объединить выделенные сообщения"
         action: "Объединить выделенные сообщения"
         error: "Произошла ошибка во время объединения выделенных сообщений."
+      publish_page:
+        title: "Публикация страниц"
+        publish: "Публиковать"
+        description: "Когда тема публикуется в виде страницы, ее URL-адрес может быть предоставлен для общего доступа, и она будет отображаться с пользовательским стилем."
+        slug: "Slug"
+        publish_url: "Ваша страница была опубликована по адресу:"
+        topic_published: "Ваша тема была опубликована на:"
+        preview_url: "Ваша страница будет опубликована по адресу:"
+        invalid_slug: "Извините, вы не можете опубликовать эту страницу."
+        unpublish: "Отменить публикацию"
+        unpublished: "Публикация страницы была отменена и более недоступна по указанному ранее адресу."
+        publishing_settings: "Настройки публикации"
       change_owner:
         title: "Сменить владельца"
         action: "Изменить владельца"
@@ -2356,6 +2408,11 @@ ru:
           few: "Пожалуйста, выберите нового владельца для сообщений <b>@{{old_user}}</b>"
           many: "Пожалуйста, выберите нового владельца для сообщений <b>@{{old_user}}</b>"
           other: "Пожалуйста, выберите нового владельца {{count}} сообщений для <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Пожалуйста, выберите нового владельца сообщения"
+          few: "Пожалуйста, выберите нового владельца {{count}}сообщений"
+          many: "Пожалуйста, выберите нового владельца {{count}} сообщений"
+          other: "Пожалуйста, выберите нового владельца {{count}} сообщений"
       change_timestamp:
         title: "Изменить метку времени..."
         action: "Изменить метку времени"
@@ -2499,6 +2556,7 @@ ru:
         convert_to_moderator: "Добавить цвет модератора"
         revert_to_regular: "Убрать цвет модератора"
         rebake: "Обработать сообщение  - HTML"
+        publish_page: "Публикация страниц"
         unhide: "Снова сделать видимым"
         change_owner: "Изменить владельца"
         grant_badge: "Выдать награду"
@@ -2607,13 +2665,18 @@ ru:
             button: "HTML"
       bookmarks:
         create: "Создать закладку"
+        edit: "Изменить закладку"
+        created: "Создано"
         name: "Имя"
-        name_placeholder: "Присвойте имя закладке (необязательно)"
-        set_reminder: "Настроить напоминание (необязательно)"
+        name_placeholder: "Присвойте имя закладке (необязательно) "
+        set_reminder: "Настроить напоминание (необязательно) "
         actions:
           delete_bookmark:
             name: "Удалить закладку"
-            description: "Удаляет закладку из вашего профиля и останавливает все напоминания о закладке"
+            description: "Удаление закладки, включая все настроенные о ней напоминания."
+          edit_bookmark:
+            name: "Изменить закладку"
+            description: "Изменение названия закладки или даты/времени напоминания"
     category:
       can: "может&hellip; "
       none: "(вне раздела)"
@@ -3005,6 +3068,18 @@ ru:
         title: "Редактирование"
         return: "%{shortcut} Вернуться в редактор"
         fullscreen: "%{shortcut} Полноэкранный редактор"
+      bookmarks:
+        title: "Создание закладки"
+        enter: "%{shortcut} Сохранить и закрыть"
+        later_today: "%{shortcut} Сегодня, но позже"
+        later_this_week: "%{shortcut} Позже на этой неделе"
+        tomorrow: "%{shortcut} Завтра"
+        next_week: "%{shortcut} На следующей неделе"
+        next_month: "%{shortcut}В следующем месяце"
+        next_business_week: "%{shortcut} На следующей рабочей неделе"
+        next_business_day: "%{shortcut} На следующий рабочий день"
+        custom: "%{shortcut} Установить дату и время напоминания"
+        none: "%{shortcut} Не настраивать напоминание"
       actions:
         title: "Темы"
         bookmark_topic: "%{shortcut} Добавить / удалить из закладок"
@@ -3026,7 +3101,11 @@ ru:
         mark_watching: "%{shortcut} Наблюдать за темой"
         print: "%{shortcut} Печатать тему"
         defer: "%{shortcut} Отложить тему"
-        topic_admin_actions: "%{shortcut} Откройте раздел действия администратора"
+        topic_admin_actions: "%{shortcut} Открыть в теме меню действий администратора"
+      search_menu:
+        title: "Меню результатов поиска"
+        prev_next: "%{shortcut} Перемещение по результатам поиска"
+        insert_url: "%{shortcut} Вставить ссылку на найденное сообщение в окно открытого редактора"
     badges:
       earned_n_times:
         one: "Заработал эту награду %{count} раз"
@@ -3069,7 +3148,7 @@ ru:
           name: Публикации
     tagging:
       all_tags: "Все теги"
-      other_tags: "Изменить теги"
+      other_tags: "Другие теги"
       selector_all_tags: "Все теги"
       selector_no_tags: "Нет тегов"
       changed: "Теги изменены:"
@@ -3462,6 +3541,9 @@ ru:
         notification_event:
           name: "Событие уведомления"
           details: "При добавлении нового элемента в ленту уведомлений пользователя."
+        user_badge_event:
+          name: "Событие награждения"
+          details: "При получении пользователем награды."
         delivery_status:
           title: "Статус передачи"
           inactive: "Неактивна"
@@ -3615,6 +3697,7 @@ ru:
           theme_name: "Название темы"
           component_name: "Имя компонента"
           themes_intro: "Выберите существующую тему или установите новую, чтобы начать работу"
+          themes_intro_emoji: "woman artist emoji"
           beginners_guide_title: "Руководство для начинающих по использованию тем Discourse"
           developers_guide_title: "Руководство разработчика по темам Discourse"
           browse_themes: "Просмотр тем сообщества "
@@ -3843,6 +3926,7 @@ ru:
         format: "Формат"
         html: "html"
         text: "текст"
+        html_preview: "Предварительный просмотр содержимого"
         last_seen_user: "Последний раз был:"
         no_result: "Ничего не найдено для сводки новостей."
         reply_key: "Ключ ответа"
@@ -3997,6 +4081,8 @@ ru:
             api_key_update: "Обновление API-ключа"
             api_key_destroy: "Удаление API-ключа"
             override_upload_secure_status: "перезаписать защищенный статус загрузки"
+            page_published: "страница опубликована"
+            page_unpublished: "публикация страницы отменена"
         screened_emails:
           title: "Почтовые адреса"
           description: "Когда кто-то создаёт новую учётную запись, указанный пользователем почтовый адрес проверяется на соответствие с указанным ниже списком, и в случае совпадения регистрация блокируется или производятся другие дополнительные действия."
@@ -4102,7 +4188,6 @@ ru:
           staff: "Персонал"
           suspended: "Замороженные"
           silenced: "Заблокированные"
-          suspect: "Подозрительные"
           staged: "Сымитированные"
         approved: "Подтвердить?"
         titles:
@@ -4119,7 +4204,6 @@ ru:
           moderators: "Модераторы"
           silenced: "Заблокированные пользователи"
           suspended: "Замороженные пользователи"
-          suspect: "Подозрительные пользователи"
           staged: "Сымитированные пользователи"
         not_verified: "Непроверенные"
         check_email:
@@ -4256,6 +4340,7 @@ ru:
           threshold_reached: "Получено слишком много возвратов от этой эл.почты."
         trust_level_change_failed: "Возникла ошибка при изменении уровня доверия пользователя."
         suspend_modal_title: "Заморозить пользователя"
+        confirm_cancel_penalty: "Вы действительно хотите закрыть окно без сохранения введённой информации?"
         trust_level_2_users: "Пользователи с уровнем доверия 2"
         trust_level_3_requirements: "Требуется 3 уровень доверия"
         trust_level_locked_tip: "Уровень доверия заблокирован, система не может изменять уровень доверия пользователя"
@@ -4473,6 +4558,7 @@ ru:
             with_time: "<span class=\"username\">%{username}</span> в <span class=\"time\">%{time}</span>"
         badge_intro:
           title: "Выберите существующую награду или создайте новую, чтобы начать работу"
+          emoji: "woman student emoji"
           what_are_badges_title: "Что такое награды?"
           badge_query_examples_title: "Примеры запроса награды"
         mass_award:
@@ -4489,7 +4575,9 @@ ru:
         help: "Добавить новые смайлики-emoji, которые будут доступны всем. (Подсказка: можно перетаскивать несколько файлов за раз)"
         add: "Добавить новую иконку"
         name: "Название"
+        group: "Группа"
         image: "Изображение"
+        alt: "Предварительный просмотр пользовательских emoji"
         delete_confirm: "Вы действительно хотите удалить иконку :%{name}:?"
       embedding:
         get_started: "Для встраивания на другой сайт необходимо добавить соответствующий хост."
@@ -4509,13 +4597,14 @@ ru:
         embed_post_limit: "Максимальное количество вложенных сообщений"
         embed_title_scrubber: "Регулярное выражение, используемое для очистки заголовка сообщений"
         embed_truncate: "Обрезать встроенные сообщения."
+        embed_unlisted: "Импортированные темы будут отображаться в списке тем  только после добавления в них ответа."
         embed_whitelist_selector: "Селекторы CSS которые разрешены для использования."
         embed_blacklist_selector: "Селекторы CSS которые запрещены для использования."
         embed_classname_whitelist: "Разрешённые CSS-классы"
         save: "Сохранить настройки встраивания"
       permalink:
         title: "Постоянные ссылки"
-        description: "Обратите внимание, что это относится только к внешним источникам. Ссылки, размещенные на вашем форуме, не будут перенаправлены."
+        description: "Перенаправления, применяемые для URL, не известных форуму."
         url: "Ссылка URL"
         topic_id: "Номер темы"
         topic_title: "Тема"
@@ -4524,6 +4613,7 @@ ru:
         category_id: "Номер раздела"
         category_title: "Раздел"
         external_url: "Внешняя ссылка"
+        destination: "Назначения"
         delete_confirm: "Удалить эту постоянную ссылку?"
         form:
           label: "Новая постоянная ссылка:"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 581b512a14..fe8370261d 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -30,7 +30,6 @@ sk:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -288,6 +287,10 @@ sk:
       remove: "Odstrániť záložku"
       confirm_clear: "Ste si istý, že chcete odstrániť všetky záložky z tejto témy?"
       save: "Uložiť"
+      reminders:
+        tomorrow: "Zajtra"
+        next_week: "Budúci týždeň"
+        next_month: "Budúci mesiac"
     drafts:
       resume: "Pokračovať"
       remove: "Odstrániť"
@@ -792,10 +795,6 @@ sk:
         success_staff: "Na váš aktuálny email sme odoslali správu. Nasledujte prosím inštrukcie pre potvrdenie."
       change_avatar:
         title: "Zmeniť váš profilový obrázok"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, podľa"
-        gravatar_title: "Zmeňte váš avatar na webe Gravatar "
-        gravatar_failed: "Nemohli sme nájsť žiadny Gravatar s touto emailovou adresou."
-        refresh_gravatar_title: "Obnoviť váš Gravatar"
         letter_based: "Systém pridelil profilový obrázok"
         uploaded_avatar: "Vlastný obrázok"
         uploaded_avatar_empty: "Pridať vlastný obrázok"
@@ -1043,6 +1042,8 @@ sk:
         back: "Späť"
         again: "Skúsiť znova"
         fixed: "Načítať stránku"
+    modal:
+      close: "zatvoriť"
     close: "Zatvoriť"
     assets_changed_confirm: "Táto stránka bola práve aktualizovaná. Obnoviť na najnovšiu verziu?"
     logout: "Boli ste odhlásený."
@@ -1837,6 +1838,7 @@ sk:
           text_part:
             button: "Text"
       bookmarks:
+        created: "Vytvorené"
         name: "Meno"
     category:
       can: "môže &hellip; "
@@ -2762,7 +2764,6 @@ sk:
           active: "Aktívny"
           staff: "Zamestnanci"
           suspended: "Odobrate práva"
-          suspect: "Podozrivý"
           staged: "Dočasný"
         approved: "Schválený?"
         titles:
@@ -2778,7 +2779,6 @@ sk:
           admins: "Admin používatelia"
           moderators: "Moderátori"
           suspended: "Užívatelia s odobratými právami"
-          suspect: "Podozriví užívatelia"
         not_verified: "Neoverený"
         check_email:
           title: "Odhaliť emailovú adresu tohto používateľa"
@@ -3056,6 +3056,7 @@ sk:
         help: "Pridaj nové emoji, ktoré bude dostupné pre všetkých (TIP: môžete pretiahnuť viac súborov naraz)"
         add: "Pridaj nové Emoji"
         name: "Meno"
+        group: "Skupina"
         image: "Obrázok"
         delete_confirm: "Ste si istý, že chcete zmazať: %{name}: emoji?"
       embedding:
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 1cb2bae4eb..ce28cb3268 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -30,7 +30,6 @@ sl:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY H:mm"
@@ -310,6 +309,12 @@ sl:
       remove: "Odstrani zaznamek"
       confirm_clear: "Ste prepričani, da želite odstraniti vse svoje zaznamke iz te teme?"
       save: "Shrani"
+      reminders:
+        later_today: "Kasneje v dnevu"
+        tomorrow: "Jutri"
+        next_week: "Naslednji teden"
+        later_this_week: "Kasneje v tednu"
+        next_month: "Naslednji mesec"
     drafts:
       resume: "Nadaljuj"
       remove: "Odstrani"
@@ -931,10 +936,6 @@ sl:
         success_staff: "Poslali smo e-sporočilo na vaš trenutni naslov. Sledite navodilom za potrditev."
       change_avatar:
         title: "Menjaj profilno sliko"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a> od"
-        gravatar_title: "Spremeni svoj avatar na Gravatar strani"
-        gravatar_failed: "Nismo našli Gravatar s tem e-naslovom."
-        refresh_gravatar_title: "Osveži svoj Gravatar"
         letter_based: "Sistemsko privzeta profilna slika"
         uploaded_avatar: "Slika po meri"
         uploaded_avatar_empty: "Dodaj sliko po meri"
@@ -1230,6 +1231,8 @@ sl:
         back: "Nazaj"
         again: "Poskusi ponovno"
         fixed: "Naloži stran"
+    modal:
+      close: "zapri"
     close: "Zapri"
     assets_changed_confirm: "Stran ji bala pravkar posodobljena. Osvežimo takoj za zadnjo verzijo?"
     logout: "Bili ste odjavljeni."
@@ -1445,7 +1448,6 @@ sl:
       objects: Stvari
       symbols: Simboli
       flags: Zastave
-      custom: Po meri emoji
       recent: Nedavno uporabljeni
       default_tone: Brez barve kože
       light_tone: Svetla barva kože
@@ -1453,6 +1455,7 @@ sl:
       medium_tone: Srednja barva kože
       medium_dark_tone: Srednje temna barva kože
       dark_tone: Temna barva kože
+      default: Po meri emoji
     shared_drafts:
       title: "Skupni osnutki"
       notice: "Ta tema je vidna samo tistim, ki lahko vidijo kategorijo <b>{{category}}</b>."
@@ -1605,6 +1608,7 @@ sl:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2424,6 +2428,7 @@ sl:
             title: "Prikaži HTML obliko e-sporočila"
             button: "HTML"
       bookmarks:
+        created: "Ustvarjeno"
         name: "Polno ime"
     category:
       can: "lahko&hellip; "
@@ -3470,7 +3475,6 @@ sl:
           staff: "Osebje"
           suspended: "Suspendirani"
           silenced: "Utišani"
-          suspect: "Sumljivi"
           staged: "Prirejeni"
         approved: "Potrjen?"
         titles:
@@ -3486,7 +3490,6 @@ sl:
           moderators: "Moderatorji"
           silenced: "Utišani uporabniki"
           suspended: "Suspendirani uporabniki"
-          suspect: "Sumljivi uporabniki"
           staged: "Prirejeni uporabniki"
         check_email:
           text: "Prikaži"
@@ -3784,6 +3787,7 @@ sl:
         help: "Dodaj nov emoji, ki bo na voljo vsem. (lahko prestavite in spustite več datotek naenkrat)"
         add: "Dodaj nov emoji"
         name: "Ime"
+        group: "Skupina"
         image: "Slika"
         delete_confirm: "Ali ste prepričani, da hočete izbrisati emoji :%{name}:?"
       embedding:
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 2d814f9718..9c1adc9143 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -28,7 +28,6 @@ sq:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -592,9 +591,6 @@ sq:
         success_staff: "Ju dërguam një email tek adresa që shkruajtët. Ju ftojmë të ndiqni udhëzimet e konfirmimit."
       change_avatar:
         title: "Ndrysho fotografinë e profilit"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, bazur në"
-        gravatar_title: "Ndryshoni avatarin tuaj në faqen web të shërbimit Gravatar"
-        refresh_gravatar_title: "Rifreskoni Gravatarin tuaj"
         letter_based: "Foto e profilit e caktuar nga sistemi"
         uploaded_avatar: "Foto e personalizuar"
         uploaded_avatar_empty: "Shto një foto të personalizuar"
@@ -813,6 +809,8 @@ sq:
         back: "Kthehu mbrapa"
         again: "Provo përsëri"
         fixed: "Ngarko faqen"
+    modal:
+      close: "mbylle"
     close: "Mbyll"
     assets_changed_confirm: "Faqja u azhornua. Doni t'a rifreskoni tani për versionin e fundit?"
     logout: "Ju jeni shkëputur!"
@@ -1522,6 +1520,7 @@ sq:
           html_part:
             button: "HTML"
       bookmarks:
+        created: "Krijuar"
         name: "Emri"
     category:
       can: "mund&hellip; "
@@ -2382,7 +2381,6 @@ sq:
           active: "Aktiv"
           staff: "Stafi"
           suspended: "Të pezulluar"
-          suspect: "Të dyshimtë"
         approved: "Aprovuar?"
         titles:
           active: "Përdorues Aktivë"
@@ -2397,7 +2395,6 @@ sq:
           admins: "Administratorë"
           moderators: "Moderatorë"
           suspended: "Përdorues të Pezulluar"
-          suspect: "Përdorues të Dyshimtë"
         not_verified: "I pa verifikuar"
         check_email:
           title: "Shfaq adresën email të këtij përdoruesi."
@@ -2674,6 +2671,7 @@ sq:
         help: "Add new emoji that will be available to everyone. (PROTIP: drag & drop multiple files at once)"
         add: "Add New Emoji"
         name: "Emri"
+        group: "Grupi"
         image: "Imazh"
         delete_confirm: "Are you sure you want to delete the :%{name}: emoji?"
       embedding:
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 20f594e376..e32a910f2b 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -29,7 +29,6 @@ sr:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY HH:mm"
@@ -538,8 +537,6 @@ sr:
         success: "Poslali smo e-mail na tu adresu. Molimo vas sledite uputstva za potvrdu."
       change_avatar:
         title: "Promeni tvoju profilnu sliku"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baziran na"
-        refresh_gravatar_title: "Obnovi svoj Gravatar"
         letter_based: "Sistemski dodata profilna slika"
         uploaded_avatar: "Vaša slika"
         uploaded_avatar_empty: "Dodajte vašu sliku"
@@ -745,6 +742,8 @@ sr:
         back: "Idi nazad"
         again: "Pokušaj ponovno"
         fixed: "Učitaj stranicu"
+    modal:
+      close: "zatvori"
     close: "Zatvori"
     assets_changed_confirm: "Ova stranica je upravo ažurirana. Osveži sada za najnoviju verziju?"
     logout: "Odjavljeni ste."
@@ -1281,6 +1280,7 @@ sr:
           side_by_side_markdown:
             title: "Prikaži razlike u sirovom izvoru jednu nasuprot druge."
       bookmarks:
+        created: "Napravljeno"
         name: "Ime foruma"
     category:
       can: "može&hellip"
@@ -1949,7 +1949,6 @@ sr:
           active: "Aktivno"
           staff: "Osoblje"
           suspended: "Suspendovani"
-          suspect: "Sumnjivi"
         approved: "Potvrđenji?"
         titles:
           active: "Aktivni Korisnici"
@@ -1964,7 +1963,6 @@ sr:
           admins: "Administratori"
           moderators: "Moderatori"
           suspended: "Suspendovani Korisnici"
-          suspect: "Sumnjivi korisnici"
         not_verified: "Nije verifikovano"
         check_email:
           title: "Otkrij korisnikovu email adresu"
@@ -2211,6 +2209,7 @@ sr:
         help: "Dodajte nove Emoji-e koji će biti dostupni svima. (Savet: povuci i ispusti više datoteka odjednom)"
         add: "Dodaj Novi Emoji"
         name: "Ime"
+        group: "Grupa"
         image: "Slika"
         delete_confirm: "Jeste li sigurni da želite izbrisati :%{name}: emoji?"
       embedding:
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index d856489c4d..c0420ef694 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -29,7 +29,7 @@ sv:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM, YYYY h:mm a"
@@ -261,22 +261,34 @@ sv:
       help:
         bookmark: "Klicka för att bokmärka första inlägget i ämnet "
         unbookmark: "Klicka för att radera alla bokmärken i ämnet"
+        unbookmark_with_reminder: "Markera för att ta bort alla bokmärken samt påminnelser för detta ämne. Du har en påminnelse inställd till %{reminder_at} för detta ämne."
     bookmarks:
       created: "du har bokmärkt detta inlägg"
       not_bookmarked: "bokmärk detta inlägg"
-      created_with_reminder: "du har bokmärkt detta inlägg med en påminnelse vid %{date}"
+      created_with_reminder: "du har bokmärkt detta inlägg med en påminnelse %{date}"
+      created_with_at_desktop_reminder: "du har bokmärkt detta inlägg och kommer att påminnas nästa gång du är vid din dator"
       remove: "Ta bort bokmärke"
       confirm_clear: "Är du säker på att du vill radera alla dina bokmärken från ämnet?"
       save: "Spara"
       no_timezone: 'Du har ännu inte valt tidszon. Du kommer därför inte kunna sätta påminnelser. Ange en <a href="%{basePath}/my/preferences/profile">i din profil</a>.'
+      invalid_custom_datetime: "Datumet och tiden du har angivit är ogiltig, vänligen försök igen."
+      list_permission_denied: "Du har inte behörighet att visa bokmärken för denna användare."
       reminders:
         at_desktop: "Nästa gång är jag vid datorn"
         later_today: "Senare idag"
-        next_business_day: "Nästa arbetsdag"
+        next_business_day: "Nästa vardag"
         tomorrow: "Imorgon"
         next_week: "Nästa vecka"
+        later_this_week: "Senare denna vecka"
+        start_of_next_business_week: "Nästa måndag"
         next_month: "Nästa månad"
         custom: "Anpassa datum och tid"
+        last_custom: "Senaste"
+        none: "Ingen påminnelse nödvändig"
+        today_with_time: "idag vid %{time}"
+        tomorrow_with_time: "imorgon vid %{time}"
+        at_time: "den %{date_time}"
+        existing_reminder: "Du har en påminnelse inställd för detta bokmärke vilken kommer skickas"
     drafts:
       resume: "Återuppta"
       remove: "Ta bort"
@@ -514,6 +526,7 @@ sv:
       days_visited_long: "Dagar Besökta"
       posts_read: "Läst"
       posts_read_long: "Lästa inlägg"
+      last_updated: "Senast uppdaterad:"
       total_rows:
         one: "%{count} användare"
         other: "%{count} användare"
@@ -539,6 +552,7 @@ sv:
         deny: "Neka"
         denied: "nekad"
         undone: "förfrågan återkallad"
+        handle: "hantera begäran om medlemskap"
       manage:
         title: "Hantera"
         name: "Namn"
@@ -766,6 +780,7 @@ sv:
         clear:
           title: "Rensa"
           warning: "Är du säker på att vill rensa ditt utvalda ämne?"
+      use_current_timezone: "Använd nuvarande tidszon"
       profile_hidden: "Denna användarens offentliga profil är dold."
       expand_profile: "Utvidga"
       collapse_profile: "Förminska"
@@ -865,6 +880,7 @@ sv:
         deleted_posts: "raderade inlägg"
         suspensions: "avstängningar"
         warnings_received: "varningar"
+        rejected_posts: "avvisade inlägg"
       messages:
         all: "Alla"
         inbox: "Inkorg"
@@ -891,6 +907,7 @@ sv:
         success: "(e-post skickat)"
         in_progress: "(skickar e-post)"
         error: "(fel)"
+        emoji: "lås emoji"
         action: "Skicka e-post för att återställa lösenord"
         set_password: "Ange lösenord"
         choose_new: "Välj ett nytt lösenord"
@@ -941,6 +958,7 @@ sv:
           title: "Bevisbaserade autentiserare"
           add: "Ny autentiserare"
           default_name: "Min autentiserare"
+          name_and_code_required_error: "Du måste ange ett namn samt koden från din app för autentisering."
         security_key:
           register: "Registrera"
           title: "Säkerhetsnycklar"
@@ -951,6 +969,7 @@ sv:
           edit: "Ändra säkerhetsnyckel"
           edit_description: "Namn på säkerhetsnyckel"
           delete: "Radera"
+          name_required_error: "Du måste ange ett namn för din säkerhetsnyckel."
       change_about:
         title: "Ändra Om Mig"
         error: "Ett fel inträffade vid ändringen av det här värdet."
@@ -967,10 +986,10 @@ sv:
         success_staff: "Vi har skickat e-post till din nuvarande adress. Vänligen följ instruktionerna för konfirmering."
       change_avatar:
         title: "Ändra din profilbild"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baserat på"
-        gravatar_title: "Byt din avatar på Gravatars hemsida"
-        gravatar_failed: "Vi hittade ingen Gravatar med den e-postadressen."
-        refresh_gravatar_title: "Uppdatera din Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, baserat på"
+        gravatar_title: "Ändra din avatar på {{gravatarName}}s webbsida"
+        gravatar_failed: "Vi kunde inte hitta en {{gravatarName}} för den e-postadressen."
+        refresh_gravatar_title: "Förnya din {{gravatarName}}"
         letter_based: "Profilbild tilldelad av systemet"
         uploaded_avatar: "Anpassad bild"
         uploaded_avatar_empty: "Lägg till en anpassad bild"
@@ -1033,6 +1052,9 @@ sv:
         any: "något"
       password_confirmation:
         title: "Lösenord igen"
+      invite_code:
+        title: "Inbjudningskod"
+        instructions: "Kontoregistrering kräver en inbjudningskod"
       auth_tokens:
         title: "Senaste använda enheter"
         ip: "IP"
@@ -1253,6 +1275,9 @@ sv:
         back: "Gå tillbaka"
         again: "Försök igen"
         fixed: "Ladda sida"
+    modal:
+      close: "stäng"
+      dismiss_error: "Avfärda fel"
     close: "Stäng"
     assets_changed_confirm: "Den här webbplatsen uppdaterades precis. Uppdatera för att se den senaste versionen?"
     logout: "Du loggades ut."
@@ -1347,6 +1372,7 @@ sv:
     email_login:
       link_label: "E-posta mig en inloggningslänk"
       button_label: "per e-post"
+      emoji: "lås emoji"
       complete_username: "Om ett konto matchar användarnamnet <b>%{username}</b>, bör du inom kort få ett e-postmeddelande med en inloggningslänk."
       complete_email: "Om ett konto matchar <b>%{email}</b>, bör du inom kort få ett e-postmeddelande med en inloggningslänk."
       complete_username_found: "Vi hittade ett konto som matchade användarnamnet <b> %{username} </b>, du kommer snart att få ett e-postmeddelande med länk för inloggning inom kort."
@@ -1424,6 +1450,7 @@ sv:
         backup_code: "Använd en reservkod istället"
     invites:
       accept_title: "Inbjudan"
+      emoji: "kuvert emoji"
       welcome_to: "Välkommen till %{site_name}!"
       invited_by: "Du bjöds in av:"
       social_login_available: "Du kommer också att kunna logga in med social inloggningar via denna mail."
@@ -1488,7 +1515,6 @@ sv:
       objects: Objekt
       symbols: Symboler
       flags: Flaggor
-      custom: Anpassa emojis
       recent: Senaste använda
       default_tone: Ingen hudton
       light_tone: Ljus hudton
@@ -1496,6 +1522,7 @@ sv:
       medium_tone: Medium hudton
       medium_dark_tone: Medium mörk hudton
       dark_tone: Mörk hudton
+      default: Anpassa emojis
     shared_drafts:
       title: "Delade utkast"
       notice: "Detta ämne är enbart synligt för de som kan se kategorin <b>{{category}}</b>."
@@ -1637,6 +1664,9 @@ sv:
         message:
           one: "%{count} oläst meddelande"
           other: "{{count}} olästa meddelanden"
+        high_priority:
+          one: "%{count} oläst notifikation med hög prioritet"
+          other: "%{count} olästa notifikationer med hög prioritet"
       title: "notiser från @namn-omnämnanden, svar på dina inlägg och ämnen, meddelanden, etc"
       none: "Kan inte ladda notiser just nu."
       empty: "Inga notifieringar hittades."
@@ -1645,6 +1675,7 @@ sv:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1695,6 +1726,8 @@ sv:
         posted: "nytt inlägg"
         moved_post: "inlägg flyttat"
         linked: "länkat"
+        bookmark_reminder: "påminnelse för bokmärke"
+        bookmark_reminder_with_name: "påminnelse för bokmärke - %{name}"
         granted_badge: "utmärkelse tilldelad"
         invited_to_topic: "inbjuden till ämne"
         group_mentioned: "grupp omnämnde"
@@ -1760,7 +1793,7 @@ sv:
         in_group:
           label: I gruppen
         with_badge:
-          label: Med märke
+          label: Med utmärkelse
         with_tags:
           label: Taggad
         filters:
@@ -1923,6 +1956,7 @@ sv:
       group_request_sent: "Din begäran om gruppmedlemskap har skickats. Du kommer informeras om den har accepterats."
       unread_indicator: "Ingen medlem har läst det senaste inlägget ännu."
       read_more_MF: "Det finns { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 oläst</a> } other { <a href='{basePath}/unread'># olästa</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{och } false {} other{}} <a href='{basePath}/new'>1 nytt</a> ämne} other { {BOTH, select, true{och } false {} other{}} <a href='{basePath}/new'># nya</a> ämnen} } kvar, eller {CATEGORY, select, true {bläddra bland andra ämnen i {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Bläddra bland alla kategorier
       view_latest_topics: visa senaste ämnen
       suggest_create_topic: "Varför inte skapa ett ämne?"
@@ -1933,6 +1967,7 @@ sv:
         title: "Ämnestidtagning"
         save: "Ställ in timer"
         num_of_hours: "Antal timmar:"
+        num_of_days: "Antal dagar:"
         remove: "Ta bort timer:"
         publish_to: "Publicera till:"
         when: "När:"
@@ -1975,6 +2010,8 @@ sv:
         title: "Auto-knuffa Ämne"
       reminder:
         title: "Påminn mig"
+      auto_delete_replies:
+        title: "Radera svar automatiskt"
       status_update_notice:
         auto_open: "Detta ämne kommer öppnas automatiskt om %{timeLeft}."
         auto_close: "Det här ämnet kommer stängas automatiskt om %{timeLeft}."
@@ -1983,6 +2020,7 @@ sv:
         auto_delete: "Det här ämnet kommer raderas automatiskt om %{timeLeft}."
         auto_bump: "Det här ämnet kommer knuffas automatiskt %{timeLeft}."
         auto_reminder: "Du kommer att påminnas om detta ämne om: %{timeLeft}."
+        auto_delete_replies: "Svar på detta ämne raderas automatiskt efter %{duration}."
       auto_close_title: "Inställningar för automatisk stängning"
       auto_close_immediate:
         one: "Senaste inlägget i det här ämnet är redan %{count} timme gammalt, så ämnet kommer att stängas omedelbart. "
@@ -2194,6 +2232,18 @@ sv:
         title: "Sammanfoga markerade inlägg"
         action: "sammanfoga markerade inlägg"
         error: "Det uppstod ett fel vid sammanfogningen av de markerade inläggen."
+      publish_page:
+        title: "Sidpublicering"
+        publish: "Publicera"
+        description: "När ett ämne publiceras som en sida kan deras URL delas och den kommer att visas med anpassad utformning."
+        slug: "Slug"
+        publish_url: "Din sida har publicerats vid:"
+        topic_published: "Ditt ämne har publicerats vid:"
+        preview_url: "Din sida kommer publiceras vid:"
+        invalid_slug: "Tyvärr, du kan inte publicera denna sida."
+        unpublish: "Avpublicera"
+        unpublished: "Din sida har blivit avpublicerad och är inte längre tillgänglig."
+        publishing_settings: "Inställningar för publicering"
       change_owner:
         title: "Byt ägare"
         action: "ändra ägare"
@@ -2202,6 +2252,9 @@ sv:
         instructions:
           one: "Vänligen välj en ny ägare för inlägget från <b>@{{old_user}}</b>"
           other: "Vänligen välj en ny ägare för {{count}} inlägg från <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Vänligen välj en ny ägare för inlägget"
+          other: "Vänligen välj en ny ägare för de {{count}} inläggen"
       change_timestamp:
         title: "Ändra tidsstämpel..."
         action: "ändra tidsstämpeln"
@@ -2327,6 +2380,7 @@ sv:
         convert_to_moderator: "Lägg till personalfärg"
         revert_to_regular: "Ta bort personalfärg"
         rebake: "Generera HTML"
+        publish_page: "Sidpublicering"
         unhide: "Visa"
         change_owner: "Ändra ägare"
         grant_badge: "Utfärda utmärkelse"
@@ -2421,13 +2475,18 @@ sv:
             button: "HTML"
       bookmarks:
         create: "Skapa bokmärke"
+        edit: "Redigera bokmärke"
+        created: "Skapad"
         name: "Namn"
-        name_placeholder: "Namnge bokmärket för att underlätta för ditt minne"
-        set_reminder: "Skapa påminnelse"
+        name_placeholder: "Vad används detta bokmärke till?"
+        set_reminder: "Påminn mig"
         actions:
           delete_bookmark:
             name: "Radera bokmärke"
             description: "Tar bort bokmärket från din profil och stoppar alla påminnelser för bokmärket."
+          edit_bookmark:
+            name: "Redigera bokmärke"
+            description: "Redigera bokmärkets namn eller ändra påminnelsens datum och tid."
     category:
       can: "can&hellip; "
       none: "(ingen kategori)"
@@ -2789,6 +2848,18 @@ sv:
         title: "Skapar"
         return: "%{shortcut} Återgå till skaparen"
         fullscreen: "%{shortcut} Helskärmsläge för skaparen"
+      bookmarks:
+        title: "Bokmärkning"
+        enter: "%{shortcut} Spara och stäng"
+        later_today: "%{shortcut} Senare idag"
+        later_this_week: "%{shortcut} Senare denna vecka"
+        tomorrow: "%{shortcut} Imorgon"
+        next_week: "%{shortcut} Nästa vecka"
+        next_month: "%{shortcut} Nästa månad"
+        next_business_week: "%{shortcut} I början på nästa vecka"
+        next_business_day: "%{shortcut} Nästa vardag"
+        custom: "%{shortcut} Anpassa datum och tid"
+        none: "%{shortcut} Ingen påminnelse"
       actions:
         title: "Åtgärder"
         bookmark_topic: "%{shortcut} Växla bokmärkning av ämne"
@@ -2811,6 +2882,10 @@ sv:
         print: "%{shortcut} Skriv ut ämne"
         defer: "%{shortcut} Skjut upp ämne"
         topic_admin_actions: "%{shortcut} Öppna administratörsåtgärder för ämne"
+      search_menu:
+        title: "Sökmeny"
+        prev_next: "%{shortcut} Flytta markering upp eller ner"
+        insert_url: "%{shortcut} Infoga urval till pågående skaparen"
     badges:
       earned_n_times:
         one: "Förtjänade den här utmärkelsen %{count} gång"
@@ -3015,7 +3090,7 @@ sv:
         show_traffic_report: "Visa detaljerad trafikrapport"
         community_health: Hälsa för gemenskapen
         moderators_activity: Moderatorers aktivitet
-        whats_new_in_discourse: "Vad är nytt i Discource?"
+        whats_new_in_discourse: "Vad är nytt i Discourse?"
         activity_metrics: Aktivitetsdata
         all_reports: "Alla rapporter"
         general_tab: "Allmänt"
@@ -3222,6 +3297,9 @@ sv:
         notification_event:
           name: "Notifikationshändelse"
           details: "När en användare mottager en notifikation i deras flöde."
+        user_badge_event:
+          name: "Utmärkelse tilldelning"
+          details: "När en användare mottager en utmärkelse."
         delivery_status:
           title: "Leveransstatus"
           inactive: "Inaktiv"
@@ -3371,6 +3449,7 @@ sv:
           theme_name: "Temanamn"
           component_name: "Komponentnamn"
           themes_intro: "Välj ett existerande tema eller installera ett nytt för att komma igång"
+          themes_intro_emoji: "kvinnlig artist emoji"
           beginners_guide_title: "Nybörjarguide för användning av Discourse-teman"
           developers_guide_title: "Utvecklarguide för Discourse-teman"
           browse_themes: "Visa gemenskapens teman"
@@ -3597,6 +3676,7 @@ sv:
         format: "Format"
         html: "html"
         text: "text"
+        html_preview: "Förhandsgranskning e-postinnehåll "
         last_seen_user: "Senast sedd användare:"
         no_result: "Inga resultat är funna."
         reply_key: "Svarsnyckel"
@@ -3751,6 +3831,8 @@ sv:
             api_key_update: "api nyckel uppdaterad"
             api_key_destroy: "api nyckel förstörd"
             override_upload_secure_status: "åsidosätt säkerhetsstatus för uppladdning"
+            page_published: "sida publicerad"
+            page_unpublished: "sida avpublicerad"
         screened_emails:
           title: "Kontrollerad e-post"
           description: "När någon försöker skapa ett nytt konto, kommer följande e-postadresser att kontrolleras och registreringen blockeras, eller någon annan åtgärd vidtas."
@@ -3854,7 +3936,6 @@ sv:
           staff: "Medarbetare"
           suspended: "Avstängd"
           silenced: "Tystad"
-          suspect: "Misstänkt"
           staged: "Arrangerad"
         approved: "Godkänd?"
         titles:
@@ -3871,7 +3952,6 @@ sv:
           moderators: "Moderatorer"
           silenced: "Tystad användare"
           suspended: "Avstängda användare"
-          suspect: "Misstänkta användare"
           staged: "Påhittad användare"
         not_verified: "Ej verifierad"
         check_email:
@@ -4002,6 +4082,7 @@ sv:
           threshold_reached: "Mottog för många studsar från den e-posten."
         trust_level_change_failed: "Ett problem uppstod då användarens förtroendenivå skulle ändras."
         suspend_modal_title: "Stäng av användare"
+        confirm_cancel_penalty: "Är du säker på att du vill ångra bestraffningen?"
         trust_level_2_users: "Användare med förtroendenivå 2"
         trust_level_3_requirements: "Krav för förtroendenivå 3"
         trust_level_locked_tip: "förtroendenivå är låst, systemet kommer ej att befordra eller degradera användare"
@@ -4214,7 +4295,8 @@ sv:
             with_post_time: "<span class=\"username\">%{username}</span> för inlägg i %{link} vid kl. <span class=\"time\">%{time}</span>"
             with_time: "<span class=\"username\">%{username}</span> vid kl. <span class=\"time\">%{time}</span>"
         badge_intro:
-          title: "Välj ett existerande märke eller skapa ett nytt för att komma igång"
+          title: "Välj en existerande utmärkelse eller skapa en ny för att komma igång"
+          emoji: "kvinnlig student emoji"
           what_are_badges_title: "Vad är utmärkelser?"
           badge_query_examples_title: "Exempel på utmärkelsefråga"
         mass_award:
@@ -4231,7 +4313,9 @@ sv:
         help: "Lägg till en ny emoji för andra att använda. (TIPS: dra och släpp flera filer på en och samma gång)"
         add: "Lägg till ny emoji"
         name: "Namn"
+        group: "Grupp"
         image: "Bild"
+        alt: "anpassa förhandsvisning av emoji "
         delete_confirm: "Är du säker på att du vill radera emojin :%{name}:?"
       embedding:
         get_started: "Börja genom att lägga till värden, om du vill bädda in Discourse på en annan hemsida. "
@@ -4251,13 +4335,14 @@ sv:
         embed_post_limit: "Högsta tillåtna antal inlägg att bädda in"
         embed_title_scrubber: "Reguljära uttryck som används för att hitta och korrigera fel i inläggsrubriken"
         embed_truncate: "Trunkera de inbäddade inläggen"
+        embed_unlisted: "Importerade ämnen kommer att vara olistade tills dess att det finns ett svar."
         embed_whitelist_selector: "CSS-väljare för element som tillåts bäddas in"
         embed_blacklist_selector: "CSS-väljare för element som tas bort från inbäddningar"
         embed_classname_whitelist: "Tillåtna CSS klassnamn"
         save: "Spara inbäddningsinställningar"
       permalink:
         title: "Permalänkar"
-        description: "Observera att detta endast gäller externa källor, länkar som publiceras på ditt forum kommer inte att omdirigeras."
+        description: "Omdirigeringar att tillämpa för URL:er som inte är kända av forumet."
         url: "URL"
         topic_id: "Ämnes-ID"
         topic_title: "Ämne"
@@ -4266,6 +4351,7 @@ sv:
         category_id: "Kategori-ID"
         category_title: "Kategori"
         external_url: "Extern URL"
+        destination: "Mål"
         delete_confirm: "Är du säker på att du vill ta bort den här permalänken?"
         form:
           label: "Ny:"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 5f1e71b61e..55dcb12453 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -28,7 +28,6 @@ sw:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -238,6 +237,12 @@ sw:
       remove: "Ondoa Alamisho"
       confirm_clear: "Una uhakika unataka kuondoa mialamisho ya mada hii?"
       save: "hifadhi"
+      reminders:
+        later_today: "Baada ya mda leo"
+        tomorrow: "Kesho"
+        next_week: "Wiki Ijayo"
+        later_this_week: "Baada ya mda ndani ya wiki hii"
+        next_month: "Mwezi ujao"
     drafts:
       remove: "Ondoa"
       new_topic: "Mswadajaribio wa mada mpya"
@@ -716,9 +721,6 @@ sw:
         success_staff: "Tumekutumia barua kwenye barua pepe uliyotumia. Tafadhali fuata maelezo tuliyokutumia."
       change_avatar:
         title: "Badilisha Picha yako"
-        gravatar: "imetoka kwa <a href='//gravatar.com/emails' target='_blank'>Ishara</a>"
-        gravatar_title: "Badilisha Ishara kwenye Mtandao wa Ishara"
-        refresh_gravatar_title: "Onesha Upya Ishara Yako"
         letter_based: "Mfumo imekabidhi Picha"
         uploaded_avatar: "Picha Binafsi"
         uploaded_avatar_empty: "Ongeza picha yako binafsi"
@@ -957,6 +959,8 @@ sw:
         back: "Rudi Nyuma"
         again: "Jaribu Tena"
         fixed: "Pakua Ukurasa"
+    modal:
+      close: "funga"
     close: "Funga"
     assets_changed_confirm: "Tovuti hii imesasishwa hivi karibuni. Rudisha tena kupata toleo la hivi karibuni?"
     logout: "Ulitolewa."
@@ -1141,7 +1145,6 @@ sw:
       filter_placeholder: Tafuta picha-hisia
       objects: Vitu
       flags: Bendera
-      custom: Ishara binafsi
       recent: Imetumika hivi karibuni
       default_tone: Mwonekano usio na toni
       light_tone: Mwonekano wenye toni nyepesi
@@ -1149,6 +1152,7 @@ sw:
       medium_tone: Mwonekano wenye toni ya katikati
       medium_dark_tone: Mwonekano mweusi wenye toni ya katikati
       dark_tone: Mwonekano wenye toni nyeusi
+      default: Ishara binafsi
     shared_drafts:
       title: "Maswadajaribio Gawiza"
       notice: "Mada hii inapatikana kwa watu wanaoweza kuona kategoria <b>{{category}}</b>."
@@ -1279,6 +1283,7 @@ sw:
       mentioned: "<span>{{jina la mtumiaji}} </span>{{maelezo}}"
       group_mentioned: "<span>{{jina la mtumiaji}} </span>{{maelezo}}"
       quoted: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
+      bookmark_reminder: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
       replied: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
       posted: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
       edited: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
@@ -1908,6 +1913,7 @@ sw:
             title: "Onyesha sehemu yenye html kwenye barua pepe."
             button: "HTML"
       bookmarks:
+        created: "Imetengenezwa"
         name: "Jina"
     category:
       can: "can&hellip; "
@@ -2938,7 +2944,6 @@ sw:
           staff: "Wasaidizi"
           suspended: "Alisitishwa"
           silenced: "Amenyamazishwa"
-          suspect: "Mshukiwa"
           staged: "Sehemu ya kujaribu"
         approved: "Wamekubaliwa?"
         titles:
@@ -2955,7 +2960,6 @@ sw:
           moderators: "Wasimamizi"
           silenced: "Watumiaji Walionyamazishwa"
           suspended: "Watumiaji Waliositishwa"
-          suspect: "Sitisha Watumiaji"
         not_verified: "Haijathibitishwa"
         check_email:
           title: "Onyesha barua pepe ya mtumiaji"
@@ -3267,6 +3271,7 @@ sw:
         help: "Ongeza emoji mpya ambayo itapatikana kwa kila mtu. (USHAURI: unaweza kuweka zaidi ya faili moja mara moja)"
         add: "Ongeza Emoji Mpya"
         name: "Jina"
+        group: "Kikundi"
         image: "Picha"
         delete_confirm: "Una uhakika unataka kufuta emoji ya :%{name}: ?"
       embedding:
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index 3e792c170f..970a244802 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -24,7 +24,6 @@ te:
             tb: టీబీ
     dates:
       time: "h:mm a"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       long_with_year: "MMM D, YYYY h:mm a"
       long_with_year_no_time: "MMM D, YYYY"
@@ -165,6 +164,10 @@ te:
       created: "ఈ టపాకు పేజీక ఉంచారు"
       remove: "పేజీక తొలగించండి"
       save: "భద్రపరచు"
+      reminders:
+        tomorrow: "రేపు"
+        next_week: "వచ్చే వారం"
+        next_month: "వచ్చే నెల"
     drafts:
       remove: "తొలగించు"
       abandon:
@@ -433,8 +436,6 @@ te:
         success: "ఆ చిరునామాకు మేము వేగు పంపాము. అందులోని సూచనలు అనుసరించండి. "
       change_avatar:
         title: "మీ ప్రవర బొమ్మ మార్చండి."
-        gravatar: "ఆధారపడిన <a href='//gravatar.com/emails' target='_blank'>గ్రావతారం</a>"
-        refresh_gravatar_title: "మీ గ్రావతారం తాజాపరుచు"
         letter_based: "వ్యవస్థ కేటాయించిన ప్రవర బొమ్మ"
         uploaded_avatar: "అనురూప బొమ్మ"
         uploaded_avatar_empty: "అనురూప బొమ్మను కలపండి"
@@ -574,6 +575,8 @@ te:
         back: "వెనక్కు వెళ్లండి"
         again: "మళ్ళీ ప్రయత్నించండి"
         fixed: "పుట ఎక్కించండి"
+    modal:
+      close: "మూసివేయి"
     close: "మూసివేయి"
     assets_changed_confirm: "ఈ సైటు ఇప్పుడే ఉన్నతీకరించబడింది. కొత్త రూపాంతరం చూడటానికి తాజాపరచండి?"
     logout: "మీరు లాగవుట్ అయ్యారు."
@@ -1061,6 +1064,7 @@ te:
           side_by_side_markdown:
             title: "ముడి మూల తేడాను పక్కపక్కన చూపు"
       bookmarks:
+        created: "సృష్టించిన"
         name: "పేరు"
     category:
       can: "can&hellip;"
@@ -1704,7 +1708,6 @@ te:
           active: "క్రియాశీల"
           staff: "సిబ్బంది"
           suspended: "సస్పెడయ్యాడు"
-          suspect: "అనుమానించు"
         approved: "అంగీకరించు"
         titles:
           active: "క్రియాశీల సభ్యులు"
@@ -1719,7 +1722,6 @@ te:
           admins: "అధికారి సభ్యులు"
           moderators: "నిర్వాహకులు"
           suspended: "సస్పెండయిన సభ్యులు"
-          suspect: "అనుమానిత సభ్యులు"
         not_verified: "ద్రువీకరించలేదు"
         check_email:
           title: "ఈ సభ్యుని ఈమెయిల్ చూపు"
@@ -1950,6 +1952,7 @@ te:
         title: "ఇమోజి"
         add: "కొత్త ఇమోజి కలుపు"
         name: "పేరు"
+        group: "సమూహం"
         image: "బొమ్మ"
         delete_confirm: "మీరు నిజంగా %{name}: ఎమోజీ ని తొలగించాలనుకుంటున్నారా ?"
       embedding:
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 3149fc5af8..6e8bc581d4 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -27,7 +27,6 @@ th:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -561,9 +560,6 @@ th:
         success: "เราส่งอีเมลไปยังที่อยู่อีเมลดังกล่าวแล้ว กรุณาทำตามขั้นตอนยืนยัน"
       change_avatar:
         title: "เปลี่ยนรูปโพรไฟล์"
-        gravatar: "ทำงานด้วย <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "เปลี่ยนภาพแทนตัวของคุณบนเว็บไซต์ Gravatar"
-        refresh_gravatar_title: "เรียกของคุณ Gravatar ใหม่"
         letter_based: "รูปโพรไฟล์ที่ระบบทำให้อัตโนมัติ"
         uploaded_avatar: "รูปกำหนดเอง"
         uploaded_avatar_empty: "เพิ่มรูปกำหนดเอง"
@@ -772,6 +768,8 @@ th:
         back: "ย้อนกลับ"
         again: "ลองอีกครั้ง"
         fixed: "โหลดหน้า"
+    modal:
+      close: "ปิด"
     close: "ปิด"
     assets_changed_confirm: "เว็บนี้พึ่งได้รับการอัปเดต รีเฟรชเพื่อเข้าหน้าเว็บล่าสุด?"
     logout: "คุณได้ออกจากระบบ"
@@ -1264,6 +1262,7 @@ th:
         by_you:
           bookmark: "บุ๊คมาร์คโพสนี้"
       bookmarks:
+        created: "สร้างเมื่อ"
         name: "ชื่อ"
     category:
       edit: "แก้ไข"
@@ -1748,7 +1747,6 @@ th:
           active: "ใช้งานอยู่"
           staff: "ทีมงาน"
           suspended: "ระงับการใช้งาน"
-          suspect: "ต้องสงสัย"
         approved: "ยืนยันหรือไม่"
         titles:
           active: "ผู้ใช้ที่ใช้งานอยู่"
@@ -1761,7 +1759,6 @@ th:
           leader: "ผู้ใช้ที่ระดับความไว้ใจ 4 (ผู้นำ)"
           staff: "ทีมงาน"
           suspended: "ผู้ใช้งานที่ถูกระงับ"
-          suspect: "ผู้ใช้งานที่ต้องสงสัย"
         not_verified: "ยังไม่ได้รับการตรวจสอบ"
         check_email:
           title: "แสดงอีเมลผู้ใช้งาน"
@@ -1936,6 +1933,7 @@ th:
         title: "Emoji"
         add: "เพิ่ม Emoji ใหม่"
         name: "ชื่อ"
+        group: "กลุ่ม"
         image: "ภาพ"
         delete_confirm: "คุณแน่ใจหรือว่าจะลบ Emoji :%{name}: ออก?"
       embedding:
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 65a225f7c8..10f8321f6f 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -29,7 +29,6 @@ tr_TR:
       time: "h:mm a"
       time_short_day: "ggg, SS:dd"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM, YYYY h:mm a"
@@ -263,18 +262,17 @@ tr_TR:
     bookmarks:
       created: "bu gönderiyi işaretledin"
       not_bookmarked: "bu yazıya yer işareti koy"
-      created_with_reminder: "bu gönderiyi %{date} adresinde bir hatırlatıcı ile yer işaretlerine eklediniz"
       remove: "İşareti Kaldır"
       confirm_clear: "Bu konudaki tüm yer işaretlerinizi silmek istediğinizden emin misiniz?"
       save: "Kaydet"
       no_timezone: 'Henüz bir saat dilimi belirlemediniz. Hatırlatıcı ayarlayamazsınız. <a href="%{basePath}/my/preferences/profile">Profilinizde</a> bir tane oluşturun.'
       reminders:
         at_desktop: "Bir dahaki sefere masaüstümdeyim"
-        later_today: "Bugün daha sonra <br/> {{date}}"
-        next_business_day: "Bir sonraki iş günü <br/> {{date}}"
-        tomorrow: "Yarın <br/> {{date}}"
-        next_week: "Gelecek hafta <br/> {{date}}"
-        next_month: "Gelecek ay <br/> {{date}}"
+        later_today: "Bugün ilerleyen saatlerde"
+        tomorrow: "Yarın"
+        next_week: "Gelecek hafta"
+        later_this_week: "Bu hafta içinde"
+        next_month: "Gelecek ay"
         custom: "Özel tarih ve saat"
     drafts:
       resume: "Sürdür"
@@ -538,6 +536,7 @@ tr_TR:
         deny: "Reddet"
         denied: "reddedildi"
         undone: "istek reddedildi"
+        handle: "üyelik isteğini yerine getir"
       manage:
         title: "Yönet"
         name: "İsim"
@@ -964,10 +963,6 @@ tr_TR:
         success_staff: "Şu anki adresine bir e-posta gönderdik. Lütfen doğrulama bilgilendirmelerini takip et."
       change_avatar:
         title: "Profil resmini değiştir"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baz alındı"
-        gravatar_title: "Profil görselini \"Gravatar web sitesi\"nde değiştir"
-        gravatar_failed: "Bu e-posta adresine sahip bir Gravatar bulamadık."
-        refresh_gravatar_title: "Gravatar profil görselini yenile"
         letter_based: "Sistem profil görseli atadı"
         uploaded_avatar: "Kişisel resim"
         uploaded_avatar_empty: "Kişisel bir resim ekle"
@@ -1250,6 +1245,8 @@ tr_TR:
         back: "Geri Dön"
         again: "Tekrar Dene"
         fixed: "Sayfayı Yükle"
+    modal:
+      close: "kapat"
     close: "Kapat"
     assets_changed_confirm: "Bu site henüz güncellendi. Son hali için sayfayı yenilemek ister misin?"
     logout: "Çıkış yaptın."
@@ -1477,7 +1474,6 @@ tr_TR:
       objects: Nesneler
       symbols: Semboller
       flags: Bayraklar
-      custom: Özel emojiler
       recent: Son zamanlarda kullanılmış
       default_tone: Görünüm rengi yok
       light_tone: Açık görünüm tonu
@@ -1485,6 +1481,7 @@ tr_TR:
       medium_tone: Orta görünüm tonu
       medium_dark_tone: Orta koyu görünüm tonu
       dark_tone: Koyu görünüm tonu
+      default: Özel emojiler
     shared_drafts:
       title: "Paylaşılan taslaklar"
       notice: "Bu konu, yalnızca <b>{{category}}</b> kategorisini görebilen kişiler tarafından görülebilir."
@@ -1634,6 +1631,7 @@ tr_TR:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2410,9 +2408,8 @@ tr_TR:
             button: "HTML"
       bookmarks:
         create: "Yer işareti oluştur"
+        created: "Oluşturuldu"
         name: "İsim"
-        name_placeholder: "Daha kolay hatırlayabilmeniz için yer işaretini adlandırın"
-        set_reminder: "Hatırlatıcı kur"
     category:
       can: "yapabilir&hellip;"
       none: "(kategori yok)"
@@ -3839,7 +3836,6 @@ tr_TR:
           staff: "Görevli"
           suspended: "Askıya Alınmış"
           silenced: "Susturuldu"
-          suspect: "Şüpheli"
           staged: "Aşamalı"
         approved: "Onaylanmış mı?"
         titles:
@@ -3856,7 +3852,6 @@ tr_TR:
           moderators: "Moderatörler"
           silenced: "Susturulmuş Kullanıcılar"
           suspended: "Askıya Alınan Kullanıcılar"
-          suspect: "Şüpheli Kullanıcılar"
           staged: "Aşamalı Kullanıcılar"
         not_verified: "Doğrulanmadı"
         check_email:
@@ -4214,6 +4209,7 @@ tr_TR:
         help: "Herkese açık yeni bir emoji ekle. (PROTIP: birden çok dosyayı tek seferde sürükleyip bırakabilirsin)"
         add: "Yeni Emoji Ekle"
         name: "İsim"
+        group: "Grup"
         image: "Resim"
         delete_confirm: ":%{name}: emojisini silmek istediğine emin misin?"
       embedding:
@@ -4240,7 +4236,6 @@ tr_TR:
         save: "Gömme Ayarlarını Kaydet"
       permalink:
         title: "Kalıcı Bağlantılar"
-        description: "Lütfen bunun yalnızca harici kaynaklar için geçerli olduğunu unutmayın, forumunuzda yayınlanan bağlantılar yönlendirilmeyecektir."
         url: "URL"
         topic_id: "Konu ID"
         topic_title: "Konu"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index be53040281..9a1fc5167b 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -31,7 +31,6 @@ uk:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY, HH:mm"
@@ -312,18 +311,17 @@ uk:
     bookmarks:
       created: "ви додали цей допис до закладок"
       not_bookmarked: "додати цей допис до закладок"
-      created_with_reminder: "ви додали закладку на цю публікацію з нагадуванням на %{date}"
       remove: "Вилучити закладку"
       confirm_clear: "Ви впевнені, що хочете вилучити всі закладки з цієї теми?"
       save: "Зберегти"
       no_timezone: 'Ви ще не встановили часовий пояс. Ви не зможете встановити нагадування. Налаштуйте його <a href="%{basePath}/my/preferences/profile">у своєму профілі</a> .'
       reminders:
         at_desktop: "Наступного разу на мій робочий стіл"
-        later_today: "Пізніше сьогодні <br/> {{date}}"
-        next_business_day: "Наступний робочий день <br/> {{date}}"
-        tomorrow: "Завтра <br/> {{date}}"
-        next_week: "Наступного тижня <br/> {{date}}"
-        next_month: "Наступного місяця <br/> {{date}}"
+        later_today: "Пізніше сьогодні"
+        tomorrow: "Завтра"
+        next_week: "На наступному тижні"
+        later_this_week: "Пізніше на цьому тижні"
+        next_month: "В наступному місяці"
         custom: "Вибрана дата та час"
     drafts:
       resume: "Продовжити"
@@ -611,6 +609,7 @@ uk:
         deny: "Відмовити"
         denied: "відмовлено"
         undone: "запит скасовано"
+        handle: "обробляти запит на вступ"
       manage:
         title: "Керувати"
         name: "Ім'я"
@@ -1047,10 +1046,6 @@ uk:
         success_staff: "Ми надіслали листа на вашу поточну скриньку. Будь ласка, виконайте інструкції щодо підтвердження."
       change_avatar:
         title: "Змінити своє зображення профілю"
-        gravatar: "На основі <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "Змінити аватарку на сайті Gravatar"
-        gravatar_failed: "Не вдалося знайти Gravatar за цією електронною поштою."
-        refresh_gravatar_title: "Оновити мій Gravatar"
         letter_based: "Ваше зображення додане автоматично"
         uploaded_avatar: "Інше зображення"
         uploaded_avatar_empty: "Додати інше зображення"
@@ -1353,6 +1348,8 @@ uk:
         back: "Повернутися"
         again: "Спробувати ще раз"
         fixed: "Завантаження Сторінки"
+    modal:
+      close: "сховати"
     close: "Закрити"
     assets_changed_confirm: "Сайт тільки що був оновлений. Перезавантажити сторінку для переходу до нової версії?"
     logout: "Ви вийшли."
@@ -1588,7 +1585,6 @@ uk:
       objects: Objects
       symbols: Атрибутика
       flags: Скарги
-      custom: Призначені для користувача смайли
       recent: Нещодавно використані
       default_tone: Немає скіна
       light_tone: Світлий тон скіна
@@ -1596,6 +1592,7 @@ uk:
       medium_tone: Середній тон скіна
       medium_dark_tone: Середній темний тон скіна
       dark_tone: Темний відтінок скіна
+      default: Призначені для користувача смайли
     shared_drafts:
       title: "загальні Чернетки"
       notice: "Ці теми видно тільки тим, хто може бачити <b>{{category}}</b> категорію."
@@ -1751,6 +1748,7 @@ uk:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2601,9 +2599,8 @@ uk:
             button: "HTML"
       bookmarks:
         create: "Створити закладку"
+        created: "Створено"
         name: "Назва"
-        name_placeholder: "Назва закладки, яка допоможе знайти та згадати"
-        set_reminder: "Створити нагадування"
         actions:
           delete_bookmark:
             name: "Видалити закладку"
@@ -4096,7 +4093,6 @@ uk:
           staff: "Персонал"
           suspended: "Призупинені"
           silenced: "Відключені"
-          suspect: "Підозрілі"
           staged: "Недокористувач"
         approved: "Схвалено?"
         titles:
@@ -4113,7 +4109,6 @@ uk:
           moderators: "Модератори"
           silenced: "Відключені користувачі"
           suspended: "Призупинені користувачі"
-          suspect: "Підозрілі користувачі"
           staged: "Недокористувачі"
         not_verified: "Не підтверджений"
         check_email:
@@ -4481,6 +4476,7 @@ uk:
         help: "Додати нові смайли-emoji, які будуть доступні всім. (Підказка: можна перетягувати кілька файлів за раз)"
         add: "Додати нову іконку"
         name: "Ім'я"
+        group: "Група"
         image: "Зображення"
         delete_confirm: "Ви впевнені, що хочете видалити іконку :%{name}:?"
       embedding:
@@ -4507,7 +4503,6 @@ uk:
         save: "Зберегти налаштування вбудовування"
       permalink:
         title: "Постійні посилання"
-        description: "Зверніть увагу, що це стосується лише зовнішніх джерел, посилання, розміщені на вашому форумі, не будуть перенаправлені."
         url: "Посилання"
         topic_id: "ID теми"
         topic_title: "Тема"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 99524b1b41..a4ec6ef83f 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -28,7 +28,6 @@ ur:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -264,6 +263,12 @@ ur:
       remove: "بُک مارک ہٹائیں"
       confirm_clear: "کیا آپ کو یقین ہے کہ آپ اِس ٹاپک سے اپنے تمام بُک مارکس ہٹانا چاہتے ہیں؟"
       save: "محفوظ کریں"
+      reminders:
+        later_today: "آج بعد میں"
+        tomorrow: "کَل"
+        next_week: "اگلے ہفتے"
+        later_this_week: "اِس ہفتے بعد میں"
+        next_month: "اگلے ماہ"
     drafts:
       resume: "جاری رکھیں"
       remove: "خارج کریں"
@@ -519,6 +524,7 @@ ur:
         deny: "انکار"
         denied: "انکار کر دیا"
         undone: "درخواست کالعدم"
+        handle: "رکنیت کی درخواست سے نمٹیں"
       manage:
         title: "مَینَیج"
         name: "نام"
@@ -929,10 +935,6 @@ ur:
         success_staff: "ہم نے آپ کے موجودہ ایڈریس پر ایک اِی میل بھیج دی ہے۔ براہ کرم، تصدیق کی ہدایات پر عمل کریں۔"
       change_avatar:
         title: "اپنے پروفائل کی تصویر تبدیل کریں"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>گَرِیوَّٹار</a>، کی بنیاد پر"
-        gravatar_title: "گَرِیوَّٹار کی ویب سائٹ پر اپنے اوتار کو تبدیل کریں"
-        gravatar_failed: "ہم اِس ایمیل ایڈریس کے ساتھ گَرَیوَٹار نہیں تلاش کرسکے۔"
-        refresh_gravatar_title: "اپنے گَرِیوَّٹار کو رِیفریش کریں"
         letter_based: "سسٹم تفویض کردہ پروفائل تصویر"
         uploaded_avatar: "اپنی مرضی کی تصویر"
         uploaded_avatar_empty: "اپنی مرضی کی تصویر شامل کریں"
@@ -1208,6 +1210,8 @@ ur:
         back: "واپس جائیں"
         again: "دوبارہ کوشش کریں"
         fixed: "پیج لوڈ کریں"
+    modal:
+      close: "بند کریں"
     close: "بند کریں"
     assets_changed_confirm: "یہ ویب سائٹ ابھی ابھی اَپ ڈیٹ کی گئی ہے۔ تازہ ترین ورژن کے لئے ابھی رِیفریش کریں؟"
     logout: "آپ لاگ آؤٹ ہو گئے تھے۔"
@@ -1420,7 +1424,6 @@ ur:
       objects: اشیاء
       symbols: علامات
       flags: فلَیگز
-      custom: اپنی مرضی کے اِیمَوجی
       recent: حال ہی میں استعمال کیے گئے
       default_tone: کوئی جِلد رنگ نہیں
       light_tone: ہلکا جِلد رنگ
@@ -1428,6 +1431,7 @@ ur:
       medium_tone: درمیانا جِلد رنگ
       medium_dark_tone: درمیانا سیاہ جِلد رنگ
       dark_tone: سیاہ جِلد رنگ
+      default: اپنی مرضی کے اِیمَوجی
     shared_drafts:
       title: "مشترکہ ڈرافٹس"
       notice: "یہ ٹاپک صرف اُن لوگوں کیلئے نظر آتا ہے جو <b>{{category}}</b> زُمرَہ کو دیکھ سکتے ہیں۔"
@@ -1574,6 +1578,7 @@ ur:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2326,6 +2331,7 @@ ur:
             title: "ای میل کے متن کا html حصہ دکھائیں"
             button: "HTML"
       bookmarks:
+        created: "بنایا گیا"
         name: "نام"
     category:
       can: "کر سکتا ہے&hellip; "
@@ -3693,7 +3699,6 @@ ur:
           staff: "سٹاف"
           suspended: "معطل کردہ"
           silenced: "خاموش کیو ہوئے"
-          suspect: "مشتبہ"
           staged: "سٹَیجڈ"
         approved: "منظورشدہ؟"
         titles:
@@ -3710,7 +3715,6 @@ ur:
           moderators: "ماڈریٹرز"
           silenced: "خاموش کردہ صارفین"
           suspended: "معطل کردہ صارفین"
-          suspect: "مشتبہ صارفین"
           staged: "سٹَیجڈ صارفین"
         not_verified: "غیر تصدیق شدہ"
         check_email:
@@ -4059,6 +4063,7 @@ ur:
         help: "نئی اِیمَوجی شامل کریں جو سب کے لئے دستیاب ہوگی۔ (پیشہ وَرَانہ ٹِپ: ایک بار میں ایک سے زیادہ فائلوں کو ڈرَیگ & ڈراپ کریں)"
         add: "نئی اِیمَوجی شامل کریں"
         name: "نام"
+        group: "گروپ"
         image: "تصویر"
         delete_confirm: "کیا آپ واقعی :%{name}: اِیمَوجی حذف کرنا چاہتے ہیں؟"
       embedding:
@@ -4085,7 +4090,6 @@ ur:
         save: "اَیمبَیڈ کرنے کی سیٹِنگ محفوظ کریں"
       permalink:
         title: "دائمی لِنکس"
-        description: "براہ کرم نوٹ کریں کہ یہ صرف بیرونی ذرائع پر لاگو ہوتا ہے، آپ کے فورم پر شائع کردہ لنکس کو ری ڈائریکٹ نہیں کیا جائے گا۔"
         url: "URL"
         topic_id: "ٹاپک ID"
         topic_title: "ٹاپک"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index f71871ae86..e121af9332 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -28,7 +28,6 @@ vi:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -239,18 +238,15 @@ vi:
     bookmarks:
       created: "bạn đã đánh dấu bài viết này"
       not_bookmarked: "đánh dấu bài viết này"
-      created_with_reminder: "bạn đã đánh dấu bài đăng này bằng một lời nhắc tại %{date}"
       remove: "Xóa dấu trang"
       confirm_clear: "Bạn có chắc muốn xóa toàn bộ đánh dấu trong chủ đề này?"
       save: "Lưu"
       no_timezone: 'Bạn chưa đặt múi giờ. Bạn sẽ không thể đặt lời nhắc. Thiết lập một <a href="%{basePath}/my/preferences/profile">trong hồ sơ của bạn</a> .'
       reminders:
         at_desktop: "Lần sau tôi ở máy tính để bàn của tôi"
-        later_today: "Sau ngày hôm nay <br/> {{date}}"
-        next_business_day: "Ngày làm việc tiếp theo <br/> {{date}}"
-        tomorrow: "Ngày mai <br/> {{date}}"
-        next_week: "Tuần tới <br/> {{date}}"
-        next_month: "Tháng tiếp theo <br/> {{date}}"
+        tomorrow: "Ngày mai"
+        next_week: "Tuần tới"
+        next_month: "Tháng t"
         custom: "Ngày giờ tùy chỉnh"
     drafts:
       resume: "Làm lại"
@@ -867,9 +863,6 @@ vi:
         success: "Chúng tôi đã gửi email tới địa chỉ đó. Vui lòng làm theo chỉ dẫn để xác nhận lại."
       change_avatar:
         title: "Đổi ảnh đại diện"
-        gravatar: "dựa trên <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "Đổi ảnh đại diện của bạn trên website Gravatar"
-        refresh_gravatar_title: "Làm mới Gravatar của bạn"
         letter_based: "Hệ thống xác định ảnh đại diện"
         uploaded_avatar: "Chính sửa hình ảnh"
         uploaded_avatar_empty: "Thêm một ảnh chỉnh sửa"
@@ -1116,6 +1109,8 @@ vi:
         back: "Quay trở lại"
         again: "Thử lại"
         fixed: "Load lại trang"
+    modal:
+      close: "đóng"
     close: "Đóng lại"
     assets_changed_confirm: "Website đã được cập nhật bản mới. Bạn có thể làm mới lại trang để có thể sử dụng bản mới được cập nhật"
     logout: "Bạn đã đăng xuất"
@@ -1878,6 +1873,7 @@ vi:
           html_part:
             button: "HTML"
       bookmarks:
+        created: "Tạo bởi"
         name: "Tên"
     category:
       can: "can&hellip;"
@@ -2726,7 +2722,6 @@ vi:
           active: "Kích hoạt"
           staff: "Nhân viên"
           suspended: "Đã tạm khóa"
-          suspect: "Nghi ngờ"
         approved: "Đã duyệt?"
         titles:
           active: "Thành viên kích hoạt"
@@ -2741,7 +2736,6 @@ vi:
           admins: "Tài khoản Quản trị"
           moderators: "Điều hành viên"
           suspended: "Tài khoản Tạm khóa"
-          suspect: "Tài khoản đáng ngờ"
         not_verified: "Chưa xác thực"
         check_email:
           title: "Khám phá email của tài khoản này"
@@ -3013,6 +3007,7 @@ vi:
         help: "Thêm emoji mới có sẵn cho tất cả mọi người. (MẸO: kéo & thả nhiều file cùng lúc)"
         add: "Thêm emoji mới"
         name: "Tên"
+        group: "Nhóm"
         image: "Hình ảnh"
         delete_confirm: "Bạn có chắc chắn muốn xóa emoji :%{name}:?"
       embedding:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index ced1e8b9f5..a0d9460b95 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -10,7 +10,7 @@ zh_CN:
     number:
       format:
         separator: "."
-        delimiter: "，"
+        delimiter: ","
       human:
         storage_units:
           format: "%n %u"
@@ -28,17 +28,17 @@ zh_CN:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "YYYY[年]M[月]"
-      long_no_year: "M[月]D[日], HH:mm"
-      long_no_year_no_time: "M月D日"
-      full_no_year_no_time: "M月D日"
-      long_with_year: "YYYY年M月D日 HH:mm"
-      long_with_year_no_time: "YYYY年M月D日"
-      full_with_year_no_time: "YYYY年M月D日"
-      long_date_with_year: "YY年M月D日 LT"
-      long_date_without_year: "M月D日 LT"
-      long_date_with_year_without_time: "YY年M月D日"
-      long_date_without_year_with_linebreak: "M月D日 <br/>LT"
-      long_date_with_year_with_linebreak: "YY年M月D日 <br/>LT"
+      long_no_year: "M[月]D[日] HH:mm"
+      long_no_year_no_time: "M[月]D[日]"
+      full_no_year_no_time: "M[月]D[日]"
+      long_with_year: "YYYY[年]M[月]D[日] HH:mm"
+      long_with_year_no_time: "YYYY[年]M[月]D[日]"
+      full_with_year_no_time: "YYYY[年]M[月]D[日]"
+      long_date_with_year: "YY[年]M[月]D[日] LT"
+      long_date_without_year: "M[月]D[日] LT"
+      long_date_with_year_without_time: "YY[年]M[月]D[日]"
+      long_date_without_year_with_linebreak: "M[月]D[日] <br/>LT"
+      long_date_with_year_with_linebreak: "YY[年]M[月]D[日] <br/>LT"
       wrap_ago: "%{date} 前"
       tiny:
         half_a_minute: "< 1 分钟"
@@ -62,8 +62,8 @@ zh_CN:
           other: "> %{count} 年"
         almost_x_years:
           other: "近 %{count} 年"
-        date_month: "M月D日"
-        date_year: "YY年M月"
+        date_month: "M[月]D[日]"
+        date_year: "YY[年]M[月]"
       medium:
         x_minutes:
           other: "%{count} 分钟"
@@ -71,7 +71,7 @@ zh_CN:
           other: "%{count} 小时"
         x_days:
           other: "%{count} 天"
-        date_year: "YY年M月"
+        date_year: "YY[年]M[月]D[日]"
       medium_with_ago:
         x_minutes:
           other: "%{count} 分钟前"
@@ -102,7 +102,7 @@ zh_CN:
       email: "通过电子邮件分享此链接"
     action_codes:
       public_topic: "于%{when}将此主题设为公开"
-      private_topic: "于%{when}将该次主题转换为私信"
+      private_topic: "于%{when}将该主题转换为私信"
       split_topic: "于%{when}拆分了此主题"
       invited_user: "于%{when}邀请了 %{who}"
       invited_group: "于%{when}邀请了 %{who}"
@@ -127,19 +127,19 @@ zh_CN:
         disabled: "于%{when}解除全站置顶"
       visible:
         enabled: "于%{when}列出"
-        disabled: "于%{when}除名"
+        disabled: "于%{when}隐藏"
       banner:
         enabled: "于%{when}将此设置为横幅。用户关闭横幅前，横幅将显示在每一页的顶部。"
         disabled: "于%{when}移除了该横幅。横幅将不再显示在每一页的顶部。"
       forwarded: "转发上述邮件"
     topic_admin_menu: "管理主题"
     wizard_required: "欢迎来到你新安装的 Discourse！让我们开始<a href='%{url}' data-auto-route='true'>设置向导</a>✨"
-    emails_are_disabled: "出站邮件已经被管理员全局禁用。将不发送任何邮件提醒。"
-    bootstrap_mode_enabled: "为方便站点准备发布，其正处于初始化模式中。所有新用户将被授予信任等级 1，并为他们设置接受每日邮件摘要。初始化模式会在用户数超过%{min_users}个时关闭。"
-    bootstrap_mode_disabled: "初始化模式将会在24小时后关闭。"
+    emails_are_disabled: "出站邮件已经被管理员全局禁用。将不会发送任何邮件提醒。"
+    bootstrap_mode_enabled: "为方便新站点的冷启动，现正处于初始化模式中。所有新用户将被授予信任等级 1，并为他们启用每日邮件摘要。初始化模式会在用户数超过%{min_users}个时关闭。"
+    bootstrap_mode_disabled: "初始化模式将会在24小时内关闭。"
     themes:
       default_description: "默认"
-      broken_theme_alert: "你的网站可能无法正常运行，因为主题/组件%{theme}有错误。 在%{path}禁用它。"
+      broken_theme_alert: "因为主题或组件%{theme}有错误，你的网站可能无法正常运行。 在%{path}禁用它。"
     s3:
       regions:
         ap_northeast_1: "亚太地区（Tokyo）"
@@ -162,7 +162,7 @@ zh_CN:
         us_gov_west_1: "AWS 政府云（US-West）"
         us_west_1: "美国西部（N. California）"
         us_west_2: "美国西部（Oregon）"
-    edit: "编辑标题和分类"
+    edit: "编辑该主题的标题和分类"
     expand: "展开"
     not_implemented: "非常抱歉，这个功能仍在开发中！"
     no_value: "否"
@@ -237,22 +237,33 @@ zh_CN:
       help:
         bookmark: "点击收藏该主题的第一个帖子"
         unbookmark: "点击删除本主题的所有收藏"
+        unbookmark_with_reminder: "点击以移除该主题上的所有收藏和提醒。你在该主题中设定了一个于%{reminder_at}的提醒。"
     bookmarks:
       created: "你已经收藏了此帖"
       not_bookmarked: "收藏此帖"
-      created_with_reminder: "你已收藏此帖并添加了一个于%{date}的提醒"
+      created_with_reminder: "你已经收藏该帖并且设定了一个于%{date}的提醒"
+      created_with_at_desktop_reminder: "你所收藏的此帖将会在你下次使用桌面设备时被提醒。"
       remove: "取消收藏"
       confirm_clear: "你确定要清空这个主题中的所有收藏？"
       save: "保存"
       no_timezone: '你尚未设置时区。您将无法设置提醒。在 <a href="%{basePath}/my/preferences/profile">你的个人资料中</a>设置。'
+      invalid_custom_datetime: "你所提供的日期和时间无效，请重试。"
+      list_permission_denied: "你没有权限查看该用户的收藏。"
       reminders:
         at_desktop: "下次我使用桌面设备时"
-        later_today: "今天晚些时候<br/> {{date}}"
-        next_business_day: "下个工作日"
+        later_today: "今天的某个时候"
+        next_business_day: "下一个工作日"
         tomorrow: "明天"
-        next_week: "下周"
-        next_month: "下个月<br/> {{date}}"
+        next_week: "下个星期"
+        later_this_week: "这周的某个时候"
+        start_of_next_business_week: "下周一"
+        next_month: "下个月"
         custom: "自定义日期和时间"
+        last_custom: "最近"
+        none: "无需提醒"
+        today_with_time: "今天%{time}"
+        tomorrow_with_time: "明天%{time}"
+        at_time: "于%{date_time}"
     drafts:
       resume: "复位"
       remove: "移除"
@@ -260,8 +271,8 @@ zh_CN:
       new_private_message: "新私信草稿"
       topic_reply: "草稿回复"
       abandon:
-        confirm: "您已在此主题中打开了另一个草稿。 你确定要放弃吗？"
-        yes_value: "是的，放弃"
+        confirm: "你已在此主题中打开了另一个草稿。 你确定要舍弃它吗？"
+        yes_value: "是的，舍弃"
         no_value: "不，保持"
     topic_count_latest:
       other: "有 {{count}} 个更新或新主题"
@@ -301,8 +312,8 @@ zh_CN:
     choose_message:
       none_found: "无符合的结果"
       title:
-        search: "搜索消息"
-        placeholder: "在此处输入消息标题、URL或ID"
+        search: "搜索私信"
+        placeholder: "在此处输入私信的标题、URL或ID"
     review:
       order_by: "排序依据"
       in_reply_to: "回复给"
@@ -312,24 +323,24 @@ zh_CN:
         formula: "公式"
         subtotal: "小计"
         total: "总计"
-        min_score_visibility: "可见时的最低分数"
+        min_score_visibility: "可见的最低分数"
         score_to_hide: "隐藏帖子的分数"
         take_action_bonus:
           name: "立即执行"
           title: "当工作人员选择采取行动时，会给标记加分。"
         user_accuracy_bonus:
           name: "用户准确性"
-          title: "历史上已同意其标记的用户将获得奖励。"
+          title: "先前已同意其标记的用户将获得奖励。"
         trust_level_bonus:
           name: "信任等级"
           title: "待审阅项目由较高信任级别且具有较高分数的用户创建的。"
         type_bonus:
           name: "奖励类型"
-          title: "某些可审核的类型可以由管理人员加权，以使其具有更高的优先级。"
+          title: "某些可审核类型可以由管理人员加权，以使其具有更高的优先级。"
       claim_help:
-        optional: "你可以认领此条目以防止他人审核。"
+        optional: "你可以认领此条目以避免被他人审核。"
         required: "在你审核之前你必须认领此条目。"
-        claimed_by_you: "你已认领此条目并可审核。"
+        claimed_by_you: "你已认领此条目现在可以审核了。"
         claimed_by_other: "此条目仅可被<b>{{username}}</b>审核。"
       claim:
         title: "认领该主题"
@@ -349,14 +360,14 @@ zh_CN:
       none: "没有项目需要审核"
       view_pending: "查看待审核"
       topic_has_pending:
-        other: "这个主题有 <b>{{count}}</b> 个帖子等待审核"
+        other: "该主题中有 <b>{{count}}</b> 个帖等待审核中"
       title: "审核"
       topic: "主题："
       filtered_topic: "您正在选择性地查看这一主题中的可审核内容。"
       filtered_user: "用户"
       show_all_topics: "显示所有主题"
-      deleted_post: "(帖子已删除)"
-      deleted_user: "(用户已删除)"
+      deleted_post: "(已删除的帖子)"
+      deleted_user: "(已删除的用户)"
       user:
         bio: "简介"
         website: "网站"
@@ -378,7 +389,7 @@ zh_CN:
         reviewable_count: "计数"
         reported_by: "报告人"
         deleted: "[已删除的主题]"
-        original: "（原始主题）"
+        original: "（原主题）"
         details: "详情"
         unique_users:
           other: "{{count}} 位用户"
@@ -405,12 +416,12 @@ zh_CN:
         priority:
           title: "最低优先级"
           low: "（所有）"
-          medium: "中等"
+          medium: "中"
           high: "高"
       conversation:
-        view_full: "查看所有对话"
+        view_full: "查看完整对话"
       scores:
-        about: "该分数是通过举报者的信任等级、该用户以往举报的准确性以及被举报项目的优先级计算得出。"
+        about: "该分数是根据报告者的信任等级、该用户以往举报的准确性以及被举报条目的优先级计算得出的。"
         score: "评分"
         date: "日期"
         type: "类型"
@@ -444,9 +455,9 @@ zh_CN:
           title: "用户"
       approval:
         title: "等待审核中"
-        description: "我们已经保存了你的帖子，不过帖子需要由管理员先审核才能显示。请耐心。"
+        description: "我们已经收到了你的发帖，不过帖子需要由版主审核才能显示。请耐心等待。"
         pending_posts:
-          other: "你有 <strong>{{count}}</strong> 个帖子待审核。"
+          other: "你有 <strong>{{count}}</strong> 个帖子在等待审核中。"
         ok: "确认"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a>发表了<a href='{{topicUrl}}'>该主题</a>"
@@ -465,7 +476,7 @@ zh_CN:
     directory:
       filter_name: "按用户名筛选"
       title: "用户"
-      likes_given: "送出赞"
+      likes_given: "点赞"
       likes_received: "获得赞"
       topics_entered: "浏览"
       topics_entered_long: "浏览主题"
@@ -478,7 +489,8 @@ zh_CN:
       days_visited: "访问"
       days_visited_long: "访问天数"
       posts_read: "阅读"
-      posts_read_long: "阅读帖子"
+      posts_read_long: "看帖"
+      last_updated: "最近更新："
       total_rows:
         other: "%{count} 位用户"
     group_histories:
@@ -503,6 +515,7 @@ zh_CN:
         deny: "拒绝"
         denied: "已拒绝"
         undone: "撤销请求"
+        handle: "处理成员请求"
       manage:
         title: "管理"
         name: "名字"
@@ -533,7 +546,7 @@ zh_CN:
       empty:
         posts: "群组成员没有发布帖子。"
         members: "群组没有成员。"
-        requests: "没有用户请求成为此群组的成员"
+        requests: "没有请求加入此群组的请求。"
         mentions: "群组从未被提及过。"
         messages: "群组从未发送过私信。"
         topics: "群组的成员从未发表主题。"
@@ -543,7 +556,7 @@ zh_CN:
       leave: "离开"
       request: "请求"
       message: "私信"
-      confirm_leave: "你确定你要离开这个团队吗？"
+      confirm_leave: "你确定要离开这个群组吗？"
       allow_membership_requests: "允许用户向群组所有者发送成员资格请求（需要公开可见的群组）"
       membership_request_template: "用户发送会员请求时向其显示的自定义模板"
       membership_request:
@@ -551,7 +564,7 @@ zh_CN:
         title: "申请加入%{group_name}"
         reason: "向群组拥有者说明你为何属于这个群组"
       membership: "成员资格"
-      name: "群组ID"
+      name: "名称"
       group_name: "群组名"
       user_count: "用户"
       bio: "关于群组"
@@ -563,14 +576,14 @@ zh_CN:
         empty: "没有可见的群组。"
         filter: "根据群组类型筛选"
         owner_groups: "拥有的群组"
-        close_groups: "封闭群组"
+        close_groups: "关闭的群组"
         automatic_groups: "自动分组"
         automatic: "自动"
         closed: "已关闭"
         public: "公开"
         private: "私密"
-        public_groups: "公开群组"
-        automatic_group: 自动群组
+        public_groups: "公开的群组"
+        automatic_group: 自动分组
         close_group: 关闭群组
         my_groups: "我的群组"
         group_type: "群组类别"
@@ -601,7 +614,7 @@ zh_CN:
         messageable: "谁能私信此群组"
         nobody: "没有人"
         only_admins: "管理员"
-        mods_and_admins: "版主与管理员"
+        mods_and_admins: "仅版主和管理员"
         members_mods_and_admins: "组员、版主与管理员"
         owners_mods_and_admins: "仅群组成员、版主与管理员"
         everyone: "任何人"
@@ -610,7 +623,7 @@ zh_CN:
           title: "跟踪"
           description: "你将会在该私信中的每个新帖子发布后收到通知，并且会显示新回复数量。"
         watching_first_post:
-          title: "监看头一帖"
+          title: "监看新主题"
           description: "你将收到有关此组中新消息的通知，但不会回复消息。"
         tracking:
           title: "跟踪"
@@ -631,13 +644,13 @@ zh_CN:
       flair_preview_icon: "预览图标"
       flair_preview_image: "预览图片"
     user_action_groups:
-      "1": "送出赞"
+      "1": "点赞赞"
       "2": "获得赞"
       "3": "收藏"
       "4": "主题"
       "5": "回复"
       "6": "回应"
-      "7": "@我的"
+      "7": "提及"
       "9": "引用"
       "11": "编辑"
       "12": "发送"
@@ -665,9 +678,9 @@ zh_CN:
       topic_sentence:
         other: "%{count} 主题"
       topic_stat_sentence_week:
-        other: "%{count}上周新帖。"
+        other: "过去一周有%{count}个新主题。"
       topic_stat_sentence_month:
-        other: "%{count}上月新帖。"
+        other: "过去一个月有%{count}个新主题。"
       n_more: "分类 (还有%{count}个分类) ..."
     ip_lookup:
       title: IP 地址查询
@@ -726,6 +739,7 @@ zh_CN:
         clear:
           title: "清除"
           warning: "你确定要清除精选主题吗？"
+      use_current_timezone: "使用现在的时区"
       profile_hidden: "此用户公共信息已被隐藏。"
       expand_profile: "展开"
       collapse_profile: "折叠"
@@ -782,22 +796,22 @@ zh_CN:
         warning: "邮件列表模式启用。邮件通知设置被覆盖。"
       tag_settings: "标签"
       watched_tags: "关注"
-      watched_tags_instructions: "你将自动关注有这些标签的所有主题。所有新帖子和新主题会通知你，新帖数量也会显示在主题旁边。"
+      watched_tags_instructions: "你将自动关注所有含有这些标签的主题。你会收到所有新帖子和主题的通知，且新帖子的数量也会显示在主题旁边。"
       tracked_tags: "跟踪"
-      tracked_tags_instructions: "你将自动跟踪这些标签的所有主题，新帖数量将会显示在主题旁边。"
+      tracked_tags_instructions: "你将自动跟踪所有含有这些标签的主题，新帖数量将会显示在主题旁边。"
       muted_tags: "静音"
       muted_tags_instructions: "你将不会收到有这些标签的新主题任何通知，它们也不会出现在“最新”主题列表。"
       watched_categories: "监看"
-      watched_categories_instructions: "你将自动关注这些分类中的所有主题。所有新帖子和新主题会通知你，新帖数量也将显示在主题旁边。"
+      watched_categories_instructions: "你将自动关注这些分类中的所有主题。你会收到所有新帖子和新主题的通知，新帖数量也会显示在主题旁边。"
       tracked_categories: "跟踪"
       tracked_categories_instructions: "你将自动跟踪这些分类中的所有主题。新帖数量将会显示在主题旁边。"
-      watched_first_post_categories: "监看头一帖"
+      watched_first_post_categories: "监看新主题"
       watched_first_post_categories_instructions: "在这些分类里面，每一个新主题的第一帖会通知你。"
-      watched_first_post_tags: "监看头一帖"
+      watched_first_post_tags: "监看新主题"
       watched_first_post_tags_instructions: "在有了这些标签的每一个新主题，第一帖会通知你。"
       muted_categories: "静音"
       muted_categories_instructions: "你不会收到有关这些分类中新主题的任何通知，也不会出现在类别或最新页面上。"
-      muted_categories_instructions_dont_hide: "你不会收到这些组内关于新主题中的通知。"
+      muted_categories_instructions_dont_hide: "你将不会收到在这些分类中的新主题通知。"
       no_category_access: "无法保存，作为审核人你仅具有受限的 分类 访问权限"
       delete_account: "删除我的账户"
       delete_account_confirm: "你真的要永久删除自己的账户吗？删除之后无法恢复！"
@@ -808,8 +822,8 @@ zh_CN:
       users: "用户"
       muted_users: "静音"
       muted_users_instructions: "抑制来自这些用户的所有通知。"
-      ignored_users: "忽略"
-      ignored_users_instructions: "取消所有帖子和来自这些用户的通知。"
+      ignored_users: "忽视"
+      ignored_users_instructions: "封禁所有来自这些用户的帖子和通知。"
       tracked_topics_link: "显示"
       automatically_unpin_topics: "当我完整阅读了主题时自动解除置顶。"
       apps: "应用"
@@ -826,6 +840,7 @@ zh_CN:
         deleted_posts: "已删除"
         suspensions: "封禁"
         warnings_received: "警告"
+        rejected_posts: "被驳回的帖子"
       messages:
         all: "所有"
         inbox: "收件箱"
@@ -875,7 +890,7 @@ zh_CN:
         title: "双重验证"
         enable: "管理两步验证"
         forgot_password: "忘记密码？"
-        confirm_password_description: "确认密码以继续"
+        confirm_password_description: "请确认密码后继续"
         name: "名称"
         label: "编码"
         rate_limit: "请等待另一个验证码。"
@@ -884,11 +899,11 @@ zh_CN:
         disable_description: "请输入来自 app 的验证码"
         show_key_description: "手动输入"
         short_description: |
-          使用一次性安全码保护你的帐户。
+          使用一次性安全码保护你的账户。
         extended_description: |
-          双重身份验证除了你的密码之外还需要一次性令牌，从而为你的帐户增加了额外的安全性。 可以在<a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a>和<a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>设备。
-        oauth_enabled_warning: "请注意，一旦你的帐户启用了双重身份验证，系统就会停用社交登录。"
-        use: "使用身份验证器app"
+          双重验证要求你的密码之外的一次性令牌，从而为你的账户增加了额外的安全性。可以在<a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a>和<a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>设备上生成令牌。
+        oauth_enabled_warning: "请注意，一旦你的账户启用了双重验证，社交登录将被停用。"
+        use: "使用身份验证器应用"
         enforced_notice: "在访问此站点之前，你需要启用双重身份验证。"
         disable: "停用"
         disable_title: "禁用次要身份验证器"
@@ -901,6 +916,7 @@ zh_CN:
           title: "基于凭证的身份验证器"
           add: "新增身份验证器"
           default_name: "我的身份验证器"
+          name_and_code_required_error: "你必须提供你的身份验证器应用的名称和代码。"
         security_key:
           register: "注册"
           title: "安全密钥"
@@ -911,6 +927,7 @@ zh_CN:
           edit: "编辑安全密钥"
           edit_description: "安全密钥名称"
           delete: "删除"
+          name_required_error: "你必须提供安全密钥的名称。"
       change_about:
         title: "更改个人信息"
         error: "提交修改时出错了"
@@ -927,10 +944,10 @@ zh_CN:
         success_staff: "我们已经发送了一封确认信到你现在的邮箱，请按照邮件内指示完成确认。"
       change_avatar:
         title: "更换头像"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>头像，基于："
-        gravatar_title: "在 Gravatar 网站上更改你的头像"
-        gravatar_failed: "我们找不到包含该电子邮件地址的Gravatar。"
-        refresh_gravatar_title: "刷新你的 Gravatar 头像"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>，基于"
+        gravatar_title: "在{{gravatarName}}网站修改你的头像"
+        gravatar_failed: "我们无法找到此电子邮件的{{gravatarName}}。"
+        refresh_gravatar_title: "刷新你的{{gravatarName}}"
         letter_based: "默认头像"
         uploaded_avatar: "自定义图片"
         uploaded_avatar_empty: "上传自定义图片"
@@ -951,10 +968,10 @@ zh_CN:
         secondary: "次邮箱"
         no_secondary: "没有次邮箱"
         sso_override_instructions: "电子邮件地址可以通过SSO登录来更新。"
-        instructions: "绝不会被公开显示。"
+        instructions: "绝不会被公开显示"
         ok: "将通过邮件验证确认"
         invalid: "请填写正确的邮箱地址"
-        authenticated: "邮箱已经由 {{provider}} 验证了。"
+        authenticated: "你的邮箱已被{{provider}}验证过了"
         frequency_immediately: "如果你没有阅读过摘要邮件中的相关内容，将立即发送电子邮件给你。"
         frequency:
           other: "仅在 {{count}} 分钟内没有访问时发送邮件给你。"
@@ -992,6 +1009,9 @@ zh_CN:
         any: "任意"
       password_confirmation:
         title: "请再次输入密码"
+      invite_code:
+        title: "邀请码"
+        instructions: "账户注册需要邀请码"
       auth_tokens:
         title: "最近使用的设备"
         ip: "IP"
@@ -1004,7 +1024,7 @@ zh_CN:
         was_this_you: "这是你吗？"
         was_this_you_description: "如果不是你，我们建议你更改密码并在任何地方注销。"
         browser_and_device: "{{browser}}在{{device}}"
-        secure_account: "保护我的帐户"
+        secure_account: "保护我的账户"
         latest_post: "你上次发布了......"
       last_posted: "最后发帖"
       last_emailed: "最后邮寄"
@@ -1046,13 +1066,13 @@ zh_CN:
         every_month: "每月"
         every_six_months: "每6个月"
       email_level:
-        title: "当有人引用和回复我的帖子、@我或邀请我至主题时，发送邮件提醒"
+        title: "当有人引用和回复我的帖子、@我或邀请我至主题时，给我发送邮件"
         always: "始终"
         only_when_away: "只在离开时"
         never: "从不"
-      email_messages_level: "有人发私信给我时邮件提醒"
+      email_messages_level: "有人给我发送消息时给我发送邮件"
       include_tl0_in_digests: "摘要邮件中包含新用户的内容"
-      email_in_reply_to: "邮件中包含回复你的内容节选"
+      email_in_reply_to: "在邮件中包含回复内容的节选"
       other_settings: "其它"
       categories_settings: "分类"
       new_topic_duration:
@@ -1115,15 +1135,15 @@ zh_CN:
           text: "通过文件批量邀请"
           success: "文件上传成功，当操作完成时将通过私信通知你。"
           error: "抱歉，文件必须是CSV格式。"
-          confirmation_message: "你将发邮件邀请上传的文件中的所有人。"
+          confirmation_message: "你将通过电子邮件将邀请发送给在上传的文件中的每一个人。"
       password:
         title: "密码"
         too_short: "密码过短"
-        common: "密码过于简单"
+        common: "密码过于常见"
         same_as_username: "密码不能与用户名相同"
         same_as_email: "密码不能与邮箱相同"
         ok: "密码符合要求"
-        instructions: "至少%{count}个字母。"
+        instructions: "至少%{count}个字符"
       summary:
         title: "概要"
         stats: "统计"
@@ -1156,7 +1176,7 @@ zh_CN:
         more_badges: "更多徽章"
         top_links: "热门链接"
         no_links: "暂无链接。"
-        most_liked_by: "谁赞最多"
+        most_liked_by: "谁赞得最多"
         most_liked_users: "赞谁最多"
         most_replied_to_users: "最多回复至"
         no_likes: "暂无赞。"
@@ -1203,6 +1223,9 @@ zh_CN:
         back: "返回"
         again: "重试"
         fixed: "载入"
+    modal:
+      close: "关闭"
+      dismiss_error: "忽略错误"
     close: "关闭"
     assets_changed_confirm: "网站刚更新了，刷新使用新版本？"
     logout: "你已登出用户。"
@@ -1211,6 +1234,12 @@ zh_CN:
       enabled: "站点正处于只读模式。你可以继续浏览，但是回复、赞和其他操作暂时被禁用。"
       login_disabled: "只读模式下不允许登录。"
       logout_disabled: "站点在只读模式下无法登出。"
+    too_few_topics_and_posts_notice_MF: >-
+      让我们<a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">开始讨论吧！</a>现{currentTopics, plural, one {仅有<strong>#</strong>个主题} other {共有 <strong>#</strong>个主题}}和{currentPosts, plural, one {<strong>#</strong>个帖子} other {<strong>#</strong>个帖子}}。访客需要更多的阅读和回复——我们建议至少 {requiredTopics, plural, one {<strong>#</strong>个主题} other {<strong>#</strong>个主题}}和{requiredPosts, plural, one {<strong>#</strong>个帖子} other {<strong>#</strong>个帖子}}。此消息仅管理人员可见。
+    too_few_topics_notice_MF: >-
+      让我们<a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">开始讨论吧！</a>现{currentTopics, plural, one {仅有<strong>#</strong>个主题} other { 共有 <strong>#</strong>个主题}}。访客需要更多的阅读和回复——我们建议至少{requiredTopics, plural, one {<strong>#</strong>个主题} other {<strong>#</strong>个主题}}。此消息仅管理人员可见。
+    too_few_posts_notice_MF: >-
+      让我们<a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">开始讨论吧！</a>现 {currentPosts, plural, one {仅有<strong>#</strong>个帖子} other {共有<strong>#</strong>个帖子}}。访客需要更多的阅读和回复——我们建议至少{requiredPosts, plural, one {<strong>#</strong>个帖子} other {<strong>#</strong>个帖子}}。此消息仅管理人员可见。
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} other {# errors/hour}}</a>达到了站点设置中的限制{limit, plural, one {# error/hour} other {# errors/hour}}。"
       reached_minute_MF: "<b>{relativeAge}</b>1 – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} other {# errors/minute}}</a>已经达到站点设置限制 {limit, plural, one {# error/minute} other {# errors/minute}}。"
@@ -1242,8 +1271,8 @@ zh_CN:
       hide_session: "明天提醒我"
       hide_forever: "不了"
       hidden_for_session: "好的，我会在明天提醒你。不过你随时都可以使用“登录”来创建账户。"
-      intro: "你好！看起来你正在享受讨论，但你尚未注册帐户。"
-      value_prop: "当你创建了账户，我们就可以准确地记录你的阅读进度。这样你再次访问时就可以回到上次离开的地方。只要有人回复你，你也可以通过此处和电子邮件收到通知。而且你还可以赞帖子，向他人分享感激之情。:heartbeat:"
+      intro: "你好！看起来你正在享受讨论，但还没有注册一个账户。"
+      value_prop: "当你创建了账户，我们就可以准确地记录你的阅读进度，你再次访问时就可以回到之前离开的地方。当有人回复你，你可以通过这里或电子邮件收到通知。并且你还可以通过点赞帖子向他人分享你的喜爱之情。:heartbeat:"
     summary:
       enabled_description: "你正在查看主题的精简摘要版本：一些社区公认有意思的帖子。"
       description: "有 <b>{{replyCount}}</b> 个回复。"
@@ -1290,12 +1319,12 @@ zh_CN:
     email_login:
       link_label: "给我通过邮件发送一个登录链接"
       button_label: "通过邮件"
-      complete_username: "如果帐户与用户名<b>%{username}</b>匹配，你很快就会收到一封带有登录链接的电子邮件。"
-      complete_email: "如果帐户与<b>%{email}</b>匹配，你很快就会收到一封带有登录链接的电子邮件。"
-      complete_username_found: "我们找到了一个与用户名<b>%{username}</b>匹配的帐户，你很快就会收到一封带有登录链接的电子邮件。"
-      complete_email_found: "我们发现了一个与<b>%{email}</b>相匹配的帐户，你很快就会收到一封带有登录链接的电子邮件。"
-      complete_username_not_found: "没有帐户与用户名<b>%{username}</b>匹配"
-      complete_email_not_found: "没有帐户匹配<b>%{email}</b>"
+      complete_username: "如果有一个与用户名<b>%{username}</b>相匹配的账户，你很快就会收到一封带有登录链接的电子邮件。"
+      complete_email: "如果<b>%{email}</b>与账户相匹配，你很快就会收到一封带有登录链接的电子邮件。"
+      complete_username_found: "我们找到了一个与用户名<b>%{username}</b>相匹配的账户，你很快就会收到一封带有登录链接的电子邮件。"
+      complete_email_found: "我们发现了一个与<b>%{email}</b>相匹配的账户，你很快就会收到一封带有登录链接的电子邮件。"
+      complete_username_not_found: "没有与用户名<b>%{username}</b>相匹配的账户"
+      complete_email_not_found: "没有账户匹配<b>%{email}</b>"
       confirm_title: "转入到%{site_name}"
       logging_in_as: "用%{email}登录"
       confirm_button: 登录完成
@@ -1370,7 +1399,7 @@ zh_CN:
       welcome_to: "欢迎来到%{site_name}！"
       invited_by: "邀请你的是："
       social_login_available: "你也可以通过任何使用这个邮箱的社交网站登录。"
-      your_email: "你的帐户邮箱地址是<b>%{email}</b>。"
+      your_email: "你的账户的邮箱地址为<b>%{email}</b>。"
       accept_invite: "接受邀请"
       success: "已创建你的账户，你现在可以登录了。"
       name_label: "昵称"
@@ -1420,7 +1449,7 @@ zh_CN:
         to_before_from: "截至日期必须晚于开始日期。"
     emoji_picker:
       filter_placeholder: 查找表情符号
-      smileys_&_emotion: 笑脸与表情
+      smileys_&_emotion: 笑脸与情感
       people_&_body: 人与身体
       animals_&_nature: 动物与自然
       food_&_drink: 饮食
@@ -1429,7 +1458,6 @@ zh_CN:
       objects: 物品
       symbols: 符号
       flags: 标记
-      custom: 自定义表情符号
       recent: 近期使用
       default_tone: 无肤色
       light_tone: 浅肤色
@@ -1437,6 +1465,7 @@ zh_CN:
       medium_tone: 中间肤色
       medium_dark_tone: 中深肤色
       dark_tone: 深肤色
+      default: 自定义表情符号
     shared_drafts:
       title: "共享草稿"
       notice: "只有那些可以看到<b>{{category}}</b>分类的人才能看到此主题。"
@@ -1472,7 +1501,7 @@ zh_CN:
         title_too_short: "标题过短，至少 {{min}} 个字"
         title_too_long: "标题过长，最多 {{max}} 个字"
         post_missing: "帖子不能为空"
-        post_length: "帖子至少应有 {{min}} 个字"
+        post_length: "帖子至少要有{{min}} 个字符"
         try_like: "试试{{heart}}按钮？"
         category_missing: "未选择分类"
         tags_missing: "你必须至少选择{{count}}个标签"
@@ -1575,6 +1604,8 @@ zh_CN:
           other: "{{count}} 个未读通知"
         message:
           other: "{{count}} 条未读私信"
+        high_priority:
+          other: "%{count}个未读的高优先级通知"
       title: "使用@提到你，回复你的内容、私信以及其他的通知"
       none: "现在无法载入通知"
       empty: "未发现通知"
@@ -1583,6 +1614,7 @@ zh_CN:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span>{{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -1630,6 +1662,8 @@ zh_CN:
         posted: "新帖子"
         moved_post: "帖子已移动"
         linked: "链接"
+        bookmark_reminder: "收藏提醒"
+        bookmark_reminder_with_name: "收藏提醒 - %{name}"
         granted_badge: "勋章授予"
         invited_to_topic: "邀请到主题"
         group_mentioned: "群组提及"
@@ -1700,7 +1734,7 @@ zh_CN:
         filters:
           label: 只返回主题/帖子……
           title: 仅在标题中匹配
-          likes: 我给了赞的
+          likes: 我赞过的
           posted: 我参与发帖
           created: 我创建的
           watching: 我正在监看
@@ -1826,14 +1860,14 @@ zh_CN:
         login_required: "此主题需要登录后浏览。"
       server_error:
         title: "载入主题失败"
-        description: "抱歉，无法载入主题。网络连接可能出问题了。请重试一次。如果始终无法加载，请联系我们。"
+        description: "抱歉，无法加载该主题，有可能是网络连接出现了问题。请重试。如果问题依然存在，请联系我们。"
       not_found:
         title: "未找到主题"
         description: "抱歉，无法找到此主题。可能已经被删除了。"
       total_unread_posts:
         other: "这个主题中，你有 {{count}} 条未读的帖子"
       unread_posts:
-        other: "这个主题中，你有 {{count}} 条未读的帖子"
+        other: "这个主题中，你有 {{count}} 个未读的帖子"
       new_posts:
         other: "自你上一次阅读此主题后，又有 {{count}} 个新帖子发表了"
       likes:
@@ -1849,6 +1883,7 @@ zh_CN:
       group_request_sent: "你加入群组的请求已发送。当被接受时你会收到通知。"
       unread_indicator: "还没有成员读过此主题的最新帖子。"
       read_more_MF: "还有 { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 个未读主题</a>} other { <a href='{basePath}/unread'># 个未读主题</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{和 } false {} other{}} <a href='{basePath}/new'>1 个新</a>主题} other { {BOTH, select, true{和 } false {} other{}} <a href='{basePath}/new'># 个近期</a>主题} }可以阅读，或者{CATEGORY, select, true {浏览{catLink}中的其他主题} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{首帖}：{创建于}\n{末帖}：{顶起于}"
       browse_all_categories: 浏览所有分类
       view_latest_topics: 查阅最新主题
       suggest_create_topic: 创建一个新的主题吧！
@@ -1859,12 +1894,13 @@ zh_CN:
         title: "主题计时器"
         save: "设置计时器"
         num_of_hours: "小时数："
+        num_of_days: "天数"
         remove: "撤销计时器"
         publish_to: "发布至："
         when: "时间："
         public_timer_types: 主题计时器
         private_timer_types: 用户主题计时器
-        time_frame_required: 请选择时间范围
+        time_frame_required: 请选择一个时间范围
       auto_update_input:
         none: "选择时间范围"
         later_today: "今天的某个时候"
@@ -1901,6 +1937,8 @@ zh_CN:
         title: "自动顶帖"
       reminder:
         title: "提醒我"
+      auto_delete_replies:
+        title: "自动删除回复"
       status_update_notice:
         auto_open: "本主题将在%{timeLeft}自动开启。"
         auto_close: "本主题将在%{timeLeft}自动关闭。"
@@ -1909,6 +1947,7 @@ zh_CN:
         auto_delete: "主题在%{timeLeft}后将被自动删除。"
         auto_bump: "此主题将在%{timeLeft}后自动顶起。"
         auto_reminder: "你将在%{timeLeft}后收到该主题的提醒。"
+        auto_delete_replies: "此主题的回复会在%{duration}后自动删除。"
       auto_close_title: "自动关闭设置"
       auto_close_immediate:
         other: "主题中的最后一帖是 %{hours} 小时前发出的，所以主题将会立即关闭。"
@@ -1935,16 +1974,16 @@ zh_CN:
         reasons:
           mailing_list_mode: "邮件列表模式已启用，将以邮件通知你关于该主题的回复。"
           "3_10": "因为你正监看该主题上的标签，你将会收到通知。"
-          "3_6": "因为你正在关注该分类，你将会收到通知。"
-          "3_5": "因为你开始自动监看该主题，你将会收到通知。"
-          "3_2": "因为你正在关注该主题，你将会收到通知。"
+          "3_6": "因为你正在监看该分类，你将会收到通知。"
+          "3_5": "因为你自动地开始监看该主题，你将会收到通知。"
+          "3_2": "因为你正在监看该主题，你将会收到通知。"
           "3_1": "因为你创建了这个主题，你将会收到通知。"
-          "3": "因为你正在关注该主题，你将会收到通知。"
+          "3": "因为你正在监看该主题，你将会收到通知。"
           "2_8": "因为你追踪了该分类，所以你会看到新回复的数量。"
-          "2_4": "因为你回复过该主题，所以你会看到新回复的数量。"
-          "2_2": "因为你追踪了该主题，所以你会看到新回复的数量。"
-          "2": '因为你<a href="{{basePath}}/u/{{username}}/preferences">读过该主题</a>，所以你会看到新回复的数量。'
-          "1_2": "如果有人@你或回复你，将通知你。"
+          "2_4": "你会看到新回复的数量的原因是你曾经回复过该主题。"
+          "2_2": "你会看到新回复数量的原因是你正在追踪该主题。"
+          "2": '你会看到新回复数量的原因是你<a href="{{basePath}}/u/{{username}}/preferences">阅读过该主题</a>。'
+          "1_2": "有人@你或回复你时会通知你。"
           "1": "如果有人@你或回复你，将通知你。"
           "0_7": "你将忽略关于该分类的所有通知。"
           "0_2": "你将忽略关于该主题的所有通知。"
@@ -1954,13 +1993,13 @@ zh_CN:
           description: "私信有新回复时提醒我，并显示新回复数量。"
         watching:
           title: "监看"
-          description: "在此主题里，每一个新回复将通知你，还将显示新回复的数量。"
+          description: "你将收到该主题所有新回复的通知，还会显示新回复的数量。"
         tracking_pm:
           title: "跟踪"
           description: "在私信标题后显示新回复数量。你只会在别人@你或回复你的帖子时才会收到通知。"
         tracking:
           title: "跟踪"
-          description: "将为该主题显示新回复的数量。如果有人@你或回复你，将通知你。"
+          description: "将为该主题显示新回复的数量。你会在有人@你或回复你的时候收到通知。"
         regular:
           title: "普通"
           description: "如果有人@你或回复你，将通知你。"
@@ -1969,10 +2008,10 @@ zh_CN:
           description: "如果有人@你或回复你，将通知你。"
         muted_pm:
           title: "静音"
-          description: "不会收到该私信的任何通知。"
+          description: "你永远都不会收到任何关于此私信的通知。"
         muted:
           title: "静音"
-          description: "你不会收到此主题的任何通知，它也不会出现在“最新”主题列表。"
+          description: "你不会收到关于此主题的任何通知，它也不会出现在“最新”主题列表中。"
       actions:
         title: "动作"
         recover: "撤销删除主题"
@@ -2077,7 +2116,7 @@ zh_CN:
       move_to:
         title: "移动到"
         action: "移动到"
-        error: "移动话题时发生了错误。"
+        error: "移动帖子时发生了错误。"
       split_topic:
         title: "拆分主题"
         action: "拆分主题"
@@ -2090,28 +2129,39 @@ zh_CN:
         title: "合并主题"
         action: "合并主题"
         error: "合并主题时发生错误。"
-        radio_label: "已存在的主题"
+        radio_label: "现存的主题"
         instructions:
           other: "请选择一个主题以便移动这 <b>{{count}}</b> 个帖子。"
       move_to_new_message:
         title: "移动到新的即时信息"
-        action: "移动到新的即时信息"
-        message_title: "新信息的标题"
-        radio_label: "发新私信"
+        action: "移动到新的私信"
+        message_title: "新私信的标题"
+        radio_label: "创建新私信"
         participants: "参与者"
         instructions:
           other: "你正在发送<b>{{count}}</b>篇帖子到一条新的私信/消息。"
       move_to_existing_message:
-        title: "移动到已有私信/消息"
-        action: "移动到已有私信/消息"
-        radio_label: "已有私信/消息"
+        title: "移动到现存的私信"
+        action: "移动到已存在的私信"
+        radio_label: "现存的私信"
         participants: "参与者"
         instructions:
-          other: "请你选择一个私信/消息以便移动到<b>{{count}}</b>。"
+          other: "请选择你要将<b>{{count}}</b>个帖子所移动到的私信。"
       merge_posts:
         title: "合并选择的帖子"
         action: "合并选择的帖子"
         error: "合并帖子时发生了错误。"
+      publish_page:
+        publish: "出版"
+        description: "当一个主题被出版为一个页面时，其链接是共享的，并且会以自定义的样式显示。"
+        slug: "Slug"
+        publish_url: "你的页面已出版于："
+        topic_published: "你的主题已出版于："
+        preview_url: "你的页面将出版于："
+        invalid_slug: "抱歉，您不能出版此页面。"
+        unpublish: "取消出版"
+        unpublished: "你的页面已经取消出版并且不再可用。"
+        publishing_settings: "出版设置"
       change_owner:
         title: "更改所有者"
         action: "更改作者"
@@ -2119,6 +2169,8 @@ zh_CN:
         placeholder: "新作者的用户名"
         instructions:
           other: "请选择<b>@{{old_user}}</b>创建的{{count}}个帖子的新作者。"
+        instructions_without_old_user:
+          other: "请为此{{count}}个帖子选择一个新的拥有者。"
       change_timestamp:
         title: "修改时间"
         action: "修改时间"
@@ -2140,7 +2192,7 @@ zh_CN:
         select_below:
           label: "选择 +以下"
           title: "选择帖子及其后的所有内容"
-        delete: 删除所选
+        delete: 删除所选项
         cancel: 取消选择
         select_all: 全选
         deselect_all: 全不选
@@ -2210,7 +2262,7 @@ zh_CN:
       few_likes_left: "谢谢你的热情！你今天的赞快用完了。"
       controls:
         reply: "开始撰写本帖的回复"
-        like: "赞一下此帖"
+        like: "点赞此帖"
         has_liked: "已赞"
         read_indicator: "阅读了帖子的用户"
         undo_like: "取消赞"
@@ -2322,13 +2374,18 @@ zh_CN:
             button: "HTML"
       bookmarks:
         create: "创建收藏夹"
+        edit: "编辑收藏"
+        created: "创建日期"
         name: "名称"
-        name_placeholder: "命名收藏夹以帮助你记忆"
-        set_reminder: "设置一个提醒"
+        name_placeholder: "这个收藏是做什么用的？"
+        set_reminder: "提醒我"
         actions:
           delete_bookmark:
             name: "删除收藏"
             description: "从你的个人资料中删除收藏并停止所有有关该收藏的提醒"
+          edit_bookmark:
+            name: "编辑收藏"
+            description: "编辑收藏名称或修改提醒的日期和时间"
     category:
       can: "能够&hellip; "
       none: "（未分类）"
@@ -2344,13 +2401,13 @@ zh_CN:
       tags_allowed_tags: "限制这些标签只能用在此分类"
       tags_allowed_tag_groups: "限制这些标签组只能用在此分类"
       tags_placeholder: "（可选）允许使用的标签列表"
-      tags_tab_description: "上面指定的标签和标签组仅在此分类以及其它也指定了的类别中可用。它们将无法在其它类别中使用。"
+      tags_tab_description: "上面所指定的标签和标签组仅在此分类以及其它也指定了它们的分类中可用。它们将无法在其它分类中使用。"
       tag_groups_placeholder: "（可选）允许使用的标签组列表"
       manage_tag_groups_link: "管理这里的标签组。"
-      allow_global_tags_label: "总是允许其它标题"
+      allow_global_tags_label: "也允许其它标签"
       tag_group_selector_placeholder: "（可选）标签组"
       required_tag_group_description: "要求新主题包含标签组中的标签："
-      min_tags_from_required_group_label: "Num标签:"
+      min_tags_from_required_group_label: "标签数量："
       required_tag_group_label: "标签组："
       topic_featured_link_allowed: "允许在该分类中发布特色链接标题"
       delete: "删除分类"
@@ -2370,7 +2427,7 @@ zh_CN:
       background_color: "背景色"
       foreground_color: "前景色"
       name_placeholder: "应该简明扼要。"
-      color_placeholder: "任何网页颜色"
+      color_placeholder: "任意网页颜色"
       delete_confirm: "你确定要删除此分类吗？"
       delete_error: "在删除此分类时发生了错误。"
       list: "列出分类"
@@ -2378,9 +2435,9 @@ zh_CN:
       change_in_category_topic: "访问分类主题来编辑描述信息"
       already_used: "此色彩已经被另一个分类使用"
       security: "安全性"
-      special_warning: "警告：这个分类是已经自动建立好的分类，它的安全设置不能被更改。如果你不想要使用这个分类，直接删除它，而不是另作他用。"
+      special_warning: "警告：这是一个预设的分类，它的安全设置不能被更改。如果你不想要使用这个分类，直接删除它，而不是另作他用。"
       uncategorized_security_warning: "这是个特殊的分类。如果不知道应该话题属于哪个分类，那么请使用这个分类。这个分类没有安全设置。"
-      uncategorized_general_warning: '这个分类很特别。它用作未选择分类的新主题的默认分类。如果要阻止此行为并强制选择分类，<a href="%{settingLink}">请在此处禁用此设置</a>。如果要更改名称或说明，请转到<a href="%{customizeLink}">自定义/文本内容</a>。'
+      uncategorized_general_warning: '这个分类是特殊的。它用作未选择分类的新主题的默认分类。如果你想要避免此行为并强制选择分类，<a href="%{settingLink}">请在此处禁用该设置</a>。如果你要修改其名称或描述，请转到<a href="%{customizeLink}">自定义/文本内容</a>。'
       pending_permission_change_alert: "你还没有添加%{group}到此分类；点击此按钮添加。"
       images: "图片"
       email_in: "自定义进站电子邮件地址："
@@ -2398,7 +2455,7 @@ zh_CN:
       default_top_period: "默认热门时长："
       allow_badges_label: "允许在此分类中授予徽章"
       edit_permissions: "编辑权限"
-      reviewable_by_group: "除了工作人员之外，也可以审核该分类中的帖子和标记的人："
+      reviewable_by_group: "管理人员之外，可以审核该分类中的帖子和标记的人："
       review_group_name: "群组名"
       require_topic_approval: "所有新主题需要版主审批"
       require_reply_approval: "所有新回复需要版主审批"
@@ -2407,19 +2464,19 @@ zh_CN:
       default_position: "默认位置"
       position_disabled: "分类按照其活跃程度的顺序显示。要固定分类列表的显示顺序，"
       position_disabled_click: '启用“固定分类位置”设置。'
-      minimum_required_tags: "在一个主题中允许的最少标签数量："
+      minimum_required_tags: "在一个主题中至少含有多少个标签："
       parent: "上级分类"
       num_auto_bump_daily: "每天自动碰撞的主题的数量"
       navigate_to_first_post_after_read: "阅读主题后导航到第一个帖子"
       notifications:
         watching:
-          title: "关注"
-          description: "你将自动关注这些分类中的所有主题。每一个主题的每一个新帖，将通知你，还将显示新回复的数量。"
+          title: "监看"
+          description: "你将自动关注这些分类中的所有主题。你会收到所有新主题中的每一个新帖的通知，还会显示新回复的数量。"
         watching_first_post:
-          title: "监看头一帖"
-          description: "您将收到此类别中的新主题的通知，但别人回复主题不会给您发送通知。"
+          title: "监看新主题"
+          description: "你将收到此分类中的新主题通知，不包括回复。"
         tracking:
-          title: "跟踪"
+          title: "追踪"
           description: "你将自动跟踪这些分类中的所有主题。如果有人@你或回复你，将通知你，还将显示新回复的数量。"
         regular:
           title: "普通"
@@ -2431,7 +2488,7 @@ zh_CN:
         label: "搜索优先级"
         options:
           normal: "普通"
-          ignore: "忽略"
+          ignore: "忽视"
           very_low: "非常低"
           low: "低"
           high: "高"
@@ -2605,7 +2662,7 @@ zh_CN:
         yearly:
           title: "年度"
         quarterly:
-          title: "季度的"
+          title: "季度"
         monthly:
           title: "月度"
         weekly:
@@ -2614,7 +2671,7 @@ zh_CN:
           title: "每天"
         all_time: "不限时间"
         this_year: "年"
-        this_quarter: "季度"
+        this_quarter: "季"
         this_month: "月"
         this_week: "周"
         today: "今天"
@@ -2626,8 +2683,8 @@ zh_CN:
       readonly: "阅读"
     lightbox:
       download: "下载"
-      previous: "之前的（左方向键）"
-      next: "继续（右方向键）"
+      previous: "上一个（左方向键）"
+      next: "下一个（右方向键）"
       counter: "%curr% / %total%"
       close: "关闭(Esc)"
       content_load_error: '<a href="%url%">内容</a>无法加载'
@@ -2675,6 +2732,18 @@ zh_CN:
         title: "编辑"
         return: "%{shortcut}返回编辑器"
         fullscreen: "%{shortcut}全屏编辑器"
+      bookmarks:
+        title: "收藏"
+        enter: "%{shortcut} 保存并关闭"
+        later_today: "%{shortcut} 今天晚些时候"
+        later_this_week: "%{shortcut} 本周的晚些时候"
+        tomorrow: "%{shortcut} 明天"
+        next_week: "%{shortcut} 下周"
+        next_month: "%{shortcut} 下个月"
+        next_business_week: "%{shortcut} 下周开始"
+        next_business_day: "%{shortcut} 下个工作日"
+        custom: "%{shortcut} 自定义日期和时间"
+        none: "%{shortcut} 没有提醒"
       actions:
         title: "动作"
         bookmark_topic: "%{shortcut} 切换主题收藏状态"
@@ -2697,6 +2766,10 @@ zh_CN:
         print: "%{shortcut} 打印主题"
         defer: "%{shortcut}延迟主题"
         topic_admin_actions: "%{shortcut}打开主题管理"
+      search_menu:
+        title: "搜索菜单"
+        prev_next: "%{shortcut}上下移动所选内容"
+        insert_url: "%{shortcut}将选定内容插入到打开的编辑器"
     badges:
       earned_n_times:
         other: "已获得此徽章 %{count} 次"
@@ -2782,19 +2855,19 @@ zh_CN:
       notifications:
         watching:
           title: "监看"
-          description: "你将自动监看该标签中的所有主题。你将收到所有新帖子和主题的通知，此外，主题旁边还会显示未读和新帖子的数量。"
+          description: "你将自动监看所有含有此标签的主题。你将收到所有新帖子和主题的通知，此外，主题旁边还会显示未读和新帖子的数量。"
         watching_first_post:
-          title: "关注第一条帖子"
-          description: "您将收到此标签中的新主题的通知，但对主题的回复不会再给您发送通知。"
+          title: "监控新主题"
+          description: "你将会收到此标签中的新主题的通知，但对主题的回复则不会。"
         tracking:
           title: "跟踪"
-          description: "你将使用此标签自动跟踪所有主题。未读和新帖计数将显示在主题旁。"
+          description: "你将自动监看所有含有此标签的主题。未读和新帖的计数将显示在主题旁边。"
         regular:
           title: "普通"
-          description: "如果有人@你或回复你的帖子，将通知你。"
+          description: "有人@你或回复你的帖子时将会通知你"
         muted:
           title: "静音"
-          description: "你不会收到有关此标签的新主题的任何通知，也不会显示在未读标签上。"
+          description: "你不会收到任何含有此标签的新主题的通知，也不会在未读栏。"
       groups:
         title: "标签组"
         about: "将标签分组以便管理。"
@@ -2833,7 +2906,7 @@ zh_CN:
     invite:
       custom_message: "通过编写<a href>自定义消息</a>，使你的邀请更个性化。"
       custom_message_placeholder: "输入留言"
-      custom_message_template_forum: "你好，你应该来我们这个论坛！"
+      custom_message_template_forum: "你好，你应该加入这个论坛！"
       custom_message_template_topic: "你好，我觉得你可能会喜欢这个主题！"
     forced_anonymous: "由于极端负载，暂时向所有人显示，已注销用户会看到它。"
     safe_mode:
@@ -2846,7 +2919,7 @@ zh_CN:
       tags:
         remove_muted_tags_from_latest:
           always: "始终"
-          only_muted: "单独使用或与其他静音标签一起使用时"
+          only_muted: "单独或与其它静音的标签一起使用时"
           never: "从不"
       reports:
         title: "可用报告列表"
@@ -3096,6 +3169,9 @@ zh_CN:
         notification_event:
           name: "通知事件"
           details: "当用户在其feed中收到通知时。"
+        user_badge_event:
+          name: "徽章授予事件"
+          details: "当一个用户收到一个徽章时。"
         delivery_status:
           title: "分发状态"
           inactive: "不活跃"
@@ -3243,6 +3319,7 @@ zh_CN:
           theme_name: "主题名称"
           component_name: "组件名称"
           themes_intro: "选择现有主题或安装新主题即可开始使用"
+          themes_intro_emoji: "女艺术家表情符号"
           beginners_guide_title: "使用Discourse主题的初学者指导"
           developers_guide_title: "Discourse主题的开发者指导"
           browse_themes: "浏览社区主题"
@@ -3318,7 +3395,7 @@ zh_CN:
           install: "安装"
           installed: "已安装"
           install_popular: "热门"
-          install_upload: "来自您的设备"
+          install_upload: "来自你的设备"
           install_git_repo: "从 git 仓库"
           install_create: "创建新的"
           about_theme: "关于"
@@ -3468,6 +3545,7 @@ zh_CN:
         format: "格式"
         html: "html"
         text: "text"
+        html_preview: "预览邮件内容"
         last_seen_user: "用户最后登录时间:"
         no_result: "没有找到摘要信息。"
         reply_key: "回复关键字"
@@ -3483,7 +3561,7 @@ zh_CN:
             title: "进站邮件详情"
             error: "错误"
             headers: "头部"
-            subject: "主题"
+            subject: "标题"
             body: "内容"
             rejection_message: "拒绝邮件"
           filters:
@@ -3562,7 +3640,7 @@ zh_CN:
             delete_topic: "删除主题"
             recover_topic: "撤销删除帖子"
             delete_post: "删除帖子"
-            impersonate: "检视"
+            impersonate: "模拟用户"
             anonymize_user: "匿名用户"
             roll_up: "回退 IP 封禁"
             change_category_settings: "更改分类设置"
@@ -3622,6 +3700,8 @@ zh_CN:
             api_key_update: "更新api密钥"
             api_key_destroy: "销毁api密钥"
             override_upload_secure_status: "覆盖上传安全状态"
+            page_published: "页面已出版"
+            page_unpublished: "页面未出版"
         screened_emails:
           title: "已屏蔽的邮件地址"
           description: "当有人试图用以下邮件地址注册时，将受到阻止或其它系统操作。"
@@ -3637,7 +3717,7 @@ zh_CN:
           title: "已屏蔽的 IP"
           description: '受监视的 IP 地址，使用“放行”可将 IP 地址加入白名单。'
           delete_confirm: "确定要撤销对 IP 地址为 %{ip_address} 的规则？"
-          roll_up_confirm: "你确定要将常用的已屏蔽的 IP 地址归类为子网地址吗？"
+          roll_up_confirm: "你确定要将常用屏蔽 IP 地址归类为子网地址吗？"
           rolled_up_some_subnets: "成功地折叠了 IP 封禁记录至这些子网： %{subnets}。"
           rolled_up_no_subnet: "没有可折叠内容。"
           actions:
@@ -3683,7 +3763,7 @@ zh_CN:
           block: "封禁"
           censor: "审查"
           require_approval: "需要审核"
-          flag: "旗标"
+          flag: "标记"
         action_descriptions:
           block: "防止发布包含这些敏感词的帖子。用户提交帖子时会收到错误提示。"
           censor: "允许包含这些敏感词的帖子，但将其替换为隐藏敏感词的字符。"
@@ -3705,10 +3785,10 @@ zh_CN:
           found_matches: "发现匹配："
           no_matches: "无符合的结果"
       impersonate:
-        title: "检视用户视角"
-        help: "使用此工具来检视其他用户的账户以方便调试。你应该在完成后立即退出。"
+        title: "模拟用户"
+        help: "使用此工具来模拟一个用户账户以方便调试。你应该在完成后立即注销。"
         not_found: "无法找到该用户。"
-        invalid: "抱歉，你不能以此用户角度检视。"
+        invalid: "抱歉，你不能模拟此用户。"
       users:
         title: "用户"
         create: "添加管理员用户"
@@ -3724,7 +3804,6 @@ zh_CN:
           staff: "管理人员"
           suspended: "禁止登录"
           silenced: "已禁言"
-          suspect: "怀疑"
           staged: "暂存"
         approved: "已批准？"
         titles:
@@ -3741,7 +3820,6 @@ zh_CN:
           moderators: "版主"
           silenced: "已禁言的用户"
           suspended: "已封禁的用户"
-          suspect: "嫌疑用户"
           staged: "暂存用户"
         not_verified: "未验证"
         check_email:
@@ -3790,7 +3868,7 @@ zh_CN:
         staged: "暂存？"
         show_admin_profile: "管理员"
         show_public_profile: "显示公开介绍"
-        impersonate: "检视角度"
+        impersonate: "模拟用户"
         action_logs: "操作日志"
         ip_lookup: "IP 查询"
         log_out: "退出"
@@ -3808,7 +3886,7 @@ zh_CN:
         reputation: 声誉
         permissions: 权限
         activity: 活动
-        like_count: 送出赞 / 获得赞
+        like_count: 点赞 / 获赞
         last_100_days: "在最近 100 天"
         private_topics_count: 私有主题数量
         posts_read_count: 已阅帖子数量
@@ -3869,6 +3947,7 @@ zh_CN:
           threshold_reached: "近期该邮箱有过多退信。"
         trust_level_change_failed: "改变用户等级时出现了一个问题。"
         suspend_modal_title: "封禁用户"
+        confirm_cancel_penalty: "你确定要放弃惩罚吗？"
         trust_level_2_users: "信任等级2用户"
         trust_level_3_requirements: "信任等级 3 要求"
         trust_level_locked_tip: "信任等级已经被锁定，系统将不会升降用户的信任等级"
@@ -3890,7 +3969,7 @@ zh_CN:
           posts_read_all_time: "已读的帖子（全部）"
           flagged_posts: "被标记的帖子"
           flagged_by_users: "标记其的用户"
-          likes_given: "送出赞"
+          likes_given: "点赞"
           likes_received: "获得赞"
           likes_received_days: "获得赞：独立天数"
           likes_received_users: "获得赞：每用户"
@@ -4079,7 +4158,8 @@ zh_CN:
             with_post_time: "<span class=\"username\">%{username}</span> 因在 <span class=\"time\">%{time}</span> 时的 %{link} 帖子"
             with_time: "<span class=\"username\">%{username}</span> 在 <span class=\"time\">%{time}</span>"
         badge_intro:
-          title: "选择现有徽章或创建新徽章来开始"
+          title: "选择现一个现有的徽章或创建一个新的徽章来开始使用"
+          emoji: "女学生表情符号"
           what_are_badges_title: "什么是徽章？"
           badge_query_examples_title: "徽章查询示例"
         mass_award:
@@ -4096,7 +4176,9 @@ zh_CN:
         help: "增加所有人可用的 emoji。（高端技巧：一次性拖进多个文件）"
         add: "增加新的 Emoji"
         name: "名称"
+        group: "群组"
         image: "图片"
+        alt: "自定义表情符号预览"
         delete_confirm: "你确定要删除 :%{name}: emoji 么？"
       embedding:
         get_started: "如果你想要将 Discourse 嵌入至其他网站，添加他们的主机地址。"
@@ -4104,7 +4186,7 @@ zh_CN:
         sample: "使用下列 HTML 代码至你的站点创建和嵌入 Discourse 主题。把<b>REPLACE_ME</b> 替换成你将嵌入至的网址。"
         title: "嵌入"
         host: "允许的主机"
-        class_name: "class 名"
+        class_name: "类名"
         path_whitelist: "路径白名单"
         edit: "编辑"
         category: "发布到分类"
@@ -4116,13 +4198,14 @@ zh_CN:
         embed_post_limit: "嵌入的最大帖子数量。"
         embed_title_scrubber: "从帖子中提取标题的正则表达式"
         embed_truncate: "截断嵌入的帖子"
+        embed_unlisted: "直到有一个回复前，导入的主题不会被列出。"
         embed_whitelist_selector: "允许嵌入的CSS选择器"
         embed_blacklist_selector: "移除嵌入的CSS选择器"
         embed_classname_whitelist: "允许CSS类名"
         save: "保存嵌入设置"
       permalink:
         title: "永久链接"
-        description: "请注意，这仅适用于外部资源，论坛上发布的链接不会被重定向。"
+        description: "所应用的重定向链接无法被论坛识别。"
         url: "URL"
         topic_id: "主题 ID"
         topic_title: "主题"
@@ -4131,6 +4214,7 @@ zh_CN:
         category_id: "分类 ID"
         category_title: "分类"
         external_url: "外部 URL"
+        destination: "目标"
         delete_confirm: 你确定要删除该永久链接？
         form:
           label: "新："
@@ -4144,7 +4228,7 @@ zh_CN:
           title: "替换文本"
           subtitle: "用最新的翻译替换系统生成的类别和主题的文本"
           categories: "分类"
-          topics: "话题"
+          topics: "主题"
           replace: "替换"
   wizard_js:
     wizard:
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 80d0e7920c..1adf3edcff 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -27,7 +27,6 @@ zh_TW:
     dates:
       time: "h:mm a"
       timeline_date: "YYYY年 M月"
-      long_no_year: "M月 D日, h:mm a"
       long_no_year_no_time: "M月 D日"
       full_no_year_no_time: "M月 D日"
       long_with_year: "YYYY年 M月 D日 h:mm a"
@@ -238,6 +237,12 @@ zh_TW:
       remove: "移除書籤"
       confirm_clear: "確定要移除該話題上的所有書籤嗎？"
       save: "儲存"
+      reminders:
+        later_today: "今日稍晚"
+        tomorrow: "明天"
+        next_week: "下週"
+        later_this_week: "本週稍晚"
+        next_month: "下個月"
     drafts:
       resume: "恢復"
       remove: "移除"
@@ -445,6 +450,7 @@ zh_TW:
         deny: "拒絕"
         denied: "被拒絕"
         undone: "請求未完成"
+        handle: "處理會員申請"
       manage:
         title: "管理"
         name: "名稱"
@@ -834,10 +840,6 @@ zh_TW:
         success_staff: "我們已傳送一封電子郵件至你目前的信箱。請根據確認指示進行操作。"
       change_avatar:
         title: "設定個人資料圖片"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, based on"
-        gravatar_title: "在 Gravatar 網站修改你的頭像"
-        gravatar_failed: "無法在 Gravatar 上找到這個電子郵件位置。"
-        refresh_gravatar_title: "重新整理你的 Gravatar 頭像"
         letter_based: "系統分配的個人資料圖片"
         uploaded_avatar: "自訂圖片"
         uploaded_avatar_empty: "新增一張自訂圖片"
@@ -1099,6 +1101,8 @@ zh_TW:
         back: "返回"
         again: "請再試一次"
         fixed: "載入頁面"
+    modal:
+      close: "關閉"
     close: "關閉"
     assets_changed_confirm: "此網站剛剛已更新，你要重整頁面以獲得最新版本嗎？"
     logout: "已登出"
@@ -1298,7 +1302,6 @@ zh_TW:
       objects: 物品
       symbols: 象徵<br>
       flags: 檢舉
-      custom: 自訂表情符號
       recent: 最近使用過的
       default_tone: 膚色深度：0
       light_tone: 膚色深度：1
@@ -1306,6 +1309,7 @@ zh_TW:
       medium_tone: 膚色深度：3
       medium_dark_tone: 膚色深度：4
       dark_tone: 膚色深度：5
+      default: 自訂表情符號
     shared_drafts:
       title: "共享草稿"
       notice: "\b只有能瀏覽<b>{{category}}</b>分類的使用者能看到這個話題"
@@ -1446,6 +1450,7 @@ zh_TW:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
+      bookmark_reminder: "<span>{{username}}</span> {{description}}"
       replied: "<span>{{username}}</span> {{description}}"
       posted: "<span>{{username}}</span> {{description}}"
       edited: "<span>{{username}}</span> {{description}}"
@@ -2135,6 +2140,7 @@ zh_TW:
             title: "顯示電子郵件HTML格式"
             button: "HTML"
       bookmarks:
+        created: "已建立"
         name: "名稱"
     category:
       can: "可以&hellip; "
@@ -3418,7 +3424,6 @@ zh_TW:
           staff: "管理員"
           suspended: "已停權"
           silenced: "被靜音"
-          suspect: "嫌疑"
           staged: "暫存"
         approved: "已批准？"
         titles:
@@ -3435,7 +3440,6 @@ zh_TW:
           moderators: "板主"
           silenced: "被靜音的使用者"
           suspended: "已停權的使用者"
-          suspect: "嫌疑使用者"
           staged: "暫存使用者"
         not_verified: "未確認"
         check_email:
@@ -3775,6 +3779,7 @@ zh_TW:
         help: "新增新的emoji供所有人使用。(提示：一次拖放多個檔案)"
         add: "新增emoji"
         name: "名稱"
+        group: "群組"
         image: "圖片"
         delete_confirm: "你確定要刪除 :%{name}: emoji ?"
       embedding:
@@ -3801,7 +3806,6 @@ zh_TW:
         save: "儲存崁入設定"
       permalink:
         title: "固定連結"
-        description: "請注意，這僅適用於外部來源，論壇上發佈的連接不會被重新導向。"
         url: "網址"
         topic_id: "話題 ID"
         topic_title: "話題"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 7c129f04f2..ac2a435186 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -241,6 +241,10 @@ ar:
   bookmarks:
     reminders:
       at_desktop: "في المرة القادمة سأكون عند مكتبي"
+      later_today: "في وقت لاحق اليوم"
+      tomorrow: "غداً"
+      next_week: "الاسبوع القادم"
+      next_month: "الشهر القادم"
   groups:
     errors:
       can_not_modify_automatic: "لا يمكنك تعديل مجموعة تم انشائها تلقائيا"
@@ -948,8 +952,6 @@ ar:
     email_custom_headers: "قائمة قناة محددة لرؤوس بريد إلكتروني مخصص."
     force_https: "ارغام الموقع على استخدام HTTPS فقط. تحذير: لا تفعل هذا الاختيار الا بعد التأكد أن HTTPS مفعلة وتعمل بالكامل فى جميع أنحاء الموقع! هل اختبرت جميع الخوادم CDN، جميع تسجيلات الدخول من شبكات التواصل الاجتماعى، أية صور أو تبعيات خارجية للتأكد من أنها كلها متوافقه مع HTTPS؟"
     summary_score_threshold: "الحد الأدنى للنقاط المطلوبة لتضمين مشاركة في \"تلخيص هذا الموضوع\""
-    summary_posts_required: "الحد الأدنى للمشاركات في الموضوع قبل \"تلخيص هذا الموضوع\" مفعل."
-    summary_likes_required: "الحد الأدنى للإعجابات في الموضوع قبل \"تلخيص هذا الموضوع\" مفعل."
     summary_percent_filter: "عندما يضغط المستخدم على \"تلخيص هذا الموضوع\"، يظهر أعلى % o المشاركات."
     enable_long_polling: "ناقل الرسالة المستخدم للاشعارات يمكن أن يستخدم التصويت الطويل."
     long_polling_base_url: "قاعدة URL تستخدم للتصويت الطويل (عندما CDN يخدم المحتوى الديناميكي, تأكد لتعيين هذا لسحب الأصل) eg: http://origin.site.com"
@@ -1011,7 +1013,6 @@ ar:
     enable_instagram_logins: "تفعيل تسجيل الدخول عن طريق حساب انستغرام."
     instagram_consumer_key: "مفتاح المستهلك لنظام تسجيل الدخول بحساب انستجرام."
     instagram_consumer_secret: "رقم المستهلك السري لنظام تسجيل الدخول بحساب انستجرام."
-    readonly_mode_during_backup: "فعّل وضع القراءة فقط أثناء أخذ نسخة احتياطيّة"
     allow_restore: "تسمح استعادة، والتي يمكن أن تحل محل ALL بيانات الموقع! ترك كاذبة إلا إذا كنت تخطط لاستعادة نسخة احتياطية"
     maximum_backups: "أكبر قدر ممكن من النسخ الاحتياطي للحفاظ على القرص. يتم حذف النسخ الاحتياطية القديمة تلقائيا"
     automatic_backups_enabled: "فعل النسخ الإحتياطي التلقائي بشكل متكرر كما هو محدد."
@@ -1241,6 +1242,10 @@ ar:
     errors:
       different_topics: "المشاركات من موضوعين مختلفين لايُمكن دمجهم"
       different_users: "المشاركات من اعضاء مختلفين لايُمكن دمجهم"
+  publish_page:
+    slug_errors:
+      blank: "لا يمكن جعله فارغا."
+      invalid: "يحتوي احرف غير صالحة "
   topic_statuses:
     autoclosed_enabled_days:
       zero: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متوفره بعد الان."
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index ddc531f97a..ccb1dbf542 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -226,6 +226,9 @@ be:
   edit_conflict: "Гэта паведамленне было адрэдагавана іншым карыстальнікам, і вашы змены не могуць быць больш не захаваны."
   revert_version_same: "Бягучая версія супадае з версіяй на якую вы спрабуеце вярнуцца."
   excerpt_image: "малюнак"
+  bookmarks:
+    reminders:
+      tomorrow: "заўтра"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' не з'яўляецца дапушчальным узроўнем даверу."
@@ -248,7 +251,6 @@ be:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Заяўка на ўступ у @%{group_name}"
-      handle: "звяртацца з просьбай аб членстве"
   education:
     until_posts:
       one: "%{count} запіс"
@@ -940,8 +942,6 @@ be:
     force_https: "Прымусьце свой сайт, каб выкарыстоўваць толькі HTTPS. УВАГА: Не ўключайце гэта, пакуль вы не пераканайцеся, HTTPS цалкам настроена і працуе абсалютна ўсюды! Праверылі Ці вы свой CDN, усе сацыяльныя лагіны, і ўсе знешнія лагатыпы"
     same_site_cookies: "Выкарыстоўвайце тыя ж печыва сайта, яны ліквідуюць ўсе вектары Cross Site Request Падробка на падтрымоўваных браўзэраў (LAX або Strict). Увага: Строгі будзе працаваць толькі на сайтах, якія прымушаюць лагін і выкарыстоўваць адзіны ўваход."
     summary_score_threshold: "Мінімальная колькасць балаў, неабходныя для пасады, якія будуць уключаны ў «Сумаваць гэтую тэму»"
-    summary_posts_required: "Мінімум паведамленні ў тэме да «Абагульніць Гэтую тэму» уключана"
-    summary_likes_required: "Мінімум любіць ў тэме да «Сумаваць Гэтую тэму» уключаны"
     summary_percent_filter: "Калі карыстальнік націскае «Сумаваць гэтую тэму», паказваюць верхнюю% паведамленняў"
     summary_max_results: "Максімум паведамлення якiя вяртаюцца «Абагульніць Гэтую тэму»"
     enable_personal_messages: "Дазволіць траставы ўзровень 1 (наладжваецца праз мін ўзровень даверу для адпраўкі паведамленняў) карыстальнікам ствараць паведамленні і адказваць на паведамленні. Звярніце ўвагу, што супрацоўнікі заўсёды могуць адпраўляць паведамленні незалежна ад таго, што."
@@ -1039,7 +1039,6 @@ be:
     enable_instagram_logins: "Ўключэнне праверкі сапраўднасці Instagram, патрабуе instagram_consumer_key і instagram_consumer_secret"
     instagram_consumer_key: "Спажывецкі ключ для аўтэнтыфікацыі Instagram"
     instagram_consumer_secret: "Спажывецкі сакрэт аўтэнтыфікацыі Instagram"
-    readonly_mode_during_backup: "Ўключыць рэжым чытання толькі падчас прыёму рэзервовага капіявання"
     enable_backups: "Дазволіць адміністратарам ствараць рэзервовыя копіі форуму"
     allow_restore: "Дазволіць аднаўленне, якое можа замяніць УСЕ дадзеныя сайта! Пакіньце хлусня, калі вы не плануеце аднавіць рэзервовую копію"
     maximum_backups: "Максімальную колькасць рэзервовых копій, каб захаваць на дыску. Старыя рэзервовыя копіі аўтаматычна выдаляюцца"
@@ -1421,6 +1420,10 @@ be:
       different_users: "Паведамленні, якія належаць розным карыстачам не могуць быць аб'яднаныя."
   change_owner:
     post_revision_text: "уласнасці перададзеныя"
+  publish_page:
+    slug_errors:
+      blank: "не можа быць пустым"
+      invalid: "ўтрымлівае недапушчальныя сімвалы"
   topic_statuses:
     autoclosed_disabled: "Гэтая тэма ў цяперашні час адкрыта. Новыя адказы дазволеныя."
     autoclosed_disabled_lastpost: "Гэтая тэма ў цяперашні час адкрыта. Новыя адказы дазволеныя."
@@ -1482,7 +1485,7 @@ be:
       inactive_user: "неактыўны карыстальнік"
   unsubscribe_mailer:
     title: "Адмовіцца ад Mailer"
-    subject_template: "Пераканайцеся, вы больш не жадаеце атрымліваць абвесткі ад% {SITE_TITLE}"
+    subject_template: "Пераканайцеся што вы больш не жадаеце атрымліваць абвесткі ад %{site_title}"
   invite_mailer:
     title: "запрасіць Mailer"
   custom_invite_mailer:
@@ -1565,38 +1568,59 @@ be:
     email_reject_inactive_user:
       title: "Email Адхіліць неактыўны карыстальнік"
     email_reject_parsing:
-      title: "Email Адхіліць Сінтаксічны"
+      title: "Email Reject Parsing"
+      subject_template: "[%{email_prefix}] Email issue -- Content Unrecognized"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        We couldn't find your reply in the email. **Make sure your reply is at the top of the email** -- we can't process inline replies.
     email_reject_invalid_access:
       title: "Email Адхіліць Invalid доступу"
-      subject_template: "[% {Email_prefix}] Email пытанне - Invalid доступ"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Ваш уліковы запіс не мае права размяшчаць новыя тэмы ў гэтай катэгорыі. Калі вы лічыце, што гэта памылка, [кантакт супрацоўніка] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- Invalid Access"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        Your account does not have the privileges to post new topics in that category. If you believe this is an error, [contact a staff member](%{base_url}/about).
     email_reject_strangers_not_allowed:
       title: "Email Адхіліць Чужыя не дазволены"
-      subject_template: "[% {Email_prefix}] Email пытанне - Invalid доступ"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Катэгорыі вы паслалі гэты ліст дае толькі адказы ад карыстальнікаў з сапраўднымі рахункамі і вядомых адрасоў электроннай пошты. Калі вы лічыце, што гэта памылка, [кантакт супрацоўніка] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- Invalid Access"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        The category you sent this email to only allows replies from users with valid accounts and known email addresses. If you believe this is an error, [contact a staff member](%{base_url}/about).
     email_reject_invalid_post:
       title: "Email Адхіліць Invalid паведамленне"
-      subject_template: "[% {Email_prefix}] Email пытанне - Праводка памылак"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Некаторыя магчымыя прычыны: складанае фарматаванне, паведамленне занадта вялікае, паведамленне занадта малыя. Калі ласка, паспрабуйце яшчэ раз, або адправіць праз вэб-сайт, калі гэта будзе працягвацца.
+      subject_template: "[%{email_prefix}] Email issue -- Posting error"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        Some possible causes are: complex formatting, message too large, message too small. Please try again, or post via the website if this continues.
     email_reject_invalid_post_specified:
       title: "Email Адхіліць Invalid Паведамленне паказана"
-      subject_template: "[% {Email_prefix}] Email пытанне - Праводка памылак"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.прычына:% {Post_error}Калі вы можаце выправіць гэтую праблему, калі ласка, паспрабуйце яшчэ раз.
+      subject_template: "[%{email_prefix}] Email issue -- Posting error"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        Reason:
+
+        %{post_error}
+
+        If you can correct the problem, please try again.
       date_invalid: "Няма дата стварэння паста не знойдзена. Ці з'яўляецца адрас электроннай пошты адсутнічае Дата: загаловак?"
     email_reject_post_too_short:
       title: "Email Адхіліць паведамленне занадта кароткае"
-      subject_template: "[% {Email_prefix}] праблема электроннай пошты - паведамленне занадта кароткае"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Для таго, каб спрыяць больш паглыбленых гутарак, вельмі кароткія адказы не дапускаюцца. Ці можаце вы адказаць, па меншай меры% {лік} сымбаляў? Акрамя таго, вы можаце, як пост па электроннай пошце, адказваючы на «1».
+      subject_template: "[%{email_prefix}] праблема электроннай пошты - паведамленне занадта кароткае"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        To promote more in depth conversations, very short replies are not allowed. Can you please reply with at least %{count} characters? Alternatively, you can like a post via email by replying with "+1".
     email_reject_invalid_post_action:
       title: "Email Адхіліць Invalid Паведамленне Дзеянне"
-      subject_template: "[% {Email_prefix}] вопрос Email - Invalid паведамленне Дзеянне"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Паведамленне Дзеянне не было прызнана. Калі ласка, паспрабуйце яшчэ раз, або адправіць праз вэб-сайт, калі гэта будзе працягвацца.
+      subject_template: "[%{email_prefix}] Email issue -- Invalid Post Action"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        The Post Action was not recognized. Please try again, or post via the website if this continues.
     email_reject_reply_key:
       title: "Email Адхіліць Адказаць Key"
       subject_template: "[% {Email_prefix}] Email пытанне - Unknown Адказаць Key"
@@ -1624,39 +1648,73 @@ be:
         Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Тэма, якую вы адказваеце у цяперашні час зачынена і больш не прымаць адказы. Калі вы лічыце, што гэта памылка, [кантакт супрацоўніка] (% {base_url}
     email_reject_auto_generated:
       title: "Email Адхіліць Auto Generated"
-      subject_template: "[% {Email_prefix}] вопрос Email - Auto Сфарміраваны Адказаць"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Ваш электронны адрас быў адзначаны як «автогенерируемые», што азначае, што яна была створана аўтаматычна з дапамогай кампутара замест таго, каб быць набраны чалавекам; мы не можам прыняць гэтыя віды лістоў. Калі вы лічыце, што гэта памылка, [кантакт супрацоўніка] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- Auto Generated Reply"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        Your email was marked as "auto generated", which means it was automatically created by a computer instead of being typed by a human; we can't accept those kinds of emails. If you believe this is an error, [contact a staff member](%{base_url}/about).
     email_reject_unrecognized_error:
       title: "Email Адхіліць Неопознанная памылка"
-      subject_template: "[% {Email_prefix}] Email пытанне - Неопознанная памылка"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Быў непрызнаная памылка пры апрацоўцы паведамлення і не была апублікавана. Вы павінны паспрабаваць яшчэ раз, або [кантакт супрацоўніка] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- Unrecognized Error"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        There was an unrecognized error while processing your email and it wasn't posted. You should try again, or [contact a staff member](%{base_url}/about).
     email_reject_attachment:
       title: "Email Attachment Адхілена"
-      subject_template: "[% {Email_prefix}] Email пытанне - Дадатак Адхілена"
-      text_body_template: |-
-        На жаль, некаторыя ўкладання ў паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) былі адхіленыя.Чытаць далей:% {Rejected_errors}Калі вы лічыце, што гэта памылка, [кантакт супрацоўніка] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- Attachment Rejected"
+      text_body_template: |
+        Unfortunately some attachments in your email message to %{destination} (titled %{former_title}) were rejected.
+
+        Details:
+        %{rejected_errors}
+
+        If you believe this is an error, [contact a staff member](%{base_url}/about).
+    email_reject_reply_not_allowed:
+      title: "Email Reject Reply Not Allowed"
+      subject_template: "[%{email_prefix}] Email issue -- Reply Not Allowed"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        You don't have permissions to reply to the topic. If you believe this is an error, [contact a staff member](%{base_url}/about).
     email_error_notification:
       title: "Апавяшчэнне па электроннай пошце пра памылку"
-      subject_template: "[% {Email_prefix}] Праблема электроннай пошты - памылка аўтэнтыфікацыі POP"
-      text_body_template: |-
-        На жаль, адбылася памылка аўтэнтыфікацыі падчас апытання пошты з сервера POP.Калі ласка, пераканайцеся, што вы правільна наладзілі POP уліковых дадзеных [налады сайта] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- POP authentication error"
+      text_body_template: |
+        Unfortunately, there was an authentication error while polling mails from the POP server.
+
+        Please make sure you have properly configured the POP credentials in [the site settings](%{base_url}/admin/site_settings/category/email).
+
+        If there is a web UI for the POP email account, you may need to log in on the web and check your settings there.
     email_revoked:
       title: "Email Revoked"
       subject_template: "Ці з'яўляецца ваш адрас электроннай пошты правільна?"
-      text_body_template: |-
-        Мы шкадуем, але мы ўзніклі праблемы дасягнення вам па электроннай пошце. Нашы апошнія некалькі электронных лістоў вам усё адскочылі назад, як здадзеныя.Вы можаце пераканацца, што [ваш адрас электроннай пошты] (% {base_url}
-    email_bounced: |-
-      Паведамленьне% {адрас электроннай пошты} падскочыў.### Больш падрабязна`` `Тэкст% {} Сыравіны`` `
+      text_body_template: |
+        We’re sorry, but we’re having trouble reaching you via email. Our last few emails to you have all bounced back as undeliverable.
+
+        Can you make sure [your email address](%{base_url}/my/preferences/email) is valid and working? You may also wish to add our email address to your address book / contact list to improve deliverability.
+    email_bounced: |
+      The message to %{email} bounced.
+
+      ### Details
+
+      ``` text
+      %{raw}
+      ```
     ignored_users_summary:
       title: "Ігнаруецца прайшоў парог карыстальніка"
       subject_template: "Карыстальнік ігнаруецца шматлікімі іншымі карыстальнікамі"
     too_many_spam_flags:
       title: "Занадта шмат спаму Сьцягоў"
       subject_template: "Новы ўліковы запіс на ўтрыманне"
-      text_body_template: |-
-        Добры дзень,Гэта аўтаматычнае паведамленне ад% {SITE_NAME}, каб вы ведалі, што вашы пасты былі часова схаваныя, паколькі яны былі адзначаны супольнасцю.У якасці меры засцярогі, новая уліковы запіс была адключаная і не зможа не ствараць адказы ці тэмы, пакуль супрацоўнік можа праглядзець Вашу ўліковы запіс. Просім прабачэння за прычыненыя нязручнасці.Для атрымання дадатковых указанняў, калі ласка, звярніцеся да нашых прынцыпам супольнасці [] (% {base_url}
+      text_body_template: |
+        Hello,
+
+        This is an automated message from %{site_name} to let you know that your posts have been temporarily hidden because they were flagged by the community.
+
+        As a precautionary measure, your new account has been silenced and will be unable to create replies or topics until a staff member can review your account. We apologize for the inconvenience.
+
+        For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
     too_many_tl3_flags:
       title: "Занадта шмат ТЛ3 Flags"
       subject_template: "Новы ўліковы запіс на ўтрыманне"
@@ -1684,127 +1742,213 @@ be:
         Добры дзень,Гэта аўтаматычнае паведамленне ад% {SITE_NAME}, каб вы ведаеце, што ваш уліковы запіс больш не на ўтрыманне пасля праверкі персаналу.Цяпер вы можаце ствараць новыя адказы і тэмы зноў. Дзякуй за ваша цярпенне.
     pending_users_reminder:
       title: "У чаканні карыстальнікаў Напамін"
-      text_body_template: |-
-        Ёсць новыя рэгістрацыі карыстальнікаў, якія чакаюць быць зацверджана (або адхілена), перш чым яны могуць атрымаць доступ да гэтага форуму.[Калі ласка, азнаёмцеся з імі] (% {base_url}
+      text_body_template: |
+        There are new user signups waiting to be approved (or rejected) before they can access this forum.
+
+        [Please review them](%{base_url}/review).
     download_remote_images_disabled:
       title: "Загрузіць выдаленыя выявы з абмежаванымі фізічнымі магчымасцямі"
       subject_template: "Загрузка аддаленых малюнкаў адключаная"
-      text_body_template: "Параметр `download_remote_images_to_local` быў адключаны, так як быў дасягнуты мяжа дыскавай прасторы на` download_remote_images_threshold`."
+      text_body_template: "The `download_remote_images_to_local` setting was disabled because the disk space limit at `download_remote_images_threshold` was reached."
     dashboard_problems:
       title: "праблемы Dashboard"
       subject_template: "Новыя рэкамендацыі на вашым сайце прыборнай панэлі"
     new_user_of_the_month:
       title: "Вы новы карыстальнік месяцы!"
       subject_template: "Вы новы карыстальнік месяцы!"
-      text_body_template: |-
-        Віншую, вы зарабілі ** Новы карыстальнік прэміі месяца за% {MONTH_YEAR} **. : Трафей:Гэтая ўзнагарода даецца толькі для двух новых карыстальнікаў у месяц, і ён будзе пастаянна бачны на [старонцы знакаў] (% {URL}).Вы хутка стаць каштоўным членам нашага супольнасці. Дзякуй за ўдзел, і захаваць вялікую працу!
+      text_body_template: |
+        Congratulations, you've earned the **New User of the Month award for %{month_year}**. :trophy:
+
+        This award is only granted to two new users per month, and it will be permanently visible on [the badges page](%{url}).
+
+        You've quickly become a valuable member of our community. Thanks for joining, and keep up the great work!
     queued_posts_reminder:
       title: "QUEUED Паведамленняў Reminder"
-  unsubscribe_link: |-
-    Каб адмовіцца ад гэтых лістоў, [націсніце тут] (% {unsubscribe_url}).
-  unsubscribe_link_and_mail: |-
-    Каб адмовіцца ад гэтых лістоў, [націсніце тут] (% {unsubscribe_url}).
-  unsubscribe_mailing_list: |-
-    Вы атрымліваеце гэта таму, што вы ўключылі рэжым спісу рассылання.Каб адмовіцца ад гэтых лістоў, [націсніце тут] (% {unsubscribe_url}).
+      text_body_template: |
+        Hello,
+
+        Posts from new users were held for moderation and are currently waiting to be reviewed. [Approve or reject them here](%{base_url}/review?type=ReviewableQueuedPost).
+  unsubscribe_link: |
+    Каб адмовіцца ад гэтых лістоў, [націсніце тут] (%{unsubscribe_url}).
+  unsubscribe_link_and_mail: |
+    Каб адмовіцца ад гэтых лістоў, [націсніце тут] ( %{unsubscribe_url}).
+  unsubscribe_mailing_list: "Вы атрымліваеце гэта таму, што вы ўключылі рэжым спісу \n\nрассылання. Каб адмовіцца ад гэтых лістоў, [націсніце тут]%{unsubscribe_url}).\n"
   subject_re: "Re:"
   subject_pm: "[PM]"
-  email_from: "% {User_name} з дапамогай {%} site_name"
+  email_from: "%{user_name} via %{site_name}"
   user_notifications:
     previous_discussion: "папярэднія адказы"
     in_reply_to: "У адказ на"
     unsubscribe:
       title: "Адмовіцца ад падпіскі"
       description: "Не зацікаўленыя ў атрыманні гэтых лістоў? Няма праблем! Націсніце ніжэй, каб адмовіцца ад падпіскі імгненна:"
-    reply_by_email: "[Наведаць тэма] (% {base_url}% {URL}) або адказаць на гэты ліст, каб адказаць."
-    reply_by_email_pm: "[Наведаць паведамленне] (% {base_url}% {URL}) або адказаць на гэты ліст, каб адказаць на% {удзельнікаў}."
+    reply_by_email: "[Visit Topic](%{base_url}%{url}) or reply to this email to respond."
+    reply_by_email_pm: "[Visit Message](%{base_url}%{url}) or reply to this email to respond to %{participants}."
     only_reply_by_email: "Адказаць на гэтае паведамленне, каб адказаць."
     only_reply_by_email_pm: "Адказаць на гэты ліст, каб адказаць на% {удзельнікаў}."
-    visit_link_to_respond: "[Наведаць тэма] (% {base_url}% {URL}), каб адказаць."
-    visit_link_to_respond_pm: "[Наведаць паведамленне] (% {base_url}% {URL}), каб адказаць на% {удзельнікаў}."
-    posted_by: "Паведамленне ад% {імя карыстальніка} на {%} POST_DATE"
-    pm_participants: "Удзельнікі:% {ўдзельнікі}"
+    visit_link_to_respond: "[Visit Topic](%{base_url}%{url}) to respond."
+    visit_link_to_respond_pm: "[Visit Message](%{base_url}%{url}) to respond to %{participants}."
+    posted_by: "Posted by %{username} on %{post_date}"
+    pm_participants: "Удзельнікі: %{participants}"
     user_invited_to_private_message_pm_group:
       title: "Карыстальнік Запрошаныя групе PM"
-      subject_template: "[% {Email_prefix}]% {імя карыстальніка} запрасіў @% {GROUP_NAME} на паведамленне '% {TOPIC_TITLE}'"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{username} invited @%{group_name} to a message '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "Карыстальнік запрошаны ў лічку"
-      subject_template: "[% {Email_prefix}]% {імя карыстальніка} запрашае вас на паведамленне '% {TOPIC_TITLE}'"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{username} invited you to a message '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm_staged:
       title: "Карыстальнік Запрошаны PM Паэтапнае"
       subject_template: "[% {Email_prefix}]% {імя карыстальніка} запрашае вас на паведамленне '% {TOPIC_TITLE}'"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Respond_instructions}
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_topic:
       title: "Карыстальнік запрошаны на тэму"
-      subject_template: "[% {Email_prefix}]% {імя карыстальніка} запрасіў вас '% {TOPIC_TITLE}'"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{username} запрасіў вас у '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_replied:
       title: "Карыстальнік Адказаў"
-      subject_template: "[% {Email_prefix}] {%} TOPIC_TITLE"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_replied_pm:
       title: "Карыстальнік Адказаў PM"
-      subject_template: "[% {Email_prefix}] [ЛС]% {TOPIC_TITLE}"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_quoted:
       title: "цытаты карыстальнікаў"
-      subject_template: "[% {Email_prefix}] {%} TOPIC_TITLE"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_linked:
       title: "Карыстальнік Linked"
-      subject_template: "[% {Email_prefix}] {%} TOPIC_TITLE"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_mentioned:
       title: "Карыстальнік Згадваецца"
-      subject_template: "[% {Email_prefix}] {%} TOPIC_TITLE"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_mentioned_pm:
       title: "Карыстальнік Згаданы PM"
-      subject_template: "[% {Email_prefix}] [ЛС]% {TOPIC_TITLE}"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_group_mentioned:
       title: "Карыстальнік Група Згадваецца"
-      subject_template: "[% {Email_prefix}] {%} TOPIC_TITLE"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_posted:
       title: "Карыстальнік Паведамленне"
-      subject_template: "[% {Email_prefix}] {%} TOPIC_TITLE"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_watching_first_post:
       title: "Карыстальнік Гледзячы першы пост"
-      subject_template: "[% {Email_prefix}] {%} TOPIC_TITLE"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_posted_pm:
       title: "Карыстальнік Паведамленне PM"
-      subject_template: "[% {Email_prefix}] [ЛС]% {TOPIC_TITLE}"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_posted_pm_staged:
       title: "Карыстальнік Паведамленне PM Пастановачная"
-      subject_template: "% {Optional_re}% {TOPIC_TITLE}"
-      text_body_template: |-
-        % {Паведамленне}
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |2
+
+        %{message}
     account_suspended:
-      title: "кошт Падвесных"
-      subject_template: "[% {Email_prefix}] Ваш рахунак быў заблякаваны"
+      title: "Аккаунт прыпынены"
+      subject_template: "[%{email_prefix}] Ваш рахунак быў заблякаваны"
       text_body_template: |-
         Вы не былі адхіленыя ад форума да% {suspended_till}.% {Прычына}% {Паведамленне}
     account_silenced:
-      title: "кошт глушыцель"
+      title: "Аккаунт прыпынены"
       subject_template: "[% {Email_prefix}] Ваш уліковы запіс была адключаная"
       text_body_template: |-
         Вы не былі адключаныя ад форума да% {silenced_till}.% {Прычына}% {Паведамленне}
@@ -1819,10 +1963,9 @@ be:
       text_body_template: |-
         Два фактары аўтэнтыфікацыі быў адключаны на вашым рахунку ў% {site_name}. Цяпер вы можаце ўвайсці толькі з паролем; ня дадатковы код аўтэнтыфікацыі больш не патрабуецца.Калі вы не абралі, каб адключыць два фактары аўтэнтыфікацыі, хто-то можа скампраметавалі свой рахунак.Калі ў вас ёсць якія-небудзь пытанні, [звязацца з нашым прыязным персаналам] (% {base_url}
     digest:
-      why: "Кароткі выклад% {SITE_LINK} з моманту вашага апошняга наведвання% {last_seen_at}"
+      why: "Кароткі выклад %{site_link}з моманту вашага апошняга наведвання%{last_seen_at} "
       since_last_visit: "З моманту Вашага апошняга візіту"
       new_topics: "новыя тэмы"
-      unread_messages: "непрачытаныя паведамленні"
       unread_notifications: "непрачытаныя Апавяшчэнні"
       liked_received: "сімпатыі"
       new_users: "новыя карыстальнікі"
@@ -1831,72 +1974,106 @@ be:
       join_the_discussion: "Чытаць далей"
       popular_posts: "Папулярныя паведамленні"
       more_new: "Новае для вас"
-      subject_template: "[% {Email_prefix}] Кароткае апісанне"
-      unsubscribe: "[% {Email_prefix}] Кароткае апісанне..."
-      your_email_settings: "[% {Email_prefix}] Кароткае апісанне......"
-      click_here: "[% {Email_prefix}] Кароткае апісанне........."
-      preheader: "[% {Email_prefix}] Кароткае апісанне..............."
+      subject_template: "[%{email_prefix}] Кароткае апісанне"
+      unsubscribe: "This summary is sent from %{site_link} when we haven't seen you in a while. Change %{email_preferences_link}, or %{unsubscribe_link} to unsubscribe."
+      your_email_settings: "your email settings"
+      click_here: "click here"
+      preheader: "A brief summary since your last visit on %{last_seen_at}"
     forgot_password:
       title: "Забыліся на пароль"
-      subject_template: "[% {Email_prefix}] Аднаўленне пароля"
-      text_body_template: |-
-        Хто-то спытаў, каб скінуць пароль на [% {site_name}] (% {base_url}).Калі б гэта было не так, то вы можаце спакойна ігнараваць гэтае паведамленне.Націсніце на спасылку, каб выбраць новы пароль:% {Base_url}
+      subject_template: "[%{email_prefix}] Скінуць пароль"
+      text_body_template: |
+        Нехта спытаў каб скінуць пароль на [%{site_name}](%{base_url}).
+
+        Калі гэта былі не вы, то вы можаце спакойна ігнараваць гэтае паведамленне.
+
+        Націсніце на спасылку, каб выбраць новы пароль:
+        %{base_url}/u/password-reset/%{email_token}
     email_login:
       title: "Увайсці па спасылцы"
-      subject_template: "[% {Email_prefix}] Уваход па спасылцы"
-      text_body_template: |-
-        Вось ваша спасылка ўвайсці на [% {site_name}] (% {base_url}).Калі вы не запытвалі гэтую спасылку, вы можаце спакойна ігнараваць гэтае паведамленне.Націсніце на спасылку, каб увайсці:% {Base_url}
+      subject_template: "[%{email_prefix}] Уваход па спасылцы"
+      text_body_template: |
+        Вось ваша спасылка каб ўвайсці на [%{site_name}](%{base_url}).
+
+        Калі вы не запытвалі гэтую спасылку, вы можаце спакойна ігнараваць гэтае паведамленне.
+
+        Націсніце на спасылку, каб увайсці:
+        %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "ўсталяваць пароль"
-      subject_template: "[% {Email_prefix}] Усталяваць пароль"
-      text_body_template: |-
-        Хто-то спытаў, каб дадаць пароль да вашай ўліковага запісу на [% {site_name}] (% {base_url}). Акрамя таго, вы можаце ўвайсці, выкарыстоўваючы любы з падтрымоўваных онлайн сэрвісу (Google, Facebook і г.д.), што звязана з гэтым пацверджаным адрасам электроннай пошты.Калі вы не рабілі гэты запыт, вы можаце спакойна ігнараваць гэтае паведамленне.Націсніце на спасылку, каб выбраць пароль:% {Base_url}
+      subject_template: "[%{email_prefix}] Усталяваць пароль"
+      text_body_template: |
+        Somebody asked to add a password to your account on [%{site_name}](%{base_url}). Alternatively, you can log in using any supported online service (Google, Facebook, etc) that is associated with this validated email address.
+
+        If you did not make this request, you can safely ignore this email.
+
+        Click the following link to choose a password:
+        %{base_url}/u/password-reset/%{email_token}
     admin_login:
-      title: "адміністратар Увайсці"
-      subject_template: "[% {Email_prefix}] Статыстыка"
+      title: "Увайсці як адміністратар"
+      subject_template: "[%{email_prefix}] Увайсці"
     account_created:
-      title: "уліковы запіс створаны"
-      subject_template: "[% {Email_prefix}] Ваш новы рахунак"
-      text_body_template: |-
-        Новы ўліковы запіс была створана для вас у% {site_name}Націсніце на спасылку, каб выбраць пароль для новага рахунку:% {Base_url}
+      title: "Уліковы запіс створаны"
+      subject_template: "[%{email_prefix}] Ваш новы рахунак"
+      text_body_template: |
+        A new account was created for you at %{site_name}
+
+        Click the following link to choose a password for your new account:
+        %{base_url}/u/password-reset/%{email_token}
     confirm_new_email:
       title: "Пацвердзіце новы Email"
-      subject_template: "[% {Email_prefix}] Пацвердзіце свой новы адрас электроннай пошты"
+      subject_template: "[%{email_prefix}] Пацвердзіце свой новы адрас электроннай пошты"
     confirm_old_email:
       title: "Пацвердзіце стары адрас электроннай пошты"
-      subject_template: "[% {Email_prefix}] Пацвердзіце свой бягучы адрас электроннай пошты"
+      subject_template: "[%{email_prefix}] Пацвердзіце свой бягучы адрас электроннай пошты"
     notify_old_email:
       title: "Апавяшчаць Стары e-mail"
-      subject_template: "[% {Email_prefix}] Ваш электронны адрас быў зменены"
-      text_body_template: |-
-        Гэта аўтаматычнае паведамленне, каб вы ведаеце, што ваш адрас электроннай пошты для% {Site_name} зменена. Калі гэта было зроблена па памылцы, калі ласка, звяжыцеся задміністратар сайта.Ваш электронны адрас быў зменены на:% {NEW_EMAIL}
+      subject_template: "[%{email_prefix}] Ваш электронны адрас быў зменены"
+      text_body_template: |
+        This is an automated message to let you know that your email address for
+        %{site_name} has been changed. If this was done in error, please contact
+        a site administrator.
+
+        Your email address has been changed to:
+
+        %{new_email}
     signup_after_approval:
       title: "Рэгістрацыя Пасля зацвярджэння"
-      subject_template: "Вы былі зацверджаны на% {site_name}!"
+      subject_template: "Вы былі зацверджаны на %{site_name}!"
       text_body_template: |-
         Сардэчна запрашаем у% {site_name}!Супрацоўнік зацвердзіў свой кошт на% {SITE_NAME}.Цяпер вы можаце атрымаць доступ да новага рахунку, увайшоўшы на сайт:% {Base_url}Калі вышэй ссылка не клікабельнасць, паспрабуйце скапіяваць і ўставіць яго ў адрасную радок вашага браўзэра.% {New_user_tips}Мы лічым, што ў [цывілізаванае паводзіны супольнасці] (% {base_url}
     signup:
       title: "Зарэгістравацца"
-      subject_template: "[% {Email_prefix}] Пацвердзіце новы рахунак"
+      subject_template: "[%{email_prefix}] Пацвердзіце новы рахунак"
       text_body_template: |-
         Сардэчна запрашаем у% {site_name}!Націсніце на спасылку, каб пацвердзіць і актываваць новы рахунак:% {Base_url}
     activation_reminder:
-      title: "актывацыя Напамін"
-      subject_template: "[% {Email_prefix}] Напамін, каб пацвердзіць свой рахунак"
+      title: "Актывацыя Напаміну"
+      subject_template: "[%{email_prefix}] Напамін, каб пацвердзіць свой рахунак"
       text_body_template: |-
         Сардэчна запрашаем у% {site_name}!Гэта сяброўскае напамін, каб актываваць свой рахунак.Націсніце на спасылку, каб пацвердзіць і актываваць новы рахунак:% {Base_url}
     suspicious_login:
       title: "Новы Лагін абвесткі"
-      subject_template: "[% {Site_name}] Новае Увайсці з% {месца}"
-      text_body_template: |-
-        Добры дзень,Мы заўважылі, што лагін ад прылады або месца, якія вы звычайна не выкарыстоўваеце. Ці быў гэта ты? - Размяшчэнне:% {месца} (% {client_ip}) - Браўзэр:% {браўзэр} - Прылада:% {прылада} - {%} восКалі гэта ты, выдатна! Там няма нічога іншага, што вам трэба зрабіць.Калі гэта не вы, калі ласка [агляд існуючых сесій] (% {base_url}
+      subject_template: "[%{site_name}] New Login from %{location}"
+      text_body_template: |
+        Hello,
+
+        We noticed a login from a device or location you don’t usually use. Was this you?
+
+         - Location: %{location} (%{client_ip})
+         - Browser: %{browser}
+         - Device: %{device} – %{os}
+
+        If this was you, great! There’s nothing else you need to do.
+
+        If this was not you, please [review your existing sessions](%{base_url}/my/preferences/account) and consider changing your password.
   page_not_found:
     title: "На жаль! Гэтая старонка не існуе або з'яўляецца прыватнай уласнасцю."
     popular_topics: "папулярны"
-    recent_topics: "апошні"
-    see_more: "больш"
+    recent_topics: "Надаўнія"
+    see_more: "Больш"
     search_title: "Пошук па сайце"
-    search_button: "пошук"
+    search_button: "Пошук"
   offline:
     title: "Не ўдаецца загрузіць дадатак"
     offline_page_message: "Падобна на тое, што вы знаходзіцеся ў аўтаномным рэжыме! Калі ласка, праверце падключэнне да сеткі і паспрабуйце ізноў."
@@ -1909,9 +2086,9 @@ be:
   image: "малюнак"
   upload:
     edit_reason: "загружаныя лакальныя копіі малюнкаў"
-    unauthorized: "На жаль, файл, які вы ўкладаеце, ня санкцыянаваныя (аўтарызаваныя пашырэння:% {authorized_extensions})."
+    unauthorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})."
     pasted_image_filename: "ўстаўленае выява"
-    store_failure: "Не атрымалася захаваць загрузку #% {upload_id} для карыстальніка #% {user_id}."
+    store_failure: "Failed to store upload #%{upload_id} for user #%{user_id}."
     file_missing: "На жаль, вы павінны даць файл для загрузкі."
     empty: "Выбачайце, але Прадстаўлены файл пусты."
     png_to_jpg_conversion_failure_message: "Памылка пры пераўтварэнні з PNG ў JPG адбылося."
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 93a19cfefd..f0be12316e 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -177,10 +177,9 @@ bg:
   bookmarks:
     reminders:
       later_today: "По-късно днес"
-      next_business_day: "Следващият работен ден"
       tomorrow: "Утре"
-      next_week: "Следващата седмица"
-      next_month: "Следващият месец"
+      next_week: "Следваща седмица"
+      next_month: "Следващия месец"
   groups:
     errors:
       invalid_domain: "'%{domain}' е невалиден домейн."
@@ -697,8 +696,6 @@ bg:
     notification_email: "Подател: имейлът се използва при изпращане на всички системни съобщения. Посоченият тук домейн трябва да се конфигурира правилно със SPF, DKIM и PTR данни за успешна доставка."
     email_custom_headers: "Разделен със знака \"|\" списък от персонализирани имейл хедъри. "
     summary_score_threshold: "Минимална оценка необходима за една публикация, за да бъде включена в \"Обобщи тази тема\""
-    summary_posts_required: "Минимум публикации в темата преди \"Обобщи тази тема\" да бъде активирано"
-    summary_likes_required: "Минимум харесвания в темата преди \"Обобщи тази тема\" да бъде активирано"
     summary_percent_filter: "Когато потребителят кликне върху \"Обобщи тази тема\", се показват % от най-добрите публикации "
     enable_long_polling: "Системата за обработка на известия, да използва long polling - заявки с дълго изчакване / дълъг интервал "
     long_polling_base_url: "Основен URL използван за long polling - проверка на дълги интервали (когато се използва CDN за динамично съдръжание, уверете се, че тази стойност е настроена към основното съдържание) Например: http://origin.site.com"
@@ -925,6 +922,10 @@ bg:
   redirected_to_top_reasons:
     new_user: "Добре дошли в нашата общност! Това са най-популярните последни теми. "
     not_seen_in_a_month: "Добре дошли отново! Това са най-популярните теми за времето, през което Ви нямаше."
+  publish_page:
+    slug_errors:
+      blank: "не може да бъде празно"
+      invalid: "съдържа невалидни знаци"
   topic_statuses:
     autoclosed_enabled_days:
       one: "Тази тема ще се затвори автоматично след %{count} ден. Нови отговори вече не се допускат."
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 49473d134d..8c2754ec4a 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -57,7 +57,6 @@ bs_BA:
       no_multilevels_components: "Teme s dječjim temama ne mogu biti same teme djeteta"
     settings_errors:
       invalid_yaml: "Korišteni YAML fajl nije validan."
-      data_type_not_a_number: "Postavka tipa `%{name}` nije podržana. Podržani tipovi su `integer`, `bool`, `list` i `enum`"
       name_too_long: "Postoji postavka sa predugim imenom. Maksimalna dužina je 255"
       default_value_missing: "Postavka `%{name}` nema uobičajenu (default) vrijednost"
       default_not_match_type: "Postavka `%{name}` default uobičajena vrijednosti se ne podudara sa tipom postavke."
@@ -154,11 +153,10 @@ bs_BA:
   bookmarks:
     reminders:
       at_desktop: "Sljedeći put sam za svojim desktop kompjuterom"
-      later_today: "Danas, malo kasnije"
-      next_business_day: "Sljedeći radni dan"
-      tomorrow: "Sutradan"
+      later_today: "Kasnije danas"
+      tomorrow: "Sutra"
       next_week: "Sljedeće sedmice"
-      next_month: "Naredni mjesec"
+      next_month: "Sljedeći mjesec"
       custom: "Ciljano vrijeme i datum"
   groups:
     default_names:
@@ -570,8 +568,6 @@ bs_BA:
     notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive."
     email_custom_headers: "A pipe-delimited list of custom email headers"
     summary_score_threshold: "The minimum score required for a post to be included in 'Summarize This Topic'"
-    summary_posts_required: "Minimum posts in a topic before 'Summarize This Topic' is enabled"
-    summary_likes_required: "Minimum likes in a topic before 'Summarize This Topic' is enabled"
     summary_percent_filter: "When a user clicks 'Summarize This Topic', show the top % of posts"
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_interval: "Interval before a new long poll is issued in milliseconds "
@@ -744,6 +740,9 @@ bs_BA:
   redirected_to_top_reasons:
     new_user: "Dobrodošli u našu zajednicu! Ovo su najnovije popularne teme."
     not_seen_in_a_month: "Dobrodošli nazad! Nismo vas odavno vidjeli. Ovo su najnovije popularne teme od vaše zadnje posjete."
+  publish_page:
+    slug_errors:
+      invalid: "contains invalid characters"
   topic_statuses:
     autoclosed_disabled: "This topic is now opened. New replies are allowed."
     autoclosed_disabled_lastpost: "Ova tema je sada otvorena. Novi postovi su dozvoljeni."
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 2cf54be443..75bdbe8052 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -58,7 +58,6 @@ ca:
       no_multilevels_components: "Les aparences amb aparences filla no poden ser elles mateixes aparences  filles."
     settings_errors:
       invalid_yaml: "El YAML proveït no és vàlid"
-      data_type_not_a_number: "El paràmetre de tipus `%{name}` no és admès. Els tipus admesos són `integer`, `bool`, `list` i `enum`."
       name_too_long: "Hi ha un paràmetre amb un nom massa llarg. La longitud màxima és 255."
       default_value_missing: "El paràmetre `%{name}` no té un valor per defecte."
       default_not_match_type: "El tipus del valor per defecte del paràmetre `%{name}` no coincideix amb el tipus del paràmetre."
@@ -316,6 +315,12 @@ ca:
   edit_conflict: "Aquesta publicació ha estat editada per un altre usuari i els vostres canvis no es poden desar."
   revert_version_same: "La versió actual és la mateixa que la versió que intenteu revertir."
   excerpt_image: "imatge"
+  bookmarks:
+    reminders:
+      later_today: "Més tard avui"
+      tomorrow: "Demà"
+      next_week: "La setmana que ve"
+      next_month: "El mes que ve"
   groups:
     success:
       bulk_add:
@@ -345,7 +350,6 @@ ca:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Sol·licitud d'afiliació a @%{group_name}"
-      handle: "gestiona la sol·licitud d'afiliació"
     view_hidden_topic_request_reason: "Voldria unir-me al grup '%{group_name}' de manera que tingui accés a [aquest tema](%{topic_url})"
   education:
     until_posts:
@@ -1233,7 +1237,6 @@ ca:
   dashboard:
     rails_env_warning: "El vostre servidor s'executa en mode %{env}."
     host_names_warning: "El vostre fitxer config/database.yml empra el nom d'amfitrió local per defecte. Actualitzeu-lo per a fer servir el nom del vostre lloc web."
-    gc_warning: 'El servidor utilitza paràmetres d''alliberament de recursos (garbage collection) de Ruby per defecte que no us donaran el millor rendiment. Llegiu aquest article sobre l''ajust de rendiment: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a> .'
     sidekiq_warning: 'Sidekiq no s''està executant. Sidekiq fa que moltes tasques, com ara enviar correus electrònics, s''executin de manera asincrònica. Assegureu-vos que s''executa almenys un procés Sidekiq. <a href="https://github.com/mperham/sidekiq" target="_blank">Obtingueu informació sobre Sidekiq aquí</a> .'
     queue_size_warning: "El nombre de tasques en cua és de %{queue_size}, que és elevat. Això podria indicar un problema amb un o més processos, o potser us cal afegir més treballadors de <i>Sidekiq</i>."
     memory_warning: "El vostre servidor s'està executant amb menys d'1 GB de memòria total. Es recomana com a mínim un 1 GB de memòria."
@@ -1341,8 +1344,6 @@ ca:
     force_https: "Força el lloc web a fer servir només HTTPS. ATENCIÓ: NO ho activeu fins que no verifiqueu que l'HTTPS és totalment configurat i funciona a tot arreu. ¿Heu comprovat també la xarxa CDN, totes les connexions socials, i qualsevol logo o dependència externa per a assegurar-vos que tots són compatibles amb HTTPS?"
     same_site_cookies: "Utilitza les mateixes galetes del lloc web. Eliminen tots els vectors Cross Site Request Forgery (falsificació de petició entre llocs) en els navegadors compatibles (Lax o Strict). Advertència: Strict sols funcionarà en llocs que forcin l'inici de sessió i utilitzin SSO."
     summary_score_threshold: "La puntuació mínima requerida perquè una publicació sigui inclosa en 'Resumeix aquest tema'"
-    summary_posts_required: "Publicacions mínimes en un tema abans que sigui activat 'Resumeix aquest tema'"
-    summary_likes_required: "Nombre mínim de 'M'agrades' en un tema abans que sigui activat 'Resumeix aquest tema'"
     summary_percent_filter: "Quan un usuari fa clic en 'Resumeix aquest tema', mostra el % superior de les publicacions"
     summary_max_results: "Nombre màxim de publicacions retornades per \"Resumeix aquest tema\""
     enable_personal_messages: "Permet que els usuaris amb nivell de confiança 1 puguin crear missatges i respondre-hi (configurable amb nivell de confiança mínim per a enviar missatges). Observeu que l'equip responsable sempre pot enviar tota mena de missatges."
@@ -1478,7 +1479,6 @@ ca:
     discord_client_id: 'Identificador de client Discord (si us en cal un, visiteu <a href="https://discordapp.com/developers/applications/me">el portal de desenvolupadors Discord</a>)'
     discord_secret: "Clau secreta de Discord"
     discord_trusted_guilds: 'Permet sols als membres d''aquests gremis Discord iniciar sessió mitjançant Discord. Utilitzeu l''identificador numèric per al gremi. Per a obtenir més informació, consulteu les instruccions <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">aquí</a>. Deixeu-ho en blanc per a permetre qualsevol gremi.'
-    readonly_mode_during_backup: "Activa el mode només de lectura mentre es fa la còpia de seguretat"
     enable_backups: "Permet als administradors crear còpies de seguretat del fòrum"
     allow_restore: "Permet restaurar, cosa que pot reemplaçar TOTES les dades del lloc web! Deixeu-ho com a \"fals\" si no preteneu restaurar una còpia de seguretat."
     maximum_backups: "Nombre màxim de còpies de seguretat que es mantenen en el disc. Les còpies més antigues seran suprimides automàticament."
@@ -1608,11 +1608,13 @@ ca:
     desktop_category_page_style: "Estil visual per a la pàgina /categories."
     category_colors: "Llista de valors de color hexadecimal permesos per a categories."
     category_style: "Estil visual per a insígnies de categoria."
+    max_image_size_kb: "Mida màxima de càrrega d'imatge en kB. Cal configurar-ho en nginx (client_max_body_size) / apache o en el proxy també. Les imatges més grans que aquest límit i més petites que client_max_body_size es redimensionaran en la càrrega."
     max_attachment_size_kb: "Mida màxima de càrrega de fitxers adjunts en kB. Cal configurar-ho en nginx (client_max_body_size) / apache o en el proxy també."
     authorized_extensions: "Llista d'extensions de fitxer permeses per a carregar (feu servir '*' per a habilitar tota mena de fitxers)"
     authorized_extensions_for_staff: "Llista d'extensions permeses als usuaris de l'equip responsable en carregar fitxers a més de la llista definida en el paràmetre `authorized_extensions` de la configuració. (Feu servir \"*\" per a habilitar tots els tipus de fitxers.)"
     theme_authorized_extensions: "Llista d'extensions de fitxers permeses per a càrregues d'aparences (utilitzeu '*' per a permetre tots els tipus de fitxers)"
     max_similar_results: "Quants temes semblants es mostren per damunt de l'editor quan es redacta un tema nou. La comparació es basa en el títol i el cos."
+    max_image_megapixels: "Nombre màxim de megapíxels permesos en una imatge. Es rebutjaran les imatges amb un nombre més alt de megapíxels. "
     title_prettify: "Evita errades tipogràfiques freqüents en el títol, incloent-hi tot en majúscula, primer caràcter en minúscula, exclamacions i interrogants múltiples, punts extres al final, etc."
     title_remove_extraneous_space: "Elimina els espais blancs de davant de la puntuació final."
     automatic_topic_heat_values: 'Actualitza automàticament els paràmetres de "topic views heat" i "topic post like heat" basant-se en l''activitat del lloc web. '
@@ -1967,6 +1969,10 @@ ca:
       other: "%{count} publicacions s'han combinat en un missatge existent: %{topic_link}"
   change_owner:
     post_revision_text: "Propietat transferida"
+  publish_page:
+    slug_errors:
+      blank: "no pot ser buit"
+      invalid: "conté caràcters no vàlids"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Aquest missatge s'ha tancat automàticament després d'arribar al límit màxim d'%{count} resposta."
@@ -2699,7 +2705,6 @@ ca:
       why: "Un resum breu de %{site_link} des de la vostra darrera visita el  %{last_seen_at}"
       since_last_visit: "Des de la vostra darrera visita"
       new_topics: "Temes nous"
-      unread_messages: "Missatges no llegits"
       unread_notifications: "Alertes sense llegir"
       liked_received: "M'agrades rebuts"
       new_users: "Usuaris nous"
@@ -3036,11 +3041,17 @@ ca:
         Aquesta insígnia es concedeix quan rebeu 5 'M'agrada' en 300 publicacions diferents. Molt bé! La comunitat admira les vostres aportacions freqüents i d'alta gran qualitat a les converses!
     out_of_love:
       name: Sense amor
+      long_description: |
+        Aquesta insígnia es concedeix quan gasteu tots els %{max_likes_per_day} dels vostres 'M'agrada' diaris. Dedicar un temps a mostrar estima per les publicacions que us han agradat encoratja els membres de la comunitat a crear discussions encara millors en el futur.
     higher_love:
       name: Un amor més elevat
+      long_description: |
+        Aquesta insígnia es concedeix quan gasteu tots els %{max_likes_per_day} dels vostres 'M'agrada' diaris durant 5 dies. Gràcies per animar activament les millors converses cada dia.
     crazy_in_love:
       name: Boig d'amor
       description: Ha fet servir 50 'M'agrada' en un dia 20 vegades
+      long_description: |
+        Aquesta insígnia es concedeix quan utilitzeu tots els vostres %{max_likes_per_day} 'm'agrada' diaris durant vint dies. Oh! Sou un model per a animar els companys de comunitat!
     thank_you:
       name: Gràcies
       description: Té 20 publicacions amb 'm'agrada' i ha donat 10 'm'agrada'
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 629dd6b113..17674fc998 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -225,6 +225,12 @@ cs:
   too_late_to_edit: "Tento příspěvek byl vytvořen velmi dávno. Už ho není možné smazat ani upravovat."
   revert_version_same: "Aktuální verze je stejná jako verze, na kterou se pokoušíte vrátit."
   excerpt_image: "obrázek"
+  bookmarks:
+    reminders:
+      later_today: "Později během dnešního dne"
+      tomorrow: "Zítra"
+      next_week: "Další týden"
+      next_month: "Další měsíc"
   groups:
     errors:
       can_not_modify_automatic: "Nelze měnit automatické skupiny"
@@ -883,6 +889,10 @@ cs:
   redirected_to_top_reasons:
     new_user: "Vítejte v naší komunitě! Tohle jsou poslední populární témata."
     not_seen_in_a_month: "Vítejte zprátky! Chvíli jsme se neviděli. Tohle jsou nejpopulárnější témata od vaší poslední návštěvy."
+  publish_page:
+    slug_errors:
+      blank: "nemůže zůstat prázdné"
+      invalid: "obsahuje neplatné znaky"
   topic_statuses:
     autoclosed_disabled: "Toto téma je otevřeno. Nové odpovědi jsou povoleny."
     autoclosed_disabled_lastpost: "Toto téma je otevřeno. Nové odpovědi jsou povoleny."
@@ -960,7 +970,6 @@ cs:
       why: "Krátký souhrn z webu %{site_link} od poslední návštěvy v %{last_seen_at}"
       since_last_visit: "Od poslední návštěvy"
       new_topics: "Nová témata"
-      unread_messages: "Nepřečtené zprávy"
       liked_received: "Obdržených 'líbí se'"
       new_users: "Noví uživatelé"
       popular_topics: "Populární témata"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 05e49b2d2c..0d255dc1f1 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -57,7 +57,6 @@ da:
       no_multilevels_components: "Temaer med børnetemaer kan ikke selv være børn af andre temaer"
     settings_errors:
       invalid_yaml: "Forsynet YAML er ugyldig."
-      data_type_not_a_number: "Indstillingen `%{name}`s type er ikke understøttet. Understøttede typer er `integer`, `bool`, `list` og `enum`"
       name_too_long: "Der er en indstilling med et for langt navn. Maksimal længde er 255"
       default_value_missing: "Indstilling af `%{name}` har ingen standard værdi"
       default_not_match_type: "Indstilling af `%{name}`s standard værdi's type stemmer ikke overens med den type fundet i indstillingerne."
@@ -221,7 +220,7 @@ da:
     in_reply_to: "▶ %{username}"
     replies:
       one: "%{count} svar"
-      other: "%{count} svarer"
+      other: "%{count} svar"
     last_reply: "Sidste svar"
     created: "Oprettet"
   no_mentions_allowed: "Beklager, du kan ikke nævne andre brugere."
@@ -293,9 +292,10 @@ da:
   excerpt_image: "billede"
   bookmarks:
     reminders:
+      later_today: "Senere i dag"
       tomorrow: "I morgen"
       next_week: "Næste uge"
-      next_month: "Næste måned"
+      next_month: "Næste Månede"
       custom: "Valgfri dato og tid"
   groups:
     success:
@@ -967,8 +967,6 @@ da:
     email_custom_headers: "En liste af brugerdefinerede e-mail-headers adskilt af |-tegn."
     force_https: "Tving din side til kun at anvende HTTPS. Slå ikke denne funktion til før det er sat helt op og virker overalt! Har du tjekket dit CDN, alle social logins, og eksterne logos og afhængigheder og sikret at de også er HTTPS kompatible?"
     summary_score_threshold: "Påkrævet minimum score for et indlæg til at blive inkluderet i 'opsummering af emne'"
-    summary_posts_required: "Minimum antal indlæg i et emne, før 'opsummer dette emne' er aktiveret"
-    summary_likes_required: "Minimum antal likes på et emne før 'opsummer dette emne' er aktiveret"
     summary_percent_filter: "Når en bruger kllikker 'Opsummer dette Emne' vises top % af indlæg"
     enable_personal_messages: "Tillad Trust Level 1 (kan konfigureres minimum trust level til at sende beskeder), brugere til at sende og svare på beskeder. Bemærk at moderatorer beskeder, uanset hvad."
     enable_long_polling: "Message bus til underretninger kan bruge long polling"
@@ -1009,7 +1007,6 @@ da:
     google_oauth2_client_id: "Client ID of your Google application."
     google_oauth2_client_secret: "Client secret of your Google application."
     enable_instagram_logins: "Aktivér Instagram-login, kræver instagram_consumer_key og instagram_consumer_secret"
-    readonly_mode_during_backup: "Slå \"read-only\" tilstand til mens der foretages backup"
     active_user_rate_limit_secs: "Hvor ofte vi opdaterer feltet 'last_seen_at', i sekunder."
     previous_visit_timeout_hours: "Hvor lang tid et besøg varer før vi regner det med i det 'forrige' besøg, i timer."
     max_likes_per_day: "Maksimalt antal likes per bruger per dag."
@@ -1113,6 +1110,10 @@ da:
   frequent_poster: "Hyppig forfatter"
   redirected_to_top_reasons:
     new_user: "Velkommen til fællesskabet! Dette er de seneste mest populære emner."
+  publish_page:
+    slug_errors:
+      blank: "kan ikke være tom"
+      invalid: "indeholder ugyldige tegn"
   topic_statuses:
     autoclosed_enabled_days:
       one: "Dette emne blev automatisk lukket efter %{count} dag. Nye svar er ikke længere tilladt."
@@ -1485,7 +1486,6 @@ da:
       why: "Et kort resumé af %{site_link} siden dit sidste besøg %{last_seen_at}"
       since_last_visit: "Siden dit sidste besøg"
       new_topics: "Nye emner"
-      unread_messages: "Ulæste beskeder"
       unread_notifications: "Ulæste beskeder"
       liked_received: "Modtagne \"Synes om\""
       new_users: "Nye brugere"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index e8570280b0..cd216e367c 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -59,7 +59,6 @@ de:
       optimized_link: Optimierte Bild-Verknüpfungen sind kurzlebig und sollten nicht in Theme-Quellcode enthalten sein.
     settings_errors:
       invalid_yaml: "Der YAML-Code ist ungültig."
-      data_type_not_a_number: "Der eingestellte Datentyp `%{name}` wird nicht unterstützt. Unterstützte Datentypen sind `integer`, `bool`, `list` und `enum`."
       name_too_long: "Es gibt eine Einstellung mit einem zu langen Namen. Die maximale Länge beträgt 255 Zeichen."
       default_value_missing: "Einstellung `%{name}` hat keinen Standardwert."
       default_not_match_type: "Bei der Einstellung `%{name}` stimmt der Datentyp des Standardwerts nicht mit dem Datentyp der Einstellung überein."
@@ -289,6 +288,7 @@ de:
   pm_reached_recipients_limit: "Entschuldige, aber Du kannst nicht mehr als %{recipients_limit} Empfänger in einer Nachricht haben."
   removed_direct_reply_full_quotes: "Automatisch entferntes Zitat des gesamten vorherigen Beitrags."
   secure_upload_not_allowed_in_public_topic: "Entschuldigung, der/die folgende/n sichere Upload(s) konnte nicht in einem öffentlichen Thema verwendet werden: %{upload_filenames}."
+  create_pm_on_existing_topic: "Entschuldigung, du kannst keine PM für ein exisiterendes Thema erstellen."
   just_posted_that: "ist einer einer vor Kurzem von dir geschriebenen Nachricht zu ähnlich"
   invalid_characters: "enthält ungültige Zeichen"
   is_invalid: "scheint unklar, ist das ein ganzer Satz?"
@@ -332,7 +332,6 @@ de:
     reminders:
       at_desktop: "Nächstes mal wenn ich an meinem PC bin"
       later_today: "Im Laufe des Tages"
-      next_business_day: "Nächster Geschäftstag"
       tomorrow: "Morgen"
       next_week: "Nächste Woche"
       next_month: "Nächster Monat"
@@ -366,7 +365,6 @@ de:
       trust_level_4: "vertrauensstufe_4"
     request_membership_pm:
       title: "Mitgliedschaftsanfrage für @%{group_name}"
-      handle: "Mitgliedschaftsanfrage bearbeiten"
     view_hidden_topic_request_reason: "Ich möchte der Gruppe '%{group_name}' beitreten, damit ich auf [this topic](%{topic_url}) zugreifen kann"
   education:
     until_posts:
@@ -1052,6 +1050,7 @@ de:
       labels:
         level: Stufe
       description: "Anzahl von Benutzern nach Vertrauensstufe."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Benutzer nach Art"
       xaxis: "Art"
@@ -1244,7 +1243,6 @@ de:
   dashboard:
     rails_env_warning: "Dein Server läuft im %{env}-Modus."
     host_names_warning: "Deine config/database.yml-Datei verwendet localhost als Hostname. Trage hier den Hostnamen deiner Website ein."
-    gc_warning: 'Dein Server verwendet die Standardparameter für Rubys Garbage-Collector, die nicht optimal sind. Lese dieses Thema über Performanzeinstellungen (en): <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq läuft nicht. Viele Aufgaben, wie zum Beispiel das Versenden von E-Mails, werden asynchron durch Sidekiq ausgeführt. Bitte stell sicher, dass mindestens ein Sidekiq-Prozess läuft. <a href="https://github.com/mperham/sidekiq">Mehr über Sidekiq erfährst du hier (en)</a>.'
     queue_size_warning: "Eine hohe Anzahl an Aufgaben (%{queue_size}) befindet sich in der Warteschlange. Dies könnte auf ein Problem mit Sidekiq hinweisen oder du musst zusätzliche Sidekiq Worker starten."
     memory_warning: "Dein Server läuft mit weniger als 1 GB Hauptspeicher. Mindestens 1 GB Hauptspeicher werden empfohlen."
@@ -1355,8 +1353,6 @@ de:
     force_https: "Erzwinge HTTPS für deine Site. ACHTUNG: Aktiviere dies nicht, bevor HTTPS nicht vollständig eingerichtet ist und auf jeden Fall überall funktioniert! Hast du alle CDN-Netzwerke, alle Logins über Soziale Netzwerke, alle externe Logos / Abhängigkeiten geprüft, um sicherzustellen, dass sie auch alle HTTPS-kompatibel sind?"
     same_site_cookies: "Verwende Same-Site-Cookies, die alle Angriffsszenarien für Cross-Site-Request-Forgery in unterstützten Browsern verhindern. Warnung: Strikt wird nur auf Seiten funktionieren, die Login erzwingen und SSO verwenden."
     summary_score_threshold: "Mindestpunktzahl, die ein Beitrag benötigt, um in der \"Thema zusammenfassen\"-Ansicht zu erscheinen."
-    summary_posts_required: "Mindestanzahl an Beiträgen in einem Thema, bevor die \"Thema zusammenfassen\"-Funktion aktiviert wird."
-    summary_likes_required: "Mindestanzahl an Likes in einem Thema, bevor die \"Thema zusammenfassen\" Funktion aktiviert wird."
     summary_percent_filter: "Zeige die besten (n)% der Beiträge eines Themas in der \"Thema zusammenfassen\"-Ansicht."
     summary_max_results: "Maximale Anzahl der Beiträge bei 'Dieses Thema zusammenfassen'"
     enable_personal_messages: "Erlaube Benutzern mit der Vertrauensstufe 1 (konfigurierbar über die minimale Vertrauensstufe zum Senden von Nachrichten), Nachrichten zu erstellen und auf Nachrichten zu antworten. Beachte, dass das Team immer Nachrichten und Antworten senden kann."
@@ -1388,7 +1384,6 @@ de:
     markdown_typographer_quotation_marks: "Liste von doppelten und einzelnen Ausführungszeichen-Paaren für die Ersetzung"
     post_undo_action_window_mins: "Minuten, die ein Benutzer hat, um Aktionen auf einen Beitrag rückgängig zu machen (Gefällt mir, Meldung, usw.)."
     must_approve_users: "Alle neuen Benutzerkonten müssen von Mitarbeitern freigeschaltet werden, bevor sie Zugriff auf die Seite erhalten."
-    approve_suspect_users: "Team Mitglieder müssen alle verdächtigen Benutzerkonten genehmigen"
     pending_users_reminder_delay: "Benachrichtige die Moderatoren, falls neue Benutzer mehr als so viele Stunden auf ihre Genehmigung gewartet haben. Stelle -1 ein, um diese Benachrichtigungen zu deaktivieren."
     maximum_session_age: "Benutzer bleiben (n) Stunden nach ihrem letzten Besuch angemeldet"
     ga_universal_tracking_code: "Tracking Code ID von Google Universal Analytics (analytics.js), eg: UA-12345678-9; siehe <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1494,7 +1489,6 @@ de:
     discord_client_id: 'Discord Client ID (benötigst du eine? besuche<a href="https://discordapp.com/developers/applications/me">das Discord Entwickler Portal</a>)'
     discord_secret: "Discord geheimer Schlüssel"
     discord_trusted_guilds: 'Das Einloggen per Discord nur Mitgliedern dieser Discord Gilden gestatten. Verwende die numerische ID der Gilde. Lies die Anleitung <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">hier</a>, um mehr zu erfahren. Leer lassen um jede Gilde zuzulassen.'
-    readonly_mode_during_backup: "Nur-Lesen-Modus beim Erstellen einer Sicherung aktivieren"
     enable_backups: "Erlaube Administratoren, Backups des Forums zu erstellen"
     allow_restore: "Wiederherstellung von Sicherungen zulassen, die ALLE vorhandenen Daten überschreiben! Auf 'false' lassen, sofern Sie nicht planen, eine Sicherung wiederherzustellen."
     maximum_backups: "Die maximale Anzahl an Sicherungen, die auf dem Server gespeichert werden. Ältere Sicherungen werden automatisch gelöscht."
@@ -1502,7 +1496,7 @@ de:
     backup_frequency: "Die Anzahl von Tagen zwischen Backups."
     s3_backup_bucket: "Der entfernte Speicherort für Ihre Sicherungen. WARNUNG: Stellen Sie sicher, dass es sich um einen privaten Speicherort handelt."
     s3_endpoint: "Dieser Endpunkt kann so angepasst werden, dass er die Sicherung an einen S3-kompatiblen Service wie DigitalOcean Spaces oder Minio übertragt. WARNUNG: Verwende den Standard bei Verwendung von AWS S3."
-    s3_configure_tombstone_policy: "Aktiviere die automatische Löschregel für Grabstein-Uploads. WICHTIGT: Wenn deaktiviert, wird kein Speicherplatz freigegeben, wenn Uploads gelöscht werden."
+    s3_configure_tombstone_policy: "Aktiviere die automatische Löschregel für Grabstein-Uploads. WICHTIG: Wenn deaktiviert, wird kein Speicherplatz freigegeben, wenn Uploads gelöscht werden."
     s3_disable_cleanup: "Deaktiviere das Löschen von Backups aus S3 wenn sie lokal entfernt werden"
     enable_s3_inventory: "Erstelle Berichte und überprüfe Uploads mit Amazon S3-Bestand. WICHTIG: Benötigt gültige S3-Anmeldeinformationen (sowohl access_key_id als auch secret_access_key)."
     backup_time_of_day: "Uhrzeit in UTC, wenn Backups ausgeführt werden sollen."
@@ -1625,6 +1619,7 @@ de:
     desktop_category_page_style: "Visueller Stil für die /categories Seite"
     category_colors: "Liste hexadezimaler Farbwerte, die als Kategoriefarben erlaubt sind."
     category_style: "Visueller Stil für Kategorie-Abzeichen."
+    max_image_size_kb: "Die maximale Bild Upload Größe in kB. Sie muss in nginx (client_max_body_size) / Apache oder einem Proxy ebenfalls konfiguriert werden. Bilder, die größer als dieses Limit und kleiner als client_max_body_size sind werden in der Größe verändert, um für den Upload zu passen."
     max_attachment_size_kb: "Maximale Größe hochgeladener Dateianhänge in kB. Dieser Wert muss auch in Nginx (client_max_body_size), Apache oder anderen Proxies entsprechend konfiguriert werden."
     authorized_extensions: "Liste von erlaubten Dateiendungen für hochgeladene Dateien ('*' um alle Dateiendungen zu erlauben)"
     authorized_extensions_for_staff: "Eine Liste von erlaubten Dateiendungen für den Upload von Dateien durch Team-Benutzer, zusätzlich zu der in der Seiteninstellung `authorized_extensions` definierten Liste. (Der Wert „*“ erlaubt alle Dateitypen.)"
@@ -1811,7 +1806,6 @@ de:
     delete_drafts_older_than_n_days: "Lösche Entwürfe, die mehr als (n) Tage alt sind."
     bootstrap_mode_min_users: "Erforderliche Benutzeranzahl, um den Starthilfe-Modus zu deaktivieren (0 = ausgeschaltet)"
     prevent_anons_from_downloading_files: "Nichtangemeldeten Benutzern das Herunterladen von Anhängen verbieten. WARNUNG: dies verhindert auch das Herunterladen jeglicher Ressourcen für Website-Anpassungen, die als Anhänge gespeichert wurden."
-    secure_media: 'Beschränkt den Zugriff auf Medien-Uploads (Bilder, Videos, Audio). Falls "Login erforderlich" aktiviert ist, können nur angemeldete Benutzer auf Medien-Uploads zugreifen. Sonst wird der Zugriff nur für Medien-Uploads in privaten Nachrichten beschränkt. Hinweis. S3 Uploads müssen vor Aktivierung dieser Einstellung aktiviert sein.'
     slug_generation_method: "Gib eine Methode an, wie Kürzel in URLs generiert werden sollen. 'encoded' verwendet einen Prozent-Encodierten String, bei 'none' wird kein Kürzel verwendet."
     enable_emoji: "Aktiviere emoji"
     enable_emoji_shortcuts: "Geläufige Text-Smileys wie :) :p :( werden in Emojis umgewandelt"
@@ -1993,6 +1987,10 @@ de:
       other: "%{count} Beiträge wurden in eine existierende Nachricht verschoben: %{topic_link}"
   change_owner:
     post_revision_text: "Eigentümer übertragen."
+  publish_page:
+    slug_errors:
+      blank: "darf nicht leer sein"
+      invalid: "enthält ungültige Zeichen"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Diese Nachricht wurde automatisch geschlossen, nachde mdie maximale Anzahl von einer Antwort erreicht wurde."
@@ -2083,6 +2081,7 @@ de:
     second_factor_backup_description: "Bitte gib einen deiner Wiederherstellungs-Codes ein:"
     second_factor_backup_title: "Zwei-Faktor-Wiederherstellungs-Code"
     invalid_second_factor_code: "Ungültiger Authentifizierungscode. Jeder Code kann nur einmal benutzt werden."
+    invalid_security_key: "Ungültiger Sicherheitsschlüssel."
     second_factor_toggle:
       backup_code: "Benutze stattdessen einen Backup Code"
   admin:
@@ -2536,7 +2535,7 @@ de:
       date_invalid: "Kein Beitrag-Erstelldatum gefunden. Fehlt der E-Mail ein „Date:“-Header?"
     email_reject_post_too_short:
       title: "E-Mail Ablehnungsbeitrag zu kurz"
-      subject_template: "[%{email_prefix}] Email Problem -- Beitrag zu kurz"
+      subject_template: "[%{email_prefix}] E-Mail Problem -- Beitrag zu kurz"
       text_body_template: |
         Es tut uns leid aber Deine E-Mail Nachricht an %{destination} (betitelt mit %{former_title}) funktionierte nicht.
 
@@ -2970,7 +2969,6 @@ de:
       why: "Eine kurze Zusammenfassung von %{site_link} seit deinem letzten Besuch am %{last_seen_at}"
       since_last_visit: "Seit deinem letzten Besuch"
       new_topics: "Neue Themen"
-      unread_messages: "Ungelesene Nachrichten"
       unread_notifications: "Ungelesene Benachrichtigungen"
       liked_received: "Erhaltene Likes"
       new_users: "Neue Benutzer"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 8263d27680..40782e4934 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -211,6 +211,12 @@ el:
   too_late_to_edit: "Αυτή η ανάρτηση δημιουργήθηκε πολύ καιρό πριν. Δεν μπορεί πλέον να γίνει επεξεργασία της ή να διαγραφεί."
   revert_version_same: "Η τρέχουσα έκδοση είναι η ίδια με την έκδοση που προσπαθείς να επαναφέρεις."
   excerpt_image: "εικόνα"
+  bookmarks:
+    reminders:
+      later_today: "Αργότερα σήμερα"
+      tomorrow: "Αύριο"
+      next_week: "Την άλλη εβδομάδα"
+      next_month: "Τον άλλο μήνα"
   groups:
     errors:
       can_not_modify_automatic: "Δεν μπορείς να τροποποιήσεις μια αυτόματη ομάδα"
@@ -889,8 +895,6 @@ el:
     force_https: "Αναγκάζει το site σας να χρησιμοποιεί μόνο HTTPS. ΠΡΟΣΟΧΗ: Μην το ενεργοποιήσετε, μέχρι να επαληθεύσετε ότι το HTTPS είναι πλήρως εγκατεστημένο και λειτουργεί απολύτως παντού! Ελέγξατε το CDN σας, όλες τις κοινωνικές συνδέσεις και τα εξωτερικά σας λογότυπα / εξαρτήσεις για να βεβαιωθείτε ότι είναι όλα συμβατά με HTTPS;"
     same_site_cookies: "Χρησιμοποίηση των ίδιων cookies της σελίδας, το οποίο καταργεί όλα τα vectors Cross Site Request Forgery σε υποστηριζόμενους περιηγητές (Lax ή Strict). Προσοχή: Το Strict θα λειτουργήσει μόνο σε σελίδες που εξαναγκάζουν την σύνδεση και την χρήση SSO"
     summary_score_threshold: "Η ελάχιστη βαθμολογία που απαιτείται από μια ανάρτηση για να συμπεριληφθεί στο «Συνοψίστε αυτό το θέμα»"
-    summary_posts_required: "Ελάχιστες αναρτήσεις σε ένα νήμα πριν το «Συνοψίστε αυτό το θέμα» ενεργοποιηθεί"
-    summary_likes_required: "Ελάχιστος αριθμός ''Μου αρέσει'' σε ένα θέμα πριν ενεργοποιηθεί το «Συνοψίστε αυτό το θέμα» "
     summary_percent_filter: "Όταν ο χρήστης επιλέξει «Συνοψίστε αυτό το θέμα», δείξε το κορυφαίο % των αναρτήσεων"
     enable_personal_messages: "Επίτρεψε στους χρήστες επιπέδου εμπιστοσύνης 1 (ρυθμιζόμενο μέσω min trust level to send messages) να δημιουργήσουν μηνύματα και να απαντήσουν σε μηνύματα. Σημειώστε ότι οι συνεργάτες μπορούν πάντα να στέλνουν μηνύματα."
     enable_long_polling: "Η αρτηρία μηνυμάτων που χρησιμοποιείτε για ειδοποιήσεις μπορεί να χρησιμοποιήσει μακρυά μέθοδο εξέτασης."
@@ -967,7 +971,6 @@ el:
     enable_instagram_logins: "Ενεργοποίησε την επαλήθευση μέσω Instagram, απαιτεί instagram_consumer_key και instagram_consumer_secret"
     instagram_consumer_key: "Consumer key για επαλήθευση μέσω Instagram"
     instagram_consumer_secret: "Consumer secret για επαλήθευση μέσω Instagram"
-    readonly_mode_during_backup: "Ενεργοποίηση της λειτουργίας \"μόνο-ανάγνωση\" κατά τη διάρκεια δημιουργίας αντίγραφου ασφαλείας"
     allow_restore: "Επίτρεψε επαναφορά, η οποία μπορεί να αντικαταστήσει ΟΛΑ τα δεδομένα του ιστότοπου! Αφήστε απενεργοποιημένο, εκτός αν σχεδιάζετε να επαναφέρετε αντίγραφο ασφαλείας"
     maximum_backups: "Το μέγιστο ποσό αντιγράφων ασφαλείας το οποία θα διατηρηθούν στο δίσκο. Παλαιότερα αντίγραφα ασφαλείας διαγράφονται αυτόματα"
     automatic_backups_enabled: "Πάρε αυτόματα αντίγραφα ασφαλείας όπως ορίζεται στη συχνότητα αντιγράφων ασφαλείας"
@@ -1304,6 +1307,10 @@ el:
     errors:
       different_topics: "Δημοσιεύσεις που ανήκουν σε διαφορετικά νήματα δεν μπορούν να συγχωνευθούν."
       different_users: "Δημοσιεύσεις που ανήκουν σε διαφορετικούς χρήστες δεν μπορούν να συγχωνευθούν."
+  publish_page:
+    slug_errors:
+      blank: "δεν μπορεί να είναι άδειο"
+      invalid: "περιέχει μη έγκυρους χαρακτήρες"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Αυτό το μήνυμα έκλεισε αυτόματα αφού έφτασε το μέγιστο όριο της %{count} απάντησης."
@@ -2012,7 +2019,6 @@ el:
       why: "Μια σύντομη σύνοψη του %{site_link} από την τελευταία σου επίσκεψη στις %{last_seen_at}"
       since_last_visit: "Από την τελευταία σου επίσκεψη"
       new_topics: "Νέα Νήματα"
-      unread_messages: "Αδιάβαστα Μηνύματα"
       unread_notifications: "Αδιάβαστες Ειδοποιήσεις"
       liked_received: "Ληφθέντα \"Μου αρέσει\""
       new_users: "Νέοι Χρήστες"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 9f545d92eb..8501b266d8 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -47,6 +47,7 @@ es:
       generic: Se produjo un error al importar ese tema
       about_json: "Error de importación: about.json no existe, o es inválido"
       about_json_values: "about.json contiene valores inválidos: %{errors}"
+      modifier_values: "los modificadores about.json contienen valores inválidos: %{errors}"
       git: "Error al clonar el repositorio git, se deniega el acceso o no se encuentra el repositorio"
       unpack_failed: "Error al descomprimir el archivo"
       file_too_big: "El archivo sin comprimir es demasiado grande."
@@ -59,7 +60,6 @@ es:
       optimized_link: Los enlaces de imagen optimizados son efímeros y no deben incluirse en el código fuente del tema.
     settings_errors:
       invalid_yaml: "El YAML provisto es inválido."
-      data_type_not_a_number: "El tipo de ajuste «%{name}» no está soportado. Los tipos soportados son: «integer», «bool», «list» y «enum»"
       name_too_long: "Hay un ajuste con un nombre muy largo. La cantidad máxima de caracteres es 255"
       default_value_missing: "El ajuste «%{name}» no tiene valor por defecto"
       default_not_match_type: "El tipo de valor por defecto para el ajuste «%{name}» no coincide con el tipo de ajuste."
@@ -289,6 +289,7 @@ es:
   pm_reached_recipients_limit: "Lo sentimos, no puedes tener más de %{recipients_limit} destinatarios en un mensaje."
   removed_direct_reply_full_quotes: "Cita de toda la publicación anterior eliminada automáticamente."
   secure_upload_not_allowed_in_public_topic: "Lo sentimos, la(s) siguiente(s) subida(s) no se pueden utilizar en un tema público: %{upload_filenames}."
+  create_pm_on_existing_topic: "Lo sentimos, no puedes crear un mensaje privado en un tema existente."
   just_posted_that: "es demasiado parecido a lo que has publicado recientemente"
   invalid_characters: "contiene caracteres inválidos"
   is_invalid: "parece poco claro, ¿es una oración completa?"
@@ -328,14 +329,15 @@ es:
   bookmarks:
     errors:
       already_bookmarked_post: "No puedes guardar la misma publicación en marcadores dos veces."
+      cannot_set_past_reminder: "No puedes establecer un recordatorio de marcador en el pasado."
+      cannot_set_reminder_in_distant_future: "No puedes establecer un recordatorio de marcador más de 10 años en el futuro."
       time_must_be_provided: "se debe especificar la hora para todos los recordatorios excepto '%{reminder_type}'"
     reminders:
       at_desktop: "La próxima vez que esté en mi ordenador"
-      later_today: "Más tarde hoy"
-      next_business_day: "El próximo día hábil"
+      later_today: "Más tarde durante el día de hoy"
       tomorrow: "Mañana"
-      next_week: "La próxima semana"
-      next_month: "El mes que viene"
+      next_week: "Próxima semana"
+      next_month: "Próximo mes"
       custom: "Fecha y hora personalizadas"
   groups:
     success:
@@ -366,7 +368,6 @@ es:
       trust_level_4: "nivel_de_confianza_4"
     request_membership_pm:
       title: "Solicitud de membresía para @%{group_name}"
-      handle: "atender solicitud de membresía"
     view_hidden_topic_request_reason: "Me gustaría unirme al grupo «%{group_name}» para poder acceder a [este tema](%{topic_url})"
   education:
     until_posts:
@@ -476,6 +477,10 @@ es:
               same_as_password: "es igual a tu contraseña."
             ip_address:
               signup_not_allowed: "No se permite el registro desde esta cuenta."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Este tema no puede ser destacado en tu perfil."
         user_email:
           attributes:
             user_id:
@@ -1072,6 +1077,7 @@ es:
       labels:
         level: Nivel
       description: "Número de usuarios agrupados por nivel de confianza."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Usuarios por tipos"
       xaxis: "Tipo"
@@ -1264,7 +1270,6 @@ es:
   dashboard:
     rails_env_warning: "Tu servidor está funcionando en modo de %{env}."
     host_names_warning: "Tu archivo config/database.yml está utilizando el hostname localhost predeterminado. Actualízalo para usar el hostname de tu sitio."
-    gc_warning: 'Tu servidor está usando los parámetros predeterminados de ruby para la recolección de residuos, lo cual no te proveerá el mejor rendimiento. Lee este tema sobre la optimización del rendimiento: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Optimización de Ruby and Rails para Discourse</a>.'
     sidekiq_warning: 'Sidekiq no está funcionando. Muchas tareas, tal como el envío de correos electrónicos, están siendo realizadas desincronizadamente por sidekiq. Por favor, asegúrate de que por lo menos un proceso de sidekiq está funcionando. <a href="https://github.com/mperham/sidekiq" target="_blank">Aprende sobre Sidekiq aquí</a>.'
     queue_size_warning: "El número de tareas en cola es %{queue_size}, que es una cifra alta. Esto podría indicar un problema en el proceso (o procesos) de Sidekiq, o tal vez deberías añadir más trabajadores de Sidekiq."
     memory_warning: "Tu servidor está funcionando con menos de 1 GB de memoria total. Se recomienda una memoria de al menos 1 GB de capacidad."
@@ -1375,8 +1380,6 @@ es:
     force_https: "Forzar al sitio a utilizar solo HTTPS. AVISO: ¡NO actives esta opción a menos que verifiques completamente la configuración y funcione correctamente en todas partes! ¿Has verificado también que el CDN, los inicios de sesión a través de redes sociales y cualquier logo externo / dependencia son compatibles con HTTPS?"
     same_site_cookies: "Usar las mismas cookies del sitio, ellos eliminan todos los vectores CSRF (falsificación de petición en sitios cruzados) de los navegadores soportados (Lax o Strict). Advertencia: Strict solo funcionará en sitios que forcen el inicio de sesión y usen SSO. "
     summary_score_threshold: "La puntuación mínima requerida para que una publicación se incluya en el «resumen de este tema»"
-    summary_posts_required: "Cantidad mínima de publicaciones en un tema para habilitar el «resumen de este tema»"
-    summary_likes_required: "Cantidad mínina de me gusta en un tema para habilitar «resumen de este tema»"
     summary_percent_filter: "Cuando un usuario hace clic en «resumen de este tema», mostrar el % de las publicaciones destacadas"
     summary_max_results: "Cantidad máxima de publicaciones devueltas en «resumen de este tema»"
     enable_personal_messages: "Permitir a los usuarios con nivel de confianza 1 (configurable a través del mínimo nivel de confianza para enviar mensajes) crear mensajes y responder a ellos. Ten en cuenta que el staff siempre puede enviar mensajes pase lo que pase."
@@ -1408,7 +1411,8 @@ es:
     markdown_typographer_quotation_marks: "Lista de pares de reemplazo de comillas dobles y simples"
     post_undo_action_window_mins: "Número de minutos durante los cuales los usuarios pueden deshacer sus acciones recientes en una publicación (me gusta, reportes, etc)."
     must_approve_users: "El staff debe aprobar todas las cuentas nuevas antes de que se les permita acceder al sitio."
-    approve_suspect_users: "El staff debe aprobar todas las cuentas sospechosas"
+    invite_code: "El usuario debe ingresar este código para que se le permita el registro de la cuenta, ignorado cuando está vacío (no distingue entre mayúsculas y minúsculas)"
+    approve_suspect_users: "Agregar usuarios sospechosos a la lista por revisión. Los usuarios sospechosos que hayan ingresado una biografía/página web pero que no hayan registrado ninguna actividad de lectura."
     pending_users_reminder_delay: "Notificar a los moderadores si hay usuarios nuevos que hayan estado esperando aprobación durante más de esta cantidad de horas. Usa -1 para desactivar estas notificaciones."
     maximum_session_age: "El usuario permanecerá con su sesión iniciada n horas desde su última visita"
     ga_universal_tracking_code: "Código de seguimiento de Google Universal Analytics (analytics.js), ejemplo: UA-12345678-9; visita <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1514,7 +1518,6 @@ es:
     discord_client_id: 'ID de cliente de Discord (¿necesitas una? visita <a href="https://discordapp.com/developers/applications/me">el portal del desarrollador</a>)'
     discord_secret: "Clave secreta de Discord"
     discord_trusted_guilds: 'Solo permitir a los miembros de estos clanes de Discord conectarse mediante Discord. Utiliza la ID numérica del clan. Para más información, revisa las instrucciones <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">aquí</a>. Dejar en blanco para permitir todos los clanes.'
-    readonly_mode_during_backup: "Habilitar el modo de solo lectura mientras se crea un respaldo"
     enable_backups: "Permitir a los administradores crear respaldos del foro"
     allow_restore: "Permitir restaurar, ¡lo cual puede remplazar TODOS los datos del sitio! Dejar en falso a menos de que tengas planeado recuperar los datos desde una copia de respaldo. "
     maximum_backups: "La cantidad máxima de copias de respaldo que se mantendrán en el disco. Las copias de respaldo más antiguas se eliminan automáticamente"
@@ -1645,11 +1648,13 @@ es:
     desktop_category_page_style: "Estilo visual de la página de /categorías."
     category_colors: "Una lista de valores en hexadecimal de los colores para las categorías."
     category_style: "Estilo visual de las etiquetas de categoría."
+    max_image_size_kb: "El tamaño máximo que puede tener una imagen que se subirá en kB. Esto se tiene que configurar en nginx (client_max_body_size) / apache o proxy también. Las imágenes con un tamaño mayor que este y menores que el client_max_body_size sufrirán una adaptación de tamaño para ajustarse al tamaño de subida."
     max_attachment_size_kb: "El tamaño máximo, en kB, de los archivos que se pueden adjuntar. Debe ser configurado también en nginx (client_max_body_size) / apache o proxy."
     authorized_extensions: "Una lista de las extensiones de archivo que se permite subir (usa «*» para habilitar todos los tipos de archivo)"
     authorized_extensions_for_staff: "Una lista de las extensiones de archivo que se le permite subir a miembros del staff sumada a la lista definida en la configuración `authorized_extensions`. (Usa «*» para habilitar todos los tipos)"
     theme_authorized_extensions: "Una lista de las extensiones de archivo que se permite subir (usa «*» para habilitar todos los tipos)"
     max_similar_results: "Cantidad de temas similares que se muestran encima del editor cuando se está creando un nuevo tema. La comparación se basa en el título y el cuerpo del tema."
+    max_image_megapixels: "Número máximo de megapíxeles permitidos para una imagen. Las imágenes con un numero de megapíxeles mayor que este se rechazarán."
     title_prettify: "Prevenir errores comunes en el título, incluidos los títulos escritos todo mayúsculas, con la primera letra en minúscula, con múltiples signos ! o ?, . adicional al final, etc."
     title_remove_extraneous_space: "Eliminar los espacios en blanco delante de la puntuación final."
     automatic_topic_heat_values: 'Actualizar automáticamente la configuración de «temperatura de vistas del tema» y «temperatura de me gusta de publicaciones del tema» según la actividad del sitio.'
@@ -1689,6 +1694,8 @@ es:
     reviewable_claiming: "¿Es necesario reclamar el contenido revisable antes de poder actuar sobre el mismo?"
     reviewable_default_topics: "Mostrar contenido revisable agrupado por tema por defecto"
     reviewable_default_visibility: "No muestre elementos revisables a menos que cumplan con esta prioridad"
+    high_trust_flaggers_auto_hide_posts: "Las publicaciones de los usuarios nuevos se esconden automáticamente tras ser marcadas como spam por un usuario con NC3 o superior"
+    cooldown_hours_until_reflag: "Cantidad de tiempo que los usuarios deberán esperar antes de poder reportar de nuevo una publicación."
     reply_by_email_enabled: "Habilitar la respuesta a temas por correo electrónico."
     reply_by_email_address: "Plantilla para la dirección de correo electrónico que aparecerá al recibir correos con la función de respuesta por correo electrónico: %%{reply_key}@respuesta.ejemplo.com o respuestas+%%{reply_key}@ejemplo.com"
     alternative_reply_by_email_addresses: "Lista de plantillas alternativa para las direcciones de respuesta por correo electrónico. Ejemplo: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
@@ -1783,7 +1790,9 @@ es:
     ignored_users_count_message_threshold: "Notificar a los moderadores si un usuario en particular es ignorado este número de veces por otros usuarios."
     ignored_users_message_gap_days: "Tiempo que se espera antes de notificar a los moderadores de nuevo sobre un usuario que ha sido ignorado por muchos otros."
     clean_up_inactive_users_after_days: "Número de días antes de que se elimine un usuario inactivo (nivel de confianza 0 sin publicaciones). Para desactivar la limpieza, configure en 0."
+    clean_up_unused_staged_users_after_days: "Cantidad de días antes de que un usuario temporal (sin ninguna publicación) sea eliminado. Para inhabilitar esta limpieza de usuarios, establece el valor en 0."
     user_selected_primary_groups: "Permitir a los usuarios establecer su propio grupo primario"
+    max_notifications_per_user: "Cantidad máxima de notificaciones por usuario. Si se supera este número, las notificaciones antiguas se eliminarán. Aplicado semanalmente. Establece el valor en 0 para inhabilitar."
     user_website_domains_whitelist: "El sitio web del usuario será verificado con estos dominios. Lista delimitada por barras."
     allow_profile_backgrounds: "Permitir a los usuarios subir fondos de perfil."
     sequential_replies_threshold: "Número de mensajes seguidos que un usuario tiene que publicar antes de que se le recuerde que son demasiadas respuestas consecutivas."
@@ -1820,6 +1829,7 @@ es:
     highlighted_languages: "Reglas de resaltado de sintaxis incluidas. (Aviso: incluir demasiados lenguajes puede afectar al rendimiento) Ver: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> para un demo."
     embed_any_origin: "Permitir la inserción de contenido sin importar su origen. Esto se requiere para aplicaciones móviles con HTML estático."
     embed_topics_list: "Soportar la inserción HTML de listas de temas"
+    embed_set_canonical_url: "Establece la URL canónica para los temas insertados en la URL de los contenidos insertados."
     embed_truncate: "Truncar las publicaciones insertadas."
     embed_support_markdown: "Soporte de formato Markdown para publicaciones incrustadas."
     embed_whitelist_selector: "Lista separada por comas de elementos CSS que están permitidos en las inserciones."
@@ -1831,7 +1841,7 @@ es:
     delete_drafts_older_than_n_days: "Eliminar borradores de más de (n) días de antigüedad."
     bootstrap_mode_min_users: "Número mínimo de usuarios requerido para desactivar el modo bootstrap (establece en 0 para desactivar esta opción)"
     prevent_anons_from_downloading_files: "Impedir que los usuarios anónimos descarguen archivos. ADVERTENCIA: Esto impedirá que funcione cualquier recurso del sitio publicado como adjunto que no sea una imagen."
-    secure_media: 'Limita el acceso a los medios subidos (imágenes, video, audio). Si está habilitado «inicio de sesión requerido», solo los usuarios que hayan iniciado sesión pueden acceder a los medios subidos. En caso contrario, se limitará el acceso únicamente a los medios subidos en mensajes privados. Nota: se deben habilitar las subidas S3 antes de poder habilitar esta configuración.'
+    secure_media: 'Limita el acceso a los medios subidos (imágenes, video, audio). Si está habilitado «inicio de sesión requerido», solo los usuarios que hayan iniciado sesión pueden acceder a los medios subidos. En caso contrario, se limitará el acceso únicamente a los medios subidos en mensajes privados. ADVERTENCIA: se deben habilitar las subidas S3 antes de poder habilitar esta configuración. Ver <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">the secure media topic on Meta</a> para más detalles.'
     slug_generation_method: "Elegir un método de generación de slug. «encoded» generará cadenas con código porcentual. «none» deshabilitará completamente el slug."
     enable_emoji: "Habilitar emoji"
     enable_emoji_shortcuts: "Texto común de emoticones como :) :p :( se convertirán a emojis"
@@ -1914,6 +1924,9 @@ es:
     push_notifications_icon: "El icono de la medalla que aparece en la esquina de notificación. El tamaño requerido es de 96 × 96."
     short_title: "El título corto se utilizará en la pantalla de inicio del usuario, el iniciador u otros lugares donde el espacio puede ser limitado. Debe limitarse a 12 caracteres."
     dashboard_general_tab_activity_metrics: "Selecciona los reportes que se muestran como medidas de actividad en la pestaña general."
+    gravatar_name: "Nombre del proveedor de Gravatar"
+    gravatar_base_url: "URL de la API base del proveedor de Gravatar"
+    gravatar_login_url: "URL relativa a gravatar_base_url, la cual provee al usuario el acceso al servicio de Gravatar"
     errors:
       invalid_email: "Dirección de correo electrónico inválida. "
       invalid_username: "No existe ningún usuario con ese nombre de usuario. "
@@ -2013,6 +2026,10 @@ es:
       other: "%{count} publicaciones han sido unidas a un mensaje existente: %{topic_link}"
   change_owner:
     post_revision_text: "Se ha transferido la propiedad"
+  publish_page:
+    slug_errors:
+      blank: "no puede dejarse en blanco"
+      invalid: "contiene caracteres inválidos"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Este mensaje fue cerrado automáticamente al alcanzar el límite máximo de %{count} respuesta."
@@ -2095,6 +2112,7 @@ es:
     new_registrations_disabled: "El registro de nuevas cuentas no está permitido en este momento."
     password_too_long: "Las contraseñas están limitadas a 200 caracteres."
     email_too_long: "El correo electrónico que has proporcionado es demasiado largo. Las direcciones de correo no deben tener más de 254 caracteres y los nombres de dominio no más de 253."
+    wrong_invite_code: "El código de invitación que ingresaste es incorrecto."
     reserved_username: "Ese nombre de usuario no está permitido."
     missing_user_field: "No has completado todos los campos de usuario"
     auth_complete: "Autenticación completa."
@@ -2106,6 +2124,8 @@ es:
     second_factor_backup_title: "Código de respaldo de verificación en dos pasos"
     invalid_second_factor_code: "Código de autentificación inválido. Cada código se puede usar solo una vez."
     invalid_security_key: "Clave de seguridad inválida."
+    missing_second_factor_name: "Por favor, introduce un nombre."
+    missing_second_factor_code: "Por favor, introduce un código."
     second_factor_toggle:
       totp: "Usar una aplicación de autenticación o una llave de seguridad en su lugar"
       backup_code: "Usar un código de respaldo en su lugar"
@@ -3126,7 +3146,6 @@ es:
       why: "Un breve resumen de %{site_link} desde tu última visita el %{last_seen_at}"
       since_last_visit: "Desde tu última visita"
       new_topics: "Temas nuevos"
-      unread_messages: "Mensajes no leídos"
       unread_notifications: "Notificaciones no leídas"
       liked_received: "Me gusta recibidos"
       new_users: "Usuarios nuevos"
@@ -3298,6 +3317,7 @@ es:
     file_missing: "Lo sentimos, debes incluir un archivo para subir."
     empty: "Disculpa, el archivo que proporcionaste está vacío."
     png_to_jpg_conversion_failure_message: "Ha ocurrido un error cuando se convertía desde PNG a JPG."
+    optimize_failure_message: "Se produjo un error al optimizar la imagen cargada."
     attachments:
       too_large: "Lo sentimos, el archivo que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB)."
     images:
@@ -3333,6 +3353,7 @@ es:
     sender_body_blank: "el cuerpo está en blanco"
     sender_post_deleted: "La publicación fue eliminada"
     sender_message_to_invalid: "el destinatario tiene una dirección de correo electrónico inválida"
+    sender_topic_deleted: "el tema fue eliminado"
   color_schemes:
     base_theme_name: "Base"
     light: "Claro"
@@ -4204,7 +4225,7 @@ es:
       invite_only: "Todos los usuarios nuevos deben ser invitados. Consulta `invite_only`."
       email_auth_res_enqueue: "Este correo falló la comprobación DMARC, por lo que seguramente no es de quien parece ser. Comprueba los encabezados del correo para más información."
       email_spam: "Este correo se marcó como spam por el encabezado definido en `email_in_spam_header`."
-      suspect_user: "Los usuarios en la lista de sospechosos deben ser examinados por el staff. Ver `approve_suspect_users`."
+      suspect_user: "Este usuario nuevo ingresó información de perfil sin haber leído ningún tema o publicación, lo cual sugiere claramente que podría tratarse de un spammer. Revisa `approve_suspect_users`."
     actions:
       agree:
         title: "Concordar..."
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index f2ccd29c5d..279d2554e4 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -193,6 +193,12 @@ et:
   too_late_to_edit: "Postitus loodi kaua aega tagasi. Seda ei saa enam muuta ega kustutada."
   revert_version_same: "Praegune versioon on sama sellega, millele sa püüad tagasi pöörduda."
   excerpt_image: "pilt"
+  bookmarks:
+    reminders:
+      later_today: "Täna hiljem"
+      tomorrow: "Homme"
+      next_week: "Järgmisel nädalal"
+      next_month: "Järgmisel kuul"
   groups:
     errors:
       can_not_modify_automatic: "Autommatset gruppi ei saa muuta"
@@ -785,6 +791,10 @@ et:
   most_posts: "Enamus postitusi"
   most_recent_poster: "Viimane postitaja"
   frequent_poster: "Tihedam postitaja"
+  publish_page:
+    slug_errors:
+      blank: "ei saa olla tühi"
+      invalid: "sisaldab ebasobivaid tähemärke"
   login:
     not_approved: "Kontot pole veel kinnitatud. Teid teavitatakse e-post teel, kui sisselogimine on võimaldatud."
     admin_not_allowed_from_ip_address: "Sellelt IP-aadressilt ei saa adminnina sisse logida."
@@ -834,7 +844,6 @@ et:
         %{message}
     digest:
       new_topics: "Uued teemad"
-      unread_messages: "Lugemata sõnumid"
       unread_notifications: "Lugemata teavitused"
       liked_received: "Meeldimisi saadud"
       new_users: "Uued kasutajad"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index d957ab034e..2702deab2b 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -222,11 +222,10 @@ fa_IR:
   bookmarks:
     reminders:
       at_desktop: "بار آینده من پشت میزم هستم"
-      later_today: "امروز کمی بعد"
-      next_business_day: "روز کاری آینده"
+      later_today: "امروز"
       tomorrow: "فردا"
-      next_week: "هفته ی آینده"
-      next_month: "ماه آینده"
+      next_week: "هفته بعد"
+      next_month: "ماه بعد"
       custom: "درج تاریخ و ساعت"
   groups:
     errors:
@@ -889,8 +888,6 @@ fa_IR:
     force_https: "اجبار به استفاده از HTTPS ، تا زمانی که HTTPS را کامل تنظیم نکرده‌اید این گزینه را فعال نکنید. آیا تمام CDN ها و شبکه‌های اجتماعی جهت ورود را بررسی کردید و تمام لوگو‌ها و وابستگی‌ها بدون مشکل با HTTPS کار می‌کنند؟"
     same_site_cookies: "استفاده از همان کوکی ها، آن‌ها از تمام درخواست های vector cross site جلوگیری می‌کنند(Lax یا Strict). توجه: این کار سختگیرانه فقط در سایت‌هایی که ورود اجباری دارند و از SSO استفاده می‌کنند قابل استفاده است."
     summary_score_threshold: "حداقل امتیاز برای یک نوشته که بتواند شامل \" خلاصه این موضوع\" شود"
-    summary_posts_required: "حداقل نوشته‌ها در این جستار قبل از اینکه \" خلاصه این موضوع\" فعال شود"
-    summary_likes_required: "حداقل پسندها در این جستار قبل از اینکه \" خلاصه این موضوع\" فعال شود"
     summary_percent_filter: "وقتی کاربر بر روی ' خلاصه این موضوع' کلیک کرد٬‌ % بهترین نوشته‌ها را نشان بده"
     enable_personal_messages: "اجازه ارسال پیام به کاربران سطح اعتماد 1 (قابل تنظیم با حداقل سطح اعتماد برای ارسال پیام). توجه کنید که همکاران در هر شرایطی می‌توانند پیام ارسال کنند."
     enable_long_polling: "message bus استفاده شده برای آگاه سازی می تواند برای رای گیری طولانی استفاده شود. "
@@ -960,7 +957,6 @@ fa_IR:
     enable_instagram_logins: "فعالسازی ورود با اینستاگرام، نیازمند \ninstagram_consumer_key and instagram_consumer_secret"
     instagram_consumer_key: "Consumer key اینستاگرام"
     instagram_consumer_secret: "Consumer secret اینستاگرام"
-    readonly_mode_during_backup: "فعالسازی حالت فقط خواندنی برای گرفتن نسخه پشتیبان"
     allow_restore: "اجازه بازیابی بده، که می‌تواند تمام اطلاعات سایت را جایگزین کند! نادرست را رها کن مگر اینکه قصد بازیابی نسخه پشتیبان را داری "
     maximum_backups: "حداکثر تعداد پشتیبان برای نگه داری بر روی دیسک. نسخه های پشتیبان قدیمی بطور خودکار پاک شده است"
     automatic_backups_enabled: "فعالسازی پشتیبان‌گیری خودکار در بازه زمانی مشخص"
@@ -1290,6 +1286,10 @@ fa_IR:
     existing_topic_moderator_post:
       one: "یک نوشته به مبحث موجود منتقل شد: %{topic_link}"
       other: "%{count} نوشته به مبحث موجود منتقل شد: %{topic_link}"
+  publish_page:
+    slug_errors:
+      blank: "نمی‌تواند خالی باشد"
+      invalid: "شامل نویسه‌های نامعتبر است"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "این پیام بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد."
@@ -1842,7 +1842,6 @@ fa_IR:
       why: "یک گزارش کوتاه از %{site_link} از آخرین باری که بازدید کردید در %{last_seen_at}"
       since_last_visit: "از آخرین بازدید شما"
       new_topics: "موضوعات جدید"
-      unread_messages: "پیام‌های خوانده نشده"
       unread_notifications: "اطلاعیه‌های خوانده نشده"
       liked_received: "پسند‌های دریافت شده"
       new_users: "کاربران جدید"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 875c63ffc0..6b68d7c0a9 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -59,7 +59,6 @@ fi:
       optimized_link: Optimoidut kuvalinkit ovat lyhytikäisiä eikä niitä tulisi sisällyttää teeman lähdekoodiin.
     settings_errors:
       invalid_yaml: "Annettu YAML ei kelpaa"
-      data_type_not_a_number: "Ei voi asettaa tietotyypiksi %{name}. Tuettuja tyyppejä ovat integer, blool, list ja enum."
       name_too_long: "Jollain asetuksella on liian pitkä nimi. Enimmäispituus on 255."
       default_value_missing: "Asetuksella \"%{name}\" ei ole oletusarvoa"
       default_not_match_type: "Asetuksen \"%{name}\" oletusarvo ei sovi asetuksen tyyppiin."
@@ -328,10 +327,12 @@ fi:
   bookmarks:
     errors:
       already_bookmarked_post: "Samaa viestiä ei voi kirjanmerkitä kahdesti."
+      cannot_set_past_reminder: "Kirjanmerkkimuistutusta ei voi asettaa menneisyyteen."
+      cannot_set_reminder_in_distant_future: "Kirjanmerkkimuistutusta ei voi asettaa yli 10 vuoden päähän tulevaisuuteen."
       time_must_be_provided: "kaikkiin muistutuksiin paitsi '%{reminder_type}' tarvitaan aika"
     reminders:
       at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
-      later_today: "Myöhemmin tänään "
+      later_today: "Myöhemmin tänään"
       next_business_day: "Seuraavana arkipäivänä"
       tomorrow: "Huomenna"
       next_week: "Ensi viikolla"
@@ -366,7 +367,6 @@ fi:
       trust_level_4: "luottamustaso_4"
     request_membership_pm:
       title: "Jäsenhakemus ryhmään @%{group_name}"
-      handle: "käsittele jäsenyyshakemus"
     view_hidden_topic_request_reason: "Haluaisin liittyä ryhmään '%{group_name}', jotta pääsen [tähän ketjuun](%{topic_url})"
   education:
     until_posts:
@@ -1072,6 +1072,7 @@ fi:
       labels:
         level: Taso
       description: "Kuinka monta käyttäjää on milläkin luottamustasolla."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Käyttäjät tyypeittäin"
       xaxis: "Tyyppi"
@@ -1264,7 +1265,6 @@ fi:
   dashboard:
     rails_env_warning: "Palvelintasi ajetaan %{env} moodissa."
     host_names_warning: "Sivuston config/database.yml tiedosto käyttää oletusisäntänimeä. Päivitä se käyttämään sivuston isäntänimeä."
-    gc_warning: 'Palvelimesi käyttää Rubyn oletuksia roskienkeräyksessä, mikä ei tarjoa parasta mahdollista suorituskykyä. Tässä ketjussa on suorituskyvyn optimoisesta: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq ei ole käynnissä. Monet tehtävät, kuten sähköpostien lähettäminen, suoritetaan asynkronisesti sidekiqin avulla. Varmista, että vähintään yksi sidekiq prosessi on käynnissä. <a href="https://github.com/mperham/sidekiq" target="_blank">Opiskele lisää Sidekiqista täältä</a>.'
     queue_size_warning: "Jonossa olevien tehtävien määrä on %{queue_size}, joka on korkea. Tämä voi olla merkki ongelmista Sidekiq prosess(e)issa tai sinun voi täytyä lisätä Sidekiq workerien määrää."
     memory_warning: "Palvelimella on alle 1GB muistia. Vähintään 1 GB muistia on suositeltavaa."
@@ -1372,8 +1372,6 @@ fi:
     enforce_second_factor: "Pakottaa käyttäjiä ottamaan kaksivaiheisen tunnistautumisen käyttöön. Voit pakottaa sen kaikille valitsemalla \"kaikki\". Vaihtoehto \"henkilökunta\" pakottaa sen vain henkilökunnalle."
     force_https: "Pakota sivusto käyttämään vain HTTPS:ää. VAROITUS: älä ota tätä käyttöön ennen kuin HTTPS on täysin käytössä ja toimii täysin kaikkialla! Tarkastitko käyttämäsi CDN, kaikki sosiaaliset kirjautumiset ja kaikki ulkoiset logot / muut riippuvuudet ovat myös HTTPS-yhteensopivia?"
     summary_score_threshold: "Viestin minimipistemäärä, jotta se näytetään ketjun tiivistelmässä."
-    summary_posts_required: "Montako viestiä ketjussa täytyy olla, jotta ketjun tiivistelmä otetaan käyttöön"
-    summary_likes_required: "Montako tykkäystä ketjussa pitää olla, jotta ketjun tiivistelmä otetaan käyttöön"
     summary_percent_filter: "Kun käyttäjä klikkaa 'Näytä ketjun tiivistelmä', näytä paras % viesteistä"
     summary_max_results: "Maksimimäärä viestejä, jotka näytetään ketjun tiivistelmässä"
     enable_personal_messages: "Salli luottamustason 1 saavuttaneiden käyttäjien (\"min trust level to send messages\" on säädettävissä) lähettää yksityisviestejä ja vastata niihin. Huomioi, että henkilökunta voi aina lähettää yksityisviestejä."
@@ -1506,7 +1504,6 @@ fi:
     discord_client_id: 'Discordin Client ID (Tarvitsetko? Käy Discordin <a href="https://discordapp.com/developers/applications/me">kehittäjäportaalissa</a>)'
     discord_secret: "Discordin Secret Key"
     discord_trusted_guilds: 'Salli vain näiden Discord-kiltojen jäsenten kirjautua Discordin avulla. Käytä killan numeerista ID:tä. Jos tarvitset lisätietoa, ohjeet löytyy <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">täältä</a>. Jätä tyhjäksi, jos et halua rajoittaa killan perusteella.'
-    readonly_mode_during_backup: "Ota käyttöön vain luku -tila, kun otetaan varmuuskopiota"
     enable_backups: "Salli ylläpitäjien tehdä varmuuskopioita palstasta"
     allow_restore: "Salli palautus, joka korvaa KAIKEN sivuston datan! Jätä valitsematta, jos et aio palauttaa sivuston varmuuskopiota"
     maximum_backups: "Tallennettuna pidettävien varmuuskopioiden maksimimäärä. Vanhemmat varmuuskopiot poistetaan automaattisesti"
@@ -1814,7 +1811,6 @@ fi:
     delete_drafts_older_than_n_days: "Poista yli (n) päivää vanhat luonnokset."
     bootstrap_mode_min_users: "Vähimmäismäärä käyttäjiä, joka vaaditaan aloitustilan poistamiseen (aseta 0 poistaaksesi käytöstä)"
     prevent_anons_from_downloading_files: "Estä kirjautumattomia käyttäjiä lataamasta liitetiedostoja. VAROITUS: tämä estää viestin liitettyjen muiden tiedostojen, kuin kuvien käyttämisen sivustolla."
-    secure_media: 'Rajoita pääsyä ladattuihin mediatiedostoihin (kuvat, video, äänitiedostot). Jos "kirjautuminen vaaditaan" -tila on käytössä, vain kirjautuneilla käyttäjillä on pääsy mediatiedostoihin. Muussa tapauksessa vain pääsyä rajoitetaan vain yksityiskeskusteluiden medialatauksiin. Huomioi: S3-lataukset tulee olla käytössä ennen tämän asetuksen käyttöönottoa.'
     slug_generation_method: "Valitse polkulyhenteen luomisen metodi. 'encoded' käyttää prosenttikoodausta, 'none' poistaa polkulyhenteet käytöstä."
     enable_emoji: "Ota emoji käyttöön"
     enable_emoji_shortcuts: "Yleiset tekstiemojit kuten :) :p :( muunnetaan emojeiksi"
@@ -1995,6 +1991,10 @@ fi:
       other: "%{count} viestiä siirrettiin yksityisviestiketjuun: %{topic_link}"
   change_owner:
     post_revision_text: "Vaihtoi omistajaa"
+  publish_page:
+    slug_errors:
+      blank: "ei voi olla tyhjä"
+      invalid: "sisältää epäkelpoja merkkejä"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Tämä yksityisketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän %{count}."
@@ -3065,7 +3065,6 @@ fi:
       why: "Lyhyt kooste siitä mitä on tapahtunut sivustolla %{site_link} viimeisimmän vierailusi jälkeen %{last_seen_at}."
       since_last_visit: "Viime vierailusi jälkeen"
       new_topics: "Uutta ketjua"
-      unread_messages: "Lukematonta viestiä"
       unread_notifications: "Lukematonta ilmoitusta"
       liked_received: "Saatua tykkäystä"
       new_users: "Uutta käyttäjää"
@@ -3535,7 +3534,7 @@ fi:
       name: Hyvä vastaus
       description: Vastaus sai 10 tykkäystä
       long_description: |
-        Tämä ansiomerkki myönnetään, kun vastauksesi saa 10 tykkäykstä. Teit sillä vaikutuksen yhteisöön ja edistit keskustelua!
+        Tämä ansiomerkki myönnetään, kun vastauksesi saa 10 tykkäystä. Teit sillä vaikutuksen yhteisöön ja edistit keskustelua!
     good_post:
       name: Erinomainen vastaus
       description: Vastaus sai 25 tykkäystä
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 8169754c58..a62b88e85e 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -59,7 +59,6 @@ fr:
       optimized_link: Les liens optimisés d'images sont éphémères et ne devraient pas être inclus dans le code source d'un thème.
     settings_errors:
       invalid_yaml: "Le YAML est invalide"
-      data_type_not_a_number: "Le type du paramètre `%{name}` n'est pas supporté. Les types supportés sont `integer`, `bool`, `list` et `enum`"
       name_too_long: "Il y a un paramètre avec un nom trop long. Longueur maximum 255"
       default_value_missing: "Le paramètre `%{name}` n'a pas de valeur par défaut"
       default_not_match_type: "Le type de la valeur par défaut de paramètre `%{name}` ne correspond pas au type du paramètre."
@@ -325,13 +324,15 @@ fr:
   revert_version_same: "La version actuelle est la même que la version vers laquelle vous essayez de revenir."
   excerpt_image: "image"
   bookmarks:
+    errors:
+      already_bookmarked_post: "Il n'est pas possible de mettre plus d'un signet sur un même message."
+      cannot_set_past_reminder: "Vous ne pouvez pas définir un rappel de signet à une date passée."
     reminders:
       at_desktop: "La prochaine fois je suis à mon bureau"
-      later_today: "Plus tard dans la journée\n{{date}}"
-      next_business_day: "Prochain jour ouvré"
+      later_today: "Plus tard aujourd'hui"
       tomorrow: "Demain"
-      next_week: "La semaine prochaine"
-      next_month: "Le mois prochain"
+      next_week: "Semaine prochaine"
+      next_month: "Mois prochai"
       custom: "Date et heure personnalisés"
   groups:
     success:
@@ -362,7 +363,6 @@ fr:
       trust_level_4: "niveau_confiance_4"
     request_membership_pm:
       title: "Demande d'adhésion pour @%{group_name}"
-      handle: "Gérer demande d'adhésion"
     view_hidden_topic_request_reason: "J'aimerais rejoindre le groupe '%{group_name}' afin d'accéder à [ce sujet] (%{topic_url})."
   education:
     until_posts:
@@ -472,6 +472,10 @@ fr:
               same_as_password: "est identique à votre mot de passe."
             ip_address:
               signup_not_allowed: "L'inscription n'est pas autorisée à partir de ce compte."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Ce sujet ne peut pas être mis à la une sur votre profil."
         user_email:
           attributes:
             user_id:
@@ -816,8 +820,10 @@ fr:
       long_form: "a été aimé"
   draft:
     sequence_conflict_error:
+      title: "erreur d'ébauche"
       description: "L'ébauche est en train d'être modifiée dans une autre fenêtre. Veuillez recharger cette page."
   draft_backup:
+    pm_title: "Sauvegarde des ébauches sur les sujets en cours."
     pm_body: "Sujet contenant des ébauches sauvegardées"
   user_activity:
     no_default:
@@ -836,7 +842,9 @@ fr:
       self: "Vous n'avez pas d'ébauche ; commencez à répondre à un sujet et la réponse sera automatiquement sauvegardée comme nouvelle ébauche."
   webauthn:
     validation:
+      challenge_mismatch_error: "Le défi fourni ne correspond pas au défi généré par le serveur d'authentification."
       invalid_origin_error: "L'origine de la requête d'authentification ne correspond pas à l'origine du serveur."
+      malformed_attestation_error: "Une erreur s'est produite pendant le déchiffrage des données d'attestation."
       user_verification_error: "Une vérification de l'utilisateur est requise."
       unsupported_public_key_algorithm_error: "L'algorithme de clé publique fournie n'est pas supporté par le serveur."
       ownership_error: "La clé de sécurité n'appartient pas à l'utilisateur."
@@ -991,7 +999,13 @@ fr:
       yaxis: "Nombre de nouveaux contributeurs"
       description: "Nombre d'utilisateurs qui ont fait leur première contribution durant cette période."
     trust_level_growth:
+      xaxis:
+        tl1_reached: "Niveau de confiance 1 atteint"
+        tl2_reached: "Niveau de confiance 2 atteint"
+        tl3_reached: "Niveau de confiance 3 atteint"
+        tl4_reached: "Niveau de confiance 4 atteint"
       yaxis: "Jour"
+      description: "Nombre d'utilisateurs ayant augmenté leur niveau de confiance au cours de cette période."
     consolidated_page_views:
       title: "Pages vues unifiées"
       xaxis:
@@ -1244,7 +1258,6 @@ fr:
   dashboard:
     rails_env_warning: "Votre serveur fonctionne dans l'environnement de %{env}."
     host_names_warning: "Votre fichier config/database.yml utilise le nom d'hôte par défaut. Veuillez renseigner votre nom d'hôte."
-    gc_warning: 'Votre serveur utilise les paramètres par défaut de collection du GC de ruby, ce qui ne vous donnera pas les meilleures performances. Merci de lire ce sujet sur <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">l''optimisation des performances de Ruby et Rails pour Discourse</a>.'
     sidekiq_warning: 'Sidekiq n''est pas lancé. De nombreuses tâches, comme l''envoi des courriels, sont exécutées de manière asynchrone par sidekiq. Assurez-vous d''avoir au moins un processus sidekiq de lancé. <a href="https://github.com/mperham/sidekiq">En savoir plus sur sidekiq</a>.'
     queue_size_warning: "Le nombre de jobs dans la file d'attente est de %{queue_size}, ce qui est assez élevé. Cela peut indiquer un problème avec le(s) process Sidekiq, ou la nécessité d'ajouter davantage de workers."
     memory_warning: "Votre serveur dispose de moins de 1 Go de mémoire vive. Au moins 1 Go de RAM est recommandé."
@@ -1350,8 +1363,6 @@ fr:
     force_https: "Forcer votre site en HTTPS uniquement. ATTENTION : n'activez PAS cette fonction tant que vous n'avez pas vérifié que le HTTPS est complètement configuré et fonctionne absolument partout ! Avez-vous vérifié que vos CDN, vos connexions via réseaux sociaux ainsi que tous les logos / dépendances tiers sont tous compatibles HTTPS eux aussi ?"
     same_site_cookies: "Utiliser des cookies de même site, qui éliminent tous les vecteurs de Cross Site Request Forgery sur les navigateurs supportés (Lax ou Strict). Avertissement : Strict ne fonctionnera que sur des sites qui imposent la connexion et utilisent le SSO."
     summary_score_threshold: "Le score minimum requis pour qu'un message soit inclus dans le 'Résumé de ce sujet'"
-    summary_posts_required: "Nombre minimum de messages dans un sujet avant que le 'Résumé du sujet' soit activé"
-    summary_likes_required: "Nombre de J'aime minimum dans un sujet avant que le 'Résumé du sujet' soit activé"
     summary_percent_filter: "Quand un utilisateur clique sur « Résumer ce sujet », montrer le top % des messages"
     summary_max_results: "Nombre maximum de messages retournés par « Résumer ce sujet »"
     enable_personal_messages: "Autoriser les utilisateurs de niveau de confiance 1 à créer des messages et à répondre (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages."
@@ -1487,7 +1498,6 @@ fr:
     discord_client_id: 'Identifiant de l''utilisateur Discord (en cas de besoin, le créer via <a href="https://discordapp.com/developers/applications/me">le portail de développement Discord</a>)'
     discord_secret: "Clé secrète Discord"
     discord_trusted_guilds: ' Seuls les membres de ces guildes Discord peuvent se connecter via Discord. Utiliser les identifiants numériques des guildes. Pour plus d''informations, suivre les instructions<a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">ici</a>. Laisser blanc pour autoriser toutes les guildes.'
-    readonly_mode_during_backup: "Activer le mode lecture seule pendant une sauvegarde"
     enable_backups: "Autoriser les administrateurs à créer de nouveaux sauvegardes du forum"
     allow_restore: "Autoriser la restauration, qui peut remplacer TOUTES les données du site ! Laissez à faux, sauf si vous envisagez de faire restaurer une sauvegarde"
     maximum_backups: "Nombre maximum de sauvegardes à conserver sur le disque. Les anciennes sauvegardes seront automatiquement supprimées"
@@ -1661,6 +1671,7 @@ fr:
     reviewable_claiming: "Est-ce que les contenu à vérifier doit être réservé avant qu'on puisse agir dessus ?"
     reviewable_default_topics: "Afficher le contenu révisable groupé par sujet par défaut"
     reviewable_default_visibility: "Ne pas afficher les éléments révisables à moins qu'ils répondent à cette priorité"
+    high_trust_flaggers_auto_hide_posts: "Les messages des nouveaux utilisateurs seront automatiquement cachés après avoir été signalés comme spam par un utilisateur d'un niveau de confiance 3 et plus"
     reply_by_email_enabled: "Activer les réponses aux sujets via courriel."
     reply_by_email_address: "Modèle pour la réponse par courriel entrant, exemple : %%{reply_key}@reply.example.com ou replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Liste des templates alternatifs pour les adresses des courriels entrants de la réponse par courriel. Exemple : %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
@@ -1747,13 +1758,16 @@ fr:
     anonymous_posting_min_trust_level: "Le niveau de confiance minimum pour passer en mode anonyme."
     anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple : si 600 est choisi, dès 600 minutes après le dernier message ET que l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera crée."
     hide_user_profiles_from_public: "Cacher les cartes, les profils et le répertoire d'utilisateurs aux visiteurs."
+    allow_featured_topic_on_user_profiles: "Permet aux utilisateurs de mettre un lien vers un sujet à la une sur leur fiche et leur profil."
     show_inactive_accounts: "Autoriser les utilisateurs connectés à parcourir les profils de comptes inactifs."
     hide_suspension_reasons: "Ne pas afficher les raisons d'une suspension sur les profils utilisateurs."
     log_personal_messages_views: "Logguer les vues de messages directs par Admin pour d'autres utilisateurs/groupes."
     ignored_users_count_message_threshold: "Notifier les modérateur si un utilisateur est ignoré par autant d'utilisateurs."
     ignored_users_message_gap_days: "Combien de temps faut-il attendre avant de notifier à nouveau les modérateurs d'un utilisateur ignoré par beaucoup d'autres."
     clean_up_inactive_users_after_days: "Nombre de jours avant qu'un utilisateur inactif (niveau de confiance 0 sans aucun messages) soit supprimé. Pour désactiver le nettoyage saisir 0."
+    clean_up_unused_staged_users_after_days: "Nombre de jours avant de supprimer un utilisateur distant inutilisé (sans aucun message). 0 pour désactiver le nettoyage."
     user_selected_primary_groups: "Autoriser les utilisateurs à définir leur groupe principal"
+    max_notifications_per_user: "Volume de notifications maximum par utilisateur. Si ce seuil est dépassé alors les notifications les plus anciennes seront supprimées. Appliqué chaque semaine. 0 pour le désactiver."
     user_website_domains_whitelist: "Les sites Web des utilisateurs vont être vérifiés contre ces domaines. Liste délimitée par des pipes (|)."
     allow_profile_backgrounds: "Autoriser les utilisateurs à envoyer des arrières-plans de profil."
     sequential_replies_threshold: "Nombre de messages successifs qu'un utilisateur peut poster dans un sujet avant d'être averti d'avoir posté un nombre excessif de réponses qui se suivent."
@@ -1818,6 +1832,7 @@ fr:
     returning_users_days: "Combien de jours doivent s'écouler avant qu'un utilisateur soit considéré comme étant de retour."
     default_email_digest_frequency: "Par défaut, à quelle fréquence les utilisateurs reçoivent les résumés par courriel."
     default_include_tl0_in_digests: "Par défaut, inclure les messages des nouveaux utilisateurs dans les résumés par courriel. Les utilisateurs peuvent changer cela dans leurs préférences."
+    default_email_level: "Définit le niveau des notifications par défaut pour les sujets standards."
     default_email_messages_level: "Définissez le niveau de notification courriel par défaut quand quelqu'un envoie un message direct à un utilisateur."
     default_email_mailing_list_mode: "Envoyer un courriel pour chaque nouveau message."
     default_email_mailing_list_mode_frequency: "Par défaut, les utilisateurs ayant activé la liste de diffusion recevront des courriels à cette fréquence."
@@ -1837,6 +1852,7 @@ fr:
     default_categories_tracking: "Liste de catégories suivies par défaut."
     default_categories_muted: "Liste de catégories silencées par défaut."
     default_categories_watching_first_post: "Liste des catégories dont le premier message de chaque nouveau sujet sera surveillé par défaut."
+    mute_all_categories_by_default: "Définit le niveau des notifications pour toutes les catégories à silencieux. Nécessite que les utilisateurs acceptent explicitement les catégories pour les faire apparaître sur les pages 'récents' et 'catégories'. Si vous souhaitez corriger les valeurs par défaut pour les utilisateurs anonymes veuillez renseigner les paramètres 'default_categories_'."
     default_tags_watching: "Liste des étiquettes qui sont surveillées par défaut."
     default_tags_tracking: "Liste des étiquettes qui sont suivies par défaut."
     default_tags_muted: "Liste des étiquettes qui sont mises sous silence par défaut."
@@ -1973,6 +1989,10 @@ fr:
       other: "%{count} messages ont été fusionnés à un message direct existant : %{topic_link}"
   change_owner:
     post_revision_text: "Propriété transférée"
+  publish_page:
+    slug_errors:
+      blank: "ne peut être vide"
+      invalid: "contient des caractères invalides"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Ce message a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponse."
@@ -2064,6 +2084,8 @@ fr:
     second_factor_backup_title: "Code de secours de l'authentification à deux facteurs"
     invalid_second_factor_code: "Code d'authentification invalide. Chaque code ne peut être utilisé qu'une fois."
     invalid_security_key: "Clé de sécurité invalide."
+    missing_second_factor_name: "Veuillez renseigner un nom."
+    missing_second_factor_code: "Veuillez renseigne un code."
     second_factor_toggle:
       backup_code: "Utilisez plutôt un code de secours"
   admin:
@@ -2101,6 +2123,7 @@ fr:
       fixed_primary_email: "Correction de l'email primaire pour utilisateur distant"
       same_ip_address: "Même adresse IP (%{ip_address}) que d'autres utilisateurs"
       inactive_user: "Utilisateur inactif"
+    email_in_spam_header: "Le premier courriel de l'utilisateur a été signalé comme spam"
   reviewables_reminder:
     submitted:
       one: "Ces éléments ont été soumis il y a plus d'une heure. [Veuillez les passer en revue](%{base_path}/flags)."
@@ -2221,6 +2244,10 @@ fr:
   admin_confirmation_mailer:
     title: "Confirmation de l'Administrateur"
     subject_template: "[%{email_prefix}] Confirmer votre nouveau compte"
+    text_body_template: |
+      Merci de confirmer que vous souhaitez ajouter **%{target_username} (%{target_email})** comme administrateur à votre forum.
+
+      [Confirmer le compte administrateur](%{admin_confirm_url})
   test_mailer:
     title: "Envoyer un courriel de test"
     subject_template: "[%{email_prefix}] Test de délivrabilité courriel"
@@ -2314,7 +2341,14 @@ fr:
 
         Nous sommes ravis que vous passiez du temps avec nous, et nous adorerions en savoir plus sur vous. Prenez un moment pour [remplir votre profil](%{base_url}/my/preferences/profile) ou sentez-vous libre de [démarrer un nouveau sujet](%{base_url}/categories).
     welcome_staff:
+      title: "Bienvenue dans l'équipe"
       subject_template: "Félicitations, le statut de %{role} vous a été accordé !"
+      text_body_template: |
+        Le rôle de %{role} vous a été accordé par un membre de l'équipe.
+
+        En tant que %{role}, vous avez maintenant accès à l'interface <a href='%{base_url}/admin' target='_blank'>d'administration</a>.
+
+        À grand pouvoir grande responsabilité. Si vous débutez dans le rôle de modérateur, veuillez consulter le [Guide de modération](https://meta.discourse.org/t/guide-des-moderateurs/89968).
     welcome_invite:
       title: "Bienvenue invité"
       subject_template: "Bienvenue sur %{site_name} !"
@@ -2955,7 +2989,6 @@ fr:
       why: "Voici un bref résumé de ce qu'il s'est passé sur %{site_link} depuis votre dernière visite le %{last_seen_at}"
       since_last_visit: "Depuis votre dernière visite"
       new_topics: "Nouveaux sujets"
-      unread_messages: "Messages non lus"
       unread_notifications: "Notifications non lues"
       liked_received: "J'aime reçus"
       new_users: "Nouveaux utilisateurs"
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index e5348422d7..e2d4c728f2 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -475,6 +475,10 @@ gl:
   frequent_poster: "Publicador frecuente"
   redirected_to_top_reasons:
     new_user: "Benvido/a á nosa comunidade. Estes son os temas recentes máis populares."
+  publish_page:
+    slug_errors:
+      blank: "non pode quedar baleiro"
+      invalid: "contén caracteres incorrectos"
   login:
     admin_not_allowed_from_ip_address: "Non podes acceder como administrador desde este enderezo IP."
     new_registrations_disabled: "Neste momento non se permite o rexistro de novas contas."
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 2a4d0b5263..29ba03459d 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -47,6 +47,7 @@ he:
       generic: אירעה שגיאה בעת ייבוא ערכת העיצוב הזו
       about_json: "שגיאת ייבוא: about.json לא קיים או שהוא פגום"
       about_json_values: "about.json מכיל ערכים שגויים: %{errors}"
+      modifier_values: "המחליפים ב־about.json מכילים ערכים שגויים: %{errors}"
       git: "שגיאה בעת שכפול מאגר git, הגישה נדחיתה או שהמאגר לא נמצא"
       unpack_failed: "חילוץ הקובץ נכשל"
       file_too_big: "הקובץ גדול מדי ללא דחיסה."
@@ -59,7 +60,7 @@ he:
       optimized_link: קישורים משופרים לתמונות הם בני חלוף ואין לכלול אותם בקוד המקור של ערכת העיצוב.
     settings_errors:
       invalid_yaml: "ה־YAML שסופק שגוי."
-      data_type_not_a_number: "הגדרת הסוג `%{name}` אינה נתמכת. הסוגים הנתמכים הם `integer`,‏ `bool`,‏ `list` ו־`enum`"
+      data_type_not_a_number: "סוג ההגדרה `%{name}` אינו נתמך. הסוגים הנתמכים הם: `integer`,‏ `bool`,‏ `list`,‏ `enum` ו־`upload`"
       name_too_long: "קיימת הגדרה עם שם ארוך מדי. האורך המרבי הוא 255"
       default_value_missing: "להגדרה `%{name}` אין ערך בררת מחדל"
       default_not_match_type: "סוג ערך בררת המחדל של ההגדרה `%{name}` אינו תואם לסוג ההגדרה."
@@ -359,14 +360,16 @@ he:
   bookmarks:
     errors:
       already_bookmarked_post: "אי אפשר לסמן את אותו הפוסט פעמיים"
+      cannot_set_past_reminder: "אי אפשר להגדיר תזכורת סימנייה למועד שעבר."
+      cannot_set_reminder_in_distant_future: "לא ניתן להגדיר תזכורת סימנייה למעבר ל־10 שנים בעתיד."
       time_must_be_provided: "צריך לציין זמן לכל התזכורות למעט ‚%{reminder_type}’"
     reminders:
       at_desktop: "בשימוש הבא דרך שולחן העבודה"
-      later_today: "המשך היום"
-      next_business_day: "ביום העסקים הבא"
+      later_today: "בהמשך היום"
+      next_business_day: "יום העסקים הבא"
       tomorrow: "מחר"
       next_week: "בשבוע הבא"
-      next_month: "בחודש הבא"
+      next_month: "חודש הבא"
       custom: "תאריך ושעה מותאמים אישית"
   groups:
     success:
@@ -401,7 +404,6 @@ he:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "בקשת חברות עבור ‎@%{group_name}‎"
-      handle: "טיפול בבקשות חברות"
     view_hidden_topic_request_reason: "אבקש להצטרף לקבוצה ‚%{group_name}’, כדי שאוכל לגשת ל[נושא הזה](%{topic_url})"
   education:
     until_posts:
@@ -513,6 +515,10 @@ he:
               same_as_password: "זהה לססמה שלך."
             ip_address:
               signup_not_allowed: "אסור להירשם מהחשבון הזה."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "לא ניתן להציג את הנושא הזה במומלצים בפרופיל שלך."
         user_email:
           attributes:
             user_id:
@@ -808,7 +814,7 @@ he:
     confirmed: "כתובת הדוא״ל שלך עודכנה."
     please_continue: "להמשיך אל %{site_name}"
     error: "הייתה שגיאה בעדכון כתובת הדוא״ל. אולי היא כבר בשימוש?"
-    error_staged: "אירעה שגיאה בהחלפת כתובת הדוא״ל שלך. הכתובת כבר נמצאת בשימוש על ידי מועמדים לשימוש במערכת."
+    error_staged: "אירעה שגיאה בהחלפת כתובת הדוא״ל שלך. הכתובת כבר נמצאת בשימוש על ידי משתמשים מבוימים במערכת."
     already_done: "קישור אימות זה אינו תקף עוד, עמך הסליחה. אולי כתובת הדוא״ל שלך כבר הוחלפה?"
     confirm: "אישור"
     authorizing_new:
@@ -1334,7 +1340,6 @@ he:
   dashboard:
     rails_env_warning: "השרת שלך רץ במצב %{env}."
     host_names_warning: "הקובץ config/database.yml אצלכם משתמש בכתובת ברירת המחדל - localhost. עדכנו אותה להשתמש בכתובת של השרת שלכם."
-    gc_warning: 'השרת שלך משתמש במשתני בררת המחדל לאיסוף פסולת של ruby, מה שעשוי לפגוע בביצועים. מומלץ לקרוא את הנושא הזה על שיפור ביצועים: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">כוונון של Ruby ושל Rails לטובת Discourse</a>.'
     sidekiq_warning: 'Sidekiq לא רץ. משימות רבות, כמו שליחת מיילים, מבוצעות אסינכרונית באמצעות Sidekiq. אנא וודאו שלפחות תהליך אחד של Sidekiq רץ. <a href="https://github.com/mperham/sidekiq" target="_blank">לימדו על Sidekiq כאן</a>.'
     queue_size_warning: "מספר העבודות בתור הוא %{queue_size}, שהוא גבוה. זה עלול להצביע על בעיה עם תהליך(י) Sidekiq, או שייתכן שאתם צריכים יותר Sidekiq workers."
     memory_warning: "בשרת שלכם יש פחות מ 1 גיגה זיכרון בסך הכל. מומלץ לפחות 1 גיגה זיכרון."
@@ -1447,8 +1452,8 @@ he:
     force_https: "הכריחו את אתרכם להשתמש אך ורק ב HTTPS. אזהרה: אל תאפשרו זאת עד שתוודאו ש HTTPS מותקן ועובד ממש בכל המקרים! וידאתם את הגדרות ה CDN שלכם, כל שירותי ההתחברות, וכל הלוגואים / תלויות החיצוניים - כדי לוודא שכולם עובדים גם כן עם HTTPS?"
     same_site_cookies: "שימוש בעוגיות של האתר, הן מבטלות את כל הווקטורים של Cross Site Request Forgery בדפדפנים נתמכים (Lax או Strict). אזהרה: Strict יעבוד רק על אתרים שמכריכים התחברות ומשתמשים ב SSO."
     summary_score_threshold: "הניקוד המינימלי הנדרש כדי שפוסט ייכלל ב\"סיכום נושא זה\""
-    summary_posts_required: "מספר הפוסטים המנימלי בנושא לפני שהאפשרות \"סיכום נושא זה\" תתאפשר"
-    summary_likes_required: "מינימום הלייקים לנושא לפני שהאפשרות \"סיכום נושא זה\" תתאפשר"
+    summary_posts_required: "כמות פוסטים מזערית בנושא בטרם מופעל ‚תקציר לנושא זה’. שינויים בהגדרה זו יחולו רטרואקטיבית תוך שבוע."
+    summary_likes_required: "כמות לייקים מזערית בנושא בטרם מופעל ‚תקציר לנושא זה’. שינויים בהגדרה זו יחולו רטרואקטיבית תוך שבוע."
     summary_percent_filter: "כאשר משתמש/ת מקליקים על \"סיכום נושא זה\", הציגו את % הפוסטים הראשונים"
     summary_max_results: "מספר הפוסטים המרבי שיוחזר על ידי ‚סיכום הנושא הזה’"
     enable_personal_messages: "לאפשר למשתמשים בדרגת אמון 1 (ניתן להגדרה דרך דרגת אמון מזערית לשליחת הודעות) ליצור הודעות ולענות להודעות. נא לשים לב שהסגל תמיד יכול לשלוח הודעות, ללא קשר."
@@ -1480,7 +1485,8 @@ he:
     markdown_typographer_quotation_marks: "רשימה של צמדי החלפות מירכאות כפולות ובודדות"
     post_undo_action_window_mins: "מספר הדקות בהן מתאפשר למשתמשים לבטל פעולות אחרות בפוסט (לייק, סימון, וכו')."
     must_approve_users: "על הסגל לאשר את כל חשבונות המשתמשים החדשים בטרם מתאפשרת כניסתם לאתר."
-    approve_suspect_users: "על חברי הסגל לאשר את כל החשבונות החשודים"
+    invite_code: "על המשתמש להקליד את הקוד הזה כדי שיתאפשר לו להירשם לחשבון, כשריק אין לזה משמעות (אין משמעות לאותיות גדולות/קטנות)"
+    approve_suspect_users: "הוספת משתמשים חשודים לתור הסקירה. משתמשים חשודים מילאו ביוגרפיה/אתר אבל לא קראו שום דבר."
     pending_users_reminder_delay: "יש להודיע למפקחים אם משתמשים חדשים ממתינים לעדכון מעבר לכמות כזו של שעות. יש להגדיר ל־‎-1 כדי לנטרל את ההתראות."
     maximum_session_age: "משתמשים ישארו מחוברים ל n שעות מאז ביקורם האחרון"
     ga_universal_tracking_code: "מזהה קוד מעקב של Google Universal Analytics (analytics.js), למשל: UA-12345678-9; ניתן לעיין ב־<a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1529,6 +1535,8 @@ he:
     allow_index_in_robots_txt: "יש לציין ב־robots.txt שמותר לאתר הזה להצטרף למאגר של מנועי החיפוש. במקרים יוצאי דופן, ניתן <a href='%{base_path}/admin/customize/robots'>לדרוס את robots.txt</a> באופן קבוע."
     email_domains_blacklist: "רשימה מופרדת בצינור (pipe) של דומיינים של אימייל אשר מהם משתמשים לא מורשים לרשום חשבונות. למשל: mailinator.com|trashmail.net"
     email_domains_whitelist: "רשימה מופרדת בצינור (pipe) אשר ר-ק ממנה משתמשים יכולים לרשום חשבונות. א-ז-ה-ר-ה: משתמשים עם אימיילים מדומיינים אחרים לא יורשו!"
+    enforce_canonical_emails: "בטרם יצירת משתמשים יש להפשיט כתובת דוא״ל לצורה אחידה כדי לאמת ייחודיות. ההגדרות תפעל רק על רישומי חשבונות חדשים. כאשר user+1@domain.com לא תהיה כתובת מורשית אם user+2@domain.com כבר רשומה."
+    auto_approve_email_domains: "משתמשים עם כתובות דוא״ל מרשימת שמות התחום האלה יאושרו אוטומטית."
     hide_email_address_taken: "לא להודיע למשתמשים שקיים חשבון עם כתובת דוא״ל מסוימת במהלך ההרשמה ובטופס שחזור הססמה."
     log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמש/ת בכל המכשירים"
     version_checks: "לדגום את Discourse Hub כדי למצוא עדכוני גרסאות ולהציג הודעות של גרסאות חדשות בלוח הניהול <a href='%{base_path}/admin' target='_blank'>‎/admin</a>"
@@ -1586,7 +1594,6 @@ he:
     discord_client_id: 'מזהה לקוח Discord (אין לך כזה? יש לבקר ב<a href="https://discordapp.com/developers/applications/me">פורטל המפתחים של Discord</a>)'
     discord_secret: "מפתח סודי של Discord"
     discord_trusted_guilds: 'לאפשר רק למשתמש מגילדות ה־Discord האלה להיכנס באמצעות Discord. עליך להשתמש במזהה המספרי של הגילדה. למידע נוסף, יש לעיין בהנחיות ש<a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">כאן</a>. שדה ריק משמעו כל גילדה שהיא.'
-    readonly_mode_during_backup: "הפעלת מצב קריאה בלבד בזמן גיבוי"
     enable_backups: "לאפשר למנהלים ליצור גיבויים של הפורום"
     allow_restore: "אפשר שחזור, אשר יכול להחליף את כל(!) המידע באתר! הותירו על \"שלילי\" (false) אלא אם כן אתם מתכננים לשחזר גיבוי."
     maximum_backups: "המספר המקסימלי של גיבויים לשמירה על הכונן. גיבויים ישנים יותר ימחקו אוטומטית"
@@ -1779,8 +1786,8 @@ he:
     delete_email_logs_after_days: "מחיקת יומני מיילים אחרי (N) ימים. 0 ישמור אותם ללא הגבלה"
     disallow_reply_by_email_after_days: "לא לאפשר להגיב בדוא״ל לאחר (N) ימים. 0 כדי לאפשר תמיד."
     max_emails_per_day_per_user: "מספר המיילים המקסימאלי שניתן לשלוח למשתמש/ת ביום. הקישו 0 למשלוח ללא הגבלה."
-    enable_staged_users: "יצירת משתמשים מועמדים באופן אוטומטי בזמן עיבוד מיילים נכנסים."
-    maximum_staged_users_per_email: "מספר מקסימלי של משתמשים מועמדים שנוצרים בזמן עיבוד מייל מכנס."
+    enable_staged_users: "יצירת משתמשים מבוימים באופן אוטומטי בזמן עיבוד הודעות דוא״ל נכנסות."
+    maximum_staged_users_per_email: "מספר מרבי של משתמשים מבוימים שנוצרים בזמן עיבוד הודעת דוא״ל נכנסת."
     auto_generated_whitelist: "רשימת כתובות דואר מהן לא ייבדק אם התוכן נוצר-אוטומטית. למשל: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "חסימת מיילים נכנסים שמזוהים ככאלו שנוצרו אוטומטית."
     ignore_by_title: "התעלמות ממיילים נכנסים לפי הכותרת שלהם."
@@ -1821,6 +1828,7 @@ he:
     relative_date_duration: "מספר הימים לאחר פרסום בהם תאריך הפוסט מופיע כתאריך יחסי (7 ימים) לעומת תאריך רגיל (20 בפברואר)."
     delete_user_max_post_age: "אל תפאשרו מחיקת משתמשים שהפוסט הראשון שלהם הוא בן יותר מ-(x) ימים."
     delete_all_posts_max: "מספר הפוסטים המרבי שניתן להסיר בבת אחת עם הכפתור להסרת כל הפוסטים. אם למשתמש יש יותר פוסטים מהכמות הזאת, לא ניתן למחוק את כל הפוסטים בבת אחת וגם לא ניתן למחוק את המשתמש."
+    delete_user_self_max_post_count: "מספר הרשומות המרבי שיכול להיות למשתמש ועדיין לאפשר לו למחוק את החשבון בעצמו. בחירה ב־‎-1 משביתה את האפשרות למחיקת חשבון עצמאית."
     username_change_period: "המספר המרבי של ימים לאחר ההרשמה בהם ניתן לשנות את שם המשתמש (0 כדי למנוע שינויים לשם המשתמש)."
     email_editable: "אפשרו למשתמשים לשנות את כתובת המייל שלהם לאחר ההרשמה."
     logout_redirect: "מיקום להפניית הדפדפן לאחר היציאה מהמערכת (למשל: https://example.com/logout)"
@@ -1859,6 +1867,7 @@ he:
     ignored_users_count_message_threshold: "להודיע למפקחים במקרה שמשתמש מסוים זכה לחסימות מצד משתמשים רבים אחרים."
     ignored_users_message_gap_days: "כמה זמן להמתין בטרם שליחת הודעה נוספת למפקחים בנוגע למשתמש שזכה לחסימות מצד משתמשים רבים."
     clean_up_inactive_users_after_days: "מספר הימים בטרם הסרת משתמש בלתי פעיל (דרגת אמון 0 ללא פוסטים). כדי להשבית את הפינוי יש להגדיר ל־0."
+    clean_up_unused_staged_users_after_days: "מספר הימים לפני שמשתמש מבוים שאינו בשימוש (ללא פוסטים) נמחק מהמערכת. כדי להשבית את הפינוי יש להגדיר ל־0."
     user_selected_primary_groups: "לאפשר למשתמשים להגדיר את הקבוצה העיקרית של עצמם"
     max_notifications_per_user: "כמות ההתראות המרבית למשתמש, אם המשתמש חרג מהמספר הזה, התראות ישנות תימחקנה. נאכף כל שבוע. 0 להשבתה"
     user_website_domains_whitelist: "אתרי משתמשים יאומתו עם מתחמים אלו. רשימה מופרדת על ידי קווים-אנכיים."
@@ -1897,7 +1906,9 @@ he:
     highlighted_languages: "כללי הדגשת תחביר להכללה. (אזהרה: הכללה של שפות רבות מדי פוגעת בביצועים) להדגמה: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a>"
     embed_any_origin: "לאפשר תוכן עם יכולת הטמעה ללא תלות במקור. נחוץ ליישומונים לנייד עם HTML סטטי."
     embed_topics_list: "תמיכה בהטמעת רשימות נושאים ב־HTML"
+    embed_set_canonical_url: "הגדרת הכתובת הקנונית לנושאים מוטמעים כדי להטמיע את כתובת התוכן."
     embed_truncate: "חיתוך הפוסטים המוטמעים."
+    embed_unlisted: "נושאים שיובאו לא יופיעו ברשימה עד שתתווסף אליהם תגובה ממשתמש."
     embed_support_markdown: "תמיכה בסימון Markdown בפוסטים מוטמעים."
     embed_whitelist_selector: "רשימה מופרדת בפסיקים של רכיבי CSS שמותר להשתמש בהם בהטמעות (embed)."
     allowed_href_schemes: "פרוטוקולים מותרים בלינקים בנוסף ל http ו https."
@@ -1908,7 +1919,7 @@ he:
     delete_drafts_older_than_n_days: "מחקו טיוטות בנות יותר מ (n) ימים."
     bootstrap_mode_min_users: "מספר משתמשים מינימלי שנדרש כדי לנטרל מצב איתחול (קבעו ל 0 כדי לנטרל)"
     prevent_anons_from_downloading_files: "מונע ממשתמשים אנונימיים להוריד צרופות (attachments). אזהרה: דבר זה ימנע מכל משאב שאינו תמונה ופורסם כצרופה לעבוד."
-    secure_media: 'הגבלת הגישה להעלאות מדיה (תמונות, סרטונים, קטעי שמע). אם מופעלת „דרישת כניסה”, רק למשתמשים שנכנסו לחשבון במערכת תהיה גישה למדיה שהועלתה. אחרת, הגישה תוגבל רק למדיה שנשלחה בהודעות פרטיות. לתשומת לבך: חובה להפעיל העלאות ל־S3 בטרם הפעלת הגדרה זו.'
+    secure_media: 'מגביל גישה לכל ההעלאות (תמונות, סרטונים, שמע, טקסט, קובצי PDF, ארכיוני zip ועוד). אם מופעלת האפשרות „דרישת כניסה”, רק משתמשים שנכנסו למערכת יכולים לגשת להעלאות. אחרת, הגישה תוגבל רק להעלאות מסוגי מדיה בהודעות פרטיות ובקטגוריות פרטיות. אזהרה: מדובר בהגדרה מסובכת שדורשת הבנה עמוקה בניהול המערכת. יש לעיין ב<a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">נושא המדיה המאובטחת ב־Meta</a> לקבלת פרטים נוספים.'
     slug_generation_method: "בחרו צורת ייצור slug. צורה של 'encoded' תגרום למחרוזות עם קידוד אחוזים. 'none' ינטרל slug לחלוטין."
     enable_emoji: "הפעלת אמוג׳י"
     enable_emoji_shortcuts: "חייכנים נפוצים כגון ‎:) :p :(‎ יומרו לאמוג׳ים"
@@ -1929,6 +1940,7 @@ he:
     new_user_notice_tl: "דרגת האמון המזערית הדרושה לצפייה בהתראות על פוסט של משתמש חדש."
     returning_user_notice_tl: "דרגת האמון המזערית הדרושה לצפייה בהתראות משתמש חוזר."
     returning_users_days: "כמה ימים אמורים לעבור לפני שמשתמש נחשב למשתמש חוזר."
+    enable_page_publishing: "לאפשר לחברי סגל לפרסם נושאים לכתובות חדשות עם סגנון עצמאי."
     default_email_digest_frequency: "באיזו תדירות משתמשים יקבלו סיכומי מיילים כברירת מחדל."
     default_include_tl0_in_digests: "כללו פוסטים ממשתמשים חדשים בדוא\"ל מסכם כברירת מחדל. משתמשים יוכלו לשנות זאת בהעדפות האישיות."
     default_email_level: "הגדרת רמת ההתראה בדוא״ל כבררת מחדל לנושאים רגילים."
@@ -1991,6 +2003,9 @@ he:
     push_notifications_icon: "סמל העיטור שמופיע בפינת ההתרעה. הגודל הנדרש הוא 96 × 96."
     short_title: "בכותרת הקצרה ייעשה שימוש במסך הבית של המשתמש, במשגר או במקומות אחרים שבהם המקום מוגבל. אורכה לא יעלה על 12 תווים."
     dashboard_general_tab_activity_metrics: "נא לבחור דיווחים שיופיעו בתור מדדי פעילות בלשונית הכללית."
+    gravatar_name: "שם ספק ה־Gravatar"
+    gravatar_base_url: "כתובת בסיס ה־API של ספק ה־Gravatar"
+    gravatar_login_url: "כתובת ביחס אל gravatar_base_url (כתובת הבסיס של Gravatat) שמספקת למשתמש גישה לשירות Gravatar"
     errors:
       invalid_email: "כתובת דוא\"ל לא קיימת."
       invalid_username: "אין משתמש/ת עם שם משתמש כזה."
@@ -2100,6 +2115,11 @@ he:
       other: "%{count} פוסטים מוזגו להודעה קיימת: %{topic_link}"
   change_owner:
     post_revision_text: "הבעלות הועברה"
+  publish_page:
+    slug_errors:
+      blank: "לא ניתן להשאיר ריק"
+      unavailable: "אינו זמין"
+      invalid: "מכיל תווים לא תקניים"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "הודעה זו נסגרה אוטומטית אחרי שהגיעה למספר המקסימלי של תגובות: %{count} ."
@@ -2210,6 +2230,7 @@ he:
     new_registrations_disabled: "הוספת חשבונות חדשים אינה מותרת בעת זו."
     password_too_long: "סיסמאות מוגבלות ל-200 תווים."
     email_too_long: "המייל שהזנת ארוך מדי. שמות מייל צריכים להכיל לכל היותר 254 תוים, ושמות דומיין צריכים להכיל לכל היותר 253 תוים."
+    wrong_invite_code: "קוד ההזמנה שהקלדת שגוי."
     reserved_username: "שם משתמש זה אינו מורשה."
     missing_user_field: "לא מילאת את כל שדות המשתמש/ת"
     auth_complete: "אימות הושלם."
@@ -2221,6 +2242,8 @@ he:
     second_factor_backup_title: "קוד גיבוי לאימות דו־שלבי"
     invalid_second_factor_code: "קוד האימות שגוי. מותר להשתמש בכל קוד פעם אחת בלבד."
     invalid_security_key: "מפתח אבטחה שגוי."
+    missing_second_factor_name: "נא לציין שם."
+    missing_second_factor_code: "נא לציין קוד."
     second_factor_toggle:
       totp: "יש להשתמש ביישומון מאמת או במפתח אבטחה במקום"
       backup_code: "להשתמש בקוד גיבוי במקום"
@@ -3074,7 +3097,7 @@ he:
 
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
-      title: "משתמש/ת הוזמן/ה להודעה פרטית מדורגת"
+      title: "משתמש/ת הוזמן/ה להודעה פרטית מבוימת"
       subject_template: "הוזמנת לדיון '%{topic_title}' על ידי [%{email_prefix}] %{username}"
       text_body_template: |
         %{header_instructions}
@@ -3202,7 +3225,7 @@ he:
 
         %{respond_instructions}
     user_posted_pm_staged:
-      title: "משתמש/ת פרסם/ה הודעה פרטית מדורגת"
+      title: "משתמש/ת פרסם/ה הודעה פרטית מבוימת"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
@@ -3249,8 +3272,8 @@ he:
       why: "סיכום קצר של %{site_link} מאז ביקורך האחרון ב-%{last_seen_at}"
       since_last_visit: "מאז ביקורכם האחרון"
       new_topics: "נושאים חדשים"
-      unread_messages: "הודעות שלא נקראו"
       unread_notifications: "התראות שלא נקראו"
+      unread_high_priority: "הודעות בדחיפות גבוהה שלא נקראו"
       liked_received: "לייקים שהתקבלו"
       new_users: "משתמשים חדשים"
       popular_topics: "נושאים פופולאריים"
@@ -3421,6 +3444,7 @@ he:
     file_missing: "סליחה, עליך לספק קובץ להעלות."
     empty: "מצטערים, אבל הקובץ שסיפקתם ריק"
     png_to_jpg_conversion_failure_message: "אירעה שגיאה בעת המרה מ־PNG ל־JPG."
+    optimize_failure_message: "אירעה שגיאה בעת מיטוב התמונה שהועלתה."
     attachments:
       too_large: "מצטערים, הקובץ שאתם מנסים להעלות גדול מידי (הגודל המקסימלי המותר הוא %{max_size_kb}KB)."
     images:
@@ -3456,6 +3480,7 @@ he:
     sender_body_blank: "גוף ריק"
     sender_post_deleted: "פוסט נמחק"
     sender_message_to_invalid: "כתובת דוא״ל הנמען שגויה"
+    sender_topic_deleted: "הנושא נמחק"
   color_schemes:
     base_theme_name: "בסיס"
     light: "בהיר"
@@ -4176,7 +4201,7 @@ he:
       invite_only: "על כל המשתמשים החדשים לקבל הזמנה. יש לעיין ב־`invite_only` (הזמנה בלבד)"
       email_auth_res_enqueue: "הודעת דוא״ל זו נפסלה בבדיקת DMARC, כנראה שאינה נשלחה מהנמען שצוין. מוטב להתעמק בכותרות הגולמיות של הודעת הדוא״ל כדי להבין יותר לעומק."
       email_spam: "הודעת דוא״ל זו סומנה כספאם עקב הכותרת שהוגדרה תחת `email_in_spam_header` (כותרת דוא״ל לספאם)."
-      suspect_user: "משתמשים ברשימת החשודים חייבים לעבור את סקירת הסגל. נא לעיין ב־`approve_suspect_users` (אישור משתמשים חשודים)."
+      suspect_user: "המשתמש החדש הזה מילא פרטי חשבון מבלי לקרוא נושאים או פוסטים, מה שעשוי לרמז על כך שייתכן שמדובר בתוקף ספאם. יש לעיין ב־`approve_suspect_users` (אישור משתמשים חשודים).  "
     actions:
       agree:
         title: "הסכמה…"
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index 9dc15bdac6..052c905d60 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -57,7 +57,6 @@ hu:
       no_multilevels_components: "A gyermektémákat tartalmazó témák nem lehet maguk is gyermektémák"
     settings_errors:
       invalid_yaml: "A megadott YAML érvénytelen."
-      data_type_not_a_number: "A(z) „%{name}” típus beállítása nem támogatott. A támogatott típusok: „integer”, „bool”, „list” és „enum”."
       name_too_long: "Az egyik beállítás neve túl hosszú. A legnagyobb hossz 255"
       default_value_missing: "A(z) „%{name}” beállításnak nincs alapértelmezett értéke."
       default_not_match_type: "A(z) „%{name}” beállítás alapértelmezett értékének típusa nem egyezik a beállítás típusával."
@@ -245,6 +244,12 @@ hu:
   too_late_to_edit: "Ez a bejegyzés túl régen lett létrehozva. Már nem lehet szerkeszteni vagy törölni."
   revert_version_same: "A jelenlegi verzió megegyezik azzal a verzióval amire vissza szeretne térni."
   excerpt_image: "kép"
+  bookmarks:
+    reminders:
+      later_today: "A mai nap folyamán"
+      tomorrow: "Holnap"
+      next_week: "Jövő héten"
+      next_month: "Jövő hónapban"
   groups:
     errors:
       can_not_modify_automatic: "Nem módosíthat egy automata csoportot"
@@ -791,6 +796,10 @@ hu:
   redirected_to_top_reasons:
     new_user: "Üdv a közösségünkben! Ezek a legnépszerűbb témakörök."
     not_seen_in_a_month: "Üdv újra itt! Régóta nem láttuk. Ezek a legnépszerűbb témakörök, amióta távol volt."
+  publish_page:
+    slug_errors:
+      blank: "nem lehet üres"
+      invalid: "érvénytelen karaktereket tartalmaz"
   topic_statuses:
     autoclosed_disabled: "A témakör jelenleg nyitott. Mostantól lehet válaszolni rá."
     autoclosed_disabled_lastpost: "A témakör jelenleg nyitott. Mostantól lehet válaszolni rá."
@@ -1019,7 +1028,6 @@ hu:
       why: "Egy kis összefoglaló a(z) %{site_link} oldalról, hogy mik történtek a legutóbbi látogatása (%{last_seen_at}) óta."
       since_last_visit: "Utolsó látogatása óta"
       new_topics: "Új téma"
-      unread_messages: "Olvasatlan üzenet"
       unread_notifications: "Olvasatlan értesítés"
       liked_received: "Kapott kedvelés"
       new_users: "Új felhasználó"
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index 661caa18a8..db6169dfd9 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -55,7 +55,6 @@ hy:
       no_multilevels_components: "Դուստր-թեմա ունեցող թեմաները չեն կարող լինել իրենք իրենց դուստր-թեմա"
     settings_errors:
       invalid_yaml: "Տրված YAML -ը անվավեր է:"
-      data_type_not_a_number: "Կարգավորման `%{name}` տիպը չի ապահովվում: Ապահովվող տիպերն են՝ `integer`, `bool`, `list` և `enum` :"
       name_too_long: "Չափազանց երկար անունով կարգավորում կա: Առավելագույն երկարությունն է 255:"
       default_value_missing: " `%{name}` կարգավորումը չունի լռելյայն արժեք"
       default_not_match_type: "Կարգավորման `%{name}` լռելյայն արժեքի տիպը չի համապատասխանում կարգավորման տիպին:"
@@ -291,6 +290,12 @@ hy:
   edit_conflict: "Այդ գրառումը խմբագրվել է մեկ այլ օգտաիրոջ կողմից, և Ձեր փոփոխությունները այլևս չեն կարող պահպանվել:"
   revert_version_same: "Ընթացիկ տարբերակը նույնն է, ինչ այն, որը Դուք փորձում եք վերադարձնել:"
   excerpt_image: "նկար"
+  bookmarks:
+    reminders:
+      later_today: "Այսօր, մի փոքր ուշ"
+      tomorrow: "Վաղը"
+      next_week: "Հաջորդ շաբաթ"
+      next_month: "Հաջորդ ամիս"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' -ը վավեր վստահության մակարդակ չէ:"
@@ -1082,7 +1087,6 @@ hy:
   dashboard:
     rails_env_warning: "Ձեր սերվերը աշխատում է %{env} ռեժիմով:"
     host_names_warning: "Ձեր config/database.yml ֆայլը օգտագործում է լռելյայն localhost հոսթի անուն: Թարմացրեք այն Ձեր կայքի հոսթի անունով:"
-    gc_warning: 'Ձեր սերվերը լռելյայն օգտագործում է ruby garbage collection պարամետրեր, որը լավագույն կատարողականություն չի տա: Կարդացեք կատարողականության կարգավորման մասին այս թեման՝ <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Ruby and Rails -ի կարգավորում Discourse-ի համար</a>:'
     sidekiq_warning: 'Sidekiq -ը չի աշխատում: Շատ առաջադրանքներ, օրինակ՝ էլ. նամակների ուղարկումը, անհամաժամորեն(asynchronously) իրականացվում են sidekiq -ի կողմից: Խնդրում ենք համոզվել, որ առնվազն մեկ sidekiq գործընթաց աշխատում է: <a href="https://github.com/mperham/sidekiq" target="_blank">Իմացեք Sidekiq -ի մասին այստեղ</a>:'
     queue_size_warning: "Սպասող job-երի քանակը %{queue_size} է, ինչը բարձր է: Սա կարող է խնդիր առաջացնել Sidekiq գործընթաց(ներ)ի հետ, կամ հնարավոր է՝ կարիք լինի ավելացնելու ավելի շատ Sidekiq աշխատողների:"
     memory_warning: "Ձեր սերվերն աշխատում է 1 ԳԲ-ից քիչ ընդհանուր հիշողությամբ: Խորհուրդ է տրվում առնվազն 1 ԳԲ հիշողություն:"
@@ -1179,8 +1183,6 @@ hy:
     force_https: "Պարտադրեք Ձեր կայքին օգտագործել միայն HTTPS: ՈՒՇԱԴՐՈՒԹՅՈՒՆ՝ ՄԻ միացրեք սա, քանի դեռ համոզված չեք, որ HTTPS -ը ամբողջությամբ կարգավորված է և աշխատում է բացառապես ամենուր! Դուք ստուգե՞լ եք նաև Ձեր CDN-ը, բոլոր սոցիալական կայքերը և ցանկացած արտաքին լոգո / կախյալներ՝ համոզվելու համար, որ դրանք բոլորը համատեղելի են HTTPS -ի հետ:"
     same_site_cookies: "Use same site cookies, they eliminate all vectors Cross Site Request Forgery on supported browsers (Lax or Strict). Warning: Strict will only work on sites that force login and use SSO."
     summary_score_threshold: "'Ամփոփել Այս Թեման'-ի մեջ ներառման համար անհրաժեշտ գրառման նվազագույն միավորը"
-    summary_posts_required: "Թեմայի նվազագույն գրառումները՝ մինչ 'Ամփոփել Այս Թեման' միացնելը"
-    summary_likes_required: "Թեմայի նվազագույն հավանումները՝ մինչ 'Ամփոփել Այս Թեման' միացնելը"
     summary_percent_filter: "Երբ օգտատերը սեղմում է 'Ամփոփել Այս Թեման' , ցուցադրել գրառումների թոփ %-ը"
     summary_max_results: "'Ամփոփել Այս Թեման' -ի կողմից վերադարձված առավելագույն գրառումները"
     enable_personal_messages: "Թույլատրել վստահության 1-ին մակարդակի (կարգավորվում է հաղորդագրություններ ուղարկելու համար նվազագույն վստահության մակարդակի միջոցով) օգտատերերին ստեղծել և պատասխանել հաղորդագրություններին: Նկատի ունեցեք, որ անձնակազմը միշտ կարող է ուղարկել հաղորդագրություն, կապ չունի թե ինչպիսի:"
@@ -1299,7 +1301,6 @@ hy:
     enable_github_logins: "Միացնել Github-ով վավերականացումը, պահանջում է github_client_id և github_client_secret: Այցելեք <a href='https://meta.discourse.org/t/13745' target='_blank'>GitHub-ով մուտքի կարգավորումը Discourse -ի համար</a>:"
     github_client_id: "Հաճախորդի id-ն Github-ով վավերականացման համար, որը գտնվում է այստեղ՝ <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Հաճախորդի գաղտնի արժեքը Github-ով վավերականացման համար, որը գտնվում է այստեղ՝ <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
-    readonly_mode_during_backup: "Պահուստ ստեղծելիս միացնել միայն կարդալու համար ռեժիմը"
     enable_backups: "Թույլատրել ադմինիստրատորներին ստեղծել ֆորումի պահուստներ"
     allow_restore: "Թույլատրել վերականգնումը, որը կարող է փոխարինել կայքի ԲՈԼՈՐ տվյալները: Թողեք սխալ, մինչև որ չպլանավորեք վերականգնել պահուստ:"
     maximum_backups: "Պահուստների՝ դիսկի վրա պահելու առավելագույն քանակը: Ավելի հին պահուստները ավտոմատ կերպով ջնջվում են:"
@@ -1740,6 +1741,10 @@ hy:
       other: "%{count} գրառում միավորվել է գոյություն ունեցող հաղորդագրության՝ %{topic_link}"
   change_owner:
     post_revision_text: "Սեփականությունը փոխանցված է"
+  publish_page:
+    slug_errors:
+      blank: "չի կարող լինել դատարկ"
+      invalid: "պարունակում է անվավեր սիմվոլներ"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Այս հաղորդագրությունը ավտոմատ փակվել է՝ պատասխանների առավելագույն %{count} թվին հասնելուց հետո:"
@@ -2595,7 +2600,6 @@ hy:
       why: " %{site_link}-ի համառոտ ամփոփում՝ Ձեր %{last_seen_at}վերջին այցելությունից հետո"
       since_last_visit: "Ձեր վերջին այցելությունից հետո"
       new_topics: "Նոր Թեմաներ"
-      unread_messages: "Չկարդացած Նամակներ"
       unread_notifications: "Չկարդացած Ծանուցումներ"
       liked_received: "Ստացված Հավանումներ"
       new_users: "Նոր Օգտատերեր"
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index b8d01a2987..baf224e920 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -172,11 +172,6 @@ id:
   bookmarks:
     reminders:
       at_desktop: "Lain kali saat saya di depan komputer"
-      later_today: "Nanti <br/> {{date}}"
-      next_business_day: "Hari kerja berikutnya <br/> {{date}}"
-      tomorrow: "Besok <br/> {{date}}"
-      next_week: "Minggu depan <br/> {{date}}"
-      next_month: "Bulan depan <br/> {{date}}"
       custom: "Tanggal dan waktu tersuai"
   groups:
     errors:
@@ -541,6 +536,10 @@ id:
     types:
       category: "Kategori"
       user: "Pengguna"
+  publish_page:
+    slug_errors:
+      blank: "tidak boleh kosong"
+      invalid: "memuat karakter yang tidak valid"
   topic_statuses:
     autoclosed_disabled: "Topik telah dibuka. Jawaban baru sekarang diijinkan."
     autoclosed_disabled_lastpost: "Topik telah dibuka. Jawaban baru sekarang diijinkan."
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index bb53cb61cb..0169606eb3 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -37,9 +37,9 @@ it:
   anonymous: "Anonimo"
   remove_posts_deleted_by_author: "Cancellato dall'autore"
   redirect_warning: "Non è stato possibile verificare che il collegamento che hai selezionato sia stato effettivamente pubblicato sul forum. Se desideri procedere comunque, seleziona il collegamento qui sotto."
-  on_another_topic: "Su un altro Argomento"
+  on_another_topic: "Su un altro argomento"
   themes:
-    bad_color_scheme: "Impossibile aggiornare il Tema, paletta dei colori non valida"
+    bad_color_scheme: "Impossibile aggiornare il tema, paletta dei colori non valida"
     other_error: "Qualcosa è andato storto durante l'aggiornamento del tema"
     compile_error:
       unrecognized_extension: "Estensione del file non riconosciuta: %{extension}"
@@ -47,34 +47,36 @@ it:
       generic: Errore durante l'importazione del tema
       about_json: "Errore di importazione: about.json non esiste o non è valido"
       about_json_values: "about.json contiene valori non validi: %{errors}"
+      modifier_values: "I modificatori about.json contengono valori non validi: %{errors}"
       git: "Errore nella clonazione del repository git, accesso negato o repository non trovato"
-      unpack_failed: "Errore estranedo il contenuto del file"
+      unpack_failed: "Impossibile decomprimere il file"
       file_too_big: "Il file non compresso è troppo grande."
-      unknown_file_type: "Il file che hai caricato non sembra essere un tema di Discourse valido."
+      unknown_file_type: "Il file che hai caricato non sembra essere un tema valido di Discourse."
     errors:
       component_no_user_selectable: "I componenti del tema non possono essere selezionabili dall'utente"
       component_no_default: "I componenti del tema non possono essere il tema predefinito"
-      component_no_color_scheme: "I Componenti dei Temi non possono avere palette dei colori"
+      component_no_color_scheme: "I componenti dei temi non possono avere palette dei colori"
       no_multilevels_components: "I temi con temi figlio non possono essere essi stessi temi figlio"
+      optimized_link: I collegamenti ad immagini ottimizzate sono effimeri e non devono essere inclusi nel codice sorgente del tema.
     settings_errors:
       invalid_yaml: "Il codice YAML fornito è invalido."
-      data_type_not_a_number: "L'impostazione del tipo `%{name}` non è supportata. I tipi supportati sono `integer`, `bool`, `list` e `enum`"
+      data_type_not_a_number: "L'impostazione del tipo `%{name}` non è supportata. I tipi supportati sono `integer`,` bool`, `list`,` enum` e `upload`"
       name_too_long: "Una delle impostazioni ha un nome troppo lungo. La lunghezza massima è 255 caratteri"
-      default_value_missing: "L'impostazione `%{name}` non ha valore predefinito"
-      default_not_match_type: "L'impostazione del valore di `%{name}` valore predefinito non corrisponde al tipo di impostazione."
+      default_value_missing: "L'impostazione `%{name}` non ha alcun valore predefinito"
+      default_not_match_type: "L'impostazione del valore predefinito `%{name}` non corrisponde al tipo di impostazione."
       default_out_range: "L'impostazione del valore predefinito `%{name}` non è nell'intervallo specificato."
       enum_value_not_valid: "Il valore selezionato non è una delle opzioni enum."
       number_value_not_valid: "Il nuovo valore non è compreso nell'intervallo consentito."
-      number_value_not_valid_min_max: "Deve essere tra %{min} e %{max}."
+      number_value_not_valid_min_max: "Deve essere compreso tra %{min} e %{max}."
       number_value_not_valid_min: "Deve essere maggiore o uguale a %{min}."
       number_value_not_valid_max: "Deve essere minore o uguale a %{max}."
       string_value_not_valid: "La nuova lunghezza del valore non rientra nell'intervallo consentito."
-      string_value_not_valid_min_max: "Deve avere tra i %{min} ed i %{max} caratteri."
+      string_value_not_valid_min_max: "Deve essere lungo da %{min} a %{max} caratteri."
       string_value_not_valid_min: "Deve contenere almeno %{min} caratteri."
       string_value_not_valid_max: "Deve contenere al massimo %{max} caratteri."
     locale_errors:
-      top_level_locale: "La chiave di primo livello in un file di localizzazione deve essere identica al nome della localizzazione"
-      invalid_yaml: "File YAML della traduzione non valido"
+      top_level_locale: "La chiave di primo livello in un file di localizzazione deve corrispondere al nome della localizzazione"
+      invalid_yaml: "Traduzione YAML non valida"
   emails:
     incoming:
       default_subject: "L'argomento necessita di un titolo"
@@ -82,16 +84,17 @@ it:
       maximum_staged_user_per_email_reached: "E' stato raggiunto il numero massimo di utenti temporanei creati via email."
       no_subject: "(nessun oggetto)"
       no_body: "(nessun corpo del messaggio)"
-      missing_attachment: "(Allegato %{filename} mancante)"
+      missing_attachment: "(Manca l'allegato %{filename})"
       errors:
         empty_email_error: "Succede quando l'email ricevuta era vuota."
         no_message_id_error: "Succede quando l'email non ha l'intestazione 'Message-Id'."
         auto_generated_email_error: "Succede quando l'intestazione 'precedence' è impostata su: list, junk, bulk oppure auto_reply, oppure quando qualunque altra intestazione contiene: auto-submitted, auto-replied o auto-generated."
         no_body_detected_error: "Succede quando non si riesce ad estrapolare il corpo del messaggio e non ci sono allegati. "
         no_sender_detected_error: "Succede quando non abbiamo trovato un indirizzo email valido nell'intestazione From."
-        from_reply_by_address_error: "Accade quando l'intestazione From corrisponde alla risposta per indirizzo email."
+        from_reply_by_address_error: "Accade quando l'intestazione From corrisponde all'indirizzo email della risposta."
         inactive_user_error: "Succede quando il mittente non è attivo."
         silenced_user_error: "Succede quando il mittente è stato silenziato."
+        bad_destination_address: "Succede quando nessuno degli indirizzi email nei campi A/Cc corrisponde a un indirizzo email entrante configurato."
         strangers_not_allowed_error: "Succede quando un utente tenta di creare uno nuovo argomento in una categoria della quale non è membro."
         insufficient_trust_level_error: "Succede quando un utente tenta di creare un nuovo argomento in una categoria per la quale non ha il livello di esperienza richiesto."
         reply_user_not_matching_error: "Succede quando arriva una risposta da un indirizzo email diverso da quello cui la notifica era stata inviata."
@@ -102,6 +105,7 @@ it:
         unsubscribe_not_allowed: "Succede quando annullare l'iscrizione tramite email non è consentito per questo utente."
         email_not_allowed: "Succede quando l'indirizzo email non è in lista bianca oppure è nella lista nera."
       unrecognized_error: "Errore Non Riconosciuto"
+    secure_media_placeholder: "Redatto: questo sito ha abilitato i supporti sicuri, visita l'argomento per vedere immagine/audio/video allegati."
   errors: &errors
     format: "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>: %{message}"
@@ -123,6 +127,7 @@ it:
       inclusion: non è incluso nella lista
       invalid: non è valido
       is_invalid: "sembra poco chiaro, è una frase completa?"
+      invalid_timezone: "'%{tz}' non è un fuso orario valido"
       contains_censored_words: "contiene le seguenti parole censurate: %{censored_words}"
       less_than: "deve essere minore di %{count}"
       less_than_or_equal_to: "deve essere minore o uguale a %{count}"
@@ -131,7 +136,7 @@ it:
       odd: deve essere dispari
       record_invalid: "Validazione fallita: %{errors}"
       max_emojis: "non può avere più di %{max_emojis_count} emoji"
-      emojis_disabled: "emoji non disponibili"
+      emojis_disabled: "non può avere emoji"
       ip_address_already_screened: "è già incluso in una regola esistente"
       restrict_dependent_destroy:
         one: "Impossibile cancellare il record poiché ne esistono %{record} dipendenti"
@@ -146,12 +151,12 @@ it:
         one: ha una lunghezza errata (dovrebbe essere di %{count} carattere)
         other: ha una lunghezza errata (dovrebbe essere di %{count} caratteri)
       other_than: "deve essere diverso da %{count}"
-      sso_overrides_username: "Lo Username deve essere aggiornato nel provider SSO, dato che `sso_overrides_username` è abilitato."
+      sso_overrides_username: "Il nome utente deve essere aggiornato nel provider SSO, poichè l'impostazione del sito `sso_overrides_username` è abilitata."
     template:
       body: "Sono stati riscontrati problemi con i seguenti campi:"
       header:
         one: "%{count} errore ha impedito il salvataggio di questo %{model}"
-        other: "%{count} errori hanno impedito il salvataggio di questo %{model}"
+        other: "%{count} errori hanno impedito il salvataggio di %{model}"
     embed:
       load_from_remote: "Si è verificato un errore nel caricamento del messaggio."
     site_settings:
@@ -160,39 +165,42 @@ it:
         one: "Hai specificato la scelta non valida %{name}"
         other: "Hai specificato le scelte non valide %{name}"
       default_categories_already_selected: "Non puoi selezionare una categoria usata in un'altra lista."
+      default_tags_already_selected: "Non è possibile selezionare un'etichetta utilizzata in un altro elenco."
       s3_upload_bucket_is_required: "Non è possibile attivare i caricamenti su S3 a meno che non imposti l'opzione 's3_upload_bucket'."
-      enable_s3_uploads_is_required: "Non puoi attivare gli inventari su S3 a se il caricamento su S3 non è stato attivato a sua volta."
-      s3_backup_requires_s3_settings: "Non puoi usare S3 per salvare i backup senza che '%{setting_name}' sia stato fornito."
+      enable_s3_uploads_is_required: "Non puoi abilitare l'inventario su S3 se non hai abilitato i caricamenti S3."
+      s3_backup_requires_s3_settings: "Non è possibile utilizzare S3 per i backup a meno che non sia stato fornito '%{setting_name}'."
       s3_bucket_reused: "Non puoi usare lo stesso bucket per 's3_upload_bucket' e 's3_backup_bucket'. Scegli un bucket differente, o un percorso diverso per ciascun bucket."
-    conflicting_google_user_id: 'Il Google Account ID per questo account è cambiato; l''intervento dello staff è richiesto per motivi di sicurezza. Si prega di contattare staff e puntarli a <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+      secure_media_requirements: "I caricamenti S3 devono essere abilitati prima di abilitare i supporti sicuri."
+      second_factor_cannot_be_enforced_with_disabled_local_login: "Non è possibile applicare 2FA se i login locali sono disabilitati."
+    conflicting_google_user_id: 'Il Google Account ID per questo account è stato modificato; per motivi di sicurezza è richiesto l''intervendo dello staff. Si prega di contattare lo staff e indirizzarli a <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
   invite:
-    not_found: "Il tuo token di invito è invalido. <a href='%{base_url}/about'>Per favore contatta lo staff</a>."
-    not_found_json: "Il tuo token di invito è invalido. Per favore contatta lo staff."
+    not_found: "Il token del tuo invito non è valido. Per favore <a href='%{base_url}/about'>contatta lo staff</a>."
+    not_found_json: "Il token del tuo invito non è valido. Per favore contatta lo staff."
     not_found_template: |
-      <p>Il tuo invito a <a href="%{base_url}">%{site_name}</a> è già stato riscattato.</p>
+      <p>Il tuo invito su <a href="%{base_url}">%{site_name}</a> è già stato riscattato.</p>
 
-      <p>Se ricordi la tua password puoi effettuare il <a href="%{base_url}/login">Login</a>.</p>
+      <p>Se ricordi la tua password puoi <a href="%{base_url}/login">Accedere</a>.</p>
 
       <p>In caso contrario <a href="%{base_url}/password-reset">Reimposta la Password</a>.</p>
     error_message: "Si è verificato un errore accettando l'invito. Si prega di contattare l'amministratore del sito."
-    user_exists: "Non c'è bisogno di invitare <b>%{email}</b>, perché <a href='%{base_path}/u/%{username}/summary'>ha già un account!</a>"
-    confirm_email: "<p>Ci siamo quasi! Abbiamo mandato un'email di attivazione al tuo indirizzo di email. Per favore segui le istruzioni contenute nell'email per attivare il tuo account.</p><p>Se non dovesse arrivarti, controlla la tua cartella Spam.</p>"
+    user_exists: "Non è necessario invitare X, hanno già un account!\nNon è necessario invitare <b>%{email}</b>,  <a href='%{base_path}/u/%{username}/summary'>hanno già un account!</a>"
+    confirm_email: "<p>Ci siamo quasi! Abbiamo mandato un'email di attivazione al tuo indirizzo email. Per favore per attivare il tuo account segui le istruzioni contenute nell'email.</p><p>Se non dovesse arrivarti, controlla la tua cartella Spam.</p>"
   bulk_invite:
     file_should_be_csv: "Il file caricato deve essere in formato csv."
     max_rows: "I primi %{max_bulk_invites} inviti sono stati spediti. Prova a dividere il file in parti più piccole."
     error: "Si è verificato un errore durante il caricamento del file. Per favore riprova più tardi."
   topic_invite:
-    failed_to_invite: "L'utente non può essere invitato in questo Argomento senza essere membro di uno dei seguenti gruppi:: %{group_names}."
+    failed_to_invite: "L'utente non può essere invitato in questo argomento senza essere membro di uno dei seguenti gruppi: %{group_names}."
     user_exists: "Spiacenti, l'utente è stato già invitato. Puoi invitare un utente ad uno stesso argomento solo una volta ."
   backup:
     operation_already_running: "Un'operazione è attualmente in esecuzione. Non è possibile avviarne una nuova adesso."
     backup_file_should_be_tar_gz: "Il file di backup deve essere un archivio .tar.gz"
     not_enough_space_on_disk: "Non c'è abbastanza spazio su disco per caricare questo backup."
     invalid_filename: "Il nome del file di backup contiene caratteri non validi. I caratteri validi sono a-z 0-9 . - _."
-    file_exists: "Il file che stai provando a caricare è già esistente."
+    file_exists: "Il file che stai provando a caricare esiste già."
     location:
       local: "Locale"
       s3: "Amazon S3"
@@ -205,26 +213,26 @@ it:
   provider_not_enabled: "Non ti è consentito visualizzare la risorsa richiesta. Il provider di autenticazione non è abilitato."
   provider_not_found: "Non ti è consentito visualizzare la risorsa richiesta. Il provider di autenticazione non esiste."
   read_only_mode_enabled: "Il sito è in modalità di sola lettura. Le interazioni sono disabilitate."
-  invalid_grant_badge_reason_link: "I collegamenti esterni o collegamenti a Discourse non validi non sono consentiti nella ragione di un Distintivo"
+  invalid_grant_badge_reason_link: "Il collegamento esterno o il collegamento Discourse non  valido non è consentito nella motivazione di assegnazione di un distintivo"
   email_template_cant_be_modified: "Questo modello di email non può essere modificato."
-  invalid_whisper_access: "I Sussurri potrebbero non essere abilitati, oppure non hai il permesso di creare Messaggi Sussurri."
+  invalid_whisper_access: "I sussurri non sono abilitati oppure non hai i permessi per creare sussurri"
   not_in_group:
-    title_topic: "Devi essere membro di un gruppo per visualizzare questa argomento."
-    join_group: "Partecipa al Gruppo"
+    title_topic: "Devi essere membro di un gruppo per vedere questo argomento."
+    join_group: "Unisciti al Gruppo"
   reading_time: "Tempo di lettura"
   likes: "Mi piace"
   too_many_replies:
     one: "Spiacenti, ma i nuovi utenti possono inserire solo %{count} risposta nello stesso argomento."
     other: "Spiacenti, ma i nuovi utenti possono inserire solo %{count} risposte nello stesso argomento."
   max_consecutive_replies:
-    one: "Non sono consentite risposte consecutive. Per favore modifica le tue risposte precedenti o attendi che qualcuno ti risponda."
+    one: "Non sono consentite risposte consecutive. Per favore modifica la tua risposta precedente o attendi che qualcuno ti risponda."
     other: "Non sono consentite più di %{count} risposte consecutive. Per favore modifica le tue risposte precedenti oppure attendi che qualcuno ti risponda."
   embed:
     start_discussion: "Inizia Discussione"
     continue: "Continua Discussione"
     error: "Errore Inclusione"
     referer: "Referer:"
-    error_topics: "Il settaggio `includi la lista degli argomenti` non era abilitato"
+    error_topics: "L'impostazioni del sito `embed topics list` non è stata abilitata"
     mismatch: "Il referer non è stato inviato o non corrispondeva ad alcuno dei seguenti host:"
     no_hosts: "Non sono stati configurati host per l'inclusione."
     configure: "Configura Inclusione"
@@ -264,14 +272,14 @@ it:
     one: "Spiacenti, i nuovi utenti possono inserire al massimo un collegamento in un messaggio."
     other: "Spiacenti, i nuovi utenti possono inserire al massimo %{count} collegamenti in un messaggio."
   contains_blocked_word: "Il tuo messaggio contiene una parola non consentita: %{word}"
-  contains_blocked_words: "Il tuo post contiene parole non permesse: %{words}"
+  contains_blocked_words: "Il tuo messaggio contiene parole non consentite: %{words}"
   spamming_host: "Spiacenti, non puoi inserire un collegamento verso quel dominio."
   user_is_suspended: "Agli utenti sospesi non è permesso creare messaggi."
   topic_not_found: "Quancosa non ha funzionato. Forse questo argomento è stato chiuso o cancellato mentre lo leggevi."
   not_accepting_pms: "Spiacenti, %{username} non accetta messaggi al momento."
   max_pm_recipients: "Spiacenti, puoi inviare un messaggio ad un massimo di %{recipients_limit} destinatari."
   pm_reached_recipients_limit: "Spiacente, non sono consentiti più di %{recipients_limit} destinatari in un messaggio."
-  removed_direct_reply_full_quotes: "La citazione completa del messaggio precedente è stata rimossa automaticamente."
+  removed_direct_reply_full_quotes: "La citazione dell'intero messaggio precedente è stata rimossa automaticamente."
   just_posted_that: "è troppo simile a ciò che hai appena pubblicato"
   invalid_characters: "contiene caratteri non validi"
   is_invalid: "sembra poco chiaro, è una frase completa?"
@@ -305,19 +313,19 @@ it:
     tag: "Argomenti etichettati"
     badge: "distintivo %{display_name} su %{site_title}"
   too_late_to_edit: "Quel messaggio è stato creato troppo tempo fa. Non può più essere modificato né cancellato."
-  edit_conflict: "Il messaggio è stato modificato da un altro utente e i tuoi cambiamenti non possono essere salvati."
+  edit_conflict: "Il messaggio è stato modificato da un altro utente e le tue modifiche non possono più essere salvate."
   revert_version_same: "La versione attuale è la stessa versione che stai cercando di ripristinare."
   excerpt_image: "immagine"
   bookmarks:
     errors:
-      already_bookmarked_post: "Non puoi aggiungere più di un segnalibro allo stesso messaggio."
+      already_bookmarked_post: "Non puoi aggiungere due volte lo stesso messaggio nei segnalibri."
     reminders:
       at_desktop: "La prossima volta che sarò al mio desktop"
-      later_today: "Più tardi, oggi <br/> {{date}}"
-      next_business_day: "Il prossimo giorno lavorativo<br/> {{date}}"
-      tomorrow: "Domani <br/> {{date}}"
-      next_week: "La prossima settimana <br/> {{date}}"
-      next_month: "Il prossimo mese <br/> {{date}}"
+      later_today: "Più tardi oggi"
+      next_business_day: "Il prossimo giorno lavorativo"
+      tomorrow: "Domani"
+      next_week: "La prossima settimana"
+      next_month: "Il prossimo mese"
       custom: "Data e ora personalizzate"
   groups:
     success:
@@ -348,7 +356,6 @@ it:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Richesta di Adesione per @%{group_name}"
-      handle: "gestisci le richieste di iscrizione"
     view_hidden_topic_request_reason: "Vorrei far parte del gruppo '%{group_name}', per accedere [all'argomento](%{topic_url})"
   education:
     until_posts:
@@ -361,7 +368,7 @@ it:
 
       - Chi potrebbe esserne interessato? Perché è importante? Che tipo di risposte vorresti?
 
-      - Includi delle buone parole di ricerca nell'argomento così gli altri lo potranno *trovare*. Per raggruppare questo argomento con altri argomenti correlati, seleziona una categoria.
+      - Includi parole comunemente usate nel tuo argomento in modo che gli altri possano *trovarlo*. Per raggruppare questo argomento con altri argomenti correlati, seleziona una categoria.
 
       Per maggiori informazioni, [leggi le linee guida della comunità](%{base_path}/guidelines). Questo pannello sarà visualizzato solo per i tuoi primi %{education_posts_text}.
     "new-reply": |
@@ -391,7 +398,7 @@ it:
 
       E' più facile per chiunque leggere argomenti che hanno poche risposte ma più dettagliate, rispetto a molte brevi risposte individuali.
     dominating_topic: "### Consenti agli altri di partecipare alla conversazione\n\nQuesto argomento è chiaramente importante per te: hai inviato più dell' %{percent}% delle risposte. \n\nPotrebbe essere ancora meglio se dessi anche ad altri lo spazio per condividere i loro punti di vista. Ti va di invitarli?\n"
-    get_a_room: "### Incoraggiare tutti a partecipare alla conversazione\n\nHai risposto %{count} volte a @ %{reply_username} in questo particolare argomento! \n\nUna grande discussione vede protagoniste molte voci e punti di vista. Ti va di coinvolgere qualcun altro? \n\nE non dimenticare, se desideri continuare la tua conversazione privatamente con questo particolare utente, [invia un messaggio personale] (%{base_path}/u/%{reply_username}).\n"
+    get_a_room: "### Incoraggia tutti a partecipare alla conversazione\n\nHai risposto %{count} volte a @%{reply_username} in questo particolare argomento! \n\nUna grande discussione vede protagoniste molte voci e punti di vista. Ti va di coinvolgere qualcun altro? \n\nE non dimenticare, se desideri continuare la tua conversazione privatamente con questo particolare utente, [invia un messaggio personale](%{base_path}/u/%{reply_username}).\n"
     too_many_replies: |
       ### Hai raggiungo il limite di risposte per questo argomento
 
@@ -399,9 +406,9 @@ it:
 
       Invece di aggiungere un'altra risposta, per favore considera di modificare le tue precedenti risposte o di visitare altri argomenti.
     reviving_old_topic: |
-      ### Resuscitare questo argomento?
+      ### Vuoi resuscitare questo argomento?
 
-      L'ultima risposta a questo argomento risale a **%{time_ago}**. La tua risposta farà tornare l'argomento in cima alla lista e tutti gli utenti coinvolti verranno notificati.
+      L'ultima risposta a questo argomento risale a **%{time_ago}**. La tua risposta farà tornare l'argomento in cima alla lista e tutti gli utenti coinvolti saranno avvertiti.
 
       Sei sicuro di voler continuare questa vecchia discussione?
   activerecord:
@@ -424,10 +431,10 @@ it:
             base:
               warning_requires_pm: "Puoi allegare solo avvertimenti ai messaggi personali."
               too_many_users: "Puoi inviare avvertimenti ad un solo utente per volta."
-              cant_send_pm: "Spiacenti! Non puoi mandare messaggi personali a questo utente."
+              cant_send_pm: "Spiacenti, non puoi mandare messaggi personali a questo utente."
               no_user_selected: "Devi selezionare un utente valido."
               reply_by_email_disabled: "La risposta via email è stata disabilitata."
-              target_user_not_found: "Non è stato possibile trovare uno degli utenti a cui stai inviando questo messaggio."
+              target_user_not_found: "Impossibile trovare uno degli utenti a cui stai inviando questo messaggio."
             featured_link:
               invalid: "è invalido. Un URL dovrebbe includere http:// o https://."
               invalid_category: "non può essere modificato in questa categoria."
@@ -449,7 +456,7 @@ it:
         user_email:
           attributes:
             user_id:
-              reassigning_primary_email: "La riassegnazione di una email principale a un altro utente non è consentita."
+              reassigning_primary_email: "La riassegnazione di una email primaria un altro utente non è consentita."
         color_scheme_color:
           attributes:
             hex:
@@ -472,7 +479,7 @@ it:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Le seguenti chiavi(e) di interpolazione non sono valide: "%{keys}"'
+              invalid_interpolation_keys: 'Le seguenti chiavi di interpolazione non sono valide: "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -506,28 +513,28 @@ it:
 
       Congratulazioni! :confetti_ball:
 
-      Se vedi questo messaggio, significa che sei stato promosso ad **Assiduo** (Livello Esperienza 3).
+      Se vedi questo messaggio, significa che sei stato promosso ad **assiduo** (livello di esperienza 3).
 
       Da ora sarai in grado di: &hellip;
 
-      * Cambiare il titolo a qualsiasi Argomento
-      * Cambiare la Categoria di qualsiasi Argomento
+      * Cambiare il titolo a qualsiasi argomento
+      * Cambiare la categoria di qualsiasi argomento
       * I tuoi collegamenti saranno seguibili ([il nofollow automatico](http://en.wikipedia.org/wiki/Nofollow) è stato rimosso)
-      * Accedere alla categoria privata Lounge visibile ai soli utenti che hanno raggiunto il Livello Esperienza 3 o superiore
+      * Accedere alla categoria privata Salotto visibile ai soli utenti che hanno raggiunto il livello di esperienza 3 o superiore
       * Nascondere messaggi spam con una sola segnalazione
 
       Ecco la [lista degli attuali utenti con Livello Esperienza 3](%{base_path}/badges/3/regular). Lascia loro un saluto.
 
       Grazie per essere un importante membro della nostra comunità!
 
-      (Per ulteriori informazioni sui Livelli Esperienza dai [uno sguardo a questo Argomento][trust]. Tieni presente che solo gli utenti che continuano a rispettare i requisiti resteranno Assidui nel tempo.)
+      (Per ulteriori informazioni sui Livelli Esperienza dai [uno sguardo a questo Argomento][trust]. Tieni presente che solo gli utenti che continuano a rispettare i requisiti nel tempo resteranno assidui.)
 
       [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
-  admin_quick_start_title: "LEGGIMI PER PRIMO: Una guida rapida per amministratori"
+  admin_quick_start_title: "READ ME FIRST: Guida Rapida per Amministratore"
   category:
     topic_prefix: "Definizione della categoria %{category}"
-    replace_paragraph: "(Sostituisci questo primo paragrafo con una breve descrizione della tua nuova categoria. Questa guida verrà mostrata nell'area di scelta categoria, quindi stai sotto i 200 caratteri.)"
-    post_template: "%{replace_paragraph}\n\nUsa i seguenti paragrafi per una descrizione più estesa, ed anche per stabilire delle regole o linee guida per la categoria:\n\n- Perché la gente dovrebbe usare questa categoria? A che serve? \n\n- In cosa esattamente questa categoria è diversa dalle altre categorie già esistenti? \n\n- Cosa dovrebbero contenere gli argomenti in questa categoria? \n\n- C'è bisogno di questa categoria? Possiamo fonderla con un'altra categoria o sottocategoria?\n"
+    replace_paragraph: "(Sostituisci questo primo paragrafo con una breve descrizione della tua nuova categoria. Questa guida verrà mostrata nell'area di scelta categoria, quindi rimani sotto i 200 caratteri.)"
+    post_template: "%{replace_paragraph}\n\nUsa i seguenti paragrafi per una descrizione più estesa o per stabilire delle regole o linee guida per la categoria:\n\n- Perché la gente dovrebbe usare questa categoria? A che cosaserve? \n\n- In cosa esattamente questa categoria è diversa dalle altre categorie già esistenti? \n\n- Cosa dovrebbero contenere gli argomenti in questa categoria? \n\n- C'è bisogno di questa categoria? Possiamo fonderla con un'altra categoria o sottocategoria?\n"
     errors:
       not_found: "Categoria non trovata!"
       uncategorized_parent: "La categoria \"Nessuna\" non può avere una categoria superiore"
@@ -537,10 +544,10 @@ it:
       email_already_used_in_group: "L'indirizzo '%{email}' è stato già usato dal gruppo '%{group_name}'."
       email_already_used_in_category: "L'indirizzo '%{email}' è stato già usato dalla categoria '%{category_name}'."
       description_incomplete: "Il messaggio di descrizione della categoria deve avere almeno un paragrafo."
-      permission_conflict: "Qualsiasi gruppo cui sia permesso accedere ad una sottocategoria deve avere il permesso di accedere alla Categoria genitore. I seguenti gruppi hanno accesso a una delle sottocategorie ma non alla Categoria genitore: %{group_names}."
-      disallowed_topic_tags: "Questo Argomento ha Etichette non permesse in questa categoria: '%{tags}'"
+      permission_conflict: "Qualsiasi gruppo a cui è consentito l'accesso a una sottocategoria deve anche poter avere accesso alla categoria genitore. I seguenti gruppi hanno accesso a una delle sottocategorie ma non hanno accesso alla categoria genitore: %{group_names}."
+      disallowed_topic_tags: "In questo argomento sono presenti etichette non consentite in questa categoria: '%{tags}'"
     cannot_delete:
-      uncategorized: "Questa è una Categoria speciale. È utilizzata come area di parcheggio per gli Argomenti senza Categoria. Non può essere eliminata."
+      uncategorized: "Questa è una categoria speciale. È utilizzata come area di attesa per gli argomenti senza categoria. Non può essere eliminata."
       has_subcategories: "Non puoi cancellare questa categoria perché ha sotto-categorie."
       topic_exists:
         one: "Non puoi cancellare questa categoria perché ha %{count} argomento. L'argomento più vecchio è %{topic_link}."
@@ -569,20 +576,20 @@ it:
     slow_down: "Hai eseguito questa operazione troppe volte, riprova più tardi."
     too_many_requests: "Hai eseguito questa operazione troppe volte. Attendi %{time_left} prima di riprovare."
     by_type:
-      first_day_replies_per_day: "Hai raggiunto il massimo numero di risposte che può creare un nuovo utente il suo primo giorno. Per favore attendi %{time_left} prima di riprovare."
-      first_day_topics_per_day: "Hai raggiunto il massimo numero di argomenti che può creare un nuovo utente il suo primo giorno. Per favore attendi %{time_left} prima di riprovare."
-      create_topic: "Stai creando argomenti troppo rapidamente. Attendi %{time_left} prima di riprovare."
-      create_post: "Stai rispondendo troppo rapidamente. Attendi %{time_left} prima di riprovare."
-      delete_post: "Stai cancellando i messaggi troppo velocemente. Per favore attendi %{time_left} prima di riprovare."
-      public_group_membership: "Stai entrando/uscendo dai gruppi troppo di frequente. Per favore aspetta %{time_left} prima di riprovare."
-      topics_per_day: "Hai raggiunto il massimo numero di nuovi argomenti. Per favore attendi %{time_left} prima di riprovare."
-      pms_per_day: "Hai raggiunto il massimo numero di messaggi. Per favore attendi %{time_left} prima di riprovare."
-      create_like: "Hai raggiunto il massimo numero di \"Mi piace\". Per favore attendi %{time_left} prima di riprovare."
-      create_bookmark: "Hai raggiunto il massimo numero di segnalibri. Per favore attendi %{time_left} prima di riprovare."
-      edit_post: "Hai raggiunto il massimo numero di modifiche. Per favore attendi %{time_left} prima di riprovare."
-      live_post_counts: "Stai richiedendo troppo velocemente il conteggio dei messaggi attivi. Per favore attendi %{time_left} prima di riprovare."
-      unsubscribe_via_email: "Hai raggiunto il massimo numero di cancellazioni via email. Per favore aspetta %{time_left} prima di riprovare."
-      topic_invitations_per_day: "Hai raggiunto il numero massimo di inviti ad argomenti. Per favore aspetta %{time_left} prima di riprovare."
+      first_day_replies_per_day: "Hai raggiunto il numero massimo di risposte che un nuovo utente può creare il suo primo giorno. Attendi %{time_left} prima di riprovare."
+      first_day_topics_per_day: "Hai raggiunto il numero massimo di argomenti che un nuovo utente può creare il suo primo giorno. Attendi %{time_left} prima di riprovare."
+      create_topic: "Stai creando argomenti troppo velocemente. Attendi %{time_left} prima di riprovare."
+      create_post: "Stai rispondendo troppo velocemente. Attendi %{time_left} prima di riprovare."
+      delete_post: "Stai cancellando i messaggi troppo velocemente. Attendi %{time_left} prima di riprovare."
+      public_group_membership: "Stai entrando/uscendo dai gruppi troppo di frequente. Attendi %{time_left} prima di riprovare."
+      topics_per_day: "Hai raggiunto il numero massimo di nuovi argomenti. Attendi %{time_left} prima di riprovare."
+      pms_per_day: "Hai raggiunto il numero massimo di messaggi. Attendi %{time_left} prima di riprovare."
+      create_like: "Hai raggiunto il numero massimo di \"Mi piace\". Attendi %{time_left} prima di riprovare."
+      create_bookmark: "Hai raggiunto il numero massimo di segnalibri. Attendi %{time_left} prima di riprovare."
+      edit_post: "Hai raggiunto il numero massimo di modifiche. Attendi %{time_left} prima di riprovare."
+      live_post_counts: "Stai richiedendo troppo velocemente il conteggio dei messaggi attivi. Attendi %{time_left} prima di riprovare."
+      unsubscribe_via_email: "Hai raggiunto il numero massimo di cancellazioni via email. Attendi %{time_left} prima di riprovare."
+      topic_invitations_per_day: "Hai raggiunto il numero massimo di inviti ad argomenti. Attendi %{time_left} prima di riprovare."
     hours:
       one: "%{count} ora"
       other: "%{count} ore"
@@ -672,8 +679,8 @@ it:
     success: "La tua password è stata cambiata con successo e ora sei connesso."
     success_unapproved: "La tua password è stata cambiata con successo."
   email_login:
-    invalid_token: "Spiacenti, il collegamento per la connessione via email è scaduto. Seleziona il pulsante Connetti e clicca 'Ho dimenticato la password' per ricevere un nuovo collegamento."
-    title: "Connessione tramite Email"
+    invalid_token: "Spiacenti, il collegamento per l'accesso via email è scaduto. Seleziona il pulsante Connetti e clicca 'Ho dimenticato la password' per ricevere un nuovo collegamento."
+    title: "Accesso via Email"
   user_auth_tokens:
     browser:
       chrome: "Google Chrome"
@@ -690,10 +697,10 @@ it:
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
-      linux: "GNU/Linux Computer"
+      linux: "Computer GNU/Linux "
       mac: "Mac"
       mobile: "Dispositivo Mobile"
-      windows: "Windows Computer"
+      windows: "Computer Windows "
       unknown: "dispositivo sconosciuto"
     os:
       android: "Android"
@@ -747,20 +754,20 @@ it:
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: "Inappropriato"
-      description: 'Questo messaggio ha dei contenuti che una persona ragionevole considererebbe offensivi, aggressivi o una violazione delle<a href="%{base_path}/guidelines"> linee guida della comunità</a>.'
+      description: 'Questo messaggio ha dei contenuti che una persona ragionevole considererebbe offensivi, aggressivi o una violazione delle<a href="%{base_path}/guidelines">linee guida della comunità</a>.'
       short_description: 'Una violazione delle <a href="%{base_path}/guidelines">linee guida della nostra comunità</a>'
       long_form: "segnalato come inappropriato"
     notify_user:
       title: "Invia un messaggio a @{{username}}"
-      description: "Voglio parlare con questa persona direttamente a proposito del suo messaggio."
-      short_description: "Voglio parlare con questa persona direttamente a proposito del suo messaggio."
+      description: "Voglio parlare direttamente con questa persona a proposito del suo messaggio."
+      short_description: "Voglio parlare direttamente con questa persona a proposito del suo messaggio."
       long_form: "messaggio inviato"
       email_title: 'Il tuo messaggio su "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Altro"
       description: "Questo messaggio richiede attenzione da parte dello staff per un altro motivo non elencato."
-      short_description: "Richiede l'attenzione dello staff per un'altra ragione"
+      short_description: "Richiede l'attenzione dello staff per un altro motivo"
       long_form: "segnalato all'attenzione dello staff"
       email_title: 'Un messaggio in "%{title}" richiede l''attenzione dello staff'
       email_body: "%{link}\n\n%{message}"
@@ -779,7 +786,7 @@ it:
       self: "Non hai ancora nessuna attività."
       others: "Nessuna attività."
     no_bookmarks:
-      self: "Non hai messaggi nei Segnalibri. I Segnalibri ti consentono di accedere velocemente a specifici messaggi."
+      self: "Non hai aggiunto messaggi nei segnalibri. I segnalibri ti consentono di accedere velocemente a specifici messaggi."
       others: "Nessun segnalibro."
     no_likes_given:
       self: "Non hai messo \"Mi piace\" ad alcun messaggio."
@@ -788,7 +795,7 @@ it:
       self: "Non hai risposto a nessun messaggio."
       others: "Nessuna risposta."
     no_drafts:
-      self: "Non hai bozze. Iniziando a scrivere una risposta a un qualsiasi Argomento, questa verrà automaticamente salvata come nuova Bozza."
+      self: "Non hai bozze; inizia a scrivere una risposta in qualsiasi argomento e verrà automaticamente salvata come nuova bozza"
   topic_flag_types:
     spam:
       title: "Spam"
@@ -797,14 +804,14 @@ it:
       short_description: "Questo è un annuncio pubblicitario"
     inappropriate:
       title: "Inappropriato"
-      description: 'Questo Argomento ha dei contenuti che una persona ragionevole considererebbe offensivi, aggressivi o una violazione delle<a href="%{base_path}/guidelines"> linee guida della comunità</a>.'
+      description: 'Questo argomento ha dei contenuti che una persona ragionevole considererebbe offensivi, aggressivi o una violazione delle<a href="%{base_path}/guidelines"> linee guida della comunità</a>.'
       long_form: "segnalato come inappropriato"
       short_description: 'Una violazione delle <a href="%{base_path}/guidelines">linee guida della nostra comunità</a>'
     notify_moderators:
       title: "Altro"
-      description: 'Questo argomento richiede attenzione da parte deilo staff in base alle <a href="%{base_path}/guidelines">linee guida</a>, ai<a href="%{tos_url}">termini di servizio</a>, o per altri motivi non elencati.'
+      description: 'Questo argomento richiede attenzione da parte deilo staff in base alle <a href="%{base_path}/guidelines">linee guida</a>, ai<a href="%{tos_url}">Termini di Servizio</a>, o per altri motivi non elencati.'
       long_form: "segnalato all'attenzione dei moderatori"
-      short_description: "Richiede l'attenzione dello staff per un'altra ragione"
+      short_description: "Richiede l'attenzione dello staff per un altro motivo"
       email_title: 'L''argomento "%{title}" richiede l''attenzione di un moderatore'
       email_body: "%{link}\n\n%{message}"
   flagging:
@@ -822,9 +829,9 @@ it:
         remove: "Questo argomento non è più uno striscione. Non apparirà più in cima ad ogni pagina."
   unsubscribed:
     title: "Preferenze email aggiornate!"
-    description: "Le preferenze email per <b>%{email}</b> sono state aggiornate. Per cambiare le tue impostazioni email <a href='%{url}'>accedi alle tue Preferenze Utente</a>."
+    description: "le preferenze email per <b>%{email}</b> sono state aggiornate. Per cambiare le tue impostazioni email <a href='%{url}'>accedi alle tue preferenze utente</a>."
     topic_description: "Per re-iscriverti a %{link}, usa il controllo notifiche in fondo o a destra dell'argomento."
-    private_topic_description: "Per reiscriverti, usa il controllo notifiche in fondo o alla destra dell'Argomento."
+    private_topic_description: "Per re-iscriverti, usa il controllo notifica in fondo o sulla destra dell'argomento."
   unsubscribe:
     title: "Annulla iscrizione"
     stop_watching_topic: "Smetti di osservare questo argomento, %{link}"
@@ -837,8 +844,8 @@ it:
     log_out: "Disconnetti"
     submit: "Salva preferenze"
     digest_frequency:
-      title: "Ricevi un sommario via email ogni %{frequency}"
-      select_title: "Imposta la frequenza delle email di sommario a:"
+      title: "Stai ricevendo email riepilogative ogni %{frequency}"
+      select_title: "Imposta la frequenza delle email riepilogative a:"
       never: "mai"
       every_30_minutes: "ogni 30 minuti"
       every_hour: "ogni ora"
@@ -852,8 +859,8 @@ it:
     read: "lettura"
     read_write: "lettura/scrittura"
     description: '"%{application_name}" richiede il seguente accesso al tuo account:'
-    instructions: 'Abbiamo appena generato una nuova chiave API utente da usare con "%{application_name}", per favore, incollala nella tua applicazione.'
-    otp_description: 'Vuoi consentire ad "%{application_name}" di accedere al sito?'
+    instructions: 'Abbiamo appena generato una nuova chiave API utente da usare con "%{application_name}", incolla la seguente chiave nella tua applicazione:'
+    otp_description: 'Vuoi consentire a "%{application_name}" l''accesso al sito?'
     otp_confirmation:
       confirm_title: "Procedi su %{site_name}."
       logging_in_as: "Accedi come %{username}"
@@ -867,13 +874,13 @@ it:
       session_info: "Leggi le info della sessione utente"
       read: "Leggi tutto"
       write: "Scrivi tutto"
-      one_time_password: "Crea un token usa e getta per collegarsi"
+      one_time_password: "Crea un token di accesso usa e getta"
     invalid_public_key: "Spiacente, la chiave pubblica non è valida."
-    invalid_auth_redirect: "Spiacenti, questo auth_redirect non è consentito."
+    invalid_auth_redirect: "Spiacenti, questo host auth_redirect non è consentito."
     invalid_token: "Token mancante, non valido o scaduto."
   flags:
     errors:
-      already_handled: "La segnalazione è già stata processata."
+      already_handled: "La segnalazione è già stata gestita."
   reports:
     default:
       labels:
@@ -888,16 +895,16 @@ it:
         editor: Redattore
         author: Autore
         edit_reason: Motivo
-      description: "Numero di modifiche a nuovi messaggi."
+      description: "Numero di nuove modifiche al messaggio."
     user_flagging_ratio:
-      title: "Rapporto Segnalazione Utenti"
+      title: "Rapporto Segnalazione Utente"
       labels:
         user: Utente
         agreed_flags: Segnalazioni accettate
-        disagreed_flags: Segnalazioni non accettate
+        disagreed_flags: Segnalazioni rifiutate
         ignored_flags: Segnalazioni ignorate
         score: Punteggio
-      description: "Lista degli Utenti ordinata per rapporto delle risposte alle loro segnalazioni (da Rifiutate ad Accettate)"
+      description: "Elenco degli utenti ordinato in base al rapporto tra le risposte dello staff alle loro segnalazioni (da rifiutate ad accettate)"
     moderators_activity:
       title: "Attività Moderatore"
       labels:
@@ -906,9 +913,9 @@ it:
         time_read: Tempo di lettura
         topic_count: Argomenti creati
         post_count: Messaggi creati
-        pm_count: Messaggi Privati creati
+        pm_count: MP creati
         revision_count: Revisioni
-      description: "Lista delle attività dei Moderatori, incluse segnalazioni, revisioni, tempo di lettura, Argomenti creati, Messaggi creati, Messaggi Personali creati."
+      description: "Elenco delle attività del moderatore, incluse segnalazioni revisionate, tempo di lettura, argomenti creati, messaggi creati, messaggi personali creati."
     flags_status:
       title: "Stato Segnalazioni"
       values:
@@ -922,32 +929,32 @@ it:
         poster: Autore
         flagger: Segnalante
         time_to_resolution: Tempo di risoluzione
-      description: "Lista stati delle Segnalazioni inclusi tipo di segnalazione, autore, segnalante e tempo di risoluzione."
+      description: "Elenco degli stati delle segnalazioni inclusi tipo di segnalazione, autore, segnalante e tempo di risoluzione."
     visits:
       title: "Visite Utente"
       xaxis: "Giorno"
       yaxis: "Numero di visite"
-      description: "Numero di visite di tutti gli utenti."
+      description: "Numero di tutte le visite degli utenti."
     signups:
       title: "Iscrizioni"
       xaxis: "Giorno"
       yaxis: "Numero di iscrizioni"
       description: "Nuovi account registrati durante questo periodo."
     new_contributors:
-      title: "Nuovi contributori"
+      title: "Nuovi Contributori"
       xaxis: "Giorno"
       yaxis: "Numero di nuovi contributori"
       description: "Numero di utenti che hanno inviato il loro primo messaggio durante questo periodo."
     trust_level_growth:
       yaxis: "Giorno"
     consolidated_page_views:
-      title: "Visualizzazioni pagine consolidato"
+      title: "Pagine Viste Consolidate"
       xaxis:
-        page_view_crawler: "Crawlers"
+        page_view_crawler: "Crawler"
         page_view_anon: "Utenti anonimi"
         page_view_logged_in: "Utenti connessi"
       yaxis: "Giorno"
-      description: "Visualizzazioni pagine da utenti connessi, utenti anonimi e crawlers."
+      description: "Visualizzazioni di pagina per utenti che hanno effettuato l'accesso, utenti anonimi e crawler."
       labels:
         post: Messaggio
         editor: Redattore
@@ -957,17 +964,17 @@ it:
       title: "DAU/MAU"
       xaxis: "Giorno"
       yaxis: "DAU/MAU"
-      description: "Numero di membri che si sono connessi nelle ultime 24 ore diviso per il numero di utenti che si sono connessi nell'ultimo mese - restituisce una percentuale che rappresenta la 'permanenza' della comunità. Mirate a >30%"
+      description: "Numero di utenti che hanno effettuato l'accesso nell'ultimo giorno diviso per il numero di utenti che hanno effettuato l'accesso nell'ultimo mese - restituisce una % che rappresenta 'l'attaccamento' alla comunità. Obiettivo > 30%."
     daily_engaged_users:
-      title: "Utenti Impegnati giornalieri"
+      title: "Utenti Impegnati Giornalmente"
       xaxis: "Giorno"
       yaxis: "Utenti Impegnati"
-      description: "Numero di utenti che hanno scritto o messo Mi piace nell'ultimo giorno"
+      description: "Numero di utenti che hanno messo \"Mi piace\" o pubblicato nell'ultimo giorno."
     profile_views:
       title: "Visite Profilo Utente"
       xaxis: "Giorno"
       yaxis: "Numero profili utente visualizzati"
-      description: "Totale nuove visualizzazioni dei Profili Utente"
+      description: "Totale nuove visualizzazioni dei profili utente."
     topics:
       title: "Argomenti"
       xaxis: "Giorno"
@@ -982,7 +989,7 @@ it:
       title: "Mi piace"
       xaxis: "Giorno"
       yaxis: "Numero di nuovi \"Mi piace\""
-      description: "Numero di nuovi Mi Piace"
+      description: "Numero di nuovi \"Mi piace\""
     flags:
       title: "Segnalazioni"
       xaxis: "Giorno"
@@ -992,14 +999,14 @@ it:
       title: "Segnalibri"
       xaxis: "Giorno"
       yaxis: "Numero di nuovi segnalibri"
-      description: "Numero di Argomenti e Messaggi nei Segnalibri"
+      description: "Numero di nuovi argomenti e messaggi aggiunti ai segnalibri."
     users_by_trust_level:
       title: "Utenti per Livello Esperienza"
       xaxis: "Livello Esperienza"
       yaxis: "Numero Utenti"
       labels:
         level: Livello
-      description: "Numero di Utenti raggruppati per Livello Esperienza."
+      description: "Numero di utenti raggruppati per livello di esperienza."
     users_by_type:
       title: "Utenti per Tipo"
       xaxis: "Tipo"
@@ -1011,9 +1018,9 @@ it:
         moderator: Moderatore
         suspended: Sospeso
         silenced: Silenziato
-      description: "Numero di utenti raggruppati tra Amministratori, Moderatori, Sospesi e Silenziati."
+      description: "Numero di utenti raggruppati per amministratore, moderatore, sospeso e silenziato."
     trending_search:
-      title: Termini più cercati
+      title: Termini di Ricerca di Tendenza
       labels:
         term: Termine
         searches: Ricerche
@@ -1028,46 +1035,46 @@ it:
       title: "Utente-Utente (escluse le risposte)"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
-      description: "Numero di nuovi Messaggi Privati."
+      description: "Numero di messaggi personali avviati di recente."
     user_to_user_private_messages_with_replies:
       title: "Utente-Utente (incluse le risposte)"
       xaxis: "Giorno"
-      yaxis: "Numero di Messaggi"
-      description: "Numero totale di Messaggi Personali e relative risposte."
+      yaxis: "Numero di messaggi personali"
+      description: "Numero di tutti i nuovi messaggi e risposte personali."
     system_private_messages:
       title: "Sistema"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
-      description: "Numero di Messaggi Personali inviati automaticamente dal sistema."
+      description: "Numero di messaggi personali inviati automaticamente da System."
     moderator_warning_private_messages:
       title: "Segnalazione Moderatore"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
-      description: "Numero di richiami inviati via Messaggio Personali da Moderatori."
+      description: "Numero di avvisi inviati dai moderatori attraverso messaggi personali."
     notify_moderators_private_messages:
       title: "Notifica i Moderatori"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
-      description: "Numero di notifiche ricevute privatamente dai Moderatori tramite Segnalazioni."
+      description: "Numero di volte in cui i moderatori sono stati notificati privatamente tramite segnalazioni."
     notify_user_private_messages:
       title: "Notifiche Utente"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
-      description: "Numero di notifiche ricevute privatamente dagli Utenti tramite Segnalazioni."
+      description: "Numero di volte in cui gli utenti sono stati notificati privatamente tramite segnalazioni."
     top_referrers:
       title: "Migliori Referrer"
       xaxis: "Utente"
-      num_clicks: "Click"
+      num_clicks: "Clic"
       num_topics: "Argomenti"
       labels:
         user: "Utente"
         num_clicks: "Clic"
         num_topics: "Argomenti"
-      description: "Lista Utenti per numero di click su collegamenti da essi condivisi."
+      description: "Utenti elencati per numero di clic sui collegamenti che hanno condiviso."
     top_traffic_sources:
       title: "Migliori Sorgenti di Traffico"
       xaxis: "Dominio"
-      num_clicks: "Click"
+      num_clicks: "Clic"
       num_topics: "Argomenti"
       num_users: "Utenti"
       labels:
@@ -1080,37 +1087,37 @@ it:
       labels:
         num_clicks: "Clic"
         topic: "Argomento"
-      description: "Argomenti che hanno ricevuto il maggior numero di click da fonti esterne."
+      description: "Argomenti che hanno ricevuto il maggior numero di clic da fonti esterne."
     page_view_anon_reqs:
       title: "Anonimo"
       xaxis: "Giorno"
       yaxis: "Visualizzazioni pagina da visitatori Anonimi"
-      description: "Numero di nuove visualizzazioni pagina da utenti non connessi."
+      description: "Numero di nuove pagine viste da visitatori non connessi ad un account."
     page_view_logged_in_reqs:
       title: "Connesso"
       xaxis: "Giorno"
       yaxis: "Pagine viste da utenti connessi"
-      description: "Numero di nuove visualizzazioni pagina da utenti connessi."
+      description: "Numero di nuove pagine viste da utenti connessi."
     page_view_crawler_reqs:
-      title: "Visualizzazioni pagina da Spider web"
+      title: "Pagine Viste da Web Crawler"
       xaxis: "Giorno"
-      yaxis: "Visualizzazioni pagina da Spider web"
-      description: "Totale visualizzazioni pagina da web crawlers nel corso del tempo."
+      yaxis: "Pagine Viste da Web Crawler"
+      description: "Totale pagine viste da web crawler nel tempo."
     page_view_total_reqs:
       title: "Pagine viste"
       xaxis: "Giorno"
-      yaxis: "Visualizzazioni pagina totali"
-      description: "Numero di nuove visualizzazioni pagina da tutti i visitatori,"
+      yaxis: "Totale Pagine Viste"
+      description: "Numero di nuove pagine viste da tutti i visitatori."
     page_view_logged_in_mobile_reqs:
       title: "Pagine viste da utenti connessi"
       xaxis: "Giorno"
-      yaxis: "Pagine viste da utenti connessi su mobile"
-      description: "Numero di nuove visualizzazioni pagina da Utenti con dispositivi mobili e connessi ad un account."
+      yaxis: "Pagine Viste da Utenti Connessi su Mobile"
+      description: "Numero di nuove pagine viste da utenti su dispositivi mobile e connessi ad un account."
     page_view_anon_mobile_reqs:
       title: "Visualizzazioni pagina da visitatori anonimi"
       xaxis: "Giorno"
-      yaxis: "Visualizzazioni pagina da visitatori anonimi su dispositivi mobili"
-      description: "Numero di nuove visualizzazioni pagina da Utenti con dispositivi mobili e non connessi ad un account."
+      yaxis: "Pagine Viste da Visitatori Anonimi su Mobile"
+      description: "Numero di nuove pagine viste da utenti su dispositivi mobile e non connessi ad un account."
     http_background_reqs:
       title: "Background"
       xaxis: "Giorno"
@@ -1139,25 +1146,25 @@ it:
       title: "Tempo per la prima risposta"
       xaxis: "Giorno"
       yaxis: "Tempo medio (ore)"
-      description: "Tempo medio (in ore) della prima risposta a nuovi Argomenti."
+      description: "Tempo medio (in ore) della prima risposta a nuovi argomenti."
     topics_with_no_response:
       title: "Argomenti senza risposta"
       xaxis: "Giorno"
       yaxis: "Totali"
-      description: "Numero di nuovi Argomenti creati che non hanno ricevuto una risposta."
+      description: "Numero di nuovi argomenti creati che non hanno ricevuto una risposta."
     mobile_visits:
-      title: "Visite Utente (telefono)"
+      title: "Visite Utente (da mobile)"
       xaxis: "Giorno"
       yaxis: "Numero di visite"
-      description: "Numero di Utenti unici che hanno visitato il sito tramite dispositivi mobili."
+      description: "Numero di utenti unici che hanno visitato il sito con un dispositivo mobile."
     web_crawlers:
-      title: "Web Crawler User Agents"
+      title: "User Agents Web Crawler"
       labels:
         user_agent: "User Agent"
         page_views: "Pagine viste"
-      description: "Lista degli User Agents di Web Crawler, ordinati per pagine visualizzate."
+      description: "Elenco di user agents usati da web crawler, ordinati per pagine viste."
     suspicious_logins:
-      title: "Connessioni sospette"
+      title: "Accessi Sospetti"
       labels:
         user: Utente
         client_ip: IP client
@@ -1165,15 +1172,15 @@ it:
         browser: Browser
         device: Dispositivo
         os: Sistema Operativo
-        login_time: Ora di connessione
+        login_time: Ora di Accesso
       description: "Dettagli delle nuove connessioni sospettosamente diverse dalle precedenti."
     staff_logins:
-      title: "Connessioni degli Amministratori"
+      title: "Accessi Amministratore"
       labels:
         user: Utente
         location: Località
-        login_at: Connessione alle
-      description: "Lista degli orari di connessione degli Amministratori e relative posizioni."
+        login_at: Accesso alle
+      description: "Elenco degli orari di accesso dell'amministratore e relative posizioni."
     top_uploads:
       title: "Migliori Caricamenti"
       labels:
@@ -1181,18 +1188,17 @@ it:
         extension: Estensione
         author: Autore
         filesize: Dimensione file
-      description: "Elenca tutti i caricamenti per estensione, dimensioni ed autore."
+      description: "Elenco di tutti i caricamenti per estensione, dimensioni ed autore."
     top_ignored_users:
-      title: "Principali Utenti ignorati / silenziati"
+      title: "Principali Utenti Ignorati / Silenziati"
       labels:
-        ignored_user: Utenti ignorati
+        ignored_user: Utenti Ignorati
         ignores_count: Conteggio ignorati
         mutes_count: Conteggio silenziati
-      description: "Utenti che sono stati mutati / ignorati da svariati altri Utenti."
+      description: "Utenti che sono stati silenziati e/o ignorati da molti altri utenti."
   dashboard:
     rails_env_warning: "Il tuo server è in modalità %{env}."
     host_names_warning: "Il tuo file config/database.yml usa l'hostname di default: localhost. Aggiornalo con l'hostname del tuo sito."
-    gc_warning: 'Il tuo server usa i parametri di garbage collection di default di ruby, che potrebbero non garantirti le migliori prestazioni. Leggi questo argomento sulla taratura delle prestazioni: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq non è in esecuzione. Molte attività, come l''invio di email, sono eseguite in maniera asincrona da sidekiq. Assicurati che almeno un processo sidekiq sia in esecuzione. <a href="https://github.com/mperham/sidekiq" target="_blank">Leggi altro su sidekiq qui</a>.'
     queue_size_warning: "Il numero di job in coda è %{queue_size}, il che è alto. Ciò potrebbe indicare un problema con i processi Sidekiq, oppure devi aggiungere altri worker Sidekiq."
     memory_warning: "Il tuo server gira con meno di 1 GB di memoria. Si raccomanda almeno 1 GB di memoria."
@@ -1297,8 +1303,6 @@ it:
     force_https: "Forza il tuo sito ad usare solo HTTPS. ATTENZIONE: NON abilitare questa opzione finché non hai verificato che HTTPS è pienamente configurato e sta funzionando ovunque! Hai verificato il tuo CDN, tutti i social login, ed ogni logo esterno / dipendenze per essere sicuro che sono anch'essi tutti compatibili con HTTPS?"
     same_site_cookies: "Utilizza gli stessi cookie del sito, si eliminano tutti i vettori Cross Site Request Forgery nei browser supportati (Lax o Strict). Avviso: Strict lavorerà solo su siti che forzano l'accesso e utilizzano SSO."
     summary_score_threshold: "Il punteggio minimo richiesto affinché un messaggio sia incluso in 'Riassumi Questo Argomento'"
-    summary_posts_required: "Minimo numero di messaggi in un argomento affinché venga abilitato 'Riassumi Questo Argomento' "
-    summary_likes_required: "Minimo numero di \"Mi piace\" in un argomento affinché venga abilitato 'Riassumi Questo Argomento'"
     summary_percent_filter: "Quando un utente clicca su 'Riassumi Questo Argomento', mostra i primi % messaggi"
     summary_max_results: "Messaggi massimi restituiti da 'Riepiloga questo argomento'."
     enable_personal_messages: "Autorizza gli utenti con livello di esperienza 1 (configurabile attraverso \"min livello di esperienza per l'invio di messaggi\") a creare e rispondere ai messaggi. Nota che lo staff può inviare messaggi in ogni caso."
@@ -1430,7 +1434,6 @@ it:
     enable_github_logins: "Abilita l'autenticazione Github, richiede github_client_id e github_client_secret. Vedi <a href='https://meta.discourse.org/t/13745' target='_blank'>Configurare l'accesso a GitHub per Discourse</a> ."
     github_client_id: "Client id per l'autenticazione Github, registrato su <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Client secret per l'autenticazione Github, registrato su <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
-    readonly_mode_during_backup: "Abilita la modalità sola lettura mentre è in esecuzione un backup"
     enable_backups: "Consenti agli amministratori di creare backup del forum"
     allow_restore: "Abilita il ripristino, che sostituisce TUTTI i dati del sito! Lascia a falso a meno che non hai intenzione di ripristinare un backup."
     maximum_backups: "Il numero massimo di backup da mantenere sul disco. I backup più vecchi vengono automaticamente cancellati."
@@ -1532,7 +1535,7 @@ it:
     min_trust_to_edit_wiki_post: "Livello minimo richiesto per modificare un argomento segnato come wiki."
     min_trust_to_edit_post: "Il livello di esperienza minimo richiesto per modificare i messaggi."
     min_trust_to_allow_self_wiki: "Il livello di esperienza minimo richiesto per consentire agli utenti di pubblicare una propria wiki."
-    min_trust_to_send_messages: "Il Livello Esperienza minimo richiesto per creare nuovi messaggi personali."
+    min_trust_to_send_messages: "Il livello di esperienza minimo richiesto per creare nuovi messaggi personali."
     min_trust_to_flag_posts: "Il Livello Esperienza minimo richiesto per segnalare messaggi"
     min_trust_to_post_links: "Il Livello Esperienza minimo richiesto per includere collegamenti nei messaggi"
     min_trust_to_post_images: "Il Livello Esperienza minimo richiesto per includere le immagini in un messaggio"
@@ -1547,7 +1550,7 @@ it:
     enable_mentions: "Permetti agli utenti di menzionare altri utenti."
     create_thumbnails: "Crea anteprime e lightbox delle immagini che sono troppo grandi per essere contenute in un messaggio."
     email_time_window_mins: "Aspetta (n) minuti prima di inviare email di notifica, per dare agli utenti la possibilità di modificare e completare i loro messaggi."
-    personal_email_time_window_seconds: "Attendi (n) secondi prima di inviare qualsiasi email di notifica della presenza di messaggi personali, per dare agli utenti la possibilità di modificare e finalizzare i loro messaggi."
+    personal_email_time_window_seconds: "Attendi (n) secondi prima di inviare qualsiasi email di notifica di messaggi personali, per dare agli utenti la possibilità di modificare e finalizzare i propri messaggi."
     email_posts_context: "Quante risposte precedenti inserire come contesto nelle email di notifica."
     flush_timings_secs: "Frequenza di svuotamento dei dati temporali verso il server, in secondi."
     title_max_word_length: "La lunghezza massima di una parola, in caratteri, nel titolo di un argomento."
@@ -1668,7 +1671,7 @@ it:
     digest_posts: "Numero massimo dei messaggi di successo da mostrare nell'email riepilogativa."
     digest_other_topics: "Il numero massimo di argomenti da mostrare nella sezione \"Nuovi argomenti e categorie che segui\" delle email di riepilogo."
     digest_min_excerpt_length: "Lunghezza minima dell'estratto del messaggio nell'email riepilogativa, in caratteri."
-    suppress_digest_email_after_days: "Sopprimi le email di riepilogo per gli utenti che non visitano il sito per più di (n) giorni."
+    suppress_digest_email_after_days: "Sopprimi le email riepilogative per gli utenti che non visitano il sito per più di (n) giorni."
     digest_suppress_categories: "Sopprimi queste categorie dalle email riepilogative."
     disable_digest_emails: "Disabilita le email riepilogative per tutti gli utenti."
     apply_custom_styles_to_digest: "I template email e i css sono applicati alle emails di riepilogo."
@@ -1688,8 +1691,8 @@ it:
     anonymous_account_duration_minutes: "Per proteggere l'anonimato creare un nuovo account anonimo ogni N minuti per ogni utente. Esempio: se impostato a 600, non appena passano 600 minuti dall'ultimo messaggio E l'utente passa in modalità anonima, viene creato un nuovo account anonimo."
     hide_user_profiles_from_public: "Disabilita schede utenti, profili utenti e directory utenti per gli utenti anonimi."
     show_inactive_accounts: "Consenti agli utenti registrati di consultare i profili degli account inattivi."
-    hide_suspension_reasons: "Non visualizzare pubblicamente le ragioni della sospensione sui profili utente."
-    log_personal_messages_views: "Registra le visualizzazioni dei messaggi personali da Admin per altri utenti / gruppi."
+    hide_suspension_reasons: "Non visualizzare pubblicamente i motivi della sospensione sui profili utente."
+    log_personal_messages_views: "Registra le visualizzazioni fatte da Amministratore dei messaggi personali di altri utenti/gruppi ."
     ignored_users_count_message_threshold: "Informare i moderatori se un determinato utente viene ignorato da molti altri utenti."
     ignored_users_message_gap_days: "Quanto a lungo attendere prima di informare nuovamente i moderatori di un utente che è stato ignorato da molti altri."
     clean_up_inactive_users_after_days: "Numero di giorni prima che un utente inattivo (Livello Esperienza 0 e senza messaggi= venga rimosso. Per disabilitare la pulizia, imposta a 0."
@@ -1730,7 +1733,7 @@ it:
     allowed_href_schemes: "Schemi consentiti nei collegamenti in aggiunta a http e https."
     embed_post_limit: "Numero massimo di messaggi da incorporare."
     embed_username_required: "E' richiesto il nome utente per la creazione di argomenti."
-    notify_about_flags_after: "Se ci sono segnalazioni che non sono state gestite dopo un certo numero di ore, invia un messaggio personale ai moderatori. Impostare su 0 per disabilitare."
+    notify_about_flags_after: "Se ci sono segnalazioni che non sono state gestite dopo tale numero di ore, invia un messaggio personale ai moderatori. Impostare su 0 per disabilitare."
     show_create_topics_notice: "Se il sito ha meno di 5 argomenti pubblici, mostra un avviso chiedendo agli amministratori di creare qualche argomento."
     delete_drafts_older_than_n_days: "Elimina bozze più vecchie di (n) giorni."
     bootstrap_mode_min_users: "Numero minimo di utenti richiesto per disabilitare la modalità bootstrap (imposta a 0 per disattivare)"
@@ -1797,10 +1800,10 @@ it:
     tags_sort_alphabetically: "Mostra le etichette in ordine alfabetico. Per default vengono mostrate in ordine di popolarità."
     tags_listed_by_group: "Elenca le Etichette per gruppo di Etichette nella <a href='%{base_path}/tags' target='_blank'>pagina delle Etichette</a> ."
     tag_style: "Stile grafico dei distintivi relativi alle etichette."
-    allow_staff_to_tag_pms: "Consenti ai membri dello staff di etichettare qualsiasi Messaggio Personale"
+    allow_staff_to_tag_pms: "Consenti ai membri dello staff di etichettare qualsiasi messaggio personale"
     min_trust_level_to_tag_topics: "Livello di esperienza minimo richiesto per etichettare argomenti"
     suppress_overlapping_tags_in_list: "Se le etichette corrispondono alle esatte parole nei titoli degli argomenti, non mostrare l'etichetta"
-    remove_muted_tags_from_latest: "Non mostrare argomenti etichettati solo con Etichette disattivate nell'elenco degli argomenti più recenti."
+    remove_muted_tags_from_latest: "Non mostrare argomenti etichettati solo con etichette silenziate nell'elenco degli argomenti più recenti."
     force_lowercase_tags: "Forza tutte le nuove Etichette interamente in minuscolo."
     company_name: "Nome azienda"
     governing_law: "Diritto applicabile"
@@ -1839,8 +1842,8 @@ it:
       staged_users_disabled: "Devi abilitare 'staged users' prima di attivare questa impostazione ."
       reply_by_email_disabled: "Devi abilitare 'reply by email' prima di attivare questa impostazione ."
       sso_url_is_empty: "È necessario impostare un 'SSO url' prima di abilitare questa impostazione."
-      sso_invite_only: "Non è possibile abilitare SSO e l'accesso a solo invito allo stesso tempo."
-      enable_local_logins_disabled: "È necessario prima abilitare'abilita login locali' prima di abilitare questa impostazione."
+      sso_invite_only: "Non è possibile abilitare SSO e inviti allo stesso tempo."
+      enable_local_logins_disabled: "Prima di abilitare questa impostazione è necessario abilitare 'enable local logins'."
       min_username_length_exists: "Non è possibile impostare la lunghezza minima del nome utente se superiore al nome utente più breve (%{username})."
       min_username_length_range: "Non puoi impostare il minimo più grande del massimo."
       max_username_length_exists: "Non è possibile impostare la lunghezza massima del nome utente se inferiore al nome utente più lungo (%{username})."
@@ -1905,6 +1908,10 @@ it:
       other: "%{count} messaggi sono stati uniti ad un messaggio esitente: %{topic_link}"
   change_owner:
     post_revision_text: "Proprietà trasferita"
+  publish_page:
+    slug_errors:
+      blank: "non può essere vuoto"
+      invalid: "contiene caratteri non validi"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Questo messaggio è stato chiuso automaticamente per aver raggiunto il limite massimo di %{count} risposta."
@@ -2784,7 +2791,6 @@ it:
       why: "Un breve sommario di %{site_link} dalla tua ultima visita il %{last_seen_at}"
       since_last_visit: "Dalla tua ultima visita"
       new_topics: "Nuovi Argomenti"
-      unread_messages: "Messaggi Non Letti"
       unread_notifications: "Notifiche Non Lette"
       liked_received: "Like ricevuti"
       new_users: "Nuovi utenti"
@@ -2823,7 +2829,7 @@ it:
         Clicca sul seguente collegamento per scegliere una password:
         %{base_url}/u/password-reset/%{email_token}
     admin_login:
-      title: "Login Amministratore"
+      title: "Accesso Amministratore"
       subject_template: "[%{email_prefix}] Login"
     account_created:
       title: "Account Creato"
@@ -3171,12 +3177,12 @@ it:
       name: Base
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Può utilizzare</a> a tutte le funzioni essenziali della comunità"
       long_description: |
-        Questo distintivo è assegnato quando si raggiunge il livello di esperienza 1. Grazie per essere rimasto nei paraggi e per aver letto alcune discussioni, per capire meglio di cosa si occupa la nostra comunità. Le limitazioni imposte ai nuovi utenti sono state rimosse, e ti sono state attivate alcune funzioni essenziali come l'invio di messaggi personali, la segnalazione di messaggi dubbi, la creazione di messaggi Wiki e la possibilità di inviare immagini multiple e collegamenti.
+        Questo distintivo è assegnato quando si raggiunge il livello di esperienza 1. Grazie per essere rimasto nei paraggi e per aver letto alcune discussioni, per capire meglio di cosa si occupa la nostra comunità. Le limitazioni imposte ai nuovi utenti sono state rimosse, e ti sono state attivate alcune funzioni essenziali come l'invio di messaggi personali, la segnalazione di messaggi sospetti, la possibilità di modificare gli argomenti Wiki e l'abilità di inviare immagini e collegamenti multipli.
     member:
       name: Membro
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Può utilizzare</a> inviti, messaggi di gruppo e più \"mi piace\""
       long_description: |
-        Questo distintivo è assegnato quando si raggiunge il livello di esperienza 2. Grazie per esserti unito e per aver partecipato per qualche settimana alla nostra comunità. Ora puoi mandare inviti dalla tua pagina utente o dai singoli argomenti, creare messaggi personali di gruppo, a mettere un numero maggiore di "Mi piace" al giorno.
+        Questo distintivo è assegnato quando si raggiunge il livello di esperienza 2. Grazie per esserti unito e per aver partecipato per qualche settimana alla nostra comunità. Ora puoi mandare inviti dalla tua pagina utente o dai singoli argomenti, creare messaggi personali di gruppo, e mettere un numero maggiore di "Mi piace" al giorno.
     regular:
       name: Assiduo
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Può utilizzare</a> ricategorizza, rinomina, collegamenti seguiti, wiki e ulteriori \"mi piace\""
@@ -3256,7 +3262,7 @@ it:
       name: Prima Segnalazione
       description: Segnalato un messaggio
       long_description: |
-        Questo Distintivo è assegnato la prima volta che segnali un messaggio. Segnalare è il modo in cui tutti contribuiamo a mantenere questo posto piacevole per tutti. Se noti dei messaggi che richiedono l'attenzione di un moderatore per qualsiasi motivo, non esitare a segnalare. Se vedi un problema, :flag_black: segnalalo!
+        Questo Distintivo è assegnato la prima volta che segnali un messaggio. Segnalare è il modo in cui tutti noi contribuiamo a mantenere questo posto piacevole per tutti. Se noti dei messaggi che richiedono l'attenzione di un moderatore per qualsiasi motivo, non esitare a segnalare. Se vedi un problema, :flag_black: segnalalo!
     promoter:
       name: Promotore
       description: Ha invitato un utente
@@ -3299,17 +3305,17 @@ it:
         Questo distintivo è assegnato la prima volta che leggi un argomento lungo con più di 100 risposte. Leggere una conversazione attentamente ti aiuta a seguire la discussione, a comprendere punti di vista diversi, e conduce a conversazioni ancora più interessanti. Quanto più si legge, tanto è migliore la conversazione. Come ci piace dire, la Lettura è Fondamentale! :slight_smile:
     popular_link:
       name: Collegamento Di Successo
-      description: Ha pubblicato un collegamento esterno con 50 click
+      description: Ha pubblicato un collegamento esterno con 50 clic
       long_description: |
         Questo distintivo è assegnato quando un collegamento che hai condiviso riceve 50 clic. Grazie per aver pubblicato un collegamento utile che ha aggiunto un contesto interessante alla conversazione!
     hot_link:
       name: Collegamento Caldo
-      description: Ha pubblicato un collegamento esterno con 300 click
+      description: Ha pubblicato un collegamento esterno con 300 clic
       long_description: |
         Questo distintivo è assegnato quando un collegamento che hai condiviso riceve 300 click. Grazie per aver pubblicato un collegamento affascinante che ha portato avanti la conversazione e ha illuminato la discussione!
     famous_link:
       name: Collegamento Famoso
-      description: Ha pubblicato un collegamento esterno con 1000 click
+      description: Ha pubblicato un collegamento esterno con 1000 clic
       long_description: |
         Questo distintivo è assegnato quando un collegamento condiviso riceve 1000 clic. Wow! Hai inserito un collegamento che ha migliorato significativamente la conversazione aggiungendo dettagli, contesto e informazioni essenziali. Ottimo lavoro!
     appreciated:
@@ -3501,7 +3507,7 @@ it:
             description: "Pagina web di contatto generale per te o per la tua organizzazione. Sarà visualizzato sulla tua pagina <a href='%{base_path}/about' target='_blank'>informazioni</a>."
           site_contact:
             label: "Messaggi Automatici"
-            description: "Tutti i messaggi personali automatici di Discourse saranno inviati da questo utente, quali avvisi di segnalazione e avvisi di completamento di backup."
+            description: "Tutti i messaggi personali automatici di Discourse saranno inviati da questo utente, come avvisi per le segnalazione e avvisi di completamento backup."
       corporate:
         title: "Società"
         description: "Queste informazioni saranno inserite nei tuoi <a href='%{base_path}/tos' target='blank'>Termini di Servizio</a>, che sono un Argomento aggiornabile nella Categoria Staff. Se non hai un'azienda, puoi anche saltare questo passo, per ora."
@@ -3592,6 +3598,8 @@ it:
     user_merged: "%{username} è stato unito a questo account"
     user_delete_self: "Cancellato autonomamente da %{url}"
     webhook_deactivation_reason: "Il tuo webhook è stato automaticamente disattivato. Abbiamo ricevuto vari errori HTTP '%{status}'."
+    api_key:
+      revoked: Revocata
   reviewables:
     priorities:
       low: "Bassa"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 8224b63b54..112ab3ed77 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -55,7 +55,6 @@ ja:
       no_multilevels_components: "子テーマ自身を子テーマのテーマにはできません"
     settings_errors:
       invalid_yaml: "入力されたYAMLは不正です"
-      data_type_not_a_number: "%{name}型の設定はサポートされていません。サポートされている型は `integer`、`bool`、`list`、`enum`です。"
       name_too_long: "長すぎる名前の設定があります。長さの最大値は255です。"
       default_value_missing: "設定%{name}はデフォルト値を持っていません"
       default_not_match_type: "設定%{name}のデフォルト値の型が、設定の型と合致しません"
@@ -217,6 +216,12 @@ ja:
     tag: "タグされたトピック"
   too_late_to_edit: "この投稿の編集・削除期間が過ぎました。編集・削除が出来ません。"
   excerpt_image: "画像"
+  bookmarks:
+    reminders:
+      later_today: "今日中"
+      tomorrow: "明日"
+      next_week: "来週"
+      next_month: "来月"
   groups:
     errors:
       invalid_incoming_email: "%{email}のメール認証に失敗しました\U0001F62D"
@@ -796,8 +801,6 @@ ja:
     notification_email: "システムからの重要なメール送信に使用する from: メールアドレス。メールが届くように、ここに指定されたドメインはSPF、DKIM、逆引きPTRレコードが正しく設定されている必要があります。"
     email_custom_headers: "カスタムメールヘッダのリスト (パイプ(バーティカルバー) 区切り)"
     summary_score_threshold: "'トピックサマリー'に投稿が含まれるために必要な最低スコア"
-    summary_posts_required: "'トピックサマリー'が有効になるために必要な最小投稿数"
-    summary_likes_required: "'トピックサマリー'が有効になるために必要な最小「いいね!」数"
     summary_percent_filter: "ユーザが'トピックサマリー'をクリックしたとき, 上位何パーセントのポストを表示するか"
     enable_long_polling: "通知用のメッセージバスによるロングポーリングの利用を許可する"
     long_polling_base_url: "ロングポーリングのベースURL(CDNが動的コンテンツを配信している場合、これをoriginに指定してください) eg: http://origin.site.com"
@@ -1030,6 +1033,10 @@ ja:
   move_posts:
     existing_topic_moderator_post:
       other: "%{count}つのポストが存在するトピックに統合されました：%{topic_link}"
+  publish_page:
+    slug_errors:
+      blank: "を入力してください"
+      invalid: "は不正な文字を含んでいます"
   topic_statuses:
     autoclosed_message_max_posts:
       other: "このメッセージは%{count}つの返信に達した時に自動的に閉じます。"
@@ -1254,7 +1261,6 @@ ja:
       why: "あなたが最後にアクセスした %{last_seen_at} 以降の %{site_link} のまとめです"
       since_last_visit: "最後の訪問"
       new_topics: "新しいトピック"
-      unread_messages: "未読メッセージ"
       unread_notifications: "未読通知"
       liked_received: "いいねを受領"
       new_users: "新しいユーザー"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index e7eeba1664..6ecc3a7415 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -220,6 +220,12 @@ ko:
   too_late_to_edit: "이 글은 작성된 지 너무 오랜 기간이 지났습니다. 수정 또는 삭제할 수 없습니다."
   revert_version_same: "복구하려는 버전과 현재 버전이 똑같습니다."
   excerpt_image: "이미지"
+  bookmarks:
+    reminders:
+      later_today: "오늘 늦게"
+      tomorrow: "내일"
+      next_week: "다음 주"
+      next_month: "다음 달"
   groups:
     errors:
       can_not_modify_automatic: "자동 설정 그룹은 수정할 수 없습니다."
@@ -943,8 +949,6 @@ ko:
     force_https: "사이트가 HTTPS를 사용하도록 강제합니다. 경고: HTTPS가 완벽히 적용되어 있는 것을 확인하기 전까지는 이 옵션을 켜지마세요. CDN, 소셜 로그인, 외부 링크로 가져오는 자료, 로고들이 HTTPS호환성이 있는지 확인하셨나요?"
     same_site_cookies: "동일 사이트 쿠키를 사용합니다. 지원되는 브라우저에서 사이트 간 요청 위조의 가능성이 있는 모든 매개체를 (관대 또는 엄격하게) 제거합니다. 경고: 엄격한 통제는 로그인을 강제하거나 SSO를 사용하는 경우에만 적용됩니다."
     summary_score_threshold: "요약본에 포함되기 위한 글의 최소 점수 값"
-    summary_posts_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 글 수"
-    summary_likes_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 좋아요 수"
     summary_percent_filter: "요약본 보기를 클릭시, 글 중에 몇 %의 상위 글을 보여줄 것인가?"
     enable_personal_messages: "신뢰도 1 사용자(메시지 전송을 위한 최소 신뢰도로 설정가능)가 메시지를 작성하고 답장을 쓸 수 있도록 허용합니다. 운영진은 언제나 메시지를 보낼 수 있음을 참고하세요."
     enable_long_polling: "Message bus used for notification can use long polling"
@@ -1016,7 +1020,6 @@ ko:
     enable_instagram_logins: "인스타그램 인증 켜기, instagram_consumer_key 와 instagram_consumer_secret 필요"
     instagram_consumer_key: "인스타그램 인증을 위한 Consumer key "
     instagram_consumer_secret: "인스타그램 인증을 위한 Consumer secret"
-    readonly_mode_during_backup: "백업 받을 때, 읽기 전용 모드 켜기"
     allow_restore: "데이터 복원을 허용합니다. 이 사이트의 모든 데이터가 변경될 수 있다. 백업이나 복원 계획이 없다면 비활성화로 놔둡니다."
     maximum_backups: "디스크에 유지할 최대 백업 개수. 오래된 백업순으로 자동으로 삭제된다."
     automatic_backups_enabled: "설정된 백업 주기로 자동 백업 실행"
@@ -1276,6 +1279,10 @@ ko:
   redirected_to_top_reasons:
     new_user: "우리 커뮤니티에 오신 것을 환영합니다! 다음은 우리 사이트에서 가장 인기 많은 최근 글타래들입니다."
     not_seen_in_a_month: "잘 돌아오셨습니다. 다음은 당신이 오지 않은 동안 가장 인기있던 글타래들입니다."
+  publish_page:
+    slug_errors:
+      blank: "비어있으면 안됨"
+      invalid: "사용할 수 없는 문자를 포함하고 있습니다."
   topic_statuses:
     autoclosed_enabled_days:
       other: "이 글타래는 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다."
@@ -1548,7 +1555,6 @@ ko:
       why: "%{last_seen_at}부터 지금까지 %{site_link} 사이트 근황"
       since_last_visit: "마지막 방문 후 경과시간"
       new_topics: "새로운 토픽"
-      unread_messages: "읽지않은 메시지"
       unread_notifications: "읽지않은 알림"
       liked_received: "받은 좋아요 수"
       new_users: "새로운 사용자"
diff --git a/config/locales/server.lt.yml b/config/locales/server.lt.yml
index db7b5fb122..71ef7bd658 100644
--- a/config/locales/server.lt.yml
+++ b/config/locales/server.lt.yml
@@ -150,6 +150,12 @@ lt:
     badge: "%{display_name} ženklelis puslapyje %{site_title}"
   too_late_to_edit: "Šis pranešimas buvo sukurtas jau labai senai, todėl jo negalima redaguoti ar ištrinti."
   excerpt_image: "paveikslėlis"
+  bookmarks:
+    reminders:
+      later_today: "Šiandien vėliau"
+      tomorrow: "Rytoj"
+      next_week: "Kitą savaitę"
+      next_month: "Kitą mėnesį"
   groups:
     default_names:
       everyone: "visi"
@@ -630,6 +636,10 @@ lt:
       category: "Kategorijos"
       topic: "Rezultatai"
       user: "Vartotojai"
+  publish_page:
+    slug_errors:
+      blank: "negali būti tuščia"
+      invalid: "turi neleistinų simbolių"
   login:
     admin_not_allowed_from_ip_address: "Tu negali prisijungti kaip administratorius iš šio IP adreso."
     errors: "%{errors}"
diff --git a/config/locales/server.lv.yml b/config/locales/server.lv.yml
index de33961894..9b9557c575 100644
--- a/config/locales/server.lv.yml
+++ b/config/locales/server.lv.yml
@@ -57,6 +57,12 @@ lv:
   read_full_topic: "Lasīt pilnu tēmu"
   rss_description:
     latest: "Jaunākās tēmas"
+  bookmarks:
+    reminders:
+      later_today: "Vēlāk šodien"
+      tomorrow: "Rītdien"
+      next_week: "Nākamā nedēļā"
+      next_month: "Nākamā mēnesī"
   groups:
     default_names:
       everyone: "ikviens"
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 319c0c687a..0836613828 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -46,7 +46,6 @@ nb_NO:
       no_multilevels_components: "Drakter som inneholder underdrakter kan ikke selv være en underdrakt"
     settings_errors:
       invalid_yaml: "YAML koden er ikke gyldig."
-      data_type_not_a_number: "Innstilling `%{name}` typen er ikke støttet. Støttede typer er `integer`, `bool`, `list` og `enum`"
       name_too_long: "En eller flere innstillinger har for langt navn. Maksimal lengde er 255 tegn"
       default_value_missing: "Innstilling `%{name}` har ingen standardverdi"
       default_not_match_type: "Innstilling `%{name}` har en type standardverdi som ikke stemmer med den definerte typen for innstillingen."
@@ -257,6 +256,14 @@ nb_NO:
   too_late_to_edit: "Det er for lenge siden det innlegget ble skrevet. Det kan ikke lenger redigeres eller slettes."
   revert_version_same: "Den gjeldende versjonen er den samme som den du prøver å rulle tilbake til."
   excerpt_image: "bilde"
+  bookmarks:
+    reminders:
+      at_desktop: "Neste gang jeg er på datamaskinen min"
+      later_today: "Senere i dag"
+      tomorrow: "I morgen"
+      next_week: "Neste uke"
+      next_month: "Neste måned"
+      custom: "Egendefinert dato og tid"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' er ikke et gyldig tillitsnivå."
@@ -1028,8 +1035,6 @@ nb_NO:
     force_https: "Tving dette nettstedet til å bare tillate HTTPS. ADVARSEL: Du må IKKE aktivere dette valget før du har verifisert at HTTPS er riktig satt opp og fungerer absolutt alle steder! Har du sjekket CDN, alle sosiale loginmetoder og eventuelle eksterne ressurser for å sikre at de også er kompatible med HTTPS?"
     same_site_cookies: "Bruk Same-Site cookies/kapsler, de eliminerer alle former for Cross Site Request Forgery på nettlesere som støtter dem (Lax eller Strict). Avarsel: Strict vil kun fungere på nettsteder som tvinger innlogging og bruker SSO."
     summary_score_threshold: "Minste score for at et innlegg skal inkluderes i 'Sammendrag for Emnet'"
-    summary_posts_required: "Minste antall innlegg før 'Sammendrag for Emnet' aktiveres"
-    summary_likes_required: "Minste antall 'likes' i et emne før 'Sammendrag for Emnet' aktiveres"
     summary_percent_filter: "Når en bruker klikker 'Summér Dette Emnet', vis topp % av innlegg"
     num_users_to_silence_new_user: "Hvis en ny brukers innlegg flagges som spam num_spam_flags_to_silence_new_user ganger av dette antallet brukere, skjul den nye brukerens innlegg og stans fremtidige innlegg. 0 for å deaktivere."
     num_tl3_flags_to_silence_new_user: "Hvis en ny brukers innlegg flagges av num_tl3_users_to_silence_new_user forskjellige brukere med tillitsnivå 3, skjul alle den nye brukerens innlegg og stans fremtidige innlegg. 0 for å deaktivere."
@@ -1107,6 +1112,10 @@ nb_NO:
   redirected_to_top_reasons:
     new_user: "Velkommen til felleskapet vårt! Dette er de mest populære emnene for tiden. "
     not_seen_in_a_month: "Velkommen tilbake! Vi har ikke sett deg på en stund. Dette er de mest populære emnene siden du var her sist."
+  publish_page:
+    slug_errors:
+      blank: "kan ikke være tom"
+      invalid: "inneholder ugyldige tegn"
   topic_statuses:
     autoclosed_enabled_days:
       one: "Denne tråden ble automatisk lukket etter %{count} dag. Nye svar er ikke lenger tillatt. "
@@ -1218,7 +1227,6 @@ nb_NO:
       why: "Dette har skjedd på %{site_link} siden ditt forrige besøk %{last_seen_at}"
       since_last_visit: "Siden siste besøk"
       new_topics: "Nye emner"
-      unread_messages: "Uleste meldinger"
       unread_notifications: "Uleste varslinger."
       liked_received: "Likes mottatt"
       new_users: "Nye brukere"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index a0199c90ca..5c1e679e52 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -47,6 +47,7 @@ nl:
       generic: Er is een fout opgetreden bij het importeren van dat thema
       about_json: "Fout bij importeren: about.json bestaat niet, of is ongeldig"
       about_json_values: "about.json bevat ongeldige waarden: %{errors}"
+      modifier_values: "about.json-modificatoren bevatten ongeldige waarden: %{errors}"
       git: "Fout bij klonen van git-repository; toegang is geweigerd of repository is niet gevonden"
       unpack_failed: "Uitpakken van bestand mislukt"
       file_too_big: "Het niet-gecomprimeerde bestand is te groot."
@@ -59,7 +60,7 @@ nl:
       optimized_link: Geoptimaliseerde afbeeldingskoppelingen zijn kortstondig en dienen niet in broncode van thema's te worden opgenomen.
     settings_errors:
       invalid_yaml: "Opgegeven YAML is ongeldig."
-      data_type_not_a_number: "Type van instelling `%{name}` wordt niet ondersteund. Ondersteunde typen zijn `integer`, `bool`, `list` en `enum`."
+      data_type_not_a_number: "Type van instelling `%{name}` wordt niet ondersteund. Ondersteunde typen zijn `integer`, `bool`, `list`, `enum` en `upload`."
       name_too_long: "Er is een instelling met een te lange naam. Maximale lengte is 255."
       default_value_missing: "Instelling `%{name}` heeft geen standaardwaarde."
       default_not_match_type: "Type van standaardwaarde van instelling `%{name}` komt niet overeen met het type van de instelling."
@@ -329,6 +330,8 @@ nl:
   bookmarks:
     errors:
       already_bookmarked_post: "U kunt geen twee bladwijzers voor hetzelfde bericht maken."
+      cannot_set_past_reminder: "U kunt geen bladwijzerherinnering in het verleden instellen."
+      cannot_set_reminder_in_distant_future: "U kunt geen bladwijzerherinnering later dan over 10 jaar instellen."
       time_must_be_provided: "tijd moet voor alle herinneringen behalve '%{reminder_type}' worden opgegeven"
     reminders:
       at_desktop: "De volgende keer vanaf mijn computer"
@@ -367,7 +370,6 @@ nl:
       trust_level_4: "vertrouwensniveau_4"
     request_membership_pm:
       title: "Lidmaatschapsaanvraag voor @%{group_name}"
-      handle: "lidmaatschapsaanvraag behandelen"
     view_hidden_topic_request_reason: "Ik wil toetreden tot de groep '%{group_name}', zodat ik toegang heb tot [dit topic](%{topic_url})"
   education:
     until_posts:
@@ -477,6 +479,10 @@ nl:
               same_as_password: "is hetzelfde als uw wachtwoord."
             ip_address:
               signup_not_allowed: "Registratie vanaf deze account is niet toegestaan."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Dit topic kan niet op uw profiel worden aanbevolen."
         user_email:
           attributes:
             user_id:
@@ -1266,7 +1272,6 @@ nl:
   dashboard:
     rails_env_warning: "Uw server werkt in de modus voor %{env}."
     host_names_warning: "Uw bestand config/database.yml gebruikt de standaardhostnaam localhost. Werk deze bij naar de hostnaam van uw website."
-    gc_warning: 'Uw server gebruikt standaardparameters voor Ruby-garbagecollection, waardoor niet de beste prestaties worden verkregen. Lees dit topic over prestatieverbetering: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq is niet actief. Veel taken, zoals het verzenden van e-mail, worden door Sidekiq asynchroon uitgevoerd. Zorg ervoor dat er minstens één Sidekiq-proces actief is. <a href="https://github.com/mperham/sidekiq" target="_blank">Lees hier meer over Sidekiq</a>.'
     queue_size_warning: "Het aantal taken in de wachtrij is %{queue_size}, wat hoog is. Dit zou op een probleem met Sidekiq-processen kunnen duiden, of mogelijk dient u meer Sidekiq-workers toe te voegen."
     memory_warning: "Uw server werkt met minder dan 1 GB aan totaal geheugen. Minstens 1 GB geheugen wordt aanbevolen."
@@ -1377,8 +1382,8 @@ nl:
     force_https: "Gebruik van alleen HTTPS voor uw website afdwingen. WAARSCHUWING: schakel dit NIET in voordat u hebt geverifieerd dat HTTPS volledig is ingesteld en echt overal werkt! Hebt u ook uw CDN, alle sociale aanmeldingen en eventuele externe logo's / afhankelijkheden gecontroleerd om zeker te weten dat ze ook allemaal met HTTPS compatibel zijn?"
     same_site_cookies: "Cookies van dezelfde website gebruiken; deze vermijden alle aanvallen voor Cross Site Request Forgery in ondersteunde browsers (Lax of Strict). Waarschuwing: Strict werkt alleen op websites die aanmelding afdwingen en SSO gebruiken."
     summary_score_threshold: "De minimaal vereiste score voor een bericht om in 'Dit topic samenvatten' te worden opgenomen"
-    summary_posts_required: "Minimale aantal berichten in een topic voordat 'Dit topic samenvatten' wordt ingeschakeld"
-    summary_likes_required: "Minimale aantal likes in een topic voordat 'Dit topic samenvatten' wordt ingeschakeld"
+    summary_posts_required: "Het minimale aantal berichten in een topic voordat 'Dit topic samenvatten' wordt ingeschakeld. Wijzigingen in deze instelling worden binnen een week met terugwerkende kracht toegepast."
+    summary_likes_required: "Het minimale aantal likes in een topic voordat 'Dit topic samenvatten' wordt ingeschakeld. Wijzigingen in deze instelling worden binnen een week met terugwerkende kracht toegepast."
     summary_percent_filter: "Wanneer een gebruiker op 'Dit topic samenvatten' klikt, de top % van berichten tonen"
     summary_max_results: "Maximale aantal weergegeven berichten door 'Dit topic samenvatten'"
     enable_personal_messages: "Gebruikers met vertrouwensniveau 1 (instelbaar via het minimale niveau om berichten te verzenden) toestaan om berichten aan te maken en op berichten te antwoorden. Houd er rekening mee dat stafleden altijd berichten kunnen verzenden."
@@ -1410,7 +1415,8 @@ nl:
     markdown_typographer_quotation_marks: "Lijst van vervangingsparen voor dubbele en enkele aanhalingstekens"
     post_undo_action_window_mins: "Het aantal minuten dat gebruikers recente acties op een bericht ongedaan mogen maken (liken, markeren, etc)."
     must_approve_users: "Stafleden moeten alle nieuwe gebruikersaccounts goedkeuren voordat ze de website mogen bezoeken."
-    approve_suspect_users: "Stafleden moeten alle verdachte accounts goedkeuren"
+    invite_code: "Gebruiker moet deze code intypen voor accountregistratie, genegeerd wanneer leeg (niet hoofdlettergevoelig)"
+    approve_suspect_users: "Verdachte gebruikers toevoegen aan de wachtrij voor beoordeling. Verdachte gebruikers hebben een bio/website ingevoerd, maar hebben geen leesactiviteit."
     pending_users_reminder_delay: "Moderators inlichten als nieuwe gebruikers langer dan dit aantal uren op goedkeuring wachten. Stel dit in op -1 om meldingen uit te schakelen."
     maximum_session_age: "Gebruikers blijven (n) uur na hun laatste bezoek aangemeld"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js)-trackingcode-ID, bv. UA-12345678-9; zie <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1459,6 +1465,8 @@ nl:
     allow_index_in_robots_txt: "Geef in robots.txt op dat deze website door webzoekmachines mag worden geïndexeerd. In uitzonderlijke gevallen kunt u <a href='%{base_path}/admin/customize/robots'>robots.txt</a> blijvend negeren."
     email_domains_blacklist: "Een door een verticaal streepje (pipe) gescheiden lijst van e-maildomeinen waarmee gebruikers geen accounts mogen registreren. Voorbeeld: mailinator.com|trashmail.net"
     email_domains_whitelist: "Een door een verticaal streepje (pipe) gescheiden lijst van e-maildomeinen waarmee gebruikers accounts MOETEN registreren. WAARSCHUWING: gebruikers met andere dan de vermelde e-maildomeinen worden niet toegestaan!"
+    enforce_canonical_emails: "E-mailadres naar canonieke vorm ombouwen voordat gebruikers worden aangemaakt, omwille van uniciteit. De instelling heeft alleen effect bij nieuwe accountregistraties. Wanneer ingesteld, kan user+1@domain.com zich niet kunnen registreren als user+2@domain.com al is geregistreerd."
+    auto_approve_email_domains: "Gebruikers met e-mailadressen van deze lijst met domeinen worden automatisch goedgekeurd."
     hide_email_address_taken: "Gebruikers niet informeren dat een account met een bepaald e-mailadres bestaat tijdens registratie en vanaf het formulier voor vergeten wachtwoorden."
     log_out_strict: "Bij het afmelden ALLE sessies voor de gebruiker op alle apparaten afmelden"
     version_checks: "De Discourse Hub pingen voor versie-updates en berichten over nieuwe versies tonen op het <a href='%{base_path}/admin' target='_blank'>/admin</a>-dashboard"
@@ -1516,7 +1524,6 @@ nl:
     discord_client_id: 'Discord-client-ID (eentje nodig? bezoek <a href="https://discordapp.com/developers/applications/me">het Discord developer portal</a>)'
     discord_secret: "Geheime sleutel van Discord"
     discord_trusted_guilds: 'Alleen leden van deze Discord-guilds mogen zich aanmelden via Discord. Gebruik de numerieke ID voor de guild. Bekijk de instructies <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">hier</a> voor meer informatie. Laat dit leeg om alle guilds toe te staan.'
-    readonly_mode_during_backup: "Alleen-lezenmodus tijdens het maken van een back-up inschakelen"
     enable_backups: "Beheerders mogen back-ups van het forum maken"
     allow_restore: "Herstellen van gegevens toestaan, waarbij ALLE websitegegevens worden overschreven! Laat dit op 'false' staan, tenzij u een back-up wilt terugzetten."
     maximum_backups: "Het maximale aantal back-ups om op schijf te bewaren. Oudere back-ups worden automatisch verwijderd."
@@ -1751,6 +1758,7 @@ nl:
     relative_date_duration: "Aantal dagen na plaatsing voordat plaatsingsdata worden getoond als relatief (7d) in plaats van absoluut (20 feb)."
     delete_user_max_post_age: "Verwijderen van gebruikers wiens eerste bericht ouder is dan (x) dagen niet toestaan."
     delete_all_posts_max: "Het maximale aantal berichten dat tegelijk met de knop 'Alle berichten verwijderen' kan worden verwijderd. Als een gebruiker meer berichten heeft, kunnen de berichten niet allemaal tegelijk worden verwijderd, en kan de gebruiker niet worden verwijderd."
+    delete_user_self_max_post_count: "Het maximale aantal berichten dat een gebruiker kan hebben terwijl selfservice-accountverwijdering is toegestaan. Stel dit in op -1 om selfservice-accountverwijdering uit te schakelen."
     username_change_period: "Het maximale aantal dagen na registratie dat accounts hun gebruikersnamen kunnen wijzigen (0 om wijziging niet toe te staan)."
     email_editable: "Gebruikers mogen hun e-mailadres na registratie nog wijzigen."
     logout_redirect: "Locatie om browser naar om te leiden na afmelding (bv. https://example.com/logout)"
@@ -1789,6 +1797,7 @@ nl:
     ignored_users_count_message_threshold: "Moderators inlichten als een bepaalde gebruiker door dit aantal andere gebruikers wordt genegeerd."
     ignored_users_message_gap_days: "Wachttijd voordat moderators opnieuw worden ingelicht over een gebruiker die door veel andere wordt genegeerd."
     clean_up_inactive_users_after_days: "Aantal dagen voordat een inactieve gebruiker (vertrouwensniveau 0 zonder berichten) wordt verwijderd. Stel 0 in om opschonen uit te schakelen."
+    clean_up_unused_staged_users_after_days: "Aantal dagen voordat een niet-gebruikte staged gebruiker (zonder berichten) wordt verwijderd. Stel 0 in om opschonen uit te schakelen."
     user_selected_primary_groups: "Gebruikers mogen hun eigen primaire groep instellen"
     max_notifications_per_user: "Maximale aantal meldingen per gebruiker. Als dit aantal wordt overschreden, worden oude meldingen verwijderd. Wekelijks afgedwongen. Stel dit in op 0 om uit te schakelen."
     user_website_domains_whitelist: "Website van gebruiker wordt op deze domeinen gecontroleerd. Door pipes gescheiden lijst."
@@ -1827,7 +1836,9 @@ nl:
     highlighted_languages: "Opgenomen regels voor syntaxismarkering. (Waarschuwing: het opnemen van te veel talen kan prestaties beïnvloeden); bekijk <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> voor een demo."
     embed_any_origin: "Inbedbare inhoud toestaan, ongeacht oorsprong. Dit is vereist voor mobiele apps met statische HTML."
     embed_topics_list: "HTML-inbedding van topiclijsten ondersteunen"
+    embed_set_canonical_url: "De canonieke URL voor ingebedde topics naar de URL van de ingebedde inhoud instellen."
     embed_truncate: "De ingebedde berichten inkorten."
+    embed_unlisted: "Geïmporteerde topics worden onzichtbaar totdat een gebruiker antwoordt."
     embed_support_markdown: "Markdown-opmaak voor ingebedde berichten ondersteunen."
     embed_whitelist_selector: "Een door komma's gescheiden lijst van CSS-elementen die bij inbedding zijn toegestaan."
     allowed_href_schemes: "Toegestane schema's in koppelingen, naast http en https."
@@ -1838,7 +1849,7 @@ nl:
     delete_drafts_older_than_n_days: "Concepten ouder dan (n) dagen verwijderen."
     bootstrap_mode_min_users: "Minimale aantal vereiste gebruikers om bootstrapmodus uit te schakelen (stel dit in op 0 om uit te schakelen)"
     prevent_anons_from_downloading_files: "Voorkomen dat anonieme gebruikers bijlagen downloaden. WAARSCHUWING: hierdoor zullen websiteonderdelen anders dan afbeeldingen die als bijlage zijn geplaatst niet werken."
-    secure_media: 'Beperkt toegang tot media-uploads (afbeeldingen, video, audio). Als ''aanmelding vereist'' is ingeschakeld, hebben alleen aangemelde gebruikers toegang tot media-uploads. Anders is toegang beperkt tot media-uploads in privéberichten. Opmerking: S3-uploads moeten zijn ingeschakeld voordat u deze instelling inschakelt.'
+    secure_media: 'Beperkt toegang tot ALLE uploads (afbeeldingen, video, audio, tekst, pdf’s, zips en andere). Als ‘aanmelding vereist’ is ingeschakeld, hebben alleen aangemelde gebruikers toegang tot uploads. Anders is toegang beperkt tot media-uploads in privéberichten en privécategorieën. WAARSCHUWING: deze instelling is complex en vereist grondige kennis van beheer. Zie <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">het topic over beveiligde media op Meta</a> voor details.'
     slug_generation_method: "Kies een slug-generatiemodus. 'encoded' genereert een percentage-coderingsstring. 'none' schakelt de slug helemaal uit."
     enable_emoji: "Emoji inschakelen"
     enable_emoji_shortcuts: "Gebruikelijke smileyteksten zoals :) :p :( worden naar emoji geconverteerd"
@@ -1859,6 +1870,7 @@ nl:
     new_user_notice_tl: "Het minimale vertrouwensniveau dat nodig is om berichtmeldingen van nieuwe gebruikers te zien."
     returning_user_notice_tl: "Het minimale vertrouwensniveau dat nodig is om berichtmeldingen van terugkerende gebruikers te zien."
     returning_users_days: "Het aantal dagen dat voorbij moet gaan voordat een gebruiker als terugkerend wordt beschouwd."
+    enable_page_publishing: "Stafleden mogen topics naar nieuwe URL's publiceren met hun eigen stijlen."
     default_email_digest_frequency: "Hoe vaak gebruikers standaard e-mailsamenvattingen ontvangen."
     default_include_tl0_in_digests: "Standaard berichten van nieuwe gebruikers in e-mailsamenvattingen opnemen. Gebruikers kunnen dit in hun voorkeuren wijzigen."
     default_email_level: "Standaard e-mailmeldingsniveau voor normale topics."
@@ -1921,6 +1933,9 @@ nl:
     push_notifications_icon: "Het badgepictogram dat in de meldingenhoek verschijnt. Vereiste grootte is 96 × 96."
     short_title: "De korte titel wordt gebruikt op het startscherm van de gebruiker, de starter, of andere plaatsen waar ruimte beperkt kan zijn. Beperk de naam tot 12 tekens."
     dashboard_general_tab_activity_metrics: "Kies rapporten die als activiteitsgegevens op het algemene tabblad worden weergegeven."
+    gravatar_name: "Naam van de Gravatar-provider"
+    gravatar_base_url: "URL van de API-basis van de Gravatar-provider"
+    gravatar_login_url: "URL ten opzichte van gravatar_base_url, die de gebruiker van de aanmelding bij de Gravatar-service voorziet"
     errors:
       invalid_email: "Ongeldig e-mailadres."
       invalid_username: "Er is geen gebruiker met die gebruikersnaam."
@@ -2020,6 +2035,11 @@ nl:
       other: "%{count} berichten zijn samengevoegd naar een bestaand bericht: %{topic_link}"
   change_owner:
     post_revision_text: "Eigendom overgezet"
+  publish_page:
+    slug_errors:
+      blank: "mag niet leeg zijn"
+      unavailable: "is niet beschikbaar"
+      invalid: "bevat ongeldige tekens"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Dit bericht is na het bereiken van de maximumlimiet van %{count} antwoord automatisch gesloten."
@@ -2102,6 +2122,7 @@ nl:
     new_registrations_disabled: "Nieuwe accountregistraties zijn op dit moment niet toegestaan."
     password_too_long: "Wachtwoorden mogen maximaal 200 tekens lang zijn."
     email_too_long: "Het opgegeven e-mailadres is te lang. Postvaknamen mogen niet langer zijn dan 254 tekens, en domeinnamen niet langer dan 253 tekens."
+    wrong_invite_code: "De door u ingevoerde code is ongeldig."
     reserved_username: "Die gebruikersnaam is niet toegestaan."
     missing_user_field: "U hebt niet alle gebruikersvelden ingevuld"
     auth_complete: "Authenticatie is voltooid."
@@ -2113,6 +2134,8 @@ nl:
     second_factor_backup_title: "Twee-factor-back-upcode"
     invalid_second_factor_code: "Ongeldige authenticatiecode. Elke code kan maar eenmaal worden gebruikt."
     invalid_security_key: "Ongeldige beveiligingssleutel."
+    missing_second_factor_name: "Geef een naam op."
+    missing_second_factor_code: "Geef een code op."
     second_factor_toggle:
       totp: "Een authenticator-app of beveiligingssleutel gebruiken"
       backup_code: "Een back-upcode gebruiken"
@@ -2419,8 +2442,8 @@ nl:
       why: "Een korte samenvatting van %{site_link} sinds uw laatste bezoek op %{last_seen_at}."
       since_last_visit: "Sinds uw laatste bezoek"
       new_topics: "Nieuwe topics"
-      unread_messages: "Ongelezen berichten"
       unread_notifications: "Ongelezen meldingen"
+      unread_high_priority: "Ongelezen meldingen met hoge prioriteit"
       liked_received: "Ontvangen likes"
       new_users: "Nieuwe gebruikers"
       popular_topics: "Populaire topics"
@@ -2515,6 +2538,9 @@ nl:
     pasted_image_filename: "Geplakte afbeelding"
     store_failure: "Het opslaan van upload #%{upload_id} voor gebruiker #%{user_id} is mislukt."
     file_missing: "Sorry, u moet een bestand opgeven om te uploaden."
+    empty: "Sorry, maar het bestand dat u hebt opgegeven is leeg."
+    png_to_jpg_conversion_failure_message: "Er is een fout opgetreden bij het converteren van PNG naar JPG."
+    optimize_failure_message: "Er is een fout opgetreden bij het optimaliseren van de geüploade afbeelding."
     attachments:
       too_large: "Sorry, het bestand dat u probeert te uploaden is te groot (maximumgrootte is %{max_size_kb}%KB)."
     images:
@@ -2546,6 +2572,7 @@ nl:
     sender_body_blank: "geen tekst"
     sender_post_deleted: "bericht is verwijderd"
     sender_message_to_invalid: "ontvanger heeft een ongeldig e-mailadres"
+    sender_topic_deleted: "topic is verwijderd"
   color_schemes:
     base_theme_name: "Basis"
     light: "Licht"
@@ -2857,7 +2884,7 @@ nl:
     reasons:
       email_auth_res_enqueue: "Een DMARC-controle op deze e-mail is mislukt; het bericht komt zeer waarschijnlijk niet van wie het lijkt te komen. Controleer de onbewerkte e-mailheader voor meer informatie."
       email_spam: "Deze e-mail is als spam gemarkeerd door de header zoals gedefinieerd in `email_in_spam_header`."
-      suspect_user: "Gebruikers in de verdachtenlijst moeten door een staflid worden onderzocht. Zie `approve_suspect_users`."
+      suspect_user: "Deze nieuwe gebruiker heeft profielgegevens ingevoerd zonder topics of berichten te hebben gelezen, wat sterk doet vermoeden dat het een spammer kan zijn. Zie `approve_suspect_users`."
     actions:
       agree:
         title: "Akkoord..."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 3e43f69002..d37f012004 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -47,6 +47,7 @@ pl_PL:
       generic: Podczas importowania motywu wystąpił błąd.
       about_json: "Błąd importu: plik about.js nie istnieje albo jest niepoprawny"
       about_json_values: "Plik about.json zawiera niepoprawne wartości: %{errors}"
+      modifier_values: "modyfikatory about.json zawierają nieprawidłowe wartości: %{errors}"
       git: "Podczas klonowania repozytorium git wystąpił błąd: dostęp jest zabroniony albo repozytorium nie istnieje"
       unpack_failed: "Błąd przy rozpakowywaniu pliku"
       file_too_big: "Nieskompresowany plik jest zbyt duży."
@@ -56,9 +57,9 @@ pl_PL:
       component_no_default: "Komponenty motywu nie mogą być domyślnym motywem"
       component_no_color_scheme: "Komponenty motywu nie mogą mieć palet kolorystycznych"
       no_multilevels_components: "Motywy posiadające submotywy nie mogą być submotywami"
+      optimized_link: Zoptymalizowane łącza do obrazów są efemeryczne i nie powinny być zawarte w kodzie źródłowym motywu.
     settings_errors:
       invalid_yaml: "Wprowadzony YAML jest nieprawidłowy"
-      data_type_not_a_number: "Ustawienie typu %{name} nie jest wspierane. Wspierane typy to \"integer\", \"bool\", \"list\" i \"enum\""
       name_too_long: "Jedno z ustawień ma zbyt długą nazwę. Maksymalna długość to 255 znaków"
       default_value_missing: "Ustawienie `%{name}` nie ma domyślnej wartości"
       default_not_match_type: "Typ domyślnej wartości ustawienia \"%{name}\" nie odpowiada typowi ustawienia."
@@ -73,6 +74,7 @@ pl_PL:
       string_value_not_valid_min: "Wartość musi mieć co najmniej %{min} znaków."
       string_value_not_valid_max: "Wartość musi mieć co najwyżej %{max} znaków."
     locale_errors:
+      top_level_locale: "Klucz najwyższego poziomu w pliku ustawień regionalnych musi być zgodny z nazwą ustawień regionalnych"
       invalid_yaml: "Nieprawidłowy plik YAML z tłumaczeniem"
   emails:
     incoming:
@@ -88,8 +90,10 @@ pl_PL:
         auto_generated_email_error: "Zdarza się, gdy \"pierwszeństwo\" nagłówka jest ustawione na: listę, śmieci, luzem lub auto odpowiedź lub gdy inny nagłówek zawiera: auto-składane, auto-odpowiadanie lub auto-generowane."
         no_body_detected_error: "Zdarza się, kiedy nie można rozpakować całości wiadomości, a zawarte są w niej załączniki."
         no_sender_detected_error: "Zdarza się, kiedy nie można znaleźć prawidłowego adresu e‐mail w nagłówku Od."
+        from_reply_by_address_error: "Zdarza się, gdy nagłówek From pasuje do odpowiedzi według adresu e-mail."
         inactive_user_error: "Zdarza się kiedy nadawca jest nie aktywny."
         silenced_user_error: "Dzieje się, gdy wysyłający został uciszony."
+        bad_destination_address: "Zdarza się, gdy żaden z adresów e-mail w polach Do / DW nie odpowiada skonfigurowanemu adresowi poczty przychodzącej."
         strangers_not_allowed_error: "Zdarza się, gdy użytkownik próbuje stworzyć temat w kategorii, której nie jest członkiem."
         insufficient_trust_level_error: "Zdarza się, gdy użytkownik próbuje stworzyć temat w kategorii, której nie ma odpowiedniego poziomu zaufania.."
         reply_user_not_matching_error: "Zdarza się kiedy pojawia się odpowiedź z innego adresu email niż ten na który powiadomienie zostało wysłane."
@@ -98,7 +102,9 @@ pl_PL:
         bounced_email_error: "Email jest cofniętym raportem emaila."
         screened_email_error: "Zdarza się kiedy adres email nadawcy został zasłonięty. "
         unsubscribe_not_allowed: "Zdarza się, kiedy anulowanie subskrypcji przez e‐mail nie jest dozwolone dla tego użytkownika."
+        email_not_allowed: "Zdarza się, gdy adres e-mail nie znajduje się na białej liście lub znajduje się na czarnej liście."
       unrecognized_error: "Niezidentyfikowany błąd"
+    secure_media_placeholder: "Zredagowano: ta strona ma włączone bezpieczne media, przejdź do tematu, aby zobaczyć załączony obraz / audio / wideo."
   errors: &errors
     format: "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>:%{message}"
@@ -120,6 +126,7 @@ pl_PL:
       inclusion: nie jest zawarty w liście
       invalid: jest nieprawidłowy
       is_invalid: "wygląda niejasno, czy to cała wypowiedz ?"
+      invalid_timezone: "„%{tz}” nie jest prawidłową strefą czasową"
       contains_censored_words: "zawiera następujące niedozwolone słowa: %{censored_words}"
       less_than: "musi być mniejszy niż %{count}"
       less_than_or_equal_to: "musi być mniejszy lub równy %{count}"
@@ -149,6 +156,7 @@ pl_PL:
         many: jest nieprawidłowej długości (powinna mieć %{count} znaków)
         other: jest nieprawidłowej długości (powinna mieć %{count} znaków)
       other_than: "musi być różna od %{count}"
+      sso_overrides_username: "Nazwa użytkownika musi zostać zaktualizowana po stronie dostawcy SSO, ponieważ ustawienie `sso_overrides_username` jest włączone."
     template:
       body: "Wystąpiły problemy z następującymi polami:"
       header:
@@ -166,9 +174,16 @@ pl_PL:
         many: "Podano nieprawidłowe opcje %{name}"
         other: "Podano nieprawidłowe opcje %{name}"
       default_categories_already_selected: "Nie możesz wybrać kategorii użytej w innej liście."
+      default_tags_already_selected: "Nie można wybrać znacznika używanego z innej listy."
       s3_upload_bucket_is_required: "Nie możesz wysyłać na S3 jeżeli nie podasz 's3_upload_bucket'."
+      enable_s3_uploads_is_required: "Nie możesz włączyć zasobów reklamowych do S3, chyba że włączysz przesyłanie S3."
       s3_backup_requires_s3_settings: "Nie możesz używać S3 do tworzenia kopii zapasowych bez podania \"%{setting_name}\"."
       s3_bucket_reused: "Nie możesz używać tego samego bucketu jako \"s3_upload_bucket\" i \"s3_backup_bucket\". Wybierz inny bucket albo podaj różne ścieżki dla każdego z bucketów."
+      secure_media_requirements: "Przesyłanie S3 musi być włączone przed włączeniem bezpiecznych mediów."
+      second_factor_cannot_be_enforced_with_disabled_local_login: "Nie można wymusić 2FA, jeśli lokalne logowanie jest wyłączone."
+      local_login_cannot_be_disabled_if_second_factor_enforced: "Nie można wyłączyć lokalnego logowania, jeśli wymuszone jest 2FA. Wyłącz wymuszone 2FA przed wyłączeniem lokalnych logowań."
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "Nie można włączyć przesyłania S3, ponieważ przesyłanie S3 jest już włączone globalnie, a włączenie tego poziomu witryny może powodować krytyczne problemy z przesyłaniem"
+    conflicting_google_user_id: 'Identyfikator konta Google dla tego konta został zmieniony; interwencja personelu jest wymagana ze względów bezpieczeństwa. Skontaktuj się z personelem i wskaż go <br> <a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
@@ -203,11 +218,16 @@ pl_PL:
   provider_not_enabled: "Nie masz dostępu do żądanego zasobu. Poświadczający uwierzytelnienie nie został upoważniony w systemie."
   provider_not_found: "Nie masz dostępu do żądanego zasobu. Poświadczający uwierzytelnienie nie istnieje."
   read_only_mode_enabled: "Strona jest w trybie tylko do odczytu. Możliwość interakcji jest wyłączona."
+  invalid_grant_badge_reason_link: "Zewnętrzny lub nieprawidłowy link do dyskursu jest niedozwolony z przyczyn związanych z odznaką"
   email_template_cant_be_modified: "Ten szablon e-mail nie może być zmodyfikowany"
+  invalid_whisper_access: "Albo szepty nie są włączone, albo nie masz dostępu do tworzenia postów szeptanych"
   not_in_group:
     title_topic: "Musisz być w grupie, aby zobaczyć ten temat."
+    title_category: "Musisz być w grupie, aby zobaczyć tę kategorię."
     request_membership: "Poproś o członkostwo"
     join_group: "Dołącz do grupy"
+  deleted_topic: "Ups! Ten temat został usunięty i nie jest już dostępny."
+  delete_topic_failed: "Podczas usuwania tego tematu wystąpił błąd. Skontaktuj się z administratorem strony."
   reading_time: "Czas odczytu"
   likes: "Lajki"
   too_many_replies:
@@ -225,6 +245,8 @@ pl_PL:
     continue: "Kontynuuj dyskusję"
     error: "Błąd osadzenia"
     referer: "Odnośnik:"
+    error_topics: "Ustawienie witryny „lista tematów do umieszczenia” nie zostało włączone"
+    mismatch: "Skierujący albo nie został wysłany, albo nie pasuje do żadnego z następujących hostów:"
     no_hosts: "Brak ustawionych hostów do osadzenia."
     configure: "Konfiguracja osadzenia"
     more_replies:
@@ -290,6 +312,8 @@ pl_PL:
   max_pm_recipients: "Przepraszam, możesz wysłać wiadomość tylko do %{recipients_limit} odbiorców."
   pm_reached_recipients_limit: "Przepraszamy, możesz wysłać wiadomość tylko do %{recipients_limit} odbiorców."
   removed_direct_reply_full_quotes: "Automatycznie usunięto cytowanie całości poprzedzającego wpisu."
+  secure_upload_not_allowed_in_public_topic: "Niestety, następujące bezpieczne przesyłanie nie może być użyte w publicznym temacie: %{upload_filenames}."
+  create_pm_on_existing_topic: "Przepraszamy, nie możesz utworzyć PM na istniejący temat."
   just_posted_that: "jest zbyt podobne do tego co umieściłeś niedawno"
   invalid_characters: "zawiera niepoprawne znaki"
   is_invalid: "wygląda niejasno, czy to cała wypowiedz ?"
@@ -326,6 +350,20 @@ pl_PL:
   edit_conflict: "Ten wpis został zmieniony przez innego użytkownika i Twoje zmiany nie zostaną zapisane."
   revert_version_same: "Obecna wersja jest taka sama jak w wersja, którą próbujesz przywrócić."
   excerpt_image: "zdjęcie"
+  bookmarks:
+    errors:
+      already_bookmarked_post: "Nie możesz dodać zakładki do tego samego postu dwa razy."
+      cannot_set_past_reminder: "W przeszłości nie można ustawić przypomnienia o zakładce."
+      cannot_set_reminder_in_distant_future: "Nie możesz ustawić przypomnienia o zakładce na więcej niż 10 lat w przyszłości."
+      time_must_be_provided: "dla wszystkich przypomnień należy przewidzieć czas z wyjątkiem „%{reminder_type}”"
+    reminders:
+      at_desktop: "Następnym razem będę na swoim pulpicie"
+      later_today: "Później dzisiaj"
+      next_business_day: "Następny dzień roboczy"
+      tomorrow: "Jutro"
+      next_week: "Następny tydzień"
+      next_month: "Następny miesiąc"
+      custom: "Niestandardowa data i godzina"
   groups:
     success:
       bulk_add:
@@ -359,7 +397,6 @@ pl_PL:
       trust_level_4: "poziom_zaufania_4"
     request_membership_pm:
       title: "Prośba o członkostwo w grupie @%{group_name}"
-      handle: "obsłuż prośby o członkostwo "
     view_hidden_topic_request_reason: "Chciał(a)by dołączyć do grupy %{group_name}, aby uzyskać dostęp do [tego wątku](%{topic_url})"
   education:
     until_posts:
@@ -465,6 +502,10 @@ pl_PL:
               same_as_password: "jest takie samo, jak twoje hasło."
             ip_address:
               signup_not_allowed: "Rejestracja z tego konta jest niemożliwa."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Ten temat nie może być polecany w twoim profilu."
         user_email:
           attributes:
             user_id:
@@ -488,6 +529,10 @@ pl_PL:
           attributes:
             execute_at:
               in_the_past: "musi być w przyszłości"
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'Następujące klucze interpolacyjne są nieprawidłowe: „%{keys}”'
         watched_word:
           attributes:
             word:
@@ -533,6 +578,7 @@ pl_PL:
       description_incomplete: "Post opisujący kategorię musi mieć przynajmniej jeden paragraf."
       permission_conflict: "Grupa posiadająca dostęp do podkategorii musi mieć także dostęp do jej kategorii nadrzędnej. Grupy %{group_names} mają dostęp do jednej z podkategorii, ale nie do grupy nadrzędnej."
       disallowed_topic_tags: "Ten wątek zawiera tagi %{tags}, które nie są dozwolone w tej kategorii"
+      disallowed_tags_generic: "W tym temacie niedozwolone są tagi."
     cannot_delete:
       uncategorized: "Ta kategoria ma specjalny charakter. Jest przeznaczona jako miejsce do przechowywania tematów nieprzypisanych do żadnej kategorii i jako taka nie może zostać usunięta."
       has_subcategories: "Nie można usunąć tej kategorii ponieważ posiada podkategorie. "
@@ -768,6 +814,7 @@ pl_PL:
       almost_done_title: "Potwierdzanie nowego adresu e-mail"
       almost_done_description: "Wysłaliśmy e-maila na nowy adres, by potwierdzić tę zmianę!"
   associated_accounts:
+    revoke_failed: "Nie udało się unieważnić konta za pomocą %{provider_name}."
     connected: "(połączony)"
   activation:
     action: "Kliknij, by aktywować swoje konto."
@@ -780,6 +827,7 @@ pl_PL:
     activated: "Przepraszamy, to konto zostało już aktywowane."
     admin_confirm:
       title: "Potwierdź konto administratora"
+      description: "Czy na pewno chcesz, aby <b>%{target_username} (%{target_email})</b> był administratorem?"
       grant: "Przynaj prawa Admina"
       complete: "<b>%{target_username}</b> jest teraz administratorem."
       back_to: "Wróć do %{title}"
@@ -828,6 +876,13 @@ pl_PL:
       description: "Polub ten wpis"
       short_description: "Polub ten wpis"
       long_form: "polubiono to"
+  draft:
+    sequence_conflict_error:
+      title: "błąd wersji roboczej"
+      description: "Szkic jest edytowany w innym oknie. Załaduj ponownie tę stronę."
+  draft_backup:
+    pm_title: "Kopie zapasowe wersje robocze z bieżących tematów"
+    pm_body: "Temat zawierający kopie zapasowe"
   user_activity:
     no_default:
       self: "Nie masz jeszcze żadnej aktywności."
@@ -843,6 +898,21 @@ pl_PL:
       others: "Brak odpowiedzi."
     no_drafts:
       self: "Nie masz żadnych zapisanych wersji roboczych. Zacznij pisać odpowiedź w jakimś wątku, a zostanie ona automatycznie zapisana jako nowa wersja robocza."
+  webauthn:
+    validation:
+      invalid_type_error: "Podany typ webauthn był nieprawidłowy. Prawidłowe typy to webauthn.get i webauthn.create."
+      challenge_mismatch_error: "Podane wyzwanie nie odpowiada wyzwaniu wygenerowanemu przez serwer uwierzytelniania."
+      invalid_origin_error: "Początek żądania uwierzytelnienia nie zgadza się z początkiem serwera."
+      malformed_attestation_error: "Wystąpił błąd podczas dekodowania danych zaświadczenia."
+      invalid_relying_party_id_error: "Identyfikator strony ufającej żądania uwierzytelnienia nie zgadza się z identyfikatorem serwera strony zależnej."
+      user_verification_error: "Wymagana jest weryfikacja użytkownika."
+      unsupported_public_key_algorithm_error: "Podany algorytm klucza publicznego nie jest obsługiwany przez serwer."
+      unsupported_attestation_format_error: "Format certyfikatu nie jest obsługiwany przez serwer."
+      credential_id_in_use_error: "Podany identyfikator poświadczenia jest już w użyciu."
+      public_key_error: "Weryfikacja klucza publicznego dla poświadczenia nie powiodła się."
+      ownership_error: "Klucz bezpieczeństwa nie jest własnością użytkownika."
+      not_found_error: "Nie można znaleźć klucza bezpieczeństwa z podanym identyfikatorem poświadczenia."
+      unknown_cose_algorithm_error: "Algorytm użyty dla klucza bezpieczeństwa nie został rozpoznany."
   topic_flag_types:
     spam:
       title: "Spam"
@@ -879,6 +949,8 @@ pl_PL:
     description: "preferencje mailowe dla <b>%{email}</b>zostały zapisane. Aby zmienić ustawienia mailowe <a href='%{url}'>zajrzyj do ustawień użytkownika</a>."
     topic_description: "Aby ponownie zasubskrybować %{link}, użyj kontrolki powiadomienia na dole lub po prawej stronie tematu."
     private_topic_description: "Aby ponownie zasubskrybować, użyj opcji powiadomienia na dole lub po prawej stronie wątku."
+  uploads:
+    marked_insecure_from_theme_component_reason: "przesyłanie użyte w komponencie motywu"
   unsubscribe:
     title: "Wypisz"
     stop_watching_topic: "Przestań obserwować ten temat, %{link}"
@@ -951,6 +1023,7 @@ pl_PL:
         disagreed_flags: Niepotwierdzone flagi
         ignored_flags: Zignorowane flagi
         score: Wynik
+      description: "Lista użytkowników uporządkowana według współczynnika odpowiedzi personelu na ich flagi (nie zgadzam się z ustalonym)."
     moderators_activity:
       title: "Aktywność moderatorów"
       labels:
@@ -961,6 +1034,7 @@ pl_PL:
         post_count: Napisanych wpisów
         pm_count: Napisanych PW
         revision_count: Wersji
+      description: "Lista działań moderatora, w tym sprawdzone flagi, czas czytania, utworzone tematy, utworzone posty, utworzone wiadomości osobiste i poprawki."
     flags_status:
       title: "Status flag"
       values:
@@ -974,19 +1048,31 @@ pl_PL:
         poster: Publikujący
         flagger: Flagujący
         time_to_resolution: Czas rozwiązania
+      description: "Lista statusów flag, w tym rodzaj flagi, plakat, flagger i czas do rozwiązania."
     visits:
       title: "Wizyty użytkowników"
       xaxis: "Dzień"
       yaxis: "Liczba wizyt"
+      description: "Liczba wszystkich wizyt użytkowników."
     signups:
       title: "Podpisy"
       xaxis: "Dzień"
+      yaxis: "Liczba rejestracji"
+      description: "Nowe rejestracje kont dla tego okresu."
     new_contributors:
       title: "Nowi współtwórcy"
       xaxis: "Dzień"
       yaxis: "Liczba nowych współtwórców"
+      description: "Liczba użytkowników, którzy napisali swój pierwszy post w tym okresie."
     trust_level_growth:
+      title: "Wzrost poziomu zaufania"
+      xaxis:
+        tl1_reached: "Osiągnięto TL1"
+        tl2_reached: "Osiągnięto TL2"
+        tl3_reached: "Osiągnięto TL3"
+        tl4_reached: "Osiągnięto TL4"
       yaxis: "Dzień"
+      description: "Liczba użytkowników, którzy podnieśli poziom zaufania w tym okresie."
     consolidated_page_views:
       title: "Skonsolidowane odsłony"
       xaxis:
@@ -1004,22 +1090,27 @@ pl_PL:
       title: "DAU / MAU"
       xaxis: "Dzień"
       yaxis: "DAU / MAU"
+      description: "Liczba członków zalogowanych w ostatnim dniu podzielona przez liczbę członków zalogowanych w ostatnim miesiącu - zwraca% wskazujący „lepkość” społeczności. Celuj na&gt; 30%."
     daily_engaged_users:
       title: "Zaangażowani użytkownicy dziennie"
       xaxis: "Dzień"
       yaxis: "Zaangażowani użytkownicy"
+      description: "Liczba użytkowników, którzy polubili lub opublikowali w ostatnim dniu."
     profile_views:
       title: "Wyświetlenia profilu użytkownika"
       xaxis: "Dzień"
       yaxis: "Liczba wyświetleń profilów użytkowników"
+      description: "Łącznie nowe widoki profili użytkowników."
     topics:
       title: "Tematy"
       xaxis: "Dzień"
       yaxis: "Liczba nowych tematów"
+      description: "Nowe tematy utworzone w tym okresie."
     posts:
       title: "Posty"
       xaxis: "Dzień"
       yaxis: "Liczba nowych postów"
+      description: "Nowe posty utworzone w tym okresie"
     likes:
       title: "Polubienia"
       xaxis: "Dzień"
@@ -1041,7 +1132,10 @@ pl_PL:
       yaxis: "Liczba użytkowników"
       labels:
         level: Poziom
+      description: "Liczba użytkowników pogrupowanych według poziomu zaufania."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
+      title: "Użytkownicy według typu"
       xaxis: "Typ"
       yaxis: "Liczba użytkowników"
       labels:
@@ -1051,37 +1145,49 @@ pl_PL:
         moderator: Moderatorzy
         suspended: Zawieszeni
         silenced: Wyciszony
+      description: "Liczba użytkowników pogrupowanych według administratora, moderatora, zawieszonych i wyciszonych."
     trending_search:
+      title: Najpopularniejsze wyszukiwane hasła
       labels:
         term: Szukana fraza
         searches: Wyszukiwania
         click_through: CTR
+      description: "Najpopularniejsze wyszukiwane hasła z ich współczynnikami klikalności."
     emails:
       title: "Wysłane emaile"
       xaxis: "Dzień"
       yaxis: "Liczba emaili"
+      description: "Liczba wysłanych nowych e-maili."
     user_to_user_private_messages:
+      title: "Użytkownik dla użytkownika (z wyłączeniem odpowiedzi)"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Liczba nowo zainicjowanych wiadomości osobistych."
     user_to_user_private_messages_with_replies:
+      title: "Użytkownik dla użytkownika (z odpowiedziami)"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Liczba wszystkich nowych osobistych wiadomości i odpowiedzi."
     system_private_messages:
       title: "System"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Liczba wiadomości osobistych wysyłanych automatycznie przez system."
     moderator_warning_private_messages:
       title: "Ostrzeżenia moderatorów"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Liczba ostrzeżeń wysłanych osobistymi wiadomościami od moderatorów."
     notify_moderators_private_messages:
       title: "Powiadomienia moderatorów"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Liczba razy moderatorzy byli prywatnie powiadamiani przez flagę."
     notify_user_private_messages:
       title: "Powiadom użytkownika"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Ile razy użytkownicy zostali prywatnie powiadomieni przez flagę."
     top_referrers:
       title: "Najczęstszy referrerzy"
       xaxis: "Użytkownik"
@@ -1091,6 +1197,7 @@ pl_PL:
         user: "Użytkownik"
         num_clicks: "Kliki"
         num_topics: "Tematy"
+      description: "Użytkownicy wymienieni według liczby kliknięć linków, które udostępnili."
     top_traffic_sources:
       title: "Najlepsze źródła ruchu"
       xaxis: "Domena"
@@ -1101,35 +1208,43 @@ pl_PL:
         domain: Domena
         num_clicks: Kliki
         num_topics: Tematy
+      description: "Źródła zewnętrzne, które najczęściej linkowały do tej strony."
     top_referred_topics:
       title: "Najczęściej linkowane tematy"
       labels:
         num_clicks: "Kliki"
         topic: "Temat"
+      description: "Tematy, które uzyskały najwięcej kliknięć ze źródeł zewnętrznych."
     page_view_anon_reqs:
       title: "Anonimowy"
       xaxis: "Dzień"
       yaxis: "Anonimowe odsłony"
+      description: "Liczba nowych odsłon przez użytkowników niezalogowanych na konto."
     page_view_logged_in_reqs:
       title: "Zalogowany"
       xaxis: "Dzień"
       yaxis: "Zalogowane odsłony"
+      description: "Liczba nowych odsłon strony od zalogowanych użytkowników."
     page_view_crawler_reqs:
       title: "Odsłony botów indeksujących"
       xaxis: "Dzień"
       yaxis: "Odsłony botów indeksujących"
+      description: "Łączna liczba odsłon stron z robotów indeksujących w czasie."
     page_view_total_reqs:
       title: "Wyświetlenia strony"
       xaxis: "Dzień"
       yaxis: "Wszystkie odsłony"
+      description: "Liczba nowych odsłon wszystkich użytkowników."
     page_view_logged_in_mobile_reqs:
       title: "Zalogowane odsłony"
       xaxis: "Dzień"
       yaxis: "Odsłony użytkowników mobilnych"
+      description: "Liczba nowych odsłon strony od użytkowników urządzeń mobilnych i zalogowanych na konto."
     page_view_anon_mobile_reqs:
       title: "Anonimowe odsłony"
       xaxis: "Dzień"
       yaxis: "Odsłony anonimowych użytkowników mobilnych"
+      description: "Liczba nowych odsłon strony użytkowników urządzenia mobilnego, którzy nie są zalogowani."
     http_background_reqs:
       title: "Tło"
       xaxis: "Dzień"
@@ -1158,18 +1273,25 @@ pl_PL:
       title: "Czas na pierwszą odpowiedź"
       xaxis: "Dzień"
       yaxis: "Średni czas (w godzinach)"
+      description: "Średni czas (w godzinach) pierwszej odpowiedzi na nowe tematy."
     topics_with_no_response:
       title: "Tematy bez odpowiedzi"
       xaxis: "Dzień"
       yaxis: "Łącznie"
+      description: "Liczba utworzonych nowych tematów, które nie otrzymały odpowiedzi."
     mobile_visits:
+      title: "Odwiedziny użytkowników (mobilne)"
       xaxis: "Dzień"
       yaxis: "Liczba wizyt"
+      description: "Liczba unikalnych użytkowników, którzy odwiedzili przy użyciu urządzenia mobilnego."
     web_crawlers:
+      title: "Agenty użytkownika przeszukiwacza sieci"
       labels:
         user_agent: "Przeglądarka użytkownika"
         page_views: "Wyświetlenia strony"
+      description: "Lista agentów użytkownika przeszukiwacza sieci, posortowana według odsłon."
     suspicious_logins:
+      title: "Podejrzane logowanie"
       labels:
         user: Użytkownik
         client_ip: IP klienta
@@ -1178,41 +1300,66 @@ pl_PL:
         device: Urządzenie
         os: System operacyjny
         login_time: Czas zalogowania
+      description: "Szczegóły nowych logowań, które różnią się podejrzanie od poprzednich logowań."
     staff_logins:
       title: "Zalogowania administratora"
       labels:
         user: Użytkownik
         location: Lokalizacja
+        login_at: Zaloguj się na
+      description: "Lista czasów logowania administratora wraz z lokalizacjami."
     top_uploads:
+      title: "Najpopularniejsze przesłane"
       labels:
         filename: Nazwa pliku
         extension: Rozszerzenia
         author: Autor
         filesize: Rozmiar pliku
+      description: "Wyświetl wszystkie przesłane pliki według rozszerzenia, rozmiaru pliku i autora."
     top_ignored_users:
+      title: "Najczęściej ignorowani / wyciszeni użytkownicy"
       labels:
+        ignored_user: Zignorowany użytkownik
         ignores_count: Licznik ignorowanych
         mutes_count: Licznik wyciszonych
+      description: "Użytkownicy, którzy zostali wyciszeni i / lub zignorowani przez wielu innych użytkowników."
   dashboard:
     rails_env_warning: "Twój serwer działa w trybie %{env}"
     host_names_warning: "Twój plik config/database.yml używa domyślnej nazwy serwera localhost. Zmień go by używał nazwy serwera Twojej strony."
     sidekiq_warning: 'Sidekiq nie działa. Wiele zadań, takich jak wysyłanie emaili, jest wykonywane asynchronicznie przez sidekiqa. Zagwarantuj, że przynajmniej jeden proces sidekiqa działa. <a href="https://github.com/mperham/sidekiq" target="_blank">Dowiedz się więcej o Sidekiqu</a>.'
     queue_size_warning: "Liczba oczekujących zadań wynosi %{queue_size}, to dużo. Może to wskazywać na problem z procesem (procesami) Sidekiq, lub możesz potrzebować więcej pracowników Sidekiq."
     memory_warning: "Twój serwer działa z mniej niż 1 GB pamięci całkowitej. Przynajmniej 1 GB pamięci jest zalecany."
+    google_oauth2_config_warning: 'Serwer jest skonfigurowany tak, aby umożliwić rejestrację i logowanie za pomocą Google OAuth2 (enable_google_oauth2_logins), ale identyfikator klienta i tajne wartości klienta nie są ustawione. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Zobacz ten przewodnik, aby dowiedzieć się więcej</a> .'
+    facebook_config_warning: 'Serwer jest skonfigurowany tak, aby umożliwić rejestrację i logowanie za pomocą Facebooka (enable_facebook_logins), ale identyfikator aplikacji i tajne wartości aplikacji nie są ustawione. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Zobacz ten przewodnik, aby dowiedzieć się więcej</a> .'
+    twitter_config_warning: 'Serwer jest skonfigurowany tak, aby umożliwić rejestrację i logowanie za pomocą Twittera (enable_twitter_logins), ale klucz i tajne wartości nie są ustawione. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Zobacz ten przewodnik, aby dowiedzieć się więcej</a> .'
+    github_config_warning: 'Serwer jest skonfigurowany tak, aby umożliwić rejestrację i logowanie za pomocą GitHub (enable_github_logins), ale identyfikator klienta i tajne wartości nie są ustawione. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Zobacz ten przewodnik, aby dowiedzieć się więcej</a> .'
+    s3_config_warning: 'Serwer jest skonfigurowany do przesyłania plików do S3, ale nie ustawiono co najmniej jednego z następujących ustawień: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile lub s3_upload_bucket. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Zobacz „Jak skonfigurować przesyłanie zdjęć do S3?” aby dowiedzieć się więcej</a> .'
+    s3_backup_config_warning: 'Serwer jest skonfigurowany do przesyłania kopii zapasowych do S3, ale nie skonfigurowano co najmniej jednego z następujących ustawień: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile lub s3_backup_bucket. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Zobacz „Jak skonfigurować przesyłanie zdjęć do S3?” aby dowiedzieć się więcej</a> .'
+    image_magick_warning: 'Serwer jest skonfigurowany do tworzenia miniatur dużych obrazów, ale ImageMagick nie jest zainstalowany. Zainstaluj ImageMagick za pomocą swojego ulubionego menedżera pakietów lub <a href="https://www.imagemagick.org/script/download.php" target="_blank">pobierz najnowszą wersję</a> .'
+    failing_emails_warning: 'Istnieją zadania e-mail %{num_failed_jobs}, które się nie powiodły. Sprawdź plik app.yml i upewnij się, że ustawienia serwera poczty są prawidłowe. <a href="%{base_path}/sidekiq/retries" target="_blank">Zobacz nieudane prace w Sidekiq</a> .'
     subfolder_ends_in_slash: "Twoje ustawienie podfolderu jest niepoprawne; DISCOURSE_RELATIVE_URL_ROOT kończy się slashem."
     email_polling_errored_recently:
       one: "Email polling wygenerował %{count} błąd w przeciągu ostatniej doby. Więcej szczegółów w <a href='%{base_path}/logs' target='_blank'>logach</a>."
       few: "Email polling wygenerował %{count} błędy w przeciągu ostatniej doby. Więcej szczegółów w <a href='%{base_path}/logs' target='_blank'>logach</a>."
       many: "Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='%{base_path}/logs' target='_blank'>logach</a>."
       other: "Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='%{base_path}/logs' target='_blank'>logach</a>."
+    missing_mailgun_api_key: "Serwer jest skonfigurowany do wysyłania wiadomości e-mail za pośrednictwem Mailgun, ale nie podałeś klucza API używanego do weryfikacji wiadomości haka internetowego."
+    bad_favicon_url: "Favicon nie ładuje się. Sprawdź ustawienia favicon w <a href='%{base_path}/admin/site_settings'>Ustawieniach witryny</a> ."
+    deprecated_api_usage: "Wykryliśmy żądanie interfejsu API przy użyciu przestarzałej metody uwierzytelniania. Zaktualizuj go, aby używać <a href='https://meta.discourse.org/t/-/22706'>uwierzytelniania opartego na nagłówkach</a> . Po aktualizacji ten komunikat może zniknąć po 24 godzinach."
+    update_mail_receiver: "Wykryliśmy nieaktualną wersję programu odbierającego pocztę. Kliknij <a href='https://meta.discourse.org/t/-/133491'>tutaj,</a> aby uzyskać instrukcje aktualizacji. Po aktualizacji ten komunikat może zniknąć po 24 godzinach."
     poll_pop3_timeout: "Połączenie z serwerem POP3 zostało zerwane. Przychodząca wiadomość mogła nie zostać odebrany. Proszę sprawdź swoje <a href='%{base_path}/admin/site_settings/category/email'ustawienia POP3</a> i dostawcę usług."
     poll_pop3_auth_error: "Połączenie z serwerem POP3 nie powiodło się przez błąd uwierzytelnienia. Proszę sprawdź swoje <a href='%{base_path}/admin/site_settings/category/email'>ustawienia POP3</a>."
+    force_https_warning: "Twoja strona korzysta z SSL. Ale ` <a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https`</a> nie jest jeszcze włączony w ustawieniach strony."
     out_of_date_themes: "Aktualizacje są dostępne dla następujących motywów:"
+    unreachable_themes: "Nie byliśmy w stanie sprawdzić aktualizacji następujących tematów:"
+    watched_word_regexp_error: "Wyrażenie regularne dla obserwowanych słów %{action} jest nieprawidłowe. Sprawdź ustawienia <a href='%{base_path}/admin/logs/watched_words'>Obserwowanego słowa</a> lub wyłącz ustawienie witryny „obserwowane słowa wyrażenia regularne”."
   site_settings:
     censored_words: "Wskazane słowa będą automatycznie zamieniane na &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Automatycznie kasuj wpisy ukryte dłużej niż 30 dni."
+    default_locale: "Domyślny język tego wystąpienia dyskursu. Tekst kategorii i tematów generowanych przez system można zastąpić w opcji <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Dostosuj / Tekst</a> ."
     allow_user_locale: "Zezwól użytkownikom na zmianę języka interfejsu we własnych ustawieniach"
     set_locale_from_accept_language_header: "ustaw język interfejsu dla niezalogowanych użytkowników na podstawie języka w nagłówku ich przeglądarki. (EKSPERYMENTALNE, nie działa z anonimowym cache)"
+    support_mixed_text_direction: "Obsługa mieszanych wskazówek tekstowych od lewej do prawej i od prawej do lewej."
     min_post_length: "Minimalna długość wpisu w znakach"
     min_first_post_length: "Minimalna długość treści (liczba znaków) pierwszego wpisu w temacie "
     min_personal_message_post_length: "Minimalna długość treści wiadomości "
@@ -1231,25 +1378,39 @@ pl_PL:
     search_query_log_max_size: "Maksymalna liczba zapytań do zachowania"
     search_query_log_max_retention_days: "Maksymalny czas zachowywania wyników wyszukiwania, w dniach."
     search_ignore_accents: "Ignoruj akcenty przy szukaniu tekstu."
+    category_search_priority_very_low_weight: "Waga zastosowana w rankingu dla bardzo niskiego priorytetu wyszukiwania kategorii."
+    category_search_priority_low_weight: "Waga zastosowana w rankingu dla priorytetu wyszukiwania niskiej kategorii."
+    category_search_priority_high_weight: "Waga zastosowana w rankingu dla priorytetu wyszukiwania wysokiej kategorii."
+    category_search_priority_very_high_weight: "Waga zastosowana w rankingu dla bardzo wysokiego priorytetu wyszukiwania kategorii."
     allow_uncategorized_topics: "Zezwól na tworzenie tematów bez kategorii. UWAGA: jeśli jest jakiś nieskategoryzowany temat, musisz go przypisać do kategorii, zanim wyłączysz tę opcję."
     allow_duplicate_topic_titles: "Pozwól na tworzenie tematów o identycznych tytułach."
     unique_posts_mins: "Ile minut musi upłynąć zanim użytkownik będzie mógł ponownie zrobić wpis z tą samą treścią"
     educate_until_posts: "Wyświetlaj okno edukacyjne po rozpoczęciu pisania dopóki nowy użytkownik nie napisze tylu wpisów."
     title: "Nazwa tej strony używana w tagu title."
     site_description: "Opis strony w jednym zdaniu, wykorzystywany w meta tagu description."
+    short_site_description: "Krótki opis, użyty w tytule na stronie głównej."
+    contact_email: "Adres e-mail kluczowego kontaktu odpowiedzialnego za tę stronę. Służy do krytycznych powiadomień, a także w formularzu kontaktowym <a href='%{base_path}/about' target='_blank'>/ about</a> w pilnych sprawach."
+    contact_url: "Kontaktowy adres URL tej witryny. Używane w formularzu kontaktowym <a href='%{base_path}/about' target='_blank'>/ about</a> w pilnych sprawach."
     crawl_images: "Pobieraj grafiki ze zdalnych URLi aby ustawić poprawną wysokość i szerokość w tagu img."
     download_remote_images_to_local: "Pobieraj zdalne grafiki i twórz ich lokalne kopie aby zapobiegać uszkodzonym/brakującym obrazkom na stronach."
     download_remote_images_threshold: "Minimalna ilość wolnego miejsca na dysku wymagana przez funkcję pobierania zdalnych grafik (w procentach)"
     download_remote_images_max_days_old: "Nie pobieraj zdalnych obrazów dla postów które mają więcej niż n dni."
     disabled_image_download_domains: "Zdalne grafiki z tych domen nie będą pobierane."
     editing_grace_period: "Przez (n) sekund po utworzeniu nowego wpisu jego kolejne edycje nie będą tworzyć nowych wersji w historii wpisu."
+    editing_grace_period_max_diff: "Maksymalna liczba zmian znaków dozwolona w okresie karencji edycji, jeśli więcej zmieniono, zapisz kolejną wersję postu (poziom zaufania 0 i 1)"
+    editing_grace_period_max_diff_high_trust: "Maksymalna liczba zmian znaków dozwolona w okresie karencji edycji, jeśli więcej zmieniono, zapisz kolejną wersję postu (poziom zaufania 2 i wyższy)"
+    staff_edit_locks_post: "Wpisy zostaną zablokowane przed edycją, jeśli będą edytowane przez członków personelu"
+    post_edit_time_limit: "Autor tl0 lub tl1 może edytować swój post przez (n) minut po opublikowaniu. Ustaw na zawsze na 0."
+    tl2_post_edit_time_limit: "Autor tl2 + może edytować swój post przez (n) minut po opublikowaniu. Ustaw na zawsze na 0."
     edit_history_visible_to_public: "Pozwól wszystkim przeglądać poprzednie wersje edytowanych wpisów. Gdy wyłączone, jedynie obsługa/staff może."
     delete_removed_posts_after: "Wpisy usunięte przez autora będą automatycznie zlikwidowane po (n) godzinach. Jeżeli liczba godzin będzie wynosić 0, to zostaną usunięte natychmiast. "
     max_image_width: "Maksymalna szerokość miniaturki grafiki we wpisie. "
     max_image_height: "Maksymalna wysokość miniaturki grafiki we wpisie. "
+    responsive_post_image_sizes: "Zmień rozmiar podglądu lightbox, aby umożliwić wyświetlanie ekranów o wysokiej rozdzielczości DPI o następujących proporcjach pikseli. Usuń wszystkie wartości, aby wyłączyć responsywne obrazy."
     fixed_category_positions: "Zaznacz, aby ręcznie ustawiać kolejność kategorii. Odznacz, aby kategorie były sortowane na podstawie aktywności. "
     fixed_category_positions_on_create: "Jeżeli jest sprawdzone to porządkowanie kategorii będzie zależało od stworzonego tematu (requires fixed_category_positions). "
     add_rel_nofollow_to_user_content: 'Dodaj rel nofollow do wszystkich treści użytkownika, poza wewnętrznymi linkami (wliczając domeny nadrzędne). Jeśli to zmienisz, musisz rebake wszystkie posty poprzez: "rake post:rebake"'
+    exclude_rel_nofollow_domains: "Lista domen, w których nofollow nie powinien być dodawany do linków. example.com automatycznie zezwoli również na sub.example.com. Jako minimum należy dodać domenę tej witryny, aby roboty indeksujące mogły znaleźć całą treść. Jeśli inne części witryny znajdują się w innych domenach, dodaj je również."
     post_excerpt_maxlength: "Maksymalna długość podsumowania / streszczenia wpisu."
     show_pinned_excerpt_mobile: "Pokaż fragment przypiętych tematów w widoku mobilnym"
     show_pinned_excerpt_desktop: "Pokaż fragment przypiętych tematów w widoku \"wersja komputerowa\""
@@ -1257,16 +1418,32 @@ pl_PL:
     onebox_domains_blacklist: "Lista domen które nigdy nie będą posegregowane. "
     inline_onebox_domains_whitelist: "Lista domen, które będą zamknięte w miniaturze jeśli zostały zalinkowane bez tytułu."
     enable_inline_onebox_on_all_domains: "Zignoruj inline_onebox_domain_whitelist strony ustawień i zezwól na wstawki onebox we wszystkich domenach."
+    force_custom_user_agent_hosts: "Hosty, dla których ma być używany niestandardowy klient użytkownika Onebox przy wszystkich żądaniach. (Szczególnie przydatne dla hostów, które ograniczają dostęp do agenta użytkownika)."
     max_oneboxes_per_post: "Masymalna ilość oneboxów w poście."
+    logo: "Obraz logo w lewym górnym rogu witryny. Użyj szerokiego prostokątnego obrazu o wysokości 120 i współczynniku kształtu większym niż 3: 1. Jeśli pole pozostanie puste, wyświetlony zostanie tekst tytułu witryny."
+    logo_small: "Mały obraz logo w lewym górnym rogu witryny, widoczny podczas przewijania w dół. Użyj kwadratowego obrazu 120 × 120. Jeśli pole pozostanie puste, wyświetlony zostanie glif domowy."
+    digest_logo: "Alternatywne logo użyte w górnej części podsumowania e-mail witryny. Użyj szerokiego obrazu prostokąta. Nie używaj obrazu SVG. Jeśli pole pozostanie puste, zostanie użyty obraz z ustawienia „logo”."
+    mobile_logo: "Logo używane w mobilnej wersji Twojej witryny. Użyj szerokiego prostokątnego obrazu o wysokości 120 i współczynniku kształtu większym niż 3: 1. Jeśli pole pozostanie puste, zostanie użyty obraz z ustawienia „logo”."
+    large_icon: "Obraz używany jako podstawa dla innych ikon metadanych. Idealnie powinna być większa niż 512 x 512. Jeśli pozostanie puste, zostanie użyte logo_small."
+    manifest_icon: "Obraz używany jako logo / obraz powitalny na Androidzie. Zostanie automatycznie zmieniony na 512 × 512. Jeśli pozostanie puste, zostanie użyty duży_plik."
+    favicon: "Ulubiony dla Twojej witryny, zobacz <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a> . Aby działać poprawnie na CDN, musi to być png. Zostanie przeskalowany do 32x32. Jeśli pozostanie puste, zostanie użyty duży_plik."
+    apple_touch_icon: "Ikona używana dla urządzeń Apple Touch. Zostanie automatycznie zmieniony na 180x180. Jeśli pozostanie puste, zostanie użyty duży_plik."
+    opengraph_image: "Domyślny obraz opengraph, używany, gdy strona nie ma innego odpowiedniego obrazu. Jeśli pozostanie puste, zostanie użyty duży_plik"
+    twitter_summary_large_image: "„Podsumowanie dużego obrazu” karty Twittera (powinno mieć co najmniej 280 szerokości i co najmniej 150 wysokości). Jeśli pole pozostanie puste, generowane są zwykłe metadane karty przy użyciu opengraph_image."
     notification_email: "Adres z którego wysyłane będą wszystkie istotne emaile systemowe.\nKonieczna jest poprawna konfiguracja rekordów SPF, DKIM oraz zwrotnego PTR użytej domeny."
     email_custom_headers: "A pipe-delimited list of custom email headers"
+    email_subject: "Konfigurowalny format tematyczny dla standardowych e-maili. Zobacz <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
+    detailed_404: "Dostarcza użytkownikom więcej informacji o tym, dlaczego nie mogą uzyskać dostępu do określonego tematu. Uwaga: jest to mniej bezpieczne, ponieważ użytkownicy będą wiedzieć, czy adres URL prowadzi do prawidłowego tematu."
+    enforce_second_factor: "Zmusza użytkowników do włączenia uwierzytelniania drugiego czynnika. Wybierz „wszystkie”, aby wymusić to na wszystkich użytkownikach. Wybierz „personel”, aby wymusić to tylko dla użytkowników personelu."
     force_https: "Wymuś używanie wyłącznie HTTPS na stronie. UWAGA: NIE włączaj tego dopóki nie zweryfikujesz, że HTTPS jest w pełni skonfigurowany i działa absolutnie wszędzie! Czy sprawdziłeś swoje CDN, loginy z portali społecznościowych i wszystkie zewnętrzne loga / zależności żeby być pewnym, że są kompatybilne z HTTPS?"
     same_site_cookies: "Używaj tych samych plików cookies, eliminują one wszystkie wektory Cross Site Request Forgery na wspieranych przeglądarkach (Lax lub Strict). Ostrzeżenie: Przeglądarka Strict działa jedynie na stronach, które wymagają logowania oraz używają SSO."
     summary_score_threshold: "Minimalny wynik wpisu wymagany do umieszczenia go w 'Podsumowaniu tematu'"
-    summary_posts_required: "Minimalna liczba wpisów w temacie zanim 'Podsumowanie tematu' jest dostępne"
-    summary_likes_required: "Minimalna liczba polubień w temacie zanim 'Podsumowanie tematu' jest dostępne"
+    summary_posts_required: "Minimalna liczba postów w temacie przed „Podsumowaniem tego tematu” jest włączona. Zmiany tego ustawienia zostaną zastosowane z mocą wsteczną w ciągu tygodnia."
+    summary_likes_required: "Minimalna liczba polubień w temacie przed włączeniem „Podsumuj ten temat”. Zmiany tego ustawienia zostaną zastosowane z mocą wsteczną w ciągu tygodnia."
     summary_percent_filter: "Gdy użytkownik kliknie na 'Podsumowaniu tematu', pokaż % najlepszych wpisów"
+    summary_max_results: "Maksymalna liczba postów zwróconych przez „Podsumuj ten temat”"
     enable_personal_messages: "Zezwalaj użytkownikom o poziomie zaufania 1 (możliwe do zmiany przez min trust level to send messages) na tworzenie wiadomości i odpowiadanie na nie. Zwróć uwagę, że administracja zawsze może wysyłać wiadomości bez względu na wszystko."
+    enable_system_message_replies: "Pozwala użytkownikom odpowiadać na wiadomości systemowe, nawet jeśli wiadomości osobiste są wyłączone"
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_base_url: "Podstawowy URL używany dla long polling (kiedy CDN dostarcza dynamicznych treści, upewnij się że ustawiłeś to w origin pull) np.: http://origin.site.com"
     long_polling_interval: "Okres czasu jaki serwer powinien odczekać przed odpowiedzią klientowi kiedy nie ma danych do przesłania (tylko do zalogowanych użytkowników)"
@@ -1274,80 +1451,149 @@ pl_PL:
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     background_polling_interval: "Jak często klienci powinni poll w milisekundach (kiedy okno jest w tle)"
     hide_post_sensitivity: "Prawdopodobieństwo, że flagowany wpis zostanie ukryty"
+    silence_new_user_sensitivity: "Prawdopodobieństwo, że nowy użytkownik zostanie uciszony na podstawie flag spamu"
+    auto_close_topic_sensitivity: "Prawdopodobieństwo, że oflagowany temat zostanie automatycznie zamknięty"
     cooldown_minutes_after_hiding_posts: "Liczba minut, ile musi odczekać użytkownik, zanim będzie mógł edytować post ukryty w wyniku oflagowania przez społeczność"
     max_topics_in_first_day: "Maksymalna liczba tematów, jakie może stworzyć użytkownik w trakcie 24 godzin po utworzeniu pierwszego posta"
     max_replies_in_first_day: "Maksymalna liczba odpowiedzi, jakie może stworzyć użytkownik w trakcie 24 godzin po utworzeniu pierwszego posta"
     tl2_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl2 (członek), mnożąc przez tę liczbę"
     tl3_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl3 (użytkownik stały), mnożąc przez tę liczbę"
     tl4_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl4 (lider), mnożąc przez tę liczbę"
+    num_users_to_silence_new_user: "Jeśli posty nowego użytkownika otrzymają znaczniki spamu num_spam_flags_to_silence_new_user od wielu różnych użytkowników, ukryj wszystkie ich posty i zapobiegaj publikowaniu w przyszłości. 0, aby wyłączyć."
+    num_tl3_flags_to_silence_new_user: "Jeśli posty nowego użytkownika otrzymają tyle flag od num_tl3_users_to_silence_new_user różnych użytkowników poziomu zaufania 3, ukryj wszystkie ich posty i zapobiegaj publikowaniu w przyszłości. 0, aby wyłączyć."
+    num_tl3_users_to_silence_new_user: "Jeśli posty nowego użytkownika otrzymają flagi num_tl3_flags_to_silence_new_user od wielu różnych użytkowników poziomu zaufania 3, ukryj wszystkie ich posty i zapobiegaj publikowaniu w przyszłości. 0, aby wyłączyć."
+    notify_mods_when_user_silenced: "Jeśli użytkownik zostanie automatycznie wyciszony, wyślij wiadomość do wszystkich moderatorów."
+    flag_sockpuppets: "Jeśli nowy użytkownik odpowiada na temat z tego samego adresu IP, co użytkownik, który rozpoczął ten temat, oflaguj oba jego posty jako potencjalny spam."
     traditional_markdown_linebreaks: "Używaj tradycyjnych znaków końca linii w Markdown, to znaczy dwóch spacji na końcu linii."
+    enable_markdown_typographer: "Użyj reguł typografii, aby poprawić czytelność tekstu: zamień proste cudzysłowy „na nawiasy”, (c) (tm) na symbole, - za pomocą emdash - itp."
+    enable_markdown_linkify: "Automatycznie traktuj tekst, który wygląda jak link, jako link: www.example.com i https://example.com zostaną automatycznie połączone"
+    markdown_linkify_tlds: "Lista domen najwyższego poziomu, które są automatycznie traktowane jako linki"
+    markdown_typographer_quotation_marks: "Lista par zastępujących podwójne i pojedyncze cytaty"
     post_undo_action_window_mins: "Przez tyle minut użytkownicy mogą cofnąć swoje ostatnie działania przy danym poście (lajki, flagowanie, itd.)."
     must_approve_users: "Zespół musi zaakceptować wszystkie nowe konta zanim uzyskają dostęp do serwisu."
+    invite_code: "Użytkownik musi wpisać ten kod, aby zezwolić na rejestrację konta, ignorowany, gdy jest pusty (bez rozróżniania wielkości liter)"
+    approve_suspect_users: "Dodaj podejrzanych użytkowników do kolejki recenzji. Podejrzani użytkownicy weszli do biografii / witryny, ale nie czytali."
     pending_users_reminder_delay: "Powiadomić moderatorów jeżeli nowi użytkownicy czekali na zatwierdzenie dłużej niż his mamy godzin. Ustaw -1 aby wyłączyć powiadomienia. "
     maximum_session_age: "Użytkownik zostanie zalogowany przez n godzin od czasu ostatniej wizyty."
+    ga_universal_tracking_code: "Identyfikator kodu śledzenia Google Universal Analytics (analytics.js), np .: UA-12345678-9; patrz <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_domain_name: "Nazwa domeny Google Universal Analytics (analytics.js), np .: mysite.com; patrz <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Włącz śledzenie w wielu domenach Google Universal Analytics (analytics.js). W linkach wychodzących do tych domen zostanie dodany identyfikator klienta. Zobacz <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>przewodnik śledzenia między domenami Google.</a>"
+    gtm_container_id: "Identyfikator kontenera Menedżera tagów Google. np .: GTM-ABCDEF. <br/> Uwaga: skrypty innych firm ładowane przez GTM mogą wymagać dodania do białej listy w „skrypcie polityki bezpieczeństwa treści src”."
+    enable_escaped_fragments: "Wróć do Google Ajax-Crawling API, jeśli nie zostanie wykryty żaden webcrawler. Zobacz <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     moderators_create_categories: "Zezwól moderatorom na tworzenie nowych kategorii"
     cors_origins: "Dozwolone źródła dla zapytać cross-origin (CORS). Każde źródło musi zawierać http:// lub https://. Zmienna środowiskowa DISCOURSE_ENABLE_CORS musi być ustawiona na true żeby włączyć CORS."
     use_admin_ip_whitelist: "Administratorzy mogą się logować tylko z adresów IP zdefiniowanych w liście Screened IPs (Admin > Logi > Screened Ips)."
     blacklist_ip_blocks: "Lista zablokowanych prywatnych adresów IP, które nigdy nie powinny być przeszukiwane przez Discourse."
     whitelist_internal_hosts: "Lista wewnętrznych hostów, które są bezpieczne dla discourse, jeśli chodzi o oneboxing i inne cele"
+    allowed_iframes: "Lista prefiksów domeny src iframe, które dyskurs może bezpiecznie dopuścić w postach"
+    whitelisted_crawler_user_agents: "Agenty użytkownika dla robotów indeksujących, które powinny mieć dostęp do strony. OSTRZEŻENIE! USTAWIENIE TEGO BĘDZIE NIEWIELKIE WSZYSTKIEGO PRZETWORNICY NIE WYMIENIONE TUTAJ!"
+    blacklisted_crawler_user_agents: "Unikatowe słowo bez rozróżniania wielkości liter w ciągu agenta użytkownika identyfikujące przeszukiwacze sieci, które nie powinny mieć dostępu do witryny. Nie dotyczy, jeśli zdefiniowano białą listę."
+    slow_down_crawler_user_agents: "Programy klienckie robotów indeksujących, które powinny mieć ograniczoną szybkość w pliku robots.txt, korzystając z dyrektywy o opóźnieniu indeksowania"
+    slow_down_crawler_rate: "Jeśli określono parametr slow_down_crawler_user_agents, ta stawka będzie obowiązywać dla wszystkich robotów (liczba sekund opóźnienia między żądaniami)"
+    content_security_policy: "Włącz politykę bezpieczeństwa treści"
+    content_security_policy_report_only: "Włącz tylko treść-bezpieczeństwo-zasady-tylko raport"
+    content_security_policy_collect_reports: "Włącz zbieranie raportów o naruszeniach CSP na / csp_reports"
+    content_security_policy_script_src: "Dodatkowe źródła skryptów na białej liście. Bieżący host i CDN są domyślnie dołączone. Zobacz <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Ograniczanie ataków XSS za pomocą zasad bezpieczeństwa treści.</a>"
+    invalidate_inactive_admin_email_after_days: "Konta administracyjne, które nie odwiedzały witryny w tej liczbie dni, będą musiały ponownie zweryfikować swój adres e-mail przed zalogowaniem. Ustaw na 0, aby wyłączyć."
     top_menu: "Określ które elementy nawigacyjne serwisu powinny być widoczne i w jakiej kolejności. Przykład aktualne|nowe|nieodczytane|kategorie|top|przeczytane|wysłane|zakładki"
     post_menu: "Określ które elementy menu wpisu powinny być widoczne i w jakiej kolejności. Przykład like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Elementy w menu, które w menu posta będą ukryte, chyba że kliknięty zostanie przycisk rozwijania."
     share_links: "Określ które elementy menu udostępniania powinny być widoczne i w jakiej kolejności. "
     site_contact_username: "Nazwa użytkownika, spod której wysyłane będą automatyczne wiadomości. Jeśli pusta, użyte będzie domyślne konto System."
+    site_contact_group_name: "Prawidłowa nazwa grupy, do której zostaną zaproszone wszystkie automatyczne wiadomości."
     send_welcome_message: "Wyślij wszystkim nowym użytkownikom powitalną wiadomość z krótkim przewodnikiem."
+    send_tl1_welcome_message: "Wyślij wiadomość powitalną do nowych użytkowników poziomu zaufania 1."
     suppress_reply_directly_below: "Nie pokazuj rozwijanej liczby odpowiedzi przy poście, gdy jest tylko jedna odpowiedź bezpośrednio pod tym postem."
     suppress_reply_directly_above: "Nie pokazuj rozwijanego \"w odpowiedzi na\" przy poście, gdy jest tylko jedna odpowiedź bezpośrednio nad tym postem."
+    remove_full_quote: "Automatycznie usuwaj pełne cytaty z bezpośrednich odpowiedzi."
     suppress_reply_when_quoting: "Nie pokazuj rozwijanego \"w odpowiedzi na\" przy poście, gdy w poście zacytowano odpowiedź."
     max_reply_history: "Maksymalna liczba odpowiedzi, dla której \"w odpowiedzi na\" będzie się rozwijać."
     topics_per_period_in_top_summary: "Liczba tematów wyświetlanych w domyślnym podsumowaniu najbardziej popularnych wątków"
     topics_per_period_in_top_page: "Liczba tematów wyświetlanych w widoku 'Pokaż więcej' na ekranie popularnych wątków."
     redirect_users_to_top_page: "Automatycznie kieruj nowych i długo nieobecnych użytkowników na stronę główną."
     top_page_default_timeframe: "Domyślne ramy czasowe dla strony widoku z góry."
+    moderators_view_emails: "Zezwalaj moderatorom na przeglądanie wiadomości e-mail użytkowników"
     prioritize_username_in_ux: "Pokaż nazwę użytkownika jako pierwszą na stronie użytkownika, karcie użytkownika i w postach (kiedy wyłączone imię jest pokazane jako pierwsze)"
+    enable_rich_text_paste: "Włącz automatyczną konwersję HTML do Markdown podczas wklejania tekstu do kompozytora. (Eksperymentalny)"
     email_token_valid_hours: "Tokeny resetujące hasło / aktywujące konto są ważne przez (n) godzin."
     enable_badges: "Włącz system odznak"
     enable_whispers: "Pozwalaj administracji na prywatną rozmowę w tematach."
+    allow_index_in_robots_txt: "W pliku robots.txt określ, że ta witryna może być indeksowana przez wyszukiwarki internetowe. W wyjątkowych przypadkach możesz trwale <a href='%{base_path}/admin/customize/robots'>zastąpić plik robots.txt</a> ."
     email_domains_blacklist: "Lista rozdzielonych pionową kreską domen e-mail, z których użytkownicy nie mogą się rejestrować. Przykład: mailinator.com|trashmail.net"
     email_domains_whitelist: "Lista rozdzielonych pionową kreską domen e-mail, z których użytkownicy MUSZĄ się rejestrować. UWAGA: Użytkownicy z domenami e-mail innymi niż wypisane nie będą dopuszczeni!"
+    auto_approve_email_domains: "Użytkownicy z adresami e-mail z tej listy domen zostaną automatycznie zatwierdzeni."
+    hide_email_address_taken: "Nie informuj użytkowników, że istnieje konto z danym adresem e-mail podczas rejestracji i z formularza zapomnianego hasła."
     log_out_strict: "Po wylogowaniu wyloguj WSZYSTKIE sesje użytkownika na wszystkich urządzeniach."
+    version_checks: "Wyślij ping do Discourse Hub w celu uzyskania aktualizacji wersji i pokaż komunikaty o nowej wersji na pulpicie <a href='%{base_path}/admin' target='_blank'>/ admin</a>"
     new_version_emails: "Wyślij email na adres contact_email, kiedy nowa wersja Discourse będzie dostępna."
     invite_expiry_days: "Jak długo klucz zaproszenie użytkownika jest ważny, w dniach."
+    invite_only: "Wszyscy nowi użytkownicy muszą być wyraźnie zaproszeni przez zaufanych użytkowników lub personel. Rejestracja publiczna jest wyłączona."
     login_required: "Wymagaj autoryzacji do wyświetlenia zawartości strony, zablokuj możliwość anonimowego dostępu."
     min_username_length: "Minimalna długość nazwy użytkownika w znakach. OSTRZEŻENIE: jeśli jacykolwiek istniejący użytkownicy lub grupy mają nazwy krótsze niż ta, twój serwis się uszkodzi!"
     max_username_length: "Maksymalna długość nazwy użytkownika w znakach. OSTRZEŻENIE: jeśli jacykolwiek istniejący użytkownicy lub grupy mają nazwy dłuższe niż ta, twój serwis się uszkodzi!"
+    unicode_usernames: "Pozwól, aby nazwy użytkowników i nazwy grup zawierały litery i cyfry Unicode."
+    unicode_username_character_whitelist: "Wyrażenie regularne pozwalające na używanie tylko niektórych znaków Unicode w nazwach użytkowników. Litery i cyfry ASCII będą zawsze dozwolone i nie trzeba ich umieszczać na białej liście."
     reserved_usernames: "Nazwy użytkowników, które są niedostępne przy rejestracji. Symbol dzikiej karty * może zostać użyty, aby dopasować do argumentu zero lub więcej razy."
     min_password_length: "Minimalna długość hasła."
     min_admin_password_length: "Minimalna długość hasła dla Admina."
     password_unique_characters: "Minimalna ilość różnych znaków, które muszą być w haśle."
     block_common_passwords: "Nie zezwalaj na hasła znajdujące się w grupie 10 000 najpopularniejszych haseł."
     enable_sso: "Włącz pojedyncze logowanie przez zewnętrzną stronę (UWAGA: ADRESY E-MAIL UŻYTKOWNIKÓW *MUSZĄ* BYĆ ZATWIERDZONE PRZEZ ZEWNĘTRZNĄ STRONĘ!)"
+    verbose_sso_logging: "Rejestruj pełną diagnostykę związaną z jednokrotnym logowaniem do <a href='%{base_path}/logs' target='_blank'>/ logs</a>"
+    enable_sso_provider: "Wdrożenie protokołu dostawcy SSO Discourse w punkcie końcowym / session / sso_provider, wymaga ustawienia sso_provider_secrets"
     sso_url: "URL endpoint pojedynczego logowania (musi zawierać http:// lub https://)"
     sso_secret: "Tajny ciąg znaków używany, aby kryptograficznie uwierzytelnić informacje SSO, powinien mieć 10 lub więcej znaków."
+    sso_provider_secrets: "Lista par tajnych domen, które używają Discourse jako dostawcy SSO. Upewnij się, że klucz SSO ma 10 znaków lub więcej. Symbol wieloznaczny * może być używany do dopasowania dowolnej domeny lub tylko jej części (np. * .Example.com)."
     sso_overrides_bio: "Nadpisuje biografię użytkownika w jego profilu i uniemożliwia mu zmianę biografii."
+    sso_overrides_groups: "Zsynchronizuj wszystkie ręczne członkostwo w grupach z grupami określonymi w atrybucie sso grup (OSTRZEŻENIE: jeśli nie określisz grup, każde ręczne członkostwo w grupie zostanie usunięte dla użytkownika)"
     sso_overrides_email: "Nadpisuje lokalny email poprzez zewnętrzną witrynę email z SSO przy każdym logowaniu, aby zapobiec lokalnym zmianom. (Ostrzeżenie: rozbieżności mogą pojawić się w związku z normalizacją lokalnym emaili)."
     sso_overrides_username: "Nadpisuje lokalne nazwy użytkowników z pomocą nazw użytkowników z zewnętrznej strony przez SSO przy każdym logowaniu i zapobiega lokalnym zmianom. (Ostrzeżenie: rozbieżności mogą pojawić się w związku z różnicami w długością/wymaganiami nazwy użytkownika)"
     sso_overrides_name: "Nadpisuje lokalną pełną nazwę za pomocą pełnych nazw z zewnętrznej strony przez SSO przy każdym logowaniu i zapobiega lokalnym zmianom."
+    sso_overrides_avatar: "Zastępuje awatar użytkownika zewnętrznym awatarem strony z ładunku SSO. Jeśli ta opcja jest włączona, użytkownicy nie będą mogli przesyłać awatarów na dyskurs."
+    sso_overrides_profile_background: "Zastępuje tło profilu użytkownika awatarem strony zewnętrznej z ładunku SSO."
+    sso_overrides_card_background: "Zastępuje tło karty użytkownika awatarem strony zewnętrznej z ładunku SSO."
     sso_not_approved_url: "Przekieruj niezatwierdzone konta SSO na ten URL"
     sso_allows_all_return_paths: "Nie ograniczaj domen dla return_paths dostarczanych przez SSO (domyślnie zwracana ścieżka musi być na aktualnej stronie)"
+    enable_local_logins: "Włącz konta oparte na lokalnej nazwie użytkownika i haśle. To musi być włączone dla zaproszeń do pracy. OSTRZEŻENIE: jeśli wyłączone, logowanie może być niemożliwe, jeśli wcześniej nie skonfigurowano co najmniej jednej alternatywnej metody logowania."
+    enable_local_logins_via_email: "Zezwalaj użytkownikom na żądanie linku logowania do jednego kliknięcia, który zostanie im przesłany pocztą e-mail."
     allow_new_registrations: "Zezwól na rejestrację nowych użytkowników. Odznacz opcję żeby uniemożliwić rejestrację nowych kont."
     enable_signup_cta: "Pokazuj wiadomość dla powracających użytkowników anonimowych, zachęcającą ich do założenia konta."
+    enable_google_oauth2_logins: "Włącz uwierzytelnianie Google Oauth2. Jest to metoda uwierzytelniania obsługiwana obecnie przez Google. Wymaga klucza i tajemnicy. Zobacz <a href='https://meta.discourse.org/t/15858' target='_blank'>Konfigurowanie logowania Google do dyskursu</a> ."
     google_oauth2_client_id: "Client ID twojej aplikacji w Google"
     google_oauth2_client_secret: "Client Secret twojej aplikacji w Google"
+    google_oauth2_prompt: "Opcjonalna lista wartości łańcuchowych rozdzielanych spacjami, która określa, czy serwer autoryzacji monituje użytkownika o ponowne uwierzytelnienie i zgodę. Możliwe wartości można znaleźć na <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> ."
+    google_oauth2_hd: "Opcjonalna domena Google Apps Hosted, do której logowanie będzie ograniczone. Więcej informacji można znaleźć na <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a>"
+    enable_twitter_logins: "Włącz uwierzytelnianie na Twitterze, wymaga twitter_consumer_key i twitter_consumer_secret. Zobacz <a href='https://meta.discourse.org/t/13395' target='_blank'>Konfigurowanie logowania na Twitterze (i bogatych osadzeń) dla dyskursu</a> ."
+    twitter_consumer_key: "Klucz klienta do uwierzytelnienia na Twitterze, zarejestrowany na <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
+    twitter_consumer_secret: "Sekret klienta dotyczący uwierzytelniania na Twitterze, zarejestrowany na <a href='https://developer.twitter.com/apps' target='_blank'>stronie https://developer.twitter.com/apps</a>"
     enable_instagram_logins: "Włącz uwierzytelnienie za pomocą Instagramu, wymaga instagram_consumer_key i instagram_consumer_secret."
     instagram_consumer_key: "Klucz konsumenta dla uwierzytelnienia Instragram"
     instagram_consumer_secret: "Sekret konsumenta dla uwierzytelnienia Instragram"
+    enable_facebook_logins: "Włącz uwierzytelnianie na Facebooku, wymaga facebook_app_id i facebook_app_secret. Zobacz <a href='https://meta.discourse.org/t/13394' target='_blank'>Konfigurowanie logowania na Facebooku dla dyskursu</a> ."
+    facebook_app_id: "Identyfikator aplikacji do uwierzytelniania na Facebooku, zarejestrowany na <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    facebook_app_secret: "Tajna aplikacja do uwierzytelniania na Facebooku, zarejestrowana na <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    enable_github_logins: "Włącz uwierzytelnianie Github, wymaga github_client_id i github_client_secret. Zobacz <a href='https://meta.discourse.org/t/13745' target='_blank'>Konfigurowanie logowania do GitHub dla dyskursu</a> ."
+    github_client_id: "Identyfikator klienta dla uwierzytelnienia Github, zarejestrowany na <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    github_client_secret: "Tajny klucz klienta dla uwierzytelnienia Github, zarejestrowany na <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    enable_discord_logins: "Zezwolić użytkownikom na uwierzytelnianie przy użyciu Discord?"
+    discord_client_id: 'Identyfikator klienta Discord (potrzebujesz jednego? Odwiedź <a href="https://discordapp.com/developers/applications/me">portal dewelopera Discord</a> )'
     discord_secret: "Sekretny klucz Discorda"
-    readonly_mode_during_backup: "Włącz tryb tylko do odczytu podczas wykonywania kopii zapasowej"
+    discord_trusted_guilds: 'Zezwalaj tylko członkom tych gildii Discord na logowanie się za pośrednictwem Discord. Użyj identyfikatora numerycznego gildii. Aby uzyskać więcej informacji, sprawdź instrukcje <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">tutaj</a> . Pozostaw puste, aby zezwolić dowolnej gildii.'
+    enable_backups: "Pozwól administratorom tworzyć kopie zapasowe forum"
     allow_restore: "Dopuść przywracanie, które może zamienić WSZYSTKIE dane strony! Zostaw fałsz, chyba że planujesz przywrócić kopię zapasową"
     maximum_backups: "Maksymalna liczba kopii zapasowych do przechowywania na dysku. Starsze kopie zapasowe zostaną automatycznie usunięte."
     automatic_backups_enabled: "Uruchom automatyczne kopie zapasowe zgodnie z ustawioną częstotliwością kopii"
     backup_frequency: "Liczba dni pomiędzy tworzeniem kopii zapasowych."
     s3_backup_bucket: "Zdalne wiadro do przechowywania kopii zapasowych. UWAGA: Upewnij się, że jest to wiadro prywatne."
+    s3_endpoint: "Punkt końcowy można zmodyfikować, aby utworzyć kopię zapasową w usłudze zgodnej z S3, takiej jak DigitalOcean Spaces lub Minio. OSTRZEŻENIE: Pozostaw puste, jeśli używasz AWS S3."
+    s3_configure_tombstone_policy: "Włącz zasady automatycznego usuwania przy przesyłaniu nagrobków. WAŻNE: Jeśli ta opcja jest wyłączona, nie zostanie odzyskane żadne miejsce po usunięciu przesłanych plików."
     s3_disable_cleanup: "Dezaktywuj usuwanie kopii zapasowych z S3 kiedy usunięte lokalnie."
+    enable_s3_inventory: "Generuj raporty i weryfikuj przesyłane materiały za pomocą zasobów Amazon S3. WAŻNE: wymaga prawidłowych poświadczeń S3 (zarówno identyfikator klucza dostępu, jak i tajny klucz dostępu)."
     backup_time_of_day: "Godzina (UTC) wykonania kopii zapasowej."
     backup_with_uploads: "Uwzględniaj przesyły w zaplanowanych backupach. Wyłączenie tej opcji spowoduje backup jedynie bazy danych."
+    backup_location: "Miejsce przechowywania kopii zapasowych. WAŻNE: S3 wymaga prawidłowych poświadczeń S3 wprowadzonych w ustawieniach plików."
     backup_gzip_compression_level_for_uploads: "Poziom kompresji gzip używany przy kompresowaniu wgranych plików."
+    include_thumbnails_in_backups: "Uwzględnij wygenerowane miniatury w kopiach zapasowych. Wyłączenie tego spowoduje, że kopie zapasowe będą mniejsze, ale wymaga ponownego wygenerowania wszystkich postów po przywróceniu."
     active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds"
     verbose_localization: "Wyświetlaj dodatkowe identyfikatory tłumaczeń w treści etykiet"
     previous_visit_timeout_hours: "How long a visit lasts before we consider it the 'previous' visit, in hours"
@@ -1374,6 +1620,7 @@ pl_PL:
     max_post_deletions_per_day: "Maksymalna liczba wpisów, które użytkownik może usunąć jednego dnia."
     alert_admins_if_errors_per_minute: "Liczba błędów na minutę do zaalarmowania admina. Wartość 0 wyłącza tę funkcjonalność. UWAGA: wymaga restartu."
     alert_admins_if_errors_per_hour: "Liczba błędów na godzinę do zaalarmowania admina. Wartość 0 wyłącza tę funkcjonalność. UWAGA: wymaga restartu."
+    categories_topics: "Liczba tematów do wyświetlenia na stronie / kategorie. Jeśli ustawione na 0, automatycznie spróbuje znaleźć wartość, aby utrzymać dwie kolumny symetryczne (kategorie i tematy)."
     suggested_topics: "Liczba sugerowanych tematów widocznych na końcu aktualnego tematu."
     limit_suggested_to_category: "Sugeruj tematy jedynie z tej samej kategorii."
     suggested_topics_max_days_old: "Sugerowane tematy nie powinny być starsze niż n dni."
@@ -1383,17 +1630,24 @@ pl_PL:
     purge_deleted_uploads_grace_period_days: "Okres karencji (w dniach) przed usunięciem upload zostanie skasowany."
     purge_unactivated_users_grace_period_days: "Okres karencji w dniach, po upływie którego nieaktywowane konto użytkownika zostaje usunięte. Ustaw 0, by nigdy nie usuwań nieaktywnych użytkowników."
     enable_s3_uploads: "Umieść przesyły w pamięci Amazon S3. Ważne: wymaga ważnych danych uwierzytelniających (zarówno klucza id i tajnego klucza dostępu)"
+    s3_use_iam_profile: 'Użyj <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">profilu instancji AWS EC2,</a> aby przyznać dostęp do segmentu S3. UWAGA: włączenie tej opcji wymaga, aby dyskurs działał w odpowiednio skonfigurowanej instancji EC2 i zastępuje ustawienia „Identyfikatora klucza dostępu s3” i „Tajnego klucza dostępu s3”.'
     s3_upload_bucket: "Nazwa koszyka Amazon S3, do którego zostaną przesłane pliki. Ostrzeżenie: bez wielkich liter, kropek czy podkreślenia."
+    s3_access_key_id: "Identyfikator klucza dostępu Amazon S3, który będzie używany do przesyłania zdjęć, załączników i kopii zapasowych."
+    s3_secret_access_key: "Tajny klucz dostępu Amazon S3, który będzie używany do przesyłania zdjęć, załączników i kopii zapasowych."
+    s3_region: "Nazwa regionu Amazon S3, która będzie używana do przesyłania zdjęć i kopii zapasowych."
     s3_cdn_url: "URL CDN używany dla wszystkich aktywów s3 (na przykład : https://cdn.somewhere.com). Ostrzeżenie: po zmianie tego ustawienia musisz ponownie przywrócić stare posty."
     avatar_sizes: "Lista automatycznie wygenerowanych rozmiarów awatarów."
     external_system_avatars_enabled: "Użyj zewnętrzny system awatarów."
     external_system_avatars_url: "Adres URL zewnętrznego dostawcy awatarów. Dozwolone podstawienia: {username} {first_letter} {color} {size}"
+    restrict_letter_avatar_colors: "Lista 6-cyfrowych szesnastkowych wartości kolorów, które mają być używane jako tło awatara."
     selectable_avatars_enabled: "Wymuś na użytkownikach wybieranie awatara z listy."
     selectable_avatars: "Lista awatarów, z których mogą wybierać użytkownicy."
     allow_all_attachments_for_group_messages: "Zezwól na wszystkie załączniki email dla wiadomości grupowych."
     png_to_jpg_quality: "Jakość skonwertowanego pliku JPG (1 to najniższa jakość, 99 to najlepsza jakość, 100 aby dezaktywować)."
     allow_staff_to_upload_any_file_in_pm: "Pozwól personelowi przesyłać pliki w wiadomościach."
     strip_image_metadata: "Pasek metadanych obrazu."
+    min_ratio_to_crop: "Współczynnik stosowany do przycinania wysokich zdjęć. Wpisz wynik szerokości / wysokości."
+    simultaneous_uploads: "Maksymalna liczba plików, które można przeciągnąć i upuścić w kompozytorze"
     enable_flash_video_onebox: "Włącz osadzanie linków swf i flv (Adobe Flash) za pomocą funkcji onebox. Ostrzeżenie: może powodować pewne ryzyko związane z bezpieczeństwem."
     default_invitee_trust_level: "Domyślny poziom zaufania (0-4) dla zaproszonych użytkowników."
     default_trust_level: "Domyślny poziom zaufania (0-4) dla wszystkich nowych użytkowników. Zmienianie tego narażą na ryzyko sporej ilości Spamu."
@@ -1421,6 +1675,7 @@ pl_PL:
     tl3_requires_likes_given: "Minimalna liczba polubień, które muszą zostać rozdane w ostatnich (tl3 okres) dniach, aby zakwalifikować się do awansu na poziom zaufania 3."
     tl3_requires_likes_received: "Minimalna liczba polubień, które użytkownik musi otrzymać w ostatnich (tl3 okres) dniach, aby zakwalifikować się do awansu na poziom zaufania 3."
     tl3_links_no_follow: "Nie usuwaj rel=nofollow z linków od użytkowników z trzecim poziomem zaufania."
+    trusted_users_can_edit_others: "Zezwalaj użytkownikom o wysokim poziomie zaufania na edycję treści od innych użytkowników"
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
     allow_flagging_staff: "Jeżeli włączone, użytkownicy mogą flagować wpisy członków zespołu."
     min_trust_to_edit_wiki_post: "Minimalny poziom zaufania wymagany do edycji posta oznaczonego jako wiki."
@@ -1429,6 +1684,8 @@ pl_PL:
     min_trust_to_send_messages: "Minimalny poziom zaufania wymagany do tworzenia wiadomości prywatnych."
     min_trust_to_flag_posts: "Minimalny poziom zaufania potrzebny do flagowania postów"
     min_trust_to_post_links: "Minimalny poziom zaufania potrzebny do umieszczania linków we wpisach"
+    min_trust_to_post_images: "Minimalny poziom zaufania wymagany do umieszczenia zdjęć w poście"
+    whitelisted_link_domains: "Domeny, do których użytkownicy mogą prowadzić linki, nawet jeśli nie mają odpowiedniego poziomu zaufania do publikowania linków"
     newuser_max_links: "Ile linków może dodać nowy użytkownik do posta."
     newuser_max_images: "Ile obrazów może dodać nowy użytkownik do posta."
     newuser_max_attachments: "Ile załączników może dodać nowy użytkownik do posta."
@@ -1446,15 +1703,22 @@ pl_PL:
     title_min_entropy: "Minimalna entropia tytułu wątku (liczba różnych znaków, zaleca się więcej dla języków innych niż angielski)."
     body_min_entropy: "Minimalna entropia treści posta (liczba różnych znaków, zaleca się więcej dla języków innych niż angielski)."
     allow_uppercase_posts: "Zezwól na same wielkie litery w tytule tematu lub treści postu."
+    max_consecutive_replies: "Liczba postów, które użytkownik musi wykonać w jednym rzędzie w temacie, zanim nie będzie można dodać kolejnej odpowiedzi."
+    title_fancy_entities: "Konwertuj typowe znaki ASCII na fantazyjne jednostki HTML w tytułach tematów, ala SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Minimalna długość tytułu zanim zostanie sprawdzony z podobnymi tematami."
     desktop_category_page_style: "Styl wizualny dla strony kategorii."
     category_colors: "Lista kolorów w formacie hex do użycia w etykietach kategorii."
     category_style: "Styl etykiet kategorii"
+    max_image_size_kb: "Maksymalny rozmiar przesyłanego obrazu w kB. Należy to również skonfigurować w nginx (rozmiar_maks_komputera_ klienta) / apache lub proxy. Obrazy większe niż to i mniejsze niż client_max_body_size zostaną przeskalowane, aby zmieściły się podczas przesyłania."
     max_attachment_size_kb: "Maksymalny rozmiar załącznika w kB. Należy to także skonfigurować dla serwera nginx (client_max_body_size) / Apache lub dla proxy."
     authorized_extensions: "Lista dozwolonych rozszerzeń plików (gwiazdka \"*\" oznacza wszystkie typy plików)"
+    authorized_extensions_for_staff: "Lista rozszerzeń plików dozwolonych do przesłania dla użytkowników personelu oprócz listy zdefiniowanej w ustawieniach witryny „uprawnione_rozszerzenia”. (użyj „*”, aby włączyć wszystkie typy plików)"
     theme_authorized_extensions: "Lista dozwolonych rozszerzeń plików dla przesyłania szablonów (gwiazdka \"*\" oznacza wszystkie typy plików)"
     max_similar_results: "Liczba podobnych wątków, jaka zostanie wyświetlona nad oknem edytora podczas tworzenia nowego wątku. Wątki są porównywane na podstawie tytułów i treści."
+    max_image_megapixels: "Maksymalna liczba megapikseli dozwolona dla obrazu. Obrazy o większej liczbie megapikseli zostaną odrzucone."
     title_prettify: "Prevent common title typos and errors, including all caps, lowercase first character, multiple ! and ?, extra . at end, etc."
+    title_remove_extraneous_space: "Usuń wiodące białe znaki przed interpunkcją końcową."
+    automatic_topic_heat_values: 'Automatycznie aktualizuj ustawienia „widok tematów ciepło” i „post temat jak ciepło” na podstawie aktywności na stronie.'
     topic_views_heat_low: "Po tylu wyświetleniach liczba wyświetleń zostanie lekko wyróżniona."
     topic_views_heat_medium: "Po tylu wyświetleniach liczba wyświetleń zostanie wyróżniona."
     topic_views_heat_high: "Po tylu wyświetleniach liczba wyświetleń zostanie mocno wyróżniona."
@@ -1470,6 +1734,7 @@ pl_PL:
     faq_url: "If you have a FAQ hosted elsewhere that you want to use, provide the full URL here."
     tos_url: "If you have a Terms of Service document hosted elsewhere that you want to use, provide the full URL here."
     privacy_policy_url: "If you have a Privacy Policy document hosted elsewhere that you want to use, provide the full URL here."
+    log_anonymizer_details: "Określa, czy zachować dane użytkownika w dzienniku po ich anonimizacji. Aby zachować zgodność z RODO, musisz to wyłączyć."
     newuser_spam_host_threshold: "Jak wiele razy użytkownik może zamieścić link\" original-title=\"<span class=\"glossary-highlight\" title=\"link (click to copy)\" data-copy-glossary=\"link\"> link (click to copy)\">link do tego samego hosta wewnątrz postów `newuser_spam_host_threshold` przed rozważeniem spamu."
     white_listed_spam_host_domains: "Lista domen wykluczonych z testowania pod kątem spamu. Nowi użytkownicy nigdy nie będą ograniczani w dodawaniu postów z linkami z tych domen."
     staff_like_weight: "O ile większą wagę mają mieć polubienia przyznawane przez członków zespołu?"
@@ -1484,15 +1749,27 @@ pl_PL:
     num_hours_to_close_topic: "Liczba godzin zatrzymanie tematu dla interwencji."
     auto_respond_to_flag_actions: "Włącz automatyczną odpowiedź, w czasie pozbywania się flagi."
     min_first_post_typing_time: "Minimalny czas w milisekundach, w którym użytkownik musi napisać post, jeśli próg nie zostanie osiągnięty post zostanie automatycznie dostosowany w zależności od kolejki zatwierdzania potrzeb. Ustaw 0, aby wyłączyć (nie polecane)"
+    auto_silence_fast_typers_on_first_post: "Automatycznie wyciszaj użytkowników, którzy nie dotrzymują czasu_pierwszego_poczęcia"
+    auto_silence_fast_typers_max_trust_level: "Maksymalny poziom zaufania do automatycznego wyciszania szybkich maszyn do pisania"
+    auto_silence_first_post_regex: "Wyrażenie regularne bez rozróżniania wielkości liter, które jeśli zostanie przekazane, spowoduje wyciszenie pierwszego postu przez użytkownika i wysłanie go do kolejki zatwierdzania. Przykład: wściekły | a [bc] a spowoduje, że wszystkie posty zawierające wściekłe lub aba lub aca zostaną najpierw wyciszone. Dotyczy tylko pierwszego postu."
+    reviewable_claiming: "Czy należy przejrzeć treść, którą można przeglądać, zanim będzie można z niej skorzystać?"
+    reviewable_default_topics: "Domyślnie wyświetlaj zawartość do przeglądania pogrupowaną według tematów"
+    reviewable_default_visibility: "Nie pokazuj elementów, które można przeglądać, chyba że spełniają ten priorytet"
+    high_trust_flaggers_auto_hide_posts: "Nowe posty użytkowników są automatycznie ukryte po oznaczeniu ich jako spam przez użytkownika TL3 +"
+    cooldown_hours_until_reflag: "Ile czasu użytkownicy będą musieli poczekać, aż będą mogli zmienić etykietę postu"
     reply_by_email_enabled: "Włącz możliwość odpowiadania na wpisy poprzez email."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %%{reply_key}@reply.example.com or replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Lista alternatywnych szablonów do odpowiedzi przez adres email. Przykład: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
+    incoming_email_prefer_html: "Do przychodzących wiadomości e-mail używaj HTML zamiast tekstu."
+    strip_incoming_email_lines: "Usuń wiodące i końcowe białe spacje z każdej linii przychodzących wiadomości e-mail."
+    disable_emails: "Zapobiegaj wysyłaniu przez dyskurs jakichkolwiek wiadomości e-mail. Wybierz „tak”, aby wyłączyć e-maile dla wszystkich użytkowników. Wybierz opcję „nie będący pracownikami”, aby wyłączyć wiadomości e-mail tylko dla użytkowników niebędących członkami personelu."
     strip_images_from_short_emails: "Pasek zdjęć z emaila o rozmiarze mniejszym niż 2800 bajtów"
     short_email_length: "Długość krótkiego emaila w bajtach"
     display_name_on_email_from: "Wyświetl pełne nazwy na emailach z pól"
     unsubscribe_via_email: "Pozwalaj użytkownikom na anulacja subskrypcji poprzez email, wysłanie wiadomośi o temacie lub treści \"Anuluj subskrypcje\""
     unsubscribe_via_email_footer: "Dołącz anulacje subskrypcji poprzez email mailto:link do stopki wysłanego emaila"
     delete_email_logs_after_days: "Usuń logi email po (N) dniach. 0 by trzymać w nieskończoność"
+    disallow_reply_by_email_after_days: "Nie zezwalaj na wiadomości e-mail po (N) dniach. 0, aby zachować na czas nieokreślony"
     max_emails_per_day_per_user: "Maksymalna liczba maili, jakie użytkownik może wysłać w ciągu dnia. 0 wyłącza ograniczenie."
     enable_staged_users: "Automatycznie twórz wystawianych użytkowników podczas przetwarzania przychodzących emaili."
     maximum_staged_users_per_email: "Maksymalna liczba wystawionych stworzonych użytkowników podczas przetwarzania przychodzących emaili."
@@ -1506,7 +1783,14 @@ pl_PL:
     reset_bounce_score_after_days: "Automatyczne resetuj licznik odrzucania po X dniach."
     attachment_content_type_blacklist: "Lista słów kluczowych do blokowania załączników w oparciu o typ zawartości."
     attachment_filename_blacklist: "Lista słów kluczowych do blokowania załączników w oparciu o nazwę pliku."
+    forwarded_emails_behaviour: "Jak traktować przesłaną wiadomość e-mail do Discourse"
     always_show_trimmed_content: "Zawsze pokazuj przyciętą część przychodzących maili. Ostrzeżenie: może wyjawiać adresy email."
+    private_email: "Nie umieszczaj treści z postów lub tematów w tytule lub treści e-maila. UWAGA: wyłącza także przetrawianie wiadomości e-mail."
+    email_total_attachment_size_limit_kb: "Maksymalny całkowity rozmiar plików dołączonych do wychodzących wiadomości e-mail. Ustaw na 0, aby wyłączyć wysyłanie załączników."
+    post_excerpts_in_emails: "W wiadomościach e-mail zawsze wysyłaj fragmenty zamiast pełnych postów"
+    raw_email_max_length: "Ile znaków należy przechowywać dla przychodzących wiadomości e-mail."
+    raw_rejected_email_max_length: "Ile znaków należy przechowywać dla odrzuconego przychodzącego e-maila."
+    delete_rejected_email_after_days: "Usuń odrzucone wiadomości e-mail starsze niż (n) dni."
     manual_polling_enabled: "Wykorzystuj funkcję push emails za pomocą API dla odpowiedzi na email."
     pop3_polling_enabled: "Ankieta poprzez POP3 dla odpowiedzi przez email."
     pop3_polling_ssl: "Używaj SSL podczas łączenia z serwerem POP3. (Rekomendowane)"
@@ -1516,7 +1800,11 @@ pl_PL:
     pop3_polling_host: "Host do przeglądania cyklicznego emaila poprzez POP3."
     pop3_polling_username: "Nazwa użytkownika dla konta POP3 do przeglądania cyklicznego emaila."
     pop3_polling_password: "Hasło dla konta POP3 do przeglądania cyklicznego maila."
+    pop3_polling_delete_from_server: "Usuń wiadomości e-mail z serwera. UWAGA: Jeśli to wyłączysz, powinieneś ręcznie wyczyścić swoją skrzynkę pocztową"
+    log_mail_processing_failures: "Zapisz wszystkie błędy przetwarzania wiadomości e-mail w <a href='%{base_path}/logs' target='_blank'>/ logs</a>"
+    email_in: 'Zezwalaj użytkownikom na publikowanie nowych tematów za pośrednictwem poczty e-mail (wymaga sondowania ręcznego lub pop3). Skonfiguruj adresy w zakładce „Ustawienia” każdej kategorii.'
     email_in_min_trust: "Minimalny poziom zaufania, który musi posiadać użytkownik, aby móc dodawać nowe posty w tematach poprzez email."
+    email_in_authserv_id: "Identyfikator usługi sprawdzającej autentyczność przychodzących wiadomości e-mail. Instrukcje dotyczące konfigurowania znajdują się na <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> ."
     email_in_spam_header: "Nagłówek e-maila do wykrywania spamu."
     email_prefix: "Etykieta używana w temacie emaili. Domyślnie będzie ustawiana jako \"tytuł\", w przypadku braku ustawienia."
     email_site_title: "Tytuł strony używany jako nadawca emaili ze strony. Domyślnie ustawiony jako \"tytuł\", w przypadku braku ustawienia. Jeśli twój \"tytuł\" zawiera znaki, które nie są dozwolone przez ciągi znaków nadawcy emaila, użyj tego ustawienia."
@@ -1525,7 +1813,10 @@ pl_PL:
     relative_date_duration: "Liczba dni od wysłania wpisu gdy wyświetlana jest data relatywna (7d) zamiast absolutnej (20 Lut)."
     delete_user_max_post_age: "Nie pozwalaj na usuwanie użytkowników których pierwszy post jest starszy niż (x) dni."
     delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
+    delete_user_self_max_post_count: "Maksymalna liczba postów, jaką może posiadać użytkownik, umożliwiając usunięcie konta samoobsługowego. Ustaw na -1, aby wyłączyć usuwanie konta samoobsługowego."
+    username_change_period: "Maksymalna liczba dni po rejestracji, w których konta mogą zmienić swoją nazwę użytkownika (0, aby uniemożliwić zmianę nazwy użytkownika)."
     email_editable: "Allow users to change their e-mail address after registration."
+    logout_redirect: "Lokalizacja do przekierowania przeglądarki po wylogowaniu (np .: https://example.com/logout)"
     allow_uploaded_avatars: "Zezwól użytkownikom na przesyłanie niestandardowych zdjęć profilowych."
     allow_animated_avatars: "Zezwól na używanie animowanych plików GIF jako zdjęć profilowych. UWAGA: po zmianie tego ustawienia uruchom zadanie avatars:refresh rake."
     allow_animated_thumbnails: "Generowanie miniatur animowanych gifów."
@@ -1683,6 +1974,10 @@ pl_PL:
     errors:
       different_topics: "Nie można połączyć postów z różnych wątków."
       different_users: "Nie można połączyć postów różnych użytkowników."
+  publish_page:
+    slug_errors:
+      blank: "nie może być puste"
+      invalid: "zawiera niepoprawne znaki"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
@@ -1728,9 +2023,12 @@ pl_PL:
     autoclosed_disabled_lastpost: "Temat został otwarty. Pisanie odpowiedzi jest możliwe."
     auto_deleted_by_timer: "Automatycznie usunięte przez regulator czasowy."
   login:
+    security_key_description: "Po przygotowaniu fizycznego klucza bezpieczeństwa naciśnij przycisk Uwierzytelnij za pomocą klucza bezpieczeństwa poniżej."
     security_key_alternative: "Spróbuj w inny sposób"
     security_key_authenticate: "Uwierzytelnij się za pomocą klucza bezpieczeństwa"
     security_key_not_allowed_error: "Upłynął limit czasu procesu uwierzytelniania klucza bezpieczeństwa lub został on anulowany."
+    security_key_no_matching_credential_error: "W podanym kluczu zabezpieczeń nie znaleziono zgodnych poświadczeń."
+    security_key_support_missing_error: "Twoje obecne urządzenie lub przeglądarka nie obsługuje używania kluczy bezpieczeństwa. Proszę użyć innej metody."
     not_approved: "Twoje konto nie zostało jeszcze aktywowane. Zostaniesz powiadomiony emailem gdy będziesz mógł się zalogować."
     incorrect_username_email_or_password: "Niepoprawna nazwa użytkownika, email lub hasło"
     wait_approval: "Dziękujemy za rejestrację. Powiadomimy Cię gdy Twoje konto zostanie aktywowane."
@@ -2299,7 +2597,6 @@ pl_PL:
       why: "Krótkie podsumowanie aktywności na %{site_link} od twojej ostatniej wizyty w dniu %{last_seen_at}."
       since_last_visit: "Od twojej ostatniej wizyty"
       new_topics: "Nowe tematy"
-      unread_messages: "Nieprzeczytane Wiadomości"
       unread_notifications: "Nieprzeczytane Powiadomienia"
       liked_received: "Otrzymane Polubienia"
       new_users: "Nowi użytkownicy"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 069248ad52..2210355b7c 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -57,7 +57,6 @@ pt:
       no_multilevels_components: "Temas com temas descendentes não pode ser temas descendentes"
     settings_errors:
       invalid_yaml: "O YAML fornecido é inválido"
-      data_type_not_a_number: "Tipo de configuração `%{name}` não é suportado. Tipos suportados são `integer`, `bool`, `lista` e `enum`."
       name_too_long: "Existe uma configuração com um nome demasiado longo. O tamanho máximo é 255"
       default_value_missing: "A configuração `%{name}` não tem um valor predefinido"
       default_not_match_type: "O tipo do valor predefinido para a configuração `%{name}` não é igual ao esperado pela configuração."
@@ -263,6 +262,12 @@ pt:
   too_late_to_edit: "Essa mensagem foi criada há muito tempo. Já não pode ser editada ou apagada."
   revert_version_same: "A versão actual é o mesma versão para a qual está a tentar reverter."
   excerpt_image: "imagem"
+  bookmarks:
+    reminders:
+      later_today: "Hoje, mais tarde"
+      tomorrow: "Amanhã"
+      next_week: "Próxima semana"
+      next_month: "Próximo mês"
   groups:
     errors:
       can_not_modify_automatic: "Não pode modificar um grupo automático"
@@ -878,8 +883,6 @@ pt:
     email_custom_headers: "A lista delimitada por barras verticais de cabeçalhos de e-mail personalizados"
     force_https: "Forçar o site a usar apenas HTTPS. ALERTA: NÃO active esta opção enquanto não verificar que o HTTPS está completamente configurado e funcional absolutamente em todo o lado! Verificou a sua CDN, todos os logins por rede social, e quaisquer logos ou outras dependências externas para garantir que também são compatíveis com HTTPS?"
     summary_score_threshold: "Pontuação mínima necessária para que uma mensagem seja incluída em 'Resumir Este Tópico'"
-    summary_posts_required: "Número mínimo de mensagens num tópico antes que 'Resumir Este Tópico' seja ativo."
-    summary_likes_required: "Número mínimo de gostos num tópico antes que 'Resumir Este Tópico' seja ativo."
     summary_percent_filter: "Quando um utilizador clica em 'Resumir Este Tópico', mostrar as melhores % de mensagens"
     enable_personal_messages: "Permitir que utilizadores de nível de confiança 1 (configurável através do nível de confiança mínimo para enviar mensagens) criem mensagens e respostas a mensagens. Note que a equipa de apoio pode mandar mensagens de qualquer maneira."
     enable_long_polling: "O sistema de mensagens usado para notificações pode fazer solicitações longas"
@@ -944,7 +947,6 @@ pt:
     enable_instagram_logins: "Activar autenticação pelo Instagram, requer instagram_consumer_key e instagram_consumer_secret"
     instagram_consumer_key: "Chave de consumidor para a autenticação via Instagram"
     instagram_consumer_secret: "Segredo de consumidor para a autenticação via Instagram"
-    readonly_mode_during_backup: "Activar modo de leitura penas durante a realização de uma cópia de segurança"
     allow_restore: "Permitir o restauro, que pode substituir TODOS os dados do sítio. Deixar a falso a menos que planeie restaurar uma cópia de segurança"
     maximum_backups: "Valor máximo de cópias de segurança a serem guardadas em disco. Cópias de Segurança antigas são automaticamente eliminadas."
     automatic_backups_enabled: "Executar cópias de segurança automáticas de acordo com as definições de frequência de cópia de segurança"
@@ -1251,6 +1253,10 @@ pt:
     errors:
       different_topics: "Publicações pertencentes a tópicos diferentes não podem ser unidas."
       different_users: "Publicações pertencentes a utilizadores diferentes não podem ser unidas."
+  publish_page:
+    slug_errors:
+      blank: "não pode estar em branco"
+      invalid: "contem caracteres inválidos"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Esta mensagem foi automaticamente fechada após atingir o limite máximo de %{count} resposta."
@@ -1653,7 +1659,6 @@ pt:
       why: "Um breve sumário de %{site_link} desde a sua última visita em %{last_seen_at}"
       since_last_visit: "Desde a sua última visita"
       new_topics: "Novos tópicos"
-      unread_messages: "Mensagens Não Lidas"
       unread_notifications: "Notificações Não Lidas"
       liked_received: "Gostos Recebidos"
       new_users: "Novos Utilizadores"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index d2967f6158..59b0e87e42 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -59,7 +59,6 @@ pt_BR:
       optimized_link: Links otimizados de imagem são efêmeros e não devem ser incluídos no código-fonte do tema.
     settings_errors:
       invalid_yaml: "O YAML fornecido é inválido."
-      data_type_not_a_number: "Definindo`%{name}` tipo não é suportado. Tipos suportados são `integer`,` bool`, `list` e` enum`"
       name_too_long: "Aqui está uma configuração com um nome muito longo. Comprimento máximo é de 255"
       default_value_missing: "Definindo `%{name}` não tem valor padrão"
       default_not_match_type: "Definindo `%{name}` o tipo de valor padrão não corresponde ao tipo de configuração."
@@ -316,8 +315,7 @@ pt_BR:
   bookmarks:
     reminders:
       at_desktop: "Da próxima vez que estiver na minha área de trabalho"
-      later_today: "Hoje mais tarde"
-      next_business_day: "Próximo dia comercial"
+      later_today: "Mais tarde hoje"
       tomorrow: "Amanhã"
       next_week: "Próxima semana"
       next_month: "Próximo mês"
@@ -351,7 +349,6 @@ pt_BR:
       trust_level_4: "nivel_de_confianca_4"
     request_membership_pm:
       title: "Pedido de associação para @%{group_name}"
-      handle: "tratar pedido de associação"
   education:
     until_posts:
       one: "%{count} mensagem"
@@ -1219,7 +1216,6 @@ pt_BR:
   dashboard:
     rails_env_warning: "Seu servidor está rodando no modo %{env}."
     host_names_warning: "O arquivo config/database.yml está usando hostname padrão localhost. Modifique para usar o hostname do seu site."
-    gc_warning: 'Seu servidor está usando os parâmetros padrão de coleta de lixo ruby, o que não lhe dará o melhor desempenho. Leia este tópico sobre ajuste de desempenho: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Ajustando Ruby and Rails para Discourse</a>.'
     sidekiq_warning: 'Sidekiq não está em execução. Muitas tarefas, como envio de emails, são executadas de forma assíncrona pelo sidekiq. Por favor certifique-se de que ao menos um processo sidekiq esteja execução. <a href="https://github.com/mperham/sidekiq" target="_blank">Aprenda sobre Sidekiq aqui</a>.'
     queue_size_warning: "O número de processos na fila é %{queue_size}, o que é alto. Isso pode ser indicação de um problema com o(s) processo(s) do Sidekiq, ou você pode ter que adicionar mais Sidekiq workers."
     memory_warning: "Seu servidor está rodando com menos de 1 GB de memória total. Pelo menos 1 GB é quantidade de memória recomendada."
@@ -1322,8 +1318,6 @@ pt_BR:
     force_https: "Force seu site a usar apenas HTTPS. AVISO: NÃO ative até que você tenha verificado que o HTTPS está completamente configurado e funcionando em absolutamente todos os lugares! Você verificou se seu CDN, todos os logins sociais e quaisquer logos e dependências externos são todos compatíveis com HTTPS, também?"
     same_site_cookies: "Use os mesmos cookies do site, eles eliminam todos os vetores Cross Site Request Forgery nos navegadores suportados (Lax ou Strict). Aviso: o Strict funcionará apenas em sites que forçam o login e usem o SSO."
     summary_score_threshold: "A pontuação mínima requerida para uma postagem ser incluída no \"Resuma este tópico\" "
-    summary_posts_required: "Mensagens mínimas em um tópico antes de 'Resumir este tópico' ficar habilitado"
-    summary_likes_required: "Curtidas mínimas em um tópico antes de 'Resumir este tópico, ficar habilitado"
     summary_percent_filter: "Quando um usuário clicar em 'Resumor este tópico', mostrar os melhores % mensagens"
     summary_max_results: "Número máximo de postagens retornadas por 'Resumir Este Tópico'"
     enable_personal_messages: "Permitir que o nível de confiança 1 (configurável por meio do nível mínimo de confiança para enviar mensagens) os usuários criem mensagens e respondam a mensagens. Note que a equipe sempre pode enviar mensagens, não importa o quê."
@@ -1454,7 +1448,6 @@ pt_BR:
     github_client_id: "ID do cliente para autenticação do Github, registrado em <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Segredo do cliente para autenticação do Github, registrado em <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     discord_secret: "Chave Secreta do Discord"
-    readonly_mode_during_backup: "Habilitar modo de apenas leitura quando estiver realizando um backup"
     enable_backups: "Permitir que administradores criem backups do fórum"
     allow_restore: "Permitir restauração, que pode substituir todos os dados do site! Deixe falsa, a menos que você pretenda restaurar um backup"
     maximum_backups: "A quantidade máxima de backups para manter no disco. Backups mais antigos são excluídos automaticamente"
@@ -1921,6 +1914,10 @@ pt_BR:
       other: "%{count} postagens foram mescladas em uma mensagem existente: %{topic_link}"
   change_owner:
     post_revision_text: "Propriedade transferida"
+  publish_page:
+    slug_errors:
+      blank: "não pode estar em branco"
+      invalid: "contém caracteres inválidos"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Esta mensagem foi fechada automaticamente depois de atingir o limite máximo de %{count} resposta."
@@ -2832,7 +2829,6 @@ pt_BR:
       why: "Um breve resumo de %{site_link} desde que viu pela última vez em %{last_seen_at}."
       since_last_visit: "Desde a sua última visita"
       new_topics: "Novos Tópicos"
-      unread_messages: "Mensagens Não-lidas"
       unread_notifications: "Notificações Não-lidas"
       liked_received: "Curtidas Recebidas"
       new_users: "Usuários Novos"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 9026cd79c8..19d561b983 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -202,6 +202,12 @@ ro:
   too_late_to_edit: "Acea postare este prea veche. Nu mai poate fi editată sau ștearsă."
   revert_version_same: "Versiunea curentă este identică cu cea la care încerci să revii."
   excerpt_image: "imagine"
+  bookmarks:
+    reminders:
+      later_today: "Mai târziu azi"
+      tomorrow: "Mâine"
+      next_week: "Săptămâna viitoare"
+      next_month: "Luna viitoare"
   groups:
     errors:
       can_not_modify_automatic: "Nu poți modifica un grup automat"
@@ -537,6 +543,7 @@ ro:
         make: "Acest subiect este de acum un banner. Va apărea în susul fiecărei pagini până când opțiunea va fi anulată de către utilizator."
         remove: "Acest subiect nu mai este un banner. Nu va mai apărea în susul fiecărei pagini."
   unsubscribed:
+    description: "Setările de email pentru <b>%{email}</b>au fost actualizate. Pentru a schimba setările de email, <a href='%{url}'>du-te la setări.</a>"
     topic_description: "Pentru a te abona din nou la %{link}, folosește controlul de notificări din partea dreaptă-jos a subiectului"
   unsubscribe:
     title: "Dezabonare"
@@ -834,8 +841,6 @@ ro:
     email_custom_headers: "O listă delimitată cu simbolul | (pipe) a header-elor personalizate de email"
     force_https: "Forțează site-ul să folosească exclusiv HTTPS. ATENȚIE: NU activa această opțiune până nu ai verificat dacă HTTPS este configurat în întregime și funcționează absolut peste tot. Ai verificat, de asemenea, dacă și CND-ul, toate autentificările cu cont pe rețele de socializaer și toate logo-urile și dependențele externe sunt compatibile cu HTTPS?"
     summary_score_threshold: "Scorul minim necesar pentru ca o postare să fie inclusă în 'Rezumă acest subiect'"
-    summary_posts_required: "Minimul de postări într-un subiect înainte de a se activa 'Rezumă acest subiect'."
-    summary_likes_required: "Minimul de aprecieri într-un subiect înainte de a se activa 'Rezumă acest subiect'."
     summary_percent_filter: "Când un utilizator face click pe 'Rezumatul acestui subiect', arată primele % de postări"
     enable_personal_messages: "Acordă nivelul de încredere 1 (configurabil via nivel minim de încredere pentru trimiterea de mesaje) utilizatorilor, pentru a le permite să creeze și să răspundă la mesaje. Atenție: echipa poate oricând să trimită mesaje, indiferent de setări."
     enable_long_polling: "Bus-ul de mesaje folosit pentru notificări poate utiliza long polling."
@@ -901,7 +906,6 @@ ro:
     enable_instagram_logins: "Activează autentificarea prin Instagram, necesită instagram_consumer_key și instagram_consumer_secret"
     instagram_consumer_key: "Cheie consumator pentru autentificarea Instagram"
     instagram_consumer_secret: "Autentificare Instagram pe bază de secret consumator"
-    readonly_mode_during_backup: "Activează modul exclusiv-citire în timpul operațiunii de backup"
     allow_restore: "Bifează-l doar dacă dorești să restaurezi un fișier de backup. Atenție, restaurarea poate șterge/înlocui TOATE datele din site!"
     maximum_backups: "Maximul de fișiere backup păstrate. Fișierele backup vechi sunt șterse automat"
     automatic_backups_enabled: "Rulează automat operațiuni de backup după cum este definit la frecvența de backup"
@@ -1209,6 +1213,10 @@ ro:
     errors:
       different_topics: "Postările care aparțin unor subiecte diferite nu pot fi comasate."
       different_users: "Postările care aparțin unor utilizatori diferiți nu pot fi comasate."
+  publish_page:
+    slug_errors:
+      blank: "nu poate fi gol"
+      invalid: "conține caractere invalide"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Acest mesaj va fi închis automat după ce atinge limita de maximă de un răspuns."
@@ -1585,7 +1593,6 @@ ro:
       why: "Un rezumat scurt al %{site_link} de la ultima ta vizită din %{last_seen_at}."
       since_last_visit: "De la ultima ta vizită"
       new_topics: "Subiecte noi"
-      unread_messages: "Mesaje necitite"
       unread_notifications: "Notificări necitite"
       liked_received: "Aprecieri primite"
       new_users: "Utilizatori noi"
@@ -1593,6 +1600,8 @@ ro:
       follow_topic: "Urmărește acest subiect"
       join_the_discussion: "Citește mai mult"
       popular_posts: "Postări notorii"
+      unsubscribe: "Acest rezumat este transmis de pe %{site_link} când a trecut ceva vreme de când nu te-am mai văzut. Poți schimba %{email_preferences_link} sau, pentru a te dezabona, %{unsubscribe_link}"
+      your_email_settings: "setările de email"
       click_here: "click aici"
       preheader: "Un scurt rezumat de la ultima ta vizită din %{last_seen_at}"
     forgot_password:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index df0609a743..4df0fc297e 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -59,7 +59,7 @@ ru:
       optimized_link: Оптимизированные ссылки на изображения являются эфемерными и не должны включаться в исходный код темы.
     settings_errors:
       invalid_yaml: "При условии, что YAML недействителен."
-      data_type_not_a_number: "Настройка `%{name}` не поддерживается. Поддерживаемые темы: `integer`, `bool`, `list` и `enum`"
+      data_type_not_a_number: "Тип `%{name}` не поддерживается. Поддерживаются следующие типы: `integer`, `bool`, `list`, `enum` и `upload`"
       name_too_long: "Есть настройка со слишком длинным именем. Максимальная длина 255"
       default_value_missing: "Настройка `%{name}` не имеет значения по умолчанию"
       default_not_match_type: "Настройка `%{name}` по умолчанию, не совпадает с типом параметра."
@@ -350,14 +350,16 @@ ru:
   bookmarks:
     errors:
       already_bookmarked_post: "Вы не можете дважды добавить сообщение в закладки"
+      cannot_set_past_reminder: "Нельзя указать уже прошедшую дату напоминания."
+      cannot_set_reminder_in_distant_future: "Нельзя указать дату напоминания, отличающуюся от текущей более чем на 10 лет. "
       time_must_be_provided: "время должно быть установлено для всех напоминаний, кроме '%{reminder_type}'"
     reminders:
       at_desktop: "При следующем посещении форума"
-      later_today: "На сегодня, но чуть позже"
+      later_today: "Позже сегодня"
       next_business_day: "На следующий рабочий день"
-      tomorrow: "На завтра"
-      next_week: "На следующую неделю"
-      next_month: "На следующий месяц"
+      tomorrow: "Завтра"
+      next_week: "На следующей неделе"
+      next_month: "В следующем месяце"
       custom: "Установить дату и время напоминания"
   groups:
     success:
@@ -392,7 +394,6 @@ ru:
       trust_level_4: "уровень доверия 4"
     request_membership_pm:
       title: "Запрос на участие в группе %{group_name}"
-      handle: "обрабатывать запрос на вступление"
     view_hidden_topic_request_reason: "Я хочу присоединиться к группе '%{group_name}', чтобы я мог получить доступ к [this topic](%{topic_url})"
   education:
     until_posts:
@@ -1270,7 +1271,6 @@ ru:
   dashboard:
     rails_env_warning: "Ваш сервер работает в режиме %{env}."
     host_names_warning: "Ваш файл config/database.yml использует локальное имя хоста по умолчанию. Поменяйте его на имя хоста вашего сайта."
-    gc_warning: 'Ваш сервер использует параметры сборки мусора ruby по умолчанию, что не даст вам наилучшую производительность. Прочитайте этот раздел о настройке производительности: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq не запущен. Сейчас многие задачи, такие как отправка электронных писем, выполняются асинхронно. Пожалуйста, убедитесь, что хотя бы один процесс sidekiq запущен. <a href="https://github.com/mperham/sidekiq">Узнайте больше о Sidekiq здесь</a>.'
     queue_size_warning: "Количество задач в очереди достигло большого размера %{queue_size}. Это может привести к проблемам с процессом(ами) Sidekiq, или вам придется добавить больше Sidekiq workers."
     memory_warning: "Общее количество памяти, используемое вашим сервером, составляет менее 1 GB. Рекомендовано использовать минимум 1 GB."
@@ -1354,8 +1354,6 @@ ru:
     email_subject: "Настраиваемый формат темы для стандартных писем. Смотреть: <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
     enforce_second_factor: "Заставляет пользователей включить двухфакторную проверку подлинности.. Выберите 'все', чтобы применить его ко всем пользователям. Выберите 'персонал', чтобы принудительно применять его только к сотрудникам."
     summary_score_threshold: "Минимальная оценка сообщения, необходимая для его включения в сводку по теме"
-    summary_posts_required: "Минимальное количество сообщение в теме для активации кнопки \"Сводка по теме\""
-    summary_likes_required: "Минимальное количество симпатий в теме для активации кнопки \"Сводка по теме\""
     summary_percent_filter: "При нажатии на кнопку \"Сводка по теме\", показывать лучшие % сообщений"
     summary_max_results: "Максимальное количество сообщений, возвращаемых в 'Сводке по Теме'"
     enable_system_message_replies: "Позволяет пользователям отвечать на системные сообщения, даже если личные сообщения отключены"
@@ -1432,7 +1430,6 @@ ru:
     google_oauth2_client_secret: "Client secret для Google приложения"
     twitter_consumer_key: "Ключ пользователя для аутентификации в Twitter, зарегистрированный по адресу <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Секретный номер для проверки подлинности Twitter, зарегистрированный в <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
-    readonly_mode_during_backup: "Включить режим \"только для чтения\" во время выполнения резервного копирования"
     allow_restore: "Позволить импорт, который может заменить ВСЕ данные сайта. Оставьте выключенным, если не планируете восстанавливать резервную копию"
     maximum_backups: "Максимальное количество резервных копий к сохранению. Более старые резервные копии будут автоматически удалены."
     s3_backup_bucket: "Адрес папки удаленного сервера для резервных копий. ВНИМАНИЕ: Убедитесь, что место назначения защищено от посторонних."
@@ -1640,6 +1637,7 @@ ru:
     warn_reviving_old_topic_age: "Показывать предупреждение, когда кто-то пытается ответить в очень старую тему. Указывается в днях. Чтобы отключить 0."
     autohighlight_all_code: "Принудительно использовать подсветку кода для всех отформатированных блоков кода, даже когда они явно не указан язык."
     embed_truncate: "Обрезать встроенные сообщения."
+    embed_unlisted: "Импортированные темы будут отображаться в списке тем только после добавления в них ответа."
     embed_post_limit: "Максимальное количество вложенных сообщений."
     embed_username_required: "Требуется имя пользователя для создания темы."
     show_create_topics_notice: "Если общее количество тем меньше 5, показывать персоналу сообщение с просьбой создать новые темы."
@@ -1782,6 +1780,10 @@ ru:
       other: "%{count} сообщений было перемещено в это личное сообщение: %{topic_link}"
   change_owner:
     post_revision_text: "Право собственности передано"
+  publish_page:
+    slug_errors:
+      blank: "не может быть пустым"
+      invalid: "содержит недопустимые символы"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Это сообщение было автоматически закрыто, когда количество ответов достигло максимума: %{count}."
@@ -1868,6 +1870,7 @@ ru:
     new_registrations_disabled: "Новые регистрации сейчас ограничены."
     password_too_long: "Максимальная длина пароля - 200 символов."
     email_too_long: "E-mail, который Вы указали, слишком длинный. Имя почтового ящика должно быть не длиннее 254 символов, а доменное имя не более 253 символов."
+    wrong_invite_code: "Вы указали неверный код приглашения."
     reserved_username: "Такой псевдоним не разрешен."
     missing_user_field: "Вы не заполнили все поля пользователя"
     auth_complete: "Проверка подлинности завершена."
@@ -1879,6 +1882,8 @@ ru:
     second_factor_backup_title: "Двухфакторные резервные коды"
     invalid_second_factor_code: "Неверный код аутентификации. Каждый код можно использовать только один раз."
     invalid_security_key: "Неверный ключ безопасности."
+    missing_second_factor_name: "Пожалуйста, укажите имя."
+    missing_second_factor_code: "Пожалуйста, укажите код."
     second_factor_toggle:
       backup_code: "Вместо этого используйте резервный код"
   admin:
@@ -2265,8 +2270,8 @@ ru:
       why: "Сводка обсуждений на сайте %{site_link} с момента вашего последнего визита %{last_seen_at}"
       since_last_visit: "За время вашего отсутствия"
       new_topics: "Новые темы"
-      unread_messages: "Непрочитанные сообщения"
       unread_notifications: "Непрочитанные уведомления"
+      unread_high_priority: "Непрочитанные уведомления с высоким приоритетом"
       liked_received: "Симпатии"
       new_users: "Новые пользователи"
       popular_topics: "Популярные темы"
@@ -2873,6 +2878,7 @@ ru:
     reasons:
       auto_silence_regexp: "Новый пользователь, чье первое сообщение соответствует `auto_silence_first_post_regex` настройки."
       category: "Сообщения в этом разделе требуют ручного одобрения персоналом. Смотрите настройки раздела."
+      suspect_user: "Профайл нового пользователя не содержит информации о прочтённых темах или сообщениях. С большой долей вероятности можно предположить, что это спамер."
     actions:
       agree:
         title: "Согласен..."
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index d530c26d6c..c12a47f819 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -41,7 +41,6 @@ sk:
       git: "Nastala chyba pri klonovaní git repozitára. Prístup bol odmietnuty, alebo repozitár nebol nájdený."
     settings_errors:
       invalid_yaml: "Tento YAML nie je validný."
-      data_type_not_a_number: "Hodnota nastavenia typu `%{name}` nie je podporovaná. Podporované typy sú `integer`, `bool`, `list` a `enum`"
   emails:
     incoming:
       default_subject: "Táto téma musí mať názov"
@@ -216,6 +215,11 @@ sk:
     tag: "Oštítkované témy"
   too_late_to_edit: "Tento príspevok bol vytvorený príliš dávno. Už nemôže byť upravovaný či zmazaný"
   excerpt_image: "Obrázok"
+  bookmarks:
+    reminders:
+      tomorrow: "Zajtra"
+      next_week: "Budúci týždeň"
+      next_month: "Budúci mesiac"
   groups:
     errors:
       can_not_modify_automatic: "Nemôžete upraviť automatickú skupinu"
@@ -816,8 +820,6 @@ sk:
     notification_email: "Odosieľateľ: email adresa použitá na zasielanie všetkých systémových emailov. Uvedená doména musí mať správne nastavené záznamy SPF, DKIM a opačný PTR aby email dorazil."
     email_custom_headers: "Zoznam voliteľných emailových hlavičiek oddelených |"
     summary_score_threshold: "Minimálne požadované skóre príspevku na to aby bol zahrnutý do 'Sumarizuj túto tému'"
-    summary_posts_required: "Minimálny počet príspevkou predtým ako je zapnuté 'Sumarizuj túto tému'"
-    summary_likes_required: "Minimálny počet páči sa mi predtým ako je zapnuté 'Sumarizuj túto tému'"
     summary_percent_filter: "Ak používateľ klikne na 'Sumarizuj túto tému', zobraz najlepších % príspevkov"
     enable_long_polling: "Zbernica správ pre upozornenia môže používať techniku long-polling"
     long_polling_base_url: "Base URL used for long polling (when a CDN is serving dynamic content, be sure to set this to origin pull) eg: http://origin.site.com"
@@ -870,7 +872,6 @@ sk:
     enable_signup_cta: "Zobraz oznámenie pre navrátilých anonymných používateľov s výzvou na registráciu účtu. "
     google_oauth2_client_id: "Client ID Vašej Google aplikácie."
     google_oauth2_client_secret: "Client secret Vašej Google aplikácie."
-    readonly_mode_during_backup: "Zapnúť režim len na čítanie počas vytvárania zálohy"
     allow_restore: "Umožniť obnovu, ktorá nahradí VŠETKY data na stránkach! Ponechajte prázdne okrem prípadu ak chcete obnoviť zo zálohy."
     maximum_backups: "Maximálny počet záloh udržiavaných na disku. Staršie zálohy budu automaticky vymazané"
     automatic_backups_enabled: "Spustiť automatické zálohy podľa nastavenia intervalu záloh"
@@ -1083,6 +1084,10 @@ sk:
   redirected_to_top_reasons:
     new_user: "Vitajte v našej komunite! Toto sú najpopulárnejšie z posledných tém."
     not_seen_in_a_month: "Vitajte späť! Nevideli sme Vás už nejaký čas. Toto sú najpopulárnejšie témy odkedy ste boli preč."
+  publish_page:
+    slug_errors:
+      blank: "nesmie byť prázdne"
+      invalid: "obsahuje neplatné znaky"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovede."
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index 4a3f92ff35..9571ab8433 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -176,6 +176,12 @@ sl:
     badge: "%{display_name} značka na %{site_title}"
   edit_conflict: "Ta prispevek je bil spremenjen s strani drugega uporabnika zato ne moremo shraniti vaših sprememb."
   excerpt_image: "slika"
+  bookmarks:
+    reminders:
+      later_today: "Kasneje v dnevu"
+      tomorrow: "Jutri"
+      next_week: "Naslednji teden"
+      next_month: "Naslednji mesec"
   groups:
     errors:
       already_requested_membership: "Za članstvo v tej skupini ste že zaprosili."
@@ -1586,7 +1592,6 @@ sl:
       why: "Kratek povzetek %{site_link} od vašega zadnjega obiska %{last_seen_at}"
       since_last_visit: "Od vašega zadnjega obiska"
       new_topics: "Nove teme"
-      unread_messages: "Neprebrana zasebna sporočila"
       unread_notifications: "Neprebrana obvestila"
       liked_received: "Prejeti všečki"
       new_users: "Novi uporabniki"
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 5487ad6248..8006ead250 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -642,8 +642,6 @@ sq:
     notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive."
     email_custom_headers: "A pipe-delimited list of custom email headers"
     summary_score_threshold: "The minimum score required for a post to be included in 'Summarize This Topic'"
-    summary_posts_required: "Minimum posts in a topic before 'Summarize This Topic' is enabled"
-    summary_likes_required: "Minimum likes in a topic before 'Summarize This Topic' is enabled"
     summary_percent_filter: "When a user clicks 'Summarize This Topic', show the top % of posts"
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_base_url: "Base URL used for long polling (when a CDN is serving dynamic content, be sure to set this to origin pull) eg: http://origin.site.com"
@@ -868,6 +866,10 @@ sq:
   redirected_to_top_reasons:
     new_user: "Welcome to our community! These are the most popular recent topics."
     not_seen_in_a_month: "Welcome back! We haven't seen you in a while. These are the most popular topics since you've been away."
+  publish_page:
+    slug_errors:
+      blank: "nuk mund të lihet bosh"
+      invalid: "përmban karaktere jo të vlefshëm"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeje."
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index ebfd0ef55d..269f63dcff 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -265,6 +265,9 @@ sr:
     types:
       category: "Kategorije"
       user: "Korisnici"
+  publish_page:
+    slug_errors:
+      invalid: "sadrži nevažeće karaktere."
   login:
     admin_not_allowed_from_ip_address: "Ne možete se prijaviti kao admin sa te IP adrese."
   admin:
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 94f6b6b931..5d79e6bfb2 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -47,6 +47,7 @@ sv:
       generic: Det uppstod ett fel vid import av det temat
       about_json: "Importfel: about.json finns inte eller är ogiltig"
       about_json_values: "about.json innehåller ogiltiga värden: %{errors}"
+      modifier_values: "about.json modifierare innehåller ogiltiga värden: %{errors}"
       git: "Fel vid kloning av git-lagringsplats, åtkomst nekas eller lagringsplatsen finns inte"
       unpack_failed: "Det gick inte att packa upp filen"
       file_too_big: "Den okomprimerade filen är för stor."
@@ -59,7 +60,7 @@ sv:
       optimized_link: Optimerade bildlänkar är flyktiga och bör inte inkluderas i temakällkoden.
     settings_errors:
       invalid_yaml: "Angivet YAML är ogiltigt."
-      data_type_not_a_number: "Det går inte att ställa in typen `%{name}` %{name}. Typer som stöds är `integer`, `bool`, `list` och `enum`"
+      data_type_not_a_number: "Det går inte att ställa in typen `%{name}`. Typer som stöds är `integer`, `bool`, `list` , `enum` och `upload`"
       name_too_long: "En inställning har ett namn som är för långt. Maximal längd är 255"
       default_value_missing: "Inställningen `%{name}` har inget standardvärde"
       default_not_match_type: "Standardvärdestypen i inställningen `%{name}` överensstämmer inte med inställningstypen."
@@ -329,11 +330,13 @@ sv:
   bookmarks:
     errors:
       already_bookmarked_post: "Du kan inte bokmärka samma inlägg två gånger."
+      cannot_set_past_reminder: "Du kan inte sätta en påminnelse för bokmärke i det förflutna."
+      cannot_set_reminder_in_distant_future: "Du kan inte sätta en påminnelse för bokmärke mer än 10 år framåt i tiden."
       time_must_be_provided: "tid måste tillhandahållas för alla påminnelser utom '%{reminder_type}'"
     reminders:
       at_desktop: "Nästa gång är jag vid datorn"
       later_today: "Senare idag"
-      next_business_day: "Nästa arbetsdag"
+      next_business_day: "Nästa vardag"
       tomorrow: "Imorgon"
       next_week: "Nästa vecka"
       next_month: "Nästa månad"
@@ -367,7 +370,6 @@ sv:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Begäran om medlemskap i @%{group_name}"
-      handle: "hantera begäran om medlemskap"
     view_hidden_topic_request_reason: "Jag skulle vilja gå med i gruppen '%{group_name}', så att jag kan gå till [detta ämne](%{topic_url})"
   education:
     until_posts:
@@ -477,6 +479,10 @@ sv:
               same_as_password: "är samma som ditt lösenord."
             ip_address:
               signup_not_allowed: "Registrering är inte tillåtet från detta konto."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Detta ämne kan inte presenteras på din profil."
         user_email:
           attributes:
             user_id:
@@ -1246,7 +1252,6 @@ sv:
   dashboard:
     rails_env_warning: "Din server kör i %{env} läge."
     host_names_warning: "Din config/database.yml fil använder lokalvärdens standard-värdnamn. Uppdatera den till att använda din webbplats värdnamn."
-    gc_warning: 'Din server använder ruby standardparametrar för skräpinsamling, vilket inte ger dig bästa prestanda. Läs detta ämne om prestandajustering: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>. '
     sidekiq_warning: 'Sidekiq körs inte. Många uppgifter, sm att skicka e-post, utförs asynkront av sidekiq. Var vänlig se till att minst en sidekiqprocess körs. <a href="https://github.com/mperham/sidekiq">Läs mer om Sidekiq här</a>.'
     queue_size_warning: "Antal köade jobb är %{queue_size}, vilket är ganska högt. Det kan indikera ett problem med Sidekiq process(er), eller så kanske du behöver lägga till fler Sidekiqarbetare."
     memory_warning: "Din server körs med mindre än 1 GB minne. Minne på minst 1 GB är rekommenderat."
@@ -1357,8 +1362,8 @@ sv:
     force_https: "Tvinga din webbplats att endast använda HTTPS. VARNING: bocka INTE i det här innan du kan verifiera att HTTPS verkligen fungerar överallt! Har du kontrollerat din CDN, alla sociala inloggningar och alla externa logotyper / beroenden för att säkerställa att de alla också är HTTPS-kompatibla?"
     same_site_cookies: "Använd samma webbplatskakor, detta eliminerar alla vektorer för Cross Site Request Forgery på stödda webbläsare (Löst eller Strikt). Varning: Strikt fungerar bara på webbplatser som tvingar inloggning och använder SSO."
     summary_score_threshold: "Minsta poäng för att ett inlägg ska inkluderas i 'Sammanfatta det här ämnet'"
-    summary_posts_required: "Minsta antal inlägg i ett ämne innan 'Sammanfatta det här ämnet' möjliggörs"
-    summary_likes_required: "Minsta antal gillningar i ett ämne innan 'Sammanfatta det här ämnet' möjliggörs"
+    summary_posts_required: "Minsta antal inlägg i ett ämne innan 'Sammanfatta det här ämnet' möjliggörs. Ändringar i denna inställning kommer att genomföras retroaktivt inom en vecka."
+    summary_likes_required: "Minsta antal gillningar i ett ämne innan 'Sammanfatta det här ämnet' möjliggörs. Ändringar i denna inställning kommer att genomföras retroaktivt inom en vecka."
     summary_percent_filter: "Visa högsta % av inläggen när en användare bockar i 'Sammanfatta det här ämnet'"
     summary_max_results: "Maximalt antal inlägg som returneras av 'Sammanfatta detta ämne' "
     enable_personal_messages: "Tillåt användare med förtroendenivå 1 (konfigurera via minsta förtroendenivå för att skicka meddelanden) att skapa meddelanden och svara på meddelanden. Notera att personalen oavsett alltid kan skicka meddelanden. "
@@ -1390,7 +1395,8 @@ sv:
     markdown_typographer_quotation_marks: "Lista med ersättningspar för dubbla och enkla citat"
     post_undo_action_window_mins: "Antal minuter som en användare tillåts att upphäva handlingar på ett inlägg som gjorts nyligen (gillning, flaggning osv)."
     must_approve_users: "Personal måste godkänna alla nya användarkonton innan de tillåts använda webbplatsen."
-    approve_suspect_users: "Personal måste godkänna alla misstänkta konton"
+    invite_code: "Användare måste ange denna kod för att ha tillåtelse att registrera ett konto, ignoreras om det lämnas tomt (ej skiftlägeskänslig)"
+    approve_suspect_users: "Lägg till misstänka användare i kön för granskning. Misstänkta användare har angett en bio/webbsida men har ingen läsaktivitet."
     pending_users_reminder_delay: "Notifiera moderatorer om nya användare har väntat på godkännande längre än så här många timmar. Ange -1 för att inaktivera notifikationer. "
     maximum_session_age: "Användaren kommer fortsättningsvis att vara inloggad i n timmar sedan senaste besöket"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) spårningskods ID, exempelvis UA-12345678-9; se <a href='https://google.com/analytics' target='_blank'>http://google.com/analytics</a>"
@@ -1439,6 +1445,8 @@ sv:
     allow_index_in_robots_txt: "Ange i robots.txt att den här webbplatsen får indexeras av webbsökmotorer. I undantagsfall kan du permanent <a href='%{base_path}/admin/customize/robots'>åsidosätta robots.txt</a>."
     email_domains_blacklist: "En pipe-avgränsad lista av alla e-postdomän som användare inte tillåts registrera konton med. Exempel: mailinator.com, trashmail.net"
     email_domains_whitelist: "En pipe-avgränsad lista av alla e-postdomän som användare MÅSTE registrera konton med. VARNING: Användare med e-postdomän som inte finns på listan kommer inte att tillåtas!"
+    enforce_canonical_emails: "Innan användarna skapas rensas e-postadress till kanonisk form vilket garanterar unikhet. Inställningen kommer endast att gälla vid nya kontoregistreringar. Om aktiverad kommer användare+1@domän.se inte att tillåtas registrera sig om användare+2@domän.se redan är registrerad."
+    auto_approve_email_domains: "Användare med e-postadresser som finns i denna lista av domäner kommer automatiskt att godkännas."
     hide_email_address_taken: "Informera inte användare om att det finns ett konto med en given e-postadress vid registreringen eller från det glömda lösenordsformuläret."
     log_out_strict: "Vid utloggning, logga ut ALLA sessioner för den användaren på alla apparater"
     version_checks: "Pinga Discourse Hub för versionuppdateringar och visa nya versionmeddelanden på instrumentpanelen <a href='%{base_path}/admin' target='_blank'>/admin</a> "
@@ -1496,7 +1504,6 @@ sv:
     discord_client_id: 'Discord Klient-ID (behöver du ett? Besök <a href="https://discordapp.com/developers/applications/me">utvecklarportalen för Discord</a>)'
     discord_secret: "Discord hemlig nyckel"
     discord_trusted_guilds: 'Tillåt bara medlemmar i dessa Discord-grupperingar att logga in via Discord. Använd det numeriska ID för grupperingen. För mer information, se instruktionerna <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">här</a>. Lämna tomt för att tilllåta alla grupperingar.'
-    readonly_mode_during_backup: "Aktivera skrivskyddat läge vid säkerhetskopiering"
     enable_backups: " Tillåt administratörer att skapa säkerhetskopior av forumet"
     allow_restore: "Tillåt återställning, vilket kan ersätta ALL data på webbplatsen! Lämna avbockad om du inte planerar att återställa en säkerhetskopia"
     maximum_backups: "Högsta antal säkerhetskopior att spara på disken. Äldre säkerhetskopior raderas automatiskt"
@@ -1731,6 +1738,7 @@ sv:
     relative_date_duration: "Antal dagar efter att ett inlägg skrivits som datummarkeringen som visas för inlägget är relativ (7d) istället för absolut (20 Feb). "
     delete_user_max_post_age: "Tillåt inte raderande av användare vars äldsta inlägg är äldre än (x) dagar."
     delete_all_posts_max: "Högsta antal inlägg som kan raderas på samma gång med Radera Alla Inlägg-knappen. Om en användare har fler än så många inlägg så kan inläggen inte raderas på samma gång och användaren kan inte raderas."
+    delete_user_self_max_post_count: "Maximalt antal inlägg en användare kan ha medans själv-hantering av kontoradering tillåts. Sätt till -1 för att stänga av själv-hantering av kontoradering."
     username_change_period: "Det maximala antalet dagar efter registrering som konton kan ändra användarnamn (0 för att inte tillåta ändring av användarnamn)."
     email_editable: "Tillåt användare att ändra deras e-postadress efter registrering."
     logout_redirect: "Plats att omdirigera webbläsaren till efter utloggning (egentligen: https://exempel.se/logout)"
@@ -1769,6 +1777,7 @@ sv:
     ignored_users_count_message_threshold: "Meddela moderatorer om en viss användare ignoreras av många andra användare."
     ignored_users_message_gap_days: "Hur lång tid att vänta innan moderatorer meddelas igen om en användare som ignorerats av många andra."
     clean_up_inactive_users_after_days: "Antal dagar innan en inaktiv användare (förtroendenivå 0 utan några inlägg) tas bort. Ställ in till 0 för att inaktivera rensning."
+    clean_up_unused_staged_users_after_days: "Antal dagar innan en fiktiv användare (utan några inlägg) tas bort. Sätt till 0 för att inaktivera rensning."
     user_selected_primary_groups: "Tillåt användare att ställa in sin egna primära grupp"
     max_notifications_per_user: "Maximalt antal notifikationer per användare, om detta värde överskrids kommer äldre notifikationer att raderas. Verkställs veckovis. Sätt till 0 för att inaktivera."
     user_website_domains_whitelist: "Användare websidor kommer att verifieras mot dessa domäner. Pipe- avgränsad lista."
@@ -1807,7 +1816,9 @@ sv:
     highlighted_languages: "Inkluderade syntax-markeringsregler (Varning: att inkludera för många språk kan påverka prestanda). Demonstration: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a>"
     embed_any_origin: "Tillåt inbäddbart innehåll oavsett ursprung. Detta krävs för mobilappar med statisk HTML."
     embed_topics_list: "Stöd HTML-inbäddning av ämneslistor"
+    embed_set_canonical_url: "Sätt den kanoniska URL:n för inbäddade ämnen till det inbäddade innehållets URL."
     embed_truncate: "Trunkera de inbäddade inläggen."
+    embed_unlisted: "Importerade ämnen kommer att vara olistade tills dess att en användare svarar."
     embed_support_markdown: "Stöd Markdown-formatering för inbäddade inlägg."
     embed_whitelist_selector: "En kommaseparerad lista över CSS-element som tillåts i inbäddningar."
     allowed_href_schemes: "System tillåtna i länkar i motsatsen till http och https."
@@ -1818,7 +1829,7 @@ sv:
     delete_drafts_older_than_n_days: "Ta bort utkast som är äldre än (n) dagar."
     bootstrap_mode_min_users: "Minsta antal användare som krävs för att inaktivera bootstrap-läget (ange 0 för att inaktivera)"
     prevent_anons_from_downloading_files: "Förhindra anonyma användare från att ladda ned bilagor. VARNING: det kommer att förhindra alla webbplatsens tillgångar som inte är bilder och som lagts upp som bilagor från att fungera."
-    secure_media: 'Begränsar åtkomst till mediauppladdningar (bilder, video, ljud). Om "inloggning krävs" har aktiverats kan endast inloggade användare komma åt mediauppladdningar. Annars begränsas åtkomst endast till uppladdning av media i privata meddelanden. Obs: S3-uppladdningar måste ha aktiverats innan den här inställningen aktiveras.'
+    secure_media: 'Begränsar åtkomst för ALLA uppladdningar (bilder, video, ljud, text, pdf:er, zipp med flera). Om "inloggning krävs" har aktiverats kan endast inloggade användare komma åt uppladdningar. Annars begränsas åtkomst endast till uppladdning av media i privata meddelanden samt privata kategorier. VARNING: Den här inställningen är komplex och kräver djupa administrativa kunskaper. Besök <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">ämnet för säkra media i Meta</a> för detaljer.'
     slug_generation_method: "Välj en genereringsmetod för etiketter. Ange 'none' för att inaktivera generering av etiketter. "
     enable_emoji: "Aktivera emoji"
     enable_emoji_shortcuts: "Vanlig smileytext som :): p :( kommer att konverteras till emojier"
@@ -1839,6 +1850,7 @@ sv:
     new_user_notice_tl: "Lägsta förtroendenivå som krävs för se nya användares inläggsnoteringar."
     returning_user_notice_tl: "Lägsta förtroendenivå som krävs för se återkommande användares inläggsnoteringar."
     returning_users_days: "Hur många dagar bör gå innan en användare anses återkomma."
+    enable_page_publishing: "Tillåt personal att publicera ämnen för nya URL:er med deras egna utformning."
     default_email_digest_frequency: "Standardinställning för hur ofta användare mottar e-postsammanfattningar."
     default_include_tl0_in_digests: "Standardinställning för hur ofta nya användare får e-postsammanfattningar. Användare kan ändra det i sina inställningar."
     default_email_level: "Ställ in standardnivå för e-postmeddelanden för vanliga ämnen."
@@ -1901,6 +1913,9 @@ sv:
     push_notifications_icon: "Utmärkelseikonen som visas i notifieringshörnet. Obligatorisk storlek är 96 x 96."
     short_title: "Den korta titeln kommer att användas på användarens startskärm, startapparat eller andra platser där utrymmet kan vara begränsat. Det bör begränsas till 12 tecken."
     dashboard_general_tab_activity_metrics: "Välj rapporter som ska visas som aktivitetsmätningar på fliken allmänt."
+    gravatar_name: "Namn på Gravatar leverantören"
+    gravatar_base_url: "Url till Gravatar leverantörens API mål"
+    gravatar_login_url: "Url relaterande till gravatar_base_url, vilken tillhandahåller inloggning för användaren hos Gravatar tjänsten"
     errors:
       invalid_email: "Felaktig e-postadress."
       invalid_username: "Det finns ingen användare med detta användarnamn."
@@ -2000,6 +2015,11 @@ sv:
       other: "%{count} inlägg har sammanfogats med ett existerande meddelande: %{topic_link}"
   change_owner:
     post_revision_text: "Ägarskap överfört"
+  publish_page:
+    slug_errors:
+      blank: "kan inte vara tomt"
+      unavailable: "är inte tillgänglig"
+      invalid: "innehåller otillåtna tecken"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Det här ämnet stängdes automatiskt efter att ha nått den övre gränsen av %{count} inlägg."
@@ -2082,6 +2102,7 @@ sv:
     new_registrations_disabled: "Nya kontoregistreringar är för närvarande inte tillåtna."
     password_too_long: "Lösenord har en gräns på 200 tecken."
     email_too_long: "E-postadressen du tillhandahöll är för lång. E-postadresser kan på sin höjd vara 254 tecken och domännamn inte mer än 253 tecken."
+    wrong_invite_code: "Inbjudningskoden som du har angett var felaktig."
     reserved_username: "Användarnamnet är inte tillåtet."
     missing_user_field: "Du har inte fyllt i alla användarfält"
     auth_complete: "Autentisering är färdig."
@@ -2093,6 +2114,8 @@ sv:
     second_factor_backup_title: "Två faktorig reservkod"
     invalid_second_factor_code: "Ogiltig autentiseringskod. Varje kod kan bara användas en gång."
     invalid_security_key: "Ogiltig säkerhetsnyckel."
+    missing_second_factor_name: "Vänligen ange ett namn."
+    missing_second_factor_code: "Vänligen ange en kod."
     second_factor_toggle:
       totp: "Använd en autentiseringsapp eller säkerhetsnyckel istället"
       backup_code: "Använd en reservkod istället"
@@ -2967,8 +2990,8 @@ sv:
       why: "En kortfattad sammanfattning av %{site_link} sedan ditt senaste besök den %{last_seen_at}"
       since_last_visit: "Sedan ditt senaste besök"
       new_topics: "Nya ämnen"
-      unread_messages: "olästa meddelanden"
       unread_notifications: "Olästa notifikationer"
+      unread_high_priority: "Olästa notifikationer med hög prioritet"
       liked_received: "Gillanden mottagna"
       new_users: "Nya användare"
       popular_topics: "Populära ämnen"
@@ -3092,6 +3115,7 @@ sv:
     file_missing: "Tyvärr, du måste tillhandahålla en fil för uppladdning. "
     empty: "Tyvärr, men filen du angav är tom."
     png_to_jpg_conversion_failure_message: "Ett fel uppstod vid konvertering från PNG till JPG."
+    optimize_failure_message: "Det uppstod ett fel vid optimering av den uppladdade bilden."
     attachments:
       too_large: "Tyvärr, filen du försöker ladda upp är för stor (maxstorlek är %{max_size_kb}kb)."
     images:
@@ -3127,6 +3151,7 @@ sv:
     sender_body_blank: "body är tom"
     sender_post_deleted: "inlägg har raderats"
     sender_message_to_invalid: "mottagaren har ogiltig e-postadress"
+    sender_topic_deleted: "ämne har raderats"
   color_schemes:
     base_theme_name: "Bas"
     light: "Ljus"
@@ -3730,7 +3755,7 @@ sv:
       invite_only: "Alla nya användare ska bjudas in. Se `invite_only`."
       email_auth_res_enqueue: "Det här e-postmeddelandet misslyckades med en DMARC-kontroll, det kommer sannolikt inte från den som det verkar komma från. Mer information finns i rubrikerna för e-postens rådata."
       email_spam: "Det här e-postmeddelandet flaggades som skräppost av rubriken definierad i `email_in_spam_header."
-      suspect_user: "Användare i listan över misstänkta måste undersökas av personal. Se `approve_suspect_users`."
+      suspect_user: "Denna nya användare angav profilinformation utan att ha läst några ämnen eller inlägg, vilket starkt indikerar att det kan röra sig om en skräppostare. Se `approve_suspect_users`."
     actions:
       agree:
         title: "Godkänn..."
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index 361e7ae12b..c8a5f380f1 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -42,7 +42,6 @@ sw:
       git: "Tatizo limetokea wakati wa kunakili weko la git, hauna ruhusa au weko haijapatikana"
     settings_errors:
       invalid_yaml: "YAML iliyowekwa ni batili."
-      data_type_not_a_number: "Aina ya mpangilio `%{name}` hauruhusiwi. Aina zinazoruhusiwa ni `namba kamili`, `bool`, `orodha` na `enum`"
       name_too_long: "Kuna mpangilio wenye jina lefu sana. Kiwango cha juu cha urefu ni 255"
       default_value_missing: "Mpangilio wa `%{name}` hauna thamani"
       default_out_range: "Mpangilio `%{name}` chaguo-msingi haupo kwenye namba zilizotajwa."
@@ -194,6 +193,12 @@ sw:
   too_late_to_edit: "Chapisho lilitengenezwa kitambo sana. Haiwezi kufanyiwa uhariri au kufutwa."
   revert_version_same: "Toleo la sasa ni sawa na toleo unalo jaribu kurudisha."
   excerpt_image: "Picha"
+  bookmarks:
+    reminders:
+      later_today: "Baada ya mda leo"
+      tomorrow: "Kesho"
+      next_week: "Wiki Ijayo"
+      next_month: "Mwezi ujao"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' sio kiwango cha uaminifu."
@@ -783,8 +788,6 @@ sw:
     onebox_domains_blacklist: "Orodha ya anwani za mitandao ambazo hazijawekwa kwenye boxi."
     inline_onebox_domains_whitelist: "Orodha za anwani za mtandao ambazo zitawekwa kwenye boxi kama zikiunganishwa bila kichwa cha habari"
     summary_score_threshold: "Alama ya chini ambayo mada inahitaji kabla ya kuwekwa ndani ya 'Fupisha Hii Mada' "
-    summary_posts_required: "Kiwango cha chini cha machapisho ndani ya mada kabla 'Fupisha Mada' haijaonyeshwa"
-    summary_likes_required: "Kiwango cha chini cha likes ndani ya mada kabla 'Mada kufupishwa' haijaruhusiwa"
     summary_percent_filter: "Mtumiaji akibonyeza 'Fupisha Hii Mada', onyesha % machapisho ya juu"
     enable_personal_messages: "Ruhusu watumiaji wenye kiwango cha 1 cha uaminifu (inasanidiwa kwa kupitia kiwango cha chini cha uaminifu kutuma ujumbe) kutuma ujumbe wa barua pepe. Wasaidizi wataweza kutuma ujumbe mda kila wakati."
     enable_system_message_replies: "Waruhusu watumiaji wajibu ujumbe wa mfumo,hata kama ujumbe binafsi umezuiliwa."
@@ -818,7 +821,6 @@ sw:
     enable_instagram_logins: "Ruhusu Uhalalishaji wa Instagram, inahitaji instagram_consumer_key na instagram_consumer_secret"
     instagram_consumer_key: "Ufunguo wa uhalalishaji wa Mtumiaji kupitia Instagram"
     instagram_consumer_secret: "Uhalalishaji wa Siri wa Mtumiaji kupitia Instagram"
-    readonly_mode_during_backup: "Ruhusu hali-tumizi ya usomaji tu kipindi cha chelezo"
     enable_backups: "Ruhusu wasimamizi watengeneze machelezo ya jamii"
     allow_restore: "ruhusu urejeshaji, itabadilisha taarifa zote za tovuti! Acha iwe hapana, badilisha kama unataka kurejesha chelezo"
     maximum_backups: "Kiwango cha juu cha chelezo kutunza kwenye diski. Machelezo ya mda yatafutwa otomatikali"
@@ -996,6 +998,10 @@ sw:
     errors:
       different_topics: "Machapisho kutoka mada tofauti hayawezi kuunganishwa."
       different_users: "Machapisho kutoka watumiaji tofauti hayawezi kuunganishwa."
+  publish_page:
+    slug_errors:
+      blank: "haiwezi kubaki wazi"
+      invalid: "ina herufi batili"
   topic_statuses:
     autoclosed_disabled: "Mada hii imefunguliwa. Majibu mapya yanaruhusiwa."
     autoclosed_disabled_lastpost: "Hii mada iko wazi. Majibu mapya yanakaribishwa."
@@ -1655,7 +1661,6 @@ sw:
       why: "Muhtasari Mfupi wa %{site_link} toka mara ya mwisho ulivyotembelea %{last_seen_at}"
       since_last_visit: "Kutoka mara ya mwisho ulivyotembelea"
       new_topics: "Mada Mpya"
-      unread_messages: "Ujumbe ambao Haujasomwa"
       unread_notifications: "Taarifa ambazo Hazijasomwa"
       liked_received: "Upendo Uliopokelewa"
       new_users: "Watumiaji Wapya"
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index 9b6096a6ee..e0bac8062c 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -114,6 +114,11 @@ te:
     latest: "తాజా విషయాలు"
   too_late_to_edit: "ఈ టపా పురాతన కాలంలో సృష్టించబడింది. ఇప్పుడు ఇహ సవరించలేము లేదా తొలగించలేము."
   excerpt_image: "బొమ్మ"
+  bookmarks:
+    reminders:
+      tomorrow: "రేపు"
+      next_week: "వచ్చే వారం"
+      next_month: "వచ్చే నెల"
   groups:
     default_names:
       everyone: "ప్రతీఒక్కరూ"
@@ -589,6 +594,10 @@ te:
   most_posts: "అధిక టపాలు"
   most_recent_poster: "ఇటీవలి పోస్టర్"
   frequent_poster: "తరచూ వచ్చే పోస్టర్"
+  publish_page:
+    slug_errors:
+      blank: "ఖాళీగా ఉండకూడదు"
+      invalid: "చెల్లని అక్షరాలు ఉన్నాయి."
   topic_statuses:
     autoclosed_disabled: "ఈ విషయం ఇప్పుడు తెరవబడింది.కొత్త జవాబులకు అనుమతి."
     autoclosed_disabled_lastpost: "ఈ విషయం ఇప్పుడు తెరవబడింది.కొత్త జవాబులకు అనుమతి."
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index cf2d00642e..f36b909f0c 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -182,6 +182,9 @@ th:
     types:
       category: "หมวดหมู่"
       user: "ผู้ใช้"
+  publish_page:
+    slug_errors:
+      invalid: "มีตัวอักษรที่ไม่สามารถใช้งานได้"
   login:
     admin_not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยผู้ดูแลระบบด้วยไอพีนี้"
   subject_re: "ตอบ: "
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 8df329d753..2b76fc0bd2 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -59,7 +59,6 @@ tr_TR:
       optimized_link: Optimize edilmiş görüntü bağlantıları geçicidir ve tema kaynak koduna dahil edilmemelidir.
     settings_errors:
       invalid_yaml: "Sağlanan YAML geçersiz."
-      data_type_not_a_number: "`%{name}` tipinin ayarlanması desteklenmiyor. Desteklenen türler tam sayı, bool, liste ve enum'dur."
       name_too_long: "Çok uzun ismi olan bir ayar var. Maksimum uzunluk 255"
       default_value_missing: "`%{name}` ayarının varsayılan değeri yoktur"
       default_not_match_type: "`%{name}` ayarının varsayılan değerinin türü ayar türüyle eşleşmiyor."
@@ -331,11 +330,10 @@ tr_TR:
       time_must_be_provided: "&#39;%{reminder_type}&#39; dışındaki tüm hatırlatıcılara zaman verilmelidir"
     reminders:
       at_desktop: "Bir dahaki sefere masaüstümdeyim"
-      later_today: "Bugünden sonra <br/> {{date}}"
-      next_business_day: "Bir sonraki iş günü <br/> {{date}}"
-      tomorrow: "Yarın <br/> {{date}}"
-      next_week: "Gelecek hafta <br/> {{date}}"
-      next_month: "Gelecek ay <br/> {{date}}"
+      later_today: "Bugün ilerleyen saatlerde"
+      tomorrow: "Yarın"
+      next_week: "Gelecek hafta"
+      next_month: "Gelecek ay"
       custom: "Özel tarih ve saat"
   groups:
     success:
@@ -366,7 +364,6 @@ tr_TR:
       trust_level_4: "güven_seviyesi_4"
     request_membership_pm:
       title: "@ %{group_name} için üyelik talebi"
-      handle: "üyelik isteğini yerine getir"
     view_hidden_topic_request_reason: "'%{group_name}', grubuna katılmak istiyorum, böylece katılabilirim[bu konuya](%{topic_url})"
   education:
     until_posts:
@@ -1252,7 +1249,6 @@ tr_TR:
   dashboard:
     rails_env_warning: "Sunucunuz %{env} modunda çalışıyor."
     host_names_warning: "config/database.yml dosyasınızda, bilgisayar adı olarak öntanımlı değer olan \"localhost\" ayarlı. Değeri, sitenizin bilgisayar adını kullanacak biçimde güncelleyiniz."
-    gc_warning: 'Sunucunuz, Ruby''nin öntanımlı çöp toplama ayarlarını kullanıyor ki bu size en iyi performansı vermeyecektir. Performansı ayarı için şu konuyu okuyun: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Discourse için Ruby on Rails Ayarları.'
     sidekiq_warning: 'Sidekiq çalışmıyor. E-posta yollamak gibi gibi birçok asenkron görev sidekiq''in işidir. En az bir tane sidekiq süreci çalıştırdığınızdan emin olun. <a href="https://github.com/mperham/sidekiq" target="_blank">Sidekiq ile ilgili bilgi burada</a>.'
     queue_size_warning: "Kuyruğa eklenmiş işlerin sayısı fazla: %{queue_size}. Bu Sidekiq işlem(ler)indeki bir sorunu işaret ediyor olabilir, ya da daha fazla Sidekiq işçisi eklemeniz gerekiyor olabilir."
     memory_warning: "Sunucunuz toplam 1GB'tan az bellek ile çalışıyor. En az 1GB bellek tavsiye edilmektedir."
@@ -1363,8 +1359,6 @@ tr_TR:
     force_https: "Sitenizi HTTPS kullanmaya zorlayın. DİKKAT: bu seçeneği HTTPS'nin her yerde doğru bir şekilde çalıştığından emin olmadan SEÇMEYİN. Sitenizde bulunan paylaşım siteleri bağlantılarını, CDN' adresinizi, dışsal bağlantısı olan görsellerinizi de kontrol ettiniz mi?"
     same_site_cookies: "Aynı site çerezlerini kullanın, desteklenen tüm tarayıcılardaki Siteler Arası İstek Sahteciliği'ni (Lax veya Strict) ortadan kaldırırlar. Uyarı: Katı kurallı oturum, yalnızca giriş yapmaya ve TOA kullanmaya zorlayan sitelerde çalışır."
     summary_score_threshold: "Bir gönderinin 'Bu Konuyu Özetle' içinde yer alması için gereken en az skor."
-    summary_posts_required: "'Bu Konuyu Özetle'nin etkinleştirilmesi için konuda olması gereken en az gönderi sayısı"
-    summary_likes_required: "'Bu Konuyu Özetle'nin etkinleştirilmesi için konuda olması gereken en az beğeni sayısı"
     summary_percent_filter: "Kullanıcı 'Bu Konuyu Özetle'ye tıkladığında, gönderinin ilk % kısmını göster"
     summary_max_results: "'Bu Konuyu Özetle' den dönen en fazla gönderi sayısı"
     enable_personal_messages: "Güven seviyesi 1'e(özel ileti göndermek için en az seviye ayarıyla belirlenebilir) sahip kullanıcıların ileti oluşturup cevaplamasına izin ver. Görevliler her durumda ileti gönderebilir."
@@ -1396,7 +1390,6 @@ tr_TR:
     markdown_typographer_quotation_marks: "Çift ve tek tırnak değiştirme çiftlerinin listesi"
     post_undo_action_window_mins: "Bir gönderide yapılan yeni eylemlerin (beğenme, bildirme vb) geri alınabileceği zaman, dakika olarak"
     must_approve_users: "Siteye erişimlerine izin verilmeden önce tüm yeni kullanıcı hesaplarının görevliler tarafından onaylanması gerekir."
-    approve_suspect_users: "Personel tüm şüpheli hesapları onaylamalıdır"
     pending_users_reminder_delay: "Belirtilen saatten daha uzun bir süredir onay bekleyen yeni kullanıcılar mevcutsa moderatörleri bilgilendir. Bilgilendirmeyi devre dışı bırakmak için -1 girin."
     maximum_session_age: "Kullanıcı son ziyaretinden bu yana n saat boyunca giriş yapmış olarak kalacak"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) takip kodu, örn: UA-12345678-9; bkz. <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1502,7 +1495,6 @@ tr_TR:
     discord_client_id: 'Discord İstemci Kimliği (birine ihtiyacınız var mı? <a href="https://discordapp.com/developers/applications/me">Discord geliştirici portalını</a> ziyaret edin)'
     discord_secret: "Discord Gizli Anahtarı"
     discord_trusted_guilds: 'Yalnızca bu Discord loncalarının üyelerinin Discord üzerinden giriş yapmasına izin verin. Lonca için sayısal kimliği kullanın. Daha fazla bilgi için, talimatları kontrol edin <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">buraya</a> . Bir loncaya izin vermek için boş bırakın.'
-    readonly_mode_during_backup: "Yedek alınırken yalnızca okuma modunu etkinleştir"
     enable_backups: "Yöneticilerin forumun yedeklerini oluşturmalarına izin ver"
     allow_restore: "Geri almaya izin ver. Sitedeki TÜM verileri değiştirebilir! Bir yedeklemeyi geri yüklemeyi planlamıyorsanız devre dışı bırakın."
     maximum_backups: "Diskte tutulacak en fazla yedek sayısı. Eski yedekler otomatik olarak silinir."
@@ -1819,7 +1811,6 @@ tr_TR:
     delete_drafts_older_than_n_days: "(n) günden eski taslakları sil."
     bootstrap_mode_min_users: "bootstrap modunun edilgen olması için gereken en az kullanıcı sayısı (edilgen bırakmak için 0 yapın)"
     prevent_anons_from_downloading_files: "Anonim kullanıcıların eklenti indirebilmesini önle. DİKKAT: Bu ayar, eklenti olarak gönderilen resim-dışı site içeriklerinin de çalışmasını engelleyebilir."
-    secure_media: 'Medya yüklemelerine (resimler, video, ses) erişimi sınırlar."Oturum açma gerekli" etkinse, yalnızca oturum açmış kullanıcılar medya yüklemelerine erişebilir. Aksi takdirde, erişim yalnızca özel mesajlardaki medya yüklemeleri için sınırlandırılır. Not: Bu ayar etkinleştirilmeden önce S3 yüklemeleri etkinleştirilmelidir.'
     slug_generation_method: "Slug üretim yöntemi seçin. 'kodlanmış' seçeneği yüzde kodlamalı metin oluşturur. 'hiçbiri' seçeneği slug'ı devre dışı bırakır."
     enable_emoji: "Emojiyi etkinleştir"
     enable_emoji_shortcuts: ":): p :( gibi yaygın gülen yüz ifadeleri emojilere dönüştürülecek"
@@ -2001,6 +1992,10 @@ tr_TR:
       other: "%{count} gönderiler mevcut bir mesajla birleştirildi: %{topic_link}"
   change_owner:
     post_revision_text: "Sahiplik aktarıldı"
+  publish_page:
+    slug_errors:
+      blank: "boş bırakılamaz"
+      invalid: "geçersiz karakterler barındırıyor"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Bu ileti %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı."
@@ -3033,7 +3028,6 @@ tr_TR:
       why: "%{last_seen_at} tarihindeki son girişinizden beri %{site_link} sitesine olanların kısa bir özeti"
       since_last_visit: "Son ziyaretinizden bu yana"
       new_topics: "Yeni Konular"
-      unread_messages: "Okunmamış İletiler"
       unread_notifications: "Okunmamış Bildirimler"
       liked_received: "Alınan Beğeniler"
       new_users: "Yeni Kullanıcılar"
@@ -3704,7 +3698,6 @@ tr_TR:
       invite_only: "Tüm yeni kullanıcılar davet edilmelidir. Bkz.`invite_only`"
       email_auth_res_enqueue: "Bu e-posta DMARC kontrolünde başarısız oldu, büyük olasılıkla kimden geldiği belli değil. Daha fazla bilgi için satır e-posta başlıklarına bakın."
       email_spam: "Bu e-posta, 'email_in_spam_header' içinde tanımlanan başlık tarafından spam olarak işaretlendi."
-      suspect_user: "Şüpheli listesindeki kullanıcılar personel tarafından kontrol edilmelidir. Bkz."
     actions:
       agree:
         title: "Kabul..."
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 5c240cf6e0..ba650b959b 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -59,7 +59,6 @@ uk:
       optimized_link: Посилання на оптимізовані зображення є ефемерними і не повинні включатись у вихідний код теми.
     settings_errors:
       invalid_yaml: "За умови, що YAML недійсний."
-      data_type_not_a_number: "Налаштування `%{name}` не підтримується. Підтримувані типи: `integer`, `bool`, `list` та `enum`"
       name_too_long: "Є налаштування із занадто довгим ім’ям. Максимальна довжина 255"
       default_value_missing: "Налаштування `%{name}` не має значення за замовчуванням"
       default_not_match_type: "Налаштування `%{name}` за замовчуванням, не збігається з типом параметра."
@@ -361,11 +360,10 @@ uk:
       time_must_be_provided: "Для всіх нагадувань повинен бути встановлений час, крім '%{reminder_type}'"
     reminders:
       at_desktop: "Наступного разу на мій робочий стіл"
-      later_today: "Пізніше сьогодні <br/> {{date}}"
-      next_business_day: "Наступний робочий день <br/> {{date}}"
-      tomorrow: "Завтра <br/> {{date}}"
-      next_week: "Наступного тижня <br/> {{date}}"
-      next_month: "Наступного місяця <br/> {{date}}"
+      later_today: "Пізніше сьогодні"
+      tomorrow: "Завтра"
+      next_week: "На наступному тижні"
+      next_month: "В наступному місяці"
       custom: "Вибрана дата та час"
   groups:
     success:
@@ -400,7 +398,6 @@ uk:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Запит на членство в групі @%{group_name}"
-      handle: "обробляти запит на вступ"
     view_hidden_topic_request_reason: "Я хочу приєднатися до групи '%{group_name}', щоб я міг отримати доступ до [this topic](%{topic_url})"
   education:
     until_posts:
@@ -1312,7 +1309,6 @@ uk:
   dashboard:
     rails_env_warning: "Ваш сервер працює в режимі %{env}."
     host_names_warning: "Ваш файл config/database.yml використовує локальне ім’я хоста за замовчуванням. Поміняйте його на ім’я хоста вашого веб-сайту."
-    gc_warning: 'Ваш сервер використовує параметри сборкі мусори ruby за умовами, що не дають вам найлучшу виробництво. Прочитайте цей розділ про налаштування виробничої якості: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Налаштування Ruby and Rails для Discourse</a>.'
     sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. <a href="https://github.com/mperham/sidekiq" target="_blank">Learn about Sidekiq here</a>.'
     queue_size_warning: "The number of queued jobs is %{queue_size}, which is high. This could indicate a problem with the Sidekiq process(es), or you may need to add more Sidekiq workers."
     memory_warning: "Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended."
@@ -1407,8 +1403,6 @@ uk:
     detailed_404: "Надає користувачам більше інформації про те, чому він не може отримати доступ до певної теми. Примітка: Це не дуже безпечно, оскільки користувачі дізнаються, чи URL-адреса посилається на дійсну тему."
     enforce_second_factor: "Змушує користувачів включити двохфакторную перевірку справжності. Виберіть 'всі', щоб застосувати його до всіх користувачів. Виберіть 'персонал', щоб примусово застосовувати його тільки до співробітників."
     summary_score_threshold: "Мінімальна оцінка повідомлення, необхідна для його включення в зведення по темі"
-    summary_posts_required: "Мінімальна кількість повідомлень в темі для активації кнопки \"Зведення по темі\""
-    summary_likes_required: "Мінімальна кількість симпатій в темі для активації кнопки \"Зведення по темі\""
     summary_percent_filter: "При натисканні на кнопку \"Зведення по темі\", показувати кращі % дописів"
     summary_max_results: "Максимальна кількість повідомлень, що показуються в 'Зведенні по темі'"
     enable_system_message_replies: "Дозволяє користувачам відповідати на системні повідомлення, навіть якщо приватні повідомлення відключені"
@@ -1439,7 +1433,6 @@ uk:
     markdown_typographer_quotation_marks: "Список подвійних та одиничних лапок змінювати парами"
     post_undo_action_window_mins: "Кількість хвилин, за які користувачі зможуть скасувати останні дії в публікації (наприклад, вподобайки, скарги тощо)"
     must_approve_users: "Персонал повинен схвалити всі нові облікові записи користувачів, перш ніж їм буде надано доступ до сайту"
-    approve_suspect_users: "Персонал повинен схвалити всі підозрювані записи"
     pending_users_reminder_delay: "Повідомляти модераторів, якщо нові користувачі чекають схвалення довше ніж стільки годин. Встановіть -1 для відключення цих повідомлень."
     maximum_session_age: "Користувач залишиться в системі протягом n годин з моменту останнього відвідування"
     moderators_create_categories: "Дозволити модераторам створювати нові категорії"
@@ -1515,7 +1508,6 @@ uk:
     twitter_consumer_key: "Ключ користувача для аутентифікації в Twitter, зареєстрований за адресою <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Секретний номер для перевірки справжності Twitter, зареєстрований в <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     enable_discord_logins: "Дозволити користувачам вхід за допомогою Discord?"
-    readonly_mode_during_backup: "Включати режим \"тільки для читання\" під час виконання резервного копіювання"
     enable_backups: "Дозволити адміністраторам створювати резервні копії форуму"
     allow_restore: "Дозволити імпорт, який може замінити ВСІ дані сайту. Залиште вимкненим, якщо не плануєте відновлювати резервну копію"
     maximum_backups: "Максимальна кількість резервних копій для зберігання на диску. Старіші резервні копії автоматично видаляються"
@@ -1985,6 +1977,10 @@ uk:
       other: "Дописи %{count} були об’єднані в існуюче повідомлення: %{topic_link}"
   change_owner:
     post_revision_text: "Право власності передано"
+  publish_page:
+    slug_errors:
+      blank: "не може бути порожнім"
+      invalid: "містить неприпустимі символи"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Це повідомлення було автоматично закрито після досягнення максимальної межі відповіді %{count}."
@@ -2500,7 +2496,6 @@ uk:
       why: "Короткий підсумок %{site_link} з часу останнього вашого візиту на %{last_seen_at}"
       since_last_visit: "З вашого останнього відвідування"
       new_topics: "Нові теми"
-      unread_messages: "Непрочитані повідомлення"
       unread_notifications: "Непрочитані сповіщення"
       liked_received: "Отримані вподобання"
       new_users: "Нові користувачі"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index 38a8762336..56288408d5 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -57,7 +57,6 @@ ur:
       no_multilevels_components: "ماتحت تِھیمز والی تِھیمز خود ماتحت تِھیمز نہیں ہو سکتیں"
     settings_errors:
       invalid_yaml: "فراہم کردہ YAML غلط ہے۔"
-      data_type_not_a_number: "ترتیب `%{name}` کی قسم کی اجازت نہیں ہے۔ اجازت یافتہ اقسام `integer'،` bool`، `list` اور `enum` ہیں"
       name_too_long: "بہت طویل نام کے ساتھ ایک ترتیب موجود ہے۔ زیادہ سے زیادہ لمبائی 255 ہے"
       default_value_missing: "ترتیب `%{name}` کی کوئی ڈِیفالٹ قدر نہیں ہے"
       default_not_match_type: "ترتیب `%{name}` کی ڈِیفالٹ قدر کی قِسم، ترتیب قِسم سے مَیچ نہیں کرتی۔"
@@ -308,6 +307,12 @@ ur:
   edit_conflict: "یہ پوسٹ کسی دوسرے صارف کی طرف سے ترمیم کی گئی تھی اور آپ کی تبدیلیوں کو اب محفوظ نہیں کیا جا سکتا۔"
   revert_version_same: "موجودہ وَرژن وہی وَرژن ہے جسے آپ واپس لوٹانے کی کوشش کررہے ہیں۔"
   excerpt_image: "تصویر"
+  bookmarks:
+    reminders:
+      later_today: "آج بعد میں"
+      tomorrow: "کَل"
+      next_week: "اگلے ہفتے"
+      next_month: "اگلے ماہ"
   groups:
     success:
       bulk_add:
@@ -337,7 +342,6 @@ ur:
       trust_level_4: "ٹرسٹ_لَیول_4"
     request_membership_pm:
       title: "@%{group_name} کیلئے رکنیت کی درخواست"
-      handle: "رکنیت کی درخواست سے نمٹیں"
     view_hidden_topic_request_reason: "میں '%{group_name}' گروپ میں شامل ہونا چاہتا ہوں، تاکہ میں [اِس ٹاپک](%{topic_url}) تک رسائی حاصل کر سکوں"
   education:
     until_posts:
@@ -1191,7 +1195,6 @@ ur:
   dashboard:
     rails_env_warning: "آپ کا سرور %{env} مَوڈ میں چل رہا ہے۔"
     host_names_warning: "آپ کی config/database.yml فائل ڈیفالٹ localhost نام استعمال کر رہا ہے۔ اِسے اپنے سائیٹ ہوسٹ کے نام پر اپ ڈیٹ کریں۔"
-    gc_warning: 'آپ کا سرور ڈیفالٹ روبی گاربَیج کولیکشن پیرامیٹرز کا استعمال کر رہا ہے، جو آپ کو بہترین کارکردگی نہیں دے گا۔ کارکردگی کی ٹیوننگ پر اس ٹاپک کو پڑھیں: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">ڈِسکورس کیلئے روبی اور ریلز کی ٹیوننگ</a>۔'
     sidekiq_warning: 'Sidekiq نہیں چل رہا۔ بہت سے کام، جیسا کہ ای میل بھیجنا، sidekq کی طرف سے اےسِنکرونسلی مکمل کیے جاتے ہیں۔ براہ کرم یقینی بنائیں کہ کم ازکم ایک sidekq پراسیس چل رہا ہے۔ <a href="https://github.com/mperham/sidekiq" target="_blank">Sidekiq کے بارے میں یہاں سے جانیے</a>۔'
     queue_size_warning: "قطار میں موجود جابز کی تعداد %{queue_size} ہے، جو کہ زیادہ ہے۔ یہ Sidekiq پراسیس کے ساتھ ایک مسئلہ کی نشاندہی کر سکتا ہے، یا آپ کو مزید Sidekiq کارکنوں کو شامل کرنے کی ضرورت ہوسکتی ہے۔"
     memory_warning: "آپ کا سرور مجموعی طور پر 1 GB سے کم میموری کے ساتھ چل رہا ہے۔ کم ازکم 1 GB میموری تجویز کی گئی ہے۔"
@@ -1297,8 +1300,6 @@ ur:
     force_https: "صرف HTTPS استعمال کرنے کیلئے اپنی سائٹ کو مجبورکریں۔ انتباہ: جب تک آپ تصدیق نہ کر لیں کہ HTTPS مکمل طور پر سیٹ ہے اور ہر جگہ کام کر رہا ہے، اِس کو فعال نہ کریں! کیا آپ نے اپنا CDN، تمام سماجی لاگ ان، اور بیرونی لوگو / انحصارات کو چیک کر کے یہ یقینی بنا لیا ہے کہ وہ تمام HTTPS سے مطابقت رکھتے ہیں؟"
     same_site_cookies: "سَیم سائٹ کے کُوکِیز کا استعمال کریں، وہ قابل براؤزرز (Lax یا Strict) پر تمام ویکٹر Cross Site Request Forgery کو ختم کر دیتے ہیں۔ انتباہ: Strict صرف اُن سائٹس پر کام کرے گا جو لاگ اِن پر مجبور کرتے ہیں اور SSO کا استعمال کرتے ہیں۔"
     summary_score_threshold: "'اِس ٹاپک کا خلاصہ کریں' میں شامل ہونے کیلئے ایک پوسٹ کا کم از کم سکور"
-    summary_posts_required: "'اِس ٹاپک کا خلاصہ کریں' فعال ہونے سے پہلے ٹاپک میں پوسٹس کی کم از کم تعداد"
-    summary_likes_required: "'اِس ٹاپک کا خلاصہ کریں' فعال ہونے سے پہلے ٹاپک میں لائیکس کی کم از کم تعداد"
     summary_percent_filter: "جب صارف 'اِس ٹاپک کا خلاصہ کریں' پر کلک کرتا ہے، تو سب سے اوپر % پوسٹس دکھائیں"
     summary_max_results: "'اِس ٹاپک کا خلاصہ کریں' کی طرف سے لوٹائی جانے والی زیادہ سے زیادہ پوسٹس"
     enable_personal_messages: "ٹرسٹ لَیول 1 (پیغامات بھیجنے کیلئے کم از کم ٹرسٹ لَیول کے ذریعہ ترتیب دے سکتے ہیں) والے صارفین کو پیغامات بنانے اور پیغامات کا جواب دینے کی اجازت دیں۔ نوٹ کریں کہ جوبھی ہو، اسٹاف ہمیشہ پیغامات بھیج سکتا ہے۔"
@@ -1434,7 +1435,6 @@ ur:
     discord_client_id: 'ڈِسکَورڈ کلائنٹ ID (ایک کی ضرورت ہے؟ <a href="https://discordapp.com/developers/applications/me">ڈِسکَورڈ ڈَوَیلپر پَورٹل</a> ملاحظہ کریں)'
     discord_secret: "ڈِسکَورڈ سیکرٹ کی۔"
     discord_trusted_guilds: 'صرف اِن ڈِسکَورڈ گِلڈز کے ممبران کو بذریعہ ڈِسکَورڈ لاگ اِن ہونے کی اجازت دیں۔ گِلڈ کیلئے ہندسوں والی شناخت استعمال کریں۔ مزید معلومات کیلئے، ہدایات کو <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">یہاں</a> چیک کریں۔ کسی بھی گِلڈ کو اجازت دینے کیلئے خالی چھوڑ دیں۔'
-    readonly_mode_during_backup: "بیک اَپ کرتے وقت صرف پڑھنے کا مَوڈ فعال کریں"
     enable_backups: "ایڈمِنِسٹریٹروں کو فورم کے بیک اَپ بنانے کی اجازت دیں"
     allow_restore: "رِیسٹور کی اجازت دیں، جو سائٹ کا تمام ڈیٹا تبدیل کر سکتا ہے! فالس چھوڑ دیں جب تک کہ آپ بیک اَپ بحال نہ کرنے لگیں"
     maximum_backups: "ڈِسک پر رکھے جانے بیک اَپس کی زیادہ سے زیادہ تعداد۔ پرانے بیک اَپس خود کار طریقے سے حذف کر دیے جاتے ہیں"
@@ -1912,6 +1912,10 @@ ur:
       other: "%{count} پوسٹس کو ایک موجودہ پیغام میں ضم کر دیا گیا تھا: %{topic_link}"
   change_owner:
     post_revision_text: "ملکیت منتقل ہو گئی"
+  publish_page:
+    slug_errors:
+      blank: "خالی نہیں ہو سکتا"
+      invalid: "غلط حروف شامل ہیں"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "%{count} جواب کی زیادہ سے زیادہ حد تک پہنچنے کے بعد یہ پیغام خود کار طریقہ سے بند کر دیا گیا تھا۔"
@@ -2887,7 +2891,6 @@ ur:
       why: "آپ کے %{last_seen_at} کو آخری وِزِٹ کے بعد سے %{site_link} کا ایک مختصر خلاصہ"
       since_last_visit: "آپ کے کو آخری وِزِٹ کے بعد سے"
       new_topics: "نئے ٹاپک"
-      unread_messages: "غیر پڑھے پیغامات"
       unread_notifications: "غیر پڑھی اطلاعات"
       liked_received: "لائیکس موصول ہوے"
       new_users: "نئے صارفین"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 454c36a78b..713ea34ee4 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -31,6 +31,7 @@ vi:
   submit: "Gửi đi"
   disable_remote_images_download_reason: "Không thể tải ảnh về máy chủ vì không dung lượng lưu trữ."
   anonymous: "Ẩn danh"
+  remove_posts_deleted_by_author: "Đã bị xóa bởi tác giả"
   themes:
     import_error:
       git: "Lỗi nhân bản kho git, truy cập bị từ chối hoặc không tìm thấy kho lưu trữ"
@@ -168,11 +169,9 @@ vi:
   bookmarks:
     reminders:
       at_desktop: "Lần sau tôi ở máy tính để bàn của tôi"
-      later_today: "Sau ngày hôm nay <br/> {{date}}"
-      next_business_day: "Ngày làm việc tiếp theo <br/> {{date}}"
-      tomorrow: "Ngày mai <br/> {{date}}"
-      next_week: "Tuần tới <br/> {{date}}"
-      next_month: "Tháng tiếp theo <br/> {{date}}"
+      tomorrow: "Ngày mai"
+      next_week: "Tuần tới"
+      next_month: "Tháng t"
       custom: "Ngày giờ tùy chỉnh"
   groups:
     errors:
@@ -710,8 +709,6 @@ vi:
     email_custom_headers: "Danh sách xác định email header tùy chỉnh"
     force_https: "Buộc trang web của bạn chỉ sử dụng HTTPS. CẢNH BÁO: KHÔNG kích hoạt tính năng này cho đến khi bạn xác minh HTTPS được thiết lập đầy đủ và hoạt động hoàn toàn ở mọi nơi! Bạn đã kiểm tra CDN của mình, tất cả thông tin đăng nhập xã hội và bất kỳ biểu trưng / phụ thuộc bên ngoài nào để đảm bảo tất cả chúng đều tương thích với HTTPS?"
     summary_score_threshold: "Số điểm tối thiểu yêu cầu cho một bài viết bao gồm 'Tóm tắt chủ đề này'"
-    summary_posts_required: "Số bài viết tối thiểu trong một chủ đề trước khi 'Tóm tắt chủ đề này' được kích hoạt"
-    summary_likes_required: "Số lượt thích trong một chủ đề trước khi 'Tóm tắt chủ đề này' được kích hoạt"
     summary_percent_filter: "Khi người dùng nhấn 'Tóm tắt chủ đề này', hiển thị phí trên % của bài viết"
     enable_long_polling: "Message Bus sử dụng để thông báo có thể sử dụng vòng gọi dài"
     long_polling_base_url: "URL chính sử dụng cho vòng gọi dài (khi một CDN phục vụ nội dung động, hãy chắc chắn để thiết lập này là vòng gọi gốc), vd: http://origin.site.com"
@@ -946,7 +943,6 @@ vi:
     delete_drafts_older_than_n_days: "Xóa các bản nháp cũ hơn (n) ngày."
     bootstrap_mode_min_users: "Số thành viên tối thiểu được yêu cầu để tắt chế độ bootstrap (đặt thành 0 để tắt)"
     prevent_anons_from_downloading_files: "Cấm khách truy cập tải các tập tin đính kèm. CẢNH BÁO: việc này sẽ chặn những hình ảnh không thuộc giao diện trang hoạt động"
-    secure_media: 'Giới hạn truy cập để tải lên phương tiện truyền thông (hình ảnh, video, âm thanh). Nếu "yêu cầu đăng nhập" được bật, chỉ Thành viên đã đăng nhập mới có thể truy cập tải lên phương tiện. Nếu không, quyền truy cập sẽ chỉ bị giới hạn đối với các phương tiện tải lên trong các tin nhắn riêng tư. Lưu ý: Tải lên S3 phải được bật trước khi bật cài đặt này.'
     slug_generation_method: "Chọn phương thức tạo slug. 'encoded' sẽ tạo ra phần trăm chuỗi mã hóa. 'none' sẽ tắt slug."
     enable_emoji: "Kích hoạt emoji"
     emoji_set: "Bạn thích dùng gói emoji nào?"
@@ -1008,6 +1004,10 @@ vi:
   redirected_to_top_reasons:
     new_user: "Chào mừng đến với cộng dồng của chúng tôi! Ở đây có những chủ để phổ biến."
     not_seen_in_a_month: "Chào mừng quay trở lại! Chúng tôi thấy bạn truy cập một khoảng thời gian. Ở đây có những bài viết phổ biến từ lúc bạn đ."
+  publish_page:
+    slug_errors:
+      blank: "không được để trống"
+      invalid: "chứa các kí tự không hợp lệ"
   topic_statuses:
     autoclosed_enabled_days:
       other: "Chủ đề này sẽ được tự động đóng sau %{count} ngày, sẽ không được gửi trả lời."
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 09c3f2f18d..38bd9e1d7b 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -12,11 +12,11 @@ zh_CN:
     long_date: "D MMMM YYYY LT"
   datetime_formats: &datetime_formats
     formats:
-      short: "%Y年%m月%d日"
+      short: "%Y-%m-%d"
       short_no_year: "%m月%d日"
       date_only: "%Y年%m月%d日"
-      long: "%Y年%m月%d日%H:%M"
-      no_day: "%B %Y"
+      long: "%Y年%m月%-d日 %H:%M"
+      no_day: "%Y年%m月"
   date:
     month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
     <<: *datetime_formats
@@ -32,11 +32,11 @@ zh_CN:
   sign_up: "注册"
   log_in: "登录"
   submit: "提交"
-  purge_reason: "自动删除为废弃、停用的账户"
+  purge_reason: "自动删除已废弃或已停用的账户"
   disable_remote_images_download_reason: "远程图像下载因为磁盘空间不足已经被停用。"
   anonymous: "匿名"
   remove_posts_deleted_by_author: "被作者删除"
-  redirect_warning: "我们无法验证你选择的链接是否已实际发布到论坛。如果您仍想继续，请选择以下链接。"
+  redirect_warning: "我们无法验证你选择的链接是否已实际发布到论坛。如果你仍想继续，请选择以下链接。"
   on_another_topic: "在另外的主题中"
   themes:
     bad_color_scheme: "无法更新主题，无效的调色板"
@@ -47,19 +47,20 @@ zh_CN:
       generic: 导入该主题时发生错误
       about_json: "导入错误：about.json 不存在或无效"
       about_json_values: "about.json 包含无效值：%{errors}"
+      modifier_values: "about.json 的修改包含无效值：%{errors}"
       git: "克隆 git 储存库时出错，访问被拒绝或找不到存储库"
       unpack_failed: "无法解压缩文件"
       file_too_big: "未压缩的文件太大。"
-      unknown_file_type: "你上传的文件似乎不是可用的 Discourse 主题。"
+      unknown_file_type: "你上传的文件似乎不是一个有效的 Discourse 主题。"
     errors:
       component_no_user_selectable: "主题组件不能由用户选择"
       component_no_default: "主题组件不能是默认主题"
       component_no_color_scheme: "主题组件不能有调色板"
       no_multilevels_components: "具有子主题的主题本身不能是子主题"
-      optimized_link: 优化的图像链接是暂时的，不应包含在主题源代码中。
+      optimized_link: 优化过的图像其链接是暂时的，不应包含在主题源代码中。
     settings_errors:
       invalid_yaml: "提供的 YAML 无效"
-      data_type_not_a_number: "不支持设置 `%{name}` 类型。 支持的类型是 `integer`，`bool`，`list` 和 `enum`"
+      data_type_not_a_number: "设置`%{name}`的值是不支持的类型。支持的类型为`integer`、`bool`、`list` 、`enum`和`upload`"
       name_too_long: "有一个设置的名字太长了。名称的最大长度为 255"
       default_value_missing: "设置 `%{name}` 无默认值"
       default_not_match_type: "设置 `%{name}` 默认值的类型不匹配设置类型。"
@@ -81,27 +82,27 @@ zh_CN:
       default_subject: "此主题需要一个标题"
       show_trimmed_content: "显示被截短的内容"
       maximum_staged_user_per_email_reached: "已达到每个电子邮件可以创建暂存用户的上限。"
-      no_subject: "（无主题）"
+      no_subject: "（无标题）"
       no_body: "（无正文）"
       missing_attachment: "（缺少附件 %{filename}）"
       errors:
         empty_email_error: "收到空白邮件。"
-        no_message_id_error: "邮件头部没有“Message-Id”。"
-        auto_generated_email_error: "邮件头部的优先级(precedence)设置为为：list、junk、bulk 或 auto_reply，或者头部的其他部分包含了：auto-submitted、auto-replied 或 auto-generated。"
+        no_message_id_error: "邮件报头没有“Message-Id”。"
+        auto_generated_email_error: "邮件报头的优先级（precedence）设置为：list、junk、bulk 或 auto_reply，或者头部的其他部分包含了：auto-submitted、auto-replied 或 auto-generated。"
         no_body_detected_error: "无法解析正文并且没有附件。"
         no_sender_detected_error: "当无法在邮件头中找到有效邮件地址时发生。"
-        from_reply_by_address_error: "当 From 标头与回复的电子邮件地址匹配时发生。"
+        from_reply_by_address_error: "报头的 From 字段与回复的电子邮件地址相匹配。"
         inactive_user_error: "发件人未激活。"
-        silenced_user_error: "当发件人被禁言时发生。"
-        bad_destination_address: "当没有一个“收件人/抄送”字段中的电子邮件地址能与与配置的传入电子邮件地址匹配时发生。"
-        strangers_not_allowed_error: "用户尝试在非成员分类中创建主题。"
-        insufficient_trust_level_error: "用户尝试在不满足信任等级要求的分类下发表主题。"
-        reply_user_not_matching_error: "回复邮箱地址与通知发送至的邮件地址不同。"
-        topic_not_found_error: "回复到已经删除的主题。"
-        topic_closed_error: "回复到已经锁定的主题。"
-        bounced_email_error: "邮件是投递失败的错误报告。"
+        silenced_user_error: "发件人被禁言。"
+        bad_destination_address: "“收件人/抄送”字段中的电子邮件地址无法与已配置的传入电子邮件地址匹配。"
+        strangers_not_allowed_error: "用户尝试在一个其未加入的分类中创建主题。"
+        insufficient_trust_level_error: "用户尝试在一个其不满足信任等级要求的分类下发表主题。"
+        reply_user_not_matching_error: "回复的邮箱地址与接受通知的邮件地址不同。"
+        topic_not_found_error: "回复到一个已被删除的主题。"
+        topic_closed_error: "回复到一个已经关闭的主题。"
+        bounced_email_error: "邮件是一份投递失败的错误报告。"
         screened_email_error: "发件人邮箱已经被屏蔽。"
-        unsubscribe_not_allowed: "当用户不能通过邮件退订时发生。"
+        unsubscribe_not_allowed: "用户无法通过邮件进行退订。"
         email_not_allowed: "当用户邮件不在白名单或在黑名单时发生。"
       unrecognized_error: "无法识别的错误"
     secure_media_placeholder: "已编辑：该站点已启用安全媒体，请访问主题以查看随附的图像/音频/视频。"
@@ -129,7 +130,7 @@ zh_CN:
       invalid_timezone: "“%{tz}”不是一个有效的时区"
       contains_censored_words: "包含了以下敏感词:%{censored_words}"
       less_than: "必须小于 %{count}"
-      less_than_or_equal_to: "必须小于等于 %{count}"
+      less_than_or_equal_to: "必须小于或等于 %{count}"
       not_a_number: 不是数字
       not_an_integer: 必须是整数
       odd: 必须是偶数
@@ -149,51 +150,51 @@ zh_CN:
       other_than: "必须不为 %{count}"
       sso_overrides_username: "当`sso_overrides_username`设置是启用的，用户名需要在SSO提供商处更新。"
     template:
-      body: "有下列问题："
+      body: "以下字段有问题："
       header:
-        other: "有 %{count} 个错误使得%{model}无法被保存"
+        other: "有 %{count} 个错误使得 %{model} 无法被保存"
     embed:
       load_from_remote: "载入帖子时出错了。"
     site_settings:
-      invalid_category_id: "你指定的一个分类不存在"
+      invalid_category_id: "你所指定的一个分类是不存在的"
       invalid_choice:
-        other: "你指定了无效的选择%{name}"
-      default_categories_already_selected: "不能选择一个已经用于另一个列表的分类。"
-      default_tags_already_selected: "你不能选择一个被使用在其它列表中的标签。"
+        other: "你指定了无效的选择 %{name}"
+      default_categories_already_selected: "你不能选择一个已经被用在其它列表中的分类。"
+      default_tags_already_selected: "你不能选择一个已经被使用在其它列表中的标签。"
       s3_upload_bucket_is_required: "你没有填写“s3_upload_bucket”，不能开启上传至 S3。"
-      enable_s3_uploads_is_required: "除非已启用S3上载，否则无法将库存启用到S3。"
+      enable_s3_uploads_is_required: "除非已启用上传到 S3，否则你无法存储到S3。"
       s3_backup_requires_s3_settings: "除非你提供了'%{setting_name}'，否则无法将S3用作备份位置。"
-      s3_bucket_reused: "您不可把同一个 bucket 既用作 ‘s3_upload_bucket’ 又用作 ‘s3_backup_bucket’。请选择不同的 bucket 或为每个 bucket 使用不同的路径。"
+      s3_bucket_reused: "你不可以将同一个 bucket 同时用作 ‘s3_upload_bucket’ 和 ‘s3_backup_bucket’。请选择一个不同的 bucket 或为每个 bucket 使用不同的路径。"
       secure_media_requirements: "在启用安全媒体之前，必须先启用S3上传。"
       second_factor_cannot_be_enforced_with_disabled_local_login: "如果禁用本地登录则无法强制启用2FA。"
       local_login_cannot_be_disabled_if_second_factor_enforced: "如果强制启用2FA则不能禁用本地登录。在禁用本地登录之前，请禁用强制启用2FA。"
-      cannot_enable_s3_uploads_when_s3_enabled_globally: "你无法启用S3上传，因为S3上载已经全局启用了，另外此网站级别的启用可能会导致严重的上传问题"
-    conflicting_google_user_id: '此帐户的Google帐户ID已更改; 出于安全原因，需要管理人员干预。请联系工作人员并将其指向<a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "你无法启用S3上传，因为S3上传已经全局启用了，另外这样站点级的启用可能会导致上传的文件出现严重问题"
+    conflicting_google_user_id: '此账户的Google账户ID已更改; 出于安全原因，需要管理人员干预。请联系工作人员并指引他们前往<a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
   invite:
-    not_found: "你的邀请码不正确。请联系<a href='%{base_url}/about'>工作人员</a>。"
+    not_found: "你的邀请码不正确。请<a href='%{base_url}/about'>联系工作人员</a>。"
     not_found_json: "你的邀请码不正确。请联系工作人员。"
     not_found_template: |
-      <p>你的<a href="%{base_url}">%{site_name} </a>邀请已被兑换。</ p>
+      <p>你来自<a href="%{base_url}">%{site_name} </a>的邀请已被兑换。</ p>
 
-      <p>如果你还记得密码，可以<a href="%{base_url}/login">登录</a>。</ p>
+      <p>如果你还记得密码，可以<a href="%{base_url}/login">登录</a>。</p>
 
       <p>否则请<a href="%{base_url}/password-reset">重置密码</a>。</p>
     error_message: "接受邀请时出错。 请联系该网站的管理员。"
-    user_exists: "不需要邀请<b>%{email}</b>，他们<a href='%{base_path}/u/%{username}/summary'>已经有账户了！</a>"
+    user_exists: "不需要邀请<b>%{email}</b>，他们<a href='%{base_path}/u/%{username}/summary'>已经拥有账户了！</a>"
     confirm_email: "<p>快完成了！我们发送了一封激活邮件到你的邮件地址。请按照邮件中的步骤来激活你的账户。</p><p>如果你没有收到邮件，请检查你的垃圾邮件收件箱。</p>"
   bulk_invite:
     file_should_be_csv: "上传的文件应为 csv 格式。"
     max_rows: "前%{max_bulk_invites}个邀请已经被发出。尝试将文件分割成更小的部分。"
-    error: "上传文件的时候出错了。请重试。"
+    error: "上传文件的时候出错了。请稍后重试。"
   topic_invite:
-    failed_to_invite: "如果没有以下任一组中的组成员身份，则无法邀请用户加入此主题：%{group_names}。"
-    user_exists: "抱歉，用户已经被邀请了。你可能只想邀请用户参与主题一次。"
+    failed_to_invite: "如果用户不是以下任一群组的成员，则无法被邀请加入到此主题：%{group_names}。"
+    user_exists: "抱歉，用户已经被邀请过了。你只可以邀请一个用户到一个主题中一次。"
   backup:
     operation_already_running: "有操作正在运行。目前无法开始新的操作。"
-    backup_file_should_be_tar_gz: "备份文件应为 .tar.gz 存档文件。"
+    backup_file_should_be_tar_gz: "备份文件应该是一个 .tar.gz 存档文件。"
     not_enough_space_on_disk: "没有足够的磁盘空间可供备份文件上传。"
     invalid_filename: "备份文件名包含无效字符。有效字符为 a-z 0-9 . - _."
     file_exists: "你尝试上传的文件已存在。"
@@ -203,42 +204,42 @@ zh_CN:
   invalid_params: "你为请求提供了无效参数：%{message}"
   not_logged_in: "你需要登录后才能这么做。"
   not_found: "找不到请求的地址或资源。"
-  invalid_access: "你没有权限查看请求的资源。"
+  invalid_access: "你没有权限查看所请求的资源。"
   authenticator_not_found: "身份验证方法不存在或已被禁用。"
-  invalid_api_credentials: "你没有权限查看请求的资源。API 用户名或者秘钥无效。"
-  provider_not_enabled: "你不能查看请求的资源。身份验证提供程序未启用。"
-  provider_not_found: "你不能查看请求的资源。身份验证提供程序不存在。"
+  invalid_api_credentials: "你没有权限查看所请求的资源。API 用户名或者秘钥无效。"
+  provider_not_enabled: "你没有权限查看所请求的资源。身份验证提供程序未启用。"
+  provider_not_found: "你没有权限查看所请求的资源。身份验证提供程序不存在。"
   read_only_mode_enabled: "这个站点正处于只读模式。交互功能已禁用。"
-  invalid_grant_badge_reason_link: "徽章原因不允许外部或无效的discourse链接"
-  email_template_cant_be_modified: "无法修改此邮件模板"
-  invalid_whisper_access: "没有启用密语，或者你无权创建谜语帖子"
+  invalid_grant_badge_reason_link: "徽章原因中不允许外部或无效的discourse链接"
+  email_template_cant_be_modified: "该邮件模板不能被修改"
+  invalid_whisper_access: "没有启用密语或者是你无权创建密语帖子"
   not_in_group:
-    title_topic: "你必须在群组中才能看到此主题。"
-    title_category: "你必须在群组中才能看到此分类。"
+    title_topic: "你必须在群组中才能看到这个主题。"
+    title_category: "你必须在群组中才能看到这个分类。"
     request_membership: "申请会员"
     join_group: "加入群组"
-  deleted_topic: "糟糕！该主题已被删除且不再可用。"
-  delete_topic_failed: "删除该主题时出错。请与网站管理员联系。"
+  deleted_topic: "哎呀！该主题已被删除了并且不再可用。"
+  delete_topic_failed: "删除主题时出错。请与网站管理员联系。"
   reading_time: "阅读时间"
   likes: "赞"
   too_many_replies:
-    other: "我们非常抱歉，但是新用户有发帖限制。在同一主题只能回复 %{count} 次。"
+    other: "我们非常抱歉，新用户被暂时限制同一个主题内回复不超过%{count}次。"
   max_consecutive_replies:
-    other: "不得超过%{count}次连续回复。请编辑你之前的回复，或等待他人的回复。"
+    other: "不得连续回复超过%{count}次。请编辑你之前的回复，或等待某个人回复你。"
   embed:
     start_discussion: "开始讨论"
     continue: "继续讨论"
     error: "嵌入故障"
     referer: "来源："
     error_topics: "站点设置`embed topics list`未启用"
-    mismatch: "引用头要么未发送，要么不匹配以下任何主机："
-    no_hosts: "嵌入没有设置任何主机地址。"
+    mismatch: "引用来源可能没有被发送，也可能是不在下列主机中："
+    no_hosts: "没有为嵌入内容设置任何主机地址。"
     configure: "配置嵌入"
     more_replies:
-      other: "%{count} 个更多回复"
+      other: "更多 %{count} 个回复"
     loading: "讨论载入中…"
     permalink: "永久链接"
-    imported_from: "这是一个已从原 %{link} 中分离的主题"
+    imported_from: "这是一个从原来  %{link} 中分离出来的主题"
     in_reply_to: "▶ %{username}"
     replies:
       other: "%{count}个回复"
@@ -250,29 +251,29 @@ zh_CN:
   no_mentions_allowed: "抱歉，你无法提到其他用户。"
   too_many_mentions:
     other: "抱歉，你一次仅能提到 %{count} 个用户。"
-  no_mentions_allowed_newuser: "抱歉，访客无法@用户。"
+  no_mentions_allowed_newuser: "抱歉，新用户不能@其它用户。"
   too_many_mentions_newuser:
-    other: "抱歉，访客一次仅能@ %{count} 个用户。"
+    other: "抱歉，新用户在一个帖子中最多能@ %{count} 位用户。"
   no_images_allowed_trust: "抱歉，你无法在这个帖子里贴图"
-  no_images_allowed: "抱歉，访客无法贴图。"
+  no_images_allowed: "抱歉，新用户不能在帖子中贴图。"
   too_many_images:
-    other: "抱歉，访客一次仅能贴 %{count} 张图。"
-  no_attachments_allowed: "抱歉，新用户无法上传附件。"
+    other: "抱歉，新用户在一个帖子中仅能贴 %{count} 张图。"
+  no_attachments_allowed: "抱歉，新用户不能在帖子中上传附件。"
   too_many_attachments:
-    other: "抱歉，新用户一次仅能上传 %{count} 个附件。"
-  no_links_allowed: "抱歉，访客无法贴链接。"
+    other: "抱歉，新用户在一个帖子中仅能上传 %{count} 个附件。"
+  no_links_allowed: "抱歉，新用户不能在帖子中发表链接。"
   links_require_trust: "抱歉，你的帖子中不能包含链接。"
   too_many_links:
-    other: "抱歉，访客一次仅能贴 %{count} 条链接。"
+    other: "抱歉，新用户在一个帖子中仅能发表 %{count} 条链接。"
   contains_blocked_word: "你的帖子中包含不允许的词：%{word}"
-  contains_blocked_words: "你的帖子中含有多个被禁止的字符：%{words}"
-  spamming_host: "抱歉，你不能添加一个链接到那个地址的链接。"
+  contains_blocked_words: "你的帖子中含有多个被禁止的词：%{words}"
+  spamming_host: "抱歉，你不能发表该主机的链接。"
   user_is_suspended: "被封禁的用户不允许发贴。"
   topic_not_found: "出现问题。或许这个主题在你看的时候已经被关闭或删除了。"
   not_accepting_pms: "对不起，%{username} 目前不接收讯息。"
   max_pm_recipients: "抱歉，你至多可以向%{recipients_limit}个收件人发送私信。"
   pm_reached_recipients_limit: "抱歉，私信中的收信人不能超过%{recipients_limit}。"
-  removed_direct_reply_full_quotes: "自动删除整个上篇帖子的引用。"
+  removed_direct_reply_full_quotes: "自动删除对上一个帖子的完整引用。"
   secure_upload_not_allowed_in_public_topic: "抱歉，无法在公开的主题中使用以下安全上传：%{upload_filenames}。"
   create_pm_on_existing_topic: "抱歉，你无法在现有主题上创建PM。"
   just_posted_that: "太类似于你最近发表的内容"
@@ -305,7 +306,7 @@ zh_CN:
     group_mentions: "%{group_name}组最近的提及"
     user_posts: "最新贴子由 @%{username}发表"
     user_topics: "最新主题由 @%{username}发表"
-    tag: "主题标签"
+    tag: "加标签的主题"
     badge: "%{site_title}的%{display_name}徽章"
   too_late_to_edit: "这个主题在很早之前创建。不能被编辑或者被删除。"
   edit_conflict: "该帖子由其他用户编辑，你的更改无法再保存。"
@@ -314,14 +315,16 @@ zh_CN:
   bookmarks:
     errors:
       already_bookmarked_post: "你不能将同一帖子收藏两次。"
+      cannot_set_past_reminder: "你不能在此主题设置收藏提醒。"
+      cannot_set_reminder_in_distant_future: "你不能够设置一个大于十年的收藏提醒。"
       time_must_be_provided: "必须为除“ %{reminder_type}”以外的所有提醒提供时间"
     reminders:
       at_desktop: "下次我使用桌面设备时"
-      later_today: "晚于今天的"
-      next_business_day: "下个工作日的"
+      later_today: "今天的某个时候"
+      next_business_day: "下一个工作日"
       tomorrow: "明天"
-      next_week: "下周"
-      next_month: "下个月<br/> {{date}}"
+      next_week: "下个星期"
+      next_month: "下个月"
       custom: "自定义日期和时间"
   groups:
     success:
@@ -350,7 +353,6 @@ zh_CN:
       trust_level_4: "信任等级4"
     request_membership_pm:
       title: "%{group_name}的成员请求"
-      handle: "处理成员请求"
     view_hidden_topic_request_reason: "我希望加入群组 “%{group_name}” 以访问[此主题](%{topic_url})"
   education:
     until_posts:
@@ -414,9 +416,9 @@ zh_CN:
     reviving_old_topic: |
       ### 重新激活这个主题？
 
-      这个主题的最后一个回复距今已有**%{time_ago}**。你的回复将让主题重新出现在列表的顶端并通知原先参与讨论的人。
+      该主题最后的回复是**%{time_ago}**。你的回复将让主题重新出现在列表的顶端并通知所有原先参与过讨论的人。
 
-      你确定要继续这个老的话题吗？
+      你确定要延续这个久远的话题吗？
   activerecord:
     attributes:
       category:
@@ -438,7 +440,7 @@ zh_CN:
               warning_requires_pm: "你只能在个人消息中附加警告。"
               too_many_users: "一次只能发送警告给一个用户。"
               cant_send_pm: "抱歉，你不能向该用户发送消息。"
-              no_user_selected: "必须选择一个有效的用户。"
+              no_user_selected: "你必须选择一个有效的用户。"
               reply_by_email_disabled: "用邮件回复已被禁止"
               target_user_not_found: "未找到你要向其发送此消息的其中一个用户"
             featured_link:
@@ -459,6 +461,10 @@ zh_CN:
               same_as_password: "和你的密码相同。"
             ip_address:
               signup_not_allowed: "不能使用这个账户登录。"
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "该主题不能显示在你的个人资料中。"
         user_email:
           attributes:
             user_id:
@@ -551,13 +557,13 @@ zh_CN:
       email_already_used_in_category: "'%{email}' 已经被分类'%{category_name}'使用了。"
       description_incomplete: "分类描述帖至少要有一段。"
       permission_conflict: "所有被允许访问一个子分类的群组也必须能够访问其上级分类。下列群组能够访问某个子分类，但不能访问上级分类： %{group_names}。"
-      disallowed_topic_tags: "此主题包含此类别不允许的标签：%{tags}"
+      disallowed_topic_tags: "此主题含有不允许在该分类中使用的标签：%{tags}"
       disallowed_tags_generic: "此主题有反对标签。"
     cannot_delete:
-      uncategorized: "这是个特殊的分类。如果不知道应该话题属于哪个分类，那么请使用这个分类；这个分类不能被删除。"
+      uncategorized: "这个分类是特殊的。它用于存放没有分类的主题；不能被删除。"
       has_subcategories: "不能删除该分类，因为它有子分类"
       topic_exists:
-        other: "不能删除该分类，因为它有%{count}个主题。最老的主题是%{topic_link}。"
+        other: "不能删除该分类，因为它有%{count}个主题。最久远的主题是%{topic_link}。"
       topic_exists_no_oldest: "不能删除该分类，因为主题数量为 %{count}。"
     uncategorized_description: "不需要分类或者不适合放在现有的任何分类中的主题。"
   trust_levels:
@@ -641,9 +647,9 @@ zh_CN:
       x_days:
         other: "%{count}天前"
       about_x_months:
-        other: "大约%{count}分钟前"
+        other: "大约%{count}个月前"
       x_months:
-        other: "%{count}分钟前"
+        other: "%{count}个月前"
       about_x_years:
         other: "大约%{count}年前"
       over_x_years:
@@ -710,7 +716,7 @@ zh_CN:
       almost_done_title: "确认新的电子邮件地址"
       almost_done_description: "我们需要发送一封电子邮件到您的新电子邮件地址以确认更改！"
   associated_accounts:
-    revoke_failed: "无法使用%{provider_name}撤消你的帐户。"
+    revoke_failed: "无法使用%{provider_name}吊销你的账户。"
     connected: "（已连接）"
   activation:
     action: "点击这儿激活你的账户"
@@ -719,7 +725,7 @@ zh_CN:
     continue_button: "转入到%{site_name}"
     welcome_to: "欢迎来到%{site_name}！"
     approval_required: "你的新账户需要由一位论坛版主手动批准方可使用。一旦你的账户获得批准，你将收到一封电子邮件通知！"
-    missing_session: "无法确认你是否注册了帐户，请确定你已经启用了 cookie。"
+    missing_session: "无法确认你是否注册了账户，请确认你已经启用了 cookie。"
     activated: "抱歉，这个账户已经被激活了。"
     admin_confirm:
       title: "确认管理员账户"
@@ -854,7 +860,7 @@ zh_CN:
     unwatch_category: "不再关注%{category}分类中的所有主题"
     mailing_list_mode: "停用邮件列表模式"
     all: "不要从%{sitename}给我发送任何邮件"
-    different_user_description: "你登录的帐户与邮件不符。请登出，或进入隐私模式，然后再重试。"
+    different_user_description: "你当前登录的账户与我们所发送邮件的用户不符。请登出，或进入隐私模式，然后重试。"
     not_found_description: "对不起，我们找不到这个退订链接。有可能你的邮件中的链接已经过期？"
     log_out: "退出"
     submit: "保存设置"
@@ -946,7 +952,7 @@ zh_CN:
         time_to_resolution: 解决时间
       description: "标记状态列表，包括标记类型，作者，标记人和解决时间。"
     visits:
-      title: "用户访问量"
+      title: "用户访问量（UV）"
       xaxis: "天"
       yaxis: "访问量"
       description: "用户浏览数"
@@ -966,7 +972,7 @@ zh_CN:
         tl1_reached: "达到信任等级1"
         tl2_reached: "达到信任等级2"
         tl3_reached: "达到信任等级3"
-        tl4_reached: "达到TL4"
+        tl4_reached: "达到信任等级4"
       yaxis: "天"
       description: "在此期间提升了其信任等级的用户数量。"
     consolidated_page_views:
@@ -995,12 +1001,12 @@ zh_CN:
     profile_views:
       title: "查看用户资料"
       xaxis: "天"
-      yaxis: "已看的用户资料数量"
+      yaxis: "用户资料访问量"
       description: "用户个人信息页的新访问数。"
     topics:
       title: "新发表主题"
       xaxis: "天"
-      yaxis: "新主题数"
+      yaxis: "新主题的数量"
       description: "在此期间创建的新主题。"
     posts:
       title: "新发表帖子"
@@ -1010,7 +1016,7 @@ zh_CN:
     likes:
       title: "新的赞"
       xaxis: "天"
-      yaxis: "新的赞数"
+      yaxis: "新的赞的数量"
       description: "新的赞数。"
     flags:
       title: "标记"
@@ -1021,7 +1027,7 @@ zh_CN:
       title: "收藏"
       xaxis: "天"
       yaxis: "新收藏数"
-      description: "新主题和帖子的收藏数。"
+      description: "新主题和帖子的收藏数量。"
     users_by_trust_level:
       title: "各信任等级的用户数"
       xaxis: "信任等级"
@@ -1029,6 +1035,7 @@ zh_CN:
       labels:
         level: 等级
       description: "按信任级别分组的用户数。"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "用户类型"
       xaxis: "类型"
@@ -1040,7 +1047,7 @@ zh_CN:
         moderator: 版主
         suspended: 已封禁
         silenced: 禁言
-      description: "按管理员，主持人，冻结和禁言分组的用户数。"
+      description: "按管理员，版主，封禁和禁言所分组的用户数量。"
     trending_search:
       title: 热门搜寻字词
       labels:
@@ -1072,7 +1079,7 @@ zh_CN:
       title: "版主警告"
       xaxis: "天"
       yaxis: "私信数"
-      description: "来自版主发送的警告消息的数量。"
+      description: "来自版主的警告消息数量。"
     notify_moderators_private_messages:
       title: "版主通知"
       xaxis: "天"
@@ -1105,25 +1112,25 @@ zh_CN:
         num_topics: 主题
       description: "与此网站链接最多的外部资源。"
     top_referred_topics:
-      title: "最多被引主题"
+      title: "被引用最多的主题"
       labels:
         num_clicks: "点击数"
         topic: "主题"
-      description: "从外部来源获得最多点击次数的主题。"
+      description: "从外部来源获得最多点击的主题。"
     page_view_anon_reqs:
       title: "匿名"
       xaxis: "天"
-      yaxis: "未登录页面访问"
-      description: "未登录访问者的页面访问量(PV)。"
+      yaxis: "匿名访问量（PV）"
+      description: "未登录访问者的页面访问量（PV）。"
     page_view_logged_in_reqs:
       title: "已登录"
       xaxis: "天"
-      yaxis: "已登录页面访问"
-      description: "登陆用户的新页面访问量。"
+      yaxis: "已登录访问量（PV）"
+      description: "新的已登陆用户访问量"
     page_view_crawler_reqs:
       title: "Web爬虫页面访问量"
       xaxis: "天"
-      yaxis: "Web 爬虫页面访问"
+      yaxis: "Web 爬虫访问量（PV）"
       description: "一段时间内的Web爬虫页面访问量。"
     page_view_total_reqs:
       title: "浏览量"
@@ -1133,7 +1140,7 @@ zh_CN:
     page_view_logged_in_mobile_reqs:
       title: "已登录页面访问"
       xaxis: "天"
-      yaxis: "移动端已登录页面访问"
+      yaxis: "移动端已登录的访问量（PV）"
       description: "移动设备上已登录用户的新页面访问量。"
     page_view_anon_mobile_reqs:
       title: "未登录页面访问"
@@ -1184,7 +1191,7 @@ zh_CN:
       labels:
         user_agent: "用户代理"
         page_views: "浏览量"
-      description: "网络爬虫UA列表，根据访问量排序。"
+      description: "网络爬虫用户代理列表，根据访问量排序。"
     suspicious_logins:
       title: "可疑登录"
       labels:
@@ -1200,7 +1207,7 @@ zh_CN:
       title: "管理员登陆"
       labels:
         user: 用户
-        location: 地点
+        location: 位置
         login_at: 登录于
       description: "有地点信息的管理员登录时间列表。"
     top_uploads:
@@ -1210,18 +1217,17 @@ zh_CN:
         extension: 扩展
         author: 作者
         filesize: 文件大小
-      description: "按文件扩展名，大小和作者列出所有上传内容。"
+      description: "根据文件扩展名、大小和作者排列所有上传内容。"
     top_ignored_users:
-      title: "最多的忽略/忽视的用户"
+      title: "排名最高的被忽视或忽略的用户"
       labels:
-        ignored_user: 无视的用户
-        ignores_count: 忽视计数
+        ignored_user: 忽视的用户
+        ignores_count: 被忽视次数
         mutes_count: 静音计数
       description: "被许多其他用户忽略和/或忽视的用户。"
   dashboard:
     rails_env_warning: "你的服务器运行在 %{env} 模式。"
-    host_names_warning: "你的 config/database.yml 文件使用的是缺省的 localhost 主机名。请更改成你的站点主机名。"
-    gc_warning: '你的服务器使用的是缺省的ruby垃圾回收参数，这个配置无法提供最高性能。请阅读此性能调优文档：<a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Tuning Ruby and Rails for Discourse</a>。'
+    host_names_warning: "你的 config/database.yml 文件使用的是默认的 localhost 主机名。请更新为你的站点主机名。"
     sidekiq_warning: 'Sidekiq 不在运行。很多任务，例如发送电子邮件，是异步的被 sidekiq 调度执行的。请确保至少运行一个 sidekiq 进程。<a href="https://github.com/mperham/sidekiq" target="_blank">了解 Sidekiq</a>。'
     queue_size_warning: "队列中有较多任务，为 %{queue_size} 个。这可能是因为 Sidekiq 进程的问题导致，或者需要更多的 Sidekiq 进程。"
     memory_warning: "你的服务器环境内存少于 1GB，我们建议至少要有 1GB 内存。"
@@ -1240,8 +1246,8 @@ zh_CN:
     bad_favicon_url: "网站图标无法载入。检查<a href='%{base_path}/admin/site_settings'>站点设置</a>中的图标设置。"
     deprecated_api_usage: "我们检测到了不建议使用的身份验证方法的API请求。请更新以使用<a href='https://meta.discourse.org/t/-/22706'>基于header的认证</a> 。更新后，此消息可能需要24小时才能消失。"
     update_mail_receiver: "我们检测到一个过时的电子邮件收信人版本。点击<a href='https://meta.discourse.org/t/-/133491'>这里</a>查看更新说明。更新后，此消息后可能需要24小时才会消失。"
-    poll_pop3_timeout: "至 POP3 服务器的连接超时。无法获取进站邮件。请检查<a href='%{base_path}/admin/site_settings/category/email'>POP3 设置</a>和服务商。"
-    poll_pop3_auth_error: "至 POP3 服务器的连接验证失败。请检查<a href='%{base_path}/admin/site_settings/category/email'>POP3 设置</a>。"
+    poll_pop3_timeout: "连接 POP3 服务器超时。无法获取进站邮件。请检查你的<a href='%{base_path}/admin/site_settings/category/email'>POP3 设置</a>和服务商。"
+    poll_pop3_auth_error: "连接至 POP3 服务器因身份验证错误而失败。请检查你的<a href='%{base_path}/admin/site_settings/category/email'>POP3 设置</a>。"
     force_https_warning: "你的网站使用了SSL。但是，你的网站设置中尚未启用`<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>`。"
     out_of_date_themes: "以下主题有更新："
     unreachable_themes: "我们无法检查以下主题的更新："
@@ -1264,8 +1270,8 @@ zh_CN:
     min_personal_message_title_length: "私信标题允许的最小字符数"
     max_emojis_in_title: "主题标题中允许的最大表情数量"
     min_search_term_length: "搜索条件允许的最少字符数"
-    search_tokenize_chinese_japanese_korean: "在非中/日/韩语站点强制切割中/日/韩语搜索分词"
-    search_prefer_recent_posts: "如果搜索大型论坛较慢，这个选项将优先尝试最新的帖子"
+    search_tokenize_chinese_japanese_korean: "即使在非CJK站点上也强制切割中文、日文、韩文的搜索分词。"
+    search_prefer_recent_posts: "如果搜索大型论坛较慢，此选项将尝试优先索引新的帖子"
     search_recent_posts_size: "索引多少最新的主题"
     log_search_queries: "记录用户执行的搜索查询。"
     search_query_log_max_size: "要保留的最大搜索查询量。"
@@ -1281,12 +1287,12 @@ zh_CN:
     educate_until_posts: "当用户开始键入他们的前几个（n）新帖子时，在编辑器上显示教育面板弹窗。"
     title: "站点名字，用于 title 标签。"
     site_description: "用一句话描述这个论坛，用于 meta description 标签。"
-    short_site_description: "简短说明，用于主页上的标题标签。"
-    contact_email: "负责本网站的主要联系人的电子邮件地址。用于关键通知，以及紧急事项的<a href='%{base_path}/about' target='_blank'>/about</a>联系表。"
-    contact_url: "此站点的联系URL。用于紧急事项的<a href='%{base_path}/about' target='_blank'>/about</a>联系表。"
+    short_site_description: "简短的描述，用于主页上的标题标签。"
+    contact_email: "本网站主要负责人的电子邮件地址。用于重要通知以及<a href='%{base_path}/about' target='_blank'>/about</a>页面中的紧急联系人。"
+    contact_url: "本网站的联系URL。<a href='%{base_path}/about' target='_blank'>/about</a>页面的紧急联系人。"
     crawl_images: "允许从第三方 URL 获取图片来插入宽、高数值"
-    download_remote_images_to_local: "下载一份主题中链接的外部图片到本地；以防图片损坏。"
-    download_remote_images_threshold: "本地最小可用下载外部图片到本地的空间（百分比）"
+    download_remote_images_to_local: "通过下载将远程图像转换为本地图像；此选项可避免图像损坏。"
+    download_remote_images_threshold: "下载远程图像到本地所需的最小硬盘空间（百分比）"
     download_remote_images_max_days_old: "不下载超过 n 天的帖子中的远程图片。"
     disabled_image_download_domains: "域名列表，链接到这些站点的图片不会被下载。用 | 分割。"
     editing_grace_period: "在 (n) 秒之内，对帖子的编辑不生成帖子历史。"
@@ -1300,10 +1306,10 @@ zh_CN:
     max_image_width: "帖子中图片允许的最大缩略图宽度"
     max_image_height: "帖子中图片允许的最大缩略图宽度"
     responsive_post_image_sizes: "调整预览图像的大小以允许以下像素比率的高DPI屏幕。 删除所有值以禁用响应图像。"
-    fixed_category_positions: "如果选择，你将可以设置一个固定的分类顺序。如果不选择，分类将按照活动的顺序显示。"
-    fixed_category_positions_on_create: "如果选择了，目录排序将会在话题创建对话框中被包含(要求固定目录位置选项)"
-    add_rel_nofollow_to_user_content: '添加 rel nofollow 属性到所有的用户内容，除了内部链接（包括父域名）。如果你更改了这个，你必须重新调制所有帖子，以该命令：“rake posts:rebake”'
-    exclude_rel_nofollow_domains: "Nofollow 的域名列表不应被加入到链接中。 填写 example.com 也将自动允许 sub.example.com。至少你应该填写本站域名来帮助爬虫获得所有内容。如果你网站的其余部分在另外的域名，也请添加那些域名。"
+    fixed_category_positions: "如果选中，你将能够固定分类的排序。反之，分类将按照活跃顺序显示。"
+    fixed_category_positions_on_create: "如果选中，主题创建对话框中会维持分类的排序（需要 fixed_category_positions)。"
+    add_rel_nofollow_to_user_content: '添加 rel nofollow 属性到所有的用户内容，除了内部链接（包括父域名）。如果你更改了这个，你必须使用“rake posts:rebake"重制所有帖子。'
+    exclude_rel_nofollow_domains: "不应添加nofollow的域名列表。example.com 会自动包含 sub.example.com。至少你应该填写本站域名来帮助爬虫获得所有内容。如果你网站的其余部分在另外的域名，也请添加那些域名。"
     post_excerpt_maxlength: "帖子摘要的最大字符长度"
     show_pinned_excerpt_mobile: "移动版显示置顶主题剪辑。"
     show_pinned_excerpt_desktop: "桌面版显示置顶主题剪辑。"
@@ -1313,32 +1319,32 @@ zh_CN:
     enable_inline_onebox_on_all_domains: "忽略 inline_onebox_domain_whitelist 站点设定并在所有域允许一致 Onebox 。"
     force_custom_user_agent_hosts: "在所有请求上使用自定义 onebox 用户代理的主机。（对于限制用户代理访问的主机尤其有用）。"
     max_oneboxes_per_post: "帖子中最多的 Onebox 数量。"
-    logo: "你网站左上角的logo图片。使用高120且宽高比大于3:1的宽矩形图像。如果留空，将显示网站标题文本。"
-    logo_small: "出现在你站点左上角的小号标志图片，当滚动后可见。使用方形120×120图像。如果留空，将显示主页图标。"
-    digest_logo: "网站电子邮件摘要顶部使用的备用logo图片。使用宽矩形图像。不要使用SVG图像。 如果留空，将使用“logo”设置中的图像。"
-    mobile_logo: "网站的移动版本上使用的logo。使用高120且宽高比大于3:1的宽矩形图像。 如果留空，将使用“logo”设置中的图像。"
+    logo: "你网站左上角的商标图像。使用高120且宽高比大于3:1的宽矩形图像。如果留空，将显示网站的标题文本。"
+    logo_small: "出现在你站点左上角的小号的商标图像，滚动后可见。使用方形120×120的图像。如果留空，将显示一个主页图标。"
+    digest_logo: "邮件摘要顶部所使用的备用商标图像。使用宽矩形的图像。不要使用SVG图像。 如果留空，将使用`logo`设置中的图像。"
+    mobile_logo: "网站的移动版本上使用的商标。使用高120且宽高比大于3:1的宽矩形图像。 如果留空，将使用`logo`设置中的图像。"
     large_icon: "用作其他元数据图标的基础的图像。 理想情况下应大于512 x 512。如果留空，将使用logo_small。"
-    manifest_icon: "在Android上用作logo/启动图像的图像。将自动调整为512×512。如果留空，将使用large_icon。"
-    favicon: "你的站点图标（favicon），参考<a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://zh.wikipedia.org/wiki/Favicon</a>。如果要正确地通过 CDN 分发，它必须是png图片。将调整为32x32。如果留空，将使用large_icon。"
-    apple_touch_icon: "用于Apple触控设备的图标。将自动调整为180x180。如果留空，将使用large_icon。"
-    opengraph_image: "默认打开的图像，在页面没有其他合适图像时使用。如果留空，将使用large_icon"
-    twitter_summary_large_image: "Twitter卡“摘要大图”（宽度至少应为280，高度至少为150）。如果留空，则使用opengraph_image生成常规卡片元数据。"
+    manifest_icon: "用作Android图标的图像。会被自动调整为512×512。如果留空，将使用large_icon。"
+    favicon: "你的站点图标（favicon），参考<a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://zh.wikipedia.org/wiki/Favicon</a>。如果要正确地通过 CDN 分发，它必须是png图片。会被调整为32x32。如果留空，将使用large_icon。"
+    apple_touch_icon: "用于Apple触控设备的图标。会被自动调整为180x180。如果留空，将使用large_icon。"
+    opengraph_image: "默认的opengraph图像，当页面没有其它合适的图像时使用。如果留空，将使用large_icon。"
+    twitter_summary_large_image: "Twitter卡片的“摘要大图”（宽度至少应为280，高度至少为150）。如果留空，则使用opengraph_image生成常规卡片元数据。"
     notification_email: "这个表格：被用于发送所有重要系统邮件的邮箱地址。指定的域名必须正确设置 SPF、DKIM 和反向 PTR 记录以发送邮件。"
-    email_custom_headers: "一个逗号分离的自定义邮件头部"
+    email_custom_headers: "以竖线分割的自定义邮件标头列表。"
     email_subject: "标准邮件的自定义主题格式。参见<a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
     detailed_404: "为用户提供关于他们为什么不能访问特定主题的更多细节。注意：这是不安全的，因为用户将知道一个 URL 是否链接到一个有效的主题。"
-    enforce_second_factor: "强制用户启用双重因素验证。选择“所有”以强制所有用户。算账“管理员”仅强制管理员用户。"
+    enforce_second_factor: "强制用户启用双重验证。选择“all”以强制所有用户启用。选择“staff”仅强制管理人员。"
     force_https: "强制使用 https。警告：开启前必须确认 HTTPS 已经配置并能够正常使用！你检查了 CDN、第三方登录和站外的 logo / 依赖是否支持 HTTPS 了吗？"
     same_site_cookies: "使用 Same-site cookies以消除所有跨站请求伪造（CSRF）的攻击面（Lax 或 Strict）。警告：Strict 仅在强制登录并使用 SSO 的站点有效。"
-    summary_score_threshold: "将一个帖子包含在'摘要模式'中所需的最小分值"
-    summary_posts_required: "在一个主题启用'摘要模式'的最小帖子数量"
-    summary_likes_required: "在一个主题启用'摘要模式'的最小赞的数量"
-    summary_percent_filter: "当用户点击摘要，显示前 % 几的帖子"
-    summary_max_results: "“概括主题”返回的最大帖子数量"
+    summary_score_threshold: "一个帖子被加入到“主题摘要”中所需的最小分值"
+    summary_posts_required: "一个主题启用“主题摘要”前最少需要有多少个回帖。修改此设置会影响过去一个星期。"
+    summary_likes_required: "主题启用“主题摘要”前最少需要收到多少个赞。修改此设置会影响过去一个星期。"
+    summary_percent_filter: "当用户点击摘要，显示前百分之几的帖子"
+    summary_max_results: "“主题摘要”所返回的最大帖子数量"
     enable_personal_messages: "允许信任等级1（可以另外选择发送私信的信任等级）的用户创建私信和回复私信。注意：管理人员不受限制。"
     enable_system_message_replies: "即使禁用了个人消息，也允许用户回复系统消息"
     enable_long_polling: "启用 Message bus 使通知功能可以使用长轮询（long polling）"
-    long_polling_base_url: "长轮询的基本 URL（当用 CDN 分发动态能让时，请设置此至原始拉取地址）例如：http://origin.site.com"
+    long_polling_base_url: "用于长轮询的基本 URL（当使用 CDN 分发动态内容时，确保将此设为源站地址）例如：http://origin.site.com"
     long_polling_interval: "当没有数据向客户端发送时服务器端应等待的时间（仅对已登录用户有效）"
     polling_interval: "当不再长轮询时，已登录的客户端多久应该轮询一次，以毫秒为单位"
     anon_polling_interval: "匿名客户端轮询时间间隔（单位：毫秒）"
@@ -1352,7 +1358,7 @@ zh_CN:
     tl2_additional_likes_per_day_multiplier: "增加信任等级2（成员）的赞限制，可提供一个乘数与原始值相乘"
     tl3_additional_likes_per_day_multiplier: "增加信任等级3（常规）的每日赞限制，将此设置项与原始值相乘"
     tl4_additional_likes_per_day_multiplier: "增加信任等级4（资深）的赞限制，可提供一个乘数与原始值相乘"
-    num_users_to_silence_new_user: "如果新用户被不同用户标记了 num_spam_flags_to_silence_new_user 次垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
+    num_users_to_silence_new_user: "如果新用户被不同用户标记为垃圾信息num_spam_flags_to_silence_new_user 次，隐藏他们的所有帖子并禁止发言。设置为 0 禁用。"
     num_tl3_flags_to_silence_new_user: "如果新用户被 num_tl3_users_to_silence_new_user 个信任等级3的用户标记垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
     num_tl3_users_to_silence_new_user: "如果新用户被不同信任等级3的用户标记 num_tl3_flags_to_silence_new_use 为标记垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
     notify_mods_when_user_silenced: "如果用户被自动禁言了，发私信给所有版主。"
@@ -1364,7 +1370,8 @@ zh_CN:
     markdown_typographer_quotation_marks: "双引号和单引号替换对的列表"
     post_undo_action_window_mins: "允许用户在帖子上进行撤销操作（赞、标记等）所需等待的间隔分钟数"
     must_approve_users: "新注册用户必须获得职员批准方能访问"
-    approve_suspect_users: "工作人员必须批准所有可疑账户"
+    invite_code: "用户必须输入此代码才能够进行账户注册，留空则无需输入（大小写敏感）"
+    approve_suspect_users: "添加可疑用户到审核队列。可疑用户填写了简介或网站但是没有浏览行为。"
     pending_users_reminder_delay: "如果新用户等待批准时间超过此小时设置则通知版主。设置 -1 关闭通知。"
     maximum_session_age: "用户自访问后可维持登录 n 小时"
     ga_universal_tracking_code: "Google Universal Analytics（analytics.js）跟踪代码ID，例如：UA-12345678-9; 请参阅<a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1383,21 +1390,21 @@ zh_CN:
     slow_down_crawler_user_agents: "Web爬虫的用户代理，应使用Crawl-delay指令在robots.txt中进行速率限制"
     slow_down_crawler_rate: "如果指定了slow_down_crawler_user_agents，则此速率将适用于所有抓取工具（请求之间的延迟秒数）"
     content_security_policy: "启用内容安全策略"
-    content_security_policy_report_only: "只启用内容安全报告策略"
-    content_security_policy_collect_reports: "在/csp_reports上启用内容安全策略违规报告收集"
-    content_security_policy_script_src: "其它脚本来源白名单。默认包含当前主机和CDN。<a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>使用内容安全策略缓解XSS攻击</a>"
-    invalidate_inactive_admin_email_after_days: "在此天数内未访问过网站的管理员帐户需要在登录前重新验证邮件地址。设置为0禁用。"
+    content_security_policy_report_only: "只启用内容安全策略报告"
+    content_security_policy_collect_reports: "在/csp_reports上启用内容安全策略违规报告集"
+    content_security_policy_script_src: "附加的脚本来源白名单。默认包含当前主机和CDN。<a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>使用内容安全策略缓解XSS攻击</a>"
+    invalidate_inactive_admin_email_after_days: "在此天数内未访问过网站的管理员账户需要在登录前重新验证邮件地址。设置为0禁用。"
     top_menu: "确定在主页导航条包含哪些条目，以及排列顺序。例如：latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "确定在帖子菜单条包含哪些条目，以及排列顺序。例如：like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "帖子菜单中默认隐藏的按钮，点击省略号后显示。"
     share_links: "决定分享对话框中出现的按钮及显示顺序。"
-    site_contact_username: "论坛给用户自动发送私信时使用的用户名；如果留空将使用默认的系统账户。"
-    site_contact_group_name: "被邀请到所有自动消息的有效群组名称。"
+    site_contact_username: "发送自动消息时所使用的有效的管理人员用户名。如果留空将使用默认的系统账户。"
+    site_contact_group_name: "会被邀请到所有自动私信的有效群组名。"
     send_welcome_message: "给所有用户发送快速开始指导的私信"
     send_tl1_welcome_message: "向新的信任级别1用户发送欢迎消息。"
-    suppress_reply_directly_below: "当一个帖子只有一个回复时，不显示帖子回复数量。"
-    suppress_reply_directly_above: "当一个帖子只有一个回复时，不显示回复到该贴的回复。"
-    remove_full_quote: "自动删除直接回复的引用。"
+    suppress_reply_directly_below: "当只有一个回复直接位于该帖下方时，不显示可展开的回复计数。"
+    suppress_reply_directly_above: "当直接回复上一个帖子时，不要在回复上显示展开的标记。"
+    remove_full_quote: "自动删除直接回复的完整引用。"
     suppress_reply_when_quoting: "当帖子引用回复时，不显示可展开的回复到某贴的标记。"
     max_reply_history: "扩展回复至时显示的最大回复数量"
     topics_per_period_in_top_summary: "在一个主题底部显示的默认推荐主题的数量。"
@@ -1413,6 +1420,7 @@ zh_CN:
     allow_index_in_robots_txt: "在robots.txt中指定允许网络搜索引擎建立该网站的索引。在特殊情况下，你可以永久<a href='%{base_path}/admin/customize/robots'>覆盖robots.txt</a> 。"
     email_domains_blacklist: "用管道符“|”分隔的邮箱域名黑名单列表，其中的域名将不能用来注册账户，例如：mailinator.com|trashmail.net"
     email_domains_whitelist: "用管道符“|”分隔的电子邮箱域名的列表，用户必须使用这些邮箱域名注册。警告：用户使用不包含在这个列表里的邮箱域名，将无法成功注册。"
+    auto_approve_email_domains: "使用来自此域名列表中所提供的邮箱的用户会被自动批准。"
     hide_email_address_taken: "通过邮件地址注册账户或忘记密码时不反馈用户账户是否存在的信息。"
     log_out_strict: "退出时，退出用户所有设备的会话"
     version_checks: "Ping Discourse Hub以获取版本更新并在<a href='%{base_path}/admin' target='_blank'>/admin</a>仪表板上显示新版本消息"
@@ -1445,7 +1453,7 @@ zh_CN:
     sso_overrides_card_background: "从SSO有效负载覆盖用户卡背景与外部站点头像。"
     sso_not_approved_url: "重定向未受许可的单点登录账户至这个 URL"
     sso_allows_all_return_paths: "不限制 SSO 提供的 return_paths 中的域名（默认情况下返回地址必须位于当前站点）"
-    enable_local_logins: "启用本地用户名和密码登录帐户。必须启用此选项才能使邀请生效。警告：如果禁用，如果之前未配置至少一种备用登录方法，则可能无法登录。"
+    enable_local_logins: "启用基于本地用户名和密码登录的账户。必须启用此选项才能使邀请生效。警告：如果禁用，且之前未配置至少一种备用登录方法，则可能无法登录。"
     enable_local_logins_via_email: "允许用户请求通过电子邮件将一键登录链接发送给他们。"
     allow_new_registrations: "允许新用户注册。取消选择将阻止任何人创建一个新账户。"
     enable_signup_cta: "显示推荐创建账户的提示给那些回访的未注册用户。"
@@ -1454,7 +1462,7 @@ zh_CN:
     google_oauth2_client_secret: "Google 应用的 Client secret"
     google_oauth2_prompt: "可选的以空格分隔的字符串值列表，指定授权服务器是否提示用户进行重新认证和同意。请参阅<a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'> https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a >为可能的值。"
     google_oauth2_hd: "登录将受限的可选Google Apps Hosted域。请参阅<a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd- param</a>了解更多详情。"
-    enable_twitter_logins: "启用Twitter身份验证，需要twitter_consumer_key和twitter_consumer_secret。请参阅<a href='https://meta.discourse.org/t/13395'target='_blank'>为话语配置Twitter登录（和丰富的嵌入）</a>。"
+    enable_twitter_logins: "启用Twitter身份验证，需要twitter_consumer_key和twitter_consumer_secret。请参阅<a href='https://meta.discourse.org/t/13395'target='_blank'>为Discourse配置Twitter登录（和丰富的嵌入内容）</a>。"
     twitter_consumer_key: "Twitter身份验证的消费者Key，在<a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>上注册"
     twitter_consumer_secret: "Twitter身份验证的客户secret，在<a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>上注册"
     enable_instagram_logins: "启用 Instagram 验证，需要 instagram_consumer_key 和 instagram_consumer_secret"
@@ -1470,7 +1478,6 @@ zh_CN:
     discord_client_id: 'Discord 客户端 ID（需要申请一个？请访问 <a href="https://discordapp.com/developers/applications/me">Discord 开发者门户</a>)'
     discord_secret: "Discord Secret Key"
     discord_trusted_guilds: '只允许这些 Discord  公会的成员通过 Discord 登录。使用公会的数字 ID。更多有关信息，请查看<a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">这里</a>的说明。留空则允许任意公会。'
-    readonly_mode_during_backup: "备份时启用只读模式"
     enable_backups: "允许管理员创建论坛备份"
     allow_restore: "允许导入数据，这将能替换所有全站数据！除非你计划导入数据，否则请保持设置为 false"
     maximum_backups: "磁盘保存的最大备份数量。老的备份将自动删除"
@@ -1485,7 +1492,7 @@ zh_CN:
     backup_with_uploads: "在备份日程中包括上传。关闭此项仅备份数据库。"
     backup_location: "存储备份的位置。重要信息：S3需要在文件设置中输入有效的S3凭据。"
     backup_gzip_compression_level_for_uploads: "用于压缩上传的Gzip压缩级别"
-    include_thumbnails_in_backups: "备份中包含略缩图。禁用会减小备份的体积，但是恢复备份后需要rabake所有帖子。"
+    include_thumbnails_in_backups: "备份中包含略缩图。禁用后会使备份文件更小，但是恢复备份后需要rabake所有帖子。"
     active_user_rate_limit_secs: "更新“上次访问”数据的间隔，单位为秒"
     verbose_localization: "在界面上显示详细的本地化提示"
     previous_visit_timeout_hours: "系统判断一次访问之后多少小时后为“上一次”访问"
@@ -1515,11 +1522,11 @@ zh_CN:
     categories_topics: "要在 /categories 页面中显示的主题数量。如果设置为0，它将自动尝试寻找一个值来保持两列对称（分类和主题）。"
     suggested_topics: "在一个主题底部显示的推荐主题的数量。"
     limit_suggested_to_category: "只在当前分类的推荐帖子列表中显示帖子。"
-    suggested_topics_max_days_old: "推荐主题创建时间不能大于 n 天。"
+    suggested_topics_max_days_old: "推荐主题的创建时间不能超过 n 天。"
     suggested_topics_unread_max_days_old: "推荐的未读主题创建时间不能大于 n 天。"
     clean_up_uploads: "移除孤立的已上传资料。警告：你可能想要在启用这个设定前备份一下 /uploads 目录。"
     clean_orphan_uploads_grace_period_hours: "删除孤立上传资料的宽限期（单位：小时）"
-    purge_deleted_uploads_grace_period_days: "彻底删除孤立上传资料的宽限期（单位：天）"
+    purge_deleted_uploads_grace_period_days: "彻底删除孤立的上传内容的宽限期（单位：天）"
     purge_unactivated_users_grace_period_days: "删除未激活用户账户的宽限期（单位：天）。设置为 0 将永不清除未激活用户。"
     enable_s3_uploads: "上传至 Amazon S3 存储的地址。重要：需要有效的 S3 验证资料（包括 access key id & secret access key）。"
     s3_use_iam_profile: '使用<a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2实例配置文件</a>授予对S3的访问权限。注意：启用此功能需要Discourse在配置得当的EC2实例中运行，并覆盖“s3访问密钥ID”和“s3 secret访问密钥”设置。'
@@ -1536,13 +1543,13 @@ zh_CN:
     selectable_avatars: "用户可以选择的头像列表。"
     allow_all_attachments_for_group_messages: "允许群组私信中包含任何邮件附件。"
     png_to_jpg_quality: "转换 JPG 文件的质量（1 是最低，99 最高，100 禁用）。"
-    allow_staff_to_upload_any_file_in_pm: "允许管理人员在私信中上传任何文件。"
+    allow_staff_to_upload_any_file_in_pm: "允许管理人员在私信中上传任意文件。"
     strip_image_metadata: "剥离图像元数据。"
     min_ratio_to_crop: "用于裁剪高图像的比率。输入宽/高值。"
     simultaneous_uploads: "可以在编辑器中拖放的最大文件数"
     enable_flash_video_onebox: "在 Onebox 启用嵌入 swf 和 flv 链接（Adobe Flash）。警告：可能增加安全风险。"
-    default_invitee_trust_level: "受邀用户的缺省信任等级（0-4）。"
-    default_trust_level: "所有新用户的缺省信任等级（0-4）。警告！改变此项将提高广告泛滥的风险。"
+    default_invitee_trust_level: "受邀用户的默认信任等级（0-4）。"
+    default_trust_level: "所有新用户的默认信任等级（0-4）。警告！改变此项将使你面临广告泛滥的风险。"
     tl1_requires_topics_entered: "新用户升级到信任等级1所需要进入的主题数量。"
     tl1_requires_read_posts: "新用户升级到信任等级1所需要阅读的帖子数量。"
     tl1_requires_time_spent_mins: "新用户升级到信任等级1所需要阅读帖子耗费的分钟数。"
@@ -1562,7 +1569,7 @@ zh_CN:
     tl3_requires_posts_read_cap: "要升到信任等级3所需要的，在最近考察时间段内所需查看的帖子数上限，与百分比计算后取最小。"
     tl3_requires_topics_viewed_all_time: "用户升至信任等级3所需查看的最小主题数量。"
     tl3_requires_posts_read_all_time: "用户升至信任等级3所需查看的最小帖子数量。"
-    tl3_requires_max_flagged: "要升到信任等级3所需要的，在最近考察时间段内，用户不得被x个不同用户标记x篇帖子的x值。（设置为0或更高）"
+    tl3_requires_max_flagged: "要提升到信任等级3，用户在考察时间段内不得被x个不同用户标记超过x个帖子，x为此设置的值。（设置为0或更高）"
     tl3_promotion_min_duration: "信任等级3的用户可被降级至信任等级2前最小持续天数。"
     tl3_requires_likes_given: "要升到信任等级3所需要的，在最近考察时间段内用户必须要给出的赞（设置为 0 或更高）"
     tl3_requires_likes_received: "要升到信任等级3所需要的，在最近考察时间段内用户必须要收到的赞（设置为 0 或更高）"
@@ -1614,7 +1621,7 @@ zh_CN:
     topic_views_heat_low: "多少次浏览后，该视图将稍稍高亮。"
     topic_views_heat_medium: "多少次浏览后，该视图将明显高亮。"
     topic_views_heat_high: "多少次浏览后，该视图将强烈高亮。"
-    cold_age_days_low: "在讨论开始多少天后，最后活跃日期将轻微暗淡。"
+    cold_age_days_low: "在讨论开始多少天后，最后活跃日期将稍微变暗。"
     cold_age_days_medium: "在讨论开始多少天后，最后活跃日期将明显暗淡。"
     cold_age_days_high: "在讨论开始多少天后，最后活跃日期将显著暗淡。"
     history_hours_low: "帖子在编辑后编辑指示器轻微高亮的小时数"
@@ -1627,12 +1634,12 @@ zh_CN:
     tos_url: "如果你的服务条款文档在外部，那么请在此填写其完整 URL 地址。"
     privacy_policy_url: "如果你的隐私政策文档在外部，那么请在此填写其完整 URL 地址。"
     log_anonymizer_details: "匿名后是否将用户的详细信息保留在日志中。在遵守GDPR时，你需要关闭它。"
-    newuser_spam_host_threshold: "新用户能添加至指向同一主机的链接的 newuser_spam_host_threshold 次数。超过阈值后将用户视为垃圾投递者。"
-    white_listed_spam_host_domains: "广告主机白名单域名列表。新用户可以任意链接至这些域名。"
+    newuser_spam_host_threshold: "被判定为垃圾前，新用户能发表指向同一主机的链接的次数。"
+    white_listed_spam_host_domains: "垃圾域名白名单列表。新用户发帖不会限制这些域名的链接"
     staff_like_weight: "管理人员赞时的额外权重。"
     topic_view_duration_hours: "按照每 IP/用户每 N 小时来记录一次新的主题访问"
     user_profile_view_duration_hours: "按照每 IP/用户每 N 小时来记录用户资料访问数"
-    levenshtein_distance_spammer_emails: "当匹配广告邮件时，模糊匹配判断差异的字符数。"
+    levenshtein_distance_spammer_emails: "匹配到垃圾邮件发送者时，仍将允许字符数差异的模糊匹配。"
     max_new_accounts_per_registration_ip: "如果已经有了从这个 IP 创建的(n)个信任等级0的账户（并且没有一个是管理人员或者是信任等级2以上的用户），不再允许来自该 IP 地址的注册请求。"
     min_ban_entries_for_roll_up: "当点击折叠按钮时，且至少 (N) 条记录时，将会创建一个子网封禁记录"
     max_age_unmatched_emails: "在 (N) 天后删除不匹配的已屏蔽的邮件地址。"
@@ -1640,7 +1647,7 @@ zh_CN:
     num_flaggers_to_close_topic: "要自动终止一个主题的讨论并介入时所需的最小数量的独立标记者"
     num_hours_to_close_topic: "暂停主题以介入处理的小时数"
     auto_respond_to_flag_actions: "当处理标记时启用自动回复。"
-    min_first_post_typing_time: "用户发表第一帖时打字的最小时间（以毫秒计），如果没有达到该阈值，帖子将自动进入需要批准队列。设置为 0 禁用（不推荐）"
+    min_first_post_typing_time: "用户发表第一帖时打字所需的最短时间（以毫秒计），如果没有达到该阈值，帖子将自动进入等待批准队列。设置为 0 禁用（不推荐）"
     auto_silence_fast_typers_on_first_post: "自动禁言未达到 min_first_post_typing_time 的用户"
     auto_silence_fast_typers_max_trust_level: "自动禁言输入快速的用户的适用信任等级"
     auto_silence_first_post_regex: "检查用户首贴的大小写不相关的正则表达式。如匹配，用户将被禁言并送至审核队列。例子：raging|a[bc]a 将匹配 raging、aba 或者 aca，因此禁言该用户。只对首贴有效。"
@@ -1654,27 +1661,27 @@ zh_CN:
     alternative_reply_by_email_addresses: "通过邮件回复的回复地址模板，例如：%%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "传入电子邮件使用HTML而不是文本。"
     strip_incoming_email_lines: "移除入站邮件每行的首尾空格"
-    disable_emails: "防止Discourse发送任何类型的电子邮件。 选择“是”以禁用所有用户的电子邮件。选择“非管理人员”仅为非管理用户禁用电子邮件。"
+    disable_emails: "阻止Discourse发送任何类型的电子邮件。 选择“yes”为所有用户禁用邮件。选择“non-staff”仅为非管理人员用户禁用邮件。"
     strip_images_from_short_emails: "忽略邮件中小于 2800 字节的图片"
-    short_email_length: "短邮件地址长度（以比特作为单位）"
-    display_name_on_email_from: "在邮件的来自栏显示昵称"
+    short_email_length: "缩短后的邮件长度（Bytes）"
+    display_name_on_email_from: "在邮件的来源中显示全名"
     unsubscribe_via_email: "允许用户在发送的邮件“退订”来退订邮件订阅，“退订”可在主题或正文中。"
-    unsubscribe_via_email_footer: "在发出的邮件底部包含退订链接"
+    unsubscribe_via_email_footer: "在发出的邮件底部附上退订链接"
     delete_email_logs_after_days: "在（N）天后删除邮件日志。设置为 0 无限期保留"
     disallow_reply_by_email_after_days: "在（N）天后拒绝通过电子邮件回复。0无限期保留"
-    max_emails_per_day_per_user: "每日发送给用户的最大帖子数量。设置为 0 禁止限制"
+    max_emails_per_day_per_user: "每日发送给用户的邮件数量上限。设置为 0 则不限制"
     enable_staged_users: "处理进站邮件时自动创建暂存用户。"
     maximum_staged_users_per_email: "处理进站邮件时可创建的最大暂存用户量。"
     auto_generated_whitelist: "不会被检查是否是自动生成内容的邮件地址列表。例如：foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "阻止被检测为自动生成的进站邮件。"
-    ignore_by_title: "使用正则表达式根据标题忽略进站邮件。"
-    mailgun_api_key: "用以验证 webhook 私信的 Mailgun 密钥 API。"
-    soft_bounce_score: "当碰到临时拒信时，增加用户的累计退信分值。"
-    hard_bounce_score: "当碰到永久拒信时，增加用户的累计退信分值。"
-    bounce_score_threshold: "停止发送邮件给用户的累计退信分值。"
+    ignore_by_title: "根据标题忽略进站邮件。"
+    mailgun_api_key: "用于验证 webhook 消息的 Mailgun Secret API 密钥。"
+    soft_bounce_score: "发生临时拒信时用户被附加的退信分值。"
+    hard_bounce_score: "发生永久拒信时用户被附加的退信分值。"
+    bounce_score_threshold: "停止发送邮件给用户前的最大退信分值。"
     reset_bounce_score_after_days: "自动在 X 天后重置累计退信分值。"
-    attachment_content_type_blacklist: "基于 content type 禁止附件的黑名单列表。"
-    attachment_filename_blacklist: "基于文件名禁止附件的黑名单列表。"
+    attachment_content_type_blacklist: "基于附件content type的黑名单关键词列表"
+    attachment_filename_blacklist: "基于附件名称的黑名单关键词列表。"
     forwarded_emails_behaviour: "如何处理转发给Discourse的电子邮件"
     always_show_trimmed_content: "总是显示进站邮件中被截断的部分。警告：可能显示某些邮件地址。"
     private_email: "不要在邮件标题和主体中包含帖子或主题的内容。注意：会一并关闭摘要邮件。"
@@ -1684,28 +1691,29 @@ zh_CN:
     raw_rejected_email_max_length: "应该被保存的被拒收的入站邮件字符数量。"
     delete_rejected_email_after_days: "删除（n）天之前被拒收的邮件。"
     manual_polling_enabled: "用 API 推送邮件回复。"
-    pop3_polling_enabled: "轮询 POP3 收取邮件回复。"
+    pop3_polling_enabled: "通过 POP3 轮询收取邮件回复。"
     pop3_polling_ssl: "连接至 POP3 服务器时使用 SSL。（推荐）"
     pop3_polling_openssl_verify: "验证服务器的 TLS 证书（默认：启用）"
-    pop3_polling_period_mins: "查询用于邮件的 POP3 账户的间隔（以分钟计）。注意：需要重新启动。"
-    pop3_polling_port: "POP3 轮询账户端口。"
-    pop3_polling_host: "需用 POP3 向该地址轮询电子邮件的主机。"
-    pop3_polling_username: "轮询 POP3 账户所用的用户名。"
-    pop3_polling_password: "轮询 POP3 账户所用的密码。"
+    pop3_polling_period_mins: "POP3 邮件账户的轮询间隔（以分钟计）。注意：需要重启。"
+    pop3_polling_port: "用于 POP3 轮询账户的端口。"
+    pop3_polling_host: "被 POP3 轮询邮件的主机。"
+    pop3_polling_username: "用于 POP3 轮询邮件的用户名。"
+    pop3_polling_password: "用于 POP3 轮询账户的密码。"
     pop3_polling_delete_from_server: "从服务器删除电子邮件。注意：如果禁用此功能，则应手动清理邮件收件箱"
     log_mail_processing_failures: "将所有电子邮件处理失败记录到<a href='%{base_path}/logs'target='_blank'> /logs</a>"
     email_in: '允许用户通过邮件发表新主题（需要手动或 pop3 轮询）。在每一个分类的“设置”标签页配置地址。'
     email_in_min_trust: "能通过邮件发表新主题的最低用户信任等级。"
     email_in_authserv_id: "对收到的电子邮件进行身份验证检查服务的标识符。参见 <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> 了解如何配置它。"
-    email_in_spam_header: "检测垃圾邮件的标题。"
-    email_prefix: "邮件主题中使用的 [标签]。留空将缺省使用 'title'。"
+    email_in_spam_header: "用于检测垃圾邮件的标头。"
+    email_prefix: "邮件标题中使用的 [标签]。留空将默认使用 'title'。"
     email_site_title: "邮件发送人站点标题。如果没有设置，默认为“title”。如果标题包含了任何不允许的字符，使用这个设置。"
     find_related_post_with_key: "只能使用 'reply key' 来查找已回复的帖子。警告：禁用此功能将允许用户基于电子邮件地址进行模拟。"
     minimum_topics_similar: "在编写新主题时，需要有多少相似主题存在？"
     relative_date_duration: "发表多少天内将显示相对时间（7天）而非绝对时间（2月20日）。"
     delete_user_max_post_age: "不允许删除第一个帖子发表于(x)天前的用户。"
     delete_all_posts_max: "通过删除所有帖子按钮可以删除的最大帖子数量。如果用户有比这更多的帖子，这些帖子不能一次性删除并且这个用户不能被删除。"
-    username_change_period: "帐户注册后可以更改其用户名的最大天数（0表示不允许修改）。"
+    delete_user_self_max_post_count: "用户可以自助删除账户时，最多可拥有的帖子数量。设为 -1 禁用自助删除账户。"
+    username_change_period: "账户注册后可以更改其用户名的最大天数（0表示不允许修改）。"
     email_editable: "允许用户在注册后改变他们的邮箱地址。"
     logout_redirect: "注销后将浏览器重定向到（例如：https://example.com/logout）"
     allow_uploaded_avatars: "允许用户上传自定义个人头像。"
@@ -1713,75 +1721,78 @@ zh_CN:
     allow_animated_thumbnails: "为动画 gif 生成动态缩略图。"
     default_avatars: "在用户更改头像前的默认头像 URL"
     automatically_download_gravatars: "为注册或更改邮箱的用户下载 Gravatar 头像。"
-    digest_topics: "邮件摘要中显示的流行主题的最大数目。"
-    digest_posts: "邮件摘要中显示的最流行帖子的数量。"
-    digest_other_topics: "邮件摘要中“你关注的主题和分类中的新内容”栏目显示的主题数目上限。"
+    digest_topics: "邮件摘要中显示热门主题的最大数量。"
+    digest_posts: "邮件摘要中所显示的热门帖子的数量。"
+    digest_other_topics: "邮件摘要中“你所关注的主题和分类中的新内容”这一部分的最大主题数量。"
     digest_min_excerpt_length: "邮件摘要中显示的帖子摘要字符数下限。"
     suppress_digest_email_after_days: "停止给(n)天未登录网站的用户发送摘要邮件。"
-    digest_suppress_categories: "不在摘要邮件中显示这些分类的内容。"
+    digest_suppress_categories: "从摘要邮件中排除这些分类的内容。"
     disable_digest_emails: "禁用所有用户摘要邮件功能。"
     apply_custom_styles_to_digest: "自定义邮件模板和css被应用到摘要邮件。"
     email_accent_bg_color: "HTML 邮件中用于背景的强调颜色。输入色彩名字（“red”）或十六进制值（“#0000FF”）。"
     email_accent_fg_color: "HTML 邮件中背景使用的字体颜色。输入色彩名（“white”）或十六进制值（“#FFFFFF”）。"
     email_link_color: "HTML 邮件中的链接颜色。输入色彩名字（“blue”）或十六进制值（“#0000FF”）。"
     detect_custom_avatars: "检测用户是否上传了自定义个人头像。"
-    max_daily_gravatar_crawls: "一天内 Discourse 将自动检查 gravatar 自定义头像的次数"
-    public_user_custom_fields: "能被API获取的自定义字段列表。"
-    staff_user_custom_fields: "能被管理员使用API获取的自定义字段列表。"
+    max_daily_gravatar_crawls: "在一天中 Discourse 自动检查 Gravatar 自定义头像的最大次数"
+    public_user_custom_fields: "能被API获取的用户自定义字段列表。"
+    staff_user_custom_fields: "能被管理员使用API获取的用户自定义字段列表。"
     enable_user_directory: "提供可供浏览的用户目录"
     enable_group_directory: "提供可供浏览的群组目录"
     enable_category_group_review: "允许群组审核指定分类的内容"
     group_in_subject: "在邮件标题中设置%%{optional_pm}，取决于PM中第一个组的名称，请参阅：<a href ='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target ='_blank'>自定义标准邮件的标题格式</a>"
     allow_anonymous_posting: "允许用户切换至匿名模式"
-    anonymous_posting_min_trust_level: "启用匿名发帖所需的最小信任等级"
-    anonymous_account_duration_minutes: "为了匿名性，为每个用户每 N 分钟创建一个匿名账户。例如：如果设置为 600，只要发帖后 600 分钟到了，并且用户切换至了匿名模式，就会创建一个新的匿名账户。"
-    hide_user_profiles_from_public: "不对来访用户显示用户信息卡、用户资料和用户目录。"
-    allow_featured_topic_on_user_profiles: "允许用户在其用户卡片和个人资料上显示指向主题的链接。"
+    anonymous_posting_min_trust_level: "启用匿名发帖所需的最低信任等级"
+    anonymous_account_duration_minutes: "为了匿名性，每 N 分钟为各个用户创建一个新的匿名账户。例如：如果设置为 600，只要自最后发帖起过去 600 分钟，并且用户切换至匿名模式，就会创建一个新的匿名账户。"
+    hide_user_profiles_from_public: "为匿名用户禁用用户信息卡、用户资料和用户目录。"
+    allow_featured_topic_on_user_profiles: "允许用户在其用户卡片和个人资料上宣传主题的链接。"
     show_inactive_accounts: "允许已登录用户查看不活跃账户。"
     hide_suspension_reasons: "不在用户页面公开显示封禁原因。"
-    log_personal_messages_views: "管理员为其他用户/组记录个人消息查看数。"
+    log_personal_messages_views: "管理员记录其他用户或群组的私信查看数。"
     ignored_users_count_message_threshold: "当一个用户被很多用户忽视时通知版主。"
     ignored_users_message_gap_days: "当一个用户被很多用户忽视时再次通知版主要等待多久。"
     clean_up_inactive_users_after_days: "非活跃用户（信任等级0且没有任何帖子）被删除前等待的天数。设为0则关闭清理。"
+    clean_up_unused_staged_users_after_days: "删除未使用过的暂存用户（无任何帖子）之前等待的天数。设为0则关闭清理。"
     user_selected_primary_groups: "允许用户设置其主要群组"
-    max_notifications_per_user: "每个用户的最大通知数量，如超出，旧的通知将被删除。每周执行一次。设为0以关闭。"
-    user_website_domains_whitelist: "用户网站要属于这些域名中。用 | 分割。"
+    max_notifications_per_user: "每个用户最大的通知数量，如超出，旧的通知将被删除。每周都会执行。设为0以关闭。"
+    user_website_domains_whitelist: "用户的网站需要在这些域名之中。用 | 分割的列表。"
     allow_profile_backgrounds: "允许用户上传个人资料背景图片。"
-    sequential_replies_threshold: "在被提醒回复了太多连续的回复前，用户在主题中可以连续回复的帖子的数量。"
-    get_a_room_threshold: "用户在同主题内回复多次而不被警告的通知。"
+    sequential_replies_threshold: "在被提醒过多连续的回复前，用户在主题中可以连续回复的帖子数量。"
+    get_a_room_threshold: "用户被警告前，可在同一个主题下向同一个人回帖的数量。"
     enable_mobile_theme: "为移动设备启用移动友好的主题，但也能切换回完整站点。如果你想要使用自定义的响应式主题请禁用它。"
-    dominating_topic_minimum_percent: "用户在主题中的帖子占到多少百分比时使得用户主导话题。"
+    dominating_topic_minimum_percent: "被提醒过度干预一个主题前，单个用户发帖可占整个主题的百分比。"
     disable_avatar_education_message: "禁用更改头像操作的教育私信。"
-    suppress_uncategorized_badge: "不要为主题列表中的未分类主题显示徽章。"
+    suppress_uncategorized_badge: "主题列表中的未分类主题不要显示徽章。"
     header_dropdown_category_count: "标题下拉菜单可显示多少分类。"
-    permalink_normalizations: "在匹配永久链接之前应用如下正则表达式，例如：/(topic.*)\\?.*/\\1 将去掉所有主题路径的参数字符串。格式为使用正则表达式+使用 \\1 等字符串来访问捕获内容"
-    global_notice: "为所有访客显示紧急的，不可取消的全局横幅通知，修改为空以隐藏（可使用HTML）。"
-    disable_system_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统编辑提醒。"
-    notification_consolidation_threshold: "在将通知合并为一个通知之前收到的“喜欢”或“会员资格”请求通知的数量。设置为 0 禁用此操作。"
-    likes_notification_consolidation_window_mins: "持续时间（以分钟为单位），赞同通知在达到此阈值前会被合并到单个通知中。阈值可以通过 `SiteSetting.notification_consolidation_threshold` 进行配置。"
+    permalink_normalizations: "在匹配永久链接之前应用如下正则表达式，例如：/(topic.*)\\?.*/\\1 将去掉所有主题路径的查询字符串。格式为使用正则表达式+使用 \\1 等字符串来访问捕获内容"
+    global_notice: "为所有访客显示紧急的、重要的和不可忽略的全局横幅公告，修改为空以隐藏（可使用HTML）。"
+    disable_system_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统用户的编辑提醒。"
+    notification_consolidation_threshold: "将多个通知合并为单个之前，收到“赞”或“成员申请”通知的最大数量。设置为 0 禁用合并。"
+    likes_notification_consolidation_window_mins: "以分钟计的持续时间，被点赞的通知在达到此阈值前会被合并到单个通知中。阈值可以通过 `SiteSetting.notification_consolidation_threshold` 进行配置。"
     automatically_unpin_topics: "当用户到达底部时自动解除主题置顶。"
-    read_time_word_count: "一分钟阅读的词的数量，用于估计阅读时间。"
-    topic_page_title_includes_category: "主题页面<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>标题标签</a>包含分类名。"
-    native_app_install_banner_ios: "在iOS设备上为普通用户（信任等级1及以上）显示DiscourseHub app横幅。"
-    native_app_install_banner_android: "在Android设备上为普通用户（信任等级1及以上）显示DiscourseHub app横幅。"
-    app_association_android: "<a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> json 终端的内容，用于谷歌的数字资产链接 API。"
-    app_association_ios: "<a href='%{base_path}/apple-app-site-association'>apple-app-site-association endpoint</a> 的内容，用于在该站点和 iOS 应用程序之间创建通用链接。"
+    read_time_word_count: "每分钟可阅读的字数，用于估算阅读时间。"
+    topic_page_title_includes_category: "主题页面<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>标题标签</a>包含分类名称。"
+    native_app_install_banner_ios: "在iOS设备上为普通用户（信任等级1及以上）显示 DiscourseHub 应用的横幅。"
+    native_app_install_banner_android: "在Android设备上为普通用户（信任等级1及以上）显示 DiscourseHub 应用的横幅。"
+    app_association_android: "端点 <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> 的内容，用于谷歌的数字资产链接 API。"
+    app_association_ios: "端点<a href='%{base_path}/apple-app-site-association'>apple-app-site-association </a> 的内容，用于在创建该站点和 iOS 应用程序之间通用链接。"
     share_anonymized_statistics: "分享匿名化的使用数据。"
     auto_handle_queued_age: "此设定天数后自动处理待审核的记录。标记将被忽略。队列中的帖子及用户将被拒绝。设为 0 将禁用此功能。"
-    svg_icon_subset: "添加你希望包含在资产中的其他FontAwesome 5图标。使用前缀'fa-'表示实心图标，'far-'表示常规图标，'fab-'表示品牌图标。"
+    svg_icon_subset: "添加你希望包含在资产中的其它FontAwesome 5图标。使用前缀'fa-'表示实心图标，'far-'表示常规图标，'fab-'表示品牌图标。"
     max_prints_per_hour_per_user: "/print 页面的每小时最大展示量（设置为 0 禁用）"
     full_name_required: "全名是用户个人信息的必填项。"
-    enable_names: "在用户的个人信息、用户卡片和邮件中显示全名。禁用将在所有地方隐藏全名。"
+    enable_names: "在用户的个人信息、用户卡片和邮件中显示全名。禁用以在所有地方隐藏全名。"
     display_name_on_posts: "在用户的帖子中显示他们的全名以及他们的 @username。"
-    show_time_gap_days: "如果两个帖子发表间隔多天，在主题中显示时间间隔提示。"
-    short_progress_text_threshold: "在主题中的帖子数超过这个设定后，进度条将只显示当前的帖子数。如果你更改了进度条的宽度，你需要修改这个值。"
-    default_code_lang: "默认语法高亮语言，使用 GitHub 代码块（lang-auto、ruby、python或者其他等等。）"
-    warn_reviving_old_topic_age: "当有人开始回复最后一贴超过一定天数前的主题时，将有一个警告显示，不鼓励他们复活一个老的讨论。将其设置为 0 以禁用。"
-    autohighlight_all_code: "即使未显式设定语言，仍为所有预编排代码块应用语法高亮。"
+    show_time_gap_days: "如果两个帖子发表相隔多天，在主题中显示时间间隔。"
+    short_progress_text_threshold: "在主题中的帖子数超过这个数量后，进度条将只显示当前的帖子数量。如果你更改了进度条的宽度，你需要修改这个值。"
+    default_code_lang: "默认的编程语言语法高亮应用 GitHub 代码块（lang-auto、ruby、python等。）"
+    warn_reviving_old_topic_age: "当有人开始回复一个最后回复于设定天数之前的主题时，将显示一个警告。将其设置为 0 以禁用。"
+    autohighlight_all_code: "即使未显式声明语言，仍为所有预格式化代码块应用语法高亮。"
     highlighted_languages: "包含语法突出显示规则。（警告：包含太多语言可能会影响性能）请参阅：<a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a>用于演示"
     embed_any_origin: "允许嵌入任意来源的内容。这对于带有静态 HTML 的移动应用程序是必需的。"
     embed_topics_list: "主题列表支持HTML嵌入"
+    embed_set_canonical_url: "为嵌入到主题的嵌入内容设置规范URL。"
     embed_truncate: "截断嵌入的帖子。"
+    embed_unlisted: "直到一个用户回复前，导入的主题不会被列出。"
     embed_support_markdown: "为嵌入式帖子支持Markdown格式。"
     embed_whitelist_selector: "以逗号分隔允许嵌入的CSS元素列表"
     allowed_href_schemes: "除了 http 和 https 外允许的链接协议。"
@@ -1789,13 +1800,13 @@ zh_CN:
     embed_username_required: "创建主题需要用户名。"
     notify_about_flags_after: "如果在这么多小时后仍有标记未处理，请向版主发送个人信息。设置为0以禁用。"
     show_create_topics_notice: "如果站点只有少于 5 篇的公开帖子时，显示一条请管理员创建帖子的提示。"
-    delete_drafts_older_than_n_days: "删除超过 n 天得草稿。"
+    delete_drafts_older_than_n_days: "删除超过 n 天的草稿。"
     bootstrap_mode_min_users: "禁用摘要模式的用户数下限（0 为禁用）。"
     prevent_anons_from_downloading_files: "禁止匿名用户下载附件。警告：这将禁止他们访问任何发表在帖子中的非图片资源。"
-    secure_media: '限制对媒体上传（图像、视频、音频）的访问。如果启用了“需要登录”，那么只有已登录用户才能访问上传的媒体内容。否则，只能对私人消息中的媒体上传进行限制。注意：在启用此设置之前，必须先启用 S3 上传。'
+    secure_media: '限制所有上传文件（图像、视频、音频、文本、可移植文档格式（pdf）、压缩文件等）的访问。如启用“login required”，那么只有已登录的用户才可以访问上传的文件。否则只对私信和私有分类中的媒体上传进行限制。注意：此设置很复杂且需要深入的管理认识。更详细的内容参阅<a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">官方论坛中的媒体安全话题</a>。'
     slug_generation_method: "选择一个链接生成方式。“encoded”将生成以百分号编码的链接。“none”将禁用自定义链接，只生成默认链接。"
     enable_emoji: "启用绘文字（emoji）"
-    enable_emoji_shortcuts: "常见的笑脸文字如:)：p :(将转换为表情符号"
+    enable_emoji_shortcuts: "常见的笑脸文字如 :) :p :( 将被转换为绘文字"
     emoji_set: "你喜欢哪一种 emoji？"
     emoji_autocomplete_min_chars: "触发自动填充表情符号弹出窗口所需的最少字符数"
     enable_inline_emoji_translation: "启用行内表情符号解析（之前没有任何空格或标点）"
@@ -1813,6 +1824,7 @@ zh_CN:
     new_user_notice_tl: "查看新用户发帖通知所需的最低信任级别。"
     returning_user_notice_tl: "查看回归用户发帖通知所需的最低信任级别。"
     returning_users_days: "在用户被认为回归之前应该经过多少天。"
+    enable_page_publishing: "允许工作人员以新的链接和自定义样式出版主题。"
     default_email_digest_frequency: "用户收到摘要邮件的默认频率。"
     default_include_tl0_in_digests: "在摘要邮件中默认包含新用户帖子。用户可以自行在参数设置中更改这个设置。"
     default_email_level: "设置常规主题的默认电子邮件通知级别。"
@@ -1822,8 +1834,8 @@ zh_CN:
     disable_mailing_list_mode: "禁止用户使用邮件列表模式。"
     default_email_previous_replies: "默认在邮件中包含之前的回复。"
     default_email_in_reply_to: "默认在邮件中包含回复的摘要文本。"
-    default_other_new_topic_duration_minutes: "近期主题条件的全局缺省设置"
-    default_other_auto_track_topics_after_msecs: "经过多少毫秒之后一个主题就被自动追踪的全局缺省设置"
+    default_other_new_topic_duration_minutes: "将主题视为新主题的全局默认条件"
+    default_other_auto_track_topics_after_msecs: "主题被自动设为跟踪的全局默认时间"
     default_other_notification_level_when_replying: "用户回复主题时的全局默认通知等级"
     default_other_external_links_in_new_tab: "默认在新的标签页打开外部链接"
     default_other_enable_quoting: "默认在高亮选择文字时启用引用回复"
@@ -1831,9 +1843,9 @@ zh_CN:
     default_other_dynamic_favicon: "默认在浏览器图标上显示新/更新的主题数量"
     default_other_like_notification_frequency: "默认通知用户赞的私信"
     default_topics_automatic_unpin: "默认时当用户到达底部时自动解除主题置顶。"
-    default_categories_watching: "分类列表默认跟踪。"
-    default_categories_tracking: "分类列表默认追踪。"
-    default_categories_muted: "分类列表默认不显示。"
+    default_categories_watching: "默认监看的分类列表。"
+    default_categories_tracking: "默认跟踪的分类列表。"
+    default_categories_muted: "默认静音的分类列表"
     default_categories_watching_first_post: "默认关注该分类中每个新主题的第一条贴子"
     mute_all_categories_by_default: "将所有分类的默认通知级别设置为静音。要求用户选择在“最新”和“分类”页面中出现的分类。如果您希望修改匿名用户的默认设置，请设置 'default_categories_'。"
     default_tags_watching: "默认监看的标签列表。"
@@ -1870,11 +1882,14 @@ zh_CN:
     company_name: "公司名"
     governing_law: "适用法律"
     city_for_disputes: "争议之城"
-    shared_drafts_category: "为主题草稿指定类别以启用共享草稿功能。此类别中的主题将从管理人员的主题列表中删除。"
+    shared_drafts_category: "为主题草稿指定分类以启用共享草稿功能。此类别中的主题将从管理人员的主题列表中删除。"
     push_notifications_prompt: "显示用户同意提示。"
     push_notifications_icon: "通知角中显示的徽章图标。尺寸必须为96px × 96px。"
     short_title: "短标题将用于用户主页、启动器或其他可能空间有限的地方。应该控制在12个字符内。"
     dashboard_general_tab_activity_metrics: "选择在常规选项卡中显示为活动指标的报告。"
+    gravatar_name: "Gravatar提供商的名称"
+    gravatar_base_url: "Gravatar提供商API的基础链接"
+    gravatar_login_url: "供用户登录到 Gravatar 服务，基于 gravatar_base_url 的相对链接"
     errors:
       invalid_email: "电子邮箱地址无效。"
       invalid_username: "没有这个用户名的用户。"
@@ -1962,13 +1977,18 @@ zh_CN:
     new_topic_moderator_post:
       other: "%{count} 个帖子被拆分到新主题：%{topic_link}"
     new_message_moderator_post:
-      other: "%{count} 个帖子被分拆到新私信：%{topic_link}"
+      other: "%{count} 个帖子被拆分到一个新的私信中：%{topic_link}"
     existing_topic_moderator_post:
       other: "%{count} 个帖子已被合并到了现有主题：%{topic_link}"
     existing_message_moderator_post:
-      other: "%{count}个帖子已被合并到一个现有的消息：%{topic_link}"
+      other: "%{count}个帖子已被合并到一个现存的私信中：%{topic_link}"
   change_owner:
     post_revision_text: "所有权转移"
+  publish_page:
+    slug_errors:
+      blank: "不能为空"
+      unavailable: "是不可用的"
+      invalid: "包含无效字符"
   topic_statuses:
     autoclosed_message_max_posts:
       other: "私信中回复已经达到上限 %{count}，自动锁定。"
@@ -2003,7 +2023,7 @@ zh_CN:
     auto_deleted_by_timer: "由计时器自动删除。"
   login:
     invalid_second_factor_method: "所选的双因素方法无效。"
-    not_enabled_second_factor_method: "你的帐户未启用所选的第二因素方法。"
+    not_enabled_second_factor_method: "你的帐户未启用所选的双重验证方式。"
     security_key_description: "当你准备好物理安全密钥后，请按下面的“使用安全密钥进行身份验证”按钮。"
     security_key_alternative: "尝试另一种方式"
     security_key_authenticate: "使用安全密钥进行身份验证"
@@ -2026,7 +2046,7 @@ zh_CN:
     not_available: "不可用，试试%{suggestion}？"
     something_already_taken: "出了一些问题，可能此用户名或电子邮箱已经被注册。试试 忘记密码链接吧。"
     omniauth_error:
-      generic: "抱歉，您的帐户授权时出错。请重试。"
+      generic: "抱歉，验证你的账户时出错。请重试。"
       csrf_detected: "授权超时，或者您已切换浏览器。请重试。"
       request_error: "授权时发生错误。请重试。"
       invalid_iat: "由于服务器时钟差异，无法验证授权令牌。请重试。"
@@ -2037,6 +2057,7 @@ zh_CN:
     new_registrations_disabled: "现在不允许注册新账户。"
     password_too_long: "密码不能超过 200 个字符。"
     email_too_long: "你输入的邮件太长了。邮箱名不得超过 254 字符，域名必须不超过 253 字符。"
+    wrong_invite_code: "你输入的邀请码不正确。"
     reserved_username: "该用户名不可被使用。"
     missing_user_field: "你还没有填写完所有用户字段"
     auth_complete: "验证已经完成。"
@@ -2048,6 +2069,8 @@ zh_CN:
     second_factor_backup_title: "两步验证备用码"
     invalid_second_factor_code: "验证码无效。每个代码只能使用一次。"
     invalid_security_key: "无效的安全密钥。"
+    missing_second_factor_name: "请提供一个名称。"
+    missing_second_factor_code: "请提供一个验证码"
     second_factor_toggle:
       totp: "请改用身份验证器应用或安全密钥"
       backup_code: "使用备份码"
@@ -2197,19 +2220,20 @@ zh_CN:
   admin_confirmation_mailer:
     title: "管理员确认"
     subject_template: "[%{site_name}] 确认新管理员账户"
-    text_body_template: "请确认你要添加**%{target_username}（%{target_email}）**作为你的论坛的管理员。 \n\n[确认管理员帐户](%{admin_confirm_url})\n"
+    text_body_template: "请确认你要添加**%{target_username}（%{target_email}）**作为你的论坛的管理员。 \n\n[确认管理员账户](%{admin_confirm_url})\n"
   test_mailer:
     title: "测试发件人"
     subject_template: "[%{email_prefix}] 邮件可达性测试"
     text_body_template: |
-      这是一封测试邮件
+      这是一封来自
 
       [**%{base_url}**][0]
 
+      的测试邮件
+
       发送电子邮件的过程很复杂。以下是你应首先检查的事情:
 
-      - Be *sure* to set the `notification email` from: address correctly in your site settings. **The domain specified in the "from" address of the emails you send is the domain your email will be validated against**.
-      - *请确保* 在你的网站设置中正确设置 `notification email` from: address。**你发送的电子邮件的“发件人”地址的域，将被用来验证你的电子邮件。**
+      - *请确保* 在你的网站设置中正确设置 `notification email` from: address。**你所发送的电子邮件的“发件人”地址的域名，将被用来验证你的电子邮件。**
 
       - 确保知道如何在邮件客户端查看邮件的原始来源，这样你就可以查看邮件标题中的重要线索。在 Gmail 中，它是每个邮件右上角下拉菜单中的 “show original” 选项。
 
@@ -2223,7 +2247,7 @@ zh_CN:
 
       - 我们强烈建议你 **发送测试电子邮件到 [mail-tester.com][mt]**，以验证上述所有工作都是正确的。
 
-      （*简单* 的方法是在 [SendGrid][sg]、[SparkPost][sp]、[Mailgun][mg] 或 [Mailjet][mj] 上创建一个帐户，这些网站有低成本的邮寄付费计划，适合小型社区。不过，你仍然需要在 DNS 中设置 SPF 和 DKIM 记录！）
+      （*简单* 的方法是在 [SendGrid][sg]、[SparkPost][sp]、[Mailgun][mg] 或 [Mailjet][mj] 上创建一个账户，这些网站有低成本的邮寄付费计划，适合小型社区。不过，你仍然需要在 DNS 中设置 SPF 和 DKIM 记录！）
 
       我们希望你成功收到这封测试邮件 OK!
 
@@ -2252,11 +2276,11 @@ zh_CN:
       您的版本：%{installed_version}
       新版本：**%{new_version}**
 
-      - 轻松使用我们的** [浏览器一键式升级](%{base_url}/admin/upgrade)**进行升级
+      - 轻松使用我们的**[浏览器一键式升级](%{base_url}/admin/upgrade)**进行升级
 
       - 查看[发行说明](https://meta.discourse.org/tag/release-notes)中的新功能或查看[原始GitHub更新日志](https://github.com/discourse/discourse/commits/master)
 
-      -访问[meta.discourse.org](https://meta.discourse.org)获取资讯、讨论以及对Discourse的支持
+      - 访问[meta.discourse.org](https://meta.discourse.org)获取资讯、讨论以及对Discourse的支持
   new_version_mailer_with_notes:
     title: "带注解的新版本发件人"
     subject_template: "[%{email_prefix}] 可以升级"
@@ -2266,13 +2290,13 @@ zh_CN:
       您的版本：%{installed_version}
       新版本：**%{new_version}**
 
-      - 轻松使用我们的**[浏览器一键式升级](%{base_url}/admin/ upgrade)*进行升级
+      - 轻松使用我们的**[浏览器一键式升级](%{base_url}/admin/ upgrade)**进行升级
 
       - 查看[发行说明](https://meta.discourse.org/tag/release-notes)中的新功能或查看[原始GitHub更新日志](https://github.com/discourse/discourse/commits/master)
 
-      -访问[meta.discourse.org](https://meta.discourse.org)获取资讯、讨论以及对Discourse的支持
+      - 访问[meta.discourse.org](https://meta.discourse.org)获取资讯、讨论以及对Discourse的支持
 
-      ###发布说明
+      ### 发布说明
 
       %{notes}
   flag_reasons:
@@ -2467,7 +2491,7 @@ zh_CN:
         %{logs}
         ```
     csv_export_succeeded:
-      title: "成功导致CSV格式"
+      title: "CSV导出成功"
       subject_template: "[%{export_title}]数据导出完成"
       text_body_template: |
         你的数据导出成功！:dvd:
@@ -2476,7 +2500,7 @@ zh_CN:
 
         上方的下载地址将在 48 小时后失效。
 
-        用户数据以 Zip 格式归档。若归档文件无法在你开启时自动解压，请使用此处推荐的工具：https://www.7-zip.org/
+        用户数据以 Zip 格式归档。若归档文件无法在你打开时自动解压，请使用此处推荐的工具：https://www.7-zip.org/
     csv_export_failed:
       title: "导致CSV失败"
       subject_template: "数据导出失败"
@@ -2557,9 +2581,9 @@ zh_CN:
       title: "Email被拒绝：不允许陌生人"
       subject_template: "[%{email_prefix}] 邮件问题 -- 无效访问"
       text_body_template: |
-        我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。
+        我们非常抱歉，但是你发送至%{destination}（标题为%{former_title}）无效。
 
-        邮件发至的分类只接受来自合法帐户且邮件地址已确认的用户的有邮件。如果你有异议，[联系管理人员](%{base_url}/about)。
+        邮件所发送的分类只接受来自拥有邮箱地址的有效账户的回复。如果你认为这是一个错误，[联系管理人员](%{base_url}/about)。
     email_reject_invalid_post:
       title: "邮件拒绝无效主题"
       subject_template: "[%{email_prefix}] 邮件问题 -- 发表错误"
@@ -2685,24 +2709,24 @@ zh_CN:
       ```
     ignored_users_summary:
       title: "忽视的用户超过了阈值"
-      subject_template: "一个用户被许多用户忽视"
+      subject_template: "一名用户被许多其他用户忽视"
       text_body_template: |
         您好，
 
-        这是 %{site_name} 告知您 @%{username} 已被 %{ignores_threshold} 名用户忽略的自动消息。这可能表示您的社区已开始产生问题。
+        这是 %{site_name} 告知你 @%{username} 已被 %{ignores_threshold} 名用户忽略的自动消息。这可能表示你的社区已开始产生问题。
 
-        您可能想查阅[此用户的近期发帖](%{base_url}/u/%{username}/summary)和[忽略及禁言汇报](%{base_url}/admin/reports/top_ignored_users)中的其他用户。
+        你可能想查阅[此用户的近期发帖](%{base_url}/u/%{username}/summary)和[忽略及禁言汇报](%{base_url}/admin/reports/top_ignored_users)中的其他用户。
 
-        若您需要额外帮助，请参见我们的[社区准则](%{base_url}/guidelines)。
+        若你需要额外帮助，请参见我们的[社区准则](%{base_url}/guidelines)。
     too_many_spam_flags:
       title: "太多垃圾标记"
-      subject_template: "新账户被暂时封禁"
+      subject_template: "新账户被搁置"
       text_body_template: |
         你好，
 
         这是%{site_name}通知你的帖子因被社区成员标记已被暂时隐藏的自动消息
 
-        作为预防措施，你的新帐户已被停用，并且在管理人员可以审核你的帐户之前无法创建回复或主题。我们对此深表抱歉。
+        作为预防措施，你的新账户已被停用，并且在管理人员审核你的账户前你无法创建回复或主题。我们对此深表抱歉。
 
         有关其他指导，请参阅我们的[社区指引](%{base_url}/guidelines)。
     too_many_tl3_flags:
@@ -2722,11 +2746,11 @@ zh_CN:
       text_body_template: |
         你好，
 
-        这是%{site_name}通知你的帐户因出于谨慎考虑被临时暂停使用的通知。
+        这是%{site_name}通知你的账户因出于谨慎考虑被临时暂停使用的通知。
 
-        请继续浏览，但在管理人员审核通过前，你的账户不能再发表新的回复或者主题。我们对此带来的不便表示歉意。
+        请继续浏览，但在[管理人员](%{base_url}/about)审核你最近的发帖前，你的账户不能再发表新的回复或者主题。我们对此带来的不便表示歉意。
 
-        要查看更多指引，请参考我们的[社区指引](%{base_url}/guidelines)。
+        要查看更多指引，请参阅我们的[社区指引](%{base_url}/guidelines)。
     user_automatically_silenced:
       title: "用户自动被禁用"
       subject_template: "新用户%{username}因社区标记被封禁"
@@ -2755,9 +2779,9 @@ zh_CN:
       text_body_template: |
         你好，
 
-        这是%{site_name}通知你的帐户在管理人员审核后不再受到限制的自动消息。
+        这是%{site_name}通知你的账户在管理人员审核后不再受到限制的自动消息。
 
-        你现在可以创建新回复和主题了。感谢你的耐心等待。
+        你现在又可以创建回复和主题了。感谢你的耐心等待。
     pending_users_reminder:
       title: "待审核用户提醒"
       subject_template:
@@ -2806,7 +2830,7 @@ zh_CN:
     你启用了邮件列表模式，所以收到了这些邮件。
 
     要退订这些邮件，[点击这里](%{unsubscribe_url})。
-  subject_re: "回复："
+  subject_re: "回："
   subject_pm: "[私信]"
   email_from: "%{user_name} 自 %{site_name}"
   user_notifications:
@@ -2992,7 +3016,7 @@ zh_CN:
 
         %{respond_instructions}
     user_watching_first_post:
-      title: "用户关注第一条帖子"
+      title: "用户监控新主题"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3052,17 +3076,17 @@ zh_CN:
       title: "双重验证已停用"
       subject_template: "[%{email_prefix}]双重验证已停用"
       text_body_template: |
-        你的帐户已在%{site_name}停用了双重身份验证。你现在只需使用密码登录；不再需要额外的身份验证代码
+        你在%{site_name}的账户已停用了双重验证。你现在只需使用密码便可以登录；不再需要额外的验证代码
 
-        如果你未选择禁用双因素身份验证，则有人可能入侵了你的帐户
+        如果你未选择禁用双重验证，则有可能有人入侵了你的账户
 
-        如果有任何疑问，[联系我们友好的工作人员](%{base_url}/about)。
+        如果有任何疑问，[联系我们友善的管理人员](%{base_url}/about)。
     digest:
       why: "在你上次于%{last_seen_at}访问后，%{site_link}的新内容摘要。"
       since_last_visit: "自从你上次访问"
       new_topics: "新主题"
-      unread_messages: "未读私信"
       unread_notifications: "未读通知"
+      unread_high_priority: "未读的高优先级通知"
       liked_received: "获得赞"
       new_users: "新用户"
       popular_topics: "热门主题"
@@ -3090,11 +3114,11 @@ zh_CN:
       title: "用链接登录"
       subject_template: "[%{email_prefix}]链接登录"
       text_body_template: |
-        这是你的登录链接[%{site_name}](%{base_url})
+        这是你用于登录[%{site_name}](%{base_url})的链接
 
-        如果你未请求此链接，可以放心地忽略此电子邮件。
+        如果你未请求过此链接，可以放心地忽略此电子邮件。
 
-        单击以下链接登录：
+        点击下方链接登录：
         %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "设置密码"
@@ -3110,7 +3134,7 @@ zh_CN:
       title: "管理员登录"
       subject_template: "[%{email_prefix}] 登录"
       text_body_template: |
-        有人要登录[%{site_name}](%{base_url})上的账户。
+        有人要登录你在[%{site_name}](%{base_url})上的账户。
 
         如果你没有发出此请求，则可以放心地忽略此电子邮件。
 
@@ -3151,7 +3175,7 @@ zh_CN:
         %{new_email}
     signup_after_approval:
       title: "在审批之后注册"
-      subject_template: "你已经被 %{site_name} 论坛批准加入了！"
+      subject_template: "你已经被 %{site_name} 批准加入了！"
       text_body_template: |
         欢迎来到%{site_name}！
 
@@ -3220,7 +3244,7 @@ zh_CN:
       你需要一个账户。请创建一个账户或者登录以继续。
     welcome_message_invite_only: |
       ##[欢迎来到%{title}](#welcome)
-      你需要一个账号。请从现有用户处获取一个邀请或者登录以继续。
+      你需要一个账号。请从现有用户处获取一个邀请或者登录。
   deleted: "已删除"
   image: "图片"
   upload:
@@ -3231,12 +3255,13 @@ zh_CN:
     file_missing: "抱歉，你必须选择一个文件上传。"
     empty: "抱歉，但是你提交的文件是空的。"
     png_to_jpg_conversion_failure_message: "从PNG转换为JPG时发生错误。"
+    optimize_failure_message: "优化上传的图像时出现错误。"
     attachments:
       too_large: "抱歉，你试图上传的文件太大了（最大限制为%{max_size_kb}%KB）。"
     images:
       too_large: "抱歉，你试图上传的图片太大了（最大限制为%{max_size_kb}%KB），请裁剪它并重试。"
       larger_than_x_megapixels: "对不起，你上传的图片太大(最大支持%{max_image_megapixels}像素)，请缩小图片然后再试一次。"
-      size_not_found: "抱歉，我们无法获取图片大小，请检查你的图片是否已损坏。"
+      size_not_found: "抱歉，我们无法获取图片大小。也许是你的图片损坏了？"
     placeholders:
       too_large: "(图片大小超过%{max_size_kb}KB)"
   avatar:
@@ -3251,7 +3276,7 @@ zh_CN:
     user_email_no_user: "不能找到ID为%{user_id}的用户"
     user_email_post_not_found: "不能找到ID为%{post_id}的帖子"
     user_email_anonymous_user: "用户匿名"
-    user_email_user_suspended_not_pm: "用户被封禁，这不是消息"
+    user_email_user_suspended_not_pm: "用户被封禁，这不是私信"
     user_email_seen_recently: "最近活跃用户"
     user_email_notification_already_read: "此邮件的通知已被阅读"
     user_email_notification_topic_nil: "post.topic为空"
@@ -3266,6 +3291,7 @@ zh_CN:
     sender_body_blank: "内容为空"
     sender_post_deleted: "帖子已被删除"
     sender_message_to_invalid: "收件人电子邮箱地址无效"
+    sender_topic_deleted: "主题已被删除"
   color_schemes:
     base_theme_name: "基础"
     light: "浅色"
@@ -3353,7 +3379,7 @@ zh_CN:
 
       * 文明。不要发表任何理智的人会认为冒犯的、过分的或招致怨恨的言论。
       * 拒绝色情。不要发表任何淫秽或性暗示的东西。
-      * 尊重每一个人。不要骚扰或者让别人难过，检视别人，或暴露他们的个人信息。
+      * 尊重每一个人。不要骚扰或者让别人难过，冒充别人，或暴露他们的个人信息。
       * 尊重我们的论坛。不要发表广告或者其他垃圾信息。
 
       这些条款不是法律条文，并且没有准确的定义 &mdash; 避免任何做关于他们的_可能擦边_的事。如果你不确定，问问自己的帖子是否能出现在纽约时报的头版头条上。
@@ -3406,7 +3432,7 @@ zh_CN:
        - [可接受的用途](#heading--可接受使用)
        - [内容标准](#heading--content-standards)
        - [执法](#heading--强制执行)
-       - [你的帐户](#heading--你的帐户)
+       - [你的账户](#heading--你的账户)
        - [你的内容](#heading--你的内容)
        - [你的责任](#heading--责任)
        - [免责声明](#heading--免责声明)
@@ -3440,7 +3466,7 @@ zh_CN:
 
       你可能不会使用论坛违法。
 
-      2.未经他们的特别许可，你不得在论坛上使用或尝试使用他人的帐户。
+      2.未经他们的特别许可，你不得在论坛上使用或尝试使用他人的账户。
 
       3.你不得在论坛上购买，出售或以其他方式交易用户名或其他唯一标识符。
 
@@ -3484,19 +3510,19 @@ zh_CN:
 
       公司保留以任何理由更改，编辑和删除论坛内容的权利。如果你认为有人违反这些条款向论坛提交了内容，请[立即与我们联系](#heading--contact)。
 
-      <h2 id =“heading--your-account”><a href="#heading--your-account">你的帐户</a></h2>
+      <h2 id =“heading--your-account”><a href="#heading--your-account">你的账户</a></h2>
 
-      你必须创建并登录帐户才能使用论坛的某些功能。
+      你必须创建并登录账户才能使用论坛的某些功能。
 
-      要创建帐户，你必须提供有关你自己的一些信息。如果你创建了一个帐户，则表示你同意至少提供有效的邮件地址，并使该地址保持最新状态。你可以随时通过邮件<%{contact_email}>关闭你的帐户。
+      要创建账户，你必须提供有关你自己的一些信息。如果你创建了一个账户，则表示你同意至少提供有效的邮件地址，并使该地址保持最新状态。你可以随时通过邮件<%{contact_email}>关闭你的账户。
 
-      你同意对使用你的帐户采取的所有操作负责，无论你是否授权，直到你关闭帐户或通知公司你的帐户已遭到入侵。如果你怀疑自己的帐户遭到入侵，则表示你同意立即通知公司。你同意为你的帐户选择安全密码，并保密。
+      你同意对使用你的账户账户采取的所有操作负责，无论你是否授权，直到你关闭账户或通知公司你的账户已遭到入侵。如果你怀疑自己的账户遭到入侵，则表示你同意立即通知公司。你同意为你的账户选择安全密码，并保密。
 
-      公司可以根据其处理与版权相关的删除请求的政策限制，暂停或关闭你在论坛上的帐户，或者如果公司合理地认为你违反了这些条款中的任何规则。
+      公司可以根据其处理与版权相关的删除请求的政策限制，暂停或关闭你在论坛上的账户，或者如果公司合理地认为你违反了这些条款中的任何规则。
 
       <h2 id =“heading--your-content”><a href="#heading--your-content">你的内容</a></h2>
 
-      这些条款中的任何内容均未赋予公司你与论坛共享的知识产权的所有权，例如你提交给论坛的帐户信息，帖子或其他内容。这些条款中的任何内容都不会赋予你对公司知识产权的任何所有权。
+      这些条款中的任何内容均未赋予公司你与论坛共享的知识产权的所有权，例如你提交给论坛的账户信息，帖子或其他内容。这些条款中的任何内容都不会赋予你对公司知识产权的任何所有权。
 
       在你和公司之间，你仍然对你提交给论坛的内容负全部责任。你同意不会错误地暗示你提交给论坛的内容是由公司赞助或批准的。根据这些条款，这些条款并不要求公司存储，维护或提供你提交的内容的副本，并对其进行更改。
 
@@ -3508,7 +3534,7 @@ zh_CN:
 
       <h2 id =“heading-responsibility”><a href="#heading--responsibility">你的责任</a></h2>
 
-      你同意赔偿公司因与你违反这些条款有关的其他人的法律索赔，或其他人在论坛上使用你的帐户违反这些条款。你和公司都同意尽快通知另一方你可能需要赔偿公司的任何法律索赔。如果公司未能及时通知你合法索赔，你将无需赔偿公司因你可能在及时通知后进行辩护或减轻的损失。你同意允许公司控制你必须赔偿公司的法律索赔的调查，辩护和解决，并与这些努力合作。未经你事先同意，公司同意不同意任何承认错误或对你施加义务的和解。
+      你同意赔偿公司因与你违反这些条款有关的其他人的法律索赔，或其他人在论坛上使用你的账户违反这些条款。你和公司都同意尽快通知另一方你可能需要赔偿公司的任何法律索赔。如果公司未能及时通知你合法索赔，你将无需赔偿公司因你可能在及时通知后进行辩护或减轻的损失。你同意允许公司控制你必须赔偿公司的法律索赔的调查，辩护和解决，并与这些努力合作。未经你事先同意，公司同意不同意任何承认错误或对你施加义务的和解。
 
       <h2 id =“heading--disclaimers”><a href="#heading--disclaimers">免责声明</a></h2>
 
@@ -3536,7 +3562,7 @@ zh_CN:
 
       <h2 id =“heading--dispute”><a href="#heading--disputes"> Disputes </a></h2>
 
-      %{govern_law}将管辖与这些条款或你对论坛的使用相关的任何争议。
+      %{governing_law} 将管辖与这些条款或你对论坛的使用相关的任何争议。
 
       你和公司同意仅在%{city_for_disputes}的州或联邦法院寻求与这些条款相关的禁令。你和公司都不会反对这些法院的管辖权，论坛或地点。
 
@@ -3558,13 +3584,13 @@ zh_CN:
 
       你可以根据这些条款通知公司，并通过<%{contact_email}>向公司发送问题。
 
-      公司可以使用你在论坛上为你的帐户提供的邮件地址，或通过向论坛的主页或你的帐户页面发布消息，根据这些条款通知你。
+      公司可以使用你在论坛上为你的账户提供的邮件地址，或通过向论坛的主页或你的账户页面发布消息，根据这些条款通知你。
 
       <h2 id =“heading--changes”><a href="#heading--changes">更改</a></h2>
 
-      该公司最后更新了这些条款于2018年7月12日，并可能再次更新这些条款。该公司将发布所有更新到论坛。对于包含重大更改的更新，如果你已创建帐户并提供有效的邮件地址，则公司同意通过邮件通知你。该公司还可以在论坛上通过特殊消息或警报宣布更新。
+      该公司最后更新了这些条款于2018年7月12日，并可能再次更新这些条款。该公司将发布所有更新到论坛。对于包含重大更改的更新，如果你已创建账户并提供有效的邮件地址，则公司同意通过邮件通知你。该公司还可以在论坛上通过特殊消息或警报宣布更新。
 
-      一旦你收到这些条款的更新通知，你必须同意新条款才能继续使用论坛。
+      一旦你收到这些条款的更新通知，你必须同%{governing_law}意新条款才能继续使用论坛。
   privacy_topic:
     title: "隐私政策"
     body: |
@@ -3815,7 +3841,7 @@ zh_CN:
         该徽章授予给 20 个不同的帖子都收到了至少 1 个赞的你。社区感谢你对讨论的贡献！
     respected:
       name: 尊敬
-      description: 有 100 个帖子都被赞了 2 次
+      description: 在100个帖子内收获2个赞
       long_description: |
         该徽章授予给 100 个不同的帖子都收到了至少 2 个赞的你。社区越来越尊重你在讨论中的贡献了。
     admired:
@@ -3914,7 +3940,7 @@ zh_CN:
     forbidden:
       invalid:
         other: "你选择的可以使用的标签为空"
-      in_this_category: '"%{tag_name}不能用于此类别"'
+      in_this_category: '"%{tag_name}不能用于此分类"'
       restricted_to:
         other: '“%{tag_name}”被限制在以下分类：%{category_names}'
       synonym: '不允许使用同义词。使用“ %{tag_name}”代替。'
@@ -3930,7 +3956,7 @@ zh_CN:
       button: "注册"
       title: "注册管理员账户"
       help: "注册新账户以开始"
-      no_emails: "遗憾的是，在设置过程中未定义管理员电子邮件，因此最终确定配置可能很困难。请在配置文件中添加开发人员电子邮件或<a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>从控制台创建管理员帐户</a>。"
+      no_emails: "遗憾的是，在设置过程中未定义管理员电子邮件，因此最终确定配置可能很困难。请在配置文件中添加开发人员电子邮件或<a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>从控制台创建管理员账户</a>。"
     confirm_email:
       title: "配置你的邮件"
       message: "<p>我们发送了一封激活邮件到<b>%{email}</b>。请安装电子邮件中的说明激活你的帐号。</p><p>如果没有收到，检查你的收件箱的垃圾箱或者<a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>确认你的电子邮件地址是正确的</a>。</p>"
@@ -3964,8 +3990,8 @@ zh_CN:
             label: "用一句简短的话描述你的社区"
             placeholder: "小明和他的朋友讨论酷东西的论坛"
           short_site_description:
-            label: "用几个字描述你的社区"
-            placeholder: "最佳社区"
+            label: "用几句话来描述你的社区"
+            placeholder: "有史以来最好的社区"
       introduction:
         title: "介绍"
         disabled: "<p>我们找不到任何标题为“%{topic_title}”的主题。</p> <ul> <li>如果你更改了标题，请修改该主题以修改你网站的介绍。</li> <li>如果你已删除此主题，请创建另一个主题为“%{topic_title}”作为标题。 第一篇文章的内容是你网站的介绍。</li> </ul>"
@@ -4046,7 +4072,7 @@ zh_CN:
             label: "大图标"
             description: "用于在现代设备上代表您的网站的图标图像，在较大尺寸的情况下表现出色。推荐尺寸大于512 × 512。我们默认会使用正方形的标志。"
       homepage:
-        description: "我们建议你在主页显示最后发点的主题，但你也可以选择在主页显示主题分类列表。"
+        description: "我们建议你在主页显示最新主题，但你喜欢的话也可以选择将分类（主题的分组）显示在主页。"
         title: "主页"
         fields:
           homepage_style:
@@ -4132,7 +4158,7 @@ zh_CN:
       invite_only: "所有新用户应该是被邀请的。参阅`invite_only`。"
       email_auth_res_enqueue: "此电子邮件未通过DMARC检查，很可能不是来自其所声称的来源。检查原始电子邮件的标头以获取更多信息。"
       email_spam: "该电子邮件被`email_in_spam_header`中定义的标头标记为垃圾邮件。"
-      suspect_user: "可疑列表中的用户必须经过工作人员的检查。参见`approve_suspect_users`。"
+      suspect_user: "这位新用户输入的个人资料信息但没有阅读任何主题或帖子，意味着他可能是垃圾发送者。参见`approve_suspect_users`。"
     actions:
       agree:
         title: "同意......"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 2221178662..89b6ffa521 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -55,7 +55,6 @@ zh_TW:
       no_multilevels_components: "含有兒童佈景主題的主題本身不能是兒童佈景主題"
     settings_errors:
       invalid_yaml: "提供的 YAML 無效"
-      data_type_not_a_number: "不支援 `%{name}` 類型設定。支援類型有：`integer`, `bool`, `list` 及`enum`"
       name_too_long: "此設定名稱過長，長度上限為 255"
       default_value_missing: "`%{name}` 設定沒有預設數值"
       default_not_match_type: "`%{name}` 設定的預設值類型與此設定類型不相符。"
@@ -281,6 +280,12 @@ zh_TW:
   edit_conflict: "那篇貼文已被另一位使用者編輯過，您更改的內容無法被儲存。"
   revert_version_same: "您試圖回復的版本和當前版本相同。"
   excerpt_image: "圖片"
+  bookmarks:
+    reminders:
+      later_today: "今日稍晚"
+      tomorrow: "明天"
+      next_week: "下週"
+      next_month: "下個月"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' 不是有效的信任層級。"
@@ -305,7 +310,6 @@ zh_TW:
       trust_level_4: "信任等級 4"
     request_membership_pm:
       title: "@%{group_name} 的群組會員要求"
-      handle: "處理會員申請"
   education:
     until_posts:
       other: "%{count} 篇貼文"
@@ -1123,7 +1127,6 @@ zh_TW:
   dashboard:
     rails_env_warning: "伺服器現在運行 %{env} 模式。"
     host_names_warning: "伺服器上 config/database.yml 的主機名稱為 localhost 。請更改成你的網站主機名稱。"
-    gc_warning: '伺服器正在使用的 Ruby 可能僅啟用了預設的 垃圾回收設定 （garbage collection），這個設定無法提供最佳效能。請瀏覽此效能設定的資訊：<a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Tuning Ruby and Rails for Discourse</a>。'
     sidekiq_warning: 'Sidekiq 未有執行。很多程序, 如發送電子郵件, 需要 sidekiq 非同步 (asynchronous) 執行的。請確保至少運行一個 sidekiq 程序。<a href="https://github.com/mperham/sidekiq">瞭解 Sidekiq</a>。'
     queue_size_warning: "隊列中有較多任務，為 %{queue_size} 個。這可能是因為 Sidekiq 進程的問題導致，或者需要更多的 Sidekiq 進程。"
     memory_warning: "伺服器記憶體少於 1GB，建議配置至少 1GB 記憶體"
@@ -1225,8 +1228,6 @@ zh_TW:
     force_https: "強制使用 https。警告：開啟前必須確認 HTTPS 已經配置並能夠正常使用！你檢查了 CDN、第三方登錄和站外的 logo / 依賴是否支持 HTTPS 了嗎？"
     same_site_cookies: "使用同一網站的Cookie，它們消除所有載體上支持的瀏覽器（LAX或嚴格模式）跨站請求偽造。警告：嚴格只會在強制登錄和使用SSO的網站執行。"
     summary_score_threshold: "將一個貼文包含在“概括主題”中所需的最少分數"
-    summary_posts_required: "如果使用了\"此話題的摘用\"，話題顯示時需滿足最小的貼文的數量"
-    summary_likes_required: "如果使用了\"此話題的摘用\"，話題顯示時需滿足最小得到\"讚\"的數量"
     summary_percent_filter: "當使用者點擊 \"此話題的摘要\"，顯示前面多少 % 的貼文"
     summary_max_results: "“概括主題”將顯示最大貼文數量"
     enable_personal_messages: "允許信任等級1（可以另外選擇發送消息的信任等級）的使用者建立訊息和回覆訊息。注意：管理人員不受限制。"
@@ -1350,7 +1351,6 @@ zh_TW:
     enable_github_logins: "開啟 Github 登入驗證，需要填寫 github_client_id 及 github_client_secret。參閱<a href='https://meta.discourse.org/t/13745' target='_blank'>設定 在Discourse Github 登入官方文件</a>\b"
     github_client_id: "Github 帳號驗證的使用者端帳號（Client id），到 <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/applications </a>來註冊取得 Client id"
     github_client_secret: "Github 帳號驗證的使用者端密碼（Client secret），到 <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers </a>來註冊取得 Client secret"
-    readonly_mode_during_backup: "備份時啟用只讀模式"
     enable_backups: "允許管理員建立備份"
     allow_restore: "允許還原資料，注意此動作可能覆蓋「所有」網站資料！除非你計畫還原備份檔，否則請保持此設定為 false"
     maximum_backups: "磁碟備份的最大數量，舊的將會自動刪除"
@@ -1806,6 +1806,10 @@ zh_TW:
       other: "%{count}則貼文被合併到一個已存在的訊息：%{topic_link}"
   change_owner:
     post_revision_text: "\b所有權已被轉讓"
+  publish_page:
+    slug_errors:
+      blank: "不能空白"
+      invalid: "包含無效字詞"
   topic_statuses:
     autoclosed_message_max_posts:
       other: "消息中回覆已經達到上限 %{count}，自動鎖定。"
@@ -2679,7 +2683,6 @@ zh_TW:
       why: "在你上一次於 %{last_seen_at} 訪問後，在 %{site_link} 上的摘要。"
       since_last_visit: "自你上次訪問至今"
       new_topics: "新主題"
-      unread_messages: "未讀私訊"
       unread_notifications: "未讀通知"
       liked_received: "獲得贊"
       new_users: "新使用者"
diff --git a/plugins/discourse-local-dates/config/locales/client.it.yml b/plugins/discourse-local-dates/config/locales/client.it.yml
index 3e15c0026f..2a0576a0c8 100644
--- a/plugins/discourse-local-dates/config/locales/client.it.yml
+++ b/plugins/discourse-local-dates/config/locales/client.it.yml
@@ -12,6 +12,8 @@ it:
         today: Oggi %{time}
         tomorrow: Domani %{time}
         yesterday: Ieri %{time}
+        countdown:
+          passed: la data è passata
       title: Inserisci data / ora
       create:
         form:
diff --git a/plugins/discourse-local-dates/config/locales/client.ru.yml b/plugins/discourse-local-dates/config/locales/client.ru.yml
index 529e03284a..8ae298da89 100644
--- a/plugins/discourse-local-dates/config/locales/client.ru.yml
+++ b/plugins/discourse-local-dates/config/locales/client.ru.yml
@@ -14,7 +14,7 @@ ru:
         yesterday: 'Вчера %{time} '
         countdown:
           passed: дата прошла
-      title: Введите дату / время
+      title: Дата / время
       create:
         form:
           insert: Вставить
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 90b2e33fec..7a245ba97e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -179,9 +179,6 @@ ar:
           يبدو انك لم تقم باقتباس اي شئ مني في ردك؟
 
           اختيار اي نص في المنشور سوف يظهر زر <kbd>**اقتبس**</kbd>, و الضغط علي زر **رد** عندما يكون النص محدد سوف يقتبس هذا الجزء ايضاً في الرد! هل يمكنك المحاولة مرة اخري؟
-      bookmark:
-        reply: |-
-          رائع! الان يمكنك الرجوع بسهولة لمحادثتنا في اي وقت من خلال [ تبويب العلامات المرجعية بملفك الشخصي ](%{profile_page_url}/activity/bookmarks). او بالقائمة المنبثقة من الضغط علي صورتك الشخصية &#8598;
       emoji:
         reply: |-
           هذا مثال علي :sparkles: _الرموز التعبيرية_ :sparkles:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.be.yml b/plugins/discourse-narrative-bot/config/locales/server.be.yml
index 0268de26e4..be61dd9b50 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.be.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.be.yml
@@ -150,8 +150,6 @@ be:
       bookmark:
         instructions: |-
           Калі вы хочаце даведацца больш, выберыце <IMG SRC = "% {base_uri}
-        reply: |-
-          Выдатна! Цяпер вы можаце лёгка знайсці свой шлях назад да нашай прыватнай гутарцы ў любы час, прама з [ўкладак закладак у профілі] (% {profile_page_url}
         not_found: |-
           Ой-ой, я не бачу ні адной закладкі ў гэтай тэме. Знайшоў закладку пад кожным паведамленнем? Выкарыстоўвайце паказаць яшчэ <IMG SRC = "% {base_uri}
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
index 57e1762b4f..61cce204f3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
@@ -184,8 +184,6 @@ bs_BA:
       bookmark:
         instructions: |-
           Ako želite da saznate više, izaberite <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> ispod i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> ** označi ovu osobnu poruku **. Ako to učinite, možda postoji: dar: u vašoj budućnosti!
-        reply: |-
-          Odlično! Sada možete lako pronaći put do našeg privatnog razgovora u bilo koje vrijeme, direktno iz [kartice oznaka u vašem profilu] (%{profile_page_url} / activity / bookmarks). Samo izaberite sliku u gornjem desnom uglu
         not_found: |-
           Uh oh, ne vidim oznake u ovoj temi. Da li ste pronašli oznaku ispod svakog posta? Koristite show više <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> da otkrije dodatne akcije ako je potrebno.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ca.yml b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
index c1b8bbfb91..914e221e11 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ca.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
@@ -227,8 +227,6 @@ ca:
       bookmark:
         instructions: |-
           Si voleu saber-ne més, seleccioneu <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> a sota i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marqueu com a preferit aquest missatge privat**. Si ho feu, potser tindreu un :gift: més avant!
-        reply: |-
-          Fantàstic! Ara podeu trobar fàcilment com tornar a la nostra conversa privada en qualsevol moment, exactament des de [la pestanya de favorits del vostre perfil](%{profile_page_url}/activity/bookmarks). Només heu de seleccionar la vostra imatge de perfil dalt a la dreta &#8599;
         not_found: |-
           Ui, no veig cap favorit marcat en aquest tema. ¿Heu trobat el marcador de favorits a sota de cada publicació? Utilitzeu "mostra'n més" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> per a mostrar accions addicionals si calen.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index 11c8a2417a..5f7ea53588 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -28,6 +28,12 @@ de:
     bio: "Hallo! Ich bin keine reale Person. Ich bin ein Bot, der dir etwas über diese Website beibringen kann. Schick mir eine Nachricht oder erwähne irgendwo **`@%{discobot_username}`**, um mit mir zu interagieren."
     tl2_promotion_message:
       subject_template: "Herzlichen Glückwunsch zur Beförderung ihrer Vertrauensstufe!"
+      text_body_template: |
+        Da du befördert worden bist, ist es an der Zeit etwas über die erweiterten Funktionen zu lernen!
+
+        Antworte auf diese Nachricht mit `@%{discobot_username} %{reset_trigger}` um herauszufinden, was du noch alles machen kannst.
+
+        Wir laden dich ein, dich weiter zu engagieren – wir freuen uns, dass du hier bist.
     timeout:
       message: |-
         Hallo @%{username}! Ich wollte mich nur wieder einmal melden, weil ich schon länger nichts von dir gehört habe.
@@ -120,6 +126,15 @@ de:
 
           `@%{discobot_username} %{reset_trigger} {Name-des-Tutorials}`
           > Startet ein interaktives Tutorial. `{Name-des-Tutorials}` kann eins von: `%{tracks}` sein.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          %{quote_sample}
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Du kannst dich darauf verlassen
       do_not_understand:
         first_response: |-
           Danke für die Antwort!
@@ -217,8 +232,6 @@ de:
       bookmark:
         instructions: |-
           Wenn du gerne mehr darüber erfahren möchtest, wähle unten <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> aus und klicke auf <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **Lesezeichen für diese Nachricht**. Wenn du das machst, wird es demnächst vielleicht ein :gift: geben!
-        reply: |-
-          Hervorragend! Jetzt kannst du jederzeit über [den Lesezeichen-Reiter in deinem Profil](%{profile_page_url}/activity/bookmarks) zu unserer Unterhaltung zurückkehren. Gehe dazu einfach auf dein Profilbild oben rechts &#8599;.
         not_found: |-
           Oh weh, ich sehe keine Lesezeichen in diesem Thema. Hast du das Lesezeichen unter jedme Beitrag gefunden? Verwende das „Mehr anzeigen“-Symbol <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">, um bei Bedarf weitere Aktionen anzuzeigen.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.el.yml b/plugins/discourse-narrative-bot/config/locales/server.el.yml
index 4fa5cb0d4c..a3b44717d0 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.el.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.el.yml
@@ -186,8 +186,6 @@ el:
 
           Επιλέγοντας ένα τμήμα από το κείμενο της ανάρτησής μου, εμφανίζεται το κουμπί <kbd>**Παράθεση**</kbd>. Επίσης πατώντας **Απάντηση** έχωντας πρώτα επιλέξει ένα τμήμα του κειμένου, είναι το ίδιο! Μπορείς να δοκιμάσεις ξανά;
       bookmark:
-        reply: |-
-          Καταπληκτικά! Τώρα μπορείς εύκολα να επιστρέψεις στην συνομιλία μας όποτε θελήσεις, απευθείας από [την καρτέλα σελιδοδεικτών του προφίλ σου](%{profile_page_url}/activity/bookmarks). Απλά κάνε κλικ στην εικόνα προφίλ σου στην πάνω δεξιά πλευρά &#8599;
         not_found: |-
           Ωχ, δεν βλέπω να έχουν προστεθεί σελιδοδείκτες σε αυτό το νήμα. Βλέπεις το κουμπί σελιδοδείκτη κάτω από κάθε ανάρτηση; Πάτα στο περισσότερα <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> για να εμφανιστούν οι επιπλέον λειτουργίες.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index da302a84fd..75451434cc 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -230,8 +230,6 @@ es:
       bookmark:
         instructions: |-
           Si quieres aprender más, selecciona debajo el botón <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> y <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **guarda en marcadores este mensaje personal**. Si lo haces, ¡puede haber un :gift: en tu futuro!
-        reply: |-
-          ¡Excelente! Ahora puedes encontrar fácilmente las conversaciones privadas en cualquier momento directamente desde la [sección de marcadores de tu perfil](%{profile_page_url}/activity/bookmarks). Sólo debes seleccionar tu foto de perfil en la parte superior derecha de la pantalla &#8599;
         not_found: |-
           Oh oh, no veo ningún marcador en este tema. ¿Encontraste el botón para guardar en marcadores que se encuentra debajo de cada mensaje? Usa el botón mostrar más <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para que aparezcan acciones adicionales si necesitas.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
index 7b49dd3f09..6e04b4ea1f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
@@ -197,8 +197,6 @@ fa_IR:
       bookmark:
         instructions: |-
           اگر دوست داری بیشتر یاد بگیری، <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> را انتخاب کن و <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **این پیام خصوصی را نشانک بزن**. اگر این کار را بکنی، شاید در آینده یک :gift: بگیری!
-        reply: |-
-          عالی! الان تو میتوانی راه برگشت به این پیغام خصوصی را هر زمان که دوست داشتی از [برگه‌ی نشانک‌ها در پروفایل کاربری](%{profile_page_url}/activity/bookmarks) پیدا کنی. فقط کافی است که روی عکس پروفایل خود در بالا سمت چپ انتخاب کنی &#8598;
         not_found: |-
           اوه، هیچ نشانکی در این موضوع نمیبینم. آیا آیکون نشانک را زیر هر نوشته پیدا کردی؟ در صورت لزوم از آیکون "بیشتر نشان بده" <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> برای آشکار کردن دیگر قابلیت ها استفاده کن.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 96b699b47d..20846f8be2 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -232,8 +232,6 @@ fi:
       bookmark:
         instructions: |-
           Jos haluat oppia lisää, valitse <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> tämän viestin alta ja <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **lisää tämä yksityisviestiketju kirjanmerkkeihisi**. Jos teet niin, sinua voi odottaa :gift: tulevaisuudessa!
-        reply: |-
-          Erinomaista! Löydät yksityiskeskustelumme nyt helposti koska vain [profiilisi kirjanmerkkivälilehdeltä](%{profile_page_url}/activity/bookmarks). Klikkaat vain profiilikuvaasi oikeassa yläkulmasssa &#8599;
         not_found: |-
           Tuota noin, et ole mielestäni kirjanmerkinnyt tämän ketjun viestejä. Löysithän kirjanmerkkikuvakkeen kunkin viestin alta? Voi olla, että sinun täytyy klikata <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">-kuvaketta, jotta näet sen ja muita toimintoja.
       emoji:
@@ -356,7 +354,7 @@ fi:
           Huomioi, että viestin voi palauttaa vain %{deletion_after} tunnin sisällä sen poistamisesta.
       category_hashtag:
         instructions: |-
-          Tiesitkö, että viesteissä voi viitata alueisiin ja tunnisteisiin? Esimerkiksi, oletko käynyt %{category}-alueella?
+          Tiesitkö, että viesteissä voi viitata alueisiin ja tunnisteisiin? Esimerkiksi, oletko käynyt %{category} -alueella?
 
           Näppäile lauseen keskellä `#` ja valitse mieleinen alue tai tunniste.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index f1a0ade848..822cd2e85f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -232,8 +232,6 @@ fr:
       bookmark:
         instructions: |-
           Si vous souhaitez en savoir plus, sélectionnez <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> en dessous et <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **ajouter ce message direct aux signets**. Si vous le faites, il pourrait y avoir un :gift: dans le futur !
-        reply: |-
-          Excellent ! Maintenant, vous pouvez facilement retrouver notre conversation privée à tout moment, à partir de [l'onglet marque page sur votre profil](%{profile_page_url}/activity/bookmarks). Sélectionnez juste votre photo de profil dans le coin en haut à droite &#8599;
         not_found: |-
           Uh oh, je ne vois aucun signet sur ce sujet ! Avez-vous trouvé le bouton signet sous chaque message ? Utilisez le bouton Afficher plus <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> pour dévoiler d'autres actions si nécessaire.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.he.yml b/plugins/discourse-narrative-bot/config/locales/server.he.yml
index 554c58418d..61c91465e4 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.he.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.he.yml
@@ -233,7 +233,7 @@ he:
         instructions: |-
           אם מעניין אותך לדעת עוד, יש לבחור ב־<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> להלן ולהוסיף<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **הודעה אישית זו לסימניות**. ביצוע המשימה בשלמותה עשוי לזכות אותך ב־:gift: עתידית!
         reply: |-
-          מעולה! מעכשיו דרכך חזרה אל השיחה שלנו תהיה קלה יותר בכל עת ותתאפשר ישירות מ[לשונית הסימניות בפרופיל שלך](%{profile_page_url}/activity/bookmarks). עליך פשוט לבחור בתמונת הפרופיל בפינה השמאלית העליונה &#8599;
+          מצוין! מעתה יתאפשר לך למצוא את דרכך חזרה אל הדיון בכל עת, הישר מתוך [לשונית הסימניות שבפרופיל שלך](%{bookmark_url}). עליך פשוט לבחור בתמונת הפרופיל שלך בפינה השמאלית העליונה&#8599;
         not_found: |-
           שוד ושבר, לא מצאתי סימניות בנושא זה. מצאת את הסימניות מתחת לכל פוסט? יש להשתמש בסמל להציג פעולות נוספות <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> כדי לחשוף אותן במקרה הצורך.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.hy.yml b/plugins/discourse-narrative-bot/config/locales/server.hy.yml
index 5e0aa6e867..b985bf9b28 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.hy.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.hy.yml
@@ -200,8 +200,6 @@ hy:
       bookmark:
         instructions: |-
           Եթե ցանկանում եք իմանալ ավելին, ընտրեք <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> ներքևում և <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **էջանշեք այս անձնական նամակը**. Եթե Դուք դա անեք, հնարավոր է Ձեզ համար :gift: լինի!
-        reply: |-
-          Գերազանց է! Այժմ Դուք հեշտությամբ կարող եք ցանկացած պահի գտնել վերադարձի ուղին դեպի մեր մասնավոր խոսակցություն, հենց [Ձեր պրոֆիլի էջանշանների ցանկից](%{profile_page_url}/activity/bookmarks): Ուղղակի ընտրեք Ձեր պրոֆիլի նկարը վերևի աջ մասում &#8599;
         not_found: |-
           Օհ, ես չեմ տեսնում որևէ էջանշում այս թեմայում: Դուք գտե՞լ եք յուրաքանչյուր գրառման տակ գտվնող էջանշումը: Եթե անհրաժեշտ է, օգտագործեք ցուցադրել ավելին <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> ՝ լրացուցիչ գործողությունները տեսնելու համար:
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.id.yml b/plugins/discourse-narrative-bot/config/locales/server.id.yml
index ddbf0ec42e..a0ca0963f8 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -181,9 +181,6 @@ id:
           Hmm, sepertinya Anda tidak mengutip salah satu kalimat saya di atas?
 
           Pilih teks apa saja di pos di atas untuk memunculkan tombol <kbd>**Quote**</kbd>. Lalu tekan tombol **Reply** setelah memilih teks apa saja. Bisakah tolong dicoba lagi?
-      bookmark:
-        reply: |-
-          Hebat! Kelak Anda dapat mudah menemukan percakapan pribadi kapan saja, langsung dari [the bookmarks tab on your profile](%{profile_page_url}/activity/bookmarks). Cukup pilih gambar profil Anda di pojok kanan atas &#8599;
       emoji:
         reply: |-
           Hebat :sparkles: _emojitastic!_ :sparkles:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index 5de4ed0d97..265b4e8aee 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -26,6 +26,14 @@ it:
         Questo distintivo è assegnato al completamento del tutorial interattivo per utenti avanzati. Hai imparato gli strumenti avanzati di discussione — e ora sei un diplomato!
   discourse_narrative_bot:
     bio: "Ciao, io non sono una persona reale. Sono un robot che ti può insegnare ad usare questo sito. Per interagire con me inviami un messaggio o menziona**`@%{discobot_username}`** ovunque."
+    tl2_promotion_message:
+      subject_template: "Congratulazioni per la promozione del tuo livello di esperienza!"
+      text_body_template: |
+        Ora che sei stato promosso, è tempo di conoscere alcune funzionalità avanzate!
+
+        Rispondi a questo messaggio con `@%{discobot_username} %{reset_trigger}` per scoprire di più su cosa puoi fare.
+
+        Continua a farti coinvolgere - ci piace averti in giro.
     timeout:
       message: |-
         Hey @%{username}, sto solo controllando perché è da un po' che non ti sento.
@@ -118,6 +126,15 @@ it:
 
           `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
           > Inizia un tutorial interattivo. `{name-of-tutorial}` può essere uno di: `%{tracks}`.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          %{quote_sample}
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Ci puoi contare
       do_not_understand:
         first_response: |-
           Hey, grazie per la risposta!
@@ -214,9 +231,9 @@ it:
           Selezionare un qualsiasi testo del mio messaggio farà apparire il pulsante <kbd>**Cita**</kbd>. E anche premere **Rispondi** con qualsiasi testo selezionato funzionerà! Puoi provare di nuovo?
       bookmark:
         instructions: |-
-          Se vuoi saperne di più, seleziona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">qui sotto e<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16">**inserisci questo messaggio privato nei segnalibri**. Se lo farai, ci potrebbe essere un :gift: per te!
-        reply: |-
-          Eccellente! Ora potrai tornare facilmente a questa conversazione privata in ogni momento, proprio dalla [scheda segnalibri sul tuo profilo](%{profile_page_url}/activity/bookmarks). Basta selezionare l'immagine del tuo profilo in alto a destra &#8599;
+          Se vuoi saperne di più, seleziona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> qui sotto e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **inserisci questo messaggio personale nei segnalibri**. Se lo farai, ci potrebbe essere un :gift: per te!
+        reply: |
+          Eccellente! Ora puoi facilmente tornare alla nostra conversazione privata in qualsiasi momento, direttamente dalla [scheda dei segnalibri sul tuo profilo](%{bookmark_url}). Basta selezionare la tua foto del profilo in alto a destra &#8599;
         not_found: |-
           Oh oh, non vedo nessun segnalibro in questo argomento. Hai trovato il pulsante "segnalibro" presente sotto i messaggi? Usa il pulsante "mostra altro" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> per rivelare altri pulsanti, se necessario.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index 4ca9ebed78..5983e258db 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -187,8 +187,6 @@ ko:
 
           내 포스트에서 아무 글이나 선택해도 <kbd>**인용하기**</kbd> 버튼이 뜰거야. 글을 선택하고 **답글쓰기** 를 눌러도 돼! 다시 한 번 해 볼래?
       bookmark:
-        reply: |-
-          대단해! 이제는 [프로필의 북마크 탭](%{profile_page_url}/activity/bookmarks)만 눌러도 우리의 개인적인 대화를 손쉽게 뒤돌아 볼 수 있어. 우측 상단에 있는 프로필 사진만 선택하면 돼. &#8599;
         not_found: |-
           어라, 이 토픽에는 북마크가 없는데? 포스트 별로 있는 북마크 버튼을 찾았니? 더 보기 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 를 눌러서 필요한 추가 기능이 있는지 살펴 봐.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
index 3b9a0544b6..c020e8b244 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -188,8 +188,6 @@ nb_NO:
       bookmark:
         instructions: |-
           Hvis du ønsker å lære mer, velg <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> under og <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bokmerke denne personlige meldingen**. Hvis du gjør dette, venter det kanskje en :gift: på deg i fremtiden!
-        reply: |-
-          Strålende! Nå kan du enkelt finne tilbake til den private samtalen vår på et senere tidspunkt, rett fra [listen over bokmerker i profilen din](%{profile_page_url}/activity/bookmarks). Bare klikk på profilbildet ditt øverst til høyre. &#8599;
         not_found: |-
           Øh, jeg ser ingen bokmerker noe sted i dette emnet. Fant du bokmerket under hvert innlegg? Bruk "vis mer" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> knappen for å vise flere handlinger ved behov.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
index c04a8c99ea..4a66730780 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -7,7 +7,7 @@
 
 pl_PL:
   site_settings:
-    discourse_narrative_bot_enabled: "Włącz bota Discourse Narrative"
+    discourse_narrative_bot_enabled: "Enable Discourse Narrative Bot (discobot)"
     disable_discourse_narrative_bot_welcome_post: "Dezaktywuj wpis powitalny Discourse Narrative Bot"
     discourse_narrative_bot_ignored_usernames: "Nazwy użytkownika, które bot Discourse Narrative powinien zignorować"
     discourse_narrative_bot_disable_public_replies: "Wyłącz publiczne odpowiedzi bota Discourse Narrative"
@@ -28,6 +28,8 @@ pl_PL:
     bio: "Witaj, nie jestem prawdziwą osobą. Jestem botem, który może nauczyć Cię korzystania z tej witryny. Aby skomunikować się ze mną, wyślij do mnie wiadomość lub oznacz **`@%{discobot_username}`** w dowolnym miejscu."
     tl2_promotion_message:
       subject_template: "Gratuluję zdobycia nowego poziomu zaufania!"
+      text_body_template: |
+        Po awansie nadszedł czas, aby dowiedzieć się o niektórych zaawansowanych funkcjach! Odpowiedz na tę wiadomość za pomocą „@ %{discobot_username} %{reset_trigger}”, aby dowiedzieć się więcej o tym, co możesz zrobić. Zapraszamy do dalszego angażowania się - cieszymy się, że jesteśmy w pobliżu.
     timeout:
       message: |-
         Witaj @%{username}, przypominam o sobie bo od dawna do mnie nie zaglądałeś.
@@ -228,7 +230,7 @@ pl_PL:
         instructions: |-
           Jeśli chcesz dowiedzieć się więcej, wybierz <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">poniżej i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **dodaj tę wiadomość prywatną do zakładek**. Jeśli to zrobisz, możesz otrzymać :gift: w przyszłości!
         reply: |-
-          Wspaniale! Teraz możesz w łatwy sposób, w każdym momencie przejść do konwersacji prywatnej, po prawej od [zakładki dodawania do zakładek w twoim profilu]%{profile_page_url}/activity/bookmarks). Wystarczy, że klikniesz na swoj zdjęcie profilowe po prawej u góry&#8599;
+          Doskonały! Teraz możesz łatwo znaleźć drogę do naszej prywatnej rozmowy w dowolnym momencie, bezpośrednio z [zakładki zakładek w swoim profilu] (%{bookmark_url}). Wystarczy wybrać zdjęcie profilowe w prawym górnym rogu ↗
         not_found: |-
           Ups, nie widzę żadnych zakładek w tym temacie. Czy widzisz przycisk zakładki pod każdym wpisem? Użyj przycisku „pokaż więcej” <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">, żeby wyświetlić więcej akcji, jeśli to potrzebne.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
index 9e5bcf9e64..d50817def5 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -232,8 +232,6 @@ pt_BR:
       bookmark:
         instructions: |-
           Se você quiser saber mais, selecione <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> abaixo e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marque esta mensagem pessoal como favorita**. Se você fizer isto, pode haver um :gift: no seu futuro!
-        reply: |-
-          Excelente! Agora você pode encontrar facilmente o caminho de volta à nossa conversa particular a qualquer momento, diretamente da [guia de favoritos no seu perfil](%{profile_page_url}/activity/bookmarks). É só selecionar sua foto de perfil no canto superior direito &#8599;
         not_found: |-
           Oh oh, não vejo nenhum favorito neste tópico. Você encontrou o marcador embaixo de cada postagem? Use o mostrar mais <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para revelar ações adicionais, se necessário.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 65354b9ba1..f5f68f7a2c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -232,8 +232,6 @@ ru:
       bookmark:
         instructions: |-
           Если вы хотите узнать больше, выберите <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> ниже и <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **добавьте это сообщение в закладки**. Если вы сделаете это, в скором времени вас ждет :gift:
-        reply: |-
-          Отлично! Теперь вы можете легко найти свой путь назад к нашей частной беседе любой момент, прямо с [закладок в профиле](%{profile_page_url}/activity/bookmarks). Просто выберите фотографию профиля в правом верхнем углу &#8599;
         not_found: |-
           Упс, я не вижу никаких закладок в этой теме. Вы нашли закладку под каждым постом? Воспользуйтесь опцией "показать еще" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> для просмотра дополнительных инструментов при необходимости.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sl.yml b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
index 4a88f9ba70..e4e61c705a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
@@ -215,8 +215,6 @@ sl:
       bookmark:
         instructions: |-
           Da se naučite kaj novega, kliknite <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> spodaj in <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **zaznamujte to zasebno sporočilo**. Če to storite se vam v prihodnje mogoče obeta :gift:!
-        reply: |-
-          Enkratno! Sedaj lahko kadarkoli najdete pot nazaj na najin zaseben pogovor, enostavno preko [Zaznamki zavihka v vašem profilu](%{profile_page_url}/activity/bookmarks). Samo izberite vašo profilno sliko zgoraj desno &#8599;
         not_found: |-
           Oh, ne vidim nobenega zaznamka v tej temi. Ali ste našli zaznamek pod vsakim prispevkom? Uporabite prikaži več <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> za prikaz ostalih akcij.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sv.yml b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
index f413e87346..06d136099c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sv.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
@@ -233,7 +233,7 @@ sv:
         instructions: |-
           Om du vill lära dig mer, välj <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> nedanför och <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bokmärk detta personliga meddelande**. Gör du det så väntar kanske en :gift: i framtiden!
         reply: |-
-          Utmärkt! Nu kan du enkelt hitta tillbaka till vår konversation när du vill, direkt från [fliken bokmärken under din profil](%{profile_page_url}/activity/bookmarks). Klicka bara på din profilbild uppe till höger. &#8599;
+          Utmärkt! Nu kan du enkelt hitta tillbaka till vår privata konversation när du vill, direkt från [fliken bokmärken under din profil](%{bookmark_url}). Klicka bara på din profilbild uppe till höger. &#8599;
         not_found: |-
           Ooops, jag ser inget bokmärke i detta ämne. Hittade du bokmärket under varje inlägg? Använd visa mer <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> för att synliggöra ytterligare funktioner vid behov.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sw.yml b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
index 3dc24a9c01..fef9262533 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sw.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
@@ -187,8 +187,6 @@ sw:
       bookmark:
         instructions: |-
           Kama ukipenda kujifunza zaidi, chagua <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">chini na <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **alamisha ujumbe huu binafsi**. Ukifanya hivyo, unaweza kupata :gift: baadae!
-        reply: |-
-          Vizuri! Sasa unaweza kurudi kwenye maongezi yetu binafsi mda wowote, kupitia [kichupo cha mialamisho kwenye umbo lako](%{profile_page_url}/activity/mialamisho). Chagua umbo lako iliyopo juu upande wa kulia &#8599;
         not_found: |-
           Nimeshindwa kuona mialamisho ya mada hii. Umeona alamisho yoyote kwenye kila chapisho? Tumia onyesha zaidi <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">kuona vitendo zaidi kama vinahitajika.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
index b8dcd760fd..f676323e7d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
@@ -222,8 +222,6 @@ tr_TR:
       bookmark:
         instructions: |-
           Daha fazla bilgi edinmek istiyorsanız aşağıdan seç<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> ve ** bu özel ileti yi yer im lerine ekle<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **. Bunu yaparsanız, gelecekte bir :gift: kazanabilirsiniz!
-        reply: |-
-          Mükemmel! Artık doğrudan [profilinizdeki yer işaretleri sekmesinden] (%{profile_page_url} / etkinlik / yer işaretleri) özel mesajlarımıza geri dönüş yolunuzu kolayca bulabilirsiniz. Sağ üstteki profil resminizi seçmeniz yeterlidir ↗
         not_found: |-
           Ah, bu konuda hiçbir yer işareti görmüyorum. Her gönderinin altındaki yer işaretlerini gördünüz mü? <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">Ek eylemleri ortaya çıkarmak için daha fazla göster seçeneğini kullanın.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ur.yml b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
index 9f439dec0b..9621a1c406 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
@@ -214,8 +214,6 @@ ur:
       bookmark:
         instructions: |-
           اگر آپ مزید جاننا چاہتے ہیں، تو ذیل میں <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> منتخب کریں اور <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **اِس ذاتی پیغام کو بُک مارک کریں**۔ اگر آپ ایسا کرتے ہیں، تو ہو سکتا ہے کہ آپ کے مستقبل میں ایک :gift: ہو!
-        reply: |-
-          بہترین! اَب آپ [اپنی پروفائل پر موجود بُک مارکس ٹَیب](%{profile_page_url}/activity/bookmarks) کے زریعے آسانی سے ہماری نجی بات چیت تک دوبارہ رسائی حاصل کر سکتے ہیں۔ صرف اوپری دائیں طرف پر اپنی پروفائل تصویر کو سَلَیکٹ کریں &#8599;
         not_found: |-
           اوہ، مجھے اس ٹاپک میں کوئی بک مارکس نظر نہیں آرہے۔ کیا آپ کو ہر پوسٹ کے نیچے بُک مارک ملا؟ اگر ضرورت ہو تو اضافی کارروائیوں کو ظاہر کرنے کیلئے مزید دکھایے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> کو استعمال کریں۔
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
index 33f0161b81..ceb416e9c3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -146,7 +146,7 @@ zh_CN:
 
           我只是个机器人，但是如果你想要找到真人，看看[我们的联系页面](%{base_path}/about)。
 
-          同时，我不会再烦你。
+          同时，我不会再烦你了。
     new_user_narrative:
       reset_trigger: "教程"
       title: "新用户教程完成证明"
@@ -156,11 +156,11 @@ zh_CN:
         message: |-
           感谢加入%{title}，欢迎！
 
-          -我只是一个机器人，但是我们[友好的管理员]可以提供真人帮助。
+          - 我只是一个机器人，但是我们[友好的管理员]可以提供真人帮助。
 
-          -出于安全考虑，我们暂时限制新用户能够使用的功能。当我们更了解你的时候，你就可以获得[新功能](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (还有 [徽章](%{base_uri}/badges))
+          - 出于安全考虑，我们暂时限制新用户能够使用的功能。当我们更了解你的时候，你就可以获得[新功能](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (还有 [徽章](%{base_uri}/badges))
 
-          -我们始终相信[社区文明守则](%{base_uri}/guidelines)。
+          - 我们始终信奉[社区文明守则](%{base_uri}/guidelines)。
       onebox:
         instructions: |-
           接下来，你能分享下列链接给我么？回复**单独一行的链接**，然后它会自动展开显示一个有用的摘要。
@@ -233,9 +233,9 @@ zh_CN:
         instructions: |-
           如果你想了解更多，请选择下方<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">并<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16">**收藏此私信**。如果你这样做，你一会可能收到份 :gift: ！
         reply: |-
-          太棒了！现在你可以轻松地找到我们的私信了。它就在[你个人页面的收藏栏](%{profile_page_url}/activity/bookmarks)中。选择右上方你的个人头像 &#8599;
+          太棒了！现在你可以在任何时候轻松地找到我们的私信，[你的个人页面收藏栏](%{bookmark_url})右边。只需点击你在右上方的个人头像 &#8599;
         not_found: |-
-          啊哦，我没有在这个主题中看到任何收藏。你在每个帖子下找到了收藏按钮吗？如果需要的话，使用显示更多<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">展开更多操作。
+          啊哦，我没有在此主题中看到有任何收藏。你看到每个帖子下方的收藏按钮了吗？如果需要的话，使用显示更多来<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">展开更多操作。
       emoji:
         instructions: |-
           你可能已经看到我在回复中用了很多小图片 :blue_car::dash: 这些叫做[绘文字（Emoji）](https://zh.wikipedia.org/wiki/%E7%B9%AA%E6%96%87%E5%AD%97)。你能在回复中**使用一个 Emoji **吗？这些都可以用：
@@ -272,7 +272,7 @@ zh_CN:
 
           > :imp: 我在这写了些脏话
 
-          我猜你知道要做什么了。点击**标记该贴**<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">为不合适！
+          我猜你知道要做什么了。**标记该贴**<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">为不恰当的发言！
         reply: |-
           [我们的管理人员](%{base_uri}/groups/staff)将私下通知你的标记。如果有足够的社区成员标记帖子，作为预防措施它也会自动隐藏。（因为我实际上并没有写一篇讨厌的帖子:angel:我现在已经取消了标记。）
         not_found: |-
@@ -371,11 +371,11 @@ zh_CN:
         instructions: |-
           每个主题都有通知等级。默认为“普通”，只有别人直接回复你的时候才会提醒你。
 
-          默认情况下，私信中的通知等级被设为最高级“监看”，即你将收到每个新回复的提醒。但是你可以覆盖任意一个主题的通知等级至“监看”、“追踪”或“静音”。
+          默认情况下，私信中的通知等级被设为最高级“监看”，即你将收到每个新回复的提醒。但是你可以改变任意一个主题的通知等级至“监看”、“追踪”或“静音”。
 
-          让我们试试改变这个主题的通知等级。在主题最下方，你可以看到一个**监看**的按钮。你可以把通知等级改到**追踪**吗？
+          让我们试试改变这个主题的通知等级。在主题最下方，你可以看到一个**监看**的按钮。你可以把通知等级改成**追踪**吗？
         not_found: |-
-          看起来你仍在关注 :eyes: 这个主题！没找到按钮？通知等级就在主题页面的最下方。
+          看起来你仍在关注 :eyes: 这个主题！不知道如何关注？通知等级按钮就在主题的下方。
         reply: |-
           太棒了！我希望你没有把这个话题静音，因为我有时会说话有点健谈:grin:。
 
diff --git a/plugins/poll/config/locales/client.ca.yml b/plugins/poll/config/locales/client.ca.yml
index 06baad49b1..72c1ce94bd 100644
--- a/plugins/poll/config/locales/client.ca.yml
+++ b/plugins/poll/config/locales/client.ca.yml
@@ -71,6 +71,7 @@ ca:
         title: Crea una enquesta
         insert: Insereix una enquesta
         help:
+          options_count: Introduïu almenys una opció
           invalid_values: El valor mínim ha de ser més petit que el valor màxim.
           min_step_value: L'increment mínim és 1
         poll_type:
diff --git a/plugins/poll/config/locales/client.de.yml b/plugins/poll/config/locales/client.de.yml
index ef717f1efd..772cd9732c 100644
--- a/plugins/poll/config/locales/client.de.yml
+++ b/plugins/poll/config/locales/client.de.yml
@@ -18,6 +18,8 @@ de:
       public:
         title: "Stimmen sind <strong>öffentlich</strong>."
       results:
+        groups:
+          title: "Du musst ein Mitglied von %{groups} sein, um an dieser Umfrage teilnehmen zu können."
         vote:
           title: "Ergebnisse werden <strong>nach Stimmabgabe</strong> angezeigt."
         closed:
@@ -68,6 +70,7 @@ de:
       error_while_toggling_status: "Entschuldige, beim Wechseln des Status dieser Umfrage ist ein Fehler aufgetreten."
       error_while_casting_votes: "Entschuldige, beim Abgeben deiner Stimme ist ein Fehler aufgetreten."
       error_while_fetching_voters: "Entschuldige, beim Anzeigen der Teilnehmer ist ein Fehler aufgetreten."
+      error_while_exporting_results: "Leider ist beim Exportieren der Umfrageergebnisse ein Fehler aufgetreten."
       ui_builder:
         title: Umfrage erstellen
         insert: Umfrage einfügen
@@ -86,6 +89,10 @@ de:
           vote: Nach Stimmabgabe
           closed: Nach Ende der Abstimmung
           staff: Nur Teammitglieder
+        poll_groups:
+          label: Zugelassene Gruppen
+        poll_chart_type:
+          label: Diagrammtyp
         poll_config:
           max: max.
           min: min.
diff --git a/plugins/poll/config/locales/client.it.yml b/plugins/poll/config/locales/client.it.yml
index 747c191518..042475014e 100644
--- a/plugins/poll/config/locales/client.it.yml
+++ b/plugins/poll/config/locales/client.it.yml
@@ -18,6 +18,8 @@ it:
       public:
         title: "I voti sono <strong>pubblici</strong>."
       results:
+        groups:
+          title: "Devi essere un membro di %{groups} per votare in questo sondaggio."
         vote:
           title: "I risultati saranno mostrati al momento del <strong>voto</strong>."
         closed:
@@ -44,7 +46,15 @@ it:
         label: "Mostra i risultati"
       hide-results:
         title: "Torna ai tuoi voti"
+        label: "Mostra voto"
+      group-results:
+        title: "Voti raggruppati per campo utente"
+        label: "Mostra la suddivisione"
+      ungroup-results:
+        title: "Combina tutti i voti"
+        label: "Nascondi la suddivisione"
       export-results:
+        title: "Esporta i risultati del sondaggio"
         label: "Esportare"
       open:
         title: "Apri il sondaggio"
@@ -60,10 +70,12 @@ it:
       error_while_toggling_status: "Spiacenti, si è verificato un errore nel commutare lo stato di questo sondaggio."
       error_while_casting_votes: "Spiacenti, si è verificato un errore nella votazione."
       error_while_fetching_voters: "Spiacenti, si è verificato un errore nel visualizzare i votanti."
+      error_while_exporting_results: "Spiacenti, si è verificato un errore durante l'esportazione dei risultati del sondaggio."
       ui_builder:
         title: Crea Sondaggio
         insert: Inserisci Sondaggio
         help:
+          options_count: Inserisci almeno 1 opzione
           invalid_values: Il valore minimo deve essere minore del valore massimo.
           min_step_value: Il valore minimo di un passo è 1
         poll_type:
@@ -77,6 +89,10 @@ it:
           vote: Al momento del voto
           closed: Quando chiuso
           staff: Solo staff
+        poll_groups:
+          label: Gruppi ammessi
+        poll_chart_type:
+          label: Tipo di grafico
         poll_config:
           max: Massimo
           min: Minimo
diff --git a/plugins/poll/config/locales/server.de.yml b/plugins/poll/config/locales/server.de.yml
index b3e0ef1e8e..555889e8dd 100644
--- a/plugins/poll/config/locales/server.de.yml
+++ b/plugins/poll/config/locales/server.de.yml
@@ -16,6 +16,8 @@ de:
     invalid_argument: "Ungültiger Wert '%{value}' für Argument '%{argument}'."
     multiple_polls_without_name: "Es gibt mehrere namenlose Umfragen. Benutze das Attribute '<code>name</code>', um deine Umfragen eindeutig identifizierbar zu machen."
     multiple_polls_with_same_name: "Es gibt mehre Umfragen mit dem selben Namen: <strong>%{name}</strong>. Benutze das Attribute '<code>name</code>', um deine Umfragen eindeutig identifizierbar zu machen."
+    default_poll_must_have_at_least_1_option: "Umfrage muss mindestens eine Auswahl haben."
+    named_poll_must_have_at_least_1_option: "Die Umfrage mit dem Namen <strong>%{name}</strong> muss mindestens eine Auswahl haben."
     default_poll_must_have_less_options:
       one: "Die Umfrage muss weniger als eine Option haben."
       other: "Die Umfrage muss weniger als %{count} Optionen haben."
@@ -24,6 +26,8 @@ de:
       other: "Die Umfrage mit dem Namen <strong>%{name}</strong> muss weniger als %{count} Optionen haben."
     default_poll_must_have_different_options: "Die Umfrage muss unterschiedliche Optionen haben."
     named_poll_must_have_different_options: "Die Umfrage mit dem Namen <strong>%{name}</strong> muss unterschiedliche Optionen haben."
+    default_poll_must_not_have_any_empty_options: "Umfrage darf keine leere Auswahl haben."
+    named_poll_must_not_have_any_empty_options: "Die Umfrage mit dem Namen <strong>%{name}</strong> darf keine leere Auswahl haben."
     default_poll_with_multiple_choices_has_invalid_parameters: "Die Mehrfachauswahl-Umfrage hat ungültige Parameter."
     named_poll_with_multiple_choices_has_invalid_parameters: "Die Mehrfachauswahl-Umfrage mit dem Namen <strong>%{name}</strong> hat ungültige Parameter."
     requires_at_least_1_valid_option: "Du musst mindestens eine gültige Option auswählen."
@@ -40,3 +44,5 @@ de:
     insufficient_rights_to_create: "Du darfst keine Umfragen erstellen."
     email:
       link_to_poll: "Klicke hier, um die Umfrage zu sehen."
+    user_field:
+      no_data: "Keine Daten"
diff --git a/plugins/poll/config/locales/server.it.yml b/plugins/poll/config/locales/server.it.yml
index 2c98850b35..c29eeb2320 100644
--- a/plugins/poll/config/locales/server.it.yml
+++ b/plugins/poll/config/locales/server.it.yml
@@ -11,11 +11,15 @@ it:
     poll_maximum_options: "Numero massimo di opzioni permesse in un sondaggio."
     poll_edit_window_mins: "Numero di minuti dopo la creazione di un messaggio durante i quali i sondaggi possono ancora essere modificati."
     poll_minimum_trust_level_to_create: "Definisce il minimo livello di esperienza necessario per poter creare sondaggi."
+    poll_groupable_user_fields: "Un insieme di nomi di campi utente che possono essere utilizzati per raggruppare e filtrare i risultati del sondaggio."
+    poll_export_data_explorer_query_id: "ID della query Data Explorer da utilizzare per l'esportazione dei risultati del sondaggio (0 per disabilitare)."
   poll:
     poll: "sondaggio"
     invalid_argument: "Valore '%{value}' non valido per l'argomento '%{argument}'."
     multiple_polls_without_name: "Ci sono più sondaggi privi di nome. Usa l'attributo '<code>name</code>' per identificare univocamente i tuoi sondaggi."
     multiple_polls_with_same_name: "Ci sono più sondaggi con lo stesso nome: <strong>%{name}</strong>. Usa l'attributo '<code>name</code>' per identificare univocamente i tuoi sondaggi."
+    default_poll_must_have_at_least_1_option: " Il sondaggio deve avere almeno 1 opzione."
+    named_poll_must_have_at_least_1_option: "Il sondaggio di nome <strong>%{name}</strong> deve avere almeno 1 opzione."
     default_poll_must_have_less_options:
       one: "Il sondaggio deve avere meno di una opzione."
       other: "Il sondaggio deve avere meno di %{count} opzioni."
@@ -24,6 +28,8 @@ it:
       other: "Il sondaggio <strong>%{name}</strong> deve avere meno di %{count} opzioni."
     default_poll_must_have_different_options: "Il sondaggio deve avere opzioni diverse."
     named_poll_must_have_different_options: "Il sondaggio dal nome <strong>%{name}</strong> deve avere opzioni diverse."
+    default_poll_must_not_have_any_empty_options: "Il sondaggio non deve avere opzioni vuote."
+    named_poll_must_not_have_any_empty_options: "Il sondaggio dal nome <strong>%{name}</strong>non deve avere opzioni vuote."
     default_poll_with_multiple_choices_has_invalid_parameters: "Il sondaggio a scelta multipla ha parametri non validi."
     named_poll_with_multiple_choices_has_invalid_parameters: "Il sondaggio a scelta multipla dal nome <strong>%{name}</strong> ha parametri non validi."
     requires_at_least_1_valid_option: "Devi scegliere almeno una opzione valida."
@@ -40,3 +46,5 @@ it:
     insufficient_rights_to_create: "Non sei autorizzato a creare sondaggi."
     email:
       link_to_poll: "Clicca per vedere il sondaggio."
+    user_field:
+      no_data: "Nessun Dato"
diff --git a/plugins/poll/config/locales/server.zh_CN.yml b/plugins/poll/config/locales/server.zh_CN.yml
index 154191c5e2..059e02a01a 100644
--- a/plugins/poll/config/locales/server.zh_CN.yml
+++ b/plugins/poll/config/locales/server.zh_CN.yml
@@ -15,7 +15,7 @@ zh_CN:
     poll_export_data_explorer_query_id: "用于导出投票结果的数据资源管理器查询的ID（0为禁用）。"
   poll:
     poll: "投票"
-    invalid_argument: "参数“%{argument}”无效值“%{value}”。"
+    invalid_argument: "“%{argument}”参数的无效值“%{value}”。"
     multiple_polls_without_name: "有多个投票没有名字。使用“<code>name</code>”属性区分各投票。"
     multiple_polls_with_same_name: "有多个投票的名字相同：<strong>%{name}</strong>。使用“<code>name</code>”属性区分各投票。"
     default_poll_must_have_at_least_1_option: "投票必须至少有一个选项。"

From 7876ee2d67d9ae93140ba8ec613fd35707f9fa75 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Wed, 15 Apr 2020 16:42:48 +0100
Subject: [PATCH 571/633] DEV: upgrade Rails

Latest version of Rails contains compatibility fixes for Ruby 2.7 and some
minor security fixes we would like to have

It also broke some of the multisite tests.

Rails tries to use the same connection for reading from a replica as writing
to the leader during tests, because, with everything happening in a
transaction, changes to the DB wouldn't otherwise be reflected in the
replica connection.

The difference now is that Rails tries to do this for connections opened
after the test has started which affected rails multisite connections.

The upshot of this is that, as things stand, you are likely to
experience problems if you try to connect to a different multisite DB in
a test when the `current_db` is not 'default'.
---
 Gemfile              | 14 +++++------
 Gemfile.lock         | 56 ++++++++++++++++++++++----------------------
 spec/rails_helper.rb |  2 ++
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9e4b7cb7bf..d0844e45e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,13 @@ else
   # this allows us to include the bits of rails we use without pieces we do not.
   #
   # To issue a rails update bump the version number here
-  gem 'actionmailer', '6.0.1'
-  gem 'actionpack', '6.0.1'
-  gem 'actionview', '6.0.1'
-  gem 'activemodel', '6.0.1'
-  gem 'activerecord', '6.0.1'
-  gem 'activesupport', '6.0.1'
-  gem 'railties', '6.0.1'
+  gem 'actionmailer', '6.0.2.2'
+  gem 'actionpack', '6.0.2.2'
+  gem 'actionview', '6.0.2.2'
+  gem 'activemodel', '6.0.2.2'
+  gem 'activerecord', '6.0.2.2'
+  gem 'activesupport', '6.0.2.2'
+  gem 'railties', '6.0.2.2'
   gem 'sprockets-rails'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ef1c3e67ee..fa0105851f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.1)
-      actionpack (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
+    actionmailer (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.1)
-      actionview (= 6.0.1)
-      activesupport (= 6.0.1)
-      rack (~> 2.0)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -24,15 +24,15 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.1)
-      activesupport (= 6.0.1)
+    activejob (6.0.2.2)
+      activesupport (= 6.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activerecord (6.0.1)
-      activemodel (= 6.0.1)
-      activesupport (= 6.0.1)
-    activesupport (6.0.1)
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activerecord (6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -283,9 +283,9 @@ GEM
     rails_multisite (2.1.1)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
-    railties (6.0.1)
-      actionpack (= 6.0.1)
-      activesupport (= 6.0.1)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -425,14 +425,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (= 6.0.1)
-  actionpack (= 6.0.1)
-  actionview (= 6.0.1)
+  actionmailer (= 6.0.2.2)
+  actionpack (= 6.0.2.2)
+  actionview (= 6.0.2.2)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 6.0.1)
-  activerecord (= 6.0.1)
-  activesupport (= 6.0.1)
+  activemodel (= 6.0.2.2)
+  activerecord (= 6.0.2.2)
+  activesupport (= 6.0.2.2)
   addressable
   annotate
   aws-sdk-s3
@@ -512,7 +512,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-protection
   rails_multisite
-  railties (= 6.0.1)
+  railties (= 6.0.2.2)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 011dc0309e..04a90b3e06 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -244,6 +244,8 @@ RSpec.configure do |config|
 
     RailsMultisite::ConnectionManagement.config_filename =
       "spec/fixtures/multisite/two_dbs.yml"
+
+    RailsMultisite::ConnectionManagement.establish_connection(db: 'default')
   end
 
   config.after(:each, type: :multisite) do

From 0a3cc22cec2572c4e63667f460438a145d8c9430 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 20 Apr 2020 08:31:43 -0500
Subject: [PATCH 572/633] FIX: Wizard was creating duplicate Light theme if
 Light was selected (#9464)

---
 lib/wizard/builder.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index 40318d8aa9..5372d3428b 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -181,11 +181,16 @@ class Wizard
           next unless scheme_name.present? && ColorScheme.is_base?(scheme_name)
 
           name = I18n.t("color_schemes.#{scheme_name.downcase.gsub(' ', '_')}_theme_name")
-
           theme = nil
           scheme = ColorScheme.find_by(base_scheme_id: scheme_name, via_wizard: true)
+          is_light_theme = (scheme_name == ColorScheme::LIGHT_THEME_ID)
           scheme ||= ColorScheme.create_from_base(name: name, via_wizard: true, base_scheme_id: scheme_name)
+
           themes = Theme.where(color_scheme_id: scheme.id).order(:id).to_a
+          if is_light_theme
+            themes = (themes || []).concat(Theme.where(color_scheme_id: nil).order(:id).to_a)
+            themes.sort_by(&:id)
+          end
           theme = themes.find(&:default?)
           theme ||= themes.first
 

From e5233f5ce69acc5ecc5edf29fe692d29e73703f2 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 20 Apr 2020 10:34:05 -0500
Subject: [PATCH 573/633] DEV: Add class to header-topic-info widget (#9475)

---
 .../discourse/widgets/header-topic-info.js     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js b/app/assets/javascripts/discourse/widgets/header-topic-info.js
index c6488d0562..1e31cf5fbf 100644
--- a/app/assets/javascripts/discourse/widgets/header-topic-info.js
+++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js
@@ -57,6 +57,10 @@ createWidget("topic-header-participant", {
 export default createWidget("header-topic-info", {
   tagName: "div.extra-info-wrapper",
 
+  buildClasses(attrs) {
+    return this.showCategory(attrs.topic) ? "two-rows" : "";
+  },
+
   buildFancyTitleClass() {
     const baseClass = ["topic-link"];
     const flatten = array => [].concat.apply([], array);
@@ -112,11 +116,7 @@ export default createWidget("header-topic-info", {
     const category = topic.get("category");
 
     if (loaded || category) {
-      if (
-        category &&
-        (!category.get("isUncategorizedCategory") ||
-          !this.siteSettings.suppress_uncategorized_badge)
-      ) {
+      if (this.showCategory(topic)) {
         const parentCategory = category.get("parentCategory");
         const categories = [];
         if (parentCategory) {
@@ -208,6 +208,14 @@ export default createWidget("header-topic-info", {
     );
   },
 
+  showCategory(topic) {
+    return (
+      topic.category &&
+      (!topic.category.isUncategorizedCategory ||
+        !this.siteSettings.suppress_uncategorized_badge)
+    );
+  },
+
   jumpToTopPost() {
     const topic = this.attrs.topic;
     if (topic) {

From f63ac79b9d19175049385f8aa9d3bfe0d795f2e6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2020 12:34:53 -0400
Subject: [PATCH 574/633] Build(deps-dev): Bump ruby-prof from 1.3.1 to 1.3.2
 (#9474)

Bumps [ruby-prof](https://github.com/ruby-prof/ruby-prof) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/ruby-prof/ruby-prof/releases)
- [Changelog](https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES)
- [Commits](https://github.com/ruby-prof/ruby-prof/compare/1.3.1...1.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fa0105851f..f8c8cc3e48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -352,7 +352,7 @@ GEM
       rubocop (>= 0.69.0)
     rubocop-rspec (1.38.1)
       rubocop (>= 0.68.1)
-    ruby-prof (1.3.1)
+    ruby-prof (1.3.2)
     ruby-progressbar (1.10.1)
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)

From ea8b40a53b440ccbb666b90516028b5ef42f9b20 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 20 Apr 2020 10:03:25 -0700
Subject: [PATCH 575/633] FEATURE: Add created_at column to user_badges (#9463)

* FEATURE: Add created_at column to user_badges

This makes scraping for newly granted badges easier.

Patch from @eviltrout applied.

Co-authored-by: Robin Ward <robin.ward@gmail.com>
---
 app/serializers/user_badge_serializer.rb             |  2 +-
 app/services/badge_granter.rb                        |  7 ++++---
 .../20200417183143_add_created_at_to_badge_user.rb   | 12 ++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20200417183143_add_created_at_to_badge_user.rb

diff --git a/app/serializers/user_badge_serializer.rb b/app/serializers/user_badge_serializer.rb
index 5ff905714d..6f904b01b5 100644
--- a/app/serializers/user_badge_serializer.rb
+++ b/app/serializers/user_badge_serializer.rb
@@ -10,7 +10,7 @@ class UserBadgeSerializer < ApplicationSerializer
                :admin
   end
 
-  attributes :id, :granted_at, :count, :post_id, :post_number
+  attributes :id, :granted_at, :created_at, :count, :post_id, :post_number
 
   has_one :badge
   has_one :user, serializer: UserSerializer, root: :users
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index c6dfd82170..26b9262a3a 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -16,7 +16,8 @@ class BadgeGranter
     return unless badge.enabled?
 
     system_user_id = Discourse.system_user.id
-    user_badges = users.map { |u| { badge_id: badge.id, user_id: u.id, granted_by_id: system_user_id, granted_at: Time.now } }
+    now = Time.zone.now
+    user_badges = users.map { |u| { badge_id: badge.id, user_id: u.id, granted_by_id: system_user_id, granted_at: now, created_at: now } }
     granted_badges = UserBadge.insert_all(user_badges, returning: %i[user_id])
 
     users.each do |user|
@@ -325,8 +326,8 @@ class BadgeGranter
 
     sql = <<~SQL
       WITH w as (
-        INSERT INTO user_badges(badge_id, user_id, granted_at, granted_by_id, post_id)
-        SELECT :id, q.user_id, q.granted_at, -1, #{post_id_field}
+        INSERT INTO user_badges(badge_id, user_id, granted_at, granted_by_id, created_at, post_id)
+        SELECT :id, q.user_id, q.granted_at, -1, current_timestamp, #{post_id_field}
           FROM (
                  #{badge.query}
                ) q
diff --git a/db/migrate/20200417183143_add_created_at_to_badge_user.rb b/db/migrate/20200417183143_add_created_at_to_badge_user.rb
new file mode 100644
index 0000000000..bbfd6066e9
--- /dev/null
+++ b/db/migrate/20200417183143_add_created_at_to_badge_user.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+class AddCreatedAtToBadgeUser < ActiveRecord::Migration[6.0]
+  def up
+    add_column :user_badges, :created_at, :datetime, null: true
+    execute 'UPDATE user_badges SET created_at = granted_at WHERE created_at IS NULL'
+    change_column :user_badges, :created_at, :datetime, null: false, default: 'current_timestamp'
+  end
+
+  def down
+    remove_column :user_badges, :created_at
+  end
+end

From 8f5314bf981ec44bda11131c58fc2db5437fe896 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 14:16:34 -0400
Subject: [PATCH 576/633] FIX: An `opts` hash was not, in fact, optional :)

---
 lib/topic_retriever.rb                  | 2 +-
 spec/components/topic_retriever_spec.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/topic_retriever.rb b/lib/topic_retriever.rb
index 3da6f932a2..8fae22a368 100644
--- a/lib/topic_retriever.rb
+++ b/lib/topic_retriever.rb
@@ -4,8 +4,8 @@ class TopicRetriever
 
   def initialize(embed_url, opts = nil)
     @embed_url = embed_url
-    @author_username = opts[:author_username]
     @opts = opts || {}
+    @author_username = @opts[:author_username]
   end
 
   def retrieve
diff --git a/spec/components/topic_retriever_spec.rb b/spec/components/topic_retriever_spec.rb
index 5ab908476b..6fd602c67e 100644
--- a/spec/components/topic_retriever_spec.rb
+++ b/spec/components/topic_retriever_spec.rb
@@ -8,6 +8,11 @@ describe TopicRetriever do
   let(:author_username) { "eviltrout" }
   let(:topic_retriever) { TopicRetriever.new(embed_url, author_username: author_username) }
 
+  it "can initialize without optional parameters" do
+    t = TopicRetriever.new(embed_url)
+    expect(t).to be_present
+  end
+
   describe "#retrieve" do
     context "when host is invalid" do
       before do

From 56a23c68f19835eac1d70db212a856efe8999994 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 14:27:43 -0400
Subject: [PATCH 577/633] FIX: Embedded topics couldn't update their titles

---
 app/models/topic_embed.rb       | 10 ++++------
 spec/models/topic_embed_spec.rb |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 1947a3c640..64c39c527c 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -92,12 +92,10 @@ class TopicEmbed < ActiveRecord::Base
         end
 
         if content_sha1 != embed.content_sha1
-          post.revise(
-            user,
-            { raw: absolutize_urls(url, contents) },
-            skip_validations: true,
-            bypass_rate_limiter: true
-          )
+          changes = { raw: absolutize_urls(url, contents) }
+          changes[:title] = title if title.present?
+
+          post.revise(user, changes, skip_validations: true, bypass_rate_limiter: true)
           embed.update!(content_sha1: content_sha1)
         end
       end
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index f15f55fff8..59510b90bb 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -46,8 +46,9 @@ describe TopicEmbed do
 
       it "Supports updating the post content" do
         expect do
-          TopicEmbed.import(user, url, title, "muhahaha new contents!")
+          TopicEmbed.import(user, url, "New title received", "muhahaha new contents!")
         end.to change { topic_embed.reload.content_sha1 }
+        expect(topic_embed.topic.title).to eq("New title received")
 
         expect(topic_embed.post.cooked).to match(/new contents/)
       end

From 98729c8e6efc11233a8f5eb15ecfeb52217d5272 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 14:31:24 -0400
Subject: [PATCH 578/633] FIX: Allow embed updates of just the title

---
 app/models/topic_embed.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 64c39c527c..43de234a15 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -91,7 +91,7 @@ class TopicEmbed < ActiveRecord::Base
           post.reload
         end
 
-        if content_sha1 != embed.content_sha1
+        if (content_sha1 != embed.content_sha1) || (title && title != post&.topic&.title)
           changes = { raw: absolutize_urls(url, contents) }
           changes[:title] = title if title.present?
 

From e997a1f315a0f207d851632f145f4e1cfe045113 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 14:56:21 -0400
Subject: [PATCH 579/633] FIX: Don't make topics visible unless the posts are
 regular

---
 lib/post_creator.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 0d3d61a99e..81befd03c9 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -419,6 +419,7 @@ class PostCreator
     return unless SiteSetting.embed_unlisted?
     return unless @post.post_number > 1
     return if @post.topic.visible?
+    return if @post.post_type != Post.types[:regular]
 
     if embed = @post.topic.topic_embed
       @post.topic.update_status('visible', true, @user)

From 25bed4f64349992d8028ff5c5f76062258a40f06 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 15:11:59 -0400
Subject: [PATCH 580/633] FIX: Concurrency issues with making topic embedded
 posts visible

---
 app/jobs/regular/make_embedded_topic_visible.rb | 15 +++++++++++++++
 lib/post_creator.rb                             | 12 ------------
 lib/post_jobs_enqueuer.rb                       | 12 ++++++++++++
 spec/models/topic_embed_spec.rb                 |  1 +
 4 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 app/jobs/regular/make_embedded_topic_visible.rb

diff --git a/app/jobs/regular/make_embedded_topic_visible.rb b/app/jobs/regular/make_embedded_topic_visible.rb
new file mode 100644
index 0000000000..c3c4121b5f
--- /dev/null
+++ b/app/jobs/regular/make_embedded_topic_visible.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Jobs
+  class MakeEmbeddedTopicVisible < ::Jobs::Base
+
+    def execute(args)
+      raise Discourse::InvalidParameters.new(:topic_id) if args[:topic_id].blank?
+
+      if topic = Topic.find_by(id: args[:topic_id])
+        topic.update_status('visible', true, topic.user)
+      end
+    end
+
+  end
+end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 81befd03c9..fab3de1954 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -186,7 +186,6 @@ class PostCreator
         @post.link_post_uploads
         update_uploads_secure_status
         ensure_in_allowed_users if guardian.is_staff?
-        make_visible
         unarchive_message
         if !@opts[:import_mode]
           DraftSequence.next!(@user, draft_key)
@@ -415,17 +414,6 @@ class PostCreator
     end
   end
 
-  def make_visible
-    return unless SiteSetting.embed_unlisted?
-    return unless @post.post_number > 1
-    return if @post.topic.visible?
-    return if @post.post_type != Post.types[:regular]
-
-    if embed = @post.topic.topic_embed
-      @post.topic.update_status('visible', true, @user)
-    end
-  end
-
   def unarchive_message
     return unless @topic.private_message? && @topic.id
 
diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb
index 8659cba7d1..6f95899bb4 100644
--- a/lib/post_jobs_enqueuer.rb
+++ b/lib/post_jobs_enqueuer.rb
@@ -18,6 +18,7 @@ class PostJobsEnqueuer
     unless skip_after_create?
       after_post_create
       after_topic_create
+      make_visible
     end
 
     if @topic.private_message?
@@ -44,6 +45,17 @@ class PostJobsEnqueuer
     @post.trigger_post_process(new_post: true)
   end
 
+  def make_visible
+    return unless SiteSetting.embed_unlisted?
+    return unless @post.post_number > 1
+    return if @topic.visible?
+    return if @post.post_type != Post.types[:regular]
+
+    if @topic.topic_embed.present?
+      Jobs.enqueue(:make_embedded_topic_visible, topic_id: @topic.id)
+    end
+  end
+
   def after_post_create
     TopicTrackingState.publish_unread(@post) if @post.post_number > 1
     TopicTrackingState.publish_latest(@topic, @post.whisper?)
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index 59510b90bb..c45a2209e1 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -75,6 +75,7 @@ describe TopicEmbed do
       end
 
       it "will make the topic unlisted if `embed_unlisted` is set until someone replies" do
+        Jobs.run_immediately!
         SiteSetting.embed_unlisted = true
         imported_post = TopicEmbed.import(user, "http://eviltrout.com/abcd", title, "some random content")
         expect(imported_post.topic).not_to be_visible

From 06796bec8be1b3ce9d307f925a15af0ea363f70f Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 20 Apr 2020 14:51:49 -0500
Subject: [PATCH 581/633] FIX: Set category description to first posts cooked
 value (#9478)

---
 app/models/category.rb       |  1 +
 spec/models/category_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/models/category.rb b/app/models/category.rb
index 44d115cad0..c19d3848cc 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -287,6 +287,7 @@ class Category < ActiveRecord::Base
       update_column(:topic_id, t.id)
       post = t.posts.build(raw: description || post_template, user: user)
       post.save!(validate: false)
+      update_column(:description, post.cooked) if description.present?
 
       t
     end
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index b2da411504..7b550a9c1d 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -403,6 +403,16 @@ describe Category do
       expect(@category.topics_year).to eq(0)
     end
 
+    it "cooks the definition" do
+      category = Category.create(
+        name: 'little-test',
+        user_id: Discourse.system_user.id,
+        description: "click the link [here](https://fakeurl.com)"
+      )
+      expect(category.description.include?("[here]")).to eq(false)
+      expect(category.description).to eq(category.topic.first_post.cooked)
+    end
+
     it "renames the definition when renamed" do
       @category.update(name: 'Troutfishing')
       @topic.reload

From afe1407c758278b49db5ae59500385f15c0794a5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2020 16:06:38 -0400
Subject: [PATCH 582/633] Build(deps): Bump aws-sdk-s3 from 1.61.2 to 1.62.0
 (#9479)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.2 to 1.62.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits/v1.62.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f8c8cc3e48..9d94326c20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,16 +45,16 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.294.0)
-    aws-sdk-core (3.92.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-partitions (1.298.0)
+    aws-sdk-core (3.94.0)
+      aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.61.2)
+    aws-sdk-s3 (1.62.0)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)

From 96d026a329a3d6c0b47c40f167b6c6ea1b3bfe7f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 16:18:17 -0400
Subject: [PATCH 583/633] DEV: Remove EventTarget. Future versions of Ember
 don't export this.

It was removed altogether from ApplicationRoute, which only triggered
an `activate` event which never seems to be used.

We can replace it with Evented which is still present.
---
 app/assets/javascripts/discourse-loader.js    |  1 -
 .../javascripts/discourse/lib/eyeline.js      | 26 +++++++++++++------
 .../discourse/routes/application.js           | 12 +--------
 .../javascripts/discourse/routes/topic.js     |  5 ++--
 .../discourse/services/app-events.js          |  5 +++-
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index e73ecd2b7b..24f879f687 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -108,7 +108,6 @@ var define, requirejs;
       },
       rsvp: {
         default: Ember.RSVP,
-        EventTarget: Ember.RSVP.EventTarget,
         Promise: Ember.RSVP.Promise,
         hash: Ember.RSVP.hash,
         all: Ember.RSVP.all
diff --git a/app/assets/javascripts/discourse/lib/eyeline.js b/app/assets/javascripts/discourse/lib/eyeline.js
index bebbfa1623..57a6def7dd 100644
--- a/app/assets/javascripts/discourse/lib/eyeline.js
+++ b/app/assets/javascripts/discourse/lib/eyeline.js
@@ -1,5 +1,5 @@
 import ENV from "discourse-common/config/environment";
-import { EventTarget } from "rsvp";
+import AppEvents from "discourse/services/app-events";
 
 let _skipUpdate;
 let _rootElement;
@@ -19,6 +19,15 @@ configureEyeline();
 //  Track visible elements on the screen.
 const Eyeline = function Eyeline(selector) {
   this.selector = selector;
+  this.appEvents = AppEvents.create();
+};
+
+Eyeline.prototype.on = function(name, cb) {
+  this.appEvents.on(name, cb);
+};
+
+Eyeline.prototype.off = function(name, cb) {
+  this.appEvents.off(name, cb);
 };
 
 Eyeline.prototype.update = function() {
@@ -44,6 +53,7 @@ Eyeline.prototype.update = function() {
       bottomOffset.top <= docViewBottom && bottomOffset.top >= docViewTop;
   }
 
+  let { appEvents } = this;
   return $elements.each((i, elem) => {
     const $elem = $(elem),
       elemTop = _rootElement ? $elem.position().top : $elem.offset().top,
@@ -68,17 +78,17 @@ Eyeline.prototype.update = function() {
 
     // If you hit the bottom we mark all the elements as seen. Otherwise, just the first one
     if (!atBottom) {
-      this.trigger("saw", { detail: $elem });
+      appEvents.trigger("saw", { detail: $elem });
       if (i === 0) {
-        this.trigger("sawTop", { detail: $elem });
+        appEvents.trigger("sawTop", { detail: $elem });
       }
       return false;
     }
     if (i === 0) {
-      this.trigger("sawTop", { detail: $elem });
+      appEvents.trigger("sawTop", { detail: $elem });
     }
     if (i === $elements.length - 1) {
-      return this.trigger("sawBottom", { detail: $elem });
+      return appEvents.trigger("sawBottom", { detail: $elem });
     }
   });
 };
@@ -89,9 +99,9 @@ Eyeline.prototype.flushRest = function() {
     return;
   }
 
-  $(this.selector).each((i, elem) => this.trigger("saw", { detail: $(elem) }));
+  $(this.selector).each((i, elem) =>
+    this.appEvents.trigger("saw", { detail: $(elem) })
+  );
 };
 
-EventTarget.mixin(Eyeline.prototype);
-
 export default Eyeline;
diff --git a/app/assets/javascripts/discourse/routes/application.js b/app/assets/javascripts/discourse/routes/application.js
index 07926eb568..856c203058 100644
--- a/app/assets/javascripts/discourse/routes/application.js
+++ b/app/assets/javascripts/discourse/routes/application.js
@@ -1,4 +1,4 @@
-import { next, once } from "@ember/runloop";
+import { once } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { setting } from "discourse/lib/computed";
@@ -11,7 +11,6 @@ import { findAll } from "discourse/models/login-method";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { userPath } from "discourse/lib/url";
 import Composer from "discourse/models/composer";
-import { EventTarget } from "rsvp";
 
 function unlessReadOnly(method, message) {
   return function() {
@@ -236,14 +235,6 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
     }
   },
 
-  activate() {
-    this._super(...arguments);
-    next(function() {
-      // Support for callbacks once the application has activated
-      ApplicationRoute.trigger("activate");
-    });
-  },
-
   renderTemplate() {
     this.render("application");
     this.render("user-card", { into: "application", outlet: "user-card" });
@@ -298,5 +289,4 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
   }
 });
 
-EventTarget.mixin(ApplicationRoute);
 export default ApplicationRoute;
diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/routes/topic.js
index 46a1b3ada9..ed49b86153 100644
--- a/app/assets/javascripts/discourse/routes/topic.js
+++ b/app/assets/javascripts/discourse/routes/topic.js
@@ -4,13 +4,13 @@ import { cancel, later, schedule } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
-import { EventTarget } from "rsvp";
+import Evented from "@ember/object/evented";
 
 const SCROLL_DELAY = 500;
 
 import showModal from "discourse/lib/show-modal";
 
-const TopicRoute = DiscourseRoute.extend({
+const TopicRoute = DiscourseRoute.extend(Evented, {
   init() {
     this._super(...arguments);
 
@@ -332,5 +332,4 @@ const TopicRoute = DiscourseRoute.extend({
   }
 });
 
-EventTarget.mixin(TopicRoute);
 export default TopicRoute;
diff --git a/app/assets/javascripts/discourse/services/app-events.js b/app/assets/javascripts/discourse/services/app-events.js
index 8a3e770c75..717caf7545 100644
--- a/app/assets/javascripts/discourse/services/app-events.js
+++ b/app/assets/javascripts/discourse/services/app-events.js
@@ -3,7 +3,10 @@ import Evented from "@ember/object/evented";
 import Service from "@ember/service";
 
 export default Service.extend(Evented, {
-  _events: {},
+  init() {
+    this._super(...arguments);
+    this._events = {};
+  },
 
   on() {
     if (arguments.length === 2) {

From 28e9f54e2f6fa15cf97836e5a66ce4464d73bd62 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 16:48:51 -0400
Subject: [PATCH 584/633] DEV: `sawTop` never seems used in our codebase or any
 plugins

---
 app/assets/javascripts/discourse/lib/eyeline.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/eyeline.js b/app/assets/javascripts/discourse/lib/eyeline.js
index 57a6def7dd..d31602e4da 100644
--- a/app/assets/javascripts/discourse/lib/eyeline.js
+++ b/app/assets/javascripts/discourse/lib/eyeline.js
@@ -79,14 +79,8 @@ Eyeline.prototype.update = function() {
     // If you hit the bottom we mark all the elements as seen. Otherwise, just the first one
     if (!atBottom) {
       appEvents.trigger("saw", { detail: $elem });
-      if (i === 0) {
-        appEvents.trigger("sawTop", { detail: $elem });
-      }
       return false;
     }
-    if (i === 0) {
-      appEvents.trigger("sawTop", { detail: $elem });
-    }
     if (i === $elements.length - 1) {
       return appEvents.trigger("sawBottom", { detail: $elem });
     }

From 091d6dc9fce1808c20508c06ee2d2609469da521 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 16:51:36 -0400
Subject: [PATCH 585/633] DEV: Triggering "saw" on every element seems
 pointless

We don't seem to wire this up to any listeners, so why waste time doing
all this work?
---
 .../discourse/components/discovery-topics-list.js    |  4 +---
 .../javascripts/discourse/components/user-stream.js  |  5 +----
 app/assets/javascripts/discourse/lib/eyeline.js      | 12 ------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js b/app/assets/javascripts/discourse/components/discovery-topics-list.js
index 30a0118a33..28ab1efab5 100644
--- a/app/assets/javascripts/discourse/components/discovery-topics-list.js
+++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js
@@ -38,9 +38,7 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
       Discourse.updateContextCount(0);
       this.model.loadMore().then(hasMoreResults => {
         schedule("afterRender", () => this.saveScrollPosition());
-        if (!hasMoreResults) {
-          this.eyeline.flushRest();
-        } else if ($(window).height() >= $(document).height()) {
+        if (hasMoreResults && $(window).height() >= $(document).height()) {
           this.send("loadMore");
         }
       });
diff --git a/app/assets/javascripts/discourse/components/user-stream.js b/app/assets/javascripts/discourse/components/user-stream.js
index 62d9fe7f0d..aadd188699 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js
+++ b/app/assets/javascripts/discourse/components/user-stream.js
@@ -110,10 +110,7 @@ export default Component.extend(LoadMore, {
 
       this.set("loading", true);
       const stream = this.stream;
-      stream.findItems().then(() => {
-        this.set("loading", false);
-        this.eyeline.flushRest();
-      });
+      stream.findItems().then(() => this.set("loading", false));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/lib/eyeline.js b/app/assets/javascripts/discourse/lib/eyeline.js
index d31602e4da..53f2a8435a 100644
--- a/app/assets/javascripts/discourse/lib/eyeline.js
+++ b/app/assets/javascripts/discourse/lib/eyeline.js
@@ -78,7 +78,6 @@ Eyeline.prototype.update = function() {
 
     // If you hit the bottom we mark all the elements as seen. Otherwise, just the first one
     if (!atBottom) {
-      appEvents.trigger("saw", { detail: $elem });
       return false;
     }
     if (i === $elements.length - 1) {
@@ -87,15 +86,4 @@ Eyeline.prototype.update = function() {
   });
 };
 
-//  Call this when we know aren't loading any more elements. Mark the rest as seen
-Eyeline.prototype.flushRest = function() {
-  if (ENV.environment === "test") {
-    return;
-  }
-
-  $(this.selector).each((i, elem) =>
-    this.appEvents.trigger("saw", { detail: $(elem) })
-  );
-};
-
 export default Eyeline;

From 5d9f5dd11f0ef0cac66e80c3bdae0694a8f3ad72 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 16:57:46 -0400
Subject: [PATCH 586/633] REVERT: Fix to app-events to make events not global

---
 app/assets/javascripts/discourse/services/app-events.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/services/app-events.js b/app/assets/javascripts/discourse/services/app-events.js
index 717caf7545..8a3e770c75 100644
--- a/app/assets/javascripts/discourse/services/app-events.js
+++ b/app/assets/javascripts/discourse/services/app-events.js
@@ -3,10 +3,7 @@ import Evented from "@ember/object/evented";
 import Service from "@ember/service";
 
 export default Service.extend(Evented, {
-  init() {
-    this._super(...arguments);
-    this._events = {};
-  },
+  _events: {},
 
   on() {
     if (arguments.length === 2) {

From ce9c59309c64d80e794ec0b1ba9b8c45de765cd2 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 17:14:51 -0400
Subject: [PATCH 587/633] FIX: Temporarily compatibility for Evented on a Topic
 Route

---
 app/assets/javascripts/discourse/routes/topic.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/routes/topic.js
index ed49b86153..b9d6aaf177 100644
--- a/app/assets/javascripts/discourse/routes/topic.js
+++ b/app/assets/javascripts/discourse/routes/topic.js
@@ -5,12 +5,13 @@ import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
 import Evented from "@ember/object/evented";
+import EmberObject from "@ember/object";
 
 const SCROLL_DELAY = 500;
 
 import showModal from "discourse/lib/show-modal";
 
-const TopicRoute = DiscourseRoute.extend(Evented, {
+const TopicRoute = DiscourseRoute.extend({
   init() {
     this._super(...arguments);
 
@@ -332,4 +333,9 @@ const TopicRoute = DiscourseRoute.extend(Evented, {
   }
 });
 
+// TODO: Remove this - it's barely used.
+const events = EmberObject.extend(Evented).create();
+TopicRoute.on = events.on;
+TopicRoute.trigger = events.trigger;
+
 export default TopicRoute;

From 74e4102093c6aa497fe48947afbec9751b21721a Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Mon, 20 Apr 2020 15:18:01 -0700
Subject: [PATCH 588/633] DEV: allow nav items to override computed property
 values

Plugins need to override extra nav-items. Make sure these properties are
override-able.

See:
https://deprecations.emberjs.com/v3.x/#toc_computed-property-override
---
 .../javascripts/discourse/models/nav-item.js  | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/app/assets/javascripts/discourse/models/nav-item.js b/app/assets/javascripts/discourse/models/nav-item.js
index 83330778e0..bc78b0a1a9 100644
--- a/app/assets/javascripts/discourse/models/nav-item.js
+++ b/app/assets/javascripts/discourse/models/nav-item.js
@@ -92,6 +92,45 @@ const ExtraNavItem = NavItem.extend({
       return (this._href = value);
     }
   }),
+  displayName: discourseComputed("displayName", {
+    get() {
+      if (this._displayName) {
+        return this._displayName;
+      }
+
+      return this.displayName;
+    },
+
+    set(key, value) {
+      return (this._displayName = value);
+    }
+  }),
+  filterMode: discourseComputed("filterMode", {
+    get() {
+      if (this._filterMode) {
+        return this._filterMode;
+      }
+
+      return this.filterMode;
+    },
+
+    set(key, value) {
+      return (this._filterMode = value);
+    }
+  }),
+  title: discourseComputed("title", {
+    get() {
+      if (this._title) {
+        return this._title;
+      }
+
+      return this.title;
+    },
+
+    set(key, value) {
+      return (this._title = value);
+    }
+  }),
 
   count: 0,
 

From e9f726281321b6779b2e27c7f9d2f4b4ca3012aa Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 21 Apr 2020 08:33:55 +1000
Subject: [PATCH 589/633] FIX: when category or tag is muted, update user
 (#9456)

Currently, when category or tag is muted, only after hard refresh, these new muted categories are really muted. Without a hard refresh, you will still receive "new topic" messages.

Therefore, when tag or category is muted, we should update the user object right away.
---
 .../javascripts/discourse/controllers/tags-show.js  | 13 ++++++++++++-
 app/assets/javascripts/discourse/models/category.js | 11 +++++++++++
 app/assets/javascripts/discourse/models/user.js     | 10 ++++++++++
 app/controllers/tags_controller.rb                  |  2 +-
 test/javascripts/models/user-test.js                |  7 +++++++
 5 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js b/app/assets/javascripts/discourse/controllers/tags-show.js
index a44cf850c8..e9bb719116 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js
@@ -155,7 +155,18 @@ export default Controller.extend(BulkTopicSelection, FilterModeMixin, {
     },
 
     changeTagNotificationLevel(notificationLevel) {
-      this.tagNotification.update({ notification_level: notificationLevel });
+      this.tagNotification
+        .update({ notification_level: notificationLevel })
+        .then(response => {
+          this.currentUser.set(
+            "muted_tag_ids",
+            this.currentUser.calculateMutedIds(
+              notificationLevel,
+              response.responseJson.tag_id,
+              "muted_tag_ids"
+            )
+          );
+        });
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/models/category.js
index f264248f52..d765f84d47 100644
--- a/app/assets/javascripts/discourse/models/category.js
+++ b/app/assets/javascripts/discourse/models/category.js
@@ -7,6 +7,7 @@ import PermissionType from "discourse/models/permission-type";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import deprecated from "discourse-common/lib/deprecated";
 import Site from "discourse/models/site";
+import User from "discourse/models/user";
 
 const Category = RestModel.extend({
   permissions: null,
@@ -241,6 +242,16 @@ const Category = RestModel.extend({
 
   setNotification(notification_level) {
     this.set("notification_level", notification_level);
+
+    User.currentProp(
+      "muted_category_ids",
+      User.current().calculateMutedIds(
+        notification_level,
+        this.id,
+        "muted_category_ids"
+      )
+    );
+
     const url = `/category/${this.id}/notifications`;
     return ajax(url, { data: { notification_level }, type: "POST" });
   },
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index 7b106d9206..9fff14f4f8 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -25,6 +25,7 @@ import Category from "discourse/models/category";
 import { Promise } from "rsvp";
 import deprecated from "discourse-common/lib/deprecated";
 import Site from "discourse/models/site";
+import { NotificationLevels } from "discourse/lib/notification-levels";
 
 export const SECOND_FACTOR_METHODS = {
   TOTP: 1,
@@ -859,6 +860,15 @@ const User = RestModel.extend({
 
   changeTimezone(tz) {
     this._timezone = tz;
+  },
+
+  calculateMutedIds(notificationLevel, id, type) {
+    const muted_ids = this.get(type);
+    if (notificationLevel === NotificationLevels.MUTED) {
+      return muted_ids.concat(id).uniq();
+    } else {
+      return muted_ids.filter(existing_id => existing_id !== id);
+    }
   }
 });
 
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 25d8a15aae..72f5935f64 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -274,7 +274,7 @@ class TagsController < ::ApplicationController
     raise Discourse::NotFound unless tag
     level = params[:tag_notification][:notification_level].to_i
     TagUser.change(current_user.id, tag.id, level)
-    render json: { notification_level: level }
+    render json: { notification_level: level, tag_id: tag.id }
   end
 
   def check_hashtag
diff --git a/test/javascripts/models/user-test.js b/test/javascripts/models/user-test.js
index 4675043adf..90dcef574e 100644
--- a/test/javascripts/models/user-test.js
+++ b/test/javascripts/models/user-test.js
@@ -104,3 +104,10 @@ QUnit.test("resolvedTimezone", assert => {
   );
   stub.restore();
 });
+
+QUnit.test("muted ids", assert => {
+  let user = User.create({ username: "chuck", muted_category_ids: [] });
+
+  assert.deepEqual(user.calculateMutedIds(0, 1, "muted_category_ids"), [1]);
+  assert.deepEqual(user.calculateMutedIds(1, 1, "muted_category_ids"), []);
+});

From 9a6e4b1fa1d96af90847336812f60211a5ddd1ff Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:47:48 +0200
Subject: [PATCH 590/633] FIX: Make InlineUploads handle more URL formats
 (#9467)

It previously failed to match URLs with characters other than `[a-zA-z0-9\.\/:-]`. This meant that `PullHotlinkedImages` would sometimes download an external image and then never use it in any posts.
---
 app/services/inline_uploads.rb       |  2 +-
 spec/services/inline_uploads_spec.rb | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/services/inline_uploads.rb b/app/services/inline_uploads.rb
index 30727ec2b8..e75348bcce 100644
--- a/app/services/inline_uploads.rb
+++ b/app/services/inline_uploads.rb
@@ -148,7 +148,7 @@ class InlineUploads
   end
 
   def self.match_md_inline_img(markdown, external_src: false)
-    markdown.scan(/(!?\[([^\[\]]*)\]\(([a-zA-z0-9\.\/:-]+)([ ]*['"]{1}[^\)]*['"]{1}[ ]*)?\))/) do |match|
+    markdown.scan(/(!?\[([^\[\]]*)\]\(([^\s\)]+)([ ]*['"]{1}[^\)]*['"]{1}[ ]*)?\))/) do |match|
       if (matched_uploads(match[2]).present? || external_src) && block_given?
         yield(
           match[0],
diff --git a/spec/services/inline_uploads_spec.rb b/spec/services/inline_uploads_spec.rb
index b5bf7ded43..76fb36cf9a 100644
--- a/spec/services/inline_uploads_spec.rb
+++ b/spec/services/inline_uploads_spec.rb
@@ -712,4 +712,17 @@ RSpec.describe InlineUploads do
       end
     end
   end
+
+  describe ".match_md_inline_img" do
+    it "matches URLs with various characters" do
+      md = <<~MD
+      ![test](https://some-site.com/a_test?q=1&b=hello%20there)
+      MD
+
+      url = nil
+      InlineUploads.match_md_inline_img(md, external_src: true) { |_match, src| url = src }
+
+      expect(url).to eq("https://some-site.com/a_test?q=1&b=hello%20there")
+    end
+  end
 end

From 5a81e3999c57d2329b4dce3f3938afabc1400026 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:48:19 +0200
Subject: [PATCH 591/633] DEV: Remove `bypass_bump` from CookedPostProcessor
 (#9468)

It was only passing it along to `PullHotlinkedImages` and that class have not used that arg since April 2014 (https://github.com/discourse/discourse/commit/c52ee665b45241a89b4de8b916860f380ecf0141)
---
 app/jobs/regular/process_post.rb              | 2 +-
 lib/cooked_post_processor.rb                  | 8 ++++----
 spec/components/cooked_post_processor_spec.rb | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index b13d69d61d..871e1dbb4a 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -23,7 +23,7 @@ module Jobs
         end
 
         cp = CookedPostProcessor.new(post, args)
-        cp.post_process(bypass_bump: args[:bypass_bump], new_post: args[:new_post])
+        cp.post_process(new_post: args[:new_post])
 
         # If we changed the document, save it
         cooked = cp.html
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 3cbada96b1..35de12db1b 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -32,7 +32,7 @@ class CookedPostProcessor
     @omit_nofollow = post.omit_nofollow?
   end
 
-  def post_process(bypass_bump: false, new_post: false)
+  def post_process(new_post: false)
     DistributedMutex.synchronize("post_process_#{@post.id}", validity: 10.minutes) do
       DiscourseEvent.trigger(:before_post_process_cooked, @doc, @post)
       remove_full_quote_on_direct_reply if new_post
@@ -43,7 +43,7 @@ class CookedPostProcessor
       remove_user_ids
       update_post_image
       enforce_nofollow
-      pull_hotlinked_images(bypass_bump)
+      pull_hotlinked_images
       grant_badges
       @post.link_post_uploads(fragments: @doc)
       DiscourseEvent.trigger(:post_process_cooked, @doc, @post)
@@ -655,7 +655,7 @@ class CookedPostProcessor
     end
   end
 
-  def pull_hotlinked_images(bypass_bump = false)
+  def pull_hotlinked_images
     # have we enough disk space?
     disable_if_low_on_disk_space # But still enqueue the job
     # don't download remote images for posts that are more than n days old
@@ -666,7 +666,7 @@ class CookedPostProcessor
     Jobs.cancel_scheduled_job(:pull_hotlinked_images, post_id: @post.id)
     # schedule the job
     delay = SiteSetting.editing_grace_period + 1
-    Jobs.enqueue_in(delay.seconds.to_i, :pull_hotlinked_images, post_id: @post.id, bypass_bump: bypass_bump)
+    Jobs.enqueue_in(delay.seconds.to_i, :pull_hotlinked_images, post_id: @post.id)
   end
 
   def disable_if_low_on_disk_space
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index d986651562..3d79bcf25f 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -1529,7 +1529,7 @@ describe CookedPostProcessor do
             Jobs.expects(:cancel_scheduled_job).with(:pull_hotlinked_images, post_id: post.id).once
 
             delay = SiteSetting.editing_grace_period + 1
-            Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id, bypass_bump: false).once
+            Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id).once
 
             cpp.pull_hotlinked_images
           end
@@ -1603,7 +1603,7 @@ describe CookedPostProcessor do
       Jobs.expects(:cancel_scheduled_job).with(:pull_hotlinked_images, post_id: post.id).once
 
       delay = SiteSetting.editing_grace_period + 1
-      Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id, bypass_bump: false).once
+      Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id).once
 
       cpp.pull_hotlinked_images
     end

From ab52bed014469902238936002ec79962ba1d1ce4 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:48:33 +0200
Subject: [PATCH 592/633] DEV: Remove the return value of
 disable_if_low_on_disk_space (#9469)

It was used only in specs.
---
 lib/cooked_post_processor.rb                  |  9 ++++-----
 spec/components/cooked_post_processor_spec.rb | 10 ++++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 35de12db1b..77ebba989a 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -670,11 +670,12 @@ class CookedPostProcessor
   end
 
   def disable_if_low_on_disk_space
-    return false if Discourse.store.external?
-    return false if !SiteSetting.download_remote_images_to_local
-    return false if available_disk_space >= SiteSetting.download_remote_images_threshold
+    return if Discourse.store.external?
+    return if !SiteSetting.download_remote_images_to_local
+    return if available_disk_space >= SiteSetting.download_remote_images_threshold
 
     SiteSetting.download_remote_images_to_local = false
+
     # log the site setting change
     reason = I18n.t("disable_remote_images_download_reason")
     staff_action_logger = StaffActionLogger.new(Discourse.system_user)
@@ -682,8 +683,6 @@ class CookedPostProcessor
 
     # also send a private message to the site contact user
     notify_about_low_disk_space
-
-    true
   end
 
   def notify_about_low_disk_space
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 3d79bcf25f..94d87ce0b0 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -1513,7 +1513,7 @@ describe CookedPostProcessor do
 
       context "and there is enough disk space" do
 
-        before { cpp.expects(:disable_if_low_on_disk_space).returns(false) }
+        before { cpp.expects(:disable_if_low_on_disk_space) }
 
         it "does not run when the system user updated the post" do
           post.last_editor_id = Discourse.system_user.id
@@ -1555,7 +1555,7 @@ describe CookedPostProcessor do
 
     it "does nothing when there's enough disk space" do
       SiteSetting.expects(:download_remote_images_to_local=).never
-      expect(cpp.disable_if_low_on_disk_space).to eq(false)
+      cpp.disable_if_low_on_disk_space
     end
 
     context "when there's not enough disk space" do
@@ -1565,7 +1565,8 @@ describe CookedPostProcessor do
       it "disables download_remote_images_threshold and send a notification to the admin" do
         StaffActionLogger.any_instance.expects(:log_site_setting_change).once
         SystemMessage.expects(:create_from_system_user).with(Discourse.site_contact_user, :download_remote_images_disabled).once
-        expect(cpp.disable_if_low_on_disk_space).to eq(true)
+        cpp.disable_if_low_on_disk_space
+
         expect(SiteSetting.download_remote_images_to_local).to eq(false)
       end
 
@@ -1573,7 +1574,8 @@ describe CookedPostProcessor do
         SiteSetting.s3_access_key_id = "s3-access-key-id"
         SiteSetting.s3_secret_access_key = "s3-secret-access-key"
         SiteSetting.enable_s3_uploads = true
-        expect(cpp.disable_if_low_on_disk_space).to eq(false)
+        cpp.disable_if_low_on_disk_space
+
         expect(SiteSetting.download_remote_images_to_local).to eq(true)
       end
 

From 28c706bd0994c2fb0f76c586fcaa824f698d0299 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:48:58 +0200
Subject: [PATCH 593/633] DEV: Do less work in docker_test (#9470)

* DEV: Update the working tree just once.

`git pull` was effectively doing `git fetch` and `git merge FETCH_HEAD`, and only then we were checking out the desired branch/commit. This change will skip the the merge step.

* DEV: Don't run lefthook in docker_test
---
 script/docker_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/docker_test.rb b/script/docker_test.rb
index 445901b851..3696a53159 100644
--- a/script/docker_test.rb
+++ b/script/docker_test.rb
@@ -26,10 +26,10 @@ unless ENV['NO_UPDATE']
 
   run_or_fail("git reset --hard")
 
-  run_or_fail("git pull")
+  run_or_fail("git fetch")
 
-  checkout = ENV['COMMIT_HASH'] || "HEAD"
-  run_or_fail("git checkout #{checkout}")
+  checkout = ENV['COMMIT_HASH'] || "FETCH_HEAD"
+  run_or_fail("LEFTHOOK=0 git checkout #{checkout}")
 
   puts "travis_fold:end:pulling_latest_discourse" if ENV["TRAVIS"]
   puts "travis_fold:start:bundle" if ENV["TRAVIS"]

From 17cf300b7146a7935239d451cf855314ca6cd254 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:50:20 +0200
Subject: [PATCH 594/633] DEV: Use more specific error responses (#9472)

* DEV: Use `render_json_error` (Adds specs for Admin::GroupsController)
* DEV: Use a specific error on blank category slug (Fixes a `render_json_error` warning)
* DEV: Use a specific error on reviewable claim conflict (Fixes a `render_json_error` warning)
* DEV: Use specific errors in Admin::UsersController (Fixes `render_json_error` warnings)
* FIX: PublishedPages error responses
* FIX: TopicsController error responses (There was an issue of two separate `Topic` instances for the same record. This makes sure there's only one up-to-date instance.)
---
 app/controllers/admin/groups_controller.rb    |  2 +-
 app/controllers/admin/users_controller.rb     |  8 +++-
 app/controllers/categories_controller.rb      |  5 +-
 app/controllers/reviewables_controller.rb     |  9 ++--
 app/controllers/topics_controller.rb          |  2 +-
 app/models/published_page.rb                  |  2 +
 config/initializers/012-web_hook_events.rb    |  2 +-
 lib/post_revisor.rb                           |  9 ++--
 spec/requests/admin/groups_controller_spec.rb | 48 +++++++++++++++++++
 spec/requests/admin/users_controller_spec.rb  | 47 ++++++++++++++++--
 spec/requests/categories_controller_spec.rb   |  3 +-
 .../published_pages_controller_spec.rb        |  1 +
 spec/requests/reviewables_controller_spec.rb  |  1 +
 spec/requests/topics_controller_spec.rb       |  2 +-
 14 files changed, 121 insertions(+), 20 deletions(-)

diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 17c98b2d31..05831871f1 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -124,7 +124,7 @@ class Admin::GroupsController < Admin::AdminController
   protected
 
   def can_not_modify_automatic
-    render json: { errors: I18n.t('groups.errors.can_not_modify_automatic') }, status: 422
+    render_json_error(I18n.t('groups.errors.can_not_modify_automatic'))
   end
 
   private
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 7ced962b3d..a02ab11dac 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -197,7 +197,9 @@ class Admin::UsersController < Admin::AdminController
 
   def add_group
     group = Group.find(params[:group_id].to_i)
-    return render_json_error group unless group && !group.automatic
+
+    raise Discourse::NotFound unless group
+    return render_json_error(I18n.t('groups.errors.can_not_modify_automatic')) if group.automatic
 
     group.add(@user)
     GroupActionLogger.new(current_user, group).log_add_user_to_group(@user)
@@ -207,7 +209,9 @@ class Admin::UsersController < Admin::AdminController
 
   def remove_group
     group = Group.find(params[:group_id].to_i)
-    return render_json_error group unless group && !group.automatic
+
+    raise Discourse::NotFound unless group
+    return render_json_error(I18n.t('groups.errors.can_not_modify_automatic')) if group.automatic
 
     group.remove(@user)
     GroupActionLogger.new(current_user, group).log_remove_user_from_group(@user)
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 9699b21869..8481531b64 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -179,7 +179,10 @@ class CategoriesController < ApplicationController
 
     custom_slug = params[:slug].to_s
 
-    if custom_slug.present? && @category.update(slug: custom_slug)
+    if custom_slug.blank?
+      error = @category.errors.full_message(:slug, I18n.t('errors.messages.blank'))
+      render_json_error(error)
+    elsif @category.update(slug: custom_slug)
       render json: success_json
     else
       render_json_error(@category)
diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rb
index 506eb8f9e9..3861998812 100644
--- a/app/controllers/reviewables_controller.rb
+++ b/app/controllers/reviewables_controller.rb
@@ -227,11 +227,12 @@ protected
     return if SiteSetting.reviewable_claiming == "disabled" || reviewable.topic_id.blank?
 
     claimed_by_id = ReviewableClaimedTopic.where(topic_id: reviewable.topic_id).pluck(:user_id)[0]
-    if SiteSetting.reviewable_claiming == "required" && claimed_by_id.blank?
-      return I18n.t('reviewables.must_claim')
-    end
 
-    claimed_by_id.present? && claimed_by_id != current_user.id
+    if SiteSetting.reviewable_claiming == "required" && claimed_by_id.blank?
+      I18n.t('reviewables.must_claim')
+    elsif claimed_by_id.present? && claimed_by_id != current_user.id
+      I18n.t('reviewables.user_claimed')
+    end
   end
 
   def find_reviewable
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 238746ffb0..fe399566d2 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -368,7 +368,7 @@ class TopicsController < ApplicationController
 
     if changes.length > 0
       first_post = topic.ordered_posts.first
-      success = PostRevisor.new(first_post).revise!(current_user, changes, validate_post: false)
+      success = PostRevisor.new(first_post, topic).revise!(current_user, changes, validate_post: false)
     end
 
     # this is used to return the title to the client as it may have been changed by "TextCleaner"
diff --git a/app/models/published_page.rb b/app/models/published_page.rb
index da89df53bc..3c232b6547 100644
--- a/app/models/published_page.rb
+++ b/app/models/published_page.rb
@@ -24,6 +24,8 @@ class PublishedPage < ActiveRecord::Base
   end
 
   def self.publish!(publisher, topic, slug)
+    pp = nil
+
     transaction do
       pp = find_or_initialize_by(topic: topic)
       pp.slug = slug.strip
diff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb
index 727119a627..043ede89b5 100644
--- a/config/initializers/012-web_hook_events.rb
+++ b/config/initializers/012-web_hook_events.rb
@@ -26,7 +26,7 @@ end
 end
 
 DiscourseEvent.on(:post_edited) do |post, topic_changed|
-  if post.topic
+  unless post.topic&.trashed?
     WebHook.enqueue_post_hooks(:post_edited, post)
 
     if post.is_first_post? && topic_changed
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 2685292e69..0d60af6ae4 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -45,9 +45,12 @@ class PostRevisor
 
   attr_reader :category_changed
 
-  def initialize(post, topic = nil)
+  def initialize(post, topic = post.topic)
     @post = post
-    @topic = topic || post.topic
+    @topic = topic
+
+    # Make sure we have only one Topic instance
+    post.topic = topic
   end
 
   def self.tracked_topic_fields
@@ -383,7 +386,7 @@ class PostRevisor
         .where(action_type: UserAction::WAS_LIKED)
         .update_all(user_id: new_owner.id)
 
-      private_message = @post.topic.private_message?
+      private_message = @topic.private_message?
 
       prev_owner_user_stat = prev_owner.user_stat
       unless private_message
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
index ea7e77bbbd..7ddc1562fe 100644
--- a/spec/requests/admin/groups_controller_spec.rb
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -95,6 +95,33 @@ RSpec.describe Admin::GroupsController do
       expect(group.group_users.where(owner: true).map(&:user))
         .to contain_exactly(user, admin)
     end
+
+    it 'returns not-found error when there is no group' do
+      group.destroy!
+
+      put "/admin/groups/#{group.id}/owners.json", params: {
+        group: {
+          usernames: user.username
+        }
+      }
+
+      expect(response.status).to eq(404)
+    end
+
+    it 'does not allow adding owners to an automatic group' do
+      group.update!(automatic: true)
+
+      expect do
+        put "/admin/groups/#{group.id}/owners.json", params: {
+          group: {
+            usernames: user.username
+          }
+        }
+      end.to_not change { group.group_users.count }
+
+      expect(response.status).to eq(422)
+      expect(response.parsed_body["errors"]).to eq(["You cannot modify an automatic group"])
+    end
   end
 
   describe '#remove_owner' do
@@ -108,6 +135,27 @@ RSpec.describe Admin::GroupsController do
       expect(response.status).to eq(200)
       expect(group.group_users.where(owner: true)).to eq([])
     end
+
+    it 'returns not-found error when there is no group' do
+      group.destroy!
+
+      delete "/admin/groups/#{group.id}/owners.json", params: {
+        user_id: user.id
+      }
+
+      expect(response.status).to eq(404)
+    end
+
+    it 'does not allow removing owners from an automatic group' do
+      group.update!(automatic: true)
+
+      delete "/admin/groups/#{group.id}/owners.json", params: {
+        user_id: user.id
+      }
+
+      expect(response.status).to eq(422)
+      expect(response.parsed_body["errors"]).to eq(["You cannot modify an automatic group"])
+    end
   end
 
   describe "#bulk_perform" do
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 8d52b133f8..cb654a08c6 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -342,17 +342,54 @@ RSpec.describe Admin::UsersController do
 
       expect(response.status).to eq(200)
     end
+
+    it 'returns not-found error when there is no group' do
+      group.destroy!
+
+      put "/admin/users/#{user.id}/groups.json", params: {
+        group_id: group.id
+      }
+
+      expect(response.status).to eq(404)
+    end
+
+    it 'does not allow adding users to an automatic group' do
+      group.update!(automatic: true)
+
+      expect do
+        post "/admin/users/#{user.id}/groups.json", params: {
+          group_id: group.id
+        }
+      end.to_not change { group.users.count }
+
+      expect(response.status).to eq(422)
+      expect(response.parsed_body["errors"]).to eq(["You cannot modify an automatic group"])
+    end
   end
 
   describe '#remove_group' do
     it "also clears the user's primary group" do
-      u = Fabricate(:user)
-      g = Fabricate(:group, users: [u])
-      u.update!(primary_group_id: g.id)
-      delete "/admin/users/#{u.id}/groups/#{g.id}.json"
+      group = Fabricate(:group, users: [user])
+      user.update!(primary_group_id: group.id)
+      delete "/admin/users/#{user.id}/groups/#{group.id}.json"
 
       expect(response.status).to eq(200)
-      expect(u.reload.primary_group).to eq(nil)
+      expect(user.reload.primary_group).to eq(nil)
+    end
+
+    it 'returns not-found error when there is no group' do
+      delete "/admin/users/#{user.id}/groups/9090.json"
+
+      expect(response.status).to eq(404)
+    end
+
+    it 'does not allow removing owners from an automatic group' do
+      group = Fabricate(:group, users: [user], automatic: true)
+
+      delete "/admin/users/#{user.id}/groups/#{group.id}.json"
+
+      expect(response.status).to eq(422)
+      expect(response.parsed_body["errors"]).to eq(["You cannot modify an automatic group"])
     end
   end
 
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 8451936ccc..91b1e4ebbb 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -452,8 +452,9 @@ describe CategoriesController do
       end
 
       it 'rejects blank' do
-        put "/category/#{category.id}/slug.json", params: { slug: nil }
+        put "/category/#{category.id}/slug.json", params: { slug: '   ' }
         expect(response.status).to eq(422)
+        expect(response.parsed_body["errors"]).to eq(["Slug can't be blank"])
       end
 
       it 'accepts valid custom slug' do
diff --git a/spec/requests/published_pages_controller_spec.rb b/spec/requests/published_pages_controller_spec.rb
index 6b3a6894f4..ed50ed8811 100644
--- a/spec/requests/published_pages_controller_spec.rb
+++ b/spec/requests/published_pages_controller_spec.rb
@@ -114,6 +114,7 @@ RSpec.describe PublishedPagesController do
           PublishedPage.create!(slug: 'i-hate-salt', topic: Fabricate(:topic))
           put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }
           expect(response).not_to be_successful
+          expect(response.parsed_body['errors']).to eq(['Slug has already been taken'])
         end
 
         it "returns an error if the topic already has been published" do
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index e42d67ae40..3763b725e9 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -380,6 +380,7 @@ describe ReviewablesController do
           ReviewableClaimedTopic.create!(topic_id: qp.topic_id, user: Fabricate(:admin))
           put "/review/#{qp.id}/perform/approve_post.json?version=#{qp.version}"
           expect(response.code).to eq("422")
+          expect(response.parsed_body["errors"]).to match_array(["This item has been claimed by another user."])
         end
 
         it "works when claims are optional" do
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index c5ff3ecc7a..751c8bf88b 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -989,7 +989,7 @@ RSpec.describe TopicsController do
           }
 
           expect(response.status).to eq(422)
-          expect(JSON.parse(response.body)['errors']).to be_present
+          expect(response.parsed_body['errors']).to match_array([/Title is too short/, /Title seems unclear/])
         end
 
         it "returns errors when the rate limit is exceeded" do

From a781ef7662866942d3c0a17ddda59a656f514cb8 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:50:50 +0200
Subject: [PATCH 595/633] FIX: Reject invalid Category slugs (#9473)

Previously it would sanitize given slug and then save the resulting empty slug.
---
 app/models/category.rb                      |  7 ++++++-
 spec/requests/categories_controller_spec.rb |  3 ++-
 spec/requests/list_controller_spec.rb       | 11 +++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index c19d3848cc..192204d189 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -343,7 +343,12 @@ class Category < ActiveRecord::Base
       slug = SiteSetting.slug_generation_method == 'encoded' ? CGI.unescape(self.slug) : self.slug
       # sanitize the custom slug
       self.slug = Slug.sanitize(slug)
-      errors.add(:slug, 'is already in use') if duplicate_slug?
+
+      if self.slug.blank?
+        errors.add(:slug, :invalid)
+      elsif duplicate_slug?
+        errors.add(:slug, 'is already in use')
+      end
     else
       # auto slug
       self.slug = Slug.for(name, '')
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 91b1e4ebbb..97293742d3 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -481,8 +481,9 @@ describe CategoriesController do
       end
 
       it 'rejects invalid custom slug' do
-        put "/category/#{category.id}/slug.json", params: { slug: '  ' }
+        put "/category/#{category.id}/slug.json", params: { slug: '.' }
         expect(response.status).to eq(422)
+        expect(response.parsed_body["errors"]).to eq(["Slug is invalid"])
       end
     end
   end
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 83a46f3373..38daebea59 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -376,14 +376,9 @@ RSpec.describe ListController do
         # One category has another category's id at the beginning of its name
         let!(:other_category) {
           # Our validations don't allow this to happen now, but did historically
-          Fabricate(:category_with_definition, name: "#{category.id} name", slug: '-').tap { |c|
-            DB.exec <<~SQL
-              UPDATE categories
-              SET slug = '#{category.id}-name'
-              WHERE id = #{c.id}
-            SQL
-            c.reload
-          }
+          Fabricate(:category_with_definition, name: "#{category.id} name", slug: 'will-be-changed').tap do |category|
+            category.update_column(:slug, "#{category.id}-name")
+          end
         }
 
         it 'uses the correct category' do

From d123138d3a87ba29bd6e9df897b55b62d47ca4ae Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 21 Apr 2020 14:29:12 +1000
Subject: [PATCH 596/633] FIX: Only confirm bookmark delete if a reminder has
 been set (#9484)

We do not need a secondary bootbox confirm if the bookmark has no reminder, because nothing really will be lost in that case.
---
 .../discourse/controllers/bookmark.js         | 30 ++++++++++++-------
 config/locales/client.en.yml                  |  2 +-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 9f630ee913..604a6f2ee9 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -436,17 +436,25 @@ export default Controller.extend(ModalFunctionality, {
 
     delete() {
       this._deleting = true;
-      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
-        if (result) {
-          this._closeWithoutSaving = true;
-          this._deleteBookmark()
-            .then(() => {
-              this._deleting = false;
-              this.send("closeModal");
-            })
-            .catch(e => this._handleSaveError(e));
-        }
-      });
+      let deleteAction = () => {
+        this._closeWithoutSaving = true;
+        this._deleteBookmark()
+          .then(() => {
+            this._deleting = false;
+            this.send("closeModal");
+          })
+          .catch(e => this._handleSaveError(e));
+      };
+
+      if (this._existingBookmarkHasReminder()) {
+        bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
+          if (result) {
+            deleteAction();
+          }
+        });
+      } else {
+        deleteAction();
+      }
     },
 
     closeWithoutSavingBookmark() {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 947f19c3ba..1d881a1779 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -312,7 +312,7 @@ en:
       created_with_at_desktop_reminder: "you've bookmarked this post and will be reminded next time you are at your desktop"
       remove: "Remove Bookmark"
       delete: "Delete Bookmark"
-      confirm_delete: "Are you sure you want to delete this bookmark? If you set a reminder it will also be deleted."
+      confirm_delete: "Are you sure you want to delete this bookmark? The reminder will also be deleted."
       confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
       save: "Save"
       no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up <a href="%{basePath}/my/preferences/profile">in your profile</a>.'

From c08753dc3431ce2f85916b5a7e68db52891917d8 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 06:38:35 +0200
Subject: [PATCH 597/633] DEV: Fix topic_timer_spec (#9483)

File it under "how did it even work".
---
 spec/models/topic_timer_spec.rb | 42 ++++-----------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/spec/models/topic_timer_spec.rb b/spec/models/topic_timer_spec.rb
index 36d559af3e..ad093c223e 100644
--- a/spec/models/topic_timer_spec.rb
+++ b/spec/models/topic_timer_spec.rb
@@ -3,22 +3,11 @@
 require 'rails_helper'
 
 RSpec.describe TopicTimer, type: :model do
-  let(:topic_timer) {
-    # we should not need to do this but somehow
-    # fabricator is failing here
-    TopicTimer.create!(
-      user_id: -1,
-      topic: Fabricate(:topic),
-      execute_at: 1.hour.from_now,
-      status_type: TopicTimer.types[:close]
-    )
-  }
+  fab!(:topic_timer) { Fabricate(:topic_timer) }
   fab!(:topic) { Fabricate(:topic) }
   fab!(:admin) { Fabricate(:admin) }
 
-  before do
-    freeze_time Time.new(2018)
-  end
+  before { freeze_time }
 
   context "validations" do
     describe '#status_type' do
@@ -107,15 +96,7 @@ RSpec.describe TopicTimer, type: :model do
   context 'callbacks' do
     describe 'when #execute_at and #user_id are not changed' do
       it 'should not schedule another to update topic' do
-        Jobs.expects(:enqueue_at).with(
-          topic_timer.execute_at,
-          :toggle_topic_closed,
-          topic_timer_id: topic_timer.id,
-          state: true
-        ).once
-
-        topic_timer
-
+        Jobs.expects(:enqueue_at).never
         Jobs.expects(:cancel_scheduled_job).never
 
         topic_timer.update!(topic: Fabricate(:topic))
@@ -124,9 +105,6 @@ RSpec.describe TopicTimer, type: :model do
 
     describe 'when #execute_at value is changed' do
       it 'reschedules the job' do
-        freeze_time
-        topic_timer
-
         Jobs.expects(:cancel_scheduled_job).with(
           :toggle_topic_closed, topic_timer_id: topic_timer.id
         )
@@ -142,9 +120,6 @@ RSpec.describe TopicTimer, type: :model do
 
       describe 'when execute_at is smaller than the current time' do
         it 'should enqueue the job immediately' do
-          freeze_time
-          topic_timer
-
           Jobs.expects(:enqueue_at).with(
             Time.zone.now, :toggle_topic_closed,
             topic_timer_id: topic_timer.id,
@@ -161,15 +136,10 @@ RSpec.describe TopicTimer, type: :model do
 
     describe 'when user is changed' do
       it 'should update the job' do
-        freeze_time
-        topic_timer
-
         Jobs.expects(:cancel_scheduled_job).with(
           :toggle_topic_closed, topic_timer_id: topic_timer.id
         )
 
-        admin = Fabricate(:admin)
-
         Jobs.expects(:enqueue_at).with(
           topic_timer.execute_at,
           :toggle_topic_closed,
@@ -183,8 +153,7 @@ RSpec.describe TopicTimer, type: :model do
 
     describe 'when a open topic status update is created for an open topic' do
       fab!(:topic) { Fabricate(:topic, closed: false) }
-
-      let(:topic_timer) do
+      fab!(:topic_timer) do
         Fabricate(:topic_timer,
           status_type: described_class.types[:open],
           topic: topic
@@ -212,8 +181,7 @@ RSpec.describe TopicTimer, type: :model do
 
     describe 'when a close topic status update is created for a closed topic' do
       fab!(:topic) { Fabricate(:topic, closed: true) }
-
-      let(:topic_timer) do
+      fab!(:topic_timer) do
         Fabricate(:topic_timer,
           status_type: described_class.types[:close],
           topic: topic

From 776caa24c9454b67fd0d2c3737263c126eb3b557 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 21 Apr 2020 15:32:24 +1000
Subject: [PATCH 598/633] DEV: Bump optimist from 3.0.0 to 3.0.1 (#9476)

Bumps [optimist](https://github.com/ManageIQ/optimist) from 3.0.0 to 3.0.1.

Mostly about fixing tests and adding a license file
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9d94326c20..b79091b2c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -249,7 +249,7 @@ GEM
       nokogiri (~> 1.7)
       sanitize
     openssl-signature_algorithm (0.4.0)
-    optimist (3.0.0)
+    optimist (3.0.1)
     parallel (1.19.1)
     parallel_tests (2.32.0)
       parallel

From 6559ad0d808b5ceaf2366cefc77827e6bb074d9f Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Tue, 21 Apr 2020 08:02:13 -0500
Subject: [PATCH 599/633] FEATURE: Add copy button to codeblocks (#9451)

---
 .../discourse/initializers/copy-codeblocks.js | 157 ++++++++++++++++++
 .../stylesheets/common/base/topic-post.scss   |  28 ++++
 .../stylesheets/desktop/topic-post.scss       |  11 ++
 app/assets/stylesheets/mobile/topic-post.scss |   4 +
 config/locales/server.en.yml                  |   1 +
 config/site_settings.yml                      |   3 +
 6 files changed, 204 insertions(+)
 create mode 100644 app/assets/javascripts/discourse/initializers/copy-codeblocks.js

diff --git a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
new file mode 100644
index 0000000000..b9aaa325b0
--- /dev/null
+++ b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
@@ -0,0 +1,157 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { cancel, later } from "@ember/runloop";
+import { Promise } from "rsvp";
+import { iconHTML } from "discourse-common/lib/icon-library";
+
+// http://github.com/feross/clipboard-copy
+function clipboardCopy(text) {
+  // Use the Async Clipboard API when available. Requires a secure browsing
+  // context (i.e. HTTPS)
+  if (navigator.clipboard) {
+    return navigator.clipboard.writeText(text).catch(function(err) {
+      throw err !== undefined
+        ? err
+        : new DOMException("The request is not allowed", "NotAllowedError");
+    });
+  }
+
+  // ...Otherwise, use document.execCommand() fallback
+
+  // Put the text to copy into a <span>
+  const span = document.createElement("span");
+  span.textContent = text;
+
+  // Preserve consecutive spaces and newlines
+  span.style.whiteSpace = "pre";
+
+  // Add the <span> to the page
+  document.body.appendChild(span);
+
+  // Make a selection object representing the range of text selected by the user
+  const selection = window.getSelection();
+  const range = window.document.createRange();
+  selection.removeAllRanges();
+  range.selectNode(span);
+  selection.addRange(range);
+
+  // Copy text to the clipboard
+  let success = false;
+  try {
+    success = window.document.execCommand("copy");
+  } catch (err) {
+    // eslint-disable-next-line no-console
+    console.log("error", err);
+  }
+
+  // Cleanup
+  selection.removeAllRanges();
+  window.document.body.removeChild(span);
+
+  return success
+    ? Promise.resolve()
+    : Promise.reject(
+        new DOMException("The request is not allowed", "NotAllowedError")
+      );
+}
+
+let _copyCodeblocksClickHandlers = {};
+let _fadeCopyCodeblocksRunners = {};
+
+export default {
+  name: "copy-codeblocks",
+
+  initialize(container) {
+    withPluginApi("0.8.7", api => {
+      function _cleanUp() {
+        Object.values(_copyCodeblocksClickHandlers || {}).forEach(handler =>
+          handler.removeEventListener("click", _handleClick)
+        );
+
+        Object.values(_fadeCopyCodeblocksRunners || {}).forEach(runner =>
+          cancel(runner)
+        );
+
+        _copyCodeblocksClickHandlers = {};
+        _fadeCopyCodeblocksRunners = {};
+      }
+
+      function _handleClick(event) {
+        if (!event.target.classList.contains("copy-cmd")) {
+          return;
+        }
+
+        const button = event.target;
+        const code = button.nextSibling;
+
+        if (code) {
+          clipboardCopy(code.innerText.trim()).then(() => {
+            button.classList.add("copied");
+
+            const commandId = Ember.guidFor(button);
+
+            if (_fadeCopyCodeblocksRunners[commandId]) {
+              cancel(_fadeCopyCodeblocksRunners[commandId]);
+              delete _fadeCopyCodeblocksRunners[commandId];
+            }
+
+            _fadeCopyCodeblocksRunners[commandId] = later(() => {
+              button.classList.remove("copied");
+              delete _fadeCopyCodeblocksRunners[commandId];
+            }, 3000);
+          });
+        }
+      }
+
+      function _attachCommands(postElements, helper) {
+        if (!helper) {
+          return;
+        }
+
+        const siteSettings = container.lookup("site-settings:main");
+        const { isIE11 } = container.lookup("capabilities:main");
+        if (!siteSettings.show_copy_button_on_codeblocks || isIE11) {
+          return;
+        }
+
+        const commands = postElements[0].querySelectorAll(
+          ":scope > pre > code"
+        );
+
+        const post = helper.getModel();
+
+        if (!commands.length || !post) {
+          return;
+        }
+
+        const postElement = postElements[0];
+
+        commands.forEach(command => {
+          const button = document.createElement("button");
+          button.classList.add("btn", "nohighlight", "copy-cmd");
+          button.innerHTML = iconHTML("copy");
+          command.before(button);
+          command.parentElement.classList.add("copy-codeblocks");
+        });
+
+        if (_copyCodeblocksClickHandlers[post.id]) {
+          _copyCodeblocksClickHandlers[post.id].removeEventListener(
+            "click",
+            _handleClick
+          );
+
+          delete _copyCodeblocksClickHandlers[post.id];
+        }
+
+        _copyCodeblocksClickHandlers[post.id] = postElement;
+        postElement.addEventListener("click", _handleClick, false);
+      }
+
+      api.decorateCooked(_attachCommands, {
+        onlyStream: true,
+        id: "copy-codeblocks"
+      });
+
+      api.cleanupStream(_cleanUp);
+    });
+  }
+};
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index f4d20080d1..8960425f17 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -609,6 +609,34 @@ pre {
   }
 }
 
+.copy-codeblocks {
+  display: block;
+  position: relative;
+  overflow: visible;
+
+  .copy-cmd {
+    position: absolute;
+    top: 0;
+    right: 0;
+    min-height: 0;
+    font-size: $font-down-2;
+    min-height: 0;
+    font-size: $font-down-2;
+    user-select: none;
+
+    &.copied {
+      .d-icon {
+        color: $tertiary;
+      }
+    }
+
+    .d-icon {
+      pointer-events: none;
+      margin-right: 0;
+    }
+  }
+}
+
 kbd {
   border-radius: 3px;
   box-shadow: shadow("kbd");
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 2406f4e79b..ca304b8e95 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -247,6 +247,17 @@ nav.post-controls {
   }
 }
 
+pre.copy-codeblocks .copy-cmd:not(.copied) {
+  opacity: 0;
+  transition: 0.2s;
+  visibility: hidden;
+}
+
+pre.copy-codeblocks:hover .copy-cmd {
+  opacity: 1;
+  visibility: visible;
+}
+
 .embedded-posts {
   h1,
   h2,
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index e6c008c62d..d6fa6ff9d3 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -397,6 +397,10 @@ blockquote {
   margin-right: 0;
 }
 
+pre.copy-codeblocks code {
+  padding-right: 2.75em;
+}
+
 .gap {
   padding: 0.25em 0;
 }
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 2e73efe552..23f492a394 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2067,6 +2067,7 @@ en:
     warn_reviving_old_topic_age: "When someone starts replying to a topic where the last reply is older than this many days, a warning will be displayed. Disable by setting to 0."
     autohighlight_all_code: "Force apply code highlighting to all preformatted code blocks even when they didn't explicitly specify the language."
     highlighted_languages: "Included syntax highlighting rules. (Warning: including too many languages may impact performance) see: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> for a demo"
+    show_copy_button_on_codeblocks: "Add a button to codeblocks to copy the block contents to the user's clipboard. This feature is not supported on Internet Explorer."
 
     embed_any_origin: "Allow embeddable content regardless of origin. This is required for mobile apps with static HTML."
     embed_topics_list: "Support HTML embedding of topics lists"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 4684b7d4ca..0828616904 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -850,6 +850,9 @@ posting:
     type: list
     client: true
     list_type: compact
+  show_copy_button_on_codeblocks:
+    client: true
+    default: false
   delete_old_hidden_posts: true
   enable_emoji:
     default: true

From 4f834f0008ca424b85e13b42816e920457605c3d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Apr 2020 16:20:05 +0200
Subject: [PATCH 600/633] DEV: allows click to propagate outside of header but
 not outside of sk (#9491)

---
 app/assets/javascripts/select-kit/components/select-kit.js    | 4 ++++
 .../select-kit/components/select-kit/select-kit-header.js     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 828ee6c765..7898179be0 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -122,6 +122,10 @@ export default Component.extend(
       );
     },
 
+    click(event) {
+      event.stopPropagation();
+    },
+
     _modifyComponentForRowWrapper(collection, item) {
       let component = this.modifyComponentForRow(collection, item);
       return component || "select-kit/select-kit-row";
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
index 6ec3984a98..61f57d1b5d 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
@@ -13,7 +13,7 @@ export default Component.extend(UtilsMixin, {
       return;
     if (this.eventType !== "click" || event.button !== 0) return;
     this.selectKit.toggle(event);
-    return false;
+    event.preventDefault();
   },
 
   classNames: ["select-kit-header"],

From 79058a6d99829b1582ad1e7319a610f29a272eba Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Apr 2020 16:48:49 +0200
Subject: [PATCH 601/633] DEV: makes sk scroll to current selection (#9492)

---
 .../select-kit/components/select-kit.js       | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 7898179be0..a98687caab 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -883,10 +883,31 @@ export default Component.extend(
 
       this._safeAfterRender(() => {
         this._focusFilter();
+        this._scrollToCurrent();
         this.popper && this.popper.update();
       });
     },
 
+    _scrollToCurrent() {
+      if (this.value && this.mainCollection) {
+        let highlighted;
+        if (this.valueProperty) {
+          highlighted = this.mainCollection.findBy(
+            this.valueProperty,
+            this.value
+          );
+        } else {
+          const index = this.mainCollection.indexOf(this.value);
+          highlighted = this.mainCollection.objectAt(index);
+        }
+
+        if (highlighted) {
+          this._scrollToRow(highlighted);
+          this.set("selectKit.highlighted", highlighted);
+        }
+      }
+    },
+
     _focusFilter(forceHeader = false) {
       this._safeAfterRender(() => {
         const input = this.getFilterInput();

From 62459c845f1b14b6516e85f9dd068823d39572d3 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Apr 2020 17:11:40 +0200
Subject: [PATCH 602/633] DEV: allows a sk component to stop click propagation
 (#9495)

---
 app/assets/javascripts/select-kit/components/select-kit.js | 7 +++++--
 .../templates/components/topic-notifications-button.hbs    | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index a98687caab..4fdbd62928 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -123,7 +123,9 @@ export default Component.extend(
     },
 
     click(event) {
-      event.stopPropagation();
+      if (this.selectKit.options.preventsClickPropagation) {
+        event.stopPropagation();
+      }
     },
 
     _modifyComponentForRowWrapper(collection, item) {
@@ -270,7 +272,8 @@ export default Component.extend(
       placementStrategy: null,
       filterComponent: "select-kit/select-kit-filter",
       selectedNameComponent: "selected-name",
-      castInteger: false
+      castInteger: false,
+      preventsClickPropagation: false
     },
 
     autoFilterable: computed("content.[]", "selectKit.filter", function() {
diff --git a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
index a57b6b8584..b111dd6a58 100644
--- a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
@@ -5,6 +5,7 @@
   options=(hash
     showFullTitle=showFullTitle
     placement=placement
+    preventsClickPropagation=true
   )
 }}
 

From c9cdd12e97ec12d0683e0aa0c103715a5f6fc73d Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Tue, 21 Apr 2020 10:12:56 -0500
Subject: [PATCH 603/633] FIX: Improve selector for copy codeblock button
 (#9493)

Previous selector implementation was not accounting for codeblocks in
nested elements, like lists.
---
 .../javascripts/discourse/initializers/copy-codeblocks.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
index b9aaa325b0..777400db57 100644
--- a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
+++ b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
@@ -114,7 +114,7 @@ export default {
         }
 
         const commands = postElements[0].querySelectorAll(
-          ":scope > pre > code"
+          ":scope > pre > code, :scope :not(article) > pre > code"
         );
 
         const post = helper.getModel();

From 1eb9bc4cecddeccc1fc7bf702dae451a608e313d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Apr 2020 17:27:17 +0200
Subject: [PATCH 604/633] DEV: encapsulates _events and clearing it at
 app-events module level (#9489)

---
 .../discourse/services/app-events.js          | 38 +++++++++++++------
 test/javascripts/test_helper.js               | 13 ++-----
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/discourse/services/app-events.js b/app/assets/javascripts/discourse/services/app-events.js
index 8a3e770c75..8d8761fade 100644
--- a/app/assets/javascripts/discourse/services/app-events.js
+++ b/app/assets/javascripts/discourse/services/app-events.js
@@ -2,21 +2,37 @@ import deprecated from "discourse-common/lib/deprecated";
 import Evented from "@ember/object/evented";
 import Service from "@ember/service";
 
-export default Service.extend(Evented, {
-  _events: {},
+let _events = {};
 
+export function clearAppEventsCache(container) {
+  if (container) {
+    const appEvents = container.lookup("service:app-events");
+    Object.keys(_events).forEach(eventKey => {
+      const event = _events[eventKey];
+      event.forEach(listener => {
+        if (appEvents.has(eventKey)) {
+          appEvents.off(eventKey, listener.target, listener.fn);
+        }
+      });
+    });
+  }
+
+  _events = {};
+}
+
+export default Service.extend(Evented, {
   on() {
     if (arguments.length === 2) {
       let [name, fn] = arguments;
       let target = {};
-      this._events[name] = this._events[name] || [];
-      this._events[name].push({ target, fn });
+      _events[name] = _events[name] || [];
+      _events[name].push({ target, fn });
 
       this._super(name, target, fn);
     } else if (arguments.length === 3) {
       let [name, target, fn] = arguments;
-      this._events[name] = this._events[name] || [];
-      this._events[name].push({ target, fn });
+      _events[name] = _events[name] || [];
+      _events[name].push({ target, fn });
 
       this._super(...arguments);
     }
@@ -27,21 +43,21 @@ export default Service.extend(Evented, {
     let name = arguments[0];
     let fn = arguments[2];
 
-    if (this._events[name]) {
+    if (_events[name]) {
       if (arguments.length === 1) {
         deprecated(
           "Removing all event listeners at once is deprecated, please remove each listener individually."
         );
 
-        this._events[name].forEach(ref => {
+        _events[name].forEach(ref => {
           this._super(name, ref.target, ref.fn);
         });
-        delete this._events[name];
+        delete _events[name];
       } else if (arguments.length === 3) {
         this._super(...arguments);
 
-        this._events[name] = this._events[name].filter(e => e.fn !== fn);
-        if (this._events[name].length === 0) delete this._events[name];
+        _events[name] = _events[name].filter(e => e.fn !== fn);
+        if (_events[name].length === 0) delete _events[name];
       }
     }
 
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 38afc19d67..d15cd7c8fb 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -189,16 +189,9 @@ QUnit.testDone(function() {
   // ensures any event not removed is not leaking between tests
   // most likely in intialisers, other places (controller, component...)
   // should be fixed in code
-  var appEvents = window.Discourse.__container__.lookup("service:app-events");
-  var events = appEvents.__proto__._events;
-  Object.keys(events).forEach(function(eventKey) {
-    var event = events[eventKey];
-    event.forEach(function(listener) {
-      if (appEvents.has(eventKey)) {
-        appEvents.off(eventKey, listener.target, listener.fn);
-      }
-    });
-  });
+  require("discourse/services/app-events").clearAppEventsCache(
+    window.Discourse.__container__
+  );
 
   window.MessageBus.unsubscribe("*");
   delete window.server;

From fe579c918f5a69d9027a1f94a8753f80cf6d8b48 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Apr 2020 11:55:35 -0400
Subject: [PATCH 605/633] DEV: fix failing test relating to sk click
 propagation

* followup to 62459c84
---
 test/javascripts/components/select-kit/single-select-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/components/select-kit/single-select-test.js b/test/javascripts/components/select-kit/single-select-test.js
index 88dbbacf9e..ac53d73bf7 100644
--- a/test/javascripts/components/select-kit/single-select-test.js
+++ b/test/javascripts/components/select-kit/single-select-test.js
@@ -241,7 +241,7 @@ componentTest("selected value can be 0", {
 
 componentTest("prevents propagating click event on header", {
   template:
-    "{{#d-button icon='times' action=onClick}}{{single-select value=value content=content}}{{/d-button}}",
+    "{{#d-button icon='times' action=onClick}}{{single-select options=(hash preventsClickPropagation=true) value=value content=content}}{{/d-button}}",
 
   beforeEach() {
     this.setProperties({

From 07e0490fe4763ecbd72e7f4666e476f93a13bde2 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 18:32:42 +0200
Subject: [PATCH 606/633] DEV: Update mocha (#9490)

The spec that was blocking the update was fixed in c08753dc3431ce2f85916b5a7e68db52891917d8.
---
 Gemfile      | 5 +----
 Gemfile.lock | 6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index d0844e45e8..c440694fff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -160,10 +160,7 @@ group :test, :development do
   gem 'listen', require: false
   gem 'certified', require: false
   gem 'fabrication', require: false
-
-  # TODO: upgrading to 1.10.1 cause it breaks our test suite.
-  # We want our test suite fixed though to support this upgrade.
-  gem 'mocha', '1.8.0', require: false
+  gem 'mocha', require: false
 
   gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b79091b2c2..3a60704820 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -184,7 +184,6 @@ GEM
     memory_profiler (0.9.14)
     message_bus (2.2.4)
       rack (>= 1.1.3)
-    metaclass (0.0.4)
     method_source (0.9.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
@@ -196,8 +195,7 @@ GEM
     mini_suffix (0.3.0)
       ffi (~> 1.9)
     minitest (5.14.0)
-    mocha (1.8.0)
-      metaclass (~> 0.0.1)
+    mocha (1.11.2)
     mock_redis (0.22.0)
     msgpack (1.3.3)
     multi_json (1.14.1)
@@ -488,7 +486,7 @@ DEPENDENCIES
   mini_sql
   mini_suffix
   minitest
-  mocha (= 1.8.0)
+  mocha
   mock_redis
   multi_json
   mustache

From c4cc19a2ba5e1ea3be0f527d8349bfaa2a8726b3 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 21 Apr 2020 09:58:46 -0700
Subject: [PATCH 607/633] Revert "DEV: allow nav items to override computed
 property values"

This reverts commit 74e4102093c6aa497fe48947afbec9751b21721a.
---
 .../javascripts/discourse/models/nav-item.js  | 39 -------------------
 1 file changed, 39 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/nav-item.js b/app/assets/javascripts/discourse/models/nav-item.js
index bc78b0a1a9..83330778e0 100644
--- a/app/assets/javascripts/discourse/models/nav-item.js
+++ b/app/assets/javascripts/discourse/models/nav-item.js
@@ -92,45 +92,6 @@ const ExtraNavItem = NavItem.extend({
       return (this._href = value);
     }
   }),
-  displayName: discourseComputed("displayName", {
-    get() {
-      if (this._displayName) {
-        return this._displayName;
-      }
-
-      return this.displayName;
-    },
-
-    set(key, value) {
-      return (this._displayName = value);
-    }
-  }),
-  filterMode: discourseComputed("filterMode", {
-    get() {
-      if (this._filterMode) {
-        return this._filterMode;
-      }
-
-      return this.filterMode;
-    },
-
-    set(key, value) {
-      return (this._filterMode = value);
-    }
-  }),
-  title: discourseComputed("title", {
-    get() {
-      if (this._title) {
-        return this._title;
-      }
-
-      return this.title;
-    },
-
-    set(key, value) {
-      return (this._title = value);
-    }
-  }),
 
   count: 0,
 

From ffa0a188416bf73d81962ab5bf42b1c09b69586e Mon Sep 17 00:00:00 2001
From: Dax74 <Dax74@users.noreply.github.com>
Date: Tue, 21 Apr 2020 19:35:03 +0200
Subject: [PATCH 608/633] Update bookmark step

See https://dev.discourse.org/t/discobot-tutorial-for-bookmarks/27466 for details
---
 plugins/discourse-narrative-bot/config/locales/server.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index 86d081b5bb..def563ed26 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -242,7 +242,7 @@ en:
 
       bookmark:
         instructions: |-
-          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message**. If you do, there may be a :gift: in your future!
+          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message** selecting "no reminder needed". If you do, there may be a :gift: in your future!
         reply: |-
           Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{bookmark_url}). Just select your profile picture at the upper right &#8599;
         not_found: |-

From 63811707e8e02fce8ec2796d72ebdf807a5396ea Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 21 Apr 2020 13:48:04 -0400
Subject: [PATCH 609/633] DEV: Remove `setupTopicController` event

---
 app/assets/javascripts/discourse/routes/topic.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/routes/topic.js
index b9d6aaf177..6f7fd410c6 100644
--- a/app/assets/javascripts/discourse/routes/topic.js
+++ b/app/assets/javascripts/discourse/routes/topic.js
@@ -4,8 +4,6 @@ import { cancel, later, schedule } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
-import Evented from "@ember/object/evented";
-import EmberObject from "@ember/object";
 
 const SCROLL_DELAY = 500;
 
@@ -313,8 +311,6 @@ const TopicRoute = DiscourseRoute.extend({
       firstPostExpanded: false
     });
 
-    TopicRoute.trigger("setupTopicController", this);
-
     this.searchService.set("searchContext", model.get("searchContext"));
 
     // close the multi select when switching topics
@@ -333,9 +329,4 @@ const TopicRoute = DiscourseRoute.extend({
   }
 });
 
-// TODO: Remove this - it's barely used.
-const events = EmberObject.extend(Evented).create();
-TopicRoute.on = events.on;
-TopicRoute.trigger = events.trigger;
-
 export default TopicRoute;

From a97cb2444cc67393c900fc7c80b43ce2c426b0fb Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 21 Apr 2020 19:00:47 +0100
Subject: [PATCH 610/633] UX: Fix broken image placeholder styling

---
 app/assets/stylesheets/common/base/topic-post.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 8960425f17..d6bf0ec166 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -886,6 +886,7 @@ a.mention-group {
 }
 
 .broken-image {
+  display: inline-flex;
   color: dark-light-choose($primary-low-mid, $secondary-high);
   border: 1px solid $primary-low;
   font-size: $font-up-5;

From 036236d6d62a7755e73018025888ad971e84516e Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 21 Apr 2020 13:01:57 -0500
Subject: [PATCH 611/633] FIX: properly add 'two-rows' class to
 header-topic-info container (#9497)

---
 .../discourse/widgets/header-topic-info.js    | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js b/app/assets/javascripts/discourse/widgets/header-topic-info.js
index 1e31cf5fbf..b3c6da04ed 100644
--- a/app/assets/javascripts/discourse/widgets/header-topic-info.js
+++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js
@@ -56,9 +56,12 @@ createWidget("topic-header-participant", {
 
 export default createWidget("header-topic-info", {
   tagName: "div.extra-info-wrapper",
+  contents: null,
+  title: null,
 
-  buildClasses(attrs) {
-    return this.showCategory(attrs.topic) ? "two-rows" : "";
+  buildClasses(attrs, state) {
+    this.buildAttributes(attrs, state);
+    return this.containerClassName();
   },
 
   buildFancyTitleClass() {
@@ -73,7 +76,7 @@ export default createWidget("header-topic-info", {
       .join(" ");
   },
 
-  html(attrs, state) {
+  buildAttributes(attrs, state) {
     const topic = attrs.topic;
 
     const heading = [];
@@ -112,11 +115,15 @@ export default createWidget("header-topic-info", {
       );
     }
 
-    const title = [h("h1.header-title", heading)];
+    this.title = [h("h1.header-title", heading)];
     const category = topic.get("category");
 
     if (loaded || category) {
-      if (this.showCategory(topic)) {
+      if (
+        category &&
+        (!category.isUncategorizedCategory ||
+          !this.siteSettings.suppress_uncategorized_badge)
+      ) {
         const parentCategory = category.get("parentCategory");
         const categories = [];
         if (parentCategory) {
@@ -126,7 +133,7 @@ export default createWidget("header-topic-info", {
         }
         categories.push(this.attach("category-link", { category }));
 
-        title.push(h("div.categories-wrapper", categories));
+        this.title.push(h("div.categories-wrapper", categories));
       }
 
       let extra = [];
@@ -196,24 +203,23 @@ export default createWidget("header-topic-info", {
         }
       }
       if (extra.length) {
-        title.push(h("div.topic-header-extra", extra));
+        this.title.push(h("div.topic-header-extra", extra));
       }
     }
 
-    const contents = h("div.title-wrapper", title);
+    this.contents = h("div.title-wrapper", this.title);
+  },
+
+  html() {
     return h(
       "div.extra-info",
-      { className: title.length > 1 ? "two-rows" : "" },
-      contents
+      { className: this.containerClassName() },
+      this.contents
     );
   },
 
-  showCategory(topic) {
-    return (
-      topic.category &&
-      (!topic.category.isUncategorizedCategory ||
-        !this.siteSettings.suppress_uncategorized_badge)
-    );
+  containerClassName() {
+    return this.title.length > 1 ? "two-rows" : "";
   },
 
   jumpToTopPost() {

From f51b48b421902e6552bbc347cd264331e7eeb1f5 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 21 Apr 2020 17:52:19 +0100
Subject: [PATCH 612/633] PERF: Improve lazy-load performance in Safari

Safari starts loading images as soon as attributes are modified. Modern browsers all prefer the srcset attribute over src, so we should remove srcset last, and add it first.
---
 app/assets/javascripts/discourse/lib/lazy-load-images.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/lazy-load-images.js b/app/assets/javascripts/discourse/lib/lazy-load-images.js
index a8f30a3998..f326b2ebf2 100644
--- a/app/assets/javascripts/discourse/lib/lazy-load-images.js
+++ b/app/assets/javascripts/discourse/lib/lazy-load-images.js
@@ -22,9 +22,10 @@ function hide(image) {
     height: image.height,
     className: image.className
   });
-  image.removeAttribute("srcset");
 
   image.src = image.dataset.smallUpload || LOADING_DATA;
+  image.removeAttribute("srcset");
+
   image.removeAttribute("data-small-upload");
 }
 
@@ -35,10 +36,10 @@ function show(image) {
   if (imageData) {
     const copyImg = new Image();
     copyImg.onload = () => {
-      image.src = copyImg.src;
       if (copyImg.srcset) {
         image.srcset = copyImg.srcset;
       }
+      image.src = copyImg.src;
       image.classList.remove("d-lazyload-hidden");
 
       if (image.onload) {
@@ -55,12 +56,12 @@ function show(image) {
       copyImg.onload = null;
     };
 
-    copyImg.src = imageData.src;
-
     if (imageData.srcset) {
       copyImg.srcset = imageData.srcset;
     }
 
+    copyImg.src = imageData.src;
+
     // width of image may not match, use computed style which
     // is the actual size of the image
     const computedStyle = window.getComputedStyle(image);

From b6489d269045d28ad1f8c6dc7e41f991390f002c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 21 Apr 2020 17:34:59 -0400
Subject: [PATCH 613/633] UX: Replaced locked topic "lock" icon with
 "comment-slash" icon

---
 .../javascripts/discourse/components/topic-status.js | 12 +++++++++---
 .../discourse/controllers/topic-bulk-actions.js      |  2 +-
 .../discourse/helpers/topic-status-icons.js          |  6 +++---
 .../javascripts/discourse/raw-views/topic-status.js  |  9 ++++++---
 app/assets/javascripts/discourse/templates/user.hbs  |  2 +-
 .../discourse/widgets/post-small-action.js           | 10 +++++-----
 .../discourse/widgets/topic-admin-menu.js            |  6 +++---
 lib/svg_sprite/svg_sprite.rb                         |  2 ++
 vendor/assets/svg-icons/discourse-additional.svg     |  9 +++++++++
 9 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/topic-status.js b/app/assets/javascripts/discourse/components/topic-status.js
index 569292eb5e..19f16b3ca3 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js
+++ b/app/assets/javascripts/discourse/components/topic-status.js
@@ -23,15 +23,21 @@ export default Component.extend({
   @discourseComputed("topic.closed", "topic.archived")
   topicClosedArchived(closed, archived) {
     if (closed && archived) {
-      this._set("closedArchived", "lock", "locked_and_archived");
+      this._set(
+        "closedArchived",
+        "discourse-comment-slash",
+        "locked_and_archived"
+      );
       this._reset("closed");
       this._reset("archived");
       return true;
     } else {
       this._reset("closedArchived");
-      closed ? this._set("closed", "lock", "locked") : this._reset("closed");
+      closed
+        ? this._set("closed", "discourse-comment-slash", "locked")
+        : this._reset("closed");
       archived
-        ? this._set("archived", "lock", "archived")
+        ? this._set("archived", "discourse-comment-slash", "archived")
         : this._reset("archived");
       return false;
     }
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
index 723e7fee54..d8416436b5 100644
--- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
+++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
@@ -30,7 +30,7 @@ addBulkButton("showChangeCategory", "change_category", {
   class: "btn-default"
 });
 addBulkButton("closeTopics", "close_topics", {
-  icon: "lock",
+  icon: "discourse-comment-slash",
   class: "btn-default"
 });
 addBulkButton("archiveTopics", "archive_topics", {
diff --git a/app/assets/javascripts/discourse/helpers/topic-status-icons.js b/app/assets/javascripts/discourse/helpers/topic-status-icons.js
index 2f2da65a25..a1776e4f6f 100644
--- a/app/assets/javascripts/discourse/helpers/topic-status-icons.js
+++ b/app/assets/javascripts/discourse/helpers/topic-status-icons.js
@@ -10,10 +10,10 @@ export default ArrayProxy.extend({
     };
 
     if (topic.get("closed") && topic.get("archived")) {
-      renderIcon("lock", "locked_and_archived");
+      renderIcon("discourse-comment-slash", "locked_and_archived");
     } else {
-      renderIconIf("closed", "lock", "locked");
-      renderIconIf("archived", "lock", "archived");
+      renderIconIf("closed", "discourse-comment-slash", "locked");
+      renderIconIf("archived", "discourse-comment-slash", "archived");
     }
 
     this.forEach(args => renderIconIf(...args));
diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js b/app/assets/javascripts/discourse/raw-views/topic-status.js
index d6b2c74999..ba8bf33511 100644
--- a/app/assets/javascripts/discourse/raw-views/topic-status.js
+++ b/app/assets/javascripts/discourse/raw-views/topic-status.js
@@ -38,11 +38,14 @@ export default EmberObject.extend({
     }
 
     if (topic.get("closed") && topic.get("archived")) {
-      results.push({ icon: "lock", key: "locked_and_archived" });
+      results.push({
+        icon: "discourse-comment-slash",
+        key: "locked_and_archived"
+      });
     } else if (topic.get("closed")) {
-      results.push({ icon: "lock", key: "locked" });
+      results.push({ icon: "discourse-comment-slash", key: "locked" });
     } else if (topic.get("archived")) {
-      results.push({ icon: "lock", key: "archived" });
+      results.push({ icon: "discourse-comment-slash", key: "archived" });
     }
 
     if (topic.get("pinned")) {
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 9290b1d832..ceed565516 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -233,7 +233,7 @@
           {{#if showNotificationsTab}}
             <li>
               {{#link-to 'userNotifications'}}
-                {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
+                {{d-icon "discourse-comment" class="glyph"}}{{i18n 'user.notifications'}}
               {{/link-to}}
             </li>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js b/app/assets/javascripts/discourse/widgets/post-small-action.js
index 709d70153a..19e4531259 100644
--- a/app/assets/javascripts/discourse/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/widgets/post-small-action.js
@@ -32,10 +32,10 @@ export function actionDescription(actionCode, createdAt, username) {
 }
 
 const icons = {
-  "closed.enabled": "lock",
-  "closed.disabled": "unlock-alt",
-  "autoclosed.enabled": "lock",
-  "autoclosed.disabled": "unlock-alt",
+  "closed.enabled": "discourse-comment-slash",
+  "closed.disabled": "discourse-comment",
+  "autoclosed.enabled": "discourse-comment-slash",
+  "autoclosed.disabled": "discourse-comment",
   "archived.enabled": "folder",
   "archived.disabled": "folder-open",
   "pinned.enabled": "thumbtack",
@@ -52,7 +52,7 @@ const icons = {
   user_left: "minus-circle",
   removed_user: "minus-circle",
   removed_group: "minus-circle",
-  public_topic: "comment",
+  public_topic: "discourse-comment",
   private_topic: "envelope",
   autobumped: "hand-point-right"
 };
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
index e5c8138673..edf9d4a14a 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
@@ -165,7 +165,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-open",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "unlock",
+          icon: "discourse-comment",
           label: "actions.open"
         });
       } else {
@@ -173,7 +173,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-close",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "lock",
+          icon: "discourse-comment-slash",
           label: "actions.close"
         });
       }
@@ -239,7 +239,7 @@ export default createWidget("topic-admin-menu", {
           action: isPrivateMessage
             ? "convertToPublicTopic"
             : "convertToPrivateMessage",
-          icon: isPrivateMessage ? "comment" : "envelope",
+          icon: isPrivateMessage ? "discourse-comment" : "envelope",
           label: isPrivateMessage
             ? "actions.make_public"
             : "actions.make_private"
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index f2c4bcdbb7..4fdc3e5a87 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -62,6 +62,8 @@ module SvgSprite
     "discourse-bell-one",
     "discourse-bell-slash",
     "discourse-compress",
+    "discourse-comment",
+    "discourse-comment-slash",
     "discourse-expand",
     "download",
     "ellipsis-h",
diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg
index 343b5b6abc..e3adf58e0c 100644
--- a/vendor/assets/svg-icons/discourse-additional.svg
+++ b/vendor/assets/svg-icons/discourse-additional.svg
@@ -27,4 +27,13 @@ Additional SVG icons
   <symbol id='discourse-bell-slash' viewBox="0 0 448 512">
     <path d="M442.7 396.2L36.5 70.7c-6.9-5.5-17-4.4-22.5 2.5L4 85.6c-5.5 6.9-4.4 17 2.5 22.5l406.2 325.5c6.9 5.5 17 4.4 22.5-2.5l10-12.5c5.5-6.9 3.7-17.7-3.2-23.2l.7.8zM67.5 368c16.7-22 34.5-55.8 41.4-110.6l-45.5-35.6C60.2 312.6 27 342.5 8.6 362.3 2.6 368.7 0 376.4 0 384c.1 16.4 13 32 32.1 32h279.7l-61.4-48H67.5zM224 96c61.9 0 112 50.1 112 112 0 .2-.1.4-.1.6 0 16.8 1.2 31.8 2.8 45.7l59.5 46.5c-8.3-22.1-14.3-51.5-14.3-92.9 0-77.7-54.5-139.9-127.9-155.2V32c0-17.7-14.3-32-32-32s-32 14.3-32 32v20.8c-26 5.4-49.4 16.9-69.1 32.7l38.2 29.8C179 103.2 200.6 96 224 96zm0 416c35.3 0 64-28.6 64-64H160c0 35.4 28.7 64 64 64z"/>
   </symbol>
+  <!-- "Discourse Comment Slash" is a version of https://fontawesome.com/icons/comment-slash?style=regular that has been recreated to be more legible at small sizes  -->
+  <symbol id='discourse-comment-slash' viewBox="0 0 640 512">
+    <path d="M634 471L481.6 351.8l-6.8-5.3L36 3.5C29.1-2 19-.9 13.5 6l-10 12.5C-2 25.4-.9 35.5 6 41l598 467.5c6.9 5.5 17 4.4 22.5-2.5l10-12.5c5.5-6.9 4.4-17-2.5-22.5zM224.2 89.9c36.8-19.6 81.2-29.1 127.6-24.6 59 5.6 113 33.3 148 76.1 29.5 36 43.3 80 38.8 123.7-2.1 20.4-8 39.7-17 57.3l41.6 32.5c14.8-25.9 24.1-54.4 27.2-84.5 5.9-57.7-11.9-115.2-50.3-162-43.8-53.4-110.7-88-183.4-94.9-63.4-6.1-125.6 8.8-176.5 42l44 34.4zM407.1 416c-22 7.2-45.8 11.1-70.4 11.1-7.4 0-14.9-.4-22.5-1.1-29.6-2.8-57.7-11-83.6-24.4-3.7-1.9-7.8-2.9-11.9-2.9-2.2 0-4.4.3-6.6.9l-102.9 27 38.5-87c3.9-8.7 2.6-18.9-3.2-26.5-15.2-19.6-20.9-48.8-17-86.9.9-8.6 2.5-17 4.7-25.2l-43.6-34.1c-6.5 17.2-10.8 35.3-12.8 54-4.6 44.6 1.7 81.8 18.6 110.7L39.7 454.9c-4 9.1-2.5 19.8 4 27.4 5 5.9 12.3 9.2 19.8 9.2 2.2 0 4.4-.3 6.6-.9l145.8-38.2c29.3 13.8 60.6 22.3 93.4 25.4 9.2.9 18.5 1.3 27.6 1.3 41.4 0 81.5-8.9 117.7-25.9L407.1 416z"/>
+  </symbol>
+  <!-- "Discourse Comment" is a Discourse derivative of https://fontawesome.com/icons/comment?style=regular that has been built to match the custom discourse-comment-slash icon  -->
+  <symbol id='discourse-comment' viewBox="0 0 554 479.3">
+    <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
+  </symbol>
+
 </svg>

From d1bee13fdab8e88e032c33bb039052c9d9848d53 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 21 Apr 2020 17:57:25 -0400
Subject: [PATCH 614/633] test fix

---
 test/javascripts/widgets/topic-status-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/widgets/topic-status-test.js b/test/javascripts/widgets/topic-status-test.js
index c5888d4aa4..5cc6f9d437 100644
--- a/test/javascripts/widgets/topic-status-test.js
+++ b/test/javascripts/widgets/topic-status-test.js
@@ -12,7 +12,7 @@ widgetTest("basics", {
     });
   },
   test(assert) {
-    assert.ok(find(".topic-status .d-icon-lock").length);
+    assert.ok(find(".topic-status .d-icon-discourse-comment-slash").length);
   }
 });
 

From e18aeb799e562386dac6f530ef8b91fc9156f616 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 22 Apr 2020 10:44:04 +1000
Subject: [PATCH 615/633] FIX: Make sure reminder_type is parsed on bookmark
 update (#9503)

Otherwise we are trying to update the reminder type with a string which often evaluates to 0 (At Desktop) which causes reminders to come through early.
---
 lib/bookmark_manager.rb           | 19 ++++++++++++++-----
 spec/lib/bookmark_manager_spec.rb | 17 +++++++++++++----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index b56a129f10..ee69db4ec9 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -9,7 +9,7 @@ class BookmarkManager
 
   def create(post_id:, name: nil, reminder_type: nil, reminder_at: nil)
     post = Post.unscoped.includes(:topic).find(post_id)
-    reminder_type = Bookmark.reminder_types[reminder_type.to_sym] if reminder_type.present?
+    reminder_type = parse_reminder_type(reminder_type)
 
     raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_see_post?(post)
 
@@ -74,16 +74,20 @@ class BookmarkManager
     raise Discourse::NotFound if bookmark.blank?
     raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_edit?(bookmark)
 
-    if bookmark.errors.any?
-      return add_errors_from(bookmark)
-    end
+    reminder_type = parse_reminder_type(reminder_type)
 
-    bookmark.update(
+    success = bookmark.update(
       name: name,
       reminder_at: reminder_at,
       reminder_type: reminder_type,
       reminder_set_at: Time.zone.now
     )
+
+    if bookmark.errors.any?
+      return add_errors_from(bookmark)
+    end
+
+    success
   end
 
   private
@@ -100,4 +104,9 @@ class BookmarkManager
   def update_topic_user_bookmarked(topic:, bookmarked:)
     TopicUser.change(@user.id, topic, bookmarked: bookmarked)
   end
+
+  def parse_reminder_type(reminder_type)
+    return if reminder_type.blank?
+    reminder_type.is_a?(Integer) ? reminder_type : Bookmark.reminder_types[reminder_type.to_sym]
+  end
 end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 979f567433..9dfe6ff23a 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -181,10 +181,19 @@ RSpec.describe BookmarkManager do
 
     it "saves the time and new reminder type sucessfully" do
       update_bookmark
-       bookmark.reload
-       expect(bookmark.name).to eq(new_name)
-       expect(bookmark.reminder_at).to eq_time(new_reminder_at)
-       expect(bookmark.reminder_type).to eq(new_reminder_type)
+      bookmark.reload
+      expect(bookmark.name).to eq(new_name)
+      expect(bookmark.reminder_at).to eq_time(new_reminder_at)
+      expect(bookmark.reminder_type).to eq(new_reminder_type)
+    end
+
+    context "if the new reminder type is a string" do
+      let(:new_reminder_type) { "custom" }
+      it "is parsed" do
+        update_bookmark
+        bookmark.reload
+        expect(bookmark.reminder_type).to eq(Bookmark.reminder_types[:custom])
+      end
     end
 
     context "if the bookmark is belonging to some other user" do

From 5a98869c5d1fb2a6c188600eb96ef5138954308c Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 22 Apr 2020 13:34:58 +1000
Subject: [PATCH 616/633] FIX: If bookmarking discobot posts, skip the reminder
 modal (#9505)

This is to streamline the new user narrative. only works when creating the bookmark, if editing/deleting the modal is shown. This is done via the plugin initializer.
---
 .../initializers/new-user-narrative.js.es6    | 24 +++++++++++++++++++
 .../config/locales/server.en.yml              |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6 b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
index 45b68ca24f..6498f501b3 100644
--- a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
+++ b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
@@ -1,4 +1,5 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
+import { ajax } from "discourse/lib/ajax";
 
 function initialize(api) {
   const messageBus = api.container.lookup("message-bus:main");
@@ -12,6 +13,29 @@ function initialize(api) {
     }
   });
 
+  api.modifyClass("model:post", {
+    toggleBookmarkWithReminder() {
+      // if we are talking to discobot then any bookmarks should just
+      // be created without reminder options, to streamline the new user
+      // narrative.
+      const discobotUserId = -2;
+      if (this.user_id === discobotUserId && !this.bookmarked_with_reminder) {
+        return ajax("/bookmarks", {
+          type: "POST",
+          data: { post_id: this.id }
+        }).then(response => {
+          this.setProperties({
+            "topic.bookmarked": true,
+            bookmarked_with_reminder: true,
+            bookmark_id: response.id
+          });
+          this.appEvents.trigger("post-stream:refresh", { id: this.id });
+        });
+      }
+      this._super();
+    }
+  });
+
   api.attachWidgetAction("header", "headerSearchContextTrigger", function() {
     if (this.site.mobileView) {
       this.state.skipSearchContext = false;
diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index def563ed26..86d081b5bb 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -242,7 +242,7 @@ en:
 
       bookmark:
         instructions: |-
-          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message** selecting "no reminder needed". If you do, there may be a :gift: in your future!
+          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message**. If you do, there may be a :gift: in your future!
         reply: |-
           Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{bookmark_url}). Just select your profile picture at the upper right &#8599;
         not_found: |-

From 628ba9d1e2e6ee4b552aded1625c0ae84c81d78b Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 22 Apr 2020 13:44:19 +1000
Subject: [PATCH 617/633] FEATURE: Promote bookmarks with reminders to core
 functionality (#9369)

The main thrust of this PR is to take all the conditional checks based on the `enable_bookmarks_with_reminders` away and only keep the code from the `true` path, making bookmarks with reminders the core bookmarks feature. There is also a migration to create `Bookmark` records out of `PostAction` bookmarks for a site.

### Summary

* Remove logic based on whether enable_bookmarks_with_reminders is true. This site setting is now obsolete, the old bookmark functionality is being removed. Retain the setting and set the value to `true` in a migration.
* Use the code from the rake task to create a database migration that creates bookmarks from post actions.
* Change the bookmark report to read from the new table.
* Get rid of old endpoints for bookmarks
* Link to the new bookmarks list from the user summary page
---
 .../controllers/keyboard-shortcuts-help.js    |   3 -
 .../discourse/controllers/topic.js            |   5 +-
 .../discourse/controllers/user-activity.js    |   2 -
 .../javascripts/discourse/models/topic.js     |  33 +----
 .../javascripts/discourse/routes/discovery.js |   5 +-
 .../modal/keyboard-shortcuts-help.hbs         |  34 +++--
 .../discourse/templates/user/activity.hbs     |  12 +-
 .../discourse/templates/user/summary.hbs      |   2 +-
 .../discourse/widgets/post-menu.js            |   9 +-
 .../widgets/quick-access-bookmarks.js         |  12 +-
 .../discourse/widgets/user-menu.js            |   5 +-
 app/controllers/posts_controller.rb           |  20 ---
 app/controllers/topics_controller.rb          |  75 +++++------
 .../bookmark_reminder_notifications.rb        |   2 -
 app/models/bookmark.rb                        |  10 ++
 app/models/reports/bookmarks.rb               |  13 +-
 app/models/user_summary.rb                    |   9 +-
 app/serializers/post_serializer.rb            |   2 +-
 app/serializers/topic_view_serializer.rb      |   8 +-
 config/routes.rb                              |   1 -
 config/site_settings.yml                      |   2 +-
 ...te_bookmarks_from_post_action_bookmarks.rb |  58 ++++++++
 lib/bookmark_reminder_notification_handler.rb |   2 -
 lib/search.rb                                 |   6 +-
 lib/tasks/bookmarks.rake                      |  79 +++++------
 .../new_user_narrative.rb                     |   6 +-
 plugins/discourse-narrative-bot/plugin.rb     |   6 +-
 .../new_user_narrative_spec.rb                |  19 ---
 .../bookmark_reminder_notifications_spec.rb   |   9 --
 ...mark_reminder_notification_handler_spec.rb |  12 --
 spec/requests/admin/users_controller_spec.rb  |  36 +++--
 spec/requests/posts_controller_spec.rb        | 125 ------------------
 spec/requests/topics_controller_spec.rb       |  28 ++--
 spec/serializers/post_serializer_spec.rb      |  16 +--
 spec/tasks/bookmarks_spec.rb                  |   5 -
 test/javascripts/acceptance/topic-test.js     |   5 +-
 .../controllers/preferences-account-test.js   |   2 +-
 test/javascripts/fixtures/user_fixtures.js    |  28 ++++
 test/javascripts/helpers/site-settings.js     |   1 -
 test/javascripts/widgets/post-test.js         |  10 +-
 test/javascripts/widgets/user-menu-test.js    |   6 +-
 41 files changed, 254 insertions(+), 469 deletions(-)
 create mode 100644 db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb

diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
index a0d42ac061..2b0df87882 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
@@ -1,6 +1,5 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { setting } from "discourse/lib/computed";
 
 const KEY = "keyboard_shortcuts_help";
 
@@ -57,8 +56,6 @@ export default Controller.extend(ModalFunctionality, {
     this.set("shortcuts", null);
   },
 
-  showBookmarkShortcuts: setting("enable_bookmarks_with_reminders"),
-
   _defineShortcuts() {
     this.set("shortcuts", {
       jump_to: {
diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/controllers/topic.js
index eea22c7d88..b934c13543 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js
+++ b/app/assets/javascripts/discourse/controllers/topic.js
@@ -652,10 +652,7 @@ export default Controller.extend(bufferedProperty("model"), {
       if (!this.currentUser) {
         return bootbox.alert(I18n.t("bookmarks.not_bookmarked"));
       } else if (post) {
-        if (this.siteSettings.enable_bookmarks_with_reminders) {
-          return post.toggleBookmarkWithReminder();
-        }
-        return post.toggleBookmark().catch(popupAjaxError);
+        return post.toggleBookmarkWithReminder();
       } else {
         return this.model.toggleBookmark().then(changedIds => {
           if (!changedIds) {
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js b/app/assets/javascripts/discourse/controllers/user-activity.js
index 03828c439b..12333fcf07 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js
@@ -3,7 +3,6 @@ import { inject as service } from "@ember/service";
 import Controller, { inject as controller } from "@ember/controller";
 import { exportUserArchive } from "discourse/lib/export-csv";
 import { observes } from "discourse-common/utils/decorators";
-import { setting } from "discourse/lib/computed";
 
 export default Controller.extend({
   application: controller(),
@@ -12,7 +11,6 @@ export default Controller.extend({
   userActionType: null,
 
   canDownloadPosts: alias("user.viewingSelf"),
-  bookmarksWithRemindersEnabled: setting("enable_bookmarks_with_reminders"),
 
   @observes("userActionType", "model.stream.itemsLoaded")
   _showFooter: function() {
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 6ad8de27ec..1cbab38942 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -400,10 +400,8 @@ const Topic = RestModel.extend({
   afterTopicBookmarked(firstPost) {
     if (firstPost) {
       firstPost.set("bookmarked", true);
-      if (this.siteSettings.enable_bookmarks_with_reminders) {
-        this.set("bookmark_reminder_at", firstPost.bookmark_reminder_at);
-        firstPost.set("bookmarked_with_reminder", true);
-      }
+      firstPost.set("bookmarked_with_reminder", true);
+      this.set("bookmark_reminder_at", firstPost.bookmark_reminder_at);
       return [firstPost.id];
     }
   },
@@ -438,24 +436,10 @@ const Topic = RestModel.extend({
     return this.firstPost().then(firstPost => {
       const toggleBookmarkOnServer = () => {
         if (bookmark) {
-          if (this.siteSettings.enable_bookmarks_with_reminders) {
-            return firstPost.toggleBookmarkWithReminder().then(response => {
-              this.set("bookmarking", false);
-              if (response && response.closedWithoutSaving) {
-                this.set("bookmarked", false);
-              } else {
-                return this.afterTopicBookmarked(firstPost);
-              }
-            });
-          } else {
-            return ajax(`/t/${this.id}/bookmark`, { type: "PUT" })
-              .then(() => {
-                this.toggleProperty("bookmarked");
-                return this.afterTopicBookmarked(firstPost);
-              })
-              .catch(popupAjaxError)
-              .finally(() => this.set("bookmarking", false));
-          }
+          return firstPost.toggleBookmarkWithReminder().then(() => {
+            this.set("bookmarking", false);
+            return this.afterTopicBookmarked(firstPost);
+          });
         } else {
           return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
             .then(() => {
@@ -474,10 +458,7 @@ const Topic = RestModel.extend({
                     post.set("bookmarked", false);
                     updated.push(post.id);
                   }
-                  if (
-                    this.siteSettings.enable_bookmarks_with_reminders &&
-                    post.bookmarked_with_reminder
-                  ) {
+                  if (post.bookmarked_with_reminder) {
                     post.setProperties(clearedBookmarkProps);
                     updated.push(post.id);
                   }
diff --git a/app/assets/javascripts/discourse/routes/discovery.js b/app/assets/javascripts/discourse/routes/discovery.js
index 1dd2985c46..f7bd4a5a06 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js
+++ b/app/assets/javascripts/discourse/routes/discovery.js
@@ -17,10 +17,7 @@ export default DiscourseRoute.extend(OpenComposer, {
     // including being able to show links to multiple posts to the same topic
     // and being based on a different model. better to just redirect
     const url = transition.intent.url;
-    if (
-      this.siteSettings.enable_bookmarks_with_reminders &&
-      url === "/bookmarks"
-    ) {
+    if (url === "/bookmarks") {
       this.transitionTo(
         "userActivity.bookmarksWithReminders",
         this.currentUser
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 5299b52f37..813ab3a1f6 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -55,24 +55,22 @@
         <li>{{html-safe shortcuts.actions.quote_post}}</li>
       </ul>
     </section>
-    {{#if showBookmarkShortcuts}}
-      <section class="keyboard-shortcuts-bookmark-section">
-        <h4>{{i18n "keyboard_shortcuts_help.bookmarks.title"}}</h4>
-        <ul>
-          <li>{{html-safe shortcuts.bookmarks.enter}}</li>
-          <li>{{html-safe shortcuts.bookmarks.later_today}}</li>
-          <li>{{html-safe shortcuts.bookmarks.later_this_week}}</li>
-          <li>{{html-safe shortcuts.bookmarks.tomorrow}}</li>
-          <li>{{html-safe shortcuts.bookmarks.next_week}}</li>
-          <li>{{html-safe shortcuts.bookmarks.next_month}}</li>
-          <li>{{html-safe shortcuts.bookmarks.next_business_week}}</li>
-          <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
-          <li>{{html-safe shortcuts.bookmarks.custom}}</li>
-          <li>{{html-safe shortcuts.bookmarks.none}}</li>
-          <li>{{html-safe shortcuts.bookmarks.delete}}</li>
-        </ul>
-      </section>
-    {{/if}}
+    <section class="keyboard-shortcuts-bookmark-section">
+      <h4>{{i18n "keyboard_shortcuts_help.bookmarks.title"}}</h4>
+      <ul>
+        <li>{{html-safe shortcuts.bookmarks.enter}}</li>
+        <li>{{html-safe shortcuts.bookmarks.later_today}}</li>
+        <li>{{html-safe shortcuts.bookmarks.later_this_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.tomorrow}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_month}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_business_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
+        <li>{{html-safe shortcuts.bookmarks.custom}}</li>
+        <li>{{html-safe shortcuts.bookmarks.none}}</li>
+        <li>{{html-safe shortcuts.bookmarks.delete}}</li>
+      </ul>
+    </section>
   </div>
   <div class="column">
     <section>
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index 15ac59b652..15b868def2 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -18,15 +18,9 @@
       {{#link-to "userActivity.likesGiven"}}{{i18n "user_action_groups.1"}}{{/link-to}}
     </li>
     {{#if user.showBookmarks}}
-      {{#if bookmarksWithRemindersEnabled}}
-        <li>
-          {{#link-to "userActivity.bookmarksWithReminders"}}{{i18n "user_action_groups.3"}}{{/link-to}}
-        </li>
-      {{else}}
-        <li>
-          {{#link-to "userActivity.bookmarks"}}{{i18n "user_action_groups.3"}}{{/link-to}}
-        </li>
-      {{/if}}
+      <li>
+        {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+      </li>
     {{/if}}
     {{plugin-outlet
       name="user-activity-bottom"
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index ddd89595c5..ff9c7520f9 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -27,7 +27,7 @@
         </li>
         {{#if model.bookmark_count}}
           <li class="linked-stat">
-            {{#link-to "userActivity.bookmarks"}}
+            {{#link-to "userActivity.bookmarksWithReminders"}}
               {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
             {{/link-to}}
           </li>
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js b/app/assets/javascripts/discourse/widgets/post-menu.js
index c8374058ee..98046266bd 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js
@@ -302,8 +302,8 @@ registerButton("bookmark", attrs => {
   };
 });
 
-registerButton("bookmarkWithReminder", (attrs, state, siteSettings) => {
-  if (!attrs.canBookmark || !siteSettings.enable_bookmarks_with_reminders) {
+registerButton("bookmarkWithReminder", attrs => {
+  if (!attrs.canBookmark) {
     return;
   }
 
@@ -469,10 +469,7 @@ export default createWidget("post-menu", {
 
     // filter menu items based on site settings
     const orderedButtons = this.menuItems().filter(button => {
-      if (
-        this.siteSettings.enable_bookmarks_with_reminders &&
-        button === "bookmark"
-      ) {
+      if (button === "bookmark") {
         return false;
       }
       return true;
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
index 7bbae63198..787fce384d 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
+++ b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
@@ -16,11 +16,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
   },
 
   showAllHref() {
-    if (this.siteSettings.enable_bookmarks_with_reminders) {
-      return `${this.attrs.path}/activity/bookmarks-with-reminders`;
-    } else {
-      return `${this.attrs.path}/activity/bookmarks`;
-    }
+    return `${this.attrs.path}/activity/bookmarks-with-reminders`;
   },
 
   emptyStatePlaceholderItem() {
@@ -28,11 +24,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
   },
 
   findNewItems() {
-    if (this.siteSettings.enable_bookmarks_with_reminders) {
-      return this.loadBookmarksWithReminders();
-    } else {
-      return this.loadUserActivityBookmarks();
-    }
+    return this.loadBookmarksWithReminders();
   },
 
   itemHtml(bookmark) {
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js b/app/assets/javascripts/discourse/widgets/user-menu.js
index 1198729726..08792c4130 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js
@@ -56,16 +56,13 @@ createWidget("user-menu-links", {
   },
 
   bookmarksGlyph() {
-    let path = this.siteSettings.enable_bookmarks_with_reminders
-      ? "bookmarks-with-reminders"
-      : "bookmarks";
     return {
       action: UserMenuAction.QUICK_ACCESS,
       actionParam: QuickAccess.BOOKMARKS,
       label: "user.bookmarks",
       className: "user-bookmarks-link",
       icon: "bookmark",
-      href: `${this.attrs.path}/activity/${path}`
+      href: `${this.attrs.path}/activity/bookmarks-with-reminders`
     };
   },
 
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 50c4ead17f..c440d630f5 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -488,26 +488,6 @@ class PostsController < ApplicationController
     render body: nil
   end
 
-  def bookmark
-    if params[:bookmarked] == "true"
-      post = find_post_from_params
-      result = PostActionCreator.create(current_user, post, :bookmark)
-      return render_json_error(result) if result.failed?
-    else
-      post_action = PostAction.find_by(post_id: params[:post_id], user_id: current_user.id)
-      raise Discourse::NotFound unless post_action
-
-      post = Post.with_deleted.find_by(id: post_action&.post_id)
-      raise Discourse::NotFound unless post
-
-      result = PostActionDestroyer.destroy(current_user, post, :bookmark)
-      return render_json_error(result) if result.failed?
-    end
-
-    topic_user = TopicUser.get(post.topic, current_user)
-    render_json_dump(topic_bookmarked: topic_user.try(:bookmarked))
-  end
-
   def destroy_bookmark
     params.require(:post_id)
 
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index fe399566d2..e0ecde628f 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -97,9 +97,9 @@ class TopicsController < ApplicationController
       Notification.remove_for(current_user.id, params[:topic_id]) if current_user
 
       deleted = guardian.can_see_topic?(ex.obj, false) ||
-                (!guardian.can_see_topic?(ex.obj) &&
-                 ex.obj&.access_topic_via_group &&
-                 ex.obj.deleted_at)
+        (!guardian.can_see_topic?(ex.obj) &&
+         ex.obj&.access_topic_via_group &&
+         ex.obj.deleted_at)
 
       if SiteSetting.detailed_404
         if deleted
@@ -231,11 +231,14 @@ class TopicsController < ApplicationController
 
     fetch_topic_view(options)
 
-    render_json_dump(TopicViewPostsSerializer.new(@topic_view,
-      scope: guardian,
-      root: false,
-      include_raw: !!params[:include_raw]
-    ))
+    render_json_dump(
+      TopicViewPostsSerializer.new(
+        @topic_view,
+        scope: guardian,
+        root: false,
+        include_raw: !!params[:include_raw]
+      )
+    )
   end
 
   def excerpts
@@ -261,12 +264,12 @@ class TopicsController < ApplicationController
       .joins("LEFT JOIN users u on u.id = posts.user_id")
       .pluck(:id, :cooked, :username)
       .map do |post_id, cooked, username|
-        {
-          post_id: post_id,
-          username: username,
-          excerpt: PrettyText.excerpt(cooked, 800, keep_emoji_images: true)
-        }
-      end
+      {
+        post_id: post_id,
+        username: username,
+        excerpt: PrettyText.excerpt(cooked, 800, keep_emoji_images: true)
+      }
+    end
 
     render json: @posts.to_json
   end
@@ -490,18 +493,7 @@ class TopicsController < ApplicationController
 
   def remove_bookmarks
     topic = Topic.find(params[:topic_id].to_i)
-
-    if SiteSetting.enable_bookmarks_with_reminders?
-      BookmarkManager.new(current_user).destroy_for_topic(topic)
-    else
-      PostAction.joins(:post)
-        .where(user_id: current_user.id)
-        .where('topic_id = ?', topic.id).each do |pa|
-
-        PostActionDestroyer.destroy(current_user, pa.post, :bookmark)
-      end
-    end
-
+    BookmarkManager.new(current_user).destroy_for_topic(topic)
     render body: nil
   end
 
@@ -552,16 +544,11 @@ class TopicsController < ApplicationController
     topic = Topic.find(params[:topic_id].to_i)
     first_post = topic.ordered_posts.first
 
-    if SiteSetting.enable_bookmarks_with_reminders?
-      bookmark_manager = BookmarkManager.new(current_user)
-      bookmark_manager.create(post_id: first_post.id)
+    bookmark_manager = BookmarkManager.new(current_user)
+    bookmark_manager.create(post_id: first_post.id)
 
-      if bookmark_manager.errors.any?
-        return render_json_error(bookmark_manager, status: 400)
-      end
-    else
-      result = PostActionCreator.create(current_user, first_post, :bookmark)
-      return render_json_error(result) if result.failed?
+    if bookmark_manager.errors.any?
+      return render_json_error(bookmark_manager, status: 400)
     end
 
     render body: nil
@@ -628,9 +615,9 @@ class TopicsController < ApplicationController
     topic = Topic.find_by(id: params[:topic_id])
 
     unless pm_has_slots?(topic)
-      return render_json_error(I18n.t("pm_reached_recipients_limit",
-        recipients_limit: SiteSetting.max_allowed_message_recipients
-      ))
+      return render_json_error(
+        I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
+      )
     end
 
     if topic.private_message?
@@ -654,9 +641,9 @@ class TopicsController < ApplicationController
     )
 
     unless pm_has_slots?(topic)
-      return render_json_error(I18n.t("pm_reached_recipients_limit",
-        recipients_limit: SiteSetting.max_allowed_message_recipients
-      ))
+      return render_json_error(
+        I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
+      )
     end
 
     guardian.ensure_can_invite_to!(topic)
@@ -683,7 +670,8 @@ class TopicsController < ApplicationController
 
           if group_names.present?
             json.merge!(errors: [
-              I18n.t("topic_invite.failed_to_invite",
+              I18n.t(
+                "topic_invite.failed_to_invite",
                 group_names: group_names
               )
             ])
@@ -1011,7 +999,8 @@ class TopicsController < ApplicationController
       return
     end
 
-    topic_view_serializer = TopicViewSerializer.new(@topic_view,
+    topic_view_serializer = TopicViewSerializer.new(
+      @topic_view,
       scope: guardian,
       root: false,
       include_raw: !!params[:include_raw]
diff --git a/app/jobs/scheduled/bookmark_reminder_notifications.rb b/app/jobs/scheduled/bookmark_reminder_notifications.rb
index 20ce9cb8a8..991e0d23c1 100644
--- a/app/jobs/scheduled/bookmark_reminder_notifications.rb
+++ b/app/jobs/scheduled/bookmark_reminder_notifications.rb
@@ -21,8 +21,6 @@ module Jobs
     end
 
     def execute(args = nil)
-      return if !SiteSetting.enable_bookmarks_with_reminders?
-
       bookmarks = Bookmark.pending_reminders
         .where.not(reminder_type: Bookmark.reminder_types[:at_desktop])
         .includes(:user).order('reminder_at ASC')
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index f34e58c695..2dc9733e6c 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -72,6 +72,16 @@ class Bookmark < ActiveRecord::Base
       later_this_week: 8
     )
   end
+
+  def self.count_per_day(opts = nil)
+    opts ||= {}
+    result = where('bookmarks.created_at >= ?', opts[:start_date] || (opts[:since_days_ago] || 30).days.ago)
+    result = result.where('bookmarks.created_at <= ?', opts[:end_date]) if opts[:end_date]
+    result = result.joins(:topic).merge(Topic.in_category_and_subcategories(opts[:category_id])) if opts[:category_id]
+    result.group('date(bookmarks.created_at)')
+      .order('date(bookmarks.created_at)')
+      .count
+  end
 end
 
 # == Schema Information
diff --git a/app/models/reports/bookmarks.rb b/app/models/reports/bookmarks.rb
index f4728e1f58..0844efb33d 100644
--- a/app/models/reports/bookmarks.rb
+++ b/app/models/reports/bookmarks.rb
@@ -3,5 +3,16 @@
 Report.add_report('bookmarks') do |report|
   report.icon = 'bookmark'
 
-  post_action_report report, PostActionType.types[:bookmark]
+  category_filter = report.filters.dig(:category)
+  report.add_filter('category', default: category_filter)
+
+  report.data = []
+  Bookmark.count_per_day(
+    category_id: category_filter,
+    start_date: report.start_date,
+    end_date: report.end_date
+  ).each do |date, count|
+    report.data << { x: date, y: count }
+  end
+  add_counts report, Bookmark, 'bookmarks.created_at'
 end
diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb
index 52c9199577..435702d67b 100644
--- a/app/models/user_summary.rb
+++ b/app/models/user_summary.rb
@@ -117,14 +117,7 @@ class UserSummary
   end
 
   def bookmark_count
-    if SiteSetting.enable_bookmarks_with_reminders
-      Bookmark.where(user: @user).count
-    else
-      UserAction
-        .where(user: @user)
-        .where(action_type: UserAction::BOOKMARK)
-        .count
-    end
+    Bookmark.where(user: @user).count
   end
 
   def recent_time_read
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index ff880f14c3..7bf90b98eb 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -345,7 +345,7 @@ class PostSerializer < BasicPostSerializer
   end
 
   def post_bookmark
-    return nil if !SiteSetting.enable_bookmarks_with_reminders? || @topic_view.blank?
+    return nil if @topic_view.blank?
     @post_bookmark ||= @topic_view.user_post_bookmarks.find { |bookmark| bookmark.post_id == object.id }
   end
 
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 4bace8d9ed..e40dca1d9f 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -186,15 +186,11 @@ class TopicViewSerializer < ApplicationSerializer
   end
 
   def bookmarked
-    if SiteSetting.enable_bookmarks_with_reminders?
-      object.has_bookmarks?
-    else
-      object.topic_user&.bookmarked
-    end
+    object.has_bookmarks?
   end
 
   def include_bookmark_reminder_at?
-    SiteSetting.enable_bookmarks_with_reminders? && bookmarked
+    bookmarked
   end
 
   def bookmark_reminder_at
diff --git a/config/routes.rb b/config/routes.rb
index 2fc21b435e..9be2b3f44d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -585,7 +585,6 @@ Discourse::Application.routes.draw do
   put "admin/groups/:id/members" => "groups#add_members", constraints: AdminConstraint.new
 
   resources :posts do
-    put "bookmark"
     delete "bookmark", to: "posts#destroy_bookmark"
     put "wiki"
     put "post_type"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 0828616904..986fc3ba38 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -291,7 +291,7 @@ basic:
     default: false
   enable_bookmarks_with_reminders:
     client: true
-    default: false
+    default: true
     hidden: true
   enable_bookmark_at_desktop_reminders:
     client: true
diff --git a/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb b/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
new file mode 100644
index 0000000000..092a0e7b99
--- /dev/null
+++ b/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+class CreateBookmarksFromPostActionBookmarks < ActiveRecord::Migration[6.0]
+  def up
+    SiteSetting.enable_bookmarks_with_reminders = true
+
+    bookmarks_to_create = []
+    loop do
+      # post action type id 1 is :bookmark. we do not need to OFFSET here for
+      # paging because the WHERE bookmarks.id IS NULL clause handles this effectively,
+      # because we do not get bookmarks back that have already been inserted
+      post_action_bookmarks = DB.query(
+        <<~SQL, type_id: 1
+        SELECT post_actions.id, post_actions.post_id, posts.topic_id, post_actions.user_id
+        FROM post_actions
+        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
+        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
+      )
+      break if post_action_bookmarks.count.zero?
+
+      post_action_bookmarks.each do |pab|
+        now = Time.zone.now
+        bookmarks_to_create << "(#{pab.topic_id}, #{pab.post_id}, #{pab.user_id}, '#{now}', '#{now}')"
+      end
+
+      create_bookmarks(bookmarks_to_create)
+      bookmarks_to_create = []
+    end # loop
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+  def create_bookmarks(bookmarks_to_create)
+    return if bookmarks_to_create.empty?
+
+    # this will ignore conflicts in the bookmarks table so
+    # if the user already has a post bookmarked in the new way,
+    # then we don't error and keep on truckin'
+    #
+    # we shouldn't have duplicates here at any rate because of
+    # the above LEFT JOIN but best to be safe knowing this
+    # won't blow up
+    #
+    DB.exec(
+      <<~SQL
+      INSERT INTO bookmarks (topic_id, post_id, user_id, created_at, updated_at)
+      VALUES #{bookmarks_to_create.join(",\n")}
+      ON CONFLICT DO NOTHING
+      SQL
+    )
+  end
+end
diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
index 4591719fdc..3354be3949 100644
--- a/lib/bookmark_reminder_notification_handler.rb
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -52,8 +52,6 @@ class BookmarkReminderNotificationHandler
   end
 
   def self.send_at_desktop_reminder(user:, request_user_agent:)
-    return if !SiteSetting.enable_bookmarks_with_reminders
-
     return if MobileDetection.mobile_device?(request_user_agent)
 
     return if !user_has_pending_at_desktop_reminders?(user)
diff --git a/lib/search.rb b/lib/search.rb
index bcbf5107e9..ead773d097 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -381,11 +381,7 @@ class Search
 
   advanced_filter(/^in:(bookmarks)$/) do |posts, match|
     if @guardian.user
-      if SiteSetting.enable_bookmarks_with_reminders
-        posts.where("posts.id IN (SELECT post_id FROM bookmarks WHERE bookmarks.user_id = #{@guardian.user.id})")
-      else
-        post_action_type_filter(posts, PostActionType.types[:bookmark])
-      end
+      posts.where("posts.id IN (SELECT post_id FROM bookmarks WHERE bookmarks.user_id = #{@guardian.user.id})")
     end
   end
 
diff --git a/lib/tasks/bookmarks.rake b/lib/tasks/bookmarks.rake
index 833a5f8015..d3cf545d2d 100644
--- a/lib/tasks/bookmarks.rake
+++ b/lib/tasks/bookmarks.rake
@@ -9,58 +9,40 @@ require_dependency "rake_helpers"
 # You can provide a sync_limit for a smaller batch run.
 #
 desc "migrates old PostAction bookmarks to the new Bookmark model & table"
-task "bookmarks:sync_to_table", [:sync_limit] => :environment do |_t, args|
-  sync_limit = args[:sync_limit] || 0
-  post_action_bookmarks = PostAction
-    .select('post_actions.id', 'post_actions.post_id', 'posts.topic_id', 'post_actions.user_id')
-    .where(post_action_type_id: PostActionType.types[:bookmark])
-    .joins(:post)
-    .where(deleted_at: nil)
-    .joins('LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id')
-    .joins('INNER JOIN topics ON topics.id = posts.topic_id')
-    .where('bookmarks.id IS NULL')
-
-  # if sync_limit is provided as an argument this will cap
-  # the number of bookmarks that will be created in a run of
-  # this task (for huge bookmark count communities)
-  if sync_limit > 0
-    post_action_bookmarks = post_action_bookmarks.limit(sync_limit)
-  end
-
-  post_action_bookmark_count = post_action_bookmarks.count('post_actions.id')
-  i = 0
-
+task "bookmarks:sync_to_table" => :environment do |_t, args|
   bookmarks_to_create = []
-  post_action_bookmarks.find_each(batch_size: 2000) do |pab|
-    RakeHelpers.print_status_with_label("Creating post new bookmarks.......", i, post_action_bookmark_count)
-    now = Time.zone.now
-    bookmarks_to_create << {
-      topic_id: pab.topic_id,
-      post_id: pab.post_id,
-      user_id: pab.user_id,
-      created_at: now,
-      updated_at: now
-    }
+  loop do
+    # post action type id 1 is :bookmark. we do not need to OFFSET here for
+    # paging because the WHERE bookmarks.id IS NULL clause handles this effectively,
+    # because we do not get bookmarks back that have already been inserted
+    post_action_bookmarks = DB.query(
+      <<~SQL, type_id: 1
+        SELECT post_actions.id, post_actions.post_id, posts.topic_id, post_actions.user_id
+        FROM post_actions
+        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
+        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
+    )
+    break if post_action_bookmarks.count.zero?
 
-    i += 1
-
-    # once we get to 2000 records to create, insert them all and reset
-    # the array and counter to make sure we don't have too many in memory
-    if i >= 2000
-      create_bookmarks(bookmarks_to_create)
-      i = 0
-      bookmarks_to_create = []
+    post_action_bookmarks.each do |pab|
+      now = Time.zone.now
+      bookmarks_to_create << "(#{pab.topic_id}, #{pab.post_id}, #{pab.user_id}, '#{now}', '#{now}')"
     end
-  end
 
-  # if there was < 2000 bookmarks this finishes off the last ones
-  create_bookmarks(bookmarks_to_create)
+    create_bookmarks(bookmarks_to_create)
+    bookmarks_to_create = []
+  end # loop
 
-  RakeHelpers.print_status_with_label("Bookmark creation complete!            ", i, post_action_bookmark_count)
-  puts ""
+  puts "Bookmark creation complete!"
 end
 
 def create_bookmarks(bookmarks_to_create)
+  return if bookmarks_to_create.empty?
+
   # this will ignore conflicts in the bookmarks table so
   # if the user already has a post bookmarked in the new way,
   # then we don't error and keep on truckin'
@@ -68,5 +50,12 @@ def create_bookmarks(bookmarks_to_create)
   # we shouldn't have duplicates here at any rate because of
   # the above LEFT JOIN but best to be safe knowing this
   # won't blow up
-  Bookmark.insert_all(bookmarks_to_create)
+  #
+  DB.exec(
+    <<~SQL
+      INSERT INTO bookmarks (topic_id, post_id, user_id, created_at, updated_at)
+      VALUES #{bookmarks_to_create.join(",\n")}
+      ON CONFLICT DO NOTHING
+    SQL
+  )
 end
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index 89afd4eb87..072c54beaf 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -238,11 +238,7 @@ module DiscourseNarrativeBot
       return unless @post.user_id == self.discobot_user.id
 
       profile_page_url = url_helpers(:user_url, username: @user.username)
-      bookmark_url = if SiteSetting.enable_bookmarks_with_reminders?
-        "#{profile_page_url}/activity/bookmarks-with-reminders"
-      else
-        "#{profile_page_url}/activity/bookmarks"
-      end
+      bookmark_url = "#{profile_page_url}/activity/bookmarks-with-reminders"
       raw = <<~RAW
         #{I18n.t("#{I18N_KEY}.bookmark.reply", i18n_post_args(bookmark_url: bookmark_url))}
 
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 3acbcc7a92..29766f640e 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -241,10 +241,8 @@ after_initialize do
   end
 
   self.add_model_callback(Bookmark, :after_commit, on: :create) do
-    if SiteSetting.enable_bookmarks_with_reminders?
-      if self.post && self.user.enqueue_narrative_bot_job?
-        Jobs.enqueue(:bot_input, user_id: self.user_id, post_id: self.post_id, input: :bookmark)
-      end
+    if self.post && self.user.enqueue_narrative_bot_job?
+      Jobs.enqueue(:bot_input, user_id: self.user_id, post_id: self.post_id, input: :bookmark)
     end
   end
 
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
index 43ff1ac52a..d875de3b10 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -247,26 +247,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
         end
       end
 
-      it 'should create the right reply' do
-        post.update!(user: discobot_user)
-        narrative.expects(:enqueue_timeout_job).with(user)
-
-        narrative.input(:bookmark, user, post: post)
-        new_post = Post.last
-        profile_page_url = "#{Discourse.base_url}/u/#{user.username}"
-
-        expected_raw = <<~RAW
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', bookmark_url: "#{profile_page_url}/activity/bookmarks", base_uri: '')}
-
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.instructions', base_uri: '')}
-        RAW
-
-        expect(new_post.raw).to eq(expected_raw.chomp)
-        expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_onebox)
-      end
-
       it 'should create the right reply when bookmarks with reminders are enabled' do
-        SiteSetting.enable_bookmarks_with_reminders = true
         post.update!(user: discobot_user)
         narrative.expects(:enqueue_timeout_job).with(user)
 
diff --git a/spec/jobs/bookmark_reminder_notifications_spec.rb b/spec/jobs/bookmark_reminder_notifications_spec.rb
index 92ae100020..58f7262503 100644
--- a/spec/jobs/bookmark_reminder_notifications_spec.rb
+++ b/spec/jobs/bookmark_reminder_notifications_spec.rb
@@ -18,7 +18,6 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
   end
 
   before do
-    SiteSetting.enable_bookmarks_with_reminders = true
     # this is done to avoid model validations on Bookmark
     bookmark1.update_column(:reminder_at, five_minutes_ago - 10.minutes)
     bookmark2.update_column(:reminder_at, five_minutes_ago - 5.minutes)
@@ -63,14 +62,6 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
     expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('1')
   end
 
-  context "when the bookmark with reminder site setting is disabled" do
-    it "does nothing" do
-      Bookmark.expects(:where).never
-      SiteSetting.enable_bookmarks_with_reminders = false
-      subject.execute
-    end
-  end
-
   context "when one of the bookmark reminder types is at_desktop" do
     let(:bookmark1) { Fabricate(:bookmark, reminder_type: :at_desktop) }
     it "is not included in the run, because it is not time-based" do
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index 8cc1c4b637..318a52429a 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -8,7 +8,6 @@ RSpec.describe BookmarkReminderNotificationHandler do
   fab!(:user) { Fabricate(:user) }
 
   before do
-    SiteSetting.enable_bookmarks_with_reminders = true
     Discourse.redis.flushall
   end
 
@@ -89,17 +88,6 @@ RSpec.describe BookmarkReminderNotificationHandler do
       end
     end
 
-    context "when enable bookmarks with reminders is disabled" do
-      before do
-        SiteSetting.enable_bookmarks_with_reminders = false
-      end
-
-      it "does nothing" do
-        BrowserDetection.expects(:device).never
-        send_reminder
-      end
-    end
-
     def send_reminder
       subject.send_at_desktop_reminder(user: user, request_user_agent: user_agent)
     end
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index cb654a08c6..984297dadb 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -124,11 +124,11 @@ RSpec.describe Admin::UsersController do
   end
 
   describe '#suspend' do
-    fab!(:post) { Fabricate(:post) }
+    fab!(:created_post) { Fabricate(:post) }
     let(:suspend_params) do
       { suspend_until: 5.hours.from_now,
         reason: "because of this post",
-        post_id: post.id }
+        post_id: created_post.id }
     end
 
     it "works properly" do
@@ -156,13 +156,13 @@ RSpec.describe Admin::UsersController do
         expect(response.status).to eq(200)
 
         log = UserHistory.where(target_user_id: user.id).order('id desc').first
-        expect(log.post_id).to eq(post.id)
+        expect(log.post_id).to eq(created_post.id)
       end
 
       it "can delete an associated post" do
         put "/admin/users/#{user.id}/suspend.json", params: suspend_params.merge(post_action: 'delete')
-        post.reload
-        expect(post.deleted_at).to be_present
+        created_post.reload
+        expect(created_post.deleted_at).to be_present
         expect(response.status).to eq(200)
       end
 
@@ -200,17 +200,17 @@ RSpec.describe Admin::UsersController do
         reply = PostCreator.create(
           Fabricate(:user),
           raw: 'this is the reply text',
-          reply_to_post_number: post.post_number,
-          topic_id: post.topic_id
+          reply_to_post_number: created_post.post_number,
+          topic_id: created_post.topic_id
         )
         nested_reply = PostCreator.create(
           Fabricate(:user),
           raw: 'this is the reply text2',
           reply_to_post_number: reply.post_number,
-          topic_id: post.topic_id
+          topic_id: created_post.topic_id
         )
         put "/admin/users/#{user.id}/suspend.json", params: suspend_params.merge(post_action: 'delete_replies')
-        expect(post.reload.deleted_at).to be_present
+        expect(created_post.reload.deleted_at).to be_present
         expect(reply.reload.deleted_at).to be_present
         expect(nested_reply.reload.deleted_at).to be_present
         expect(response.status).to eq(200)
@@ -223,9 +223,9 @@ RSpec.describe Admin::UsersController do
         )
 
         expect(response.status).to eq(200)
-        post.reload
-        expect(post.deleted_at).to be_blank
-        expect(post.raw).to eq("this is the edited content")
+        created_post.reload
+        expect(created_post.deleted_at).to be_blank
+        expect(created_post.raw).to eq("this is the edited content")
         expect(response.status).to eq(200)
       end
     end
@@ -252,9 +252,8 @@ RSpec.describe Admin::UsersController do
 
     it "also prevents use of any api keys" do
       api_key = Fabricate(:api_key, user: user)
-
-      put "/posts/#{Fabricate(:post).id}/bookmark.json", params: {
-        bookmarked: "true"
+      post "/bookmarks.json", params: {
+        post_id: Fabricate(:post).id
       }, headers: { HTTP_API_KEY: api_key.key }
       expect(response.status).to eq(200)
 
@@ -264,10 +263,9 @@ RSpec.describe Admin::UsersController do
       user.reload
       expect(user).to be_suspended
 
-      put "/posts/#{Fabricate(:post).id}/bookmark.json", params: {
-        bookmarked: "true",
-        api_key: api_key.key
-      }
+      post "/bookmarks.json", params: {
+        post_id: Fabricate(:post).id
+      }, headers: { HTTP_API_KEY: api_key.key }
       expect(response.status).to eq(403)
     end
   end
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 09cefae4a0..af25d9c000 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -482,131 +482,6 @@ describe PostsController do
     end
   end
 
-  describe '#bookmark' do
-    include_examples 'action requires login', :put, "/posts/2/bookmark.json"
-    let!(:post) { post_by_user }
-
-    describe 'when logged in' do
-      before do
-        sign_in(user)
-      end
-
-      fab!(:private_message) { Fabricate(:private_message_post) }
-
-      it "raises an error if the user doesn't have permission to see the post" do
-        put "/posts/#{private_message.id}/bookmark.json", params: { bookmarked: "true" }
-        expect(response).to be_forbidden
-      end
-
-      it 'creates a bookmark' do
-        put "/posts/#{post.id}/bookmark.json", params: { bookmarked: "true" }
-        expect(response.status).to eq(200)
-
-        post_action = PostAction.find_by(user: user, post: post)
-        expect(post_action.post_action_type_id).to eq(PostActionType.types[:bookmark])
-      end
-
-      context "removing a bookmark" do
-        let(:post_action) { PostActionCreator.create(user, post, :bookmark).post_action }
-
-        it "returns the right response when post is not bookmarked" do
-          put "/posts/#{post_by_user.id}/bookmark.json"
-          expect(response.status).to eq(404)
-        end
-
-        it "should be able to remove a bookmark" do
-          post_action
-          put "/posts/#{post.id}/bookmark.json"
-
-          expect(PostAction.find_by(id: post_action.id)).to eq(nil)
-        end
-
-        describe "when user doesn't have permission to see bookmarked post" do
-          it "should still be able to remove a bookmark" do
-            post_action
-            post = post_action.post
-            topic = post.topic
-            topic.convert_to_private_message(admin)
-            topic.remove_allowed_user(admin, user.username)
-
-            expect(Guardian.new(user).can_see_post?(post.reload)).to eq(false)
-
-            put "/posts/#{post.id}/bookmark.json"
-
-            expect(PostAction.find_by(id: post_action.id)).to eq(nil)
-          end
-        end
-
-        describe "when post has been deleted" do
-          it "should still be able to remove a bookmark" do
-            post = post_action.post
-            post.trash!
-
-            put "/posts/#{post.id}/bookmark.json"
-
-            expect(PostAction.find_by(id: post_action.id)).to eq(nil)
-          end
-        end
-      end
-    end
-
-    context "api" do
-      let(:api_key) { Fabricate(:api_key, user: user) }
-      let(:master_key) { Fabricate(:api_key, user: nil) }
-
-      # choosing an arbitrarily easy to mock trusted activity
-      it 'allows users with api key to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json",
-          params: { bookmarked: "true" },
-          headers: { HTTP_API_KEY: api_key.key }
-
-        expect(response.status).to eq(200)
-        expect(PostAction.where(
-          post: post,
-          user: user,
-          post_action_type_id: PostActionType.types[:bookmark]
-        ).count).to eq(1)
-      end
-
-      it 'raises an error with a user key that does not match an optionally specified username' do
-        put "/posts/#{post.id}/bookmark.json",
-          params: { bookmarked: "true" },
-          headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: 'made_up' }
-
-        expect(response.status).to eq(403)
-      end
-
-      it 'allows users with a master api key to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json",
-          params: { bookmarked: "true" },
-          headers: { HTTP_API_KEY: master_key.key, HTTP_API_USERNAME: user.username }
-
-        expect(response.status).to eq(200)
-        expect(PostAction.where(
-          post: post,
-          user: user,
-          post_action_type_id: PostActionType.types[:bookmark]
-        ).count).to eq(1)
-      end
-
-      it 'disallows phonies to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json",
-          params: { bookmarked: "true" },
-          headers: { HTTP_API_KEY: SecureRandom.hex(32), HTTP_API_USERNAME: user.username }
-
-        expect(response.status).to eq(403)
-      end
-
-      it 'disallows blank api' do
-        put "/posts/#{post.id}/bookmark.json",
-          params: { bookmarked: "true" },
-          headers: { HTTP_API_KEY: "", HTTP_API_USERNAME: user.username }
-
-        expect(response.status).to eq(403)
-      end
-    end
-  end
-
   describe '#wiki' do
     include_examples "action requires login", :put, "/posts/2/wiki.json"
 
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 751c8bf88b..e48a2f9483 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2346,19 +2346,15 @@ RSpec.describe TopicsController do
 
   describe '#remove_bookmarks' do
     it "should remove bookmarks properly from non first post" do
-      bookmark = PostActionType.types[:bookmark]
       sign_in(user)
 
       post = create_post
       post2 = create_post(topic_id: post.topic_id)
-
-      PostActionCreator.new(user, post2, bookmark).perform
-
-      put "/t/#{post.topic_id}/bookmark.json"
-      expect(PostAction.where(user_id: user.id, post_action_type: bookmark).count).to eq(2)
+      Fabricate(:bookmark, user: user, post: post)
+      Fabricate(:bookmark, user: user, post: post2)
 
       put "/t/#{post.topic_id}/remove_bookmarks.json"
-      expect(PostAction.where(user_id: user.id, post_action_type: bookmark).count).to eq(0)
+      expect(Bookmark.where(user: user).count).to eq(0)
     end
 
     it "should disallow bookmarks on posts you have no access to" do
@@ -2369,10 +2365,7 @@ RSpec.describe TopicsController do
       expect(response).to be_forbidden
     end
 
-    context "when SiteSetting.enable_bookmarks_with_reminders is true" do
-      before do
-        SiteSetting.enable_bookmarks_with_reminders = true
-      end
+    context "bookmarks with reminders" do
       it "deletes all the bookmarks for the user in the topic" do
         sign_in(user)
         post = create_post
@@ -2388,26 +2381,23 @@ RSpec.describe TopicsController do
       sign_in(user)
     end
 
-    it "should create a new post action for the bookmark on the first post of the topic" do
+    it "should create a new bookmark on the first post of the topic" do
       post = create_post
       post2 = create_post(topic_id: post.topic_id)
       put "/t/#{post.topic_id}/bookmark.json"
 
-      expect(PostAction.find_by(user_id: user.id, post_action_type: PostActionType.types[:bookmark]).post_id).to eq(post.id)
+      expect(Bookmark.find_by(user_id: user.id).post_id).to eq(post.id)
     end
 
     it "errors if the topic is already bookmarked for the user" do
       post = create_post
-      PostActionCreator.new(user, post, PostActionType.types[:bookmark]).perform
+      Bookmark.create(post: post, user: user, topic: post.topic)
 
       put "/t/#{post.topic_id}/bookmark.json"
-      expect(response).to be_forbidden
+      expect(response.status).to eq(400)
     end
 
-    context "when SiteSetting.enable_bookmarks_with_reminders is true" do
-      before do
-        SiteSetting.enable_bookmarks_with_reminders = true
-      end
+    context "bookmarks with reminders" do
       it "should create a new bookmark on the first post of the topic" do
         post = create_post
         post2 = create_post(topic_id: post.topic_id)
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index a438a06ea9..8791db56c6 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -254,11 +254,7 @@ describe PostSerializer do
     context "when a Bookmark record exists for the user on the post" do
       let!(:bookmark) { Fabricate(:bookmark_next_business_day_reminder, user: current_user, post: post) }
 
-      context "when the site setting for bookmarks with reminders is enabled" do
-        before do
-          SiteSetting.enable_bookmarks_with_reminders = true
-        end
-
+      context "bookmarks with reminders" do
         it "returns true" do
           expect(serialized.as_json[:bookmarked_with_reminder]).to eq(true)
         end
@@ -275,16 +271,6 @@ describe PostSerializer do
           end
         end
       end
-
-      context "when the site setting for bookmarks with reminders is disabled" do
-        it "does not return the bookmarked_with_reminder attribute" do
-          expect(serialized.as_json.key?(:bookmarked_with_reminder)).to eq(false)
-        end
-
-        it "does not return the bookmark_reminder_at attribute" do
-          expect(serialized.as_json.key?(:bookmark_reminder_at)).to eq(false)
-        end
-      end
     end
   end
 
diff --git a/spec/tasks/bookmarks_spec.rb b/spec/tasks/bookmarks_spec.rb
index 91249c59f8..c7b2c65bf6 100644
--- a/spec/tasks/bookmarks_spec.rb
+++ b/spec/tasks/bookmarks_spec.rb
@@ -38,11 +38,6 @@ RSpec.describe "bookmarks tasks" do
     expect(Bookmark.where(post: post1, user: user1).count).to eq(1)
   end
 
-  it "respects the sync_limit if provided and stops creating bookmarks at the limit (so this can be run progrssively" do
-    invoke_task(1)
-    expect(Bookmark.all.count).to eq(1)
-  end
-
   it "skips post actions where the post topic no longer exists and does not error" do
     post1.topic.delete
     post1.reload
diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js
index b5e2684e6f..b7edc5cc95 100644
--- a/test/javascripts/acceptance/topic-test.js
+++ b/test/javascripts/acceptance/topic-test.js
@@ -397,10 +397,7 @@ QUnit.test(
 );
 
 acceptance("Topic + Post Bookmarks with Reminders", {
-  loggedIn: true,
-  settings: {
-    enable_bookmarks_with_reminders: true
-  }
+  loggedIn: true
 });
 
 QUnit.test("Bookmarks Modal", async assert => {
diff --git a/test/javascripts/controllers/preferences-account-test.js b/test/javascripts/controllers/preferences-account-test.js
index f953fb0332..f79642e2bd 100644
--- a/test/javascripts/controllers/preferences-account-test.js
+++ b/test/javascripts/controllers/preferences-account-test.js
@@ -12,7 +12,7 @@ QUnit.test("updating of associated accounts", function(assert) {
       is_anonymous: true
     }),
     currentUser: EmberObject.create({
-      id: 1234,
+      id: 1234
     }),
     site: EmberObject.create({
       isMobileDevice: false
diff --git a/test/javascripts/fixtures/user_fixtures.js b/test/javascripts/fixtures/user_fixtures.js
index f6a2f87050..b22180109d 100644
--- a/test/javascripts/fixtures/user_fixtures.js
+++ b/test/javascripts/fixtures/user_fixtures.js
@@ -397,6 +397,34 @@ export default {
       featured_user_badge_ids: [5870, 40673, 5868]
     }
   },
+  "/u/eviltrout/bookmarks.json": {
+    user_bookmark_list: {
+      bookmarks: [
+        {
+          excerpt: "Here this is my new topic where I yell.",
+          tags: [],
+          id: 576,
+          created_at: "2020-04-07T05:30:40.446Z",
+          topic_id: 119,
+          linked_post_number: 1,
+          post_id: 281,
+          name: "test",
+          reminder_at: null,
+          title: "Yelling topic title :/",
+          deleted: false,
+          hidden: false,
+          category_id: 1,
+          closed: false,
+          archived: false,
+          archetype: "regular",
+          highest_post_number: 5,
+          bumped_at: "2020-04-06T05:20:00.172Z",
+          slug: "yelling-topic-title",
+          username: "someguy"
+        }
+      ]
+    }
+  },
   "/user_actions.json": {
     user_actions: [
       {
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index c39424b0df..bf55374eb8 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -31,7 +31,6 @@ Discourse.SiteSettingsOriginal = {
   allow_new_registrations: true,
   enable_google_logins: true,
   enable_google_oauth2_logins: false,
-  enable_bookmarks_with_reminders: false,
   enable_twitter_logins: true,
   enable_facebook_logins: true,
   enable_github_logins: true,
diff --git a/test/javascripts/widgets/post-test.js b/test/javascripts/widgets/post-test.js
index 7c19c715e6..b7131fc2a5 100644
--- a/test/javascripts/widgets/post-test.js
+++ b/test/javascripts/widgets/post-test.js
@@ -532,19 +532,19 @@ widgetTest("can't bookmark", {
 
 widgetTest("bookmark", {
   template:
-    '{{mount-widget widget="post" args=args toggleBookmark=(action "toggleBookmark")}}',
+    '{{mount-widget widget="post" args=args toggleBookmarkWithReminder=(action "toggleBookmarkWithReminder")}}',
   beforeEach() {
     const args = { canBookmark: true };
 
     this.set("args", args);
-    this.on("toggleBookmark", () => (args.bookmarked = true));
+    this.on(
+      "toggleBookmarkWithReminder",
+      () => (args.bookmarked_with_reminder = true)
+    );
   },
   async test(assert) {
     assert.equal(find(".post-menu-area .bookmark").length, 1);
     assert.equal(find("button.bookmarked").length, 0);
-
-    await click("button.bookmark");
-    assert.equal(find("button.bookmarked").length, 1);
   }
 });
 
diff --git a/test/javascripts/widgets/user-menu-test.js b/test/javascripts/widgets/user-menu-test.js
index 35d73a8542..39f2a33722 100644
--- a/test/javascripts/widgets/user-menu-test.js
+++ b/test/javascripts/widgets/user-menu-test.js
@@ -145,11 +145,9 @@ widgetTest("bookmarks", {
     const bookmark = find(".quick-access-panel li a")[0];
     assert.ok(bookmark);
 
+    assert.ok(bookmark.href.includes("/t/yelling-topic-title/119"));
     assert.ok(
-      bookmark.href.includes("/t/how-to-check-the-user-level-via-ajax/11993")
-    );
-    assert.ok(
-      bookmark.innerHTML.includes("Abhishek_Gupta"),
+      bookmark.innerHTML.includes("someguy"),
       "should include the last poster's username"
     );
     assert.ok(

From c028e1aca73500298da7c3503c1c726b43c52776 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 22 Apr 2020 12:08:59 +0530
Subject: [PATCH 618/633] FIX: use absolute url for `/user_avatar/` links

---
 app/helpers/application_helper.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 598d37a954..baee16fc8e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -502,6 +502,8 @@ module ApplicationHelper
       absolute_url = "#{Discourse.base_url}#{link}"
     elsif link.start_with?("/images/")
       absolute_url = "#{Discourse.base_url}#{link}"
+    elsif link.start_with?("/user_avatar/")
+      absolute_url = "#{Discourse.base_url}#{link}"
     elsif GlobalSetting.relative_url_root && link.start_with?(GlobalSetting.relative_url_root)
       absolute_url = "#{Discourse.base_url_no_prefix}#{link}"
     end

From ee63c35c357c6bea8764ea59e7784dbc996f5f5a Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 22 Apr 2020 12:25:59 +0530
Subject: [PATCH 619/633] DEV: use array for matching multiple values

---
 app/helpers/application_helper.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index baee16fc8e..00422273bb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -495,14 +495,10 @@ module ApplicationHelper
 
   def get_absolute_image_url(link)
     absolute_url = link
-    if link.start_with?("//")
+    if link.start_with?('//')
       uri = URI(Discourse.base_url)
       absolute_url = "#{uri.scheme}:#{link}"
-    elsif link.start_with?("/uploads/")
-      absolute_url = "#{Discourse.base_url}#{link}"
-    elsif link.start_with?("/images/")
-      absolute_url = "#{Discourse.base_url}#{link}"
-    elsif link.start_with?("/user_avatar/")
+    elsif link.start_with?('/uploads/', '/images/', '/user_avatar/')
       absolute_url = "#{Discourse.base_url}#{link}"
     elsif GlobalSetting.relative_url_root && link.start_with?(GlobalSetting.relative_url_root)
       absolute_url = "#{Discourse.base_url_no_prefix}#{link}"

From 13956017dac3bd22b8ad2f14add6dc294b29621b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Wed, 22 Apr 2020 14:57:29 +0800
Subject: [PATCH 620/633] Update lefthook.

Support for `LEFTHOOK=0` was broken in the old version. See commit 3a6522ed6307e995a86179488b01dab22146502d of lefthook.
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e9a942667b..978b1d5d15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,9 +3,9 @@
 
 
 "@arkweid/lefthook@^0.6.3":
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/@arkweid/lefthook/-/lefthook-0.6.3.tgz#59ed1e2861ec924181b40c4edd8f60c720df42f6"
-  integrity sha512-mKtMBRAs2YgH9J49KogVSAJWI9WJQdJkoH8LfMfHNs+foDOgLqFLEngPI8XiekHupHDH6YF5ZInbvm2ndc2uug==
+  version "0.6.7"
+  resolved "https://registry.yarnpkg.com/@arkweid/lefthook/-/lefthook-0.6.7.tgz#a3509532830c58319f88ec9264c49190b56bb8fb"
+  integrity sha512-UAsXrRpiRRlOC5B2E6Lfg8QpvPouBrtOsLGlUXRHkJNkrDX69ouh+rUwj+o1N/Nf0lCgvOlj04NFayQyu3u4ew==
 
 "@babel/code-frame@7.0.0-beta.44":
   version "7.0.0-beta.44"

From a511bea4cc3f50bd1e067a46bdbf5cd19eb335a3 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 22 Apr 2020 14:07:51 +0530
Subject: [PATCH 621/633] FEATURE: admin UI to merge two users. (#9509)

---
 .../admin/controllers/admin-user-index.js     | 22 +++++++++++
 .../modals/admin-merge-users-confirmation.js  | 35 ++++++++++++++++++
 .../modals/admin-merge-users-prompt.js        | 29 +++++++++++++++
 .../javascripts/admin/models/admin-user.js    | 37 +++++++++++++++++++
 .../modal/admin-merge-users-confirmation.hbs  | 21 +++++++++++
 .../modal/admin-merge-users-prompt.hbs        | 24 ++++++++++++
 .../admin/templates/user-index.hbs            |  6 ++-
 app/controllers/admin/users_controller.rb     | 14 +++++++
 app/services/user_merger.rb                   |  2 +
 config/locales/client.en.yml                  | 26 +++++++++++++
 config/routes.rb                              |  1 +
 lib/guardian/user_guardian.rb                 |  4 ++
 spec/requests/admin/users_controller_spec.rb  | 18 +++++++++
 13 files changed, 238 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
 create mode 100644 app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js
 create mode 100644 app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs
 create mode 100644 app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs

diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js b/app/assets/javascripts/admin/controllers/admin-user-index.js
index 7bd7abe341..f69993c185 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js
@@ -9,6 +9,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 import { htmlSafe } from "@ember/template";
+import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend(CanCheckEmails, {
   adminTools: service(),
@@ -207,6 +208,27 @@ export default Controller.extend(CanCheckEmails, {
       }
     },
 
+    promptTargetUser() {
+      showModal("admin-merge-users-prompt", {
+        admin: true,
+        model: this.model
+      });
+    },
+
+    showMergeConfirmation(targetUsername) {
+      showModal("admin-merge-users-confirmation", {
+        admin: true,
+        model: {
+          username: this.model.username,
+          targetUsername: targetUsername
+        }
+      });
+    },
+
+    merge(targetUsername) {
+      return this.model.merge({ targetUsername: targetUsername });
+    },
+
     viewActionLogs() {
       this.adminTools.showActionLogs(this, {
         target_user: this.get("model.username")
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
new file mode 100644
index 0000000000..2195c29631
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
@@ -0,0 +1,35 @@
+import Controller, { inject as controller } from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import discourseComputed from "discourse-common/utils/decorators";
+import { alias } from "@ember/object/computed";
+
+export default Controller.extend(ModalFunctionality, {
+  adminUserIndex: controller(),
+  username: alias("model.username"),
+  targetUsername: alias("model.targetUsername"),
+
+  onShow() {
+    this.set("value", null);
+  },
+
+  @discourseComputed("username", "targetUsername")
+  text(username, targetUsername) {
+    return `transfer @${username} to @${targetUsername}`;
+  },
+
+  @discourseComputed("value", "text")
+  mergeDisabled(value, text) {
+    return !value || text !== value;
+  },
+
+  actions: {
+    merge() {
+      this.adminUserIndex.send("merge", this.targetUsername);
+      this.send("closeModal");
+    },
+
+    cancel() {
+      this.send("closeModal");
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js
new file mode 100644
index 0000000000..535870cd6f
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js
@@ -0,0 +1,29 @@
+import Controller, { inject as controller } from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import discourseComputed from "discourse-common/utils/decorators";
+import { alias } from "@ember/object/computed";
+
+export default Controller.extend(ModalFunctionality, {
+  adminUserIndex: controller(),
+  username: alias("model.username"),
+
+  onShow() {
+    this.set("targetUsername", null);
+  },
+
+  @discourseComputed("username", "targetUsername")
+  mergeDisabled(username, targetUsername) {
+    return !targetUsername || username === targetUsername;
+  },
+
+  actions: {
+    merge() {
+      this.send("closeModal");
+      this.adminUserIndex.send("showMergeConfirmation", this.targetUsername);
+    },
+
+    cancel() {
+      this.send("closeModal");
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/models/admin-user.js b/app/assets/javascripts/admin/models/admin-user.js
index 25a822f388..454daf4b19 100644
--- a/app/assets/javascripts/admin/models/admin-user.js
+++ b/app/assets/javascripts/admin/models/admin-user.js
@@ -503,6 +503,43 @@ const AdminUser = User.extend({
     bootbox.dialog(message, buttons, { classes: "delete-user-modal" });
   },
 
+  merge(opts) {
+    const user = this;
+    const location = document.location.pathname;
+
+    bootbox.dialog(I18n.t("admin.user.merging_user"));
+    let formData = { context: location };
+
+    if (opts && opts.targetUsername) {
+      formData["target_username"] = opts.targetUsername;
+    }
+
+    return ajax(`/admin/users/${user.get("id")}/merge.json`, {
+      type: "POST",
+      data: formData
+    })
+      .then(function(data) {
+        if (data.merged) {
+          if (/^\/admin\/users\/list\//.test(location)) {
+            document.location = location;
+          } else {
+            document.location = Discourse.getURL(
+              `/admin/users/${data.user.id}/${data.user.username}`
+            );
+          }
+        } else {
+          bootbox.alert(I18n.t("admin.user.merge_failed"));
+          if (data.user) {
+            user.setProperties(data.user);
+          }
+        }
+      })
+      .catch(function() {
+        AdminUser.find(user.get("id")).then(u => user.setProperties(u));
+        bootbox.alert(I18n.t("admin.user.merge_failed"));
+      });
+  },
+
   loadDetails() {
     if (this.loadedDetails) {
       return Promise.resolve(this);
diff --git a/app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs b/app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs
new file mode 100644
index 0000000000..119cd3ad08
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs
@@ -0,0 +1,21 @@
+<div>
+  {{#d-modal-body rawTitle=(i18n "admin.user.merge.confirmation.title" username=username)}}
+    <p>{{html-safe (i18n "admin.user.merge.confirmation.description" username=username targetUsername=targetUsername text=text)}}</p>
+    {{input type="text" value=value}}
+  {{/d-modal-body}}
+
+  <div class="modal-footer">
+    {{#d-button
+      class="btn-danger"
+      action=(action "merge")
+      icon="trash-alt"
+      disabled=mergeDisabled
+    }}
+      {{i18n "admin.user.merge.confirmation.transfer_and_delete" username=username}}
+    {{/d-button}}
+    {{d-button
+      action=(action "cancel")
+      label="admin.user.merge.confirmation.cancel"
+    }}
+  </div>
+</div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs b/app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs
new file mode 100644
index 0000000000..69bdd69403
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs
@@ -0,0 +1,24 @@
+<div>
+  {{#d-modal-body rawTitle=(i18n "admin.user.merge.prompt.title" username=username)}}
+    <p>{{html-safe (i18n "admin.user.merge.prompt.description" username=username)}}</p>
+    {{user-selector single=true
+                    placeholderKey="admin.user.merge.prompt.target_username_placeholder"
+                    usernames=targetUsername
+                    autocomplete="discourse"}}
+  {{/d-modal-body}}
+
+  <div class="modal-footer">
+    {{#d-button
+      class="btn-primary"
+      action=(action "merge")
+      icon="trash-alt"
+      disabled=mergeDisabled
+    }}
+      {{i18n "admin.user.merge.prompt.transfer_and_delete" username=username}}
+    {{/d-button}}
+    {{d-button
+      action=(action "cancel")
+      label="admin.user.merge.prompt.cancel"
+    }}
+  </div>
+</div>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index c23c88a3d6..76aee47271 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -680,9 +680,13 @@
 
     {{#if model.canBeDeleted}}
       {{d-button label="admin.user.delete"
-                 icon="exclamation-triangle"
+                 icon="trash-alt"
                  class="btn-danger"
                  action=(action "destroy")}}
+      {{d-button label="admin.user.merge.transfer_and_delete"
+                 icon="trash-alt"
+                 class="btn-danger"
+                 action=(action "promptTargetUser")}}
     {{/if}}
   </div>
 
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index a02ab11dac..4ed8a10a0f 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -20,6 +20,7 @@ class Admin::UsersController < Admin::AdminController
                                     :remove_group,
                                     :primary_group,
                                     :anonymize,
+                                    :merge,
                                     :reset_bounce_score,
                                     :disable_second_factor,
                                     :delete_posts_batch]
@@ -471,6 +472,19 @@ class Admin::UsersController < Admin::AdminController
     end
   end
 
+  def merge
+    target_username = params.require(:target_username)
+    target_user = User.find_by_username(target_username)
+
+    guardian.ensure_can_merge_user!(@user, target_user)
+
+    if user = UserMerger.new(@user, target_user, current_user).merge!
+      render json: success_json.merge(merged: true, user: user)
+    else
+      render json: failed_json.merge(user: AdminDetailedUserSerializer.new(@user, root: false).as_json)
+    end
+  end
+
   def reset_bounce_score
     guardian.ensure_can_reset_bounce_score!(@user)
     @user.user_stat&.reset_bounce_score!
diff --git a/app/services/user_merger.rb b/app/services/user_merger.rb
index 25bf412625..b576eea853 100644
--- a/app/services/user_merger.rb
+++ b/app/services/user_merger.rb
@@ -24,6 +24,8 @@ class UserMerger
     delete_source_user
     delete_source_user_references
     log_merge
+
+    @target_user.reload
   end
 
   protected
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1d881a1779..39951e2b84 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4334,6 +4334,32 @@ en:
         anonymize_yes: "Yes, anonymize this account"
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "Delete User"
+        merge:
+          transfer_and_delete: "Transfer & Delete"
+          prompt:
+            title: "Transfer & Delete @%{username}"
+            description: |
+              <p>Please choose a new owner for <b>@%{username}'s</b> content.</p>
+
+              <p>All topics, posts, messages and other content created by <b>@%{username}</b> will be transferred.</p>
+
+            target_username_placeholder: "Username of new owner"
+            transfer_and_delete: "Transfer & Delete @%{username}"
+            cancel: "Cancel"
+          confirmation:
+            title: "Transfer & Delete @%{username}"
+            description: |
+              <p>All of <b>@%{username}'s</b> content will be transferred and attributed to <b>@%{targetUsername}</b>. After the content is transferred, <b>@%{username}'s</b> account will be deleted.</p>
+
+              <p><b>This can not be undone!</b></p>
+
+              <p>To continue type: <code>%{text}</code></p>
+
+            transfer_and_delete: "Transfer & Delete @%{username}"
+            cancel: "Cancel"
+
+        merging_user: "Merging user..."
+        merge_failed: "There was an error while merging the users."
         delete_forbidden_because_staff: "Admins and moderators can't be deleted."
         delete_posts_forbidden_because_staff: "Can't delete all posts of admins and moderators."
         delete_forbidden:
diff --git a/config/routes.rb b/config/routes.rb
index 9be2b3f44d..c98b6b3edb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -137,6 +137,7 @@ Discourse::Application.routes.draw do
       get "leader_requirements" => "users#tl3_requirements"
       get "tl3_requirements"
       put "anonymize"
+      post "merge"
       post "reset_bounce_score"
       put "disable_second_factor"
     end
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index ecdff65838..1461c69d69 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -76,6 +76,10 @@ module UserGuardian
     is_staff? && !user.nil? && !user.staff?
   end
 
+  def can_merge_user?(source_user, target_user)
+    is_admin? && !source_user.nil? && !source_user.staff? && !target_user.nil?
+  end
+
   def can_reset_bounce_score?(user)
     user && is_staff?
   end
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 984297dadb..273ff48192 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -988,4 +988,22 @@ RSpec.describe Admin::UsersController do
     end
   end
 
+  describe "#merge" do
+    fab!(:target_user) { Fabricate(:user) }
+    fab!(:topic) { Fabricate(:topic, user: user) }
+    fab!(:first_post) { Fabricate(:post, topic: topic, user: user) }
+
+    it 'should merge source user to target user' do
+      post "/admin/users/#{user.id}/merge.json", params: {
+        target_username: target_user.username
+      }
+
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["merged"]).to be_truthy
+      expect(response.parsed_body["user"]["id"]).to eq(target_user.id)
+      expect(topic.reload.user_id).to eq(target_user.id)
+      expect(first_post.reload.user_id).to eq(target_user.id)
+    end
+  end
+
 end

From e733701887c526f49c56b0f7d025d69162624734 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 22 Apr 2020 11:52:50 +0300
Subject: [PATCH 622/633] FEATURE: Make report filters reusable (#9444)

This commit also adds 'include subcategories' report filter
---
 .../admin/components/admin-report.js          |  6 +-
 .../admin/components/report-filters/bool.js   | 16 ++++++
 .../components/report-filters/category.js     | 12 ++--
 .../report-filters/file-extension.js          |  7 ---
 .../admin/components/report-filters/filter.js |  9 +--
 .../admin/components/report-filters/group.js  | 14 ++---
 .../admin/components/report-filters/list.js   |  3 +
 .../admin/routes/admin-dashboard-reports.js   |  2 +-
 .../templates/components/admin-report.hbs     |  3 +-
 .../components/report-filters/bool.hbs        |  5 ++
 .../components/report-filters/category.hbs    |  4 +-
 .../{file-extension.hbs => list.hbs}          |  0
 app/models/incoming_links_report.rb           | 55 ++++++++++++-------
 app/models/post.rb                            | 15 ++++-
 app/models/post_action.rb                     |  8 ++-
 app/models/report.rb                          | 37 ++++++++++---
 app/models/reports/flags.rb                   | 14 +++--
 app/models/reports/post_edits.rb              | 15 +++--
 app/models/reports/posts.rb                   | 14 +++--
 app/models/reports/profile_views.rb           |  2 +-
 app/models/reports/signups.rb                 |  2 +-
 app/models/reports/time_to_first_response.rb  |  8 +--
 app/models/reports/top_referred_topics.rb     |  6 +-
 app/models/reports/top_traffic_sources.rb     |  6 +-
 app/models/reports/top_uploads.rb             |  5 +-
 app/models/reports/topics.rb                  | 10 ++--
 app/models/reports/topics_with_no_response.rb |  9 ++-
 app/models/reports/visits.rb                  |  2 +-
 app/models/reviewable.rb                      | 16 ++++--
 app/models/topic.rb                           | 30 ++++++++--
 config/locales/client.en.yml                  |  2 +
 spec/models/report_spec.rb                    | 10 ++--
 spec/models/topic_spec.rb                     |  2 +-
 test/javascripts/fixtures/reports_bulk.js     |  2 +-
 34 files changed, 221 insertions(+), 130 deletions(-)
 create mode 100644 app/assets/javascripts/admin/components/report-filters/bool.js
 delete mode 100644 app/assets/javascripts/admin/components/report-filters/file-extension.js
 create mode 100644 app/assets/javascripts/admin/components/report-filters/list.js
 create mode 100644 app/assets/javascripts/admin/templates/components/report-filters/bool.hbs
 rename app/assets/javascripts/admin/templates/components/report-filters/{file-extension.hbs => list.hbs} (100%)

diff --git a/app/assets/javascripts/admin/components/admin-report.js b/app/assets/javascripts/admin/components/admin-report.js
index a385b71730..178bef98f2 100644
--- a/app/assets/javascripts/admin/components/admin-report.js
+++ b/app/assets/javascripts/admin/components/admin-report.js
@@ -7,7 +7,6 @@ import Component from "@ember/component";
 import ReportLoader from "discourse/lib/reports-loader";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
-import { isNumeric } from "discourse/lib/utilities";
 import Report, { SCHEMA_VERSION } from "admin/models/report";
 import ENV from "discourse-common/config/environment";
 
@@ -167,10 +166,9 @@ export default Component.extend({
       ENV.environment === "test" ? "end" : endDate.replace(/-/g, ""),
       "[:prev_period]",
       this.get("reportOptions.table.limit"),
+      // Convert all filter values to strings to ensure unique serialization
       customFilters
-        ? JSON.stringify(customFilters, (key, value) =>
-            isNumeric(value) ? value.toString() : value
-          )
+        ? JSON.stringify(customFilters, (k, v) => (k ? `${v}` : v))
         : null,
       SCHEMA_VERSION
     ]
diff --git a/app/assets/javascripts/admin/components/report-filters/bool.js b/app/assets/javascripts/admin/components/report-filters/bool.js
new file mode 100644
index 0000000000..777e15cfe4
--- /dev/null
+++ b/app/assets/javascripts/admin/components/report-filters/bool.js
@@ -0,0 +1,16 @@
+import { action } from "@ember/object";
+import FilterComponent from "admin/components/report-filters/filter";
+
+export default FilterComponent.extend({
+  checked: false,
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+    this.set("checked", !!this.filter.default);
+  },
+
+  @action
+  onChange() {
+    this.applyFilter(this.filter.id, !this.checked || undefined);
+  }
+});
diff --git a/app/assets/javascripts/admin/components/report-filters/category.js b/app/assets/javascripts/admin/components/report-filters/category.js
index fab7753da4..5a5ab52098 100644
--- a/app/assets/javascripts/admin/components/report-filters/category.js
+++ b/app/assets/javascripts/admin/components/report-filters/category.js
@@ -1,16 +1,12 @@
+import { action } from "@ember/object";
 import { readOnly } from "@ember/object/computed";
 import FilterComponent from "admin/components/report-filters/filter";
 
 export default FilterComponent.extend({
-  classNames: ["category-filter"],
-
-  layoutName: "admin/templates/components/report-filters/category",
-
   category: readOnly("filter.default"),
 
-  actions: {
-    onChange(categoryId) {
-      this.applyFilter(this.get("filter.id"), categoryId || undefined);
-    }
+  @action
+  onChange(categoryId) {
+    this.applyFilter(this.filter.id, categoryId || undefined);
   }
 });
diff --git a/app/assets/javascripts/admin/components/report-filters/file-extension.js b/app/assets/javascripts/admin/components/report-filters/file-extension.js
deleted file mode 100644
index d8eb1b5b06..0000000000
--- a/app/assets/javascripts/admin/components/report-filters/file-extension.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import FilterComponent from "admin/components/report-filters/filter";
-
-export default FilterComponent.extend({
-  classNames: ["file-extension-filter"],
-
-  layoutName: "admin/templates/components/report-filters/file-extension"
-});
diff --git a/app/assets/javascripts/admin/components/report-filters/filter.js b/app/assets/javascripts/admin/components/report-filters/filter.js
index f61b2d496a..0c4e006346 100644
--- a/app/assets/javascripts/admin/components/report-filters/filter.js
+++ b/app/assets/javascripts/admin/components/report-filters/filter.js
@@ -1,8 +1,9 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
+
 export default Component.extend({
-  actions: {
-    onChange(value) {
-      this.applyFilter(this.get("filter.id"), value);
-    }
+  @action
+  onChange(value) {
+    this.applyFilter(this.filter.id, value);
   }
 });
diff --git a/app/assets/javascripts/admin/components/report-filters/group.js b/app/assets/javascripts/admin/components/report-filters/group.js
index a6511e75f6..e841800030 100644
--- a/app/assets/javascripts/admin/components/report-filters/group.js
+++ b/app/assets/javascripts/admin/components/report-filters/group.js
@@ -1,20 +1,18 @@
+import { computed } from "@ember/object";
 import FilterComponent from "admin/components/report-filters/filter";
-import discourseComputed from "discourse-common/utils/decorators";
 
 export default FilterComponent.extend({
   classNames: ["group-filter"],
 
-  layoutName: "admin/templates/components/report-filters/group",
-
-  @discourseComputed()
-  groupOptions() {
+  @computed
+  get groupOptions() {
     return (this.site.groups || []).map(group => {
       return { name: group["name"], value: group["id"] };
     });
   },
 
-  @discourseComputed("filter.default")
-  groupId(filterDefault) {
-    return filterDefault ? parseInt(filterDefault, 10) : null;
+  @computed("filter.default")
+  get groupId() {
+    return this.filter.default ? parseInt(this.filter.default, 10) : null;
   }
 });
diff --git a/app/assets/javascripts/admin/components/report-filters/list.js b/app/assets/javascripts/admin/components/report-filters/list.js
new file mode 100644
index 0000000000..654269ecd0
--- /dev/null
+++ b/app/assets/javascripts/admin/components/report-filters/list.js
@@ -0,0 +1,3 @@
+import FilterComponent from "admin/components/report-filters/filter";
+
+export default FilterComponent.extend();
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js b/app/assets/javascripts/admin/routes/admin-dashboard-reports.js
index 0de5bfe505..b1eff77998 100644
--- a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js
+++ b/app/assets/javascripts/admin/routes/admin-dashboard-reports.js
@@ -3,7 +3,7 @@ import { ajax } from "discourse/lib/ajax";
 
 export default DiscourseRoute.extend({
   model() {
-    return ajax("/admin/reports").then(json => json);
+    return ajax("/admin/reports");
   },
 
   setupController(controller, model) {
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 2aa3143a47..ab0c1a6398 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -165,7 +165,8 @@
 
               <div class="input">
                 {{component
-                  (concat "report-filters/" filter.id)
+                  (concat "report-filters/" filter.type)
+                  model=model
                   filter=filter
                   applyFilter=(action "applyFilter")}}
               </div>
diff --git a/app/assets/javascripts/admin/templates/components/report-filters/bool.hbs b/app/assets/javascripts/admin/templates/components/report-filters/bool.hbs
new file mode 100644
index 0000000000..4d96755ff9
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/report-filters/bool.hbs
@@ -0,0 +1,5 @@
+{{input
+  type="checkbox"
+  checked=checked
+  click=(action "onChange")
+}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/templates/components/report-filters/category.hbs b/app/assets/javascripts/admin/templates/components/report-filters/category.hbs
index 31110bcbbd..bdf354e188 100644
--- a/app/assets/javascripts/admin/templates/components/report-filters/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/report-filters/category.hbs
@@ -1,7 +1,5 @@
 {{search-advanced-category-chooser
   value=category
   onChange=(action "onChange")
-  options=(hash
-    filterable=true
-  )
+  options=(hash filterable=true)
 }}
diff --git a/app/assets/javascripts/admin/templates/components/report-filters/file-extension.hbs b/app/assets/javascripts/admin/templates/components/report-filters/list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/components/report-filters/file-extension.hbs
rename to app/assets/javascripts/admin/templates/components/report-filters/list.hbs
diff --git a/app/models/incoming_links_report.rb b/app/models/incoming_links_report.rb
index d791a65903..e17f893a93 100644
--- a/app/models/incoming_links_report.rb
+++ b/app/models/incoming_links_report.rb
@@ -2,13 +2,14 @@
 
 class IncomingLinksReport
 
-  attr_accessor :type, :data, :y_titles, :start_date, :end_date, :limit, :category_id
+  attr_accessor :type, :data, :y_titles, :start_date, :end_date, :limit, :category_id, :include_subcategories
 
   def initialize(type)
     @type = type
     @y_titles = {}
     @data = nil
     @category_id = nil
+    @include_subcategories = false
   end
 
   def as_json(_options = nil)
@@ -34,6 +35,7 @@ class IncomingLinksReport
     report.end_date = _opts[:end_date] || Time.now.end_of_day
     report.limit = _opts[:limit].to_i if _opts[:limit]
     report.category_id = _opts[:category_id] if _opts[:category_id]
+    report.include_subcategories = _opts[:include_subcategories] if _opts[:include_subcategories]
 
     public_send(report_method, report)
     report
@@ -44,8 +46,8 @@ class IncomingLinksReport
     report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.num_clicks")
     report.y_titles[:num_topics] = I18n.t("reports.#{report.type}.num_topics")
 
-    num_clicks = link_count_per_user(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
-    num_topics = topic_count_per_user(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
+    num_clicks = link_count_per_user(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id, include_subcategories: report.include_subcategories)
+    num_topics = topic_count_per_user(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id, include_subcategories: report.include_subcategories)
     user_id_lookup = User
       .where(username: num_clicks.keys)
       .select(:id, :username, :uploaded_avatar_id)
@@ -70,19 +72,19 @@ class IncomingLinksReport
     report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
-  def self.per_user(start_date:, end_date:, category_id:)
-    public_incoming_links(category_id: category_id)
+  def self.per_user(start_date:, end_date:, category_id:, include_subcategories:)
+    public_incoming_links(category_id: category_id, include_subcategories: include_subcategories)
       .where('incoming_links.created_at > ? AND incoming_links.created_at < ? AND incoming_links.user_id IS NOT NULL', start_date, end_date)
       .joins(:user)
       .group('users.username')
   end
 
-  def self.link_count_per_user(start_date:, end_date:, category_id:)
-    per_user(start_date: start_date, end_date: end_date, category_id: category_id).count
+  def self.link_count_per_user(start_date:, end_date:, category_id:, include_subcategories:)
+    per_user(start_date: start_date, end_date: end_date, category_id: category_id, include_subcategories: include_subcategories).count
   end
 
-  def self.topic_count_per_user(start_date:, end_date:, category_id:)
-    per_user(start_date: start_date, end_date: end_date, category_id: category_id).joins(:post).count("DISTINCT posts.topic_id")
+  def self.topic_count_per_user(start_date:, end_date:, category_id:, include_subcategories:)
+    per_user(start_date: start_date, end_date: end_date, category_id: category_id, include_subcategories: include_subcategories).joins(:post).count("DISTINCT posts.topic_id")
   end
 
   # Return top 10 domains that brought traffic to the site within the last 30 days
@@ -91,8 +93,8 @@ class IncomingLinksReport
     report.y_titles[:num_topics] = I18n.t("reports.#{report.type}.num_topics")
     report.y_titles[:num_users] = I18n.t("reports.#{report.type}.num_users")
 
-    num_clicks = link_count_per_domain(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
-    num_topics = topic_count_per_domain(num_clicks.keys, category_id: report.category_id)
+    num_clicks = link_count_per_domain(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id, include_subcategories: report.include_subcategories)
+    num_topics = topic_count_per_domain(num_clicks.keys, category_id: report.category_id, include_subcategories: report.include_subcategories)
     report.data = []
     num_clicks.each_key do |domain|
       report.data << { domain: domain, num_clicks: num_clicks[domain], num_topics: num_topics[domain] }
@@ -100,8 +102,8 @@ class IncomingLinksReport
     report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
-  def self.link_count_per_domain(limit: 10, start_date:, end_date:, category_id:)
-    public_incoming_links(category_id: category_id)
+  def self.link_count_per_domain(limit: 10, start_date:, end_date:, category_id:, include_subcategories:)
+    public_incoming_links(category_id: category_id, include_subcategories: include_subcategories)
       .where('incoming_links.created_at > ? AND incoming_links.created_at < ?', start_date, end_date)
       .joins(incoming_referer: :incoming_domain)
       .group('incoming_domains.name')
@@ -111,7 +113,7 @@ class IncomingLinksReport
   end
 
   def self.per_domain(domains, options = {})
-    public_incoming_links(category_id: options[:category_id])
+    public_incoming_links(category_id: options[:category_id], include_subcategories: options[:include_subcategories])
       .joins(incoming_referer: :incoming_domain)
       .where('incoming_links.created_at > ? AND incoming_domains.name IN (?)', 30.days.ago, domains)
       .group('incoming_domains.name')
@@ -124,11 +126,13 @@ class IncomingLinksReport
 
   def self.report_top_referred_topics(report)
     report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.labels.num_clicks")
-    num_clicks = link_count_per_topic(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
+    num_clicks = link_count_per_topic(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id, include_subcategories: report.include_subcategories)
     num_clicks = num_clicks.to_a.sort_by { |x| x[1] }.last(report.limit || 10).reverse
     report.data = []
     topics = Topic.select('id, slug, title').where('id in (?)', num_clicks.map { |z| z[0] })
-    topics = topics.in_category_and_subcategories(report.category_id) if report.category_id
+    if report.category_id
+      topics = topics.where(category_id: report.include_subcategories ? Category.subcategory_ids(report.category_id) : report.category_id)
+    end
     num_clicks.each do |topic_id, num_clicks_element|
       topic = topics.find { |t| t.id == topic_id }
       if topic
@@ -138,17 +142,26 @@ class IncomingLinksReport
     report.data
   end
 
-  def self.link_count_per_topic(start_date:, end_date:, category_id:)
-    public_incoming_links(category_id: category_id)
+  def self.link_count_per_topic(start_date:, end_date:, category_id:, include_subcategories:)
+    public_incoming_links(category_id: category_id, include_subcategories: include_subcategories)
       .where('incoming_links.created_at > ? AND incoming_links.created_at < ? AND topic_id IS NOT NULL', start_date, end_date)
       .group('topic_id')
       .count
   end
 
-  def self.public_incoming_links(category_id: nil)
-    IncomingLink
+  def self.public_incoming_links(category_id: nil, include_subcategories: nil)
+    links = IncomingLink
       .joins(post: :topic)
       .where("topics.archetype = ?", Archetype.default)
-      .merge(Topic.in_category_and_subcategories(category_id))
+
+    if category_id
+      if include_subcategories
+        links = links.where("topics.category_id IN (?)", Category.subcategory_ids(category_id))
+      else
+        links = links.where("topics.category_id = ?", category_id)
+      end
+    end
+
+    links
   end
 end
diff --git a/app/models/post.rb b/app/models/post.rb
index 86dafde6bc..acc6c540f2 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -765,10 +765,19 @@ class Post < ActiveRecord::Base
     DiscourseEvent.trigger(:after_trigger_post_process, self)
   end
 
-  def self.public_posts_count_per_day(start_date, end_date, category_id = nil)
-    result = public_posts.where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date)
+  def self.public_posts_count_per_day(start_date, end_date, category_id = nil, include_subcategories = false)
+    result = public_posts
+      .where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date)
       .where(post_type: Post.types[:regular])
-    result = result.where('topics.category_id IN (?)', Category.subcategory_ids(category_id.to_i)) if category_id
+
+    if category_id
+      if include_subcategories
+        result = result.where('topics.category_id IN (?)', Category.subcategory_ids(category_id))
+      else
+        result = result.where('topics.category_id = ?', category_id)
+      end
+    end
+
     result
       .group('date(posts.created_at)')
       .order('date(posts.created_at)')
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 077ef253c1..53c482d0d3 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -67,7 +67,13 @@ class PostAction < ActiveRecord::Base
     result = unscoped.where(post_action_type_id: post_action_type)
     result = result.where('post_actions.created_at >= ?', opts[:start_date] || (opts[:since_days_ago] || 30).days.ago)
     result = result.where('post_actions.created_at <= ?', opts[:end_date]) if opts[:end_date]
-    result = result.joins(post: :topic).merge(Topic.in_category_and_subcategories(opts[:category_id])) if opts[:category_id]
+    if opts[:category_id]
+      if opts[:include_subcategories]
+        result = result.joins(post: :topic).where('topics.category_id IN (?)', Category.subcategory_ids(opts[:category_id]))
+      else
+        result = result.joins(post: :topic).where('topics.category_id = ?', opts[:category_id])
+      end
+    end
     result.group('date(post_actions.created_at)')
       .order('date(post_actions.created_at)')
       .count
diff --git a/app/models/report.rb b/app/models/report.rb
index 13f7d02830..b66e36c772 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -50,8 +50,8 @@ class Report
   end
 
   def self.cache_key(report)
-    (+"reports:") <<
     [
+      "reports",
       report.type,
       report.start_date.to_date.strftime("%Y%m%d"),
       report.end_date.to_date.strftime("%Y%m%d"),
@@ -63,14 +63,30 @@ class Report
   end
 
   def add_filter(name, options = {})
-    default_filter = { allow_any: false, choices: [], default: nil }
-    available_filters[name] = default_filter.merge(options)
+    if options[:type].blank?
+      options[:type] = name
+      Discourse.deprecate("#{name} filter should define a `:type` option. Temporarily setting type to #{name}.")
+    end
+
+    available_filters[name] = options
   end
 
   def remove_filter(name)
     available_filters.delete(name)
   end
 
+  def add_category_filter
+    category_id = filters[:category].to_i if filters[:category].present?
+    add_filter('category', type: 'category', default: category_id)
+    return if category_id.blank?
+
+    include_subcategories = filters[:'include-subcategories']
+    include_subcategories = !!ActiveRecord::Type::Boolean.new.cast(include_subcategories)
+    add_filter('include-subcategories', type: 'bool', default: include_subcategories)
+
+    [category_id, include_subcategories]
+  end
+
   def self.clear_cache(type = nil)
     pattern = type ? "reports:#{type}:*" : "reports:*"
 
@@ -285,15 +301,22 @@ class Report
   end
 
   def self.post_action_report(report, post_action_type)
-    category_filter = report.filters.dig(:category)
-    report.add_filter('category', default: category_filter)
+    category_id, include_subcategories = report.add_category_filter
 
     report.data = []
-    PostAction.count_per_day_for_type(post_action_type, category_id: category_filter, start_date: report.start_date, end_date: report.end_date).each do |date, count|
+    PostAction.count_per_day_for_type(post_action_type, category_id: category_id, include_subcategories: include_subcategories, start_date: report.start_date, end_date: report.end_date).each do |date, count|
       report.data << { x: date, y: count }
     end
+
     countable = PostAction.unscoped.where(post_action_type_id: post_action_type)
-    countable = countable.joins(post: :topic).merge(Topic.in_category_and_subcategories(category_filter)) if category_filter
+    if category_id
+      if include_subcategories
+        countable = countable.joins(post: :topic).where('topics.category_id IN (?)', Category.subcategory_ids(category_id))
+      else
+        countable = countable.joins(post: :topic).where('topics.category_id = ?', category_id)
+      end
+    end
+
     add_counts report, countable, 'post_actions.created_at'
   end
 
diff --git a/app/models/reports/flags.rb b/app/models/reports/flags.rb
index 682fa4f4dc..da80c8e92a 100644
--- a/app/models/reports/flags.rb
+++ b/app/models/reports/flags.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 Report.add_report('flags') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.icon = 'flag'
   report.higher_is_better = false
@@ -13,13 +12,18 @@ Report.add_report('flags') do |report|
     :count_by_date,
     report.start_date,
     report.end_date,
-    category_filter
+    category_id,
+    include_subcategories
   )
 
   countable = ReviewableFlaggedPost.scores_with_topics
 
-  if category_filter
-    countable.merge!(Topic.in_category_and_subcategories(category_filter))
+  if category_id
+    if include_subcategories
+      countable = countable.where('topics.category_id IN (?)', Category.subcategory_ids(category_id))
+    else
+      countable = countable.where('topics.category_id = ?', category_id)
+    end
   end
 
   add_counts report, countable, 'reviewable_scores.created_at'
diff --git a/app/models/reports/post_edits.rb b/app/models/reports/post_edits.rb
index 9092520430..b8ece00d0c 100644
--- a/app/models/reports/post_edits.rb
+++ b/app/models/reports/post_edits.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 Report.add_report('post_edits') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.modes = [:table]
 
@@ -77,13 +76,13 @@ Report.add_report('post_edits') do |report|
   /*limit*/
   SQL
 
-  if category_filter
+  if category_id
     builder.join "topics t ON t.id = p.topic_id"
-    builder.where("t.category_id = :category_id
-      OR t.category_id IN (
-        SELECT id FROM categories
-        WHERE categories.parent_category_id = :category_id
-      )", category_id: category_filter)
+    if include_subcategories
+      builder.where("t.category_id IN (?)", Category.subcategory_ids(category_id))
+    else
+      builder.where("t.category_id = ?", category_id)
+    end
   end
 
   builder.where("editor.id > 0 AND editor.id != author.id")
diff --git a/app/models/reports/posts.rb b/app/models/reports/posts.rb
index 0317599687..8461d79dfc 100644
--- a/app/models/reports/posts.rb
+++ b/app/models/reports/posts.rb
@@ -3,14 +3,18 @@
 Report.add_report('posts') do |report|
   report.modes = [:table, :chart]
 
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
-  basic_report_about report, Post, :public_posts_count_per_day, report.start_date, report.end_date, category_filter
+  basic_report_about report, Post, :public_posts_count_per_day, report.start_date, report.end_date, category_id, include_subcategories
 
   countable = Post.public_posts.where(post_type: Post.types[:regular])
-  if category_filter
-    countable = countable.joins(:topic).merge(Topic.in_category_and_subcategories(category_filter))
+  if category_id
+    if include_subcategories
+      countable = countable.joins(:topic).where('topics.category_id IN (?)', Category.subcategory_ids(category_id))
+    else
+      countable = countable.joins(:topic).where('topics.category_id = ?', category_id)
+    end
   end
+
   add_counts report, countable, 'posts.created_at'
 end
diff --git a/app/models/reports/profile_views.rb b/app/models/reports/profile_views.rb
index 564ff198d0..ec349cf1ad 100644
--- a/app/models/reports/profile_views.rb
+++ b/app/models/reports/profile_views.rb
@@ -2,7 +2,7 @@
 
 Report.add_report('profile_views') do |report|
   group_filter = report.filters.dig(:group)
-  report.add_filter('group', default: group_filter)
+  report.add_filter('group', type: 'group', default: group_filter)
 
   start_date = report.start_date
   end_date = report.end_date
diff --git a/app/models/reports/signups.rb b/app/models/reports/signups.rb
index 79dcc04147..3df08e2b87 100644
--- a/app/models/reports/signups.rb
+++ b/app/models/reports/signups.rb
@@ -4,7 +4,7 @@ Report.add_report('signups') do |report|
   report.icon = 'user-plus'
 
   group_filter = report.filters.dig(:group)
-  report.add_filter('group', default: group_filter)
+  report.add_filter('group', type: 'group', default: group_filter)
 
   if group_filter
     basic_report_about report, User.real, :count_by_signup_date, report.start_date, report.end_date, group_filter
diff --git a/app/models/reports/time_to_first_response.rb b/app/models/reports/time_to_first_response.rb
index 7f361ef338..dd0a474318 100644
--- a/app/models/reports/time_to_first_response.rb
+++ b/app/models/reports/time_to_first_response.rb
@@ -2,17 +2,17 @@
 
 Report.add_report('time_to_first_response') do |report|
   category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.icon = 'reply'
   report.higher_is_better = false
   report.data = []
 
-  Topic.time_to_first_response_per_day(report.start_date, report.end_date, category_id: category_filter).each do |r|
+  Topic.time_to_first_response_per_day(report.start_date, report.end_date, category_id: category_id, include_subcategories: include_subcategories).each do |r|
     report.data << { x: r['date'], y: r['hours'].to_f.round(2) }
   end
 
-  report.total = Topic.time_to_first_response_total(category_id: category_filter)
+  report.total = Topic.time_to_first_response_total(category_id: category_id, include_subcategories: include_subcategories)
 
-  report.prev30Days = Topic.time_to_first_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: category_filter)
+  report.prev30Days = Topic.time_to_first_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: category_id, include_subcategories: include_subcategories)
 end
diff --git a/app/models/reports/top_referred_topics.rb b/app/models/reports/top_referred_topics.rb
index 6b8abf84e2..7f5dad2589 100644
--- a/app/models/reports/top_referred_topics.rb
+++ b/app/models/reports/top_referred_topics.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 Report.add_report('top_referred_topics') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.modes = [:table]
 
@@ -26,7 +25,8 @@ Report.add_report('top_referred_topics') do |report|
     end_date: report.end_date,
     start_date: report.start_date,
     limit: report.limit || 8,
-    category_id: category_filter
+    category_id: category_id,
+    include_subcategories: include_subcategories
   }
   result = nil
   result = IncomingLinksReport.find(:top_referred_topics, options)
diff --git a/app/models/reports/top_traffic_sources.rb b/app/models/reports/top_traffic_sources.rb
index f32130dc05..b6b7e16bf2 100644
--- a/app/models/reports/top_traffic_sources.rb
+++ b/app/models/reports/top_traffic_sources.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 Report.add_report('top_traffic_sources') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.modes = [:table]
 
@@ -27,7 +26,8 @@ Report.add_report('top_traffic_sources') do |report|
     end_date: report.end_date,
     start_date: report.start_date,
     limit: report.limit || 8,
-    category_id: category_filter
+    category_id: category_id,
+    include_subcategories: include_subcategories
   }
 
   result = IncomingLinksReport.find(:top_traffic_sources, options)
diff --git a/app/models/reports/top_uploads.rb b/app/models/reports/top_uploads.rb
index b8978678f3..e5a4f542cf 100644
--- a/app/models/reports/top_uploads.rb
+++ b/app/models/reports/top_uploads.rb
@@ -5,10 +5,9 @@ Report.add_report('top_uploads') do |report|
 
   extension_filter = report.filters.dig(:"file-extension")
   report.add_filter('file-extension',
+    type: 'list',
     default: extension_filter || 'any',
-    choices: (
-      SiteSetting.authorized_extensions.split('|') + Array(extension_filter)
-    ).uniq
+    choices: (SiteSetting.authorized_extensions.split('|') + Array(extension_filter)).uniq
   )
 
   report.labels = [
diff --git a/app/models/reports/topics.rb b/app/models/reports/topics.rb
index 7fd181afa0..61acaaab09 100644
--- a/app/models/reports/topics.rb
+++ b/app/models/reports/topics.rb
@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
 Report.add_report('topics') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
-  basic_report_about report, Topic, :listable_count_per_day, report.start_date, report.end_date, category_filter
+  basic_report_about report, Topic, :listable_count_per_day, report.start_date, report.end_date, category_id, include_subcategories
 
   countable = Topic.listable_topics
-  if category_filter
-    countable = countable.in_category_and_subcategories(category_filter)
-  end
+  countable = countable.where(category_id: include_subcategories ? Category.subcategory_ids(category_id) : category_id) if category_id
+
   add_counts report, countable, 'topics.created_at'
 end
diff --git a/app/models/reports/topics_with_no_response.rb b/app/models/reports/topics_with_no_response.rb
index 1cc0f17e3e..7cd2d15e16 100644
--- a/app/models/reports/topics_with_no_response.rb
+++ b/app/models/reports/topics_with_no_response.rb
@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
 Report.add_report('topics_with_no_response') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.data = []
-  Topic.with_no_response_per_day(report.start_date, report.end_date, category_filter).each do |r|
+  Topic.with_no_response_per_day(report.start_date, report.end_date, category_id, include_subcategories).each do |r|
     report.data << { x: r['date'], y: r['count'].to_i }
   end
 
-  report.total = Topic.with_no_response_total(category_id: category_filter)
+  report.total = Topic.with_no_response_total(category_id: category_id, include_subcategories: include_subcategories)
 
-  report.prev30Days = Topic.with_no_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: category_filter)
+  report.prev30Days = Topic.with_no_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: category_id, include_subcategories: include_subcategories)
 end
diff --git a/app/models/reports/visits.rb b/app/models/reports/visits.rb
index 472c0117bc..841f65ecf3 100644
--- a/app/models/reports/visits.rb
+++ b/app/models/reports/visits.rb
@@ -2,7 +2,7 @@
 
 Report.add_report('visits') do |report|
   group_filter = report.filters.dig(:group)
-  report.add_filter('group', default: group_filter)
+  report.add_filter('group', type: 'group', default: group_filter)
 
   report.icon = 'user'
 
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 771b37f4ee..0fd3f4059b 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -534,10 +534,18 @@ class Reviewable < ActiveRecord::Base
     ReviewableScore.joins(reviewable: :topic).where("reviewables.type = ?", name)
   end
 
-  def self.count_by_date(start_date, end_date, category_id = nil)
-    scores_with_topics
-      .where('reviewable_scores.created_at BETWEEN ? AND ?', start_date, end_date)
-      .where("topics.category_id = COALESCE(?, topics.category_id)", category_id)
+  def self.count_by_date(start_date, end_date, category_id = nil, include_subcategories = false)
+    query = scores_with_topics.where('reviewable_scores.created_at BETWEEN ? AND ?', start_date, end_date)
+
+    if category_id
+      if include_subcategories
+        query = query.where("topics.category_id IN (?)", Category.subcategory_ids(category_id))
+      else
+        query = query.where("topics.category_id = ?", category_id)
+      end
+    end
+
+    query
       .group("date(reviewable_scores.created_at)")
       .order('date(reviewable_scores.created_at)')
       .count
diff --git a/app/models/topic.rb b/app/models/topic.rb
index d080fbee32..f1f17443ce 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -454,10 +454,10 @@ class Topic < ActiveRecord::Base
     ((Time.zone.now - created_at) / 1.minute).round
   end
 
-  def self.listable_count_per_day(start_date, end_date, category_id = nil)
+  def self.listable_count_per_day(start_date, end_date, category_id = nil, include_subcategories = false)
     result = listable_topics.where("topics.created_at >= ? AND topics.created_at <= ?", start_date, end_date)
     result = result.group('date(topics.created_at)').order('date(topics.created_at)')
-    result = result.where(category_id: category_id) if category_id
+    result = result.where(category_id: include_subcategories ? Category.subcategory_ids(category_id) : category_id) if category_id
     result.count
   end
 
@@ -1294,7 +1294,13 @@ class Topic < ActiveRecord::Base
     builder = DB.build(sql)
     builder.where("t.created_at >= :start_date", start_date: opts[:start_date]) if opts[:start_date]
     builder.where("t.created_at < :end_date", end_date: opts[:end_date]) if opts[:end_date]
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id].to_i)) if opts[:category_id]
+    if opts[:category_id]
+      if opts[:include_subcategories]
+        builder.where("t.category_id IN (?)", Category.subcategory_ids(opts[:category_id]))
+      else
+        builder.where("t.category_id = ?", opts[:category_id])
+      end
+    end
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.where("p.deleted_at IS NULL")
@@ -1329,11 +1335,17 @@ class Topic < ActiveRecord::Base
     ORDER BY tt.created_at
   SQL
 
-  def self.with_no_response_per_day(start_date, end_date, category_id = nil)
+  def self.with_no_response_per_day(start_date, end_date, category_id = nil, include_subcategories = nil)
     builder = DB.build(WITH_NO_RESPONSE_SQL)
     builder.where("t.created_at >= :start_date", start_date: start_date) if start_date
     builder.where("t.created_at < :end_date", end_date: end_date) if end_date
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(category_id.to_i)) if category_id
+    if category_id
+      if include_subcategories
+        builder.where("t.category_id IN (?)", Category.subcategory_ids(category_id))
+      else
+        builder.where("t.category_id = ?", category_id)
+      end
+    end
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_hash
@@ -1353,7 +1365,13 @@ class Topic < ActiveRecord::Base
 
   def self.with_no_response_total(opts = {})
     builder = DB.build(WITH_NO_RESPONSE_TOTAL_SQL)
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id].to_i)) if opts[:category_id]
+    if opts[:category_id]
+      if opts[:include_subcategories]
+        builder.where("t.category_id IN (?)", Category.subcategory_ids(opts[:category_id]))
+      else
+        builder.where("t.category_id = ?", opts[:category_id])
+      end
+    end
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_single.first.to_i
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 39951e2b84..4ccd3d397a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3411,6 +3411,8 @@ en:
               label: Group
             category:
               label: Category
+            include-subcategories:
+              label: "Include Subcategories"
 
       commits:
         latest_changes: "Latest changes: please update often!"
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 12924fd82e..7b4dc6dcc1 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -771,7 +771,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('flags', filters: { category: c0.id }) }
+          let(:report) { Report.find('flags', filters: { category: c0.id, 'include-subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -801,7 +801,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('topics', filters: { category: c0.id }) }
+          let(:report) { Report.find('topics', filters: { category: c0.id, 'include-subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -892,7 +892,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('posts', filters: { category: c0.id }) }
+          let(:report) { Report.find('posts', filters: { category: c0.id, 'include-subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -924,7 +924,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('topics_with_no_response', filters: { category: c0.id }) }
+          let(:report) { Report.find('topics_with_no_response', filters: { category: c0.id, 'include-subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -960,7 +960,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('likes', filters: { category: c0.id }) }
+          let(:report) { Report.find('likes', filters: { category: c0.id, 'include-subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index e4db2d1d00..d381579300 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -2359,7 +2359,7 @@ describe Topic do
       Fabricate(:post, topic: topic, user: topic.user, post_number: 1, created_at: 3.hours.ago)
       Fabricate(:post, topic: topic, post_number: 2, created_at: 2.hours.ago)
 
-      expect(Topic.time_to_first_response_total(category_id: category.id)).to eq(1)
+      expect(Topic.time_to_first_response_total(category_id: category.id, include_subcategories: true)).to eq(1)
     end
 
     it "should only count regular posts as the first response" do
diff --git a/test/javascripts/fixtures/reports_bulk.js b/test/javascripts/fixtures/reports_bulk.js
index c315989170..a41cf34583 100644
--- a/test/javascripts/fixtures/reports_bulk.js
+++ b/test/javascripts/fixtures/reports_bulk.js
@@ -61,7 +61,7 @@ let signups = {
   dates_filtering: true,
   report_key: 'reports:signups:start:end:[:prev_period]:50:{"group":"88"}:4',
   available_filters: [
-    { id: "group", allow_any: false, choices: [], default: "88" }
+    { id: "group", type: "group", allow_any: false, choices: [], default: "88" }
   ],
   labels: [
     { type: "date", properties: ["x"], title: "Day" },

From 5c45363e67b6b895ce6171f89221e66e4a7447b4 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 22 Apr 2020 10:54:02 +0200
Subject: [PATCH 623/633] UX: better outline support in sk components (#9510)

---
 app/assets/javascripts/select-kit/components/select-kit.js  | 6 ++++++
 .../stylesheets/common/select-kit/mini-tag-chooser.scss     | 6 ------
 app/assets/stylesheets/common/select-kit/select-kit.scss    | 4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 4fdbd62928..e0307c2c5d 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -838,6 +838,12 @@ export default Component.extend(
           strategy: placementStrategy,
           placement: this.selectKit.options.placement,
           modifiers: [
+            {
+              name: "offset",
+              options: {
+                offset: [0, 2]
+              }
+            },
             {
               name: "positionWrapper",
               phase: "afterWrite",
diff --git a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
index 1bbfe3f357..27c302e868 100644
--- a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
@@ -4,12 +4,6 @@
       margin-bottom: 5px;
       margin-left: 5px;
 
-      &.is-expanded {
-        .select-kit-header {
-          border: 1px solid $tertiary;
-        }
-      }
-
       &.no-tags {
         .select-kit-header .selected-name {
           color: $primary-medium;
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 65a2125971..627325e9c1 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -34,6 +34,10 @@
       box-sizing: border-box;
       width: 100%;
     }
+
+    .select-kit-header {
+      outline: 1px solid $tertiary;
+    }
   }
 
   &.is-loading {

From 4e5f9d4cd19f2d5ad5f43264f30bfe9db26988b0 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 22 Apr 2020 12:13:19 +0300
Subject: [PATCH 624/633] DEV: Drop 'key' column from user_api_keys (#9388)

---
 app/models/user_api_key.rb                      |  3 ---
 ...200408121312_remove_key_from_user_api_key.rb | 17 +++++++++++++++++
 .../auth/default_current_user_provider_spec.rb  |  2 --
 spec/fabricators/user_api_key_fabricator.rb     |  1 -
 spec/services/post_alerter_spec.rb              |  2 --
 5 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 db/post_migrate/20200408121312_remove_key_from_user_api_key.rb

diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index 4fac1230bc..c705541a73 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -28,7 +28,6 @@ class UserApiKey < ActiveRecord::Base
   def generate_key
     if !self.key_hash
       @key ||= SecureRandom.hex
-      self.key = @key
       self.key_hash = ApiKey.hash_key(@key)
     end
   end
@@ -102,7 +101,6 @@ end
 #  id               :integer          not null, primary key
 #  user_id          :integer          not null
 #  client_id        :string           not null
-#  key              :string           not null
 #  application_name :string           not null
 #  push_url         :string
 #  created_at       :datetime         not null
@@ -115,7 +113,6 @@ end
 # Indexes
 #
 #  index_user_api_keys_on_client_id  (client_id) UNIQUE
-#  index_user_api_keys_on_key        (key) UNIQUE
 #  index_user_api_keys_on_key_hash   (key_hash) UNIQUE
 #  index_user_api_keys_on_user_id    (user_id)
 #
diff --git a/db/post_migrate/20200408121312_remove_key_from_user_api_key.rb b/db/post_migrate/20200408121312_remove_key_from_user_api_key.rb
new file mode 100644
index 0000000000..a6147e5d58
--- /dev/null
+++ b/db/post_migrate/20200408121312_remove_key_from_user_api_key.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class RemoveKeyFromUserApiKey < ActiveRecord::Migration[6.0]
+  DROPPED_COLUMNS ||= {
+    user_api_keys: %i{key}
+  }
+
+  def up
+    DROPPED_COLUMNS.each do |table, columns|
+      Migration::ColumnDropper.execute_drop(table, columns)
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index ab4fa86369..e5ce0ced7b 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -769,7 +769,6 @@ describe Auth::DefaultCurrentUserProvider do
         application_name: 'my app',
         client_id: '1234',
         scopes: ['read'],
-        key: SecureRandom.hex,
         user_id: user.id
       )
     end
@@ -779,7 +778,6 @@ describe Auth::DefaultCurrentUserProvider do
         application_name: 'my app',
         client_id: '12345',
         scopes: ['read'],
-        key: SecureRandom.hex,
         user_id: user.id
       )
 
diff --git a/spec/fabricators/user_api_key_fabricator.rb b/spec/fabricators/user_api_key_fabricator.rb
index e513ac05de..5c4ce63d4d 100644
--- a/spec/fabricators/user_api_key_fabricator.rb
+++ b/spec/fabricators/user_api_key_fabricator.rb
@@ -4,6 +4,5 @@ Fabricator(:readonly_user_api_key, from: :user_api_key) do
   user
   scopes ['read']
   client_id { SecureRandom.hex }
-  key { SecureRandom.hex }
   application_name 'some app'
 end
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 4a73313c7b..973f31c663 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -681,7 +681,6 @@ describe PostAlerter do
       2.times do |i|
         UserApiKey.create!(user_id: evil_trout.id,
                            client_id: "xxx#{i}",
-                           key: "yyy#{i}",
                            application_name: "iPhone#{i}",
                            scopes: ['notifications'],
                            push_url: "https://site2.com/push")
@@ -697,7 +696,6 @@ describe PostAlerter do
       2.times do |i|
         UserApiKey.create!(user_id: evil_trout.id,
                            client_id: "xxx#{i}",
-                           key: "yyy#{i}",
                            application_name: "iPhone#{i}",
                            scopes: ['notifications'],
                            push_url: "https://site2.com/push")

From 4889dbde497025fc274770c9dd9e5e01899a1a7c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 22 Apr 2020 13:02:20 +0200
Subject: [PATCH 625/633] FIX: differentiate sk outline handling on
 single/multi (#9512)

---
 .../javascripts/select-kit/components/select-kit.js      | 9 ++++++---
 .../stylesheets/common/select-kit/multi-select.scss      | 1 +
 app/assets/stylesheets/common/select-kit/select-kit.scss | 4 ----
 .../stylesheets/common/select-kit/single-select.scss     | 6 ++++++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index e0307c2c5d..175559c333 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -832,6 +832,8 @@ export default Component.extend(
           placementStrategy = inModal ? "fixed" : "absolute";
         }
 
+        const verticalOffset = this.multiSelect ? 0 : 2;
+
         /* global Popper:true */
         this.popper = Popper.createPopper(anchor, popper, {
           eventsEnabled: false,
@@ -841,7 +843,7 @@ export default Component.extend(
             {
               name: "offset",
               options: {
-                offset: [0, 2]
+                offset: [0, verticalOffset]
               }
             },
             {
@@ -853,7 +855,7 @@ export default Component.extend(
                   ".select-kit-wrapper"
                 );
                 if (wrapper) {
-                  let height = this.element.offsetHeight;
+                  let height = this.element.offsetHeight + verticalOffset;
 
                   const body = this.element.querySelector(".select-kit-body");
                   if (body) {
@@ -873,7 +875,8 @@ export default Component.extend(
                     this.element.classList.add("is-under");
                   }
 
-                  wrapper.style.width = `${this.element.offsetWidth}px`;
+                  // - 1 accounts for any rounding error
+                  wrapper.style.width = `${this.element.offsetWidth - 1}px`;
                   wrapper.style.height = `${height}px`;
                 }
               }
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index e1ee384a8e..65d9d290d5 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -53,6 +53,7 @@
       .multi-select-header {
         border-radius: 0;
         box-shadow: none;
+        outline: none;
       }
 
       .select-kit-body {
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 627325e9c1..65a2125971 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -34,10 +34,6 @@
       box-sizing: border-box;
       width: 100%;
     }
-
-    .select-kit-header {
-      outline: 1px solid $tertiary;
-    }
   }
 
   &.is-loading {
diff --git a/app/assets/stylesheets/common/select-kit/single-select.scss b/app/assets/stylesheets/common/select-kit/single-select.scss
index 4868756a9d..f77def218c 100644
--- a/app/assets/stylesheets/common/select-kit/single-select.scss
+++ b/app/assets/stylesheets/common/select-kit/single-select.scss
@@ -8,4 +8,10 @@
       border-bottom: 1px solid $primary-low;
     }
   }
+
+  &.is-expanded {
+    .select-kit-header {
+      outline: 1px solid $tertiary;
+    }
+  }
 }

From 5fb5807098c7480cc2882bd309588c9d49c71390 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 22 Apr 2020 13:10:02 +0200
Subject: [PATCH 626/633] FIX: caret icon should inherit its color (#9513)

---
 app/assets/stylesheets/common/select-kit/select-kit.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 65a2125971..68f268687a 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -111,6 +111,7 @@
       margin-left: auto;
       padding-left: 5px;
       pointer-events: none;
+      color: inherit;
     }
 
     .d-button-label {

From ceee855d00f4ca34a2e49ec32cc8615bd1f94846 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 22 Apr 2020 16:40:59 +0530
Subject: [PATCH 627/633] minor code improvement

a511bea4cc3f50bd1e067a46bdbf5cd19eb335a3
---
 app/assets/javascripts/admin/controllers/admin-user-index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js b/app/assets/javascripts/admin/controllers/admin-user-index.js
index f69993c185..9076e56654 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js
@@ -220,13 +220,13 @@ export default Controller.extend(CanCheckEmails, {
         admin: true,
         model: {
           username: this.model.username,
-          targetUsername: targetUsername
+          targetUsername
         }
       });
     },
 
     merge(targetUsername) {
-      return this.model.merge({ targetUsername: targetUsername });
+      return this.model.merge({ targetUsername });
     },
 
     viewActionLogs() {

From c8fed90e4e325dda864c15fa0212cd946b1adccd Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Wed, 22 Apr 2020 12:12:33 +0100
Subject: [PATCH 628/633] FIX: Handle sub-sub-category paths without an id

---
 app/controllers/list_controller.rb |  4 +---
 app/controllers/tags_controller.rb |  4 +---
 app/models/category.rb             | 29 ++++++++++++++++++-----------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 498f3ed86e..81511387f7 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -319,9 +319,7 @@ class ListController < ApplicationController
     if id.present?
       @category = Category.find_by_id(id)
     elsif slug_path.present?
-      if (1..2).include?(slug_path.size)
-        @category = Category.find_by_slug(*slug_path.reverse)
-      end
+      @category = Category.find_by_slug_path(slug_path)
 
       # Legacy paths
       if @category.nil? && parts.last =~ /\A\d+-category/
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 72f5935f64..ada5d6f66d 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -359,9 +359,7 @@ class TagsController < ::ApplicationController
       if id.present?
         @filter_on_category = Category.find_by_id(id)
       elsif slug_path.present?
-        if (1..2).include?(slug_path.size)
-          @filter_on_category = Category.find_by_slug(*slug_path.reverse)
-        end
+        @filter_on_category = Category.find_by_slug_path(slug_path)
 
         # Legacy paths
         if @filter_on_category.nil? && parts.last =~ /\A\d+-category/
diff --git a/app/models/category.rb b/app/models/category.rb
index 192204d189..2651602e16 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -777,22 +777,29 @@ class Category < ActiveRecord::Base
     end
   end
 
-  def self.find_by_slug(category_slug, parent_category_slug = nil)
-
-    return nil if category_slug.nil?
+  def self.find_by_slug_path(slug_path)
+    return nil if slug_path.empty?
+    return nil if slug_path.size > SiteSetting.max_category_nesting
 
     if SiteSetting.slug_generation_method == "encoded"
-      parent_category_slug = CGI.escape(parent_category_slug) unless parent_category_slug.nil?
-      category_slug = CGI.escape(category_slug)
+      slug_path.map! { |slug| CGI.escape(slug) }
     end
 
-    if parent_category_slug
-      parent_category_id = self.where(slug: parent_category_slug, parent_category_id: nil).select(:id)
+    query =
+      slug_path.inject(nil) do |parent_id, slug|
+        Category.where(
+          slug: slug,
+          parent_category_id: parent_id,
+        ).select(:id)
+      end
 
-      self.where(slug: category_slug, parent_category_id: parent_category_id).first
-    else
-      self.where(slug: category_slug, parent_category_id: nil).first
-    end
+    Category.find_by_id(query)
+  end
+
+  def self.find_by_slug(category_slug, parent_category_slug = nil)
+    return nil if category_slug.nil?
+
+    find_by_slug_path([parent_category_slug, category_slug].compact)
   end
 
   def subcategory_list_includes_topics?

From e5c44f6dcff9717c799dfc80933368f7ddc35998 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 22 Apr 2020 17:42:09 +0530
Subject: [PATCH 629/633] UX: display 'merge' button in all non-staff user
 profiles.

---
 app/assets/javascripts/admin/templates/user-index.hbs | 3 +++
 app/controllers/admin/users_controller.rb             | 2 +-
 app/serializers/admin_detailed_user_serializer.rb     | 5 +++++
 lib/guardian/user_guardian.rb                         | 8 ++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 76aee47271..adbe7e50e9 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -683,6 +683,9 @@
                  icon="trash-alt"
                  class="btn-danger"
                  action=(action "destroy")}}
+    {{/if}}
+
+    {{#if model.can_be_merged}}
       {{d-button label="admin.user.merge.transfer_and_delete"
                  icon="trash-alt"
                  class="btn-danger"
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 4ed8a10a0f..8902781834 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -476,7 +476,7 @@ class Admin::UsersController < Admin::AdminController
     target_username = params.require(:target_username)
     target_user = User.find_by_username(target_username)
 
-    guardian.ensure_can_merge_user!(@user, target_user)
+    guardian.ensure_can_merge_users!(@user, target_user)
 
     if user = UserMerger.new(@user, target_user, current_user).merge!
       render json: success_json.merge(merged: true, user: user)
diff --git a/app/serializers/admin_detailed_user_serializer.rb b/app/serializers/admin_detailed_user_serializer.rb
index 4a83a594b1..c0b18e3df5 100644
--- a/app/serializers/admin_detailed_user_serializer.rb
+++ b/app/serializers/admin_detailed_user_serializer.rb
@@ -18,6 +18,7 @@ class AdminDetailedUserSerializer < AdminUserSerializer
              :can_delete_all_posts,
              :can_be_deleted,
              :can_be_anonymized,
+             :can_be_merged,
              :full_suspend_reason,
              :suspended_till,
              :silence_reason,
@@ -74,6 +75,10 @@ class AdminDetailedUserSerializer < AdminUserSerializer
     scope.can_anonymize_user?(object)
   end
 
+  def can_be_merged
+    scope.can_merge_user?(object)
+  end
+
   def topic_count
     object.topics.count
   end
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 1461c69d69..d8b65e1407 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -76,8 +76,12 @@ module UserGuardian
     is_staff? && !user.nil? && !user.staff?
   end
 
-  def can_merge_user?(source_user, target_user)
-    is_admin? && !source_user.nil? && !source_user.staff? && !target_user.nil?
+  def can_merge_user?(user)
+    is_admin? && !user.nil? && !user.staff?
+  end
+
+  def can_merge_users?(source_user, target_user)
+    can_merge_user?(source_user) && !target_user.nil?
   end
 
   def can_reset_bounce_score?(user)

From b7dea0d5c1c6975b78602164c6500dad1449c169 Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Wed, 22 Apr 2020 08:57:25 -0500
Subject: [PATCH 630/633] FIX: Copy button was displayed on quoted codeblock
 (#9514)

---
 .../javascripts/discourse/initializers/copy-codeblocks.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
index 777400db57..f7e81af46a 100644
--- a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
+++ b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
@@ -114,7 +114,7 @@ export default {
         }
 
         const commands = postElements[0].querySelectorAll(
-          ":scope > pre > code, :scope :not(article) > pre > code"
+          ":scope > pre > code, :scope :not(article):not(blockquote) > pre > code"
         );
 
         const post = helper.getModel();

From 32f3f1c14beff6782533e723d294e36a22bbfd79 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 22 Apr 2020 10:26:09 -0400
Subject: [PATCH 631/633] Build(deps-dev): Bump mock_redis from 0.22.0 to
 0.23.0 (#9506)

Bumps [mock_redis](https://github.com/sds/mock_redis) from 0.22.0 to 0.23.0.
- [Release notes](https://github.com/sds/mock_redis/releases)
- [Changelog](https://github.com/sds/mock_redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/mock_redis/compare/v0.22.0...v0.23.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3a60704820..bc0921c126 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -196,7 +196,7 @@ GEM
       ffi (~> 1.9)
     minitest (5.14.0)
     mocha (1.11.2)
-    mock_redis (0.22.0)
+    mock_redis (0.23.0)
     msgpack (1.3.3)
     multi_json (1.14.1)
     multi_xml (0.6.0)

From 4d4560251743f941e2477bc0fca8ea5e72d5f2c0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 22 Apr 2020 10:26:31 -0400
Subject: [PATCH 632/633] Build(deps): Bump mini_racer from 0.2.9 to 0.2.10
 (#9507)

Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.9 to 0.2.10.
- [Release notes](https://github.com/discourse/mini_racer/releases)
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.9...v0.2.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bc0921c126..e29ba65db6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -187,8 +187,8 @@ GEM
     method_source (0.9.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    mini_racer (0.2.9)
-      libv8 (>= 6.9.411)
+    mini_racer (0.2.10)
+      libv8 (> 7.3)
     mini_scheduler (0.12.2)
       sidekiq
     mini_sql (0.2.5)

From 58bdc04aac1256a857e35fca4e8b7089853764ee Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 22 Apr 2020 10:51:19 -0400
Subject: [PATCH 633/633] Version bump to v2.5.0.beta3

---
 lib/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/version.rb b/lib/version.rb
index 2d8503a967..07f2377661 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -9,7 +9,7 @@ module Discourse
       MAJOR = 2
       MINOR = 5
       TINY  = 0
-      PRE   = 'beta2'
+      PRE   = 'beta3'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end